diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4725eb32a..c33688f69 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,7 +7,7 @@ jobs:
   build:
     docker:
       # Specify the version you desire here
-      - image: cimg/php:8.2.5
+      - image: cimg/php:8.3.8
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -21,7 +21,12 @@ jobs:
     steps:
       - checkout
 
-      - run: sudo apt update && sudo apt install zlib1g-dev libsqlite3-dev
+      - run:
+          name: "Create Environment file and generate app key"
+          command: |
+            mv .env.testing .env
+
+      - run: sudo apt install zlib1g-dev libsqlite3-dev
 
       # Download and cache dependencies
 
@@ -36,18 +41,17 @@ jobs:
       - run: composer install -n --prefer-dist
 
       - save_cache:
-          key: composer-v2-{{ checksum "composer.lock" }}
+          key: v2-dependencies-{{ checksum "composer.json" }}
           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: ./vendor/bin/phpunit
+      - run: php artisan test
       - store_test_results:
           path: tests/_output
       - store_artifacts:
diff --git a/.ddev/commands/redis/redis-cli b/.ddev/commands/redis/redis-cli
index 27bf575b3..8824c6a6b 100755
--- a/.ddev/commands/redis/redis-cli
+++ b/.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"
 
-redis-cli -p 6379 -h redis $@
+exec redis-cli -p 6379 -h redis "$@"
diff --git a/.dockerignore b/.dockerignore
index 70376cdf4..757a67a51 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,8 +1,30 @@
-data
-Dockerfile
-contrib/docker/Dockerfile.*
-docker-compose*.yml
-.dockerignore
-.git
-.gitignore
-.env
+.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
diff --git a/.editorconfig b/.editorconfig
index 1cd7d1077..eff249956 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,9 +1,27 @@
 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
diff --git a/.env.docker b/.env.docker
index ce4cfe87c..0e373aedc 100644
--- a/.env.docker
+++ b/.env.docker
@@ -1,149 +1,1302 @@
-## Crypto
+#!/bin/bash
+# -*- mode: bash -*-
+# vi: ft=bash
+# shellcheck disable=SC2034,SC2148
+
+# Use Dottie (https://github.com/jippi/dottie) to manage this .env file easier!
+#
+# For example:
+#
+#   Run [dottie update] to update your [.env] file with upstream (as part of upgrade)
+#   Run [dottie validate] to validate youe [.env] file
+#
+# @dottie/source .env.docker
+
+################################################################################
+# app
+################################################################################
+
+# The name/title for your site
+# @see https://docs.pixelfed.org/technical-documentation/config/#app_name-1
+# @dottie/example My Pixelfed Site
+# @dottie/validate required,ne=My Pixelfed Site
+APP_NAME=
+
+# Application domain used for routing. (e.g., pixelfed.org)
+#
+# @see https://docs.pixelfed.org/technical-documentation/config/#app_domain
+# @dottie/example example.com
+# @dottie/validate required,ne=example.com,fqdn
+APP_DOMAIN="example.com"
+
+# This URL is used by the console to properly generate URLs when using the Artisan command line tool.
+# You should set this to the root of your application so that it is used when running Artisan tasks.
+#
+# @see https://docs.pixelfed.org/technical-documentation/config/#app_url
+# @dottie/validate required,http_url
+APP_URL="https://${APP_DOMAIN}"
+
+# Application domains used for routing.
+#
+# @see https://docs.pixelfed.org/technical-documentation/config/#admin_domain
+# @dottie/validate required,fqdn
+ADMIN_DOMAIN="${APP_DOMAIN}"
+
+# This value determines the “environment” your application is currently running in.
+# This may determine how you prefer to configure various services your application utilizes.
+#
+# @default "production"
+# @see https://docs.pixelfed.org/technical-documentation/config/#app_env
+# @dottie/validate required,oneof=production dev staging
+#APP_ENV="production"
+
+# When your application is in debug mode, detailed error messages with stack traces will
+# be shown on every error that occurs within your application.
+#
+# If disabled, a simple generic error page is shown.
+#
+# @default "false"
+# @see https://docs.pixelfed.org/technical-documentation/config/#app_debug
+# @dottie/validate required,boolean
+#APP_DEBUG="false"
+
+# Disable config cache
+#
+# If disabled, settings must be managed by .env variables.
+#
+# @default "false"
+# @see https://docs.pixelfed.org/technical-documentation/config/#config_cache
+# @dottie/validate required,boolean
+ENABLE_CONFIG_CACHE="true"
+
+# Enable/disable new local account registrations.
+#
+# @default "true"
+# @see https://docs.pixelfed.org/technical-documentation/config/#open_registration
+# @dottie/validate required,boolean
+#OPEN_REGISTRATION="true"
+
+# Require email verification before a new user can do anything.
+#
+# @default "true"
+# @see https://docs.pixelfed.org/technical-documentation/config/#enforce_email_verification
+# @dottie/validate required,boolean
+#ENFORCE_EMAIL_VERIFICATION="true"
+
+# Allow a maximum number of user accounts.
+#
+# @default "1000"
+# @see https://docs.pixelfed.org/technical-documentation/config/#pf_max_users
+# @dottie/validate required,number
+#PF_MAX_USERS="1000"
+
+# Enforce the maximum number of user accounts
+#
+# @default "true"
+# @dottie/validate boolean
+#PF_ENFORCE_MAX_USERS="true"
+
+# @default "false"
+# @see https://docs.pixelfed.org/technical-documentation/config/#oauth_enabled
+# @dottie/validate required,boolean
+#OAUTH_ENABLED="false"
+
+# ! Do not edit your timezone once the service is running - or things will break!
+#
+# @default "UTC"
+# @see https://docs.pixelfed.org/technical-documentation/config/#app_timezone
+# @see https://www.php.net/manual/en/timezones.php
+# @dottie/validate required,timezone
+APP_TIMEZONE="UTC"
+
+# The application locale determines the default locale that will be used by the translation service provider.
+# You are free to set this value to any of the locales which will be supported by the application.
+#
+# @default "en"
+# @see https://docs.pixelfed.org/technical-documentation/config/#app_locale
+# @dottie/validate required
+#APP_LOCALE="en"
+
+# The fallback locale determines the locale to use when the current one is not available.
+#
+# You may change the value to correspond to any of the language folders that are provided through your application.
+#
+# @default "en"
+# @see https://docs.pixelfed.org/technical-documentation/config/#app_fallback_locale
+# @dottie/validate required
+#APP_FALLBACK_LOCALE="en"
+
+# @see https://docs.pixelfed.org/technical-documentation/config/#limit_account_size
+# @dottie/validate required,boolean
+#LIMIT_ACCOUNT_SIZE="true"
+
+# Update the max account size, the per user limit of files in kB.
+#
+# @default "1000000" (1GB)
+# @see https://docs.pixelfed.org/technical-documentation/config/#max_account_size-kb
+# @dottie/validate required,number
+#MAX_ACCOUNT_SIZE="1000000"
+
+# Update the max photo size, in kB.
+#
+# @default "15000" (15MB)
+# @see https://docs.pixelfed.org/technical-documentation/config/#max_photo_size-kb
+# @dottie/validate required,number
+#MAX_PHOTO_SIZE="15000"
+
+# The max number of photos allowed per post.
+#
+# @default "4"
+# @see https://docs.pixelfed.org/technical-documentation/config/#max_album_length
+# @dottie/validate required,number
+#MAX_ALBUM_LENGTH="4"
+
+# Update the max avatar size, in kB.
+#
+# @default "2000" (2MB).
+# @see https://docs.pixelfed.org/technical-documentation/config/#max_avatar_size-kb
+# @dottie/validate required,number
+#MAX_AVATAR_SIZE="2000"
+
+# Change the caption length limit for new local posts.
+#
+# @default "500"
+# @see https://docs.pixelfed.org/technical-documentation/config/#max_caption_length
+# @dottie/validate required,number
+#MAX_CAPTION_LENGTH="500"
+
+# Change the bio length limit for user profiles.
+#
+# @default "125"
+# @see https://docs.pixelfed.org/technical-documentation/config/#max_bio_length
+# @dottie/validate required,number
+#MAX_BIO_LENGTH="125"
+
+# Change the length limit for user names.
+#
+# @default "30"
+# @see https://docs.pixelfed.org/technical-documentation/config/#max_name_length
+# @dottie/validate required,number
+#MAX_NAME_LENGTH="30"
+
+# Resize and optimize image uploads.
+#
+# @default "true"
+# @see https://docs.pixelfed.org/technical-documentation/config/#pf_optimize_images
+# @dottie/validate required,boolean
+#PF_OPTIMIZE_IMAGES="true"
+
+# Set the image optimization quality, must be a value between 1-100.
+#
+# @default "80"
+# @see https://docs.pixelfed.org/technical-documentation/config/#image_quality
+# @dottie/validate required,number
+#IMAGE_QUALITY="80"
+
+# Resize and optimize video uploads.
+#
+# @default "true"
+# @see https://docs.pixelfed.org/technical-documentation/config/#pf_optimize_videos
+# @dottie/validate required,boolean
+#PF_OPTIMIZE_VIDEOS="true"
+
+# Enable account deletion.
+#
+# @default "true"
+# @see https://docs.pixelfed.org/technical-documentation/config/#account_deletion
+# @dottie/validate required,boolean
+#ACCOUNT_DELETION="true"
+
+# Set account deletion queue after X days, set to false to delete accounts immediately.
+#
+# @default "false"
+# @see https://docs.pixelfed.org/technical-documentation/config/#account_delete_after
+# @dottie/validate required,boolean|number
+#ACCOUNT_DELETE_AFTER="false"
+
+# @default "Pixelfed - Photo sharing for everyone"
+# @see https://docs.pixelfed.org/technical-documentation/config/#instance_description
+# @dottie/validate required
+#INSTANCE_DESCRIPTION=""
+
+# @default "false"
+# @see https://docs.pixelfed.org/technical-documentation/config/#instance_public_hashtags
+# @dottie/validate required,boolean
+#INSTANCE_PUBLIC_HASHTAGS="false"
+
+# The public e-mail address people can use to contact you by
+#
+# @default ""
+# @see https://docs.pixelfed.org/technical-documentation/config/#instance_contact_email
+# @dottie/validate required,ne=__CHANGE_ME__,email
+INSTANCE_CONTACT_EMAIL="__CHANGE_ME__"
+
+# @default "false"
+# @see https://docs.pixelfed.org/technical-documentation/config/#instance_public_local_timeline
+# @dottie/validate required,boolean
+#INSTANCE_PUBLIC_LOCAL_TIMELINE="false"
+
+# @default ""
+# @see https://docs.pixelfed.org/technical-documentation/config/#banned_usernames
+#BANNED_USERNAMES=""
+
+# @default "false"
+# @see https://docs.pixelfed.org/technical-documentation/config/#stories_enabled
+# @dottie/validate required,boolean
+#STORIES_ENABLED="false"
+
+# Level is hardcoded to 1.
+#
+# @default "false"
+# @see https://docs.pixelfed.org/technical-documentation/config/#restricted_instance
+# @dottie/validate required,boolean
+#RESTRICTED_INSTANCE="false"
+
+# @default false
+# @see https://docs.pixelfed.org/technical-documentation/config/#media_exif_database
+# @dottie/validate required,boolean
+#MEDIA_EXIF_DATABASE="false"
+
+# Pixelfed supports GD or ImageMagick to process images.
+#
+# Possible values:
+#  - "gd" (default)
+#  - "imagick"
+#
+# @default "gd"
+# @see https://docs.pixelfed.org/technical-documentation/config/#image_driver
+# @dottie/validate required,oneof=gd imagick
+#IMAGE_DRIVER="gd"
+
+# Set trusted proxy IP addresses.
+#
+# Both IPv4 and IPv6 addresses are supported, along with CIDR notation.
+#
+# The “*” character is syntactic sugar within TrustedProxy to trust any
+# proxy that connects directly to your server, a requirement when you cannot
+# know the address of your proxy (e.g. if using Rackspace balancers).
+#
+# The “**” character is syntactic sugar within TrustedProxy to trust not just any
+# proxy that connects directly to your server, but also proxies that connect to those proxies,
+# and all the way back until you reach the original source IP.  It will mean that
+# $request->getClientIp() always gets the originating client IP, no matter how many proxies
+# that client’s request has subsequently passed through.
+#
+# @default "*"
+# @see https://docs.pixelfed.org/technical-documentation/config/#trust_proxies
+# @dottie/validate required
+#TRUST_PROXIES="*"
+
+# This option controls the default cache connection that gets used while using this caching library.
+#
+# This connection is used when another is not explicitly specified when executing a given caching function.
+#
+# Possible values:
+# - "apc"
+# - "array"
+# - "database"
+# - "file" (default)
+# - "memcached"
+# - "redis"
+#
+# @default "file"
+# @see https://docs.pixelfed.org/technical-documentation/config/#cache_driver
+# @dottie/validate required,oneof=apc array database file memcached redis
+CACHE_DRIVER="redis"
+
+# @default ${APP_NAME}_cache, or laravel_cache if no APP_NAME is set.
+# @see https://docs.pixelfed.org/technical-documentation/config/#cache_prefix
+# @dottie/validate required
+#CACHE_PREFIX="{APP_NAME}_cache"
+
+# This option controls the default broadcaster that will be used by the framework when an event needs to be broadcast.
+#
+# Possible values:
+# - "pusher"
+# - "redis"
+# - "log"
+# - "null" (default)
+#
+# @default null
+# @see https://docs.pixelfed.org/technical-documentation/config/#broadcast_driver
+# @dottie/validate required,oneof=pusher redis log null
+BROADCAST_DRIVER="redis"
+
+# @default "true"
+# @see https://docs.pixelfed.org/technical-documentation/config/#restrict_html_types
+# @dottie/validate required,boolean
+#RESTRICT_HTML_TYPES="true"
+
+# Passport uses encryption keys while generating secure access tokens
+# for your application.
+#
+# By default, the keys are stored as local files but can be set via environment
+# variables when that is more convenient.
+
+# @see https://docs.pixelfed.org/technical-documentation/config/#passport_private_key
+# @dottie/validate required
+#PASSPORT_PRIVATE_KEY=""
+
+# @see https://docs.pixelfed.org/technical-documentation/config/#passport_public_key
+# @dottie/validate required
+#PASSPORT_PUBLIC_KEY=""
+
+################################################################################
+# database
+################################################################################
+
+# Database version to use (as Docker tag)
+#
+# @see https://hub.docker.com/_/mariadb
+# @dottie/validate required
+DB_VERSION="11.2"
+
+# Here you may specify which of the database connections below
+# you wish to use as your default connection for all database work.
+#
+# Of course you may use many connections at once using the database library.
+#
+# Possible values:
+#
+# - "sqlite"
+# - "mysql" (default)
+# - "pgsql"
+# - "sqlsrv"
+#
+# @see https://docs.pixelfed.org/technical-documentation/config/#db_connection
+# @dottie/validate required,oneof=sqlite mysql pgsql sqlsrv
+DB_CONNECTION="mysql"
+
+# @see https://docs.pixelfed.org/technical-documentation/config/#db_host
+# @dottie/validate required,hostname
+DB_HOST="db"
+
+# @see https://docs.pixelfed.org/technical-documentation/config/#db_username
+# @dottie/validate required
+DB_USERNAME="pixelfed"
+
+# The password to your database. Please make it secure.
+# Use a site like https://pwgen.io/ to generate it
+#
+# @see https://docs.pixelfed.org/technical-documentation/config/#db_password
+# @dottie/validate required
+DB_PASSWORD=
+
+# @see https://docs.pixelfed.org/technical-documentation/config/#db_database
+# @dottie/validate required
+DB_DATABASE="pixelfed_prod"
+
+# Use "3306" for MySQL/MariaDB and "5432" for PostgreeSQL
+#
+# @see https://docs.pixelfed.org/technical-documentation/config/#db_port
+# @dottie/validate required,number
+DB_PORT="3306"
+
+# Automatically run [artisan migrate --force] if new migrations are detected.
+# @dottie/validate required,boolean
+DB_APPLY_NEW_MIGRATIONS_AUTOMATICALLY="false"
+
+################################################################################
+# mail
+################################################################################
+
+# Laravel supports both SMTP and PHP’s “mail” function as drivers for the sending of e-mail.
+# You may specify which one you’re using throughout your application here.
+#
+# Possible values:
+#
+# "smtp" (default)
+# "sendmail"
+# "mailgun"
+# "mandrill"
+# "ses"
+# "sparkpost"
+# "log"
+# "array"
+#
+# @default "smtp"
+# @see https://docs.pixelfed.org/technical-documentation/config/#mail_driver
+# @dottie/validate required,oneof=smtp sendmail mailgun mandrill ses sparkpost log array
+#MAIL_DRIVER="smtp"
+
+# The host address of the SMTP server used by your applications.
+#
+# A default option is provided that is compatible with the Mailgun mail service which will provide reliable deliveries.
+#
+# @default "smtp.mailgun.org"
+# @see https://docs.pixelfed.org/technical-documentation/config/#mail_host
+# @dottie/validate required_with=MAIL_DRIVER,fqdn
+#MAIL_HOST="smtp.mailgun.org"
+
+# This is the SMTP port used by your application to deliver e-mails to users of the application.
+#
+# Like the host we have set this value to stay compatible with the Mailgun e-mail application by default.
+#
+# @default 587.
+# @see https://docs.pixelfed.org/technical-documentation/config/#mail_port
+# @dottie/validate required_with=MAIL_DRIVER,number
+#MAIL_PORT="587"
+
+# Here, you may specify a name and address that is used globally for all e-mails that are sent by your application.
+#
+# You may wish for all e-mails sent by your application to be sent from the same address.
+#
+# @default "bot@example.com"
+# @see https://docs.pixelfed.org/technical-documentation/config/#mail_from_address
+# @dottie/validate required_with=MAIL_DRIVER,email,ne=__CHANGE_ME__
+#MAIL_FROM_ADDRESS="__CHANGE_ME__"
+
+# The 'name' you send e-mail from
+#
+# @default "Example"
+# @see https://docs.pixelfed.org/technical-documentation/config/#mail_from_name
+# @dottie/validate required_with=MAIL_DRIVER
+#MAIL_FROM_NAME="${APP_NAME}"
+
+# If your SMTP server requires a username for authentication, you should set it here.
+#
+# This will get used to authenticate with your server on connection.
+# You may also set the “password” value below this one.
+#
+# @default ""
+# @see https://docs.pixelfed.org/technical-documentation/config/#mail_username
+# @dottie/validate required_with=MAIL_DRIVER
+#MAIL_USERNAME=""
+
+# @default ""
+# @see https://docs.pixelfed.org/technical-documentation/config/#mail_password
+# @dottie/validate required_with=MAIL_DRIVER
+#MAIL_PASSWORD=""
+
+# Here you may specify the encryption protocol that should be used when the application send e-mail messages.
+#
+# A sensible default using the transport layer security protocol should provide great security.
+#
+# @default "tls"
+# @see https://docs.pixelfed.org/technical-documentation/config/#mail_encryption
+# @dottie/validate required_with=MAIL_DRIVER
+#MAIL_ENCRYPTION="tls"
+
+################################################################################
+# redis
+################################################################################
+
+# @default "phpredis"
+# @see https://docs.pixelfed.org/technical-documentation/config/#redis_client
+# @dottie/validate required
+#REDIS_CLIENT="phpredis"
+
+# @default "tcp"
+# @see https://docs.pixelfed.org/technical-documentation/config/#redis_scheme
+# @dottie/validate required
+#REDIS_SCHEME="tcp"
+
+# @default "localhost"
+# @see https://docs.pixelfed.org/technical-documentation/config/#redis_host
+# @dottie/validate required
+REDIS_HOST="redis"
+
+# @default "null" (not set/commented out).
+# @see https://docs.pixelfed.org/technical-documentation/config/#redis_password
+# @dottie/validate omitempty
+#REDIS_PASSWORD=
+
+# @default "6379"
+# @see https://docs.pixelfed.org/technical-documentation/config/#redis_port
+# @dottie/validate required,number
+REDIS_PORT="6379"
+
+# @default "0"
+# @see https://docs.pixelfed.org/technical-documentation/config/#redis_database
+# @dottie/validate required,number
+#REDIS_DATABASE="0"
+
+################################################################################
+# experiments
+################################################################################
+
+# Text only posts (alpha).
+#
+# @default "false"
+# @see https://docs.pixelfed.org/technical-documentation/config/#exp_top
+# @dottie/validate required,boolean
+#EXP_TOP="false"
+
+# Poll statuses (alpha).
+#
+# @default "false"
+# @see https://docs.pixelfed.org/technical-documentation/config/#exp_polls
+# @dottie/validate required,boolean
+#EXP_POLLS="false"
+
+# Cached public timeline for larger instances (beta).
+#
+# @default "false"
+# @see https://docs.pixelfed.org/technical-documentation/config/#exp_cpt
+# @dottie/validate required,boolean
+#EXP_CPT="false"
+
+# Enforce Mastodon API Compatibility (alpha).
+#
+# @default "true"
+# @see https://docs.pixelfed.org/technical-documentation/config/#exp_emc
+# @dottie/validate required,boolean
+#EXP_EMC="true"
+
+################################################################################
+# ActivityPub
+################################################################################
+
+# @default "false"
+# @see https://docs.pixelfed.org/technical-documentation/config/#activity_pub
+# @dottie/validate required,boolean
+#ACTIVITY_PUB="true"
+
+# @default "true"
+# @see https://docs.pixelfed.org/technical-documentation/config/#ap_remote_follow
+# @dottie/validate required,boolean
+#AP_REMOTE_FOLLOW="true"
+
+# @default "true"
+# @see https://docs.pixelfed.org/technical-documentation/config/#ap_sharedinbox
+# @dottie/validate required,boolean
+#AP_SHAREDINBOX="true"
+
+# @default "true"
+# @see https://docs.pixelfed.org/technical-documentation/config/#ap_inbox
+# @dottie/validate required,boolean
+#AP_INBOX="true"
+
+# @default "true"
+# @see https://docs.pixelfed.org/technical-documentation/config/#ap_outbox
+# @dottie/validate required,boolean
+#AP_OUTBOX="true"
+
+################################################################################
+# Federation
+################################################################################
+
+# @default "true"
+# @see https://docs.pixelfed.org/technical-documentation/config/#atom_feeds
+# @dottie/validate required,boolean
+#ATOM_FEEDS="true"
+
+# @default "true"
+# @see https://docs.pixelfed.org/technical-documentation/config/#nodeinfo
+# @dottie/validate required,boolean
+#NODEINFO="true"
+
+# @default "true"
+# @see https://docs.pixelfed.org/technical-documentation/config/#webfinger
+# @dottie/validate required,boolean
+#WEBFINGER="true"
+
+################################################################################
+# Storage
+################################################################################
+
+# Store media on object storage like S3, Digital Ocean Spaces, Rackspace
+#
+# @default "false"
+# @see https://docs.pixelfed.org/technical-documentation/config/#pf_enable_cloud
+# @dottie/validate required,boolean
+#PF_ENABLE_CLOUD="false"
+
+# Many applications store files both locally and in the cloud.
+#
+# For this reason, you may specify a default “cloud” driver here.
+# This driver will be bound as the Cloud disk implementation in the container.
+#
+# @default "s3"
+# @see https://docs.pixelfed.org/technical-documentation/config/#filesystem_cloud
+# @dottie/validate required_with=PF_ENABLE_CLOUD
+#FILESYSTEM_CLOUD="s3"
+
+# @default true.
+# @see https://docs.pixelfed.org/technical-documentation/config/#media_delete_local_after_cloud
+# @dottie/validate required_with=PF_ENABLE_CLOUD,boolean
+#MEDIA_DELETE_LOCAL_AFTER_CLOUD="true"
+
+# @see https://docs.pixelfed.org/technical-documentation/config/#aws_access_key_id
+# @dottie/validate required_if=FILESYSTEM_CLOUD s3
+#AWS_ACCESS_KEY_ID=""
+
+# @see https://docs.pixelfed.org/technical-documentation/config/#aws_secret_access_key
+# @dottie/validate required_if=FILESYSTEM_CLOUD s3
+#AWS_SECRET_ACCESS_KEY=""
+
+# @see https://docs.pixelfed.org/technical-documentation/config/#aws_default_region
+# @dottie/validate required_if=FILESYSTEM_CLOUD s3
+#AWS_DEFAULT_REGION=""
+
+# @see https://docs.pixelfed.org/technical-documentation/config/#aws_bucket
+# @dottie/validate required_if=FILESYSTEM_CLOUD s3
+#AWS_BUCKET=""
+
+# @see https://docs.pixelfed.org/technical-documentation/config/#aws_url
+# @dottie/validate required_if=FILESYSTEM_CLOUD s3
+#AWS_URL=""
+
+# @see https://docs.pixelfed.org/technical-documentation/config/#aws_endpoint
+# @dottie/validate required_if=FILESYSTEM_CLOUD s3
+#AWS_ENDPOINT=""
+
+# @see https://docs.pixelfed.org/technical-documentation/config/#aws_use_path_style_endpoint
+# @dottie/validate required_if=FILESYSTEM_CLOUD s3
+#AWS_USE_PATH_STYLE_ENDPOINT="false"
+
+################################################################################
+# COSTAR
+################################################################################
+
+# Comma-separated list of domains to block.
+#
+# @default null (not set/commented out).
+# @see https://docs.pixelfed.org/technical-documentation/config/#cs_blocked_domains
+# @dottie/validate
+#CS_BLOCKED_DOMAINS=""
+
+# Comma-separated list of domains to add warnings.
+#
+# @default null (not set/commented out).
+# @see https://docs.pixelfed.org/technical-documentation/config/#cs_cw_domains
+# @dottie/validate
+#CS_CW_DOMAINS=""
+
+# Comma-separated list of domains to remove from public timelines.
+#
+# @default null (not set/commented out).
+# @see https://docs.pixelfed.org/technical-documentation/config/#cs_unlisted_domains
+# @dottie/validate
+#CS_UNLISTED_DOMAINS=""
+
+# Comma-separated list of keywords to block.
+#
+# @default null (not set/commented out).
+# @see https://docs.pixelfed.org/technical-documentation/config/#cs_blocked_keywords
+# @dottie/validate
+#CS_BLOCKED_KEYWORDS=""
+
+# Comma-separated list of keywords to add warnings.
+#
+# @default null (not set/commented out).
+# @see https://docs.pixelfed.org/technical-documentation/config/#cs_cw_keywords
+# @dottie/validate
+#CS_CW_KEYWORDS=""
+
+# Comma-separated list of keywords to remove from public timelines.
+#
+# @default null (not set/commented out).
+# @see https://docs.pixelfed.org/technical-documentation/config/#cs_unlisted_keywords
+# @dottie/validate
+#CS_UNLISTED_KEYWORDS=""
+
+# @default null (not set/commented out).
+# @see https://docs.pixelfed.org/technical-documentation/config/#cs_blocked_actor
+# @dottie/validate
+#CS_BLOCKED_ACTOR=""
+
+# @default null (not set/commented out).
+# @see https://docs.pixelfed.org/technical-documentation/config/#cs_cw_actor
+# @dottie/validate
+#CS_CW_ACTOR=""
+
+# @default null (not set/commented out).
+# @see https://docs.pixelfed.org/technical-documentation/config/#cs_unlisted_actor
+# @dottie/validate
+#CS_UNLISTED_ACTOR=""
+
+################################################################################
+# logging
+################################################################################
+
+# Possible values:
+#
+# - "stack" (default)
+# - "single"
+# - "daily"
+# - "slack"
+# - "stderr"
+# - "syslog"
+# - "errorlog"
+# - "null"
+# - "emergency"
+# - "media"
+#
+# @default "stack"
+# @dottie/validate required,oneof=stack single daily slack stderr syslog errorlog null emergency media
+LOG_CHANNEL="stderr"
+
+# Used by single, stderr and syslog.
+#
+# @default "debug"
+# @see https://docs.pixelfed.org/technical-documentation/config/#log_level
+# @dottie/validate required,oneof=debug info notice warning error critical alert emergency
+#LOG_LEVEL="debug"
+
+# Used by stderr.
+#
+# @default ""
+# @see https://docs.pixelfed.org/technical-documentation/config/#log_stderr_formatter
+#LOG_STDERR_FORMATTER=""
+
+# Used by slack.
+#
+# @default ""
+# @see https://docs.pixelfed.org/technical-documentation/config/#log_slack_webhook_url
+# @dottie/validate required,http_url
+#LOG_SLACK_WEBHOOK_URL=""
+
+################################################################################
+# queue
+################################################################################
+
+# Possible values:
+#   - "sync" (default)
+#   - "database"
+#   - "beanstalkd"
+#   - "sqs"
+#   - "redis"
+#   - "null"
+#
+# @default "sync"
+# @see https://docs.pixelfed.org/technical-documentation/config/#queue_driver
+# @dottie/validate required,oneof=sync database beanstalkd sqs redis null
+QUEUE_DRIVER="redis"
+
+# @default "your-public-key"
+# @see https://docs.pixelfed.org/technical-documentation/config/#sqs_key
+# @dottie/validate required_if=QUEUE_DRIVER sqs
+#SQS_KEY="your-public-key"
+
+# @default "your-secret-key"
+# @see https://docs.pixelfed.org/technical-documentation/config/#sqs_secret
+# @dottie/validate required_if=QUEUE_DRIVER sqs
+#SQS_SECRET="your-secret-key"
+
+# @default "https://sqs.us-east-1.amazonaws.com/your-account-id"
+# @see https://docs.pixelfed.org/technical-documentation/config/#sqs_prefix
+# @dottie/validate required_if=QUEUE_DRIVER sqs
+#SQS_PREFIX=""
+
+# @default "your-queue-name"
+# @see https://docs.pixelfed.org/technical-documentation/config/#sqs_queue
+# @dottie/validate required_if=QUEUE_DRIVER sqs
+#SQS_QUEUE="your-queue-name"
+
+# @default "us-east-1"
+# @see https://docs.pixelfed.org/technical-documentation/config/#sqs_region
+# @dottie/validate required_if=QUEUE_DRIVER sqs
+#SQS_REGION="us-east-1"
+
+################################################################################
+# session
+################################################################################
+
+# This option controls the default session “driver” that will be used on requests.
+#
+# By default, we will use the lightweight native driver but you may specify any of the other wonderful drivers provided here.
+#
+# Possible values:
+#   - "file"
+#   - "cookie"
+#   - "database" (default)
+#   - "apc"
+#   - "memcached"
+#   - "redis"
+#   - "array"
+#
+# @default "database"
+# @dottie/validate required,oneof=file cookie database apc memcached redis array
+SESSION_DRIVER="redis"
+
+# Here you may specify the number of minutes that you wish the session to be allowed to remain idle before it expires.
+#
+# If you want them to immediately expire on the browser closing, set that option.
+#
+# @default 86400.
+# @see https://docs.pixelfed.org/technical-documentation/config/#session_lifetime
+# @dottie/validate required,number
+#SESSION_LIFETIME="86400"
+
+# Here you may change the domain of the cookie used to identify a session in your application.
+#
+# This will determine which domains the cookie is available to in your application.
+#
+# A sensible default has been set.
+#
+# @default the value of APP_DOMAIN, or null.
+# @see https://docs.pixelfed.org/technical-documentation/config/#session_domain
+# @dottie/validate required,hostname
+#SESSION_DOMAIN="${APP_DOMAIN}"
+
+################################################################################
+# horizon
+################################################################################
+
+# This prefix will be used when storing all Horizon data in Redis.
+#
+# You may modify the prefix when you are running multiple installations
+# of Horizon on the same server so that they don’t have problems.
+#
+# @default "horizon-"
+# @see https://docs.pixelfed.org/technical-documentation/config/#horizon_prefix
+# @dottie/validate required
+#HORIZON_PREFIX="horizon-"
+
+# @default "false"
+# @see https://docs.pixelfed.org/technical-documentation/config/#horizon_darkmode
+# @dottie/validate required,boolean
+#HORIZON_DARKMODE="false"
+
+# This value (in MB) describes the maximum amount of memory (in MB) the Horizon worker
+# may consume before it is terminated and restarted.
+#
+# You should set this value according to the resources available to your server.
+#
+# @default "64"
+# @dottie/validate required,number
+#HORIZON_MEMORY_LIMIT="64"
+
+# @see https://docs.pixelfed.org/technical-documentation/config/#horizon_balance_strategy
+# @dottie/validate required
+#HORIZON_BALANCE_STRATEGY="auto"
+
+# @see https://docs.pixelfed.org/technical-documentation/config/#horizon_min_processes
+# @dottie/validate required,number
+#HORIZON_MIN_PROCESSES="1"
+
+# @see https://docs.pixelfed.org/technical-documentation/config/#horizon_max_processes
+# @dottie/validate required,number
+#HORIZON_MAX_PROCESSES="20"
+
+# @see https://docs.pixelfed.org/technical-documentation/config/#horizon_supervisor_memory
+# @dottie/validate required,number
+#HORIZON_SUPERVISOR_MEMORY="64"
+
+# @see https://docs.pixelfed.org/technical-documentation/config/#horizon_supervisor_tries
+# @dottie/validate required,number
+#HORIZON_SUPERVISOR_TRIES="3"
+
+# @see https://docs.pixelfed.org/technical-documentation/config/#horizon_supervisor_nice
+# @dottie/validate required,number
+#HORIZON_SUPERVISOR_NICE="0"
+
+# @see https://docs.pixelfed.org/technical-documentation/config/#horizon_supervisor_timeout
+# @dottie/validate required,number
+#HORIZON_SUPERVISOR_TIMEOUT="300"
+
+################################################################################
+# docker shared
+################################################################################
+
+# A random 32-character string to be used as an encryption key.
+#
+# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+# ! NOTE: This will be auto-generated by Docker during bootstrap
+# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+#
+# This key is used by the Illuminate encrypter service and should be set to a random,
+# 32 character string, otherwise these encrypted strings will not be safe.
+#
+# @see https://docs.pixelfed.org/technical-documentation/config/#app_key
+# @dottie/validate required
 APP_KEY=
 
-## General Settings
-APP_NAME="Pixelfed Prod"
-APP_ENV=production
-APP_DEBUG=false
-APP_URL=https://real.domain
-APP_DOMAIN="real.domain"
-ADMIN_DOMAIN="real.domain"
-SESSION_DOMAIN="real.domain"
+# Prefix for container names (without any dash at the end)
+# @dottie/validate required
+DOCKER_ALL_CONTAINER_NAME_PREFIX="${APP_DOMAIN}"
 
-OPEN_REGISTRATION=true
-ENFORCE_EMAIL_VERIFICATION=false
-PF_MAX_USERS=1000
-OAUTH_ENABLED=true
+# How often Docker health check should run for all services
+#
+# Can be overridden by individual [DOCKER_*_HEALTHCHECK_INTERVAL] settings further down
+#
+# @default "10s"
+# @dottie/validate required
+DOCKER_ALL_DEFAULT_HEALTHCHECK_INTERVAL="10s"
 
-APP_TIMEZONE=UTC
-APP_LOCALE=en
+# Path (relative to the docker-compose.yml) or absolute (/some/other/path) where containers will *all* data
+# will be stored (data, config, overrides)
+#
+# @default "./docker-compose-state"
+# @dottie/validate required,dir
+DOCKER_ALL_HOST_ROOT_PATH="./docker-compose-state"
 
-## Pixelfed Tweaks
-LIMIT_ACCOUNT_SIZE=true
-MAX_ACCOUNT_SIZE=1000000
-MAX_PHOTO_SIZE=15000
-MAX_AVATAR_SIZE=2000
-MAX_CAPTION_LENGTH=500
-MAX_BIO_LENGTH=125
-MAX_NAME_LENGTH=30
-MAX_ALBUM_LENGTH=4
-IMAGE_QUALITY=80
-PF_OPTIMIZE_IMAGES=true
-PF_OPTIMIZE_VIDEOS=true
-ADMIN_ENV_EDITOR=false
-ACCOUNT_DELETION=true
-ACCOUNT_DELETE_AFTER=false
-MAX_LINKS_PER_POST=0
+# Path (relative to the docker-compose.yml) or absolute (/some/other/path) where containers will store their data
+#
+# @default "${DOCKER_ALL_HOST_ROOT_PATH}/data"
+# @dottie/validate required,dir
+DOCKER_ALL_HOST_DATA_ROOT_PATH="${DOCKER_ALL_HOST_ROOT_PATH:?error}/data"
 
-## Instance
-#INSTANCE_DESCRIPTION=
-INSTANCE_PUBLIC_HASHTAGS=false
-#INSTANCE_CONTACT_EMAIL=
-INSTANCE_PUBLIC_LOCAL_TIMELINE=false
-#BANNED_USERNAMES=
-STORIES_ENABLED=false
-RESTRICTED_INSTANCE=false
+# Path (relative to the docker-compose.yml) or absolute (/some/other/path) where containers will store their confguration
+#
+# @default "${DOCKER_ALL_HOST_ROOT_PATH}/config"
+# @dottie/validate required,dir
+DOCKER_ALL_HOST_CONFIG_ROOT_PATH="${DOCKER_ALL_HOST_ROOT_PATH:?error}/config"
 
-## Mail
-MAIL_DRIVER=log
-MAIL_HOST=smtp.mailtrap.io
-MAIL_PORT=2525
-MAIL_FROM_ADDRESS="pixelfed@example.com"
-MAIL_FROM_NAME="Pixelfed"
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
+# Path (relative to the docker-compose.yml) or absolute (/some/other/path) where containers will store overrides
+#
+# @default "${DOCKER_ALL_HOST_ROOT_PATH}/overrides"
+# @dottie/validate required,dir
+DOCKER_APP_HOST_OVERRIDES_PATH="${DOCKER_ALL_HOST_ROOT_PATH:?error}/overrides"
 
-## Databases (MySQL)
-DB_CONNECTION=mysql
-DB_DATABASE=pixelfed_prod
-DB_HOST=db
-DB_PASSWORD=pixelfed_db_pass
-DB_PORT=3306
-DB_USERNAME=pixelfed
-# pass the same values to the db itself
-MYSQL_DATABASE=pixelfed_prod
-MYSQL_PASSWORD=pixelfed_db_pass
-MYSQL_RANDOM_ROOT_PASSWORD=true
-MYSQL_USER=pixelfed
+# Set timezone used by *all* containers - these must be in sync.
+#
+# ! Do not edit your timezone once the service is running - or things will break!
+#
+# @see https://www.php.net/manual/en/timezones.php
+# @dottie/validate required,timezone
+TZ="${APP_TIMEZONE}"
 
-## Databases (Postgres)
-#DB_CONNECTION=pgsql
-#DB_HOST=postgres
-#DB_PORT=5432
-#DB_DATABASE=pixelfed
-#DB_USERNAME=postgres
-#DB_PASSWORD=postgres
+################################################################################
+# docker app
+################################################################################
 
-## Cache (Redis)
-REDIS_CLIENT=phpredis
-REDIS_SCHEME=tcp
-REDIS_HOST=redis
-REDIS_PASSWORD=redis_password
-REDIS_PORT=6379
-REDIS_DATABASE=0
+# The docker tag prefix to use for pulling images, can be one of
+#
+#  * latest
+#  * <some semver release>
+#  * staging
+#  * edge
+#  * branch-<some branch name>
+#  * pr-<some merge request id>
+#
+# Combined with [DOCKER_APP_RUNTIME] and [PHP_VERSION] configured
+# elsewhere in this file, the final Docker tag is computed.
+# @dottie/validate required
+DOCKER_APP_RELEASE="branch-jippi-fork"
 
-HORIZON_PREFIX="horizon-"
+# The PHP version to use for [web] and [worker] container
+#
+# Any version published on https://hub.docker.com/_/php should work
+#
+# Example:
+#
+#   * 8.1
+#   * 8.2
+#   * 8.2.14
+#   * latest
+#
+# Do *NOT* use the full Docker tag (e.g. "8.3.2RC1-fpm-bullseye")
+# *only* the version part. The rest of the full tag is derived from
+# the [DOCKER_APP_RUNTIME] and [PHP_DEBIAN_RELEASE] settings
+# @dottie/validate required
+DOCKER_APP_PHP_VERSION="8.2"
 
-## EXPERIMENTS 
-EXP_LC=false
-EXP_REC=false
-EXP_LOOPS=false
+# The container runtime to use.
+#
+# @see https://docs.pixelfed.org/running-pixelfed/docker/runtimes.html
+# @dottie/validate required,oneof=apache nginx fpm
+DOCKER_APP_RUNTIME="apache"
 
-## ActivityPub Federation
-ACTIVITY_PUB=false
-AP_REMOTE_FOLLOW=false
-AP_SHAREDINBOX=false
-AP_INBOX=false
-AP_OUTBOX=false
-ATOM_FEEDS=true
-NODEINFO=true
-WEBFINGER=true
+# The Debian release variant to use of the [php] Docker image
+#
+# Examlpe: [bookworm] or [bullseye]
+# @dottie/validate required,oneof=bookworm bullseye
+DOCKER_APP_DEBIAN_RELEASE="bullseye"
 
-## S3
-FILESYSTEM_CLOUD=s3
-PF_ENABLE_CLOUD=false
-#AWS_ACCESS_KEY_ID=
-#AWS_SECRET_ACCESS_KEY=
-#AWS_DEFAULT_REGION=
-#AWS_BUCKET=
-#AWS_URL=
-#AWS_ENDPOINT=
-#AWS_USE_PATH_STYLE_ENDPOINT=false
+# The [php] Docker image base type
+#
+# @see https://docs.pixelfed.org/running-pixelfed/docker/runtimes.html
+# @dottie/validate required,oneof=apache fpm cli
+DOCKER_APP_BASE_TYPE="apache"
 
-## Horizon
-HORIZON_DARKMODE=false
+# Image to pull the Pixelfed Docker images from.
+#
+# Example values:
+#
+#   * "ghcr.io/pixelfed/pixelfed" to pull from GitHub
+#   * "pixelfed/pixelfed"         to pull from DockerHub
+#   * "your/fork"                 to pull from a custom fork
+#
+# @dottie/validate required
+DOCKER_APP_IMAGE="ghcr.io/jippi/pixelfed"
 
-## COSTAR - Confirm Object Sentiment Transform and Reduce
-PF_COSTAR_ENABLED=false
+# Pixelfed version (image tag) to pull from the registry.
+#
+# @see https://github.com/pixelfed/pixelfed/pkgs/container/pixelfed
+# @dottie/validate required
+DOCKER_APP_TAG="${DOCKER_APP_RELEASE:?error}-${DOCKER_APP_RUNTIME:?error}-${DOCKER_APP_PHP_VERSION:?error}"
 
-# Media
-MEDIA_EXIF_DATABASE=false
+# Path (on host system) where the [app] + [worker] container will write
+# its [storage] data (e.g uploads/images/profile pictures etc.).
+#
+# Path is relative (./some/other/path) to the docker-compose.yml or absolute (/some/other/path)
+# @dottie/validate required,dir
+DOCKER_APP_HOST_STORAGE_PATH="${DOCKER_ALL_HOST_DATA_ROOT_PATH:?error}/pixelfed/storage"
 
-## Logging
-LOG_CHANNEL=stderr
+# Path (on host system) where the [app] + [worker] container will write
+# its [cache] data.
+#
+# Path is relative (./some/other/path) to the docker-compose.yml or absolute (/some/other/path)
+# @dottie/validate required,dir
+DOCKER_APP_HOST_CACHE_PATH="${DOCKER_ALL_HOST_DATA_ROOT_PATH:?error}/pixelfed/cache"
 
-## Image
-IMAGE_DRIVER=imagick
+# Automatically run "One-time setup tasks" commands.
+#
+# If you are migrating to this docker-compose setup or have manually run the "One time setup"
+# tasks (https://docs.pixelfed.org/running-pixelfed/installation/#setting-up-services)
+# you can set this to "0" to prevent them from running.
+#
+# Otherwise, leave it at "1" to have them run *once*.
+# @dottie/validate required,boolean
+#DOCKER_APP_RUN_ONE_TIME_SETUP_TASKS="1"
 
-## Broadcasting: log driver for local development
-BROADCAST_DRIVER=log
+# A space-seperated list of paths (inside the container) to *recursively* [chown]
+# to the container user/group id (UID/GID) in case of permission issues.
+#
+# ! You should *not* leave this on permanently, at it can significantly slow down startup
+# ! time for the container, and during normal operations there should never be permission
+# ! issues. Please report a bug if you see behavior requiring this to be permanently on
+#
+# Example: "/var/www/storage /var/www/bootstrap/cache"
+# @dottie/validate required
+#DOCKER_APP_ENSURE_OWNERSHIP_PATHS=""
 
-## Cache
-CACHE_DRIVER=redis
+# Enable Docker Entrypoint debug mode (will call [set -x] in bash scripts)
+# by setting this to "1"
+# @dottie/validate required,boolean
+#DOCKER_APP_ENTRYPOINT_DEBUG="0"
 
-## Purify
-RESTRICT_HTML_TYPES=true
+# Show the "diff" when applying templating to files
+#
+# @default "1"
+# @dottie/validate required,boolean
+#DOCKER_APP_ENTRYPOINT_SHOW_TEMPLATE_DIFF="1"
 
-## Queue
-QUEUE_DRIVER=redis
+# Docker entrypoints that should be skipped on startup
+# @default ""
+#ENTRYPOINT_SKIP_SCRIPTS=""
 
-## Session
-SESSION_DRIVER=redis
+# List of extra APT packages (separated by space) to install when building
+# locally using [docker compose build].
+#
+# @see https://github.com/pixelfed/pixelfed/blob/dev/docker/customizing.md
+# @dottie/validate required
+#DOCKER_APP_APT_PACKAGES_EXTRA=""
 
-## Trusted Proxy
-TRUST_PROXIES="*"
+# List of *extra* PECL extensions (separated by space) to install when
+# building locally using [docker compose build].
+#
+# @see https://github.com/pixelfed/pixelfed/blob/dev/docker/customizing.md
+# @dottie/validate required
+#DOCKER_APP_PHP_PECL_EXTENSIONS_EXTRA=""
 
-## Passport
-#PASSPORT_PRIVATE_KEY=
-#PASSPORT_PUBLIC_KEY=
+# List of *extra* PHP extensions (separated by space) to install when
+# building locally using [docker compose build].
+#
+# @see https://github.com/pixelfed/pixelfed/blob/dev/docker/customizing.md
+# @dottie/validate required
+#DOCKER_APP_PHP_EXTENSIONS_EXTRA=""
+
+# @default "128M"
+# @see https://www.php.net/manual/en/ini.core.php#ini.memory-limit
+# @dottie/validate required
+#DOCKER_APP_PHP_MEMORY_LIMIT="128M"
+
+# @default "E_ALL & ~E_DEPRECATED & ~E_STRICT"
+# @see http://php.net/error-reporting
+# @dottie/validate required
+#DOCKER_APP_PHP_ERROR_REPORTING="E_ALL & ~E_DEPRECATED & ~E_STRICT"
+
+# @default "off"
+# @see http://php.net/display-errors
+# @dottie/validate required,oneof=on off
+#DOCKER_APP_PHP_DISPLAY_ERRORS="off"
+
+# Enables the opcode cache.
+#
+# When disabled, code is not optimised or cached.
+#
+# @default "1"
+# @see https://www.php.net/manual/en/opcache.configuration.php#ini.opcache.enable
+# @dottie/validate required,oneof=0 1
+#DOCKER_APP_PHP_OPCACHE_ENABLE="1"
+
+# If enabled, OPcache will check for updated scripts every [opcache.revalidate_freq] seconds.
+#
+# When this directive is disabled, you must reset OPcache manually via opcache_reset(),
+# opcache_invalidate() or by restarting the Web server for changes to the filesystem to take effect.
+#
+# @default "0"
+# @see https://www.php.net/manual/en/opcache.configuration.php#ini.opcache.validate-timestamps
+# @dottie/validate required,oneof=0 1
+#DOCKER_APP_PHP_OPCACHE_VALIDATE_TIMESTAMPS="0"
+
+# How often to check script timestamps for updates, in seconds.
+# 0 will result in OPcache checking for updates on every request.
+#
+# @default "2"
+# @see https://www.php.net/manual/en/opcache.configuration.php#ini.opcache.revalidate-freq
+# @dottie/validate required,oneof=0 1 2
+#DOCKER_APP_PHP_OPCACHE_REVALIDATE_FREQ="2"
+
+# When doing [docker compose build], should the frontend be built in the Dockerfile?
+# If set to "0" the included pre-compiled frontend will be used.
+#
+# @default "0"
+# @dottie/validate required,oneof=0 1
+#DOCKER_APP_BUILD_FRONTEND="0"
+
+################################################################################
+# docker redis
+################################################################################
+
+# Set this to a non-empty value (e.g. "disabled") to disable the [redis] service
+#DOCKER_REDIS_PROFILE=
+
+# Redis version to use as Docker tag
+#
+# @see https://hub.docker.com/_/redis
+# @dottie/validate required
+DOCKER_REDIS_VERSION="7.2"
+
+# Path (on host system) where the [redis] container will store its data
+#
+# Path is relative (./some/other/path) to the docker-compose.yml or absolute (/some/other/path)
+# @dottie/validate required,dir
+DOCKER_REDIS_HOST_DATA_PATH="${DOCKER_ALL_HOST_DATA_ROOT_PATH:?error}/redis"
+
+# Port that Redis will listen on *outside* the container (e.g. the host machine)
+# @dottie/validate required,number
+DOCKER_REDIS_HOST_PORT="${REDIS_PORT:?error}"
+
+# The filename that Redis should store its config file within
+#
+# NOTE: The file *MUST* exists (even empty) before enabling this setting!
+#
+# Use a command like [touch "${DOCKER_ALL_HOST_CONFIG_ROOT_PATH}/redis/redis.conf"] to create it.
+#
+# @default ""
+# @dottie/validate required
+#DOCKER_REDIS_CONFIG_FILE="/etc/redis/redis.conf"
+# How often Docker health check should run for [redis] service
+#
+# @default "10s"
+# @dottie/validate required
+DOCKER_REDIS_HEALTHCHECK_INTERVAL="${DOCKER_ALL_DEFAULT_HEALTHCHECK_INTERVAL:?error}"
+
+################################################################################
+# docker db
+################################################################################
+
+# Set this to a non-empty value (e.g. "disabled") to disable the [db] service
+#DOCKER_DB_PROFILE=
+
+# Docker image for the DB service
+# @dottie/validate required
+DOCKER_DB_IMAGE="mariadb:${DB_VERSION}"
+
+# Command to pass to the [db] server container
+# @dottie/validate required
+DOCKER_DB_COMMAND="--default-authentication-plugin=mysql_native_password"
+
+# Path (on host system) where the [db] container will store its data
+#
+# Path is relative (./some/other/path) to the docker-compose.yml or absolute (/some/other/path)
+# @dottie/validate required,dir
+DOCKER_DB_HOST_DATA_PATH="${DOCKER_ALL_HOST_DATA_ROOT_PATH:?error}/db"
+
+# Path (inside the container) where the [db] will store its data.
+#
+# Path MUST be absolute.
+#
+# For MySQL this should be [/var/lib/mysql]
+# For PostgreSQL this should be [/var/lib/postgresql/data]
+# @dottie/validate required
+DOCKER_DB_CONTAINER_DATA_PATH="/var/lib/mysql"
+
+# Port that the database will listen on *OUTSIDE* the container (e.g. the host machine)
+#
+# Use "3306" for MySQL/MariaDB and "5432" for PostgreeSQL
+# @dottie/validate required,number
+DOCKER_DB_HOST_PORT="${DB_PORT:?error}"
+
+# Port that the database will listen on *INSIDE* the container
+#
+# Use "3306" for MySQL/MariaDB and "5432" for PostgreeSQL
+# @dottie/validate required,number
+DOCKER_DB_CONTAINER_PORT="${DB_PORT:?error}"
+
+# root password for the database. By default uses DB_PASSWORD
+# but can be changed in situations where you are migrating
+# to the included docker-compose and have a different password
+# set already
+#
+# @dottie/validate required
+DOCKER_DB_ROOT_PASSWORD="${DB_PASSWORD:?error}"
+
+# How often Docker health check should run for [db] service
+# @dottie/validate required
+DOCKER_DB_HEALTHCHECK_INTERVAL="${DOCKER_ALL_DEFAULT_HEALTHCHECK_INTERVAL:?error}"
+
+################################################################################
+# docker web
+################################################################################
+
+# Set this to a non-empty value (e.g. "disabled") to disable the [web] service
+#DOCKER_WEB_PROFILE=""
+
+# Port to expose [web] container will listen on *outside* the container (e.g. the host machine) for *HTTP* traffic only
+# @dottie/validate required,number
+DOCKER_WEB_PORT_EXTERNAL_HTTP="8080"
+
+# How often Docker health check should run for [web] service
+# @dottie/validate required
+DOCKER_WEB_HEALTHCHECK_INTERVAL="${DOCKER_ALL_DEFAULT_HEALTHCHECK_INTERVAL:?error}"
+
+################################################################################
+# docker worker
+################################################################################
+
+# Set this to a non-empty value (e.g. "disabled") to disable the [worker] service
+#DOCKER_WORKER_PROFILE=""
+
+# How often Docker health check should run for [worker] service
+# @dottie/validate required
+DOCKER_WORKER_HEALTHCHECK_INTERVAL="${DOCKER_ALL_DEFAULT_HEALTHCHECK_INTERVAL:?error}"
+
+################################################################################
+# docker proxy
+################################################################################
+
+# Set this to a non-empty value (e.g. "disabled") to disable the [proxy] and [proxy-acme] service
+#DOCKER_PROXY_PROFILE=
+
+# Set this to a non-empty value (e.g. "disabled") to disable the [proxy-acme] service
+#DOCKER_PROXY_ACME_PROFILE="${DOCKER_PROXY_PROFILE:-}"
+
+# The version of nginx-proxy to use
+#
+# @see https://hub.docker.com/r/nginxproxy/nginx-proxy
+# @dottie/validate required
+DOCKER_PROXY_VERSION="1.4"
+
+# How often Docker health check should run for [proxy] service
+# @dottie/validate required
+DOCKER_PROXY_HEALTHCHECK_INTERVAL="${DOCKER_ALL_DEFAULT_HEALTHCHECK_INTERVAL:?error}"
+
+# Port that the [proxy] will listen on *outside* the container (e.g. the host machine) for HTTP traffic
+# @dottie/validate required,number
+DOCKER_PROXY_HOST_PORT_HTTP="80"
+
+# Port that the [proxy] will listen on *outside* the container (e.g. the host machine) for HTTPS traffic
+# @dottie/validate required,number
+DOCKER_PROXY_HOST_PORT_HTTPS="443"
+
+# Path to the Docker socket on the *host*
+# @dottie/validate required,file
+DOCKER_PROXY_HOST_DOCKER_SOCKET_PATH="/var/run/docker.sock"
+
+# The host to request LetsEncrypt certificate for
+# @dottie/validate required,fqdn
+DOCKER_PROXY_LETSENCRYPT_HOST="${APP_DOMAIN}"
+
+# The e-mail to use for Lets Encrypt certificate requests.
+# @dottie/validate required,email
+DOCKER_PROXY_LETSENCRYPT_EMAIL="${INSTANCE_CONTACT_EMAIL:?error}"
+
+# Lets Encrypt staging/test servers for certificate requests.
+#
+# Setting this to any value will change to letsencrypt test servers.
+#DOCKER_PROXY_LETSENCRYPT_TEST="1"
diff --git a/.env.example b/.env.example
index d4d7228d1..79ce65337 100644
--- a/.env.example
+++ b/.env.example
@@ -8,6 +8,7 @@ OPEN_REGISTRATION="false"
 ENFORCE_EMAIL_VERIFICATION="false"
 PF_MAX_USERS="1000"
 OAUTH_ENABLED="true"
+ENABLE_CONFIG_CACHE=true
 
 # Media Configuration
 PF_OPTIMIZE_IMAGES="true"
diff --git a/.env.testing b/.env.testing
index 258d8d740..63209d91b 100644
--- a/.env.testing
+++ b/.env.testing
@@ -1,3 +1,5 @@
+# shellcheck disable=SC2034,SC2148
+
 APP_NAME="Pixelfed Test"
 APP_ENV=local
 APP_KEY=base64:lwX95GbNWX3XsucdMe0XwtOKECta3h/B+p9NbH2jd0E=
@@ -62,8 +64,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
diff --git a/.gitattributes b/.gitattributes
index 967315dd3..25c1b1b65 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,3 +3,10 @@
 *.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
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
deleted file mode 100644
index 34f31cf08..000000000
--- a/.github/workflows/build-docker.yml
+++ /dev/null
@@ -1,125 +0,0 @@
----
-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
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
new file mode 100644
index 000000000..8fdea53a1
--- /dev/null
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,230 @@
+---
+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 }}
diff --git a/.gitignore b/.gitignore
index 0494cee10..8a37ec621 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,31 @@
+.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
-/.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
+/yarn-error.log
+/public/build
+
+# Exceptions - these *MUST* be last
+!/bootstrap/cache/.gitignore
+!/public/vendor/horizon/.gitignore
diff --git a/.hadolint.yaml b/.hadolint.yaml
new file mode 100644
index 000000000..27fa2ff27
--- /dev/null
+++ b/.hadolint.yaml
@@ -0,0 +1,6 @@
+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>`
+  - DL3029 # warning: Do not use --platform flag with FROM
+  - SC2046 # warning: Quote this to prevent word splitting.
+  - SC2086 # info: Double quote to prevent globbing and word splitting.
diff --git a/.markdownlint.json b/.markdownlint.json
new file mode 100644
index 000000000..cf98a0902
--- /dev/null
+++ b/.markdownlint.json
@@ -0,0 +1,4 @@
+{
+    "MD013": false,
+    "MD014": false
+}
diff --git a/.shellcheckrc b/.shellcheckrc
new file mode 100644
index 000000000..be92f81fc
--- /dev/null
+++ b/.shellcheckrc
@@ -0,0 +1,12 @@
+# 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
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 000000000..128e0a295
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,14 @@
+{
+    "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"
+    ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..6446fb6f5
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,21 @@
+{
+    "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"
+    }
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc2b6cb11..96d9bb00a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,17 +1,261 @@
 # Release Notes
 
-## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.11.9...dev)
+## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.12.3...dev)
+
+### OAuth
+- Fix oauth oob (urn:ietf:wg:oauth:2.0:oob) support. ([8afbdb03](https://github.com/pixelfed/pixelfed/commit/8afbdb03))
+
+### Updates
+- Update AP helpers, reject statuses with invalid dates ([960f3849](https://github.com/pixelfed/pixelfed/commit/960f3849))
+- Update DirectMessage API, fix broken threading ([044d410c](https://github.com/pixelfed/pixelfed/commit/044d410c))
+- Update Status caption render logic ([fb8dbb95](https://github.com/pixelfed/pixelfed/commit/fb8dbb95))
+- Update ApiV1Controller, fix bookmark bug. Closes #5216 ([9f7cc52c](https://github.com/pixelfed/pixelfed/commit/9f7cc52c))
+- Update Status caption logic, stop storing duplicate html caption in db and defer to cached StatusService rendering ([9eeb7b67](https://github.com/pixelfed/pixelfed/commit/9eeb7b67))
+- Update AutolinkService, optimize lookups ([eac2c196](https://github.com/pixelfed/pixelfed/commit/eac2c196))
+- Update DirectMessageController, remove 72h limit for admins ([639df410](https://github.com/pixelfed/pixelfed/commit/639df410))
+- Update StatusService, fix newlines ([56c07b7a](https://github.com/pixelfed/pixelfed/commit/56c07b7a))
+- Update confirm email template, add plaintext link. Fixes #5375 ([45986707](https://github.com/pixelfed/pixelfed/commit/45986707))
+- Update UserVerifyEmail command ([77da9ad8](https://github.com/pixelfed/pixelfed/commit/77da9ad8))
+- Update StatusStatelessTransformer, refactor the caption field to be compliant with the MastoAPI. Fixes #5364 ([79039ba5](https://github.com/pixelfed/pixelfed/commit/79039ba5))
+- Update mailgun config, add endpoint and scheme ([271d5114](https://github.com/pixelfed/pixelfed/commit/271d5114))
+- Update search and status logic to fix postgres bugs ([8c39ef4](https://github.com/pixelfed/pixelfed/commit/8c39ef4))
+-  ([](https://github.com/pixelfed/pixelfed/commit/))
+
+## [v0.12.4 (2024-11-08)](https://github.com/pixelfed/pixelfed/compare/v0.12.4...dev)
+
+### Added
+- Implement Admin Domain Blocks API (Mastodon API Compatible) [ThisIsMissEm](https://github.com/ThisIsMissEm) ([#5021](https://github.com/pixelfed/pixelfed/pull/5021))
+- Authorize Interaction support (for handling remote interactions) ([4ca7c6c3](https://github.com/pixelfed/pixelfed/commit/4ca7c6c3))
+- Contact Form Admin Responses ([52cc6090](https://github.com/pixelfed/pixelfed/commit/52cc6090))
+- Profile Carousels ([8af77a3f](https://github.com/pixelfed/pixelfed/commit/8af77a3f))
+- Moderated Profiles ([39f16321](https://github.com/pixelfed/pixelfed/commit/39f16321))
+
+### Federation
+- Add ActiveSharedInboxService, for efficient sharedInbox caching ([1a6a3397](https://github.com/pixelfed/pixelfed/commit/1a6a3397))
+- Add MovePipeline queue jobs ([9904d05f](https://github.com/pixelfed/pixelfed/commit/9904d05f))
+- Add ActivityPub Move validator ([909a6c72](https://github.com/pixelfed/pixelfed/commit/909a6c72))
+- Add delay to move handler to allow for remote cache invalidation ([8a362c12](https://github.com/pixelfed/pixelfed/commit/8a362c12))
+
+### Updates
+- Update ApiV1Controller, add support for notification filter types ([f61159a1](https://github.com/pixelfed/pixelfed/commit/f61159a1))
+- Update ApiV1Dot1Controller, fix mutual api ([a8bb97b2](https://github.com/pixelfed/pixelfed/commit/a8bb97b2))
+- Update ApiV1Controller, fix /api/v1/favourits pagination ([72f68160](https://github.com/pixelfed/pixelfed/commit/72f68160))
+- Update RegisterController, update username constraints, require atleast one alpha char ([dd6e3cc2](https://github.com/pixelfed/pixelfed/commit/dd6e3cc2))
+- Update AdminUser, fix entity casting ([cb5620d4](https://github.com/pixelfed/pixelfed/commit/cb5620d4))
+- Update instance config, update network cache feed max_hours_old falloff to 90 days instead of 6 hours to allow for less active instances to have more results ([c042d135](https://github.com/pixelfed/pixelfed/commit/c042d135))
+- Update ApiV1Dot1Controller, add new single media status create endpoint ([b03f5cec](https://github.com/pixelfed/pixelfed/commit/b03f5cec))
+- Update AdminSettings component, add link to Custom CSS settings ([958daac4](https://github.com/pixelfed/pixelfed/commit/958daac4))
+- Update ApiV1Controller, fix v1/instance stats, force cast to int ([dcd95d68](https://github.com/pixelfed/pixelfed/commit/dcd95d68))
+- Update BeagleService, disable discovery if AP is disabled ([6cd1cbb4](https://github.com/pixelfed/pixelfed/commit/6cd1cbb4))
+- Update NodeinfoService, fix typo ([edad436d](https://github.com/pixelfed/pixelfed/commit/edad436d))
+- Update ActivityPubFetchService, reduce cache ttl from 1 hour to 7.5 mins and add uncached fetchRequest method ([21da2b64](https://github.com/pixelfed/pixelfed/commit/21da2b64))
+- Update UserAccountDelete command, increase sharedInbox ttl from 12h to 14d ([be02f48a](https://github.com/pixelfed/pixelfed/commit/be02f48a))
+- Update HttpSignature, add signRaw method and improve error checking ([d4cf9181](https://github.com/pixelfed/pixelfed/commit/d4cf9181))
+- Update AP helpers, add forceBanCheck param to validateUrl method ([42424028](https://github.com/pixelfed/pixelfed/commit/42424028))
+- Update layout, add og:logo ([4cc576e1](https://github.com/pixelfed/pixelfed/commit/4cc576e1))
+- Update ReblogService, fix cache sync issues ([3de8ceca](https://github.com/pixelfed/pixelfed/commit/3de8ceca))
+- Update config, allow Beagle discover service to be disabled ([de4ce3c8](https://github.com/pixelfed/pixelfed/commit/de4ce3c8))
+- Update ApiV1Dot1Controller, allow upto 5 similar push tokens ([7820b506](https://github.com/pixelfed/pixelfed/commit/7820b506))
+- Update AdminReports, add missing click handler. Fixes #5332 ([fe48b8ad](https://github.com/pixelfed/pixelfed/commit/fe48b8ad))
+- Improve media filtering by using OffscreenCanvas, if supported ([aea5392](https://github.com/pixelfed/pixelfed/commit/aea5392))
+
+## [v0.12.3 (2024-07-01)](https://github.com/pixelfed/pixelfed/compare/v0.12.2...v0.12.3)
+
+### Updates
+- Fix migrations bug ([4d1180b1](https://github.com/pixelfed/pixelfed/commit/4d1180b1))
+
+## [v0.12.2 (2024-07-01)](https://github.com/pixelfed/pixelfed/compare/v0.12.1...v0.12.2)
+
+### Framework
+- Updated to Laravel 11 (requires php 8.2+)
+
+### Added
+- New api/v1/instance/peers API endpoint, disabled by default ([4aad1c22](https://github.com/pixelfed/pixelfed/commit/4aad1c22))
+- Added disable_embeds setting, and fix cache invalidation in other settings ([c5e7e917](https://github.com/pixelfed/pixelfed/commit/c5e7e917))
+
+### Updates
+- Update DirectMessageController, add 72 hour delay for new accounts before they can send a DM ([61d105fd](https://github.com/pixelfed/pixelfed/commit/61d105fd))
+- Update AdminCuratedRegisterController, increase message length from 1000 to 3000 ([9a5e3471](https://github.com/pixelfed/pixelfed/commit/9a5e3471))
+- Update ApiV1Controller, add pe (pixelfed entity) support to /api/v1/statuses/{id}/context endpoint ([d645d6ca](https://github.com/pixelfed/pixelfed/commit/d645d6ca))
+- Update Admin Curated Onboarding, add select-all/mass action operations ([b22cac94](https://github.com/pixelfed/pixelfed/commit/b22cac94))
+- Update AdminCuratedRegisterController, fix existing account approval ([cbb96cfd](https://github.com/pixelfed/pixelfed/commit/cbb96cfd))
+- Update ActivityPubFetchService, fix Friendica bug ([e4edc6f1](https://github.com/pixelfed/pixelfed/commit/e4edc6f1))
+- Update ProfileController, fix atom feed cache ttl. Fixes #5093 ([921e2965](https://github.com/pixelfed/pixelfed/commit/921e2965))
+- Update CollectionsController, add new self route ([bc2495c6](https://github.com/pixelfed/pixelfed/commit/bc2495c6))
+- Update FederationController, add webfinger support for actor uri. Fixes #5068 ([24194f7d](https://github.com/pixelfed/pixelfed/commit/24194f7d))
+- Update FetchNodeinfoPipeline, set last_fetched_at timestamp ([a7fce91e](https://github.com/pixelfed/pixelfed/commit/a7fce91e))
+- Update task scheduler, add weekly instance scan to check nodeinfo for known instances ([dc6b9f46](https://github.com/pixelfed/pixelfed/commit/dc6b9f46))
+- Update AP fetch service and domain service ([42915ff9](https://github.com/pixelfed/pixelfed/commit/42915ff9))
+- Update ApiV1Controller, add settings to verify_credentials endpoint ([3f4e0b94](https://github.com/pixelfed/pixelfed/commit/3f4e0b94))
+- Update ApiV1Controller, fix update_credentials boolean handling ([19c62aaa](https://github.com/pixelfed/pixelfed/commit/19c62aaa))
+- Update ApiV1Controller, fix cache invalidation bug in update_credentials ([d56a4108](https://github.com/pixelfed/pixelfed/commit/d56a4108))
+- Update ApiV1Controller, fix self relationship response ([28bc7aa4](https://github.com/pixelfed/pixelfed/commit/28bc7aa4))
+- Update ApiController, add pe support to like/unlike endpoints ([679ef677](https://github.com/pixelfed/pixelfed/commit/679ef677))
+- Update ApiV1Dot1Controller, fix username to id endpoint ([4d6cea9a](https://github.com/pixelfed/pixelfed/commit/4d6cea9a))
+- Update StatusController, cache AP object ([a75b89b2](https://github.com/pixelfed/pixelfed/commit/a75b89b2))
+- Update status embed, add support for album carousels ([f4898db9](https://github.com/pixelfed/pixelfed/commit/f4898db9))
+- Update profile embeds, add support for albums ([4fd156c4](https://github.com/pixelfed/pixelfed/commit/4fd156c4))
+- Update DirectMessageController, add timestamps to threads ([b24d2554](https://github.com/pixelfed/pixelfed/commit/b24d2554))
+- Update DirectMessageController, add carousel entity to threads ([96f24f33](https://github.com/pixelfed/pixelfed/commit/96f24f33))
+- Update and refactor total local post count logic, cache value and schedule updates twice daily to eliminate the perf issue on larger instances ([4f2b8ed2](https://github.com/pixelfed/pixelfed/commit/4f2b8ed2))
+- Update Media model, fix broken thumbnail/gray thumbnail bug ([e33643c2](https://github.com/pixelfed/pixelfed/commit/e33643c2))
+- Update StatusController, fix unlisted post guest/ap access bug ([83098428](https://github.com/pixelfed/pixelfed/commit/83098428))
+- Update discover, add network trending using Beagle API ([2cae8b48](https://github.com/pixelfed/pixelfed/commit/2cae8b48))
+
+## [v0.12.1 (2024-05-07)](https://github.com/pixelfed/pixelfed/compare/v0.12.0...v0.12.1)
+
+### Updates
+- Update ApiV1Dot1Controller, fix in app registration bug that prevents proper auth flow due to missing oauth scopes ([cbf996c9](https://github.com/pixelfed/pixelfed/commit/cbf996c9))
+- Update ConfigCacheService, fix database race condition and fallback to file config and enable by default ([60a62b59](https://github.com/pixelfed/pixelfed/commit/60a62b59))
+
+## [v0.12.0 (2024-04-29)](https://github.com/pixelfed/pixelfed/compare/v0.11.13...v0.12.0)
+
+### 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))
+- Update CustomEmojiService, only return local emoji ([7f8bba44](https://github.com/pixelfed/pixelfed/commit/7f8bba44))
+- Update Like model, increase max likes per day from 500 to 1500 ([4223119f](https://github.com/pixelfed/pixelfed/commit/4223119f))
+
+## [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))
--  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ### Updates
 - Update FollowerService, add forget method to RelationshipService call to reduce load when mass purging ([347e4f59](https://github.com/pixelfed/pixelfed/commit/347e4f59))
@@ -40,7 +284,62 @@
 - 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))
--  ([](https://github.com/pixelfed/pixelfed/commit/))
+- 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)
 
diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 000000000..69a06cf87
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,18 @@
+# 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
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..3f27c84a2
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,364 @@
+# 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"]
+
+# Set www-data to be RUNTIME_UID/RUNTIME_GID
+RUN groupmod --gid ${RUNTIME_GID} www-data \
+    && usermod --uid ${RUNTIME_UID} --gid ${RUNTIME_GID} www-data
+
+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
+
+#######################################################
+# Node: Build frontend
+#######################################################
+
+# NOTE: Since the nodejs build is CPU architecture agnostic,
+# we only want to build once and cache it for other architectures.
+# We force the (CPU) [--platform] here to be architecture
+# of the "builder"/"server" and not the *target* CPU architecture
+# (e.g.) building the ARM version of Pixelfed on AMD64.
+FROM --platform=${BUILDARCH} node:lts AS frontend-build
+
+ARG BUILDARCH
+ARG BUILD_FRONTEND=0
+ARG RUNTIME_UID
+ARG RUNTIME_GID
+
+ARG NODE_ENV=production
+ENV NODE_ENV=$NODE_ENV
+
+WORKDIR /var/www/
+
+SHELL [ "/usr/bin/bash", "-c" ]
+
+# Install NPM dependencies
+RUN --mount=type=cache,id=pixelfed-node-${BUILDARCH},sharing=locked,target=/tmp/cache \
+    --mount=type=bind,source=package.json,target=/var/www/package.json \
+    --mount=type=bind,source=package-lock.json,target=/var/www/package-lock.json \
+<<EOF
+    if [[ $BUILD_FRONTEND -eq 1 ]];
+    then
+        npm install --cache /tmp/cache --no-save --dev
+    else
+        echo "Skipping [npm install] as --build-arg [BUILD_FRONTEND] is not set to '1'"
+    fi
+EOF
+
+# Copy the frontend source into the image before building
+COPY --chown=${RUNTIME_UID}:${RUNTIME_GID} . /var/www
+
+# Build the frontend with "mix" (See package.json)
+RUN \
+<<EOF
+    if [[ $BUILD_FRONTEND -eq 1 ]];
+    then
+        npm run production
+    else
+        echo "Skipping [npm run production] as --build-arg [BUILD_FRONTEND] is not set to '1'"
+    fi
+EOF
+
+#######################################################
+# 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,uid=${RUNTIME_UID},gid=${RUNTIME_GID},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 --no-scripts
+
+# Copy all other files over
+COPY --chown=${RUNTIME_UID}:${RUNTIME_GID} . /var/www/
+
+# Generate optimized autoloader now that we have all files around
+RUN set -ex \
+    && ENABLE_CONFIG_CACHE=false composer dump-autoload --optimize
+
+# Now we can run the post-install scripts
+RUN set -ex \
+    && composer run-script post-update-cmd
+
+#######################################################
+# 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
+COPY --link --from=frontend-build --chown=${RUNTIME_UID}:${RUNTIME_GID} /var/www/public /var/www/public
+
+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"]
diff --git a/README.md b/README.md
index 7c0117a52..e2a90535e 100644
--- a/README.md
+++ b/README.md
@@ -43,3 +43,10 @@ We would like to extend our thanks to the following sponsors for funding Pixelfe
 - [NLnet Foundation](https://nlnet.nl) and [NGI0
 Discovery](https://nlnet.nl/discovery/), part of the [Next Generation
 Internet](https://ngi.eu) initiative.
+
+<p>This project is supported by:</p>
+<p>
+  <a href="https://www.digitalocean.com/?utm_medium=opensource&utm_source=pixelfed">
+    <img src="https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/SVG/DO_Logo_horizontal_blue.svg" width="201px">
+  </a>
+</p>
diff --git a/app/Auth/BearerTokenResponse.php b/app/Auth/BearerTokenResponse.php
index 79cd97c85..0e1aa8a19 100644
--- a/app/Auth/BearerTokenResponse.php
+++ b/app/Auth/BearerTokenResponse.php
@@ -18,8 +18,7 @@ class BearerTokenResponse extends \League\OAuth2\Server\ResponseTypes\BearerToke
     protected function getExtraParams(AccessTokenEntityInterface $accessToken)
     {
         return [
-        	'created_at' => time(),
-        	'scope' => 'read write follow push'
+            'created_at' => time(),
         ];
     }
 }
diff --git a/app/Console/Commands/AccountPostCountStatUpdate.php b/app/Console/Commands/AccountPostCountStatUpdate.php
new file mode 100644
index 000000000..6d5ba00a6
--- /dev/null
+++ b/app/Console/Commands/AccountPostCountStatUpdate.php
@@ -0,0 +1,57 @@
+<?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;
+    }
+}
diff --git a/app/Console/Commands/AddUserDomainBlock.php b/app/Console/Commands/AddUserDomainBlock.php
new file mode 100644
index 000000000..6d5c192bf
--- /dev/null
+++ b/app/Console/Commands/AddUserDomainBlock.php
@@ -0,0 +1,106 @@
+<?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
+        ]);
+    }
+}
diff --git a/app/Console/Commands/AvatarStorage.php b/app/Console/Commands/AvatarStorage.php
index 054802f42..a6bb70e3d 100644
--- a/app/Console/Commands/AvatarStorage.php
+++ b/app/Console/Commands/AvatarStorage.php
@@ -82,7 +82,7 @@ class AvatarStorage extends Command
 
         $this->line(' ');
 
-        if(config_cache('pixelfed.cloud_storage')) {
+        if((bool) config_cache('pixelfed.cloud_storage')) {
             $this->info('✅ - Cloud storage configured');
             $this->line(' ');
         }
@@ -92,7 +92,7 @@ class AvatarStorage extends Command
             $this->line(' ');
         }
 
-        if(config_cache('pixelfed.cloud_storage') && config('instance.avatar.local_to_cloud')) {
+        if((bool) 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 = config_cache('pixelfed.cloud_storage') && config('instance.avatar.local_to_cloud') ?
+        $options = (bool) 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(!config_cache('pixelfed.cloud_storage') || !config('instance.avatar.local_to_cloud')) {
+        if(!(bool) 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(config_cache('pixelfed.cloud_storage') == false && config_cache('federation.avatars.store_local') == false) {
+        if((bool) 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;
         }
diff --git a/app/Console/Commands/AvatarStorageDeepClean.php b/app/Console/Commands/AvatarStorageDeepClean.php
index 5840142f5..6f773bd42 100644
--- a/app/Console/Commands/AvatarStorageDeepClean.php
+++ b/app/Console/Commands/AvatarStorageDeepClean.php
@@ -44,7 +44,7 @@ class AvatarStorageDeepClean extends Command
         $this->line(' ');
 
         $storage = [
-            'cloud' => boolval(config_cache('pixelfed.cloud_storage')),
+            'cloud' => (bool) config_cache('pixelfed.cloud_storage'),
             'local' => boolval(config_cache('federation.avatars.store_local'))
         ];
 
diff --git a/app/Console/Commands/CaptchaToggleCommand.php b/app/Console/Commands/CaptchaToggleCommand.php
new file mode 100644
index 000000000..e4f43f528
--- /dev/null
+++ b/app/Console/Commands/CaptchaToggleCommand.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use function Laravel\Prompts\info;
+use function Laravel\Prompts\confirm;
+use App\Services\ConfigCacheService;
+
+class CaptchaToggleCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'app:captcha-toggle-command';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Command description';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        $captchaEnabled = (bool) config_cache('captcha.enabled');
+
+        info($captchaEnabled ? 'Captcha is enabled' : 'Captcha is not enabled');
+
+        if(!$captchaEnabled) {
+            info('Enable the Captcha from the admin settings dashboard.');
+            return;
+        }
+
+        $confirmed = confirm(
+            label: 'Do you want to disable the captcha?',
+            default: false,
+            yes: 'Yes',
+            no: 'No',
+            hint: 'Select an option to proceed.'
+        );
+
+        if($confirmed) {
+            ConfigCacheService::put('captcha.enabled', false);
+        }
+    }
+}
diff --git a/app/Console/Commands/CloudMediaMigrate.php b/app/Console/Commands/CloudMediaMigrate.php
index 0f2d177b8..174b33e83 100644
--- a/app/Console/Commands/CloudMediaMigrate.php
+++ b/app/Console/Commands/CloudMediaMigrate.php
@@ -35,12 +35,16 @@ class CloudMediaMigrate extends Command
      */
     public function handle()
     {
-        $enabled = config('pixelfed.cloud_storage');
+        $enabled = (bool) config_cache('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');
 
diff --git a/app/Console/Commands/DeleteRemoteProfile.php b/app/Console/Commands/DeleteRemoteProfile.php
new file mode 100644
index 000000000..e5fb741a1
--- /dev/null
+++ b/app/Console/Commands/DeleteRemoteProfile.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Jobs\DeletePipeline\DeleteRemoteProfilePipeline;
+use App\Profile;
+use Illuminate\Console\Command;
+
+use function Laravel\Prompts\confirm;
+use function Laravel\Prompts\search;
+
+class DeleteRemoteProfile extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'app:delete-remote-profile';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Delete remote profile';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        $id = search(
+            'Search for the account',
+            fn (string $value) => strlen($value) > 2
+                ? Profile::whereNotNull('domain')->where('username', 'like', $value.'%')->pluck('username', 'id')->all()
+                : []
+        );
+        $profile = Profile::whereNotNull('domain')->find($id);
+
+        if (! $profile) {
+            $this->error('Could not find profile.');
+            exit;
+        }
+
+        $confirmed = confirm('Are you sure you want to delete '.$profile->username.'\'s account? This action cannot be reversed.');
+        DeleteRemoteProfilePipeline::dispatch($profile)->onQueue('adelete');
+        $this->info('Dispatched delete job, it may take a few minutes...');
+        exit;
+    }
+}
diff --git a/app/Console/Commands/DeleteUserDomainBlock.php b/app/Console/Commands/DeleteUserDomainBlock.php
new file mode 100644
index 000000000..405b6fe76
--- /dev/null
+++ b/app/Console/Commands/DeleteUserDomainBlock.php
@@ -0,0 +1,96 @@
+<?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();
+    }
+}
diff --git a/app/Console/Commands/FetchMissingMediaMimeType.php b/app/Console/Commands/FetchMissingMediaMimeType.php
index 16aeb5f59..27ae23e4c 100644
--- a/app/Console/Commands/FetchMissingMediaMimeType.php
+++ b/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('pixelfed.media_types')))) {
+            if (! in_array($res->header('content-type'), explode(',', config_cache('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)');
         }
     }
 }
diff --git a/app/Console/Commands/FixMediaDriver.php b/app/Console/Commands/FixMediaDriver.php
index c743d6c64..a20b0574e 100644
--- a/app/Console/Commands/FixMediaDriver.php
+++ b/app/Console/Commands/FixMediaDriver.php
@@ -37,7 +37,7 @@ class FixMediaDriver extends Command
 			return Command::SUCCESS;
 		}
 
-		if(config_cache('pixelfed.cloud_storage') == false) {
+		if((bool) config_cache('pixelfed.cloud_storage') == false) {
 			$this->error('Cloud storage not enabled, exiting...');
 			return Command::SUCCESS;
 		}
diff --git a/app/Console/Commands/HashtagCachedCountUpdate.php b/app/Console/Commands/HashtagCachedCountUpdate.php
new file mode 100644
index 000000000..49f354e2b
--- /dev/null
+++ b/app/Console/Commands/HashtagCachedCountUpdate.php
@@ -0,0 +1,57 @@
+<?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;
+    }
+}
diff --git a/app/Console/Commands/HashtagRelatedGenerate.php b/app/Console/Commands/HashtagRelatedGenerate.php
new file mode 100644
index 000000000..26fdb8b52
--- /dev/null
+++ b/app/Console/Commands/HashtagRelatedGenerate.php
@@ -0,0 +1,94 @@
+<?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!');
+    }
+}
diff --git a/app/Console/Commands/ImportEmojis.php b/app/Console/Commands/ImportEmojis.php
new file mode 100644
index 000000000..77a0c29a4
--- /dev/null
+++ b/app/Console/Commands/ImportEmojis.php
@@ -0,0 +1,118 @@
+<?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);
+    }
+}
diff --git a/app/Console/Commands/ImportUploadMediaToCloudStorage.php b/app/Console/Commands/ImportUploadMediaToCloudStorage.php
new file mode 100644
index 000000000..bf23794c9
--- /dev/null
+++ b/app/Console/Commands/ImportUploadMediaToCloudStorage.php
@@ -0,0 +1,54 @@
+<?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();
+    }
+}
diff --git a/app/Console/Commands/InstanceManager.php b/app/Console/Commands/InstanceManager.php
new file mode 100644
index 000000000..a495d9617
--- /dev/null
+++ b/app/Console/Commands/InstanceManager.php
@@ -0,0 +1,298 @@
+<?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
+        );
+    }
+}
diff --git a/app/Console/Commands/InstanceUpdateTotalLocalPosts.php b/app/Console/Commands/InstanceUpdateTotalLocalPosts.php
new file mode 100644
index 000000000..d44236a51
--- /dev/null
+++ b/app/Console/Commands/InstanceUpdateTotalLocalPosts.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Services\ConfigCacheService;
+use Cache;
+use DB;
+use Illuminate\Console\Command;
+use Storage;
+
+class InstanceUpdateTotalLocalPosts extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'app:instance-update-total-local-posts';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Update the total number of local statuses/post count';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        $cached = $this->checkForCache();
+        if (! $cached) {
+            $this->initCache();
+
+            return;
+        }
+        $cache = $this->getCached();
+        if (! $cache || ! isset($cache['count'])) {
+            $this->error('Problem fetching cache');
+
+            return;
+        }
+        $this->updateAndCache();
+        Cache::forget('api:nodeinfo');
+
+    }
+
+    protected function checkForCache()
+    {
+        return Storage::exists('total_local_posts.json');
+    }
+
+    protected function initCache()
+    {
+        $count = DB::table('statuses')->whereNull(['url', 'deleted_at'])->count();
+        $res = [
+            'count' => $count,
+        ];
+        Storage::put('total_local_posts.json', json_encode($res, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
+        ConfigCacheService::put('instance.stats.total_local_posts', $res['count']);
+    }
+
+    protected function getCached()
+    {
+        return Storage::json('total_local_posts.json');
+    }
+
+    protected function updateAndCache()
+    {
+        $count = DB::table('statuses')->whereNull(['url', 'deleted_at'])->count();
+        $res = [
+            'count' => $count,
+        ];
+        Storage::put('total_local_posts.json', json_encode($res, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
+        ConfigCacheService::put('instance.stats.total_local_posts', $res['count']);
+
+    }
+}
diff --git a/app/Console/Commands/MediaCloudUrlRewrite.php b/app/Console/Commands/MediaCloudUrlRewrite.php
new file mode 100644
index 000000000..367c22d1f
--- /dev/null
+++ b/app/Console/Commands/MediaCloudUrlRewrite.php
@@ -0,0 +1,140 @@
+<?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');
+    }
+}
diff --git a/app/Console/Commands/MediaS3GarbageCollector.php b/app/Console/Commands/MediaS3GarbageCollector.php
index b6cda43c3..e66fdd2a8 100644
--- a/app/Console/Commands/MediaS3GarbageCollector.php
+++ b/app/Console/Commands/MediaS3GarbageCollector.php
@@ -45,7 +45,7 @@ class MediaS3GarbageCollector extends Command
     */
     public function handle()
     {
-        $enabled = in_array(config_cache('pixelfed.cloud_storage'), ['1', true, 'true']);
+        $enabled = (bool) config_cache('pixelfed.cloud_storage');
         if(!$enabled) {
             $this->error('Cloud storage not enabled. Exiting...');
             return;
diff --git a/app/Console/Commands/NotificationEpochUpdate.php b/app/Console/Commands/NotificationEpochUpdate.php
new file mode 100644
index 000000000..e606b47ad
--- /dev/null
+++ b/app/Console/Commands/NotificationEpochUpdate.php
@@ -0,0 +1,31 @@
+<?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();
+    }
+}
diff --git a/app/Console/Commands/PushGatewayRefresh.php b/app/Console/Commands/PushGatewayRefresh.php
new file mode 100644
index 000000000..3b839b6af
--- /dev/null
+++ b/app/Console/Commands/PushGatewayRefresh.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Services\NotificationAppGatewayService;
+use App\Services\PushNotificationService;
+use Illuminate\Console\Command;
+
+use function Laravel\Prompts\select;
+
+class PushGatewayRefresh extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'app:push-gateway-refresh';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Refresh push notification gateway support';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        $this->info('Checking Push Notification support...');
+        $this->line(' ');
+
+        $currentState = NotificationAppGatewayService::enabled();
+
+        if ($currentState) {
+            $this->info('Push Notification support is active!');
+
+            return;
+        } else {
+            $this->error('Push notification support is NOT active');
+
+            $action = select(
+                label: 'Do you want to force re-check?',
+                options: ['Yes', 'No'],
+                required: true
+            );
+
+            if ($action === 'Yes') {
+                $recheck = NotificationAppGatewayService::forceSupportRecheck();
+                if ($recheck) {
+                    $this->info('Success! Push Notifications are now active!');
+                    PushNotificationService::warmList('like');
+
+                    return;
+                } else {
+                    $this->error('Error, please ensure you have a valid API key.');
+                    $this->line(' ');
+                    $this->line('For more info, visit https://docs.pixelfed.org/running-pixelfed/push-notifications.html');
+                    $this->line(' ');
+
+                    return;
+                }
+
+                return;
+            } else {
+                exit;
+            }
+
+            return;
+        }
+    }
+}
diff --git a/app/Console/Commands/SoftwareUpdateRefresh.php b/app/Console/Commands/SoftwareUpdateRefresh.php
new file mode 100644
index 000000000..c486d58ce
--- /dev/null
+++ b/app/Console/Commands/SoftwareUpdateRefresh.php
@@ -0,0 +1,37 @@
+<?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!');
+    }
+}
diff --git a/app/Console/Commands/TransformImports.php b/app/Console/Commands/TransformImports.php
index b88401178..6b6efa6e3 100644
--- a/app/Console/Commands/TransformImports.php
+++ b/app/Console/Commands/TransformImports.php
@@ -2,17 +2,16 @@
 
 namespace App\Console\Commands;
 
-use Illuminate\Console\Command;
-use App\Models\ImportPost;
-use App\Services\ImportService;
 use App\Media;
+use App\Models\ImportPost;
 use App\Profile;
-use App\Status;
-use Storage;
 use App\Services\AccountService;
+use App\Services\ImportService;
 use App\Services\MediaPathService;
+use App\Status;
+use Illuminate\Console\Command;
 use Illuminate\Support\Str;
-use App\Util\Lexer\Autolink;
+use Storage;
 
 class TransformImports extends Command
 {
@@ -35,23 +34,24 @@ class TransformImports extends Command
      */
     public function handle()
     {
-        if(!config('import.instagram.enabled')) {
+        if (! config('import.instagram.enabled')) {
             return;
         }
 
         $ips = ImportPost::whereNull('status_id')->where('skip_missing_media', '!=', true)->take(500)->get();
 
-        if(!$ips->count()) {
+        if (! $ips->count()) {
             return;
         }
 
-        foreach($ips as $ip) {
+        foreach ($ips as $ip) {
             $id = $ip->user_id;
             $pid = $ip->profile_id;
             $profile = Profile::find($pid);
-            if(!$profile) {
+            if (! $profile) {
                 $ip->skip_missing_media = true;
                 $ip->save();
+
                 continue;
             }
 
@@ -63,34 +63,43 @@ class TransformImports extends Command
                 ->where('creation_day', $ip->creation_day)
                 ->exists();
 
-            if($exists == true) {
+            if ($exists == true) {
                 $ip->skip_missing_media = true;
                 $ip->save();
+
                 continue;
             }
 
             $idk = ImportService::getId($ip->user_id, $ip->creation_year, $ip->creation_month, $ip->creation_day);
+            if (! $idk) {
+                $ip->skip_missing_media = true;
+                $ip->save();
 
-            if(Storage::exists('imports/' . $id . '/' . $ip->filename) === false) {
+                continue;
+            }
+
+            if (Storage::exists('imports/'.$id.'/'.$ip->filename) === false) {
                 ImportService::clearAttempts($profile->id);
                 ImportService::getPostCount($profile->id, true);
                 $ip->skip_missing_media = true;
                 $ip->save();
+
                 continue;
             }
 
             $missingMedia = false;
-            foreach($ip->media as $ipm) {
+            foreach ($ip->media as $ipm) {
                 $fileName = last(explode('/', $ipm['uri']));
-                $og = 'imports/' . $id . '/' . $fileName;
-                if(!Storage::exists($og)) {
+                $og = 'imports/'.$id.'/'.$fileName;
+                if (! Storage::exists($og)) {
                     $missingMedia = true;
                 }
             }
 
-            if($missingMedia === true) {
+            if ($missingMedia === true) {
                 $ip->skip_missing_media = true;
                 $ip->save();
+
                 continue;
             }
 
@@ -98,7 +107,6 @@ class TransformImports extends Command
             $status = new Status;
             $status->profile_id = $pid;
             $status->caption = $caption;
-            $status->rendered = strlen(trim($caption)) ? Autolink::create()->autolink($ip->caption) : null;
             $status->type = $ip->post_type;
 
             $status->scope = 'unlisted';
@@ -107,20 +115,21 @@ class TransformImports extends Command
             $status->created_at = now()->parse($ip->creation_date);
             $status->save();
 
-            foreach($ip->media as $ipm) {
+            foreach ($ip->media as $ipm) {
                 $fileName = last(explode('/', $ipm['uri']));
                 $ext = last(explode('.', $fileName));
                 $basePath = MediaPathService::get($profile);
-                $og = 'imports/' . $id . '/' . $fileName;
-                if(!Storage::exists($og)) {
+                $og = 'imports/'.$id.'/'.$fileName;
+                if (! Storage::exists($og)) {
                     $ip->skip_missing_media = true;
                     $ip->save();
+
                     continue;
                 }
                 $size = Storage::size($og);
                 $mime = Storage::mimeType($og);
-                $newFile = Str::random(40) . '.' . $ext;
-                $np = $basePath . '/' . $newFile;
+                $newFile = Str::random(40).'.'.$ext;
+                $np = $basePath.'/'.$newFile;
                 Storage::move($og, $np);
                 $media = new Media;
                 $media->profile_id = $pid;
diff --git a/app/Console/Commands/UserAccountDelete.php b/app/Console/Commands/UserAccountDelete.php
new file mode 100644
index 000000000..5032676c4
--- /dev/null
+++ b/app/Console/Commands/UserAccountDelete.php
@@ -0,0 +1,123 @@
+<?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()->subDays(14))
+            ->distinct()
+            ->pluck('shared_inbox');
+
+        $payload = json_encode($activity);
+
+        $client = new Client([
+            'timeout' => 5,
+        ]);
+
+        $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();
+    }
+}
diff --git a/app/Console/Commands/UserVerifyEmail.php b/app/Console/Commands/UserVerifyEmail.php
index 3b3cac5ef..b0461ca79 100644
--- a/app/Console/Commands/UserVerifyEmail.php
+++ b/app/Console/Commands/UserVerifyEmail.php
@@ -5,8 +5,9 @@ namespace App\Console\Commands;
 use Illuminate\Console\Command;
 use Illuminate\Support\Str;
 use App\User;
+use Illuminate\Contracts\Console\PromptsForMissingInput;
 
-class UserVerifyEmail extends Command
+class UserVerifyEmail extends Command implements PromptsForMissingInput
 {
     /**
      * The name and signature of the console command.
@@ -39,13 +40,19 @@ class UserVerifyEmail extends Command
      */
     public function handle()
     {
-        $user = User::whereUsername($this->argument('username'))->first();
+        $username = $this->argument('username');
+        $user = User::whereUsername($username)->first();
 
         if(!$user) {
             $this->error('Username not found');
             return;
         }
 
+        if($user->email_verified_at) {
+            $this->error('Email already verified ' . $user->email_verified_at->diffForHumans());
+            return;
+        }
+
         $user->email_verified_at = now();
         $user->save();
         $this->info('Successfully verified email address for ' . $user->username);
diff --git a/app/Console/Commands/WeeklyInstanceScan.php b/app/Console/Commands/WeeklyInstanceScan.php
new file mode 100644
index 000000000..a2560c254
--- /dev/null
+++ b/app/Console/Commands/WeeklyInstanceScan.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Instance;
+use App\Jobs\InstancePipeline\FetchNodeinfoPipeline;
+use Illuminate\Console\Command;
+
+use function Laravel\Prompts\progress;
+
+class WeeklyInstanceScan extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'app:weekly-instance-scan';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Scan instance nodeinfo';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        if ((bool) config_cache('federation.activitypub.enabled') == false) {
+            return;
+        }
+
+        $users = progress(
+            label: 'Updating instance stats...',
+            steps: Instance::all(),
+            callback: fn ($instance) => $this->updateInstanceStats($instance),
+        );
+    }
+
+    protected function updateInstanceStats($instance)
+    {
+        FetchNodeinfoPipeline::dispatch($instance)->onQueue('intbg');
+    }
+}
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 046924eb6..d5f6962f4 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -19,30 +19,39 @@ class Kernel extends ConsoleKernel
     /**
      * Define the application's command schedule.
      *
-     * @param \Illuminate\Console\Scheduling\Schedule $schedule
      *
      * @return void
      */
     protected function schedule(Schedule $schedule)
     {
-        $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);
+        $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('app:weekly-instance-scan')->weeklyOn(2, '4:20')->onOneServer();
 
-        if(in_array(config_cache('pixelfed.cloud_storage'), ['1', true, 'true']) && config('media.delete_local_after_cloud')) {
+        if ((bool) config_cache('pixelfed.cloud_storage') && (bool) config_cache('media.delete_local_after_cloud')) {
             $schedule->command('media:s3gc')->hourlyAt(15);
         }
 
-        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);
+        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();
+            }
         }
+
+        $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();
+        $schedule->command('app:instance-update-total-local-posts')->twiceDailyAt(1, 13, 45)->onOneServer();
     }
 
     /**
diff --git a/app/Contact.php b/app/Contact.php
index 4d9bc56e8..2239af7d8 100644
--- a/app/Contact.php
+++ b/app/Contact.php
@@ -3,16 +3,31 @@
 namespace App;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Str;
 
 class Contact extends Model
 {
+    protected $casts = [
+        'responded_at' => 'datetime',
+    ];
+
     public function user()
     {
-    	return $this->belongsTo(User::class);
+        return $this->belongsTo(User::class);
     }
 
     public function adminUrl()
     {
-    	return url('/i/admin/messages/show/' . $this->id);
+        return url('/i/admin/messages/show/'.$this->id);
+    }
+
+    public function userResponseUrl()
+    {
+        return url('/i/contact-admin-response/'.$this->id);
+    }
+
+    public function getMessageId()
+    {
+        return $this->id.'-'.(string) Str::uuid().'@'.strtolower(config('pixelfed.domain.app', 'example.org'));
     }
 }
diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 90810008b..7000ace07 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -157,7 +157,7 @@ class AccountController extends Controller
 
 		$pid = $request->user()->profile_id;
 		$count = UserFilterService::muteCount($pid);
-		$maxLimit = intval(config('instance.user_filters.max_user_mutes'));
+		$maxLimit = (int) config_cache('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 = intval(config('instance.user_filters.max_user_blocks'));
+		$maxLimit = (int) config_cache('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();
diff --git a/app/Http/Controllers/Admin/AdminDirectoryController.php b/app/Http/Controllers/Admin/AdminDirectoryController.php
index 1e4db7d2d..a5923894b 100644
--- a/app/Http/Controllers/Admin/AdminDirectoryController.php
+++ b/app/Http/Controllers/Admin/AdminDirectoryController.php
@@ -2,30 +2,20 @@
 
 namespace App\Http\Controllers\Admin;
 
-use DB, Cache;
-use App\{
-    DiscoverCategory,
-    DiscoverCategoryHashtag,
-    Hashtag,
-    Media,
-    Profile,
-    Status,
-    StatusHashtag,
-    User
-};
+use App\Http\Controllers\PixelfedDirectoryController;
 use App\Models\ConfigCache;
 use App\Services\AccountService;
 use App\Services\ConfigCacheService;
 use App\Services\StatusService;
-use Carbon\Carbon;
+use App\Status;
+use App\User;
+use Cache;
 use Illuminate\Http\Request;
-use Illuminate\Validation\Rule;
-use League\ISO3166\ISO3166;
-use Illuminate\Support\Str;
+use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
-use Illuminate\Support\Facades\Http;
-use App\Http\Controllers\PixelfedDirectoryController;
+use Illuminate\Support\Str;
+use League\ISO3166\ISO3166;
 
 trait AdminDirectoryController
 {
@@ -41,64 +31,67 @@ 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'));
+        $res['oauth_enabled'] = (bool) config_cache('pixelfed.oauth_enabled') &&
+            (file_exists(storage_path('oauth-public.key')) || config_cache('passport.public_key')) &&
+            (file_exists(storage_path('oauth-private.key')) || config_cache('passport.private_key'));
 
         $res['activitypub_enabled'] = (bool) config_cache('federation.activitypub.enabled');
 
         $res['feature_config'] = [
             'media_types' => Str::of(config_cache('pixelfed.media_types'))->explode(','),
             'image_quality' => config_cache('pixelfed.image_quality'),
-            'optimize_image' => config_cache('pixelfed.optimize_image'),
+            'optimize_image' => (bool) 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' => config_cache('pixelfed.enforce_account_limit'),
+            'enforce_account_limit' => (bool) 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' => config_cache('pixelfed.account_deletion'),
+            'account_deletion' => (bool) 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;
@@ -107,8 +100,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.');
                     }
                 },
@@ -119,12 +112,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['is_eligible'] = ($res['open_registration'] || $res['curated_onboarding']) &&
             $res['oauth_enabled'] &&
             $res['activitypub_enabled'] &&
             count($res['requirements_validator']) === 0 &&
@@ -145,11 +138,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)]);
             }
         }
@@ -158,25 +151,26 @@ 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;
         }
 
@@ -193,11 +187,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) : [];
@@ -207,27 +201,28 @@ 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')->store('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');
             $res['banner_image'] = $path;
             ConfigCacheService::put('app.banner_image', url(Storage::url($path)));
 
@@ -239,9 +234,10 @@ 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;
     }
 
@@ -249,9 +245,10 @@ trait AdminDirectoryController
     {
         $reqs = [];
         $reqs['feature_config'] = [
-            'open_registration' => config_cache('pixelfed.open_registration'),
+            'open_registration' => (bool) config_cache('pixelfed.open_registration'),
+            'curated_onboarding' => (bool) config_cache('instance.curated_registration.enabled'),
             'activitypub_enabled' => config_cache('federation.activitypub.enabled'),
-            'oauth_enabled' => config_cache('pixelfed.oauth_enabled'),
+            'oauth_enabled' => (bool) 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'),
@@ -265,13 +262,14 @@ trait AdminDirectoryController
         ];
 
         $validator = Validator::make($reqs['feature_config'], [
-            'open_registration' => 'required|accepted',
+            'open_registration' => 'required_unless:curated_onboarding,true',
+            'curated_onboarding' => 'required_unless:open_registration,true',
             '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.');
                     }
                 },
@@ -282,10 +280,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);
         }
 
@@ -294,6 +292,7 @@ trait AdminDirectoryController
 
         $data = (new PixelfedDirectoryController())->buildListing();
         $res = Http::withoutVerifying()->post('https://pixelfed.org/api/v1/directory/submission', $data);
+
         return 200;
     }
 
@@ -301,7 +300,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);
@@ -309,12 +308,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']);
         }
 
@@ -325,12 +324,13 @@ 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')
@@ -340,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');
@@ -377,11 +377,12 @@ 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;
     }
 
@@ -389,13 +390,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([]);
@@ -406,7 +407,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());
@@ -414,8 +415,9 @@ 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 +425,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,18 +433,19 @@ 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();
diff --git a/app/Http/Controllers/Admin/AdminGroupsController.php b/app/Http/Controllers/Admin/AdminGroupsController.php
new file mode 100644
index 000000000..45a4fd266
--- /dev/null
+++ b/app/Http/Controllers/Admin/AdminGroupsController.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Models\Group;
+use App\Models\GroupCategory;
+use App\Models\GroupInteraction;
+use App\Models\GroupMember;
+use App\Models\GroupPost;
+use App\Models\GroupReport;
+use Cache;
+use Illuminate\Http\Request;
+
+trait AdminGroupsController
+{
+    public function groupsHome(Request $request)
+    {
+        $stats = $this->groupAdminStats();
+
+        return view('admin.groups.home', compact('stats'));
+    }
+
+    protected function groupAdminStats()
+    {
+        return Cache::remember('admin:groups:stats', 3, function () {
+            $res = [
+                'total' => Group::count(),
+                'local' => Group::whereLocal(true)->count(),
+            ];
+
+            $res['remote'] = $res['total'] - $res['local'];
+            $res['categories'] = GroupCategory::count();
+            $res['posts'] = GroupPost::count();
+            $res['members'] = GroupMember::count();
+            $res['interactions'] = GroupInteraction::count();
+            $res['reports'] = GroupReport::count();
+
+            $res['local_30d'] = Cache::remember('admin:groups:stats:local_30d', 43200, function () {
+                return Group::whereLocal(true)->where('created_at', '>', now()->subMonth())->count();
+            });
+
+            $res['remote_30d'] = Cache::remember('admin:groups:stats:remote_30d', 43200, function () {
+                return Group::whereLocal(false)->where('created_at', '>', now()->subMonth())->count();
+            });
+
+            return $res;
+        });
+    }
+}
diff --git a/app/Http/Controllers/Admin/AdminReportController.php b/app/Http/Controllers/Admin/AdminReportController.php
index ac238f28c..bdd1c33a4 100644
--- a/app/Http/Controllers/Admin/AdminReportController.php
+++ b/app/Http/Controllers/Admin/AdminReportController.php
@@ -2,461 +2,471 @@
 
 namespace App\Http\Controllers\Admin;
 
+use App\AccountInterstitial;
+use App\Http\Resources\Admin\AdminModeratedProfileResource;
+use App\Http\Resources\AdminRemoteReport;
+use App\Http\Resources\AdminReport;
+use App\Http\Resources\AdminSpamReport;
+use App\Jobs\DeletePipeline\DeleteAccountPipeline;
+use App\Jobs\DeletePipeline\DeleteRemoteProfilePipeline;
+use App\Jobs\StatusPipeline\RemoteStatusDelete;
+use App\Jobs\StatusPipeline\StatusDelete;
+use App\Jobs\StoryPipeline\StoryDelete;
+use App\Models\ModeratedProfile;
+use App\Models\RemoteReport;
+use App\Notification;
+use App\Profile;
+use App\Report;
+use App\Services\AccountService;
+use App\Services\ModLogService;
+use App\Services\NetworkTimelineService;
+use App\Services\NotificationService;
+use App\Services\PublicTimelineService;
+use App\Services\StatusService;
+use App\Status;
+use App\Story;
+use App\User;
+use App\Util\ActivityPub\Helpers;
 use Cache;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Redis;
-use App\Services\AccountService;
-use App\Services\StatusService;
-use App\{
-	AccountInterstitial,
-	Contact,
-	Hashtag,
-	Newsroom,
-	Notification,
-	OauthClient,
-	Profile,
-	Report,
-	Status,
-	Story,
-	User
-};
-use Illuminate\Validation\Rule;
-use App\Services\StoryService;
-use App\Services\ModLogService;
-use App\Jobs\DeletePipeline\DeleteAccountPipeline;
-use App\Jobs\DeletePipeline\DeleteRemoteProfilePipeline;
-use App\Jobs\StatusPipeline\StatusDelete;
-use App\Jobs\StatusPipeline\RemoteStatusDelete;
-use App\Http\Resources\AdminReport;
-use App\Http\Resources\AdminSpamReport;
-use App\Services\NotificationService;
-use App\Services\PublicTimelineService;
-use App\Services\NetworkTimelineService;
+use Storage;
 
 trait AdminReportController
 {
-	public function reports(Request $request)
-	{
-		$filter = $request->input('filter') == 'closed' ? 'closed' : 'open';
-		$page = $request->input('page') ?? 1;
+    public function reports(Request $request)
+    {
+        $filter = $request->input('filter') == 'closed' ? 'closed' : 'open';
+        $page = $request->input('page') ?? 1;
 
-		$ai = Cache::remember('admin-dash:reports:ai-count', 3600, function() {
-			return AccountInterstitial::whereNotNull('appeal_requested_at')->whereNull('appeal_handled_at')->count();
-		});
+        $ai = Cache::remember('admin-dash:reports:ai-count', 3600, function () {
+            return AccountInterstitial::whereNotNull('appeal_requested_at')->whereNull('appeal_handled_at')->count();
+        });
 
-		$spam = Cache::remember('admin-dash:reports:spam-count', 3600, function() {
-			return AccountInterstitial::whereType('post.autospam')->whereNull('appeal_handled_at')->count();
-		});
+        $spam = Cache::remember('admin-dash:reports:spam-count', 3600, function () {
+            return AccountInterstitial::whereType('post.autospam')->whereNull('appeal_handled_at')->count();
+        });
 
-		$mailVerifications = Redis::scard('email:manual');
+        $mailVerifications = Redis::scard('email:manual');
 
-		if($filter == 'open' && $page == 1) {
-			$reports = Cache::remember('admin-dash:reports:list-cache', 300, function() use($page, $filter) {
-				return Report::whereHas('status')
-					->whereHas('reportedUser')
-					->whereHas('reporter')
-					->orderBy('created_at','desc')
-					->when($filter, function($q, $filter) {
-						return $filter == 'open' ?
-						$q->whereNull('admin_seen') :
-						$q->whereNotNull('admin_seen');
-					})
-					->paginate(6);
-			});
-		} else {
-			$reports = Report::whereHas('status')
-			->whereHas('reportedUser')
-			->whereHas('reporter')
-			->orderBy('created_at','desc')
-			->when($filter, function($q, $filter) {
-				return $filter == 'open' ?
-				$q->whereNull('admin_seen') :
-				$q->whereNotNull('admin_seen');
-			})
-			->paginate(6);
-		}
+        if ($filter == 'open' && $page == 1) {
+            $reports = Cache::remember('admin-dash:reports:list-cache', 300, function () use ($filter) {
+                return Report::whereHas('status')
+                    ->whereHas('reportedUser')
+                    ->whereHas('reporter')
+                    ->orderBy('created_at', 'desc')
+                    ->when($filter, function ($q, $filter) {
+                        return $filter == 'open' ?
+                        $q->whereNull('admin_seen') :
+                        $q->whereNotNull('admin_seen');
+                    })
+                    ->paginate(6);
+            });
+        } else {
+            $reports = Report::whereHas('status')
+                ->whereHas('reportedUser')
+                ->whereHas('reporter')
+                ->orderBy('created_at', 'desc')
+                ->when($filter, function ($q, $filter) {
+                    return $filter == 'open' ?
+                    $q->whereNull('admin_seen') :
+                    $q->whereNotNull('admin_seen');
+                })
+                ->paginate(6);
+        }
 
-		return view('admin.reports.home', compact('reports', 'ai', 'spam', 'mailVerifications'));
-	}
+        return view('admin.reports.home', compact('reports', 'ai', 'spam', 'mailVerifications'));
+    }
 
-	public function showReport(Request $request, $id)
-	{
-		$report = Report::with('status')->findOrFail($id);
-		if($request->has('ref') && $request->input('ref') == 'email') {
-			return redirect('/i/admin/reports?tab=report&id=' . $report->id);
-		}
-		return view('admin.reports.show', compact('report'));
-	}
+    public function showReport(Request $request, $id)
+    {
+        $report = Report::with('status')->findOrFail($id);
+        if ($request->has('ref') && $request->input('ref') == 'email') {
+            return redirect('/i/admin/reports?tab=report&id='.$report->id);
+        }
 
-	public function appeals(Request $request)
-	{
-		$appeals = AccountInterstitial::whereNotNull('appeal_requested_at')
-			->whereNull('appeal_handled_at')
-			->latest()
-			->paginate(6);
-		return view('admin.reports.appeals', compact('appeals'));
-	}
+        return view('admin.reports.show', compact('report'));
+    }
 
-	public function showAppeal(Request $request, $id)
-	{
-		$appeal = AccountInterstitial::whereNotNull('appeal_requested_at')
-			->whereNull('appeal_handled_at')
-			->findOrFail($id);
-		$meta = json_decode($appeal->meta);
-		return view('admin.reports.show_appeal', compact('appeal', 'meta'));
-	}
+    public function appeals(Request $request)
+    {
+        $appeals = AccountInterstitial::whereNotNull('appeal_requested_at')
+            ->whereNull('appeal_handled_at')
+            ->latest()
+            ->paginate(6);
 
-	public function spam(Request $request)
-	{
-		$this->validate($request, [
-			'tab' => 'sometimes|in:home,not-spam,spam,settings,custom,exemptions'
-		]);
+        return view('admin.reports.appeals', compact('appeals'));
+    }
 
-		$tab = $request->input('tab', 'home');
+    public function showAppeal(Request $request, $id)
+    {
+        $appeal = AccountInterstitial::whereNotNull('appeal_requested_at')
+            ->whereNull('appeal_handled_at')
+            ->findOrFail($id);
+        $meta = json_decode($appeal->meta);
 
-		$openCount = Cache::remember('admin-dash:reports:spam-count', 3600, function() {
-			return AccountInterstitial::whereType('post.autospam')
-				->whereNull('appeal_handled_at')
-				->count();
-		});
+        return view('admin.reports.show_appeal', compact('appeal', 'meta'));
+    }
 
-		$monthlyCount = Cache::remember('admin-dash:reports:spam-count:30d', 43200, function() {
-			return AccountInterstitial::whereType('post.autospam')
-				->where('created_at', '>', now()->subMonth())
-				->count();
-		});
+    public function spam(Request $request)
+    {
+        $this->validate($request, [
+            'tab' => 'sometimes|in:home,not-spam,spam,settings,custom,exemptions',
+        ]);
 
-		$totalCount = Cache::remember('admin-dash:reports:spam-count:total', 43200, function() {
-			return AccountInterstitial::whereType('post.autospam')->count();
-		});
+        $tab = $request->input('tab', 'home');
 
-		$uncategorized = Cache::remember('admin-dash:reports:spam-sync', 3600, function() {
-			return AccountInterstitial::whereType('post.autospam')
-				->whereIsSpam(null)
-				->whereNotNull('appeal_handled_at')
-				->exists();
-		});
+        $openCount = Cache::remember('admin-dash:reports:spam-count', 3600, function () {
+            return AccountInterstitial::whereType('post.autospam')
+                ->whereNull('appeal_handled_at')
+                ->count();
+        });
 
-		$avg = Cache::remember('admin-dash:reports:spam-count:avg', 43200, function() {
-			if(config('database.default') != 'mysql') {
-				return 0;
-			}
-			return AccountInterstitial::selectRaw('*, count(id) as counter')
-				->whereType('post.autospam')
-				->groupBy('user_id')
-				->get()
-				->avg('counter');
-		});
+        $monthlyCount = Cache::remember('admin-dash:reports:spam-count:30d', 43200, function () {
+            return AccountInterstitial::whereType('post.autospam')
+                ->where('created_at', '>', now()->subMonth())
+                ->count();
+        });
 
-		$avgOpen = Cache::remember('admin-dash:reports:spam-count:avgopen', 43200, function() {
-			if(config('database.default') != 'mysql') {
-				return "0";
-			}
-			$seconds = AccountInterstitial::selectRaw('DATE(created_at) AS start_date, AVG(TIME_TO_SEC(TIMEDIFF(appeal_handled_at, created_at))) AS timediff')->whereType('post.autospam')->whereNotNull('appeal_handled_at')->where('created_at', '>', now()->subMonth())->get();
-			if(!$seconds) {
-				return "0";
-			}
-			$mins = floor($seconds->avg('timediff') / 60);
+        $totalCount = Cache::remember('admin-dash:reports:spam-count:total', 43200, function () {
+            return AccountInterstitial::whereType('post.autospam')->count();
+        });
 
-			if($mins < 60) {
-				return $mins . ' min(s)';
-			}
+        $uncategorized = Cache::remember('admin-dash:reports:spam-sync', 3600, function () {
+            return AccountInterstitial::whereType('post.autospam')
+                ->whereIsSpam(null)
+                ->whereNotNull('appeal_handled_at')
+                ->exists();
+        });
 
-			if($mins < 2880) {
-				return floor($mins / 60) . ' hour(s)';
-			}
+        $avg = Cache::remember('admin-dash:reports:spam-count:avg', 43200, function () {
+            if (config('database.default') != 'mysql') {
+                return 0;
+            }
 
-			return floor($mins / 60 / 24) . ' day(s)';
-		});
-		$avgCount = $totalCount && $avg ? floor($totalCount / $avg) : "0";
+            return AccountInterstitial::selectRaw('*, count(id) as counter')
+                ->whereType('post.autospam')
+                ->groupBy('user_id')
+                ->get()
+                ->avg('counter');
+        });
 
-		if(in_array($tab, ['home', 'spam', 'not-spam'])) {
-			$appeals = AccountInterstitial::whereType('post.autospam')
-				->when($tab, function($q, $tab) {
-					switch($tab) {
-						case 'home':
-							return $q->whereNull('appeal_handled_at');
-						break;
-						case 'spam':
-							return $q->whereIsSpam(true);
-						break;
-						case 'not-spam':
-							return $q->whereIsSpam(false);
-						break;
-					}
-				})
-				->latest()
-				->paginate(6);
+        $avgOpen = Cache::remember('admin-dash:reports:spam-count:avgopen', 43200, function () {
+            if (config('database.default') != 'mysql') {
+                return '0';
+            }
+            $seconds = AccountInterstitial::selectRaw('DATE(created_at) AS start_date, AVG(TIME_TO_SEC(TIMEDIFF(appeal_handled_at, created_at))) AS timediff')->whereType('post.autospam')->whereNotNull('appeal_handled_at')->where('created_at', '>', now()->subMonth())->get();
+            if (! $seconds) {
+                return '0';
+            }
+            $mins = floor($seconds->avg('timediff') / 60);
 
-			if($tab !== 'home') {
-				$appeals = $appeals->appends(['tab' => $tab]);
-			}
-		} else {
-			$appeals = new class {
-				public function count() {
-					return 0;
-				}
+            if ($mins < 60) {
+                return $mins.' min(s)';
+            }
 
-				public function render() {
-					return;
-				}
-			};
-		}
+            if ($mins < 2880) {
+                return floor($mins / 60).' hour(s)';
+            }
 
+            return floor($mins / 60 / 24).' day(s)';
+        });
+        $avgCount = $totalCount && $avg ? floor($totalCount / $avg) : '0';
 
-		return view('admin.reports.spam', compact('tab', 'appeals', 'openCount', 'monthlyCount', 'totalCount', 'avgCount', 'avgOpen', 'uncategorized'));
-	}
+        if (in_array($tab, ['home', 'spam', 'not-spam'])) {
+            $appeals = AccountInterstitial::whereType('post.autospam')
+                ->when($tab, function ($q, $tab) {
+                    switch ($tab) {
+                        case 'home':
+                            return $q->whereNull('appeal_handled_at');
+                            break;
+                        case 'spam':
+                            return $q->whereIsSpam(true);
+                            break;
+                        case 'not-spam':
+                            return $q->whereIsSpam(false);
+                            break;
+                    }
+                })
+                ->latest()
+                ->paginate(6);
 
-	public function showSpam(Request $request, $id)
-	{
-		$appeal = AccountInterstitial::whereType('post.autospam')
-			->findOrFail($id);
-		if($request->has('ref') && $request->input('ref') == 'email') {
-			return redirect('/i/admin/reports?tab=autospam&id=' . $appeal->id);
-		}
-		$meta = json_decode($appeal->meta);
-		return view('admin.reports.show_spam', compact('appeal', 'meta'));
-	}
+            if ($tab !== 'home') {
+                $appeals = $appeals->appends(['tab' => $tab]);
+            }
+        } else {
+            $appeals = new class
+            {
+                public function count()
+                {
+                    return 0;
+                }
 
-	public function fixUncategorizedSpam(Request $request)
-	{
-		if(Cache::get('admin-dash:reports:spam-sync-active')) {
-			return redirect('/i/admin/reports/autospam');
-		}
+                public function render() {}
+            };
+        }
 
-		Cache::put('admin-dash:reports:spam-sync-active', 1, 900);
+        return view('admin.reports.spam', compact('tab', 'appeals', 'openCount', 'monthlyCount', 'totalCount', 'avgCount', 'avgOpen', 'uncategorized'));
+    }
 
-		AccountInterstitial::chunk(500, function($reports) {
-			foreach($reports as $report) {
-				if($report->item_type != 'App\Status') {
-					continue;
-				}
+    public function showSpam(Request $request, $id)
+    {
+        $appeal = AccountInterstitial::whereType('post.autospam')
+            ->findOrFail($id);
+        if ($request->has('ref') && $request->input('ref') == 'email') {
+            return redirect('/i/admin/reports?tab=autospam&id='.$appeal->id);
+        }
+        $meta = json_decode($appeal->meta);
 
-				if($report->type != 'post.autospam') {
-					continue;
-				}
+        return view('admin.reports.show_spam', compact('appeal', 'meta'));
+    }
 
-				if($report->is_spam != null) {
-					continue;
-				}
+    public function fixUncategorizedSpam(Request $request)
+    {
+        if (Cache::get('admin-dash:reports:spam-sync-active')) {
+            return redirect('/i/admin/reports/autospam');
+        }
 
-				$status = StatusService::get($report->item_id, false);
-				if(!$status) {
-					return;
-				}
-				$scope = $status['visibility'];
-				$report->is_spam = $scope == 'unlisted';
-				$report->in_violation = $report->is_spam;
-				$report->severity_index = 1;
-				$report->save();
-			}
-		});
+        Cache::put('admin-dash:reports:spam-sync-active', 1, 900);
 
-		Cache::forget('admin-dash:reports:spam-sync');
-		return redirect('/i/admin/reports/autospam');
-	}
+        AccountInterstitial::chunk(500, function ($reports) {
+            foreach ($reports as $report) {
+                if ($report->item_type != 'App\Status') {
+                    continue;
+                }
 
-	public function updateSpam(Request $request, $id)
-	{
-		$this->validate($request, [
-			'action' => 'required|in:dismiss,approve,dismiss-all,approve-all,delete-account,mark-spammer'
-		]);
+                if ($report->type != 'post.autospam') {
+                    continue;
+                }
 
-		$action = $request->input('action');
-		$appeal = AccountInterstitial::whereType('post.autospam')
-			->whereNull('appeal_handled_at')
-			->findOrFail($id);
+                if ($report->is_spam != null) {
+                    continue;
+                }
 
-		$meta = json_decode($appeal->meta);
-		$res = ['status' => 'success'];
-		$now = now();
-		Cache::forget('admin-dash:reports:spam-count:total');
-		Cache::forget('admin-dash:reports:spam-count:30d');
+                $status = StatusService::get($report->item_id, false);
+                if (! $status) {
+                    return;
+                }
+                $scope = $status['visibility'];
+                $report->is_spam = $scope == 'unlisted';
+                $report->in_violation = $report->is_spam;
+                $report->severity_index = 1;
+                $report->save();
+            }
+        });
 
-		if($action == 'delete-account') {
-			if(config('pixelfed.account_deletion') == false) {
-				abort(404);
-			}
+        Cache::forget('admin-dash:reports:spam-sync');
 
-			$user = User::findOrFail($appeal->user_id);
-			$profile = $user->profile;
+        return redirect('/i/admin/reports/autospam');
+    }
 
-			if($user->is_admin == true) {
-				$mid = $request->user()->id;
-				abort_if($user->id < $mid, 403);
-			}
+    public function updateSpam(Request $request, $id)
+    {
+        $this->validate($request, [
+            'action' => 'required|in:dismiss,approve,dismiss-all,approve-all,delete-account,mark-spammer',
+        ]);
 
-			$ts = now()->addMonth();
-			$user->status = 'delete';
-			$profile->status = 'delete';
-			$user->delete_after = $ts;
-			$profile->delete_after = $ts;
-			$user->save();
-			$profile->save();
+        $action = $request->input('action');
+        $appeal = AccountInterstitial::whereType('post.autospam')
+            ->whereNull('appeal_handled_at')
+            ->findOrFail($id);
 
-			ModLogService::boot()
-				->objectUid($user->id)
-				->objectId($user->id)
-				->objectType('App\User::class')
-				->user($request->user())
-				->action('admin.user.delete')
-				->accessLevel('admin')
-				->save();
+        $meta = json_decode($appeal->meta);
+        $res = ['status' => 'success'];
+        $now = now();
+        Cache::forget('admin-dash:reports:spam-count:total');
+        Cache::forget('admin-dash:reports:spam-count:30d');
 
-			Cache::forget('profiles:private');
-			DeleteAccountPipeline::dispatch($user);
-			return;
-		}
+        if ($action == 'delete-account') {
+            if (config('pixelfed.account_deletion') == false) {
+                abort(404);
+            }
 
-		if($action == 'dismiss') {
-			$appeal->is_spam = true;
-			$appeal->appeal_handled_at = $now;
-			$appeal->save();
+            $user = User::findOrFail($appeal->user_id);
+            $profile = $user->profile;
 
-			Cache::forget('pf:bouncer_v0:exemption_by_pid:' . $appeal->user->profile_id);
-			Cache::forget('pf:bouncer_v0:recent_by_pid:' . $appeal->user->profile_id);
-			Cache::forget('admin-dash:reports:spam-count');
-			return $res;
-		}
+            if ($user->is_admin == true) {
+                $mid = $request->user()->id;
+                abort_if($user->id < $mid, 403);
+            }
 
-		if($action == 'dismiss-all') {
-			AccountInterstitial::whereType('post.autospam')
-				->whereItemType('App\Status')
-				->whereNull('appeal_handled_at')
-				->whereUserId($appeal->user_id)
-				->update(['appeal_handled_at' => $now, 'is_spam' => true]);
-			Cache::forget('pf:bouncer_v0:exemption_by_pid:' . $appeal->user->profile_id);
-			Cache::forget('pf:bouncer_v0:recent_by_pid:' . $appeal->user->profile_id);
-			Cache::forget('admin-dash:reports:spam-count');
-			return $res;
-		}
+            $ts = now()->addMonth();
+            $user->status = 'delete';
+            $profile->status = 'delete';
+            $user->delete_after = $ts;
+            $profile->delete_after = $ts;
+            $user->save();
+            $profile->save();
 
-		if($action == 'approve-all') {
-			AccountInterstitial::whereType('post.autospam')
-				->whereItemType('App\Status')
-				->whereNull('appeal_handled_at')
-				->whereUserId($appeal->user_id)
-				->get()
-				->each(function($report) use($meta) {
-					$report->is_spam = false;
-					$report->appeal_handled_at = now();
-					$report->save();
-					$status = Status::find($report->item_id);
-					if($status) {
-						$status->is_nsfw = $meta->is_nsfw;
-						$status->scope = 'public';
-						$status->visibility = 'public';
-						$status->save();
-						StatusService::del($status->id, true);
-					}
-				});
-			Cache::forget('pf:bouncer_v0:exemption_by_pid:' . $appeal->user->profile_id);
-			Cache::forget('pf:bouncer_v0:recent_by_pid:' . $appeal->user->profile_id);
-			Cache::forget('admin-dash:reports:spam-count');
-			return $res;
-		}
+            ModLogService::boot()
+                ->objectUid($user->id)
+                ->objectId($user->id)
+                ->objectType('App\User::class')
+                ->user($request->user())
+                ->action('admin.user.delete')
+                ->accessLevel('admin')
+                ->save();
 
-		if($action == 'mark-spammer') {
-			AccountInterstitial::whereType('post.autospam')
-				->whereItemType('App\Status')
-				->whereNull('appeal_handled_at')
-				->whereUserId($appeal->user_id)
-				->update(['appeal_handled_at' => $now, 'is_spam' => true]);
+            Cache::forget('profiles:private');
+            DeleteAccountPipeline::dispatch($user);
 
-			$pro = Profile::whereUserId($appeal->user_id)->firstOrFail();
+            return;
+        }
 
-			$pro->update([
-				'unlisted' => true,
-				'cw' => true,
-				'no_autolink' => true
-			]);
+        if ($action == 'dismiss') {
+            $appeal->is_spam = true;
+            $appeal->appeal_handled_at = $now;
+            $appeal->save();
 
-			Status::whereProfileId($pro->id)
-				->get()
-				->each(function($report) {
-					$status->is_nsfw = $meta->is_nsfw;
-					$status->scope = 'public';
-					$status->visibility = 'public';
-					$status->save();
-					StatusService::del($status->id, true);
-				});
+            Cache::forget('pf:bouncer_v0:exemption_by_pid:'.$appeal->user->profile_id);
+            Cache::forget('pf:bouncer_v0:recent_by_pid:'.$appeal->user->profile_id);
+            Cache::forget('admin-dash:reports:spam-count');
 
-			Cache::forget('pf:bouncer_v0:exemption_by_pid:' . $appeal->user->profile_id);
-			Cache::forget('pf:bouncer_v0:recent_by_pid:' . $appeal->user->profile_id);
-			Cache::forget('admin-dash:reports:spam-count');
-			return $res;
-		}
+            return $res;
+        }
 
-		$status = $appeal->status;
-		$status->is_nsfw = $meta->is_nsfw;
-		$status->scope = 'public';
-		$status->visibility = 'public';
-		$status->save();
+        if ($action == 'dismiss-all') {
+            AccountInterstitial::whereType('post.autospam')
+                ->whereItemType('App\Status')
+                ->whereNull('appeal_handled_at')
+                ->whereUserId($appeal->user_id)
+                ->update(['appeal_handled_at' => $now, 'is_spam' => true]);
+            Cache::forget('pf:bouncer_v0:exemption_by_pid:'.$appeal->user->profile_id);
+            Cache::forget('pf:bouncer_v0:recent_by_pid:'.$appeal->user->profile_id);
+            Cache::forget('admin-dash:reports:spam-count');
 
-		$appeal->is_spam = false;
-		$appeal->appeal_handled_at = now();
-		$appeal->save();
+            return $res;
+        }
 
-		StatusService::del($status->id);
+        if ($action == 'approve-all') {
+            AccountInterstitial::whereType('post.autospam')
+                ->whereItemType('App\Status')
+                ->whereNull('appeal_handled_at')
+                ->whereUserId($appeal->user_id)
+                ->get()
+                ->each(function ($report) use ($meta) {
+                    $report->is_spam = false;
+                    $report->appeal_handled_at = now();
+                    $report->save();
+                    $status = Status::find($report->item_id);
+                    if ($status) {
+                        $status->is_nsfw = $meta->is_nsfw;
+                        $status->scope = 'public';
+                        $status->visibility = 'public';
+                        $status->save();
+                        StatusService::del($status->id, true);
+                    }
+                });
+            Cache::forget('pf:bouncer_v0:exemption_by_pid:'.$appeal->user->profile_id);
+            Cache::forget('pf:bouncer_v0:recent_by_pid:'.$appeal->user->profile_id);
+            Cache::forget('admin-dash:reports:spam-count');
 
-		Cache::forget('pf:bouncer_v0:exemption_by_pid:' . $appeal->user->profile_id);
-		Cache::forget('pf:bouncer_v0:recent_by_pid:' . $appeal->user->profile_id);
-		Cache::forget('admin-dash:reports:spam-count');
+            return $res;
+        }
 
-		return $res;
-	}
+        if ($action == 'mark-spammer') {
+            AccountInterstitial::whereType('post.autospam')
+                ->whereItemType('App\Status')
+                ->whereNull('appeal_handled_at')
+                ->whereUserId($appeal->user_id)
+                ->update(['appeal_handled_at' => $now, 'is_spam' => true]);
 
-	public function updateAppeal(Request $request, $id)
-	{
-		$this->validate($request, [
-			'action' => 'required|in:dismiss,approve'
-		]);
+            $pro = Profile::whereUserId($appeal->user_id)->firstOrFail();
 
-		$action = $request->input('action');
-		$appeal = AccountInterstitial::whereNotNull('appeal_requested_at')
-			->whereNull('appeal_handled_at')
-			->findOrFail($id);
+            $pro->update([
+                'unlisted' => true,
+                'cw' => true,
+                'no_autolink' => true,
+            ]);
 
-		if($action == 'dismiss') {
-			$appeal->appeal_handled_at = now();
-			$appeal->save();
-			Cache::forget('admin-dash:reports:ai-count');
-			return redirect('/i/admin/reports/appeals');
-		}
+            Status::whereProfileId($pro->id)
+                ->get()
+                ->each(function ($report) {
+                    $status->is_nsfw = $meta->is_nsfw;
+                    $status->scope = 'public';
+                    $status->visibility = 'public';
+                    $status->save();
+                    StatusService::del($status->id, true);
+                });
 
-		switch ($appeal->type) {
-			case 'post.cw':
-				$status = $appeal->status;
-				$status->is_nsfw = false;
-				$status->save();
-				break;
+            Cache::forget('pf:bouncer_v0:exemption_by_pid:'.$appeal->user->profile_id);
+            Cache::forget('pf:bouncer_v0:recent_by_pid:'.$appeal->user->profile_id);
+            Cache::forget('admin-dash:reports:spam-count');
 
-			case 'post.unlist':
-				$status = $appeal->status;
-				$status->scope = 'public';
-				$status->visibility = 'public';
-				$status->save();
-				break;
+            return $res;
+        }
 
-			default:
-				# code...
-				break;
-		}
+        $status = $appeal->status;
+        $status->is_nsfw = $meta->is_nsfw;
+        $status->scope = 'public';
+        $status->visibility = 'public';
+        $status->save();
 
-		$appeal->appeal_handled_at = now();
-		$appeal->save();
-		StatusService::del($status->id, true);
-		Cache::forget('admin-dash:reports:ai-count');
+        $appeal->is_spam = false;
+        $appeal->appeal_handled_at = now();
+        $appeal->save();
 
-		return redirect('/i/admin/reports/appeals');
-	}
+        StatusService::del($status->id);
+
+        Cache::forget('pf:bouncer_v0:exemption_by_pid:'.$appeal->user->profile_id);
+        Cache::forget('pf:bouncer_v0:recent_by_pid:'.$appeal->user->profile_id);
+        Cache::forget('admin-dash:reports:spam-count');
+
+        return $res;
+    }
+
+    public function updateAppeal(Request $request, $id)
+    {
+        $this->validate($request, [
+            'action' => 'required|in:dismiss,approve',
+        ]);
+
+        $action = $request->input('action');
+        $appeal = AccountInterstitial::whereNotNull('appeal_requested_at')
+            ->whereNull('appeal_handled_at')
+            ->findOrFail($id);
+
+        if ($action == 'dismiss') {
+            $appeal->appeal_handled_at = now();
+            $appeal->save();
+            Cache::forget('admin-dash:reports:ai-count');
+
+            return redirect('/i/admin/reports/appeals');
+        }
+
+        switch ($appeal->type) {
+            case 'post.cw':
+                $status = $appeal->status;
+                $status->is_nsfw = false;
+                $status->save();
+                break;
+
+            case 'post.unlist':
+                $status = $appeal->status;
+                $status->scope = 'public';
+                $status->visibility = 'public';
+                $status->save();
+                break;
+
+            default:
+                // code...
+                break;
+        }
+
+        $appeal->appeal_handled_at = now();
+        $appeal->save();
+        StatusService::del($status->id, true);
+        Cache::forget('admin-dash:reports:ai-count');
+
+        return redirect('/i/admin/reports/appeals');
+    }
 
     public function updateReport(Request $request, $id)
     {
         $this->validate($request, [
-            'action'	=> 'required|string',
+            'action' => 'required|string',
         ]);
 
         $action = $request->input('action');
@@ -470,7 +480,7 @@ trait AdminReportController
             'ban',
         ];
 
-        if (!in_array($action, $actions)) {
+        if (! in_array($action, $actions)) {
             return abort(403);
         }
 
@@ -479,7 +489,7 @@ trait AdminReportController
         $this->handleReportAction($report, $action);
         Cache::forget('admin-dash:reports:list-cache');
 
-        return response()->json(['msg'=> 'Success']);
+        return response()->json(['msg' => 'Success']);
     }
 
     public function handleReportAction(Report $report, $action)
@@ -541,7 +551,7 @@ trait AdminReportController
             '3' => 'unlist',
             '4' => 'delete',
             '5' => 'shadowban',
-            '6' => 'ban'
+            '6' => 'ban',
         ];
     }
 
@@ -549,675 +559,1195 @@ trait AdminReportController
     {
         $this->validate($request, [
             'action' => 'required|integer|min:1|max:10',
-            'ids'    => 'required|array'
+            'ids' => 'required|array',
         ]);
         $action = $this->actionMap()[$request->input('action')];
         $ids = $request->input('ids');
         $reports = Report::whereIn('id', $ids)->whereNull('admin_seen')->get();
-        foreach($reports as $report) {
+        foreach ($reports as $report) {
             $this->handleReportAction($report, $action);
         }
         $res = [
             'message' => 'Success',
-            'code'    => 200
+            'code' => 200,
         ];
+
         return response()->json($res);
     }
 
     public function reportMailVerifications(Request $request)
     {
-    	$ids = Redis::smembers('email:manual');
-    	$ignored = Redis::smembers('email:manual-ignored');
-    	$reports = [];
-    	if($ids) {
-			$reports = collect($ids)
-				->filter(function($id) use($ignored) {
-					return !in_array($id, $ignored);
-				})
-				->map(function($id) {
-					$user = User::whereProfileId($id)->first();
-					if(!$user || $user->email_verified_at) {
-						return [];
-					}
-					$account = AccountService::get($id, true);
-					if(!$account) {
-						return [];
-					}
-					$account['email'] = $user->email;
-					return $account;
-				})
-				->filter(function($res) {
-					return $res && isset($res['id']);
-				})
-				->values();
-    	}
-    	return view('admin.reports.mail_verification', compact('reports', 'ignored'));
+        $ids = Redis::smembers('email:manual');
+        $ignored = Redis::smembers('email:manual-ignored');
+        $reports = [];
+        if ($ids) {
+            $reports = collect($ids)
+                ->filter(function ($id) use ($ignored) {
+                    return ! in_array($id, $ignored);
+                })
+                ->map(function ($id) {
+                    $user = User::whereProfileId($id)->first();
+                    if (! $user || $user->email_verified_at) {
+                        return [];
+                    }
+                    $account = AccountService::get($id, true);
+                    if (! $account) {
+                        return [];
+                    }
+                    $account['email'] = $user->email;
+
+                    return $account;
+                })
+                ->filter(function ($res) {
+                    return $res && isset($res['id']);
+                })
+                ->values();
+        }
+
+        return view('admin.reports.mail_verification', compact('reports', 'ignored'));
     }
 
     public function reportMailVerifyIgnore(Request $request)
     {
-    	$id = $request->input('id');
-    	Redis::sadd('email:manual-ignored', $id);
-    	return redirect('/i/admin/reports');
+        $id = $request->input('id');
+        Redis::sadd('email:manual-ignored', $id);
+
+        return redirect('/i/admin/reports');
     }
 
     public function reportMailVerifyApprove(Request $request)
     {
-    	$id = $request->input('id');
-    	$user = User::whereProfileId($id)->firstOrFail();
-    	Redis::srem('email:manual', $id);
-    	Redis::srem('email:manual-ignored', $id);
-    	$user->email_verified_at = now();
-    	$user->save();
-    	return redirect('/i/admin/reports');
+        $id = $request->input('id');
+        $user = User::whereProfileId($id)->firstOrFail();
+        Redis::srem('email:manual', $id);
+        Redis::srem('email:manual-ignored', $id);
+        $user->email_verified_at = now();
+        $user->save();
+
+        return redirect('/i/admin/reports');
     }
 
     public function reportMailVerifyClearIgnored(Request $request)
     {
-    	Redis::del('email:manual-ignored');
-    	return [200];
+        Redis::del('email:manual-ignored');
+
+        return [200];
     }
 
     public function reportsStats(Request $request)
     {
-    	$stats = [
-    		'total' => Report::count(),
-    		'open' => Report::whereNull('admin_seen')->count(),
-    		'closed' => Report::whereNotNull('admin_seen')->count(),
-    		'autospam' => AccountInterstitial::whereType('post.autospam')->count(),
-    		'autospam_open' => AccountInterstitial::whereType('post.autospam')->whereNull(['appeal_handled_at'])->count(),
-    		'appeals' => AccountInterstitial::whereNotNull('appeal_requested_at')->whereNull('appeal_handled_at')->count(),
-    		'email_verification_requests' => Redis::scard('email:manual')
-    	];
-    	return $stats;
+        $stats = [
+            'total' => Report::count(),
+            'open' => Report::whereNull('admin_seen')->count(),
+            'closed' => Report::whereNotNull('admin_seen')->count(),
+            'autospam' => AccountInterstitial::whereType('post.autospam')->count(),
+            'autospam_open' => AccountInterstitial::whereType('post.autospam')->whereNull(['appeal_handled_at'])->count(),
+            'appeals' => AccountInterstitial::whereNotNull('appeal_requested_at')->whereNull('appeal_handled_at')->count(),
+            'remote_open' => RemoteReport::whereNull('action_taken_at')->count(),
+            'email_verification_requests' => Redis::scard('email:manual'),
+        ];
+
+        return $stats;
     }
 
     public function reportsApiAll(Request $request)
     {
-    	$filter = $request->input('filter') == 'closed' ? 'closed' : 'open';
+        $filter = $request->input('filter') == 'closed' ? 'closed' : 'open';
 
-    	$reports = AdminReport::collection(
-    		Report::orderBy('id','desc')
-			->when($filter, function($q, $filter) {
-				return $filter == 'open' ?
-				$q->whereNull('admin_seen') :
-				$q->whereNotNull('admin_seen');
-			})
-			->groupBy(['id', 'object_id', 'object_type', 'profile_id'])
-			->cursorPaginate(6)
-			->withQueryString()
-		);
+        $reports = AdminReport::collection(
+            Report::orderBy('id', 'desc')
+                ->when($filter, function ($q, $filter) {
+                    return $filter == 'open' ?
+                    $q->whereNull('admin_seen') :
+                    $q->whereNotNull('admin_seen');
+                })
+                ->groupBy(['id', 'object_id', 'object_type', 'profile_id'])
+                ->cursorPaginate(6)
+                ->withQueryString()
+        );
 
-		return $reports;
+        return $reports;
+    }
+
+    public function reportsApiRemote(Request $request)
+    {
+        $filter = $request->input('filter') == 'closed' ? 'closed' : 'open';
+
+        $reports = AdminRemoteReport::collection(
+            RemoteReport::orderBy('id', 'desc')
+                ->when($filter, function ($q, $filter) {
+                    return $filter == 'open' ?
+                    $q->whereNull('action_taken_at') :
+                    $q->whereNotNull('action_taken_at');
+                })
+                ->cursorPaginate(6)
+                ->withQueryString()
+        );
+
+        return $reports;
     }
 
     public function reportsApiGet(Request $request, $id)
     {
-    	$report = Report::findOrFail($id);
-    	return new AdminReport($report);
+        $report = Report::findOrFail($id);
+
+        return new AdminReport($report);
     }
 
     public function reportsApiHandle(Request $request)
     {
-    	$this->validate($request, [
-    		'object_id' => 'required',
-    		'object_type' => 'required',
-    		'id' => 'required',
-    		'action' => 'required|in:ignore,nsfw,unlist,private,delete',
-    		'action_type' => 'required|in:post,profile'
-    	]);
+        $this->validate($request, [
+            'object_id' => 'required',
+            'object_type' => 'required',
+            'id' => 'required',
+            'action' => 'required|in:ignore,nsfw,unlist,private,delete,delete-all',
+            'action_type' => 'required|in:post,profile,story',
+        ]);
 
-    	$report = Report::whereObjectId($request->input('object_id'))->findOrFail($request->input('id'));
+        $report = Report::whereObjectId($request->input('object_id'))->findOrFail($request->input('id'));
 
-    	if($request->input('action_type') === 'profile') {
-    		return $this->reportsHandleProfileAction($report, $request->input('action'));
-    	} else if($request->input('action_type') === 'post') {
-    		return $this->reportsHandleStatusAction($report, $request->input('action'));
-    	}
+        if ($request->input('action_type') === 'profile') {
+            return $this->reportsHandleProfileAction($report, $request->input('action'));
+        } elseif ($request->input('action_type') === 'post') {
+            return $this->reportsHandleStatusAction($report, $request->input('action'));
+        } elseif ($request->input('action_type') === 'story') {
+            return $this->reportsHandleStoryAction($report, $request->input('action'));
+        }
 
-    	return $report;
+        return $report;
+    }
+
+    protected function reportsHandleStoryAction($report, $action)
+    {
+        switch ($action) {
+            case 'ignore':
+                Report::whereObjectId($report->object_id)
+                    ->whereObjectType($report->object_type)
+                    ->update([
+                        'admin_seen' => now(),
+                    ]);
+
+                return [200];
+                break;
+
+            case 'delete':
+                $profile = Profile::find($report->reported_profile_id);
+                $story = Story::whereProfileId($profile->id)->find($report->object_id);
+
+                abort_if(! $story, 400, 'Invalid or missing story');
+
+                $story->active = false;
+                $story->save();
+
+                ModLogService::boot()
+                    ->objectUid($profile->id)
+                    ->objectId($report->object_id)
+                    ->objectType('App\Story::class')
+                    ->user(request()->user())
+                    ->action('admin.user.moderate')
+                    ->metadata([
+                        'action' => 'delete',
+                        'message' => 'Success!',
+                    ])
+                    ->accessLevel('admin')
+                    ->save();
+
+                Report::whereObjectId($report->object_id)
+                    ->whereObjectType($report->object_type)
+                    ->update([
+                        'admin_seen' => now(),
+                    ]);
+                StoryDelete::dispatch($story)->onQueue('story');
+
+                return [200];
+                break;
+
+            case 'delete-all':
+                $profile = Profile::find($report->reported_profile_id);
+                $stories = Story::whereProfileId($profile->id)->whereActive(true)->get();
+
+                abort_if(! $stories || ! $stories->count(), 400, 'Invalid or missing stories');
+
+                ModLogService::boot()
+                    ->objectUid($profile->id)
+                    ->objectId($report->object_id)
+                    ->objectType('App\Story::class')
+                    ->user(request()->user())
+                    ->action('admin.user.moderate')
+                    ->metadata([
+                        'action' => 'delete-all',
+                        'message' => 'Success!',
+                    ])
+                    ->accessLevel('admin')
+                    ->save();
+
+                Report::where('reported_profile_id', $profile->id)
+                    ->whereObjectType('App\Story')
+                    ->whereNull('admin_seen')
+                    ->update([
+                        'admin_seen' => now(),
+                    ]);
+                $stories->each(function ($story) {
+                    StoryDelete::dispatch($story)->onQueue('story');
+                });
+
+                return [200];
+                break;
+        }
     }
 
     protected function reportsHandleProfileAction($report, $action)
     {
-    	switch($action) {
-    		case 'ignore':
-    			Report::whereObjectId($report->object_id)
-    				->whereObjectType($report->object_type)
-    				->update([
-    					'admin_seen' => now()
-    				]);
-    			return [200];
-    		break;
+        switch ($action) {
+            case 'ignore':
+                Report::whereObjectId($report->object_id)
+                    ->whereObjectType($report->object_type)
+                    ->update([
+                        'admin_seen' => now(),
+                    ]);
 
-    		case 'nsfw':
-    			if($report->object_type === 'App\Profile') {
-    				$profile = Profile::find($report->object_id);
-    			} else if($report->object_type === 'App\Status') {
-    				$status = Status::find($report->object_id);
-    				if(!$status) {
-    					return [200];
-    				}
-    				$profile = Profile::find($status->profile_id);
-    			}
+                return [200];
+                break;
 
-    			if(!$profile) {
-    				return;
-    			}
+            case 'nsfw':
+                if ($report->object_type === 'App\Profile') {
+                    $profile = Profile::find($report->object_id);
+                } elseif ($report->object_type === 'App\Status') {
+                    $status = Status::find($report->object_id);
+                    if (! $status) {
+                        return [200];
+                    }
+                    $profile = Profile::find($status->profile_id);
+                }
 
-    			abort_if($profile->user && $profile->user->is_admin, 400, 'Cannot moderate an admin account.');
+                if (! $profile) {
+                    return;
+                }
 
-    			$profile->cw = true;
-    			$profile->save();
+                abort_if($profile->user && $profile->user->is_admin, 400, 'Cannot moderate an admin account.');
 
-    			foreach(Status::whereProfileId($profile->id)->cursor() as $status) {
-    				$status->is_nsfw = true;
-    				$status->save();
-    				StatusService::del($status->id);
-    				PublicTimelineService::rem($status->id);
-    			}
+                $profile->cw = true;
+                $profile->save();
 
-				ModLogService::boot()
-					->objectUid($profile->id)
-					->objectId($profile->id)
-					->objectType('App\Profile::class')
-					->user(request()->user())
-					->action('admin.user.moderate')
-					->metadata([
-	                    'action' => 'cw',
-	                    'message' => 'Success!'
-                	])
-					->accessLevel('admin')
-					->save();
+                if ($profile->remote_url) {
+                    ModeratedProfile::updateOrCreate([
+                        'profile_url' => $profile->remote_url,
+                        'profile_id' => $profile->id,
+                    ], [
+                        'is_nsfw' => true,
+                        'domain' => $profile->domain,
+                    ]);
+                }
 
-    			Report::whereObjectId($report->object_id)
-    				->whereObjectType($report->object_type)
-    				->update([
-    					'nsfw' => true,
-    					'admin_seen' => now()
-    				]);
-    			return [200];
-    		break;
+                foreach (Status::whereProfileId($profile->id)->cursor() as $status) {
+                    $status->is_nsfw = true;
+                    $status->save();
+                    StatusService::del($status->id);
+                    PublicTimelineService::rem($status->id);
+                }
 
-    		case 'unlist':
-    			if($report->object_type === 'App\Profile') {
-    				$profile = Profile::find($report->object_id);
-    			} else if($report->object_type === 'App\Status') {
-    				$status = Status::find($report->object_id);
-    				if(!$status) {
-    					return [200];
-    				}
-    				$profile = Profile::find($status->profile_id);
-    			}
+                ModLogService::boot()
+                    ->objectUid($profile->id)
+                    ->objectId($profile->id)
+                    ->objectType('App\Profile::class')
+                    ->user(request()->user())
+                    ->action('admin.user.moderate')
+                    ->metadata([
+                        'action' => 'cw',
+                        'message' => 'Success!',
+                    ])
+                    ->accessLevel('admin')
+                    ->save();
 
-    			if(!$profile) {
-    				return;
-    			}
+                Report::whereObjectId($report->object_id)
+                    ->whereObjectType($report->object_type)
+                    ->update([
+                        'nsfw' => true,
+                        'admin_seen' => now(),
+                    ]);
 
-    			abort_if($profile->user && $profile->user->is_admin, 400, 'Cannot moderate an admin account.');
+                return [200];
+                break;
 
-    			$profile->unlisted = true;
-    			$profile->save();
+            case 'unlist':
+                if ($report->object_type === 'App\Profile') {
+                    $profile = Profile::find($report->object_id);
+                } elseif ($report->object_type === 'App\Status') {
+                    $status = Status::find($report->object_id);
+                    if (! $status) {
+                        return [200];
+                    }
+                    $profile = Profile::find($status->profile_id);
+                }
 
-    			foreach(Status::whereProfileId($profile->id)->whereScope('public')->cursor() as $status) {
-					$status->scope = 'unlisted';
-					$status->visibility = 'unlisted';
-					$status->save();
-					StatusService::del($status->id);
-					PublicTimelineService::rem($status->id);
-    			}
+                if (! $profile) {
+                    return;
+                }
 
-				ModLogService::boot()
-					->objectUid($profile->id)
-					->objectId($profile->id)
-					->objectType('App\Profile::class')
-					->user(request()->user())
-					->action('admin.user.moderate')
-					->metadata([
-	                    'action' => 'unlisted',
-	                    'message' => 'Success!'
-                	])
-					->accessLevel('admin')
-					->save();
+                abort_if($profile->user && $profile->user->is_admin, 400, 'Cannot moderate an admin account.');
 
-    			Report::whereObjectId($report->object_id)
-    				->whereObjectType($report->object_type)
-    				->update([
-    					'admin_seen' => now()
-    				]);
-    			return [200];
-    		break;
+                $profile->unlisted = true;
+                $profile->save();
 
-    		case 'private':
-    			if($report->object_type === 'App\Profile') {
-    				$profile = Profile::find($report->object_id);
-    			} else if($report->object_type === 'App\Status') {
-    				$status = Status::find($report->object_id);
-    				if(!$status) {
-    					return [200];
-    				}
-    				$profile = Profile::find($status->profile_id);
-    			}
+                if ($profile->remote_url) {
+                    ModeratedProfile::updateOrCreate([
+                        'profile_url' => $profile->remote_url,
+                        'profile_id' => $profile->id,
+                    ], [
+                        'is_unlisted' => true,
+                        'domain' => $profile->domain,
+                    ]);
+                }
 
-    			if(!$profile) {
-    				return;
-    			}
+                foreach (Status::whereProfileId($profile->id)->whereScope('public')->cursor() as $status) {
+                    $status->scope = 'unlisted';
+                    $status->visibility = 'unlisted';
+                    $status->save();
+                    StatusService::del($status->id);
+                    PublicTimelineService::rem($status->id);
+                }
 
-    			abort_if($profile->user && $profile->user->is_admin, 400, 'Cannot moderate an admin account.');
+                ModLogService::boot()
+                    ->objectUid($profile->id)
+                    ->objectId($profile->id)
+                    ->objectType('App\Profile::class')
+                    ->user(request()->user())
+                    ->action('admin.user.moderate')
+                    ->metadata([
+                        'action' => 'unlisted',
+                        'message' => 'Success!',
+                    ])
+                    ->accessLevel('admin')
+                    ->save();
 
-    			$profile->unlisted = true;
-    			$profile->save();
+                Report::whereObjectId($report->object_id)
+                    ->whereObjectType($report->object_type)
+                    ->update([
+                        'admin_seen' => now(),
+                    ]);
 
-    			foreach(Status::whereProfileId($profile->id)->cursor() as $status) {
-					$status->scope = 'private';
-					$status->visibility = 'private';
-					$status->save();
-					StatusService::del($status->id);
-					PublicTimelineService::rem($status->id);
-    			}
+                return [200];
+                break;
 
-				ModLogService::boot()
-					->objectUid($profile->id)
-					->objectId($profile->id)
-					->objectType('App\Profile::class')
-					->user(request()->user())
-					->action('admin.user.moderate')
-					->metadata([
-	                    'action' => 'private',
-	                    'message' => 'Success!'
-                	])
-					->accessLevel('admin')
-					->save();
+            case 'private':
+                if ($report->object_type === 'App\Profile') {
+                    $profile = Profile::find($report->object_id);
+                } elseif ($report->object_type === 'App\Status') {
+                    $status = Status::find($report->object_id);
+                    if (! $status) {
+                        return [200];
+                    }
+                    $profile = Profile::find($status->profile_id);
+                }
 
-    			Report::whereObjectId($report->object_id)
-    				->whereObjectType($report->object_type)
-    				->update([
-    					'admin_seen' => now()
-    				]);
-    			return [200];
-    		break;
+                if (! $profile) {
+                    return;
+                }
 
-    		case 'delete':
-				if(config('pixelfed.account_deletion') == false) {
-					abort(404);
-				}
+                abort_if($profile->user && $profile->user->is_admin, 400, 'Cannot moderate an admin account.');
 
-    			if($report->object_type === 'App\Profile') {
-    				$profile = Profile::find($report->object_id);
-    			} else if($report->object_type === 'App\Status') {
-    				$status = Status::find($report->object_id);
-    				if(!$status) {
-    					return [200];
-    				}
-    				$profile = Profile::find($status->profile_id);
-    			}
+                $profile->unlisted = true;
+                $profile->save();
 
-    			if(!$profile) {
-    				return;
-    			}
+                if ($profile->remote_url) {
+                    ModeratedProfile::updateOrCreate([
+                        'profile_url' => $profile->remote_url,
+                        'profile_id' => $profile->id,
+                    ], [
+                        'is_unlisted' => true,
+                        'domain' => $profile->domain,
+                    ]);
+                }
 
-    			abort_if($profile->user && $profile->user->is_admin, 400, 'Cannot delete an admin account.');
+                foreach (Status::whereProfileId($profile->id)->cursor() as $status) {
+                    $status->scope = 'private';
+                    $status->visibility = 'private';
+                    $status->save();
+                    StatusService::del($status->id);
+                    PublicTimelineService::rem($status->id);
+                }
 
-				$ts = now()->addMonth();
+                ModLogService::boot()
+                    ->objectUid($profile->id)
+                    ->objectId($profile->id)
+                    ->objectType('App\Profile::class')
+                    ->user(request()->user())
+                    ->action('admin.user.moderate')
+                    ->metadata([
+                        'action' => 'private',
+                        'message' => 'Success!',
+                    ])
+                    ->accessLevel('admin')
+                    ->save();
 
-    			if($profile->user_id) {
-	    			$user = $profile->user;
-					abort_if($user->is_admin, 403, 'You cannot delete admin accounts.');
-					$user->status = 'delete';
-					$user->delete_after = $ts;
-					$user->save();
-    			}
+                Report::whereObjectId($report->object_id)
+                    ->whereObjectType($report->object_type)
+                    ->update([
+                        'admin_seen' => now(),
+                    ]);
 
-				$profile->status = 'delete';
-				$profile->delete_after = $ts;
-				$profile->save();
+                return [200];
+                break;
 
-				ModLogService::boot()
-					->objectUid($profile->id)
-					->objectId($profile->id)
-					->objectType('App\Profile::class')
-					->user(request()->user())
-					->action('admin.user.delete')
-					->accessLevel('admin')
-					->save();
+            case 'delete':
+                if (config('pixelfed.account_deletion') == false) {
+                    abort(404);
+                }
 
-    			Report::whereObjectId($report->object_id)
-    				->whereObjectType($report->object_type)
-    				->update([
-    					'admin_seen' => now()
-    				]);
+                if ($report->object_type === 'App\Profile') {
+                    $profile = Profile::find($report->object_id);
+                } elseif ($report->object_type === 'App\Status') {
+                    $status = Status::find($report->object_id);
+                    if (! $status) {
+                        return [200];
+                    }
+                    $profile = Profile::find($status->profile_id);
+                }
 
-    			if($profile->user_id) {
-    				DB::table('oauth_access_tokens')->whereUserId($user->id)->delete();
-    				DB::table('oauth_auth_codes')->whereUserId($user->id)->delete();
-					$user->email = $user->id;
-					$user->password = '';
-					$user->status = 'delete';
-					$user->save();
-					$profile->status = 'delete';
-					$profile->delete_after = now()->addMonth();
-					$profile->save();
-    				AccountService::del($profile->id);
-    				DeleteAccountPipeline::dispatch($user)->onQueue('high');
-    			} else {
-    				$profile->status = 'delete';
-					$profile->delete_after = now()->addMonth();
-					$profile->save();
-    				AccountService::del($profile->id);
-    				DeleteRemoteProfilePipeline::dispatch($profile)->onQueue('high');
-    			}
-    			return [200];
-    		break;
-    	}
+                if (! $profile) {
+                    return;
+                }
+
+                abort_if($profile->user && $profile->user->is_admin, 400, 'Cannot delete an admin account.');
+
+                $ts = now()->addMonth();
+
+                if ($profile->remote_url) {
+                    ModeratedProfile::updateOrCreate([
+                        'profile_url' => $profile->remote_url,
+                        'profile_id' => $profile->id,
+                    ], [
+                        'is_banned' => true,
+                        'domain' => $profile->domain,
+                    ]);
+                }
+
+                if ($profile->user_id) {
+                    $user = $profile->user;
+                    abort_if($user->is_admin, 403, 'You cannot delete admin accounts.');
+                    $user->status = 'delete';
+                    $user->delete_after = $ts;
+                    $user->save();
+                }
+
+                $profile->status = 'delete';
+                $profile->delete_after = $ts;
+                $profile->save();
+
+                ModLogService::boot()
+                    ->objectUid($profile->id)
+                    ->objectId($profile->id)
+                    ->objectType('App\Profile::class')
+                    ->user(request()->user())
+                    ->action('admin.user.delete')
+                    ->accessLevel('admin')
+                    ->save();
+
+                Report::whereObjectId($report->object_id)
+                    ->whereObjectType($report->object_type)
+                    ->update([
+                        'admin_seen' => now(),
+                    ]);
+
+                if ($profile->user_id) {
+                    DB::table('oauth_access_tokens')->whereUserId($user->id)->delete();
+                    DB::table('oauth_auth_codes')->whereUserId($user->id)->delete();
+                    $user->email = $user->id;
+                    $user->password = '';
+                    $user->status = 'delete';
+                    $user->save();
+                    $profile->status = 'delete';
+                    $profile->delete_after = now()->addMonth();
+                    $profile->save();
+                    AccountService::del($profile->id);
+                    DeleteAccountPipeline::dispatch($user)->onQueue('high');
+                } else {
+                    $profile->status = 'delete';
+                    $profile->delete_after = now()->addMonth();
+                    $profile->save();
+                    AccountService::del($profile->id);
+                    DeleteRemoteProfilePipeline::dispatch($profile)->onQueue('high');
+                }
+
+                return [200];
+                break;
+        }
     }
 
     protected function reportsHandleStatusAction($report, $action)
     {
-    	switch($action) {
-    		case 'ignore':
-    			Report::whereObjectId($report->object_id)
-    				->whereObjectType($report->object_type)
-    				->update([
-    					'admin_seen' => now()
-    				]);
-    			return [200];
-    		break;
+        switch ($action) {
+            case 'ignore':
+                Report::whereObjectId($report->object_id)
+                    ->whereObjectType($report->object_type)
+                    ->update([
+                        'admin_seen' => now(),
+                    ]);
 
-    		case 'nsfw':
-    			$status = Status::find($report->object_id);
+                return [200];
+                break;
 
-    			if(!$status) {
-    				return [200];
-    			}
+            case 'nsfw':
+                $status = Status::find($report->object_id);
 
-				abort_if($status->profile->user && $status->profile->user->is_admin, 400, 'Cannot moderate an admin account post.');
-    			$status->is_nsfw = true;
-    			$status->save();
-    			StatusService::del($status->id);
+                if (! $status) {
+                    return [200];
+                }
 
-				ModLogService::boot()
-					->objectUid($status->profile_id)
-					->objectId($status->profile_id)
-					->objectType('App\Status::class')
-					->user(request()->user())
-					->action('admin.status.moderate')
-					->metadata([
-	                    'action' => 'cw',
-	                    'message' => 'Success!'
-                	])
-					->accessLevel('admin')
-					->save();
+                abort_if($status->profile->user && $status->profile->user->is_admin, 400, 'Cannot moderate an admin account post.');
+                $status->is_nsfw = true;
+                $status->save();
+                StatusService::del($status->id);
 
-    			Report::whereObjectId($report->object_id)
-    				->whereObjectType($report->object_type)
-    				->update([
-    					'nsfw' => true,
-    					'admin_seen' => now()
-    				]);
-    			return [200];
-    		break;
+                ModLogService::boot()
+                    ->objectUid($status->profile_id)
+                    ->objectId($status->profile_id)
+                    ->objectType('App\Status::class')
+                    ->user(request()->user())
+                    ->action('admin.status.moderate')
+                    ->metadata([
+                        'action' => 'cw',
+                        'message' => 'Success!',
+                    ])
+                    ->accessLevel('admin')
+                    ->save();
 
-    		case 'private':
-    			$status = Status::find($report->object_id);
+                Report::whereObjectId($report->object_id)
+                    ->whereObjectType($report->object_type)
+                    ->update([
+                        'nsfw' => true,
+                        'admin_seen' => now(),
+                    ]);
 
-    			if(!$status) {
-    				return [200];
-    			}
+                return [200];
+                break;
 
-				abort_if($status->profile->user && $status->profile->user->is_admin, 400, 'Cannot moderate an admin account post.');
+            case 'private':
+                $status = Status::find($report->object_id);
 
-    			$status->scope = 'private';
-    			$status->visibility = 'private';
-    			$status->save();
-    			StatusService::del($status->id);
-				PublicTimelineService::rem($status->id);
+                if (! $status) {
+                    return [200];
+                }
 
-				ModLogService::boot()
-					->objectUid($status->profile_id)
-					->objectId($status->profile_id)
-					->objectType('App\Status::class')
-					->user(request()->user())
-					->action('admin.status.moderate')
-					->metadata([
-	                    'action' => 'private',
-	                    'message' => 'Success!'
-                	])
-					->accessLevel('admin')
-					->save();
+                abort_if($status->profile->user && $status->profile->user->is_admin, 400, 'Cannot moderate an admin account post.');
 
-    			Report::whereObjectId($report->object_id)
-    				->whereObjectType($report->object_type)
-    				->update([
-    					'admin_seen' => now()
-    				]);
-    			return [200];
-    		break;
+                $status->scope = 'private';
+                $status->visibility = 'private';
+                $status->save();
+                StatusService::del($status->id);
+                PublicTimelineService::rem($status->id);
 
-    		case 'unlist':
-    			$status = Status::find($report->object_id);
+                ModLogService::boot()
+                    ->objectUid($status->profile_id)
+                    ->objectId($status->profile_id)
+                    ->objectType('App\Status::class')
+                    ->user(request()->user())
+                    ->action('admin.status.moderate')
+                    ->metadata([
+                        'action' => 'private',
+                        'message' => 'Success!',
+                    ])
+                    ->accessLevel('admin')
+                    ->save();
 
-    			if(!$status) {
-    				return [200];
-    			}
+                Report::whereObjectId($report->object_id)
+                    ->whereObjectType($report->object_type)
+                    ->update([
+                        'admin_seen' => now(),
+                    ]);
 
-				abort_if($status->profile->user && $status->profile->user->is_admin, 400, 'Cannot moderate an admin account post.');
+                return [200];
+                break;
 
-    			if($status->scope === 'public') {
-	    			$status->scope = 'unlisted';
-	    			$status->visibility = 'unlisted';
-	    			$status->save();
-	    			StatusService::del($status->id);
-    				PublicTimelineService::rem($status->id);
-    			}
+            case 'unlist':
+                $status = Status::find($report->object_id);
 
-				ModLogService::boot()
-					->objectUid($status->profile_id)
-					->objectId($status->profile_id)
-					->objectType('App\Status::class')
-					->user(request()->user())
-					->action('admin.status.moderate')
-					->metadata([
-	                    'action' => 'unlist',
-	                    'message' => 'Success!'
-                	])
-					->accessLevel('admin')
-					->save();
+                if (! $status) {
+                    return [200];
+                }
 
-    			Report::whereObjectId($report->object_id)
-    				->whereObjectType($report->object_type)
-    				->update([
-    					'admin_seen' => now()
-    				]);
-    			return [200];
-    		break;
+                abort_if($status->profile->user && $status->profile->user->is_admin, 400, 'Cannot moderate an admin account post.');
 
-    		case 'delete':
-    			$status = Status::find($report->object_id);
+                if ($status->scope === 'public') {
+                    $status->scope = 'unlisted';
+                    $status->visibility = 'unlisted';
+                    $status->save();
+                    StatusService::del($status->id);
+                    PublicTimelineService::rem($status->id);
+                }
 
-    			if(!$status) {
-    				return [200];
-    			}
+                ModLogService::boot()
+                    ->objectUid($status->profile_id)
+                    ->objectId($status->profile_id)
+                    ->objectType('App\Status::class')
+                    ->user(request()->user())
+                    ->action('admin.status.moderate')
+                    ->metadata([
+                        'action' => 'unlist',
+                        'message' => 'Success!',
+                    ])
+                    ->accessLevel('admin')
+                    ->save();
 
-    			$profile = $status->profile;
+                Report::whereObjectId($report->object_id)
+                    ->whereObjectType($report->object_type)
+                    ->update([
+                        'admin_seen' => now(),
+                    ]);
 
-    			abort_if($profile->user && $profile->user->is_admin, 400, 'Cannot delete an admin account post.');
+                return [200];
+                break;
 
-    			StatusService::del($status->id);
+            case 'delete':
+                $status = Status::find($report->object_id);
 
-    			if($profile->user_id != null && $profile->domain == null) {
-    				PublicTimelineService::del($status->id);
-    				StatusDelete::dispatch($status)->onQueue('high');
-    			} else {
-    				NetworkTimelineService::del($status->id);
-    				RemoteStatusDelete::dispatch($status)->onQueue('high');
-    			}
+                if (! $status) {
+                    return [200];
+                }
 
-    			Report::whereObjectId($report->object_id)
-    				->whereObjectType($report->object_type)
-    				->update([
-    					'admin_seen' => now()
-    				]);
+                $profile = $status->profile;
 
-    			return [200];
-    		break;
-    	}
+                abort_if($profile->user && $profile->user->is_admin, 400, 'Cannot delete an admin account post.');
+
+                StatusService::del($status->id);
+
+                if ($profile->user_id != null && $profile->domain == null) {
+                    PublicTimelineService::del($status->id);
+                    StatusDelete::dispatch($status)->onQueue('high');
+                } else {
+                    NetworkTimelineService::del($status->id);
+                    RemoteStatusDelete::dispatch($status)->onQueue('high');
+                }
+
+                Report::whereObjectId($report->object_id)
+                    ->whereObjectType($report->object_type)
+                    ->update([
+                        'admin_seen' => now(),
+                    ]);
+
+                return [200];
+                break;
+        }
     }
 
     public function reportsApiSpamAll(Request $request)
     {
-    	$tab = $request->input('tab', 'home');
+        $tab = $request->input('tab', 'home');
 
-		$appeals = AdminSpamReport::collection(
-			AccountInterstitial::orderBy('id', 'desc')
-			->whereType('post.autospam')
-			->whereNull('appeal_handled_at')
-			->cursorPaginate(6)
-			->withQueryString()
-		);
+        $appeals = AdminSpamReport::collection(
+            AccountInterstitial::orderBy('id', 'desc')
+                ->whereType('post.autospam')
+                ->whereNull('appeal_handled_at')
+                ->cursorPaginate(6)
+                ->withQueryString()
+        );
 
-		return $appeals;
+        return $appeals;
     }
 
     public function reportsApiSpamHandle(Request $request)
     {
-    	$this->validate($request, [
-    		'id' => 'required',
-    		'action' => 'required|in:mark-read,mark-not-spam,mark-all-read,mark-all-not-spam,delete-profile',
-    	]);
+        $this->validate($request, [
+            'id' => 'required',
+            'action' => 'required|in:mark-read,mark-not-spam,mark-all-read,mark-all-not-spam,delete-profile',
+        ]);
 
-    	$action = $request->input('action');
+        $action = $request->input('action');
 
-		abort_if(
-			$action === 'delete-profile' &&
-			!config('pixelfed.account_deletion'),
-			404,
-			"Cannot delete profile, account_deletion is disabled.\n\n Set `ACCOUNT_DELETION=true` in .env and re-cache config."
-		);
+        abort_if(
+            $action === 'delete-profile' &&
+            ! config('pixelfed.account_deletion'),
+            404,
+            "Cannot delete profile, account_deletion is disabled.\n\n Set `ACCOUNT_DELETION=true` in .env and re-cache config."
+        );
 
-    	$report = AccountInterstitial::with('user')
-    		->whereType('post.autospam')
-    		->whereNull('appeal_handled_at')
-    		->findOrFail($request->input('id'));
+        $report = AccountInterstitial::with('user')
+            ->whereType('post.autospam')
+            ->whereNull('appeal_handled_at')
+            ->findOrFail($request->input('id'));
 
-    	$this->reportsHandleSpamAction($report, $action);
-    	Cache::forget('admin-dash:reports:spam-count');
-    	Cache::forget('pf:bouncer_v0:exemption_by_pid:' . $report->user->profile_id);
-		Cache::forget('pf:bouncer_v0:recent_by_pid:' . $report->user->profile_id);
-    	return [$action, $report];
+        $this->reportsHandleSpamAction($report, $action);
+        Cache::forget('admin-dash:reports:spam-count');
+        Cache::forget('pf:bouncer_v0:exemption_by_pid:'.$report->user->profile_id);
+        Cache::forget('pf:bouncer_v0:recent_by_pid:'.$report->user->profile_id);
+
+        return [$action, $report];
     }
 
     public function reportsHandleSpamAction($appeal, $action)
     {
-    	$meta = json_decode($appeal->meta);
+        $meta = json_decode($appeal->meta);
 
-		if($action == 'mark-read') {
-			$appeal->is_spam = true;
-			$appeal->appeal_handled_at = now();
-			$appeal->save();
-			PublicTimelineService::del($appeal->item_id);
-		}
+        if ($action == 'mark-read') {
+            $appeal->is_spam = true;
+            $appeal->appeal_handled_at = now();
+            $appeal->save();
+            PublicTimelineService::del($appeal->item_id);
+        }
 
-		if($action == 'mark-not-spam') {
-			$status = $appeal->status;
-			$status->is_nsfw = $meta->is_nsfw;
-			$status->scope = 'public';
-			$status->visibility = 'public';
-			$status->save();
+        if ($action == 'mark-not-spam') {
+            $status = $appeal->status;
+            $status->is_nsfw = $meta->is_nsfw;
+            $status->scope = 'public';
+            $status->visibility = 'public';
+            $status->save();
 
-			$appeal->is_spam = false;
-			$appeal->appeal_handled_at = now();
-			$appeal->save();
+            $appeal->is_spam = false;
+            $appeal->appeal_handled_at = now();
+            $appeal->save();
 
-			Notification::whereAction('autospam.warning')
-				->whereProfileId($appeal->user->profile_id)
-				->get()
-				->each(function($n) use($appeal) {
-					NotificationService::del($appeal->user->profile_id, $n->id);
-					$n->forceDelete();
-				});
+            Notification::whereAction('autospam.warning')
+                ->whereProfileId($appeal->user->profile_id)
+                ->get()
+                ->each(function ($n) use ($appeal) {
+                    NotificationService::del($appeal->user->profile_id, $n->id);
+                    $n->forceDelete();
+                });
 
-			StatusService::del($status->id);
-			StatusService::get($status->id);
-			if($status->in_reply_to_id == null && $status->reblog_of_id == null) {
-				PublicTimelineService::add($status->id);
-			}
-		}
+            StatusService::del($status->id);
+            StatusService::get($status->id);
+            if ($status->in_reply_to_id == null && $status->reblog_of_id == null) {
+                PublicTimelineService::add($status->id);
+            }
+        }
 
-		if($action == 'mark-all-read') {
-			AccountInterstitial::whereType('post.autospam')
-				->whereItemType('App\Status')
-				->whereNull('appeal_handled_at')
-				->whereUserId($appeal->user_id)
-				->update([
-					'appeal_handled_at' => now(),
-					'is_spam' => true
-				]);
-		}
+        if ($action == 'mark-all-read') {
+            AccountInterstitial::whereType('post.autospam')
+                ->whereItemType('App\Status')
+                ->whereNull('appeal_handled_at')
+                ->whereUserId($appeal->user_id)
+                ->update([
+                    'appeal_handled_at' => now(),
+                    'is_spam' => true,
+                ]);
+        }
 
-		if($action == 'mark-all-not-spam') {
-			AccountInterstitial::whereType('post.autospam')
-				->whereItemType('App\Status')
-				->whereUserId($appeal->user_id)
-				->get()
-				->each(function($report) use($meta) {
-					$report->is_spam = false;
-					$report->appeal_handled_at = now();
-					$report->save();
-					$status = Status::find($report->item_id);
-					if($status) {
-						$status->is_nsfw = $meta->is_nsfw;
-						$status->scope = 'public';
-						$status->visibility = 'public';
-						$status->save();
-						StatusService::del($status->id);
-					}
-					Notification::whereAction('autospam.warning')
-						->whereProfileId($report->user->profile_id)
-						->get()
-						->each(function($n) use($report) {
-							NotificationService::del($report->user->profile_id, $n->id);
-							$n->forceDelete();
-						});
-				});
-		}
+        if ($action == 'mark-all-not-spam') {
+            AccountInterstitial::whereType('post.autospam')
+                ->whereItemType('App\Status')
+                ->whereUserId($appeal->user_id)
+                ->get()
+                ->each(function ($report) use ($meta) {
+                    $report->is_spam = false;
+                    $report->appeal_handled_at = now();
+                    $report->save();
+                    $status = Status::find($report->item_id);
+                    if ($status) {
+                        $status->is_nsfw = $meta->is_nsfw;
+                        $status->scope = 'public';
+                        $status->visibility = 'public';
+                        $status->save();
+                        StatusService::del($status->id);
+                    }
+                    Notification::whereAction('autospam.warning')
+                        ->whereProfileId($report->user->profile_id)
+                        ->get()
+                        ->each(function ($n) use ($report) {
+                            NotificationService::del($report->user->profile_id, $n->id);
+                            $n->forceDelete();
+                        });
+                });
+        }
 
-		if($action == 'delete-profile') {
-			$user = User::findOrFail($appeal->user_id);
-			$profile = $user->profile;
+        if ($action == 'delete-profile') {
+            $user = User::findOrFail($appeal->user_id);
+            $profile = $user->profile;
 
-			if($user->is_admin == true) {
-				$mid = request()->user()->id;
-				abort_if($user->id < $mid, 403, 'You cannot delete an admin account.');
-			}
+            if ($user->is_admin == true) {
+                $mid = request()->user()->id;
+                abort_if($user->id < $mid, 403, 'You cannot delete an admin account.');
+            }
 
-			$ts = now()->addMonth();
-			$user->status = 'delete';
-			$profile->status = 'delete';
-			$user->delete_after = $ts;
-			$profile->delete_after = $ts;
-			$user->save();
-			$profile->save();
+            $ts = now()->addMonth();
+            $user->status = 'delete';
+            $profile->status = 'delete';
+            $user->delete_after = $ts;
+            $profile->delete_after = $ts;
+            $user->save();
+            $profile->save();
 
-			$appeal->appeal_handled_at = now();
-			$appeal->save();
+            $appeal->appeal_handled_at = now();
+            $appeal->save();
 
-			ModLogService::boot()
-				->objectUid($user->id)
-				->objectId($user->id)
-				->objectType('App\User::class')
-				->user(request()->user())
-				->action('admin.user.delete')
-				->accessLevel('admin')
-				->save();
+            ModLogService::boot()
+                ->objectUid($user->id)
+                ->objectId($user->id)
+                ->objectType('App\User::class')
+                ->user(request()->user())
+                ->action('admin.user.delete')
+                ->accessLevel('admin')
+                ->save();
 
-			Cache::forget('profiles:private');
-			DeleteAccountPipeline::dispatch($user);
-		}
+            Cache::forget('profiles:private');
+            DeleteAccountPipeline::dispatch($user);
+        }
     }
 
     public function reportsApiSpamGet(Request $request, $id)
     {
-    	$report = AccountInterstitial::findOrFail($id);
-    	return new AdminSpamReport($report);
+        $report = AccountInterstitial::findOrFail($id);
+
+        return new AdminSpamReport($report);
+    }
+
+    public function reportsApiRemoteHandle(Request $request)
+    {
+        $this->validate($request, [
+            'id' => 'required|exists:remote_reports,id',
+            'action' => 'required|in:mark-read,cw-posts,unlist-posts,delete-posts,private-posts,mark-all-read-by-domain,mark-all-read-by-username,cw-all-posts,private-all-posts,unlist-all-posts',
+        ]);
+
+        $report = RemoteReport::findOrFail($request->input('id'));
+        $user = User::whereProfileId($report->account_id)->first();
+        $ogPublicStatuses = [];
+        $ogUnlistedStatuses = [];
+        $ogNonCwStatuses = [];
+
+        switch ($request->input('action')) {
+            case 'mark-read':
+                $report->action_taken_at = now();
+                $report->save();
+                break;
+            case 'mark-all-read-by-domain':
+                RemoteReport::whereInstanceId($report->instance_id)->update(['action_taken_at' => now()]);
+                break;
+            case 'cw-posts':
+                $statuses = Status::find($report->status_ids);
+                foreach ($statuses as $status) {
+                    if ($report->account_id != $status->profile_id) {
+                        continue;
+                    }
+                    if (! $status->is_nsfw) {
+                        $ogNonCwStatuses[] = $status->id;
+                    }
+                    $status->is_nsfw = true;
+                    $status->saveQuietly();
+                    StatusService::del($status->id);
+                }
+                $report->action_taken_at = now();
+                $report->save();
+                break;
+            case 'cw-all-posts':
+                foreach (Status::whereProfileId($report->account_id)->lazyById(50, 'id') as $status) {
+                    if ($status->is_nsfw || $status->reblog_of_id) {
+                        continue;
+                    }
+                    if (! $status->is_nsfw) {
+                        $ogNonCwStatuses[] = $status->id;
+                    }
+                    $status->is_nsfw = true;
+                    $status->saveQuietly();
+                    StatusService::del($status->id);
+                }
+                break;
+            case 'unlist-posts':
+                $statuses = Status::find($report->status_ids);
+                foreach ($statuses as $status) {
+                    if ($report->account_id != $status->profile_id) {
+                        continue;
+                    }
+                    if ($status->scope === 'public') {
+                        $ogPublicStatuses[] = $status->id;
+                        $status->scope = 'unlisted';
+                        $status->visibility = 'unlisted';
+                        $status->saveQuietly();
+                        StatusService::del($status->id);
+                    }
+                }
+                $report->action_taken_at = now();
+                $report->save();
+                break;
+            case 'unlist-all-posts':
+                foreach (Status::whereProfileId($report->account_id)->lazyById(50, 'id') as $status) {
+                    if ($status->visibility !== 'public' || $status->reblog_of_id) {
+                        continue;
+                    }
+                    $ogPublicStatuses[] = $status->id;
+                    $status->visibility = 'unlisted';
+                    $status->scope = 'unlisted';
+                    $status->saveQuietly();
+                    StatusService::del($status->id);
+                }
+                break;
+            case 'private-posts':
+                $statuses = Status::find($report->status_ids);
+                foreach ($statuses as $status) {
+                    if ($report->account_id != $status->profile_id) {
+                        continue;
+                    }
+                    if (in_array($status->scope, ['public', 'unlisted', 'private'])) {
+                        if ($status->scope === 'public') {
+                            $ogPublicStatuses[] = $status->id;
+                        }
+                        $status->scope = 'private';
+                        $status->visibility = 'private';
+                        $status->saveQuietly();
+                        StatusService::del($status->id);
+                    }
+                }
+                $report->action_taken_at = now();
+                $report->save();
+                break;
+            case 'private-all-posts':
+                foreach (Status::whereProfileId($report->account_id)->lazyById(50, 'id') as $status) {
+                    if (! in_array($status->visibility, ['public', 'unlisted']) || $status->reblog_of_id) {
+                        continue;
+                    }
+                    if ($status->visibility === 'public') {
+                        $ogPublicStatuses[] = $status->id;
+                    } elseif ($status->visibility === 'unlisted') {
+                        $ogUnlistedStatuses[] = $status->id;
+                    }
+                    $status->visibility = 'private';
+                    $status->scope = 'private';
+                    $status->saveQuietly();
+                    StatusService::del($status->id);
+                }
+                break;
+            case 'delete-posts':
+                $statuses = Status::find($report->status_ids);
+                foreach ($statuses as $status) {
+                    if ($report->account_id != $status->profile_id) {
+                        continue;
+                    }
+                    StatusDelete::dispatch($status);
+                }
+                $report->action_taken_at = now();
+                $report->save();
+                break;
+            case 'mark-all-read-by-username':
+                RemoteReport::whereNull('action_taken_at')->whereAccountId($report->account_id)->update(['action_taken_at' => now()]);
+                break;
+
+            default:
+                abort(404);
+                break;
+        }
+
+        if ($ogPublicStatuses && count($ogPublicStatuses)) {
+            Storage::disk('local')->put('mod-log-cache/'.$report->account_id.'/'.now()->format('Y-m-d').'-og-public-statuses.json', json_encode($ogPublicStatuses, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
+        }
+
+        if ($ogNonCwStatuses && count($ogNonCwStatuses)) {
+            Storage::disk('local')->put('mod-log-cache/'.$report->account_id.'/'.now()->format('Y-m-d').'-og-noncw-statuses.json', json_encode($ogNonCwStatuses, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
+        }
+
+        if ($ogUnlistedStatuses && count($ogUnlistedStatuses)) {
+            Storage::disk('local')->put('mod-log-cache/'.$report->account_id.'/'.now()->format('Y-m-d').'-og-unlisted-statuses.json', json_encode($ogUnlistedStatuses, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
+        }
+
+        ModLogService::boot()
+            ->user(request()->user())
+            ->objectUid($user ? $user->id : null)
+            ->objectId($report->id)
+            ->objectType('App\Report::class')
+            ->action('admin.report.moderate')
+            ->metadata([
+                'action' => $request->input('action'),
+                'duration_active' => now()->parse($report->created_at)->diffForHumans(),
+            ])
+            ->accessLevel('admin')
+            ->save();
+
+        if ($report->status_ids) {
+            foreach ($report->status_ids as $sid) {
+                RemoteReport::whereNull('action_taken_at')
+                    ->whereJsonContains('status_ids', [$sid])
+                    ->update(['action_taken_at' => now()]);
+            }
+        }
+
+        return [200];
+    }
+
+    public function getModeratedProfiles(Request $request)
+    {
+        $this->validate($request, [
+            'search' => 'sometimes|string|min:3|max:120',
+        ]);
+
+        if ($request->filled('search')) {
+            $query = '%'.$request->input('search').'%';
+            $profiles = DB::table('moderated_profiles')
+                ->join('profiles', 'moderated_profiles.profile_id', '=', 'profiles.id')
+                ->where('profiles.username', 'LIKE', $query)
+                ->select('moderated_profiles.*', 'profiles.username')
+                ->orderByDesc('moderated_profiles.id')
+                ->cursorPaginate(10);
+
+            return AdminModeratedProfileResource::collection($profiles);
+        }
+        $profiles = ModeratedProfile::orderByDesc('id')->cursorPaginate(10);
+
+        return AdminModeratedProfileResource::collection($profiles);
+    }
+
+    public function getModeratedProfile(Request $request)
+    {
+        $this->validate($request, [
+            'id' => 'required',
+        ]);
+
+        $profile = ModeratedProfile::findOrFail($request->input('id'));
+
+        return new AdminModeratedProfileResource($profile);
+    }
+
+    public function exportModeratedProfiles(Request $request)
+    {
+        return response()->streamDownload(function () {
+            $profiles = ModeratedProfile::get();
+            $res = AdminModeratedProfileResource::collection($profiles);
+            echo json_encode([
+                '_pixelfed_export' => true,
+                'meta' => [
+                    'ns' => 'https://pixelfed.org',
+                    'origin' => config('pixelfed.domain.app'),
+                    'date' => now()->format('c'),
+                    'type' => 'moderated-profiles',
+                    'version' => "1.0"
+                ],
+                'data' => $res
+            ], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
+        }, 'data-export.json');
+    }
+
+    public function deleteModeratedProfile(Request $request)
+    {
+        $this->validate($request, [
+            'id' => 'required',
+        ]);
+
+        $profile = ModeratedProfile::findOrFail($request->input('id'));
+
+        ModLogService::boot()
+            ->objectUid($profile->profile_id)
+            ->objectId($profile->id)
+            ->objectType('App\Models\ModeratedProfile::class')
+            ->user(request()->user())
+            ->action('admin.moderated-profiles.delete')
+            ->metadata([
+                'profile_url' => $profile->profile_url,
+                'profile_id' => $profile->profile_id,
+                'domain' => $profile->domain,
+                'note' => $profile->note,
+                'is_banned' => $profile->is_banned,
+                'is_nsfw' => $profile->is_nsfw,
+                'is_unlisted' => $profile->is_unlisted,
+                'is_noautolink' => $profile->is_noautolink,
+                'is_nodms' => $profile->is_nodms,
+                'is_notrending' => $profile->is_notrending,
+            ])
+            ->accessLevel('admin')
+            ->save();
+
+        $profile->delete();
+
+        return ['status' => 200, 'message' => 'Successfully deleted moderated profile!'];
+    }
+
+    public function updateModeratedProfile(Request $request)
+    {
+        $this->validate($request, [
+            'id' => 'required|exists:moderated_profiles',
+            'note' => 'sometimes|nullable|string|max:500',
+            'is_banned' => 'required|boolean',
+            'is_noautolink' => 'required|boolean',
+            'is_nodms' => 'required|boolean',
+            'is_notrending' => 'required|boolean',
+            'is_nsfw' => 'required|boolean',
+            'is_unlisted' => 'required|boolean',
+        ]);
+
+        $fields = [
+            'note',
+            'is_banned',
+            'is_noautolink',
+            'is_nodms',
+            'is_notrending',
+            'is_nsfw',
+            'is_unlisted',
+        ];
+
+        $profile = ModeratedProfile::findOrFail($request->input('id'));
+        $profile->update($request->only($fields));
+
+        ModLogService::boot()
+            ->objectUid($profile->profile_id)
+            ->objectId($profile->id)
+            ->objectType('App\Models\ModeratedProfile::class')
+            ->user(request()->user())
+            ->action('admin.moderated-profiles.update')
+            ->metadata($request->only($fields))
+            ->accessLevel('admin')
+            ->save();
+
+        return [200];
+    }
+
+    public function createModeratedProfile(Request $request)
+    {
+        $this->validate($request, [
+            'url' => 'required|url|starts_with:https://',
+        ]);
+
+        $url = $request->input('url');
+        $host = parse_url($url, PHP_URL_HOST);
+
+        abort_if($host === config('pixelfed.domain.app'), 400, 'You cannot add local users!');
+
+        $exists = ModeratedProfile::whereProfileUrl($url)->exists();
+        abort_if($exists, 400, 'Moderated profile already exists!');
+
+        $profile = Profile::whereRemoteUrl($url)->first();
+
+        if ($profile) {
+            $rec = ModeratedProfile::updateOrCreate([
+                'profile_id' => $profile->id,
+            ], [
+                'profile_url' => $profile->remote_url,
+                'domain' => $profile->domain,
+            ]);
+
+            ModLogService::boot()
+                ->objectUid($rec->profile_id)
+                ->objectId($rec->id)
+                ->objectType('App\Models\ModeratedProfile::class')
+                ->user(request()->user())
+                ->action('admin.moderated-profiles.create')
+                ->metadata([
+                    'profile_existed' => true,
+                ])
+                ->accessLevel('admin')
+                ->save();
+
+            return $rec;
+        }
+
+        $remoteSearch = Helpers::profileFetch($url);
+
+        if ($remoteSearch) {
+            $rec = ModeratedProfile::updateOrCreate([
+                'profile_id' => $remoteSearch->id,
+            ], [
+                'profile_url' => $remoteSearch->remote_url,
+                'domain' => $remoteSearch->domain,
+            ]);
+
+            ModLogService::boot()
+                ->objectUid($rec->profile_id)
+                ->objectId($rec->id)
+                ->objectType('App\Models\ModeratedProfile::class')
+                ->user(request()->user())
+                ->action('admin.moderated-profiles.create')
+                ->metadata([
+                    'profile_existed' => false,
+                ])
+                ->accessLevel('admin')
+                ->save();
+
+            return $rec;
+        }
+        abort(400, 'Invalid account');
     }
 }
diff --git a/app/Http/Controllers/Admin/AdminSettingsController.php b/app/Http/Controllers/Admin/AdminSettingsController.php
index 9d9c3dfb6..17ffd98fc 100644
--- a/app/Http/Controllers/Admin/AdminSettingsController.php
+++ b/app/Http/Controllers/Admin/AdminSettingsController.php
@@ -2,284 +2,888 @@
 
 namespace App\Http\Controllers\Admin;
 
-use Artisan, Cache, DB;
-use Illuminate\Http\Request;
-use Carbon\Carbon;
-use App\{Comment, Like, Media, Page, Profile, Report, Status, User};
-use App\Models\InstanceActor;
-use App\Http\Controllers\Controller;
-use App\Util\Lexer\PrettyNumber;
 use App\Models\ConfigCache;
+use App\Models\InstanceActor;
+use App\Page;
+use App\Profile;
 use App\Services\AccountService;
+use App\Services\AdminSettingsService;
 use App\Services\ConfigCacheService;
+use App\Services\FilesystemService;
+use App\User;
 use App\Util\Site\Config;
-use Illuminate\Support\Str;
+use Artisan;
+use Cache;
+use DB;
+use Illuminate\Http\Request;
 
 trait AdminSettingsController
 {
-	public function settings(Request $request)
-	{
-		$cloud_storage = ConfigCacheService::get('pixelfed.cloud_storage');
-		$cloud_disk = config('filesystems.cloud');
-		$cloud_ready = !empty(config('filesystems.disks.' . $cloud_disk . '.key')) && !empty(config('filesystems.disks.' . $cloud_disk . '.secret'));
-		$types = explode(',', ConfigCacheService::get('pixelfed.media_types'));
-		$rules = ConfigCacheService::get('app.rules') ? json_decode(ConfigCacheService::get('app.rules'), true) : null;
-		$jpeg = in_array('image/jpg', $types) || in_array('image/jpeg', $types);
-		$png = in_array('image/png', $types);
-		$gif = in_array('image/gif', $types);
-		$mp4 = in_array('video/mp4', $types);
-		$webp = in_array('image/webp', $types);
+    public function settings(Request $request)
+    {
+        $cloud_storage = ConfigCacheService::get('pixelfed.cloud_storage');
+        $cloud_disk = config('filesystems.cloud');
+        $cloud_ready = ! empty(config('filesystems.disks.'.$cloud_disk.'.key')) && ! empty(config('filesystems.disks.'.$cloud_disk.'.secret'));
+        $types = explode(',', ConfigCacheService::get('pixelfed.media_types'));
+        $rules = ConfigCacheService::get('app.rules') ? json_decode(ConfigCacheService::get('app.rules'), true) : null;
+        $jpeg = in_array('image/jpg', $types) || in_array('image/jpeg', $types);
+        $png = in_array('image/png', $types);
+        $gif = in_array('image/gif', $types);
+        $mp4 = in_array('video/mp4', $types);
+        $webp = in_array('image/webp', $types);
 
-		$availableAdmins = User::whereIsAdmin(true)->get();
-		$currentAdmin = config_cache('instance.admin.pid') ? AccountService::get(config_cache('instance.admin.pid'), true) : null;
+        $availableAdmins = User::whereIsAdmin(true)->get();
+        $currentAdmin = config_cache('instance.admin.pid') ? AccountService::get(config_cache('instance.admin.pid'), true) : null;
+        $openReg = (bool) config_cache('pixelfed.open_registration');
+        $curOnboarding = (bool) config_cache('instance.curated_registration.enabled');
+        $regState = $openReg ? 'open' : ($curOnboarding ? 'filtered' : 'closed');
+        $accountMigration = (bool) config_cache('federation.migration');
 
-		// $system = [
-		// 	'permissions' => is_writable(base_path('storage')) && is_writable(base_path('bootstrap')),
-		// 	'max_upload_size' => ini_get('post_max_size'),
-		// 	'image_driver' => config('image.driver'),
-		// 	'image_driver_loaded' => extension_loaded(config('image.driver'))
-		// ];
+        return view('admin.settings.home', compact(
+            'jpeg',
+            'png',
+            'gif',
+            'mp4',
+            'webp',
+            'rules',
+            'cloud_storage',
+            'cloud_disk',
+            'cloud_ready',
+            'availableAdmins',
+            'currentAdmin',
+            'regState',
+            'accountMigration'
+        ));
+    }
 
-		return view('admin.settings.home', compact(
-			'jpeg',
-			'png',
-			'gif',
-			'mp4',
-			'webp',
-			'rules',
-			'cloud_storage',
-			'cloud_disk',
-			'cloud_ready',
-			'availableAdmins',
-			'currentAdmin'
-			// 'system'
-		));
-	}
+    public function settingsHomeStore(Request $request)
+    {
+        $this->validate($request, [
+            'name' => 'nullable|string',
+            'short_description' => 'nullable',
+            'long_description' => 'nullable',
+            'max_photo_size' => 'nullable|integer|min:1',
+            'max_album_length' => 'nullable|integer|min:1|max:100',
+            'image_quality' => 'nullable|integer|min:1|max:100',
+            'type_jpeg' => 'nullable',
+            'type_png' => 'nullable',
+            'type_gif' => 'nullable',
+            'type_mp4' => 'nullable',
+            'type_webp' => 'nullable',
+            'admin_account_id' => 'nullable',
+            'regs' => 'required|in:open,filtered,closed',
+            'account_migration' => 'nullable',
+            'rule_delete' => 'sometimes',
+        ]);
 
-	public function settingsHomeStore(Request $request)
-	{
-		$this->validate($request, [
-			'name' => 'nullable|string',
-			'short_description' => 'nullable',
-			'long_description' => 'nullable',
-			'max_photo_size' => 'nullable|integer|min:1',
-			'max_album_length' => 'nullable|integer|min:1|max:100',
-			'image_quality' => 'nullable|integer|min:1|max:100',
-			'type_jpeg' => 'nullable',
-			'type_png' => 'nullable',
-			'type_gif' => 'nullable',
-			'type_mp4' => 'nullable',
-			'type_webp' => 'nullable',
-			'admin_account_id' => 'nullable',
-		]);
+        $orb = false;
+        $cob = false;
+        switch ($request->input('regs')) {
+            case 'open':
+                $orb = true;
+                $cob = false;
+                break;
 
-		if($request->filled('admin_account_id')) {
-			ConfigCacheService::put('instance.admin.pid', $request->admin_account_id);
-			Cache::forget('api:v1:instance-data:contact');
-			Cache::forget('api:v1:instance-data-response-v1');
-		}
-		if($request->filled('rule_delete')) {
-			$index = (int) $request->input('rule_delete');
-			$rules = ConfigCacheService::get('app.rules');
-			$json = json_decode($rules, true);
-			if(!$rules || empty($json)) {
-				return;
-			}
-			unset($json[$index]);
-			$json = json_encode(array_values($json));
-			ConfigCacheService::put('app.rules', $json);
-			Cache::forget('api:v1:instance-data:rules');
-			Cache::forget('api:v1:instance-data-response-v1');
-			return 200;
-		}
+            case 'filtered':
+                $orb = false;
+                $cob = true;
+                break;
 
-		$media_types = explode(',', config_cache('pixelfed.media_types'));
-		$media_types_original = $media_types;
+            case 'closed':
+                $orb = false;
+                $cob = false;
+                break;
+        }
 
-		$mimes = [
-			'type_jpeg' => 'image/jpeg',
-			'type_png' => 'image/png',
-			'type_gif' => 'image/gif',
-			'type_mp4' => 'video/mp4',
-			'type_webp' => 'image/webp',
-		];
+        ConfigCacheService::put('pixelfed.open_registration', (bool) $orb);
+        ConfigCacheService::put('instance.curated_registration.enabled', (bool) $cob);
 
-		foreach ($mimes as $key => $value) {
-			if($request->input($key) == 'on') {
-				if(!in_array($value, $media_types)) {
-					array_push($media_types, $value);
-				}
-			} else {
-				$media_types = array_diff($media_types, [$value]);
-			}
-		}
+        if ($request->filled('admin_account_id')) {
+            ConfigCacheService::put('instance.admin.pid', $request->admin_account_id);
+            Cache::forget('api:v1:instance-data:contact');
+            Cache::forget('api:v1:instance-data-response-v1');
+        }
+        if ($request->filled('rule_delete')) {
+            $index = (int) $request->input('rule_delete');
+            $rules = ConfigCacheService::get('app.rules');
+            $json = json_decode($rules, true);
+            if (! $rules || empty($json)) {
+                return;
+            }
+            unset($json[$index]);
+            $json = json_encode(array_values($json));
+            ConfigCacheService::put('app.rules', $json);
+            Cache::forget('api:v1:instance-data:rules');
+            Cache::forget('api:v1:instance-data-response-v1');
 
-		if($media_types !== $media_types_original) {
-			ConfigCacheService::put('pixelfed.media_types', implode(',', array_unique($media_types)));
-		}
+            return 200;
+        }
 
-		$keys = [
-			'name' => 'app.name',
-			'short_description' => 'app.short_description',
-			'long_description' => 'app.description',
-			'max_photo_size' => 'pixelfed.max_photo_size',
-			'max_album_length' => 'pixelfed.max_album_length',
-			'image_quality' => 'pixelfed.image_quality',
-			'account_limit' => 'pixelfed.max_account_size',
-			'custom_css' => 'uikit.custom.css',
-			'custom_js' => 'uikit.custom.js',
-			'about_title' => 'about.title'
-		];
+        $media_types = explode(',', config_cache('pixelfed.media_types'));
+        $media_types_original = $media_types;
 
-		foreach ($keys as $key => $value) {
-			$cc = ConfigCache::whereK($value)->first();
-			$val = $request->input($key);
-			if($cc && $cc->v != $val) {
-				ConfigCacheService::put($value, $val);
-			} else if(!empty($val)) {
-				ConfigCacheService::put($value, $val);
-			}
-		}
+        $mimes = [
+            'type_jpeg' => 'image/jpeg',
+            'type_png' => 'image/png',
+            'type_gif' => 'image/gif',
+            'type_mp4' => 'video/mp4',
+            'type_webp' => 'image/webp',
+        ];
 
-		$bools = [
-			'activitypub' => 'federation.activitypub.enabled',
-			'open_registration' => 'pixelfed.open_registration',
-			'mobile_apis' => 'pixelfed.oauth_enabled',
-			'stories' => 'instance.stories.enabled',
-			'ig_import' => 'pixelfed.import.instagram.enabled',
-			'spam_detection' => 'pixelfed.bouncer.enabled',
-			'require_email_verification' => 'pixelfed.enforce_email_verification',
-			'enforce_account_limit' => 'pixelfed.enforce_account_limit',
-			'show_custom_css' => 'uikit.show_custom.css',
-			'show_custom_js' => 'uikit.show_custom.js',
-			'cloud_storage' => 'pixelfed.cloud_storage',
-			'account_autofollow' => 'account.autofollow',
-			'show_directory' => 'instance.landing.show_directory',
-			'show_explore_feed' => 'instance.landing.show_explore',
-		];
+        foreach ($mimes as $key => $value) {
+            if ($request->input($key) == 'on') {
+                if (! in_array($value, $media_types)) {
+                    array_push($media_types, $value);
+                }
+            } else {
+                $media_types = array_diff($media_types, [$value]);
+            }
+        }
 
-		foreach ($bools as $key => $value) {
-			$active = $request->input($key) == 'on';
+        if ($media_types !== $media_types_original) {
+            ConfigCacheService::put('pixelfed.media_types', implode(',', array_unique($media_types)));
+        }
 
-			if($key == 'activitypub' && $active && !InstanceActor::exists()) {
-				Artisan::call('instance:actor');
-			}
+        $keys = [
+            'name' => 'app.name',
+            'short_description' => 'app.short_description',
+            'long_description' => 'app.description',
+            'max_photo_size' => 'pixelfed.max_photo_size',
+            'max_album_length' => 'pixelfed.max_album_length',
+            'image_quality' => 'pixelfed.image_quality',
+            'account_limit' => 'pixelfed.max_account_size',
+            'custom_css' => 'uikit.custom.css',
+            'custom_js' => 'uikit.custom.js',
+            'about_title' => 'about.title',
+        ];
 
-			if( $key == 'mobile_apis' &&
-				$active &&
-				!file_exists(storage_path('oauth-public.key')) &&
-				!file_exists(storage_path('oauth-private.key'))
-			) {
-				Artisan::call('passport:keys');
-				Artisan::call('route:cache');
-			}
+        foreach ($keys as $key => $value) {
+            $cc = ConfigCache::whereK($value)->first();
+            $val = $request->input($key);
+            if ($cc && $cc->v != $val) {
+                ConfigCacheService::put($value, $val);
+            } elseif (! empty($val)) {
+                ConfigCacheService::put($value, $val);
+            }
+        }
 
-			if(config_cache($value) !== $active) {
-				ConfigCacheService::put($value, (bool) $active);
-			}
-		}
+        $bools = [
+            'activitypub' => 'federation.activitypub.enabled',
+            // 'open_registration' => 'pixelfed.open_registration',
+            'mobile_apis' => 'pixelfed.oauth_enabled',
+            'stories' => 'instance.stories.enabled',
+            'ig_import' => 'pixelfed.import.instagram.enabled',
+            'spam_detection' => 'pixelfed.bouncer.enabled',
+            'require_email_verification' => 'pixelfed.enforce_email_verification',
+            'enforce_account_limit' => 'pixelfed.enforce_account_limit',
+            'show_custom_css' => 'uikit.show_custom.css',
+            'show_custom_js' => 'uikit.show_custom.js',
+            'cloud_storage' => 'pixelfed.cloud_storage',
+            'account_autofollow' => 'account.autofollow',
+            'show_directory' => 'instance.landing.show_directory',
+            'show_explore_feed' => 'instance.landing.show_explore',
+            'account_migration' => 'federation.migration',
+        ];
 
-		if($request->filled('new_rule')) {
-			$rules = ConfigCacheService::get('app.rules');
-			$val = $request->input('new_rule');
-			if(!$rules) {
-				ConfigCacheService::put('app.rules', json_encode([$val]));
-			} else {
-				$json = json_decode($rules, true);
-				$json[] = $val;
-				ConfigCacheService::put('app.rules', json_encode(array_values($json)));
-			}
-			Cache::forget('api:v1:instance-data:rules');
-			Cache::forget('api:v1:instance-data-response-v1');
-		}
+        foreach ($bools as $key => $value) {
+            $active = $request->input($key) == 'on';
 
-		if($request->filled('account_autofollow_usernames')) {
-			$usernames = explode(',', $request->input('account_autofollow_usernames'));
-			$names = [];
+            if ($key == 'activitypub' && $active && ! InstanceActor::exists()) {
+                Artisan::call('instance:actor');
+            }
 
-			foreach($usernames as $n) {
-				$p = Profile::whereUsername($n)->first();
-				if(!$p) {
-					continue;
-				}
-				array_push($names, $p->username);
-			}
+            if ($key == 'mobile_apis' &&
+                $active &&
+                ! file_exists(storage_path('oauth-public.key')) &&
+                ! config_cache('passport.public_key') &&
+                ! file_exists(storage_path('oauth-private.key')) &&
+                ! config_cache('passport.private_key')
+            ) {
+                Artisan::call('passport:keys');
+                Artisan::call('route:cache');
+            }
 
-			ConfigCacheService::put('account.autofollow_usernames', implode(',', $names));
-		}
+            if (config_cache($value) !== $active) {
+                ConfigCacheService::put($value, (bool) $active);
+            }
+        }
 
-		Cache::forget(Config::CACHE_KEY);
+        if ($request->filled('new_rule')) {
+            $rules = ConfigCacheService::get('app.rules');
+            $val = $request->input('new_rule');
+            if (! $rules) {
+                ConfigCacheService::put('app.rules', json_encode([$val]));
+            } else {
+                $json = json_decode($rules, true);
+                $json[] = $val;
+                ConfigCacheService::put('app.rules', json_encode(array_values($json)));
+            }
+            Cache::forget('api:v1:instance-data:rules');
+            Cache::forget('api:v1:instance-data-response-v1');
+        }
 
-		return redirect('/i/admin/settings')->with('status', 'Successfully updated settings!');
-	}
+        if ($request->filled('account_autofollow_usernames')) {
+            $usernames = explode(',', $request->input('account_autofollow_usernames'));
+            $names = [];
 
-	public function settingsBackups(Request $request)
-	{
-		$path = storage_path('app/'.config('app.name'));
-		$files = is_dir($path) ? new \DirectoryIterator($path) : [];
-		return view('admin.settings.backups', compact('files'));
-	}
+            foreach ($usernames as $n) {
+                $p = Profile::whereUsername($n)->first();
+                if (! $p) {
+                    continue;
+                }
+                array_push($names, $p->username);
+            }
 
-	public function settingsMaintenance(Request $request)
-	{
-		return view('admin.settings.maintenance');
-	}
+            ConfigCacheService::put('account.autofollow_usernames', implode(',', $names));
+        }
 
-	public function settingsStorage(Request $request)
-	{
-		$storage = [];
-		return view('admin.settings.storage', compact('storage'));
-	}
+        Cache::forget(Config::CACHE_KEY);
 
-	public function settingsFeatures(Request $request)
-	{
-		return view('admin.settings.features');
-	}
+        return redirect('/i/admin/settings')->with('status', 'Successfully updated settings!');
+    }
 
-	public function settingsPages(Request $request)
-	{
-		$pages = Page::orderByDesc('updated_at')->paginate(10);
-		return view('admin.pages.home', compact('pages'));
-	}
+    public function settingsBackups(Request $request)
+    {
+        $path = storage_path('app/'.config('app.name'));
+        $files = is_dir($path) ? new \DirectoryIterator($path) : [];
 
-	public function settingsPageEdit(Request $request)
-	{
-		return view('admin.pages.edit');
-	}
+        return view('admin.settings.backups', compact('files'));
+    }
 
-	public function settingsSystem(Request $request)
-	{
-		$sys = [
-			'pixelfed' => config('pixelfed.version'),
-			'php' => phpversion(),
-			'laravel' => app()->version(),
-		];
-		switch (config('database.default')) {
-			case 'pgsql':
-			$exp = DB::raw('select version();');
-			$expQuery = $exp->getValue(DB::connection()->getQueryGrammar());
-			$sys['database'] = [
-				'name' => 'Postgres',
-				'version' => explode(' ', DB::select($expQuery)[0]->version)[1]
-			];
-			break;
+    public function settingsMaintenance(Request $request)
+    {
+        return view('admin.settings.maintenance');
+    }
 
-			case 'mysql':
-			$exp = DB::raw('select version()');
-			$expQuery = $exp->getValue(DB::connection()->getQueryGrammar());
-			$sys['database'] = [
-				'name' => 'MySQL',
-				'version' => DB::select($expQuery)[0]->{'version()'}
-			];
-			break;
+    public function settingsStorage(Request $request)
+    {
+        $storage = [];
 
-			default:
-			$sys['database'] = [
-				'name' => 'Unknown',
-				'version' => '?'
-			];
-			break;
-		}
-		return view('admin.settings.system', compact('sys'));
-	}
+        return view('admin.settings.storage', compact('storage'));
+    }
+
+    public function settingsFeatures(Request $request)
+    {
+        return view('admin.settings.features');
+    }
+
+    public function settingsPages(Request $request)
+    {
+        $pages = Page::orderByDesc('updated_at')->paginate(10);
+
+        return view('admin.pages.home', compact('pages'));
+    }
+
+    public function settingsPageEdit(Request $request)
+    {
+        return view('admin.pages.edit');
+    }
+
+    public function settingsSystem(Request $request)
+    {
+        $sys = [
+            'pixelfed' => config('pixelfed.version'),
+            'php' => phpversion(),
+            'laravel' => app()->version(),
+        ];
+        switch (config('database.default')) {
+            case 'pgsql':
+                $exp = DB::raw('select version();');
+                $expQuery = $exp->getValue(DB::connection()->getQueryGrammar());
+                $sys['database'] = [
+                    'name' => 'Postgres',
+                    'version' => explode(' ', DB::select($expQuery)[0]->version)[1],
+                ];
+                break;
+
+            case 'mysql':
+                $exp = DB::raw('select version()');
+                $expQuery = $exp->getValue(DB::connection()->getQueryGrammar());
+                $sys['database'] = [
+                    'name' => 'MySQL',
+                    'version' => DB::select($expQuery)[0]->{'version()'},
+                ];
+                break;
+
+            default:
+                $sys['database'] = [
+                    'name' => 'Unknown',
+                    'version' => '?',
+                ];
+                break;
+        }
+
+        return view('admin.settings.system', compact('sys'));
+    }
+
+    public function settingsApiFetch(Request $request)
+    {
+        $cloud_storage = ConfigCacheService::get('pixelfed.cloud_storage');
+        $cloud_disk = config('filesystems.cloud');
+        $cloud_ready = ! empty(config('filesystems.disks.'.$cloud_disk.'.key')) && ! empty(config('filesystems.disks.'.$cloud_disk.'.secret'));
+        $types = explode(',', ConfigCacheService::get('pixelfed.media_types'));
+        $rules = ConfigCacheService::get('app.rules') ? json_decode(ConfigCacheService::get('app.rules'), true) : [];
+        $jpeg = in_array('image/jpg', $types) || in_array('image/jpeg', $types);
+        $png = in_array('image/png', $types);
+        $gif = in_array('image/gif', $types);
+        $mp4 = in_array('video/mp4', $types);
+        $webp = in_array('image/webp', $types);
+
+        $availableAdmins = User::whereIsAdmin(true)->get();
+        $currentAdmin = config_cache('instance.admin.pid') ? AccountService::get(config_cache('instance.admin.pid'), true) : null;
+        $openReg = (bool) config_cache('pixelfed.open_registration');
+        $curOnboarding = (bool) config_cache('instance.curated_registration.enabled');
+        $regState = $openReg ? 'open' : ($curOnboarding ? 'filtered' : 'closed');
+        $accountMigration = (bool) config_cache('federation.migration');
+        $autoFollow = config_cache('account.autofollow_usernames');
+        if (strlen($autoFollow) > 3) {
+            $autoFollow = explode(',', $autoFollow);
+        }
+
+        $res = AdminSettingsService::getAll();
+
+        return response()->json($res);
+    }
+
+    public function settingsApiRulesAdd(Request $request)
+    {
+        $this->validate($request, [
+            'rule' => 'required|string|min:5|max:1000',
+        ]);
+
+        $rules = ConfigCacheService::get('app.rules');
+        $val = $request->input('rule');
+        if (! $rules) {
+            ConfigCacheService::put('app.rules', json_encode([$val]));
+        } else {
+            $json = json_decode($rules, true);
+            $count = count($json);
+            if ($count >= 30) {
+                return response()->json(['message' => 'Max rules limit reached, you can set up to 30 rules at a time.'], 400);
+            }
+            $json[] = $val;
+            ConfigCacheService::put('app.rules', json_encode(array_values($json)));
+        }
+        Cache::forget('api:v1:instance-data:rules');
+        Cache::forget('api:v1:instance-data-response-v1');
+        Cache::forget('api:v2:instance-data-response-v2');
+        Config::refresh();
+
+        return [$val];
+    }
+
+    public function settingsApiRulesDelete(Request $request)
+    {
+        $this->validate($request, [
+            'rule' => 'required|string',
+        ]);
+
+        $rules = ConfigCacheService::get('app.rules');
+        $val = $request->input('rule');
+
+        if (! $rules) {
+            return [];
+        } else {
+            $json = json_decode($rules, true);
+            $idx = array_search($val, $json);
+            if ($idx !== false) {
+                unset($json[$idx]);
+                $json = array_values($json);
+            }
+            ConfigCacheService::put('app.rules', json_encode(array_values($json)));
+        }
+
+        Cache::forget('api:v1:instance-data:rules');
+        Cache::forget('api:v1:instance-data-response-v1');
+        Cache::forget('api:v2:instance-data-response-v2');
+        Config::refresh();
+
+        return response()->json($json);
+    }
+
+    public function settingsApiRulesDeleteAll(Request $request)
+    {
+        $rules = ConfigCacheService::get('app.rules');
+
+        if (! $rules) {
+            return [];
+        } else {
+            ConfigCacheService::put('app.rules', json_encode([]));
+        }
+
+        Cache::forget('api:v1:instance-data:rules');
+        Cache::forget('api:v1:instance-data-response-v1');
+        Cache::forget('api:v2:instance-data-response-v2');
+        Config::refresh();
+
+        return response()->json([]);
+    }
+
+    public function settingsApiAutofollowDelete(Request $request)
+    {
+        $this->validate($request, [
+            'username' => 'required|string',
+        ]);
+
+        $username = $request->input('username');
+        $names = [];
+        $existing = config_cache('account.autofollow_usernames');
+        if ($existing) {
+            $names = explode(',', $existing);
+        }
+
+        if (in_array($username, $names)) {
+            $key = array_search($username, $names);
+            if ($key !== false) {
+                unset($names[$key]);
+            }
+        }
+        ConfigCacheService::put('account.autofollow_usernames', implode(',', $names));
+
+        return response()->json(['accounts' => array_values($names)]);
+    }
+
+    public function settingsApiAutofollowAdd(Request $request)
+    {
+        $this->validate($request, [
+            'username' => 'required|string',
+        ]);
+
+        $username = $request->input('username');
+        $names = [];
+        $existing = config_cache('account.autofollow_usernames');
+        if ($existing) {
+            $names = explode(',', $existing);
+        }
+
+        if ($existing && count($names)) {
+            if (count($names) >= 5) {
+                return response()->json(['message' => 'You can only add up to 5 accounts to be autofollowed.'], 400);
+            }
+            if (in_array(strtolower($username), array_map('strtolower', $names))) {
+                return response()->json(['message' => 'User already exists, please try again.'], 400);
+            }
+        }
+
+        $p = User::whereUsername($username)->whereNull('status')->first();
+        if (! $p || in_array($p->username, $names)) {
+            abort(404);
+        }
+        array_push($names, $p->username);
+        ConfigCacheService::put('account.autofollow_usernames', implode(',', $names));
+
+        return response()->json(['accounts' => array_values($names)]);
+    }
+
+    public function settingsApiUpdateType(Request $request, $type)
+    {
+        abort_unless(in_array($type, [
+            'posts',
+            'platform',
+            'home',
+            'landing',
+            'branding',
+            'media',
+            'users',
+            'storage',
+        ]), 400);
+
+        switch ($type) {
+            case 'home':
+                return $this->settingsApiUpdateHomeType($request);
+                break;
+
+            case 'landing':
+                return $this->settingsApiUpdateLandingType($request);
+                break;
+
+            case 'posts':
+                return $this->settingsApiUpdatePostsType($request);
+                break;
+
+            case 'platform':
+                return $this->settingsApiUpdatePlatformType($request);
+                break;
+
+            case 'branding':
+                return $this->settingsApiUpdateBrandingType($request);
+                break;
+
+            case 'media':
+                return $this->settingsApiUpdateMediaType($request);
+                break;
+
+            case 'users':
+                return $this->settingsApiUpdateUsersType($request);
+                break;
+
+            case 'storage':
+                return $this->settingsApiUpdateStorageType($request);
+                break;
+
+            default:
+                abort(404);
+                break;
+        }
+    }
+
+    public function settingsApiUpdateHomeType($request)
+    {
+        $this->validate($request, [
+            'registration_status' => 'required|in:open,filtered,closed',
+            'cloud_storage' => 'required',
+            'activitypub_enabled' => 'required',
+            'authorized_fetch' => 'required',
+            'account_migration' => 'required',
+            'mobile_apis' => 'required',
+            'stories' => 'required',
+            'instagram_import' => 'required',
+            'autospam_enabled' => 'required',
+        ]);
+
+        $regStatus = $request->input('registration_status');
+        ConfigCacheService::put('pixelfed.open_registration', $regStatus === 'open');
+        ConfigCacheService::put('instance.curated_registration.enabled', $regStatus === 'filtered');
+        $cloudStorage = $request->boolean('cloud_storage');
+        if ($cloudStorage !== (bool) config_cache('pixelfed.cloud_storage')) {
+            if (! $cloudStorage) {
+                ConfigCacheService::put('pixelfed.cloud_storage', false);
+            } else {
+                $cloud_disk = config('filesystems.cloud');
+                $cloud_ready = ! empty(config('filesystems.disks.'.$cloud_disk.'.key')) && ! empty(config('filesystems.disks.'.$cloud_disk.'.secret'));
+                if (! $cloud_ready) {
+                    return redirect()->back()->withErrors(['cloud_storage' => 'Must configure cloud storage before enabling!']);
+                } else {
+                    ConfigCacheService::put('pixelfed.cloud_storage', true);
+                }
+            }
+        }
+        ConfigCacheService::put('federation.activitypub.authorized_fetch', $request->boolean('authorized_fetch'));
+        ConfigCacheService::put('federation.activitypub.enabled', $request->boolean('activitypub_enabled'));
+        ConfigCacheService::put('federation.migration', $request->boolean('account_migration'));
+        ConfigCacheService::put('pixelfed.oauth_enabled', $request->boolean('mobile_apis'));
+        ConfigCacheService::put('instance.stories.enabled', $request->boolean('stories'));
+        ConfigCacheService::put('pixelfed.import.instagram.enabled', $request->boolean('instagram_import'));
+        ConfigCacheService::put('pixelfed.bouncer.enabled', $request->boolean('autospam_enabled'));
+
+        Cache::forget('api:v1:instance-data-response-v1');
+        Cache::forget('api:v2:instance-data-response-v2');
+        Cache::forget('api:v1:instance-data:contact');
+        Config::refresh();
+
+        return $request->all();
+    }
+
+    public function settingsApiUpdateLandingType($request)
+    {
+        $this->validate($request, [
+            'current_admin' => 'required',
+            'show_directory' => 'required',
+            'show_explore' => 'required',
+        ]);
+
+        ConfigCacheService::put('instance.admin.pid', $request->input('current_admin'));
+        ConfigCacheService::put('instance.landing.show_directory', $request->boolean('show_directory'));
+        ConfigCacheService::put('instance.landing.show_explore', $request->boolean('show_explore'));
+
+        Cache::forget('api:v1:instance-data:rules');
+        Cache::forget('api:v1:instance-data-response-v1');
+        Cache::forget('api:v2:instance-data-response-v2');
+        Cache::forget('api:v1:instance-data:contact');
+        Config::refresh();
+
+        return $request->all();
+    }
+
+    public function settingsApiUpdateMediaType($request)
+    {
+        $this->validate($request, [
+            'image_quality' => 'required|integer|min:1|max:100',
+            'max_album_length' => 'required|integer|min:1|max:20',
+            'max_photo_size' => 'required|integer|min:100|max:50000',
+            'media_types' => 'required',
+            'optimize_image' => 'required',
+            'optimize_video' => 'required',
+        ]);
+
+        $mediaTypes = $request->input('media_types');
+        $mediaArray = explode(',', $mediaTypes);
+        foreach ($mediaArray as $mediaType) {
+            if (! in_array($mediaType, ['image/jpeg', 'image/png', 'image/gif', 'image/webp', 'video/mp4'])) {
+                return redirect()->back()->withErrors(['media_types' => 'Invalid media type']);
+            }
+        }
+
+        ConfigCacheService::put('pixelfed.media_types', $request->input('media_types'));
+        ConfigCacheService::put('pixelfed.image_quality', $request->input('image_quality'));
+        ConfigCacheService::put('pixelfed.max_album_length', $request->input('max_album_length'));
+        ConfigCacheService::put('pixelfed.max_photo_size', $request->input('max_photo_size'));
+        ConfigCacheService::put('pixelfed.optimize_image', $request->boolean('optimize_image'));
+        ConfigCacheService::put('pixelfed.optimize_video', $request->boolean('optimize_video'));
+
+        Cache::forget('api:v1:instance-data:rules');
+        Cache::forget('api:v1:instance-data-response-v1');
+        Cache::forget('api:v2:instance-data-response-v2');
+        Cache::forget('api:v1:instance-data:contact');
+        Config::refresh();
+
+        return $request->all();
+    }
+
+    public function settingsApiUpdateBrandingType($request)
+    {
+        $this->validate($request, [
+            'name' => 'required',
+            'short_description' => 'required',
+            'long_description' => 'required',
+        ]);
+
+        ConfigCacheService::put('app.name', $request->input('name'));
+        ConfigCacheService::put('app.short_description', $request->input('short_description'));
+        ConfigCacheService::put('app.description', $request->input('long_description'));
+
+        Cache::forget('api:v1:instance-data:rules');
+        Cache::forget('api:v1:instance-data-response-v1');
+        Cache::forget('api:v2:instance-data-response-v2');
+        Cache::forget('api:v1:instance-data:contact');
+        Config::refresh();
+
+        return $request->all();
+    }
+
+    public function settingsApiUpdatePostsType($request)
+    {
+        $this->validate($request, [
+            'max_caption_length' => 'required|integer|min:5|max:10000',
+            'max_altext_length' => 'required|integer|min:5|max:40000',
+        ]);
+
+        ConfigCacheService::put('pixelfed.max_caption_length', $request->input('max_caption_length'));
+        ConfigCacheService::put('pixelfed.max_altext_length', $request->input('max_altext_length'));
+        $res = [
+            'max_caption_length' => $request->input('max_caption_length'),
+            'max_altext_length' => $request->input('max_altext_length'),
+        ];
+        Cache::forget('api:v1:instance-data:rules');
+        Cache::forget('api:v1:instance-data-response-v1');
+        Cache::forget('api:v2:instance-data-response-v2');
+        Config::refresh();
+
+        return $res;
+    }
+
+    public function settingsApiUpdatePlatformType($request)
+    {
+        $this->validate($request, [
+            'allow_app_registration' => 'required',
+            'app_registration_rate_limit_attempts' => 'required|integer|min:1',
+            'app_registration_rate_limit_decay' => 'required|integer|min:1',
+            'app_registration_confirm_rate_limit_attempts' => 'required|integer|min:1',
+            'app_registration_confirm_rate_limit_decay' => 'required|integer|min:1',
+            'allow_post_embeds' => 'required',
+            'allow_profile_embeds' => 'required',
+            'captcha_enabled' => 'required',
+            'captcha_on_login' => 'required_if_accepted:captcha_enabled',
+            'captcha_on_register' => 'required_if_accepted:captcha_enabled',
+            'captcha_secret' => 'required_if_accepted:captcha_enabled',
+            'captcha_sitekey' => 'required_if_accepted:captcha_enabled',
+            'custom_emoji_enabled' => 'required',
+        ]);
+
+        ConfigCacheService::put('pixelfed.allow_app_registration', $request->boolean('allow_app_registration'));
+        ConfigCacheService::put('pixelfed.app_registration_rate_limit_attempts', $request->input('app_registration_rate_limit_attempts'));
+        ConfigCacheService::put('pixelfed.app_registration_rate_limit_decay', $request->input('app_registration_rate_limit_decay'));
+        ConfigCacheService::put('pixelfed.app_registration_confirm_rate_limit_attempts', $request->input('app_registration_confirm_rate_limit_attempts'));
+        ConfigCacheService::put('pixelfed.app_registration_confirm_rate_limit_decay', $request->input('app_registration_confirm_rate_limit_decay'));
+        ConfigCacheService::put('instance.embed.post', $request->boolean('allow_post_embeds'));
+        ConfigCacheService::put('instance.embed.profile', $request->boolean('allow_profile_embeds'));
+        ConfigCacheService::put('federation.custom_emoji.enabled', $request->boolean('custom_emoji_enabled'));
+        $captcha = $request->boolean('captcha_enabled');
+        if ($captcha) {
+            $secret = $request->input('captcha_secret');
+            $sitekey = $request->input('captcha_sitekey');
+            if (config_cache('captcha.secret') != $secret && strpos($secret, '*') === false) {
+                ConfigCacheService::put('captcha.secret', $secret);
+            }
+            if (config_cache('captcha.sitekey') != $sitekey && strpos($sitekey, '*') === false) {
+                ConfigCacheService::put('captcha.sitekey', $sitekey);
+            }
+            ConfigCacheService::put('captcha.active.login', $request->boolean('captcha_on_login'));
+            ConfigCacheService::put('captcha.active.register', $request->boolean('captcha_on_register'));
+            ConfigCacheService::put('captcha.triggers.login.enabled', $request->boolean('captcha_on_login'));
+            ConfigCacheService::put('captcha.enabled', true);
+        } else {
+            ConfigCacheService::put('captcha.enabled', false);
+        }
+        $res = [
+            'allow_app_registration' => $request->boolean('allow_app_registration'),
+            'app_registration_rate_limit_attempts' => $request->input('app_registration_rate_limit_attempts'),
+            'app_registration_rate_limit_decay' => $request->input('app_registration_rate_limit_decay'),
+            'app_registration_confirm_rate_limit_attempts' => $request->input('app_registration_confirm_rate_limit_attempts'),
+            'app_registration_confirm_rate_limit_decay' => $request->input('app_registration_confirm_rate_limit_decay'),
+            'allow_post_embeds' => $request->boolean('allow_post_embeds'),
+            'allow_profile_embeds' => $request->boolean('allow_profile_embeds'),
+            'captcha_enabled' => $request->boolean('captcha_enabled'),
+            'captcha_on_login' => $request->boolean('captcha_on_login'),
+            'captcha_on_register' => $request->boolean('captcha_on_register'),
+            'captcha_secret' => $request->input('captcha_secret'),
+            'captcha_sitekey' => $request->input('captcha_sitekey'),
+            'custom_emoji_enabled' => $request->boolean('custom_emoji_enabled'),
+        ];
+        Cache::forget('api:v1:instance-data:rules');
+        Cache::forget('api:v1:instance-data-response-v1');
+        Cache::forget('api:v2:instance-data-response-v2');
+        Config::refresh();
+
+        return $res;
+    }
+
+    public function settingsApiUpdateUsersType($request)
+    {
+        $this->validate($request, [
+            'require_email_verification' => 'required',
+            'enforce_account_limit' => 'required',
+            'max_account_size' => 'required|integer|min:50000',
+            'admin_autofollow' => 'required',
+            'admin_autofollow_accounts' => 'sometimes',
+            'max_user_blocks' => 'required|integer|min:0|max:5000',
+            'max_user_mutes' => 'required|integer|min:0|max:5000',
+            'max_domain_blocks' => 'required|integer|min:0|max:5000',
+        ]);
+
+        $adminAutofollow = $request->boolean('admin_autofollow');
+        $adminAutofollowAccounts = $request->input('admin_autofollow_accounts');
+        if ($adminAutofollow) {
+            if ($request->filled('admin_autofollow_accounts')) {
+                $names = [];
+                $existing = config_cache('account.autofollow_usernames');
+                if ($existing) {
+                    $names = explode(',', $existing);
+                    foreach (array_map('strtolower', $adminAutofollowAccounts) as $afc) {
+                        if (in_array(strtolower($afc), array_map('strtolower', $names))) {
+                            continue;
+                        }
+                        $names[] = $afc;
+                    }
+                } else {
+                    $names = $adminAutofollowAccounts;
+                }
+                if (! $names || count($names) == 0) {
+                    return response()->json(['message' => 'You need to assign autofollow accounts before you can enable it.'], 400);
+                }
+                if (count($names) > 5) {
+                    return response()->json(['message' => 'You can only add up to 5 accounts to be autofollowed.'.json_encode($names)], 400);
+                }
+                $autofollows = User::whereIn('username', $names)->whereNull('status')->pluck('username');
+                $adminAutofollowAccounts = $autofollows->implode(',');
+                ConfigCacheService::put('account.autofollow_usernames', $adminAutofollowAccounts);
+            } else {
+                return response()->json(['message' => 'You need to assign autofollow accounts before you can enable it.'], 400);
+            }
+        }
+
+        ConfigCacheService::put('pixelfed.enforce_email_verification', $request->boolean('require_email_verification'));
+        ConfigCacheService::put('pixelfed.enforce_account_limit', $request->boolean('enforce_account_limit'));
+        ConfigCacheService::put('pixelfed.max_account_size', $request->input('max_account_size'));
+        ConfigCacheService::put('account.autofollow', $request->boolean('admin_autofollow'));
+        ConfigCacheService::put('instance.user_filters.max_user_blocks', (int) $request->input('max_user_blocks'));
+        ConfigCacheService::put('instance.user_filters.max_user_mutes', (int) $request->input('max_user_mutes'));
+        ConfigCacheService::put('instance.user_filters.max_domain_blocks', (int) $request->input('max_domain_blocks'));
+        $res = [
+            'require_email_verification' => $request->boolean('require_email_verification'),
+            'enforce_account_limit' => $request->boolean('enforce_account_limit'),
+            'admin_autofollow' => $request->boolean('admin_autofollow'),
+            'admin_autofollow_accounts' => $adminAutofollowAccounts,
+            'max_user_blocks' => $request->input('max_user_blocks'),
+            'max_user_mutes' => $request->input('max_user_mutes'),
+            'max_domain_blocks' => $request->input('max_domain_blocks'),
+        ];
+        Cache::forget('api:v1:instance-data:rules');
+        Cache::forget('api:v1:instance-data-response-v1');
+        Cache::forget('api:v2:instance-data-response-v2');
+        Config::refresh();
+
+        return $res;
+    }
+
+    public function settingsApiUpdateStorageType($request)
+    {
+        $this->validate($request, [
+            'primary_disk' => 'required|in:local,cloud',
+            'update_disk' => 'sometimes',
+            'disk_config' => 'required_if_accepted:update_disk',
+            'disk_config.driver' => 'required|in:s3,spaces',
+            'disk_config.key' => 'required',
+            'disk_config.secret' => 'required',
+            'disk_config.region' => 'required',
+            'disk_config.bucket' => 'required',
+            'disk_config.visibility' => 'required',
+            'disk_config.endpoint' => 'required',
+            'disk_config.url' => 'nullable',
+        ]);
+
+        ConfigCacheService::put('pixelfed.cloud_storage', $request->input('primary_disk') === 'cloud');
+        $res = [
+            'primary_disk' => $request->input('primary_disk'),
+        ];
+        if ($request->has('update_disk')) {
+            $res['disk_config'] = $request->input('disk_config');
+            $changes = [];
+            $dkey = $request->input('disk_config.driver') === 's3' ? 'filesystems.disks.s3.' : 'filesystems.disks.spaces.';
+            $key = $request->input('disk_config.key');
+            $ckey = null;
+            $secret = $request->input('disk_config.secret');
+            $csecret = null;
+            $region = $request->input('disk_config.region');
+            $bucket = $request->input('disk_config.bucket');
+            $visibility = $request->input('disk_config.visibility');
+            $url = $request->input('disk_config.url');
+            $endpoint = $request->input('disk_config.endpoint');
+            if (strpos($key, '*') === false && $key != config_cache($dkey.'key')) {
+                array_push($changes, 'key');
+            } else {
+                $ckey = config_cache($dkey.'key');
+            }
+            if (strpos($secret, '*') === false && $secret != config_cache($dkey.'secret')) {
+                array_push($changes, 'secret');
+            } else {
+                $csecret = config_cache($dkey.'secret');
+            }
+            if ($region != config_cache($dkey.'region')) {
+                array_push($changes, 'region');
+            }
+            if ($bucket != config_cache($dkey.'bucket')) {
+                array_push($changes, 'bucket');
+            }
+            if ($visibility != config_cache($dkey.'visibility')) {
+                array_push($changes, 'visibility');
+            }
+            if ($url != config_cache($dkey.'url')) {
+                array_push($changes, 'url');
+            }
+            if ($endpoint != config_cache($dkey.'endpoint')) {
+                array_push($changes, 'endpoint');
+            }
+
+            if ($changes && count($changes)) {
+                $isValid = FilesystemService::getVerifyCredentials(
+                    $ckey ?? $key,
+                    $csecret ?? $secret,
+                    $region,
+                    $bucket,
+                    $endpoint,
+                );
+                if (! $isValid) {
+                    return response()->json(['error' => true, 's3_vce' => true, 'message' => "<div class='border border-danger text-danger p-3 font-weight-bold rounded-lg'>The S3/Spaces credentials you provided are invalid, or the bucket does not have the proper permissions.</div><br/>Please check all fields and try again.<br/><br/><strong>Any cloud storage configuration changes you made have NOT been saved due to invalid credentials.</strong>"], 400);
+                }
+            }
+            $res['changes'] = json_encode($changes);
+        }
+        Cache::forget('api:v1:instance-data:rules');
+        Cache::forget('api:v1:instance-data-response-v1');
+        Cache::forget('api:v2:instance-data-response-v2');
+        Config::refresh();
+
+        return $res;
+    }
 }
diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
index e54908a41..b769f3c8e 100644
--- a/app/Http/Controllers/AdminController.php
+++ b/app/Http/Controllers/AdminController.php
@@ -2,562 +2,668 @@
 
 namespace App\Http\Controllers;
 
-use App\{
-	AccountInterstitial,
-	Contact,
-	Hashtag,
-	Instance,
-	Newsroom,
-	OauthClient,
-	Profile,
-	Report,
-	Status,
-	StatusHashtag,
-	Story,
-	User
-};
-use DB, Cache, Storage;
-use Carbon\Carbon;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Redis;
-use App\Http\Controllers\Admin\{
-	AdminAutospamController,
-	AdminDirectoryController,
-	AdminDiscoverController,
-	AdminHashtagsController,
-	AdminInstanceController,
-	AdminReportController,
-	// AdminGroupsController,
-	AdminMediaController,
-	AdminSettingsController,
-	// AdminStorageController,
-	AdminSupportController,
-	AdminUserController
-};
-use Illuminate\Validation\Rule;
-use App\Services\AdminStatsService;
+use App\Contact;
+use App\Http\Controllers\Admin\AdminAutospamController;
+use App\Http\Controllers\Admin\AdminDirectoryController;
+use App\Http\Controllers\Admin\AdminDiscoverController;
+use App\Http\Controllers\Admin\AdminHashtagsController;
+use App\Http\Controllers\Admin\AdminInstanceController;
+use App\Http\Controllers\Admin\AdminMediaController;
+use App\Http\Controllers\Admin\AdminReportController;
+use App\Http\Controllers\Admin\AdminSettingsController;
+use App\Http\Controllers\Admin\AdminUserController;
+use App\Instance;
+use App\Mail\AdminMessageResponse;
+use App\Models\CustomEmoji;
+use App\Newsroom;
+use App\OauthClient;
+use App\Profile;
 use App\Services\AccountService;
+use App\Services\AdminStatsService;
+use App\Services\ConfigCacheService;
 use App\Services\StatusService;
 use App\Services\StoryService;
-use App\Models\CustomEmoji;
+use App\Status;
+use App\Story;
+use App\User;
+use Cache;
+use DB;
+use Illuminate\Http\Request;
+use Illuminate\Validation\Rule;
+use Mail;
+use Storage;
 
 class AdminController extends Controller
 {
-	use AdminReportController,
-	AdminAutospamController,
-	AdminDirectoryController,
-	AdminDiscoverController,
-	AdminHashtagsController,
-	// AdminGroupsController,
-	AdminMediaController,
-	AdminSettingsController,
-	AdminInstanceController,
-	// AdminStorageController,
-	AdminUserController;
+    use AdminAutospamController,
+        AdminDirectoryController,
+        AdminDiscoverController,
+        AdminHashtagsController,
+        AdminInstanceController,
+        AdminMediaController,
+        AdminReportController,
+        AdminSettingsController,
+        AdminUserController;
 
-	public function __construct()
-	{
-		$this->middleware('admin');
-		$this->middleware('dangerzone');
-		$this->middleware('twofactor');
-	}
+    public function __construct()
+    {
+        $this->middleware('admin');
+        $this->middleware('dangerzone');
+        $this->middleware('twofactor');
+    }
 
-	public function home()
-	{
-		return view('admin.home');
-	}
+    public function home()
+    {
+        return view('admin.home');
+    }
 
-	public function stats()
-	{
-		$data = AdminStatsService::get();
-		return view('admin.stats', compact('data'));
-	}
+    public function customCss()
+    {
+        return view('admin.settings.customcss');
+    }
 
-	public function getStats()
-	{
-		return AdminStatsService::summary();
-	}
+    public function saveCustomCss(Request $request)
+    {
+        $this->validate($request, [
+            'css' => 'sometimes|max:5000',
+            'show' => 'sometimes',
+        ]);
+        ConfigCacheService::put('uikit.custom.css', $request->input('css'));
+        ConfigCacheService::put('uikit.show_custom.css', $request->boolean('show'));
 
-	public function getAccounts()
-	{
-		$users = User::orderByDesc('id')->cursorPaginate(10);
+        return view('admin.settings.customcss');
+    }
 
-		$res = [
-			"next_page_url" => $users->nextPageUrl(),
-			"data" => $users->map(function($user) {
-				$account = AccountService::get($user->profile_id, true);
-				if(!$account) {
-					return [
-						"id" => $user->profile_id,
-						"username" => $user->username,
-						"status" => "deleted",
-						"avatar" => "/storage/avatars/default.jpg",
-						"created_at" => $user->created_at
-					];
-				}
-				$account['user_id'] = $user->id;
-				return $account;
-			})
-			->filter(function($user) {
-				return $user;
-			})
-		];
-		return $res;
-	}
+    public function stats()
+    {
+        $data = AdminStatsService::get();
 
-	public function getPosts()
-	{
-		$posts = DB::table('statuses')
-			->orderByDesc('id')
-			->cursorPaginate(10);
+        return view('admin.stats', compact('data'));
+    }
 
-		$res = [
-			"next_page_url" => $posts->nextPageUrl(),
-			"data" => $posts->map(function($post) {
-				$status = StatusService::get($post->id, false);
-				if(!$status) {
-					return ["id" => $post->id, "created_at" => $post->created_at];
-				}
-				return $status;
-			})
-		];
+    public function getStats()
+    {
+        return AdminStatsService::summary();
+    }
 
-		return $res;
-	}
+    public function getAccounts()
+    {
+        $users = User::orderByDesc('id')->cursorPaginate(10);
 
-	public function getInstances()
-	{
-		return Instance::orderByDesc('id')->cursorPaginate(10);
-	}
+        $res = [
+            'next_page_url' => $users->nextPageUrl(),
+            'data' => $users->map(function ($user) {
+                $account = AccountService::get($user->profile_id, true);
+                if (! $account) {
+                    return [
+                        'id' => $user->profile_id,
+                        'username' => $user->username,
+                        'status' => 'deleted',
+                        'avatar' => '/storage/avatars/default.jpg',
+                        'created_at' => $user->created_at,
+                    ];
+                }
+                $account['user_id'] = $user->id;
 
-	public function statuses(Request $request)
-	{
-		$statuses = Status::orderBy('id', 'desc')->cursorPaginate(10);
-		$data = $statuses->map(function($status) {
-			return StatusService::get($status->id, false);
-		})
-		->filter(function($s) {
-			return $s;
-		})
-		->toArray();
-		return view('admin.statuses.home', compact('statuses', 'data'));
-	}
+                return $account;
+            })
+                ->filter(function ($user) {
+                    return $user;
+                }),
+        ];
 
-	public function showStatus(Request $request, $id)
-	{
-		$status = Status::findOrFail($id);
+        return $res;
+    }
 
-		return view('admin.statuses.show', compact('status'));
-	}
+    public function getPosts()
+    {
+        $posts = DB::table('statuses')
+            ->orderByDesc('id')
+            ->cursorPaginate(10);
 
-	public function profiles(Request $request)
-	{
-		$this->validate($request, [
-			'search' => 'nullable|string|max:250',
-			'filter' => [
-				'nullable',
-				'string',
-				Rule::in(['all', 'local', 'remote'])
-			]
-		]);
-		$search = $request->input('search');
-		$filter = $request->input('filter');
-		$limit = 12;
-		$profiles = Profile::select('id','username')
-			->whereNull('status')
-			->when($search, function($q, $search) {
-				return $q->where('username', 'like', "%$search%");
-			})->when($filter, function($q, $filter) {
-				if($filter == 'local') {
-					return $q->whereNull('domain');
-				}
-				if($filter == 'remote') {
-					return $q->whereNotNull('domain');
-				}
-				return $q;
-			})->orderByDesc('id')
-			->simplePaginate($limit);
+        $res = [
+            'next_page_url' => $posts->nextPageUrl(),
+            'data' => $posts->map(function ($post) {
+                $status = StatusService::get($post->id, false);
+                if (! $status) {
+                    return ['id' => $post->id, 'created_at' => $post->created_at];
+                }
 
-		return view('admin.profiles.home', compact('profiles'));
-	}
+                return $status;
+            }),
+        ];
 
-	public function profileShow(Request $request, $id)
-	{
-		$profile = Profile::findOrFail($id);
-		$user = $profile->user;
-		return view('admin.profiles.edit', compact('profile', 'user'));
-	}
+        return $res;
+    }
 
-	public function appsHome(Request $request)
-	{
-		$filter = $request->input('filter');
-		if($filter == 'revoked') {
-			$apps = OauthClient::with('user')
-			->whereNotNull('user_id')
-			->whereRevoked(true)
-			->orderByDesc('id')
-			->paginate(10);
-		} else {
-			$apps = OauthClient::with('user')
-			->whereNotNull('user_id')
-			->orderByDesc('id')
-			->paginate(10);
-		}
-		return view('admin.apps.home', compact('apps'));
-	}
+    public function getInstances()
+    {
+        return Instance::orderByDesc('id')->cursorPaginate(10);
+    }
 
-	public function messagesHome(Request $request)
-	{
-		$messages = Contact::orderByDesc('id')->paginate(10);
-		return view('admin.messages.home', compact('messages'));
-	}
+    public function statuses(Request $request)
+    {
+        $statuses = Status::orderBy('id', 'desc')->cursorPaginate(10);
+        $data = $statuses->map(function ($status) {
+            return StatusService::get($status->id, false);
+        })
+            ->filter(function ($s) {
+                return $s;
+            })
+            ->toArray();
 
-	public function messagesShow(Request $request, $id)
-	{
-		$message = Contact::findOrFail($id);
-		return view('admin.messages.show', compact('message'));
-	}
+        return view('admin.statuses.home', compact('statuses', 'data'));
+    }
 
-	public function messagesMarkRead(Request $request)
-	{
-		$this->validate($request, [
-			'id' => 'required|integer|min:1'
-		]);
-		$id = $request->input('id');
-		$message = Contact::findOrFail($id);
-		if($message->read_at) {
-			return;
-		}
-		$message->read_at = now();
-		$message->save();
-		return;
-	}
+    public function showStatus(Request $request, $id)
+    {
+        $status = Status::findOrFail($id);
 
-	public function newsroomHome(Request $request)
-	{
-		$newsroom = Newsroom::latest()->paginate(10);
-		return view('admin.newsroom.home', compact('newsroom'));
-	}
+        return view('admin.statuses.show', compact('status'));
+    }
 
-	public function newsroomCreate(Request $request)
-	{
-		return view('admin.newsroom.create');
-	}
+    public function profiles(Request $request)
+    {
+        $this->validate($request, [
+            'search' => 'nullable|string|max:250',
+            'filter' => [
+                'nullable',
+                'string',
+                Rule::in(['all', 'local', 'remote']),
+            ],
+        ]);
+        $search = $request->input('search');
+        $filter = $request->input('filter');
+        $limit = 12;
+        $profiles = Profile::select('id', 'username')
+            ->whereNull('status')
+            ->when($search, function ($q, $search) {
+                return $q->where('username', 'like', "%$search%");
+            })->when($filter, function ($q, $filter) {
+                if ($filter == 'local') {
+                    return $q->whereNull('domain');
+                }
+                if ($filter == 'remote') {
+                    return $q->whereNotNull('domain');
+                }
 
-	public function newsroomEdit(Request $request, $id)
-	{
-		$news = Newsroom::findOrFail($id);
-		return view('admin.newsroom.edit', compact('news'));
-	}
+                return $q;
+            })->orderByDesc('id')
+            ->simplePaginate($limit);
 
-	public function newsroomDelete(Request $request, $id)
-	{
-		$news = Newsroom::findOrFail($id);
-		$news->delete();
-		return redirect('/i/admin/newsroom');
-	}
+        return view('admin.profiles.home', compact('profiles'));
+    }
 
-	public function newsroomUpdate(Request $request, $id)
-	{
-		$this->validate($request, [
-			'title' => 'required|string|min:1|max:100',
-			'summary' => 'nullable|string|max:200',
-			'body'  => 'nullable|string'
-		]);
-		$changed = false;
-		$changedFields = [];
-		$slug = str_slug($request->input('title'));
-		if(Newsroom::whereSlug($slug)->exists()) {
-			$slug = $slug . '-' . str_random(4);
-		}
-		$news = Newsroom::findOrFail($id);
-		$fields = [
-			'title' => 'string',
-			'summary' => 'string',
-			'body' => 'string',
-			'category' => 'string',
-			'show_timeline' => 'boolean',
-			'auth_only' => 'boolean',
-			'show_link' => 'boolean',
-			'force_modal' => 'boolean',
-			'published' => 'published'
-		];
-		foreach($fields as $field => $type) {
-			switch ($type) {
-				case 'string':
-				if($request->{$field} != $news->{$field}) {
-					if($field == 'title') {
-						$news->slug = $slug;
-					}
-					$news->{$field} = $request->{$field};
-					$changed = true;
-					array_push($changedFields, $field);
-				}
-				break;
+    public function profileShow(Request $request, $id)
+    {
+        $profile = Profile::findOrFail($id);
+        $user = $profile->user;
 
-				case 'boolean':
-				$state = $request->{$field} == 'on' ? true : false;
-				if($state != $news->{$field}) {
-					$news->{$field} = $state;
-					$changed = true;
-					array_push($changedFields, $field);
-				}
-				break;
-				case 'published':
-				$state = $request->{$field} == 'on' ? true : false;
-				$published = $news->published_at != null;
-				if($state != $published) {
-					$news->published_at = $state ? now() : null;
-					$changed = true;
-					array_push($changedFields, $field);
-				}
-				break;
+        return view('admin.profiles.edit', compact('profile', 'user'));
+    }
 
-			}
-		}
+    public function appsHome(Request $request)
+    {
+        $filter = $request->input('filter');
+        if ($filter == 'revoked') {
+            $apps = OauthClient::with('user')
+                ->whereNotNull('user_id')
+                ->whereRevoked(true)
+                ->orderByDesc('id')
+                ->paginate(10);
+        } else {
+            $apps = OauthClient::with('user')
+                ->whereNotNull('user_id')
+                ->orderByDesc('id')
+                ->paginate(10);
+        }
 
-		if($changed) {
-			$news->save();
-		}
-		$redirect = $news->published_at ? $news->permalink() : $news->editUrl();
-		return redirect($redirect);
-	}
+        return view('admin.apps.home', compact('apps'));
+    }
 
+    public function messagesHome(Request $request)
+    {
+        $this->validate($request, [
+            'sort' => 'sometimes|string|in:all,open,closed',
+        ]);
+        $sort = $request->input('sort', 'open');
 
-	public function newsroomStore(Request $request)
-	{
-		$this->validate($request, [
-			'title' => 'required|string|min:1|max:100',
-			'summary' => 'nullable|string|max:200',
-			'body'  => 'nullable|string'
-		]);
-		$changed = false;
-		$changedFields = [];
-		$slug = str_slug($request->input('title'));
-		if(Newsroom::whereSlug($slug)->exists()) {
-			$slug = $slug . '-' . str_random(4);
-		}
-		$news = new Newsroom();
-		$fields = [
-			'title' => 'string',
-			'summary' => 'string',
-			'body' => 'string',
-			'category' => 'string',
-			'show_timeline' => 'boolean',
-			'auth_only' => 'boolean',
-			'show_link' => 'boolean',
-			'force_modal' => 'boolean',
-			'published' => 'published'
-		];
-		foreach($fields as $field => $type) {
-			switch ($type) {
-				case 'string':
-				if($request->{$field} != $news->{$field}) {
-					if($field == 'title') {
-						$news->slug = $slug;
-					}
-					$news->{$field} = $request->{$field};
-					$changed = true;
-					array_push($changedFields, $field);
-				}
-				break;
+        $messages = Contact::when($sort, function ($query, $sort) {
+            if ($sort === 'open') {
+                $query->whereNull('read_at');
+            }
+            if ($sort === 'closed') {
+                $query->whereNotNull('read_at');
+            }
+        })
+            ->orderByDesc('id')
+            ->paginate(10)
+            ->withQueryString();
 
-				case 'boolean':
-				$state = $request->{$field} == 'on' ? true : false;
-				if($state != $news->{$field}) {
-					$news->{$field} = $state;
-					$changed = true;
-					array_push($changedFields, $field);
-				}
-				break;
-				case 'published':
-				$state = $request->{$field} == 'on' ? true : false;
-				$published = $news->published_at != null;
-				if($state != $published) {
-					$news->published_at = $state ? now() : null;
-					$changed = true;
-					array_push($changedFields, $field);
-				}
-				break;
+        return view('admin.messages.home', compact('messages', 'sort'));
+    }
 
-			}
-		}
+    public function messagesShow(Request $request, $id)
+    {
+        $message = Contact::findOrFail($id);
+        $user = User::whereNull('status')->find($message->user_id);
+        if(!$user) {
+            $message->read_at = now();
+            $message->save();
+            return redirect('/i/admin/messages/home')->with('status', 'Redirected from message sent from a deleted account');
+        }
 
-		if($changed) {
-			$news->save();
-		}
-		$redirect = $news->published_at ? $news->permalink() : $news->editUrl();
-		return redirect($redirect);
-	}
+        return view('admin.messages.show', compact('message'));
+    }
 
-	public function diagnosticsHome(Request $request)
-	{
-		return view('admin.diagnostics.home');
-	}
+    public function messagesReply(Request $request, $id)
+    {
+        $this->validate($request, [
+            'message' => 'required|string|min:1|max:500',
+        ]);
 
-	public function diagnosticsDecrypt(Request $request)
-	{
-		$this->validate($request, [
-			'payload' => 'required'
-		]);
+        if(config('mail.default') === 'log') {
+            return redirect('/i/admin/messages/home')->with('error', 'Mail driver not configured, please setup before you can sent email.');
+        }
 
-		$key = 'exception_report:';
-		$decrypted = decrypt($request->input('payload'));
+        $message = Contact::whereNull('responded_at')->findOrFail($id);
+        $user = User::whereNull('status')->find($message->user_id);
+        if(!$user) {
+            $message->read_at = now();
+            $message->save();
+            return redirect('/i/admin/messages/home')->with('status', 'Redirected from message sent from a deleted account');
+        }
+        $message->response = $request->input('message');
+        $message->read_at = now();
+        $message->responded_at = now();
+        $message->save();
 
-		if(!starts_with($decrypted, $key)) {
-			abort(403, 'Can only decrypt error diagnostics');
-		}
+        Mail::to($message->user->email)->send(new AdminMessageResponse($message));
 
-		$res = [
-			'decrypted' => substr($decrypted, strlen($key))
-		];
+        return redirect('/i/admin/messages/home')->with('status', 'Sent response to '.$message->user->username);
+    }
 
-		return response()->json($res);
-	}
+    public function messagesReplyPreview(Request $request, $id)
+    {
+        $this->validate($request, [
+            'message' => 'required|string|min:1|max:500',
+        ]);
 
-	public function stories(Request $request)
-	{
-		$stories = Story::with('profile')->latest()->paginate(10);
-		$stats = StoryService::adminStats();
-		return view('admin.stories.home', compact('stories', 'stats'));
-	}
+        if(config('mail.default') === 'log') {
+            return redirect('/i/admin/messages/home')->with('error', 'Mail driver not configured, please setup before you can sent email.');
+        }
 
-	public function customEmojiHome(Request $request)
-	{
-		if(!config('federation.custom_emoji.enabled')) {
-			return view('admin.custom-emoji.not-enabled');
-		}
-		$this->validate($request, [
-			'sort' => 'sometimes|in:all,local,remote,duplicates,disabled,search'
-		]);
+        $message = Contact::whereNull('read_at')->findOrFail($id);
+        $user = User::whereNull('status')->find($message->user_id);
+        if(!$user) {
+            $message->read_at = now();
+            $message->save();
+            return redirect('/i/admin/messages/home')->with('error', 'Redirected from message sent from a deleted account');
+        }
+        return new AdminMessageResponse($message);
+    }
 
-		if($request->has('cc')) {
-			Cache::forget('pf:admin:custom_emoji:stats');
-			Cache::forget('pf:custom_emoji');
-			return redirect(route('admin.custom-emoji'));
-		}
+    public function messagesMarkRead(Request $request)
+    {
+        $this->validate($request, [
+            'id' => 'required|integer|min:1',
+        ]);
+        $id = $request->input('id');
+        $message = Contact::findOrFail($id);
 
-		$sort = $request->input('sort') ?? 'all';
+        $user = User::whereNull('status')->find($message->user_id);
+        if(!$user) {
+            $message->read_at = now();
+            $message->save();
+            return redirect('/i/admin/messages/home')->with('error', 'Redirected from message sent from a deleted account');
+        }
+        if ($message->read_at) {
+            return;
+        }
+        $message->read_at = now();
+        $message->save();
+        $request->session()->flash('status', 'Marked response from '.$message->user->username.' as read!');
 
-		if($sort == 'search' && empty($request->input('q'))) {
-			return redirect(route('admin.custom-emoji'));
-		}
+        return ['status' => 200];
+    }
 
-		$pg = config('database.default') == 'pgsql';
+    public function newsroomHome(Request $request)
+    {
+        $newsroom = Newsroom::latest()->paginate(10);
 
-		$emojis = CustomEmoji::when($sort, function($query, $sort) use($request, $pg) {
-			if($sort == 'all') {
-				if($pg) {
-					return $query->latest();
-				} else {
-					return $query->groupBy('shortcode')->latest();
-				}
-			} else if($sort == 'local') {
-				return $query->latest()->where('domain', '=', config('pixelfed.domain.app'));
-			} else if($sort == 'remote') {
-				return $query->latest()->where('domain', '!=', config('pixelfed.domain.app'));
-			} else if($sort == 'duplicates') {
-				return $query->latest()->groupBy('shortcode')->havingRaw('count(*) > 1');
-			} else if($sort == 'disabled') {
-				return $query->latest()->whereDisabled(true);
-			} else if($sort == 'search') {
-				$q = $query
-					->latest()
-					->where('shortcode', 'like', '%' . $request->input('q') . '%')
-					->orWhere('domain', 'like', '%' . $request->input('q') . '%');
-				if(!$request->has('dups')) {
-					if(!$pg) {
-						$q = $q->groupBy('shortcode');
-					}
-				}
-				return $q;
-			}
-		})
-		->simplePaginate(10)
-		->withQueryString();
+        return view('admin.newsroom.home', compact('newsroom'));
+    }
 
-		$stats = Cache::remember('pf:admin:custom_emoji:stats', 43200, function() use($pg) {
-			$res = [
-				'total' => CustomEmoji::count(),
-				'active' => CustomEmoji::whereDisabled(false)->count(),
-				'remote' => CustomEmoji::where('domain', '!=', config('pixelfed.domain.app'))->count(),
-			];
+    public function newsroomCreate(Request $request)
+    {
+        return view('admin.newsroom.create');
+    }
 
-			if($pg) {
-				$res['duplicate'] = CustomEmoji::select('shortcode')->groupBy('shortcode')->havingRaw('count(*) > 1')->count();
-			} else {
-				$res['duplicate'] = CustomEmoji::groupBy('shortcode')->havingRaw('count(*) > 1')->count();
-			}
+    public function newsroomEdit(Request $request, $id)
+    {
+        $news = Newsroom::findOrFail($id);
 
-			return $res;
-		});
+        return view('admin.newsroom.edit', compact('news'));
+    }
 
-		return view('admin.custom-emoji.home', compact('emojis', 'sort', 'stats'));
-	}
+    public function newsroomDelete(Request $request, $id)
+    {
+        $news = Newsroom::findOrFail($id);
+        $news->delete();
 
-	public function customEmojiToggleActive(Request $request, $id)
-	{
-		abort_unless(config('federation.custom_emoji.enabled'), 404);
-		$emoji = CustomEmoji::findOrFail($id);
-		$emoji->disabled = !$emoji->disabled;
-		$emoji->save();
-		$key = CustomEmoji::CACHE_KEY . str_replace(':', '', $emoji->shortcode);
-		Cache::forget($key);
-		return redirect()->back();
-	}
+        return redirect('/i/admin/newsroom');
+    }
 
-	public function customEmojiAdd(Request $request)
-	{
-		abort_unless(config('federation.custom_emoji.enabled'), 404);
-		return view('admin.custom-emoji.add');
-	}
+    public function newsroomUpdate(Request $request, $id)
+    {
+        $this->validate($request, [
+            'title' => 'required|string|min:1|max:100',
+            'summary' => 'nullable|string|max:200',
+            'body' => 'nullable|string',
+        ]);
+        $changed = false;
+        $changedFields = [];
+        $slug = str_slug($request->input('title'));
+        if (Newsroom::whereSlug($slug)->exists()) {
+            $slug = $slug.'-'.str_random(4);
+        }
+        $news = Newsroom::findOrFail($id);
+        $fields = [
+            'title' => 'string',
+            'summary' => 'string',
+            'body' => 'string',
+            'category' => 'string',
+            'show_timeline' => 'boolean',
+            'auth_only' => 'boolean',
+            'show_link' => 'boolean',
+            'force_modal' => 'boolean',
+            'published' => 'published',
+        ];
+        foreach ($fields as $field => $type) {
+            switch ($type) {
+                case 'string':
+                    if ($request->{$field} != $news->{$field}) {
+                        if ($field == 'title') {
+                            $news->slug = $slug;
+                        }
+                        $news->{$field} = $request->{$field};
+                        $changed = true;
+                        array_push($changedFields, $field);
+                    }
+                    break;
 
-	public function customEmojiStore(Request $request)
-	{
-		abort_unless(config('federation.custom_emoji.enabled'), 404);
-		$this->validate($request, [
-			'shortcode' => [
-				'required',
-				'min:3',
-				'max:80',
-				'starts_with::',
-				'ends_with::',
-				Rule::unique('custom_emoji')->where(function ($query) use($request) {
-					return $query->whereDomain(config('pixelfed.domain.app'))
-					->whereShortcode($request->input('shortcode'));
-				})
-			],
-			'emoji' => 'required|file|mimes:jpg,png|max:' . (config('federation.custom_emoji.max_size') / 1000)
-		]);
+                case 'boolean':
+                    $state = $request->{$field} == 'on' ? true : false;
+                    if ($state != $news->{$field}) {
+                        $news->{$field} = $state;
+                        $changed = true;
+                        array_push($changedFields, $field);
+                    }
+                    break;
+                case 'published':
+                    $state = $request->{$field} == 'on' ? true : false;
+                    $published = $news->published_at != null;
+                    if ($state != $published) {
+                        $news->published_at = $state ? now() : null;
+                        $changed = true;
+                        array_push($changedFields, $field);
+                    }
+                    break;
 
-		$emoji = new CustomEmoji;
-		$emoji->shortcode = $request->input('shortcode');
-		$emoji->domain = config('pixelfed.domain.app');
-		$emoji->save();
+            }
+        }
 
-		$fileName = $emoji->id . '.' . $request->emoji->extension();
-		$request->emoji->storePubliclyAs('public/emoji', $fileName);
-		$emoji->media_path = 'emoji/' . $fileName;
-		$emoji->save();
-		Cache::forget('pf:custom_emoji');
-		return redirect(route('admin.custom-emoji'));
-	}
+        if ($changed) {
+            $news->save();
+        }
+        $redirect = $news->published_at ? $news->permalink() : $news->editUrl();
 
-	public function customEmojiDelete(Request $request, $id)
-	{
-		abort_unless(config('federation.custom_emoji.enabled'), 404);
-		$emoji = CustomEmoji::findOrFail($id);
-		Storage::delete("public/{$emoji->media_path}");
-		Cache::forget('pf:custom_emoji');
-		$emoji->delete();
-		return redirect(route('admin.custom-emoji'));
-	}
+        return redirect($redirect);
+    }
 
-	public function customEmojiShowDuplicates(Request $request, $id)
-	{
-		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'));
-	}
+    public function newsroomStore(Request $request)
+    {
+        $this->validate($request, [
+            'title' => 'required|string|min:1|max:100',
+            'summary' => 'nullable|string|max:200',
+            'body' => 'nullable|string',
+        ]);
+        $changed = false;
+        $changedFields = [];
+        $slug = str_slug($request->input('title'));
+        if (Newsroom::whereSlug($slug)->exists()) {
+            $slug = $slug.'-'.str_random(4);
+        }
+        $news = new Newsroom;
+        $fields = [
+            'title' => 'string',
+            'summary' => 'string',
+            'body' => 'string',
+            'category' => 'string',
+            'show_timeline' => 'boolean',
+            'auth_only' => 'boolean',
+            'show_link' => 'boolean',
+            'force_modal' => 'boolean',
+            'published' => 'published',
+        ];
+        foreach ($fields as $field => $type) {
+            switch ($type) {
+                case 'string':
+                    if ($request->{$field} != $news->{$field}) {
+                        if ($field == 'title') {
+                            $news->slug = $slug;
+                        }
+                        $news->{$field} = $request->{$field};
+                        $changed = true;
+                        array_push($changedFields, $field);
+                    }
+                    break;
+
+                case 'boolean':
+                    $state = $request->{$field} == 'on' ? true : false;
+                    if ($state != $news->{$field}) {
+                        $news->{$field} = $state;
+                        $changed = true;
+                        array_push($changedFields, $field);
+                    }
+                    break;
+                case 'published':
+                    $state = $request->{$field} == 'on' ? true : false;
+                    $published = $news->published_at != null;
+                    if ($state != $published) {
+                        $news->published_at = $state ? now() : null;
+                        $changed = true;
+                        array_push($changedFields, $field);
+                    }
+                    break;
+
+            }
+        }
+
+        if ($changed) {
+            $news->save();
+        }
+        $redirect = $news->published_at ? $news->permalink() : $news->editUrl();
+
+        return redirect($redirect);
+    }
+
+    public function diagnosticsHome(Request $request)
+    {
+        return view('admin.diagnostics.home');
+    }
+
+    public function diagnosticsDecrypt(Request $request)
+    {
+        $this->validate($request, [
+            'payload' => 'required',
+        ]);
+
+        $key = 'exception_report:';
+        $decrypted = decrypt($request->input('payload'));
+
+        if (! starts_with($decrypted, $key)) {
+            abort(403, 'Can only decrypt error diagnostics');
+        }
+
+        $res = [
+            'decrypted' => substr($decrypted, strlen($key)),
+        ];
+
+        return response()->json($res);
+    }
+
+    public function stories(Request $request)
+    {
+        $stories = Story::with('profile')->latest()->paginate(10);
+        $stats = StoryService::adminStats();
+
+        return view('admin.stories.home', compact('stories', 'stats'));
+    }
+
+    public function customEmojiHome(Request $request)
+    {
+        if (! (bool) config_cache('federation.custom_emoji.enabled')) {
+            return view('admin.custom-emoji.not-enabled');
+        }
+        $this->validate($request, [
+            'sort' => 'sometimes|in:all,local,remote,duplicates,disabled,search',
+        ]);
+
+        if ($request->has('cc')) {
+            Cache::forget('pf:admin:custom_emoji:stats');
+            Cache::forget('pf:custom_emoji');
+
+            return redirect(route('admin.custom-emoji'));
+        }
+
+        $sort = $request->input('sort') ?? 'all';
+
+        if ($sort == 'search' && empty($request->input('q'))) {
+            return redirect(route('admin.custom-emoji'));
+        }
+
+        $pg = config('database.default') == 'pgsql';
+
+        $emojis = CustomEmoji::when($sort, function ($query, $sort) use ($request, $pg) {
+            if ($sort == 'all') {
+                if ($pg) {
+                    return $query->latest();
+                } else {
+                    return $query->groupBy('shortcode')->latest();
+                }
+            } elseif ($sort == 'local') {
+                return $query->latest()->where('domain', '=', config('pixelfed.domain.app'));
+            } elseif ($sort == 'remote') {
+                return $query->latest()->where('domain', '!=', config('pixelfed.domain.app'));
+            } elseif ($sort == 'duplicates') {
+                return $query->latest()->groupBy('shortcode')->havingRaw('count(*) > 1');
+            } elseif ($sort == 'disabled') {
+                return $query->latest()->whereDisabled(true);
+            } elseif ($sort == 'search') {
+                $q = $query
+                    ->latest()
+                    ->where('shortcode', 'like', '%'.$request->input('q').'%')
+                    ->orWhere('domain', 'like', '%'.$request->input('q').'%');
+                if (! $request->has('dups')) {
+                    if (! $pg) {
+                        $q = $q->groupBy('shortcode');
+                    }
+                }
+
+                return $q;
+            }
+        })
+            ->simplePaginate(10)
+            ->withQueryString();
+
+        $stats = Cache::remember('pf:admin:custom_emoji:stats', 43200, function () use ($pg) {
+            $res = [
+                'total' => CustomEmoji::count(),
+                'active' => CustomEmoji::whereDisabled(false)->count(),
+                'remote' => CustomEmoji::where('domain', '!=', config('pixelfed.domain.app'))->count(),
+            ];
+
+            if ($pg) {
+                $res['duplicate'] = CustomEmoji::select('shortcode')->groupBy('shortcode')->havingRaw('count(*) > 1')->count();
+            } else {
+                $res['duplicate'] = CustomEmoji::groupBy('shortcode')->havingRaw('count(*) > 1')->count();
+            }
+
+            return $res;
+        });
+
+        return view('admin.custom-emoji.home', compact('emojis', 'sort', 'stats'));
+    }
+
+    public function customEmojiToggleActive(Request $request, $id)
+    {
+        abort_unless((bool) config_cache('federation.custom_emoji.enabled'), 404);
+        $emoji = CustomEmoji::findOrFail($id);
+        $emoji->disabled = ! $emoji->disabled;
+        $emoji->save();
+        $key = CustomEmoji::CACHE_KEY.str_replace(':', '', $emoji->shortcode);
+        Cache::forget($key);
+
+        return redirect()->back();
+    }
+
+    public function customEmojiAdd(Request $request)
+    {
+        abort_unless((bool) config_cache('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);
+        $this->validate($request, [
+            'shortcode' => [
+                'required',
+                'min:3',
+                'max:80',
+                'starts_with::',
+                'ends_with::',
+                Rule::unique('custom_emoji')->where(function ($query) use ($request) {
+                    return $query->whereDomain(config('pixelfed.domain.app'))
+                        ->whereShortcode($request->input('shortcode'));
+                }),
+            ],
+            'emoji' => 'required|file|mimes:jpg,png|max:'.(config('federation.custom_emoji.max_size') / 1000),
+        ]);
+
+        $emoji = new CustomEmoji;
+        $emoji->shortcode = $request->input('shortcode');
+        $emoji->domain = config('pixelfed.domain.app');
+        $emoji->save();
+
+        $fileName = $emoji->id.'.'.$request->emoji->extension();
+        $request->emoji->storePubliclyAs('public/emoji', $fileName);
+        $emoji->media_path = 'emoji/'.$fileName;
+        $emoji->save();
+        Cache::forget('pf:custom_emoji');
+
+        return redirect(route('admin.custom-emoji'));
+    }
+
+    public function customEmojiDelete(Request $request, $id)
+    {
+        abort_unless((bool) config_cache('federation.custom_emoji.enabled'), 404);
+        $emoji = CustomEmoji::findOrFail($id);
+        Storage::delete("public/{$emoji->media_path}");
+        Cache::forget('pf:custom_emoji');
+        $emoji->delete();
+
+        return redirect(route('admin.custom-emoji'));
+    }
+
+    public function customEmojiShowDuplicates(Request $request, $id)
+    {
+        abort_unless((bool) config_cache('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'));
+    }
 }
diff --git a/app/Http/Controllers/AdminCuratedRegisterController.php b/app/Http/Controllers/AdminCuratedRegisterController.php
new file mode 100644
index 000000000..afdcfba1a
--- /dev/null
+++ b/app/Http/Controllers/AdminCuratedRegisterController.php
@@ -0,0 +1,340 @@
+<?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:3000',
+        ]);
+        $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();
+
+        if (User::withTrashed()->whereEmail($record->email)->exists()) {
+            return [200];
+        }
+
+        $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);
+    }
+}
diff --git a/app/Http/Controllers/AdminShadowFilterController.php b/app/Http/Controllers/AdminShadowFilterController.php
index 461e1d0c2..e181be5c1 100644
--- a/app/Http/Controllers/AdminShadowFilterController.php
+++ b/app/Http/Controllers/AdminShadowFilterController.php
@@ -19,7 +19,8 @@ class AdminShadowFilterController extends Controller
     {
         $filter = $request->input('filter');
         $searchQuery = $request->input('q');
-        $filters = AdminShadowFilter::when($filter, function($q, $filter) {
+        $filters = AdminShadowFilter::whereHas('profile')
+        ->when($filter, function($q, $filter) {
             if($filter == 'all') {
                 return $q;
             } else if($filter == 'inactive') {
diff --git a/app/Http/Controllers/Api/AdminApiController.php b/app/Http/Controllers/Api/AdminApiController.php
index 76f73e720..21a832a76 100644
--- a/app/Http/Controllers/Api/AdminApiController.php
+++ b/app/Http/Controllers/Api/AdminApiController.php
@@ -2,91 +2,94 @@
 
 namespace App\Http\Controllers\Api;
 
-use Illuminate\Http\Request;
+use App\AccountInterstitial;
 use App\Http\Controllers\Controller;
+use App\Http\Resources\AdminInstance;
+use App\Http\Resources\AdminUser;
+use App\Instance;
+use App\Jobs\DeletePipeline\DeleteAccountPipeline;
+use App\Jobs\DeletePipeline\DeleteRemoteProfilePipeline;
 use App\Jobs\StatusPipeline\StatusDelete;
-use Auth, Cache, DB;
-use Carbon\Carbon;
-use App\{
-    AccountInterstitial,
-    Instance,
-    Like,
-    Notification,
-    Media,
-    Profile,
-    Report,
-    Status,
-    User
-};
 use App\Models\Conversation;
 use App\Models\RemoteReport;
+use App\Notification;
+use App\Profile;
+use App\Report;
 use App\Services\AccountService;
 use App\Services\AdminStatsService;
 use App\Services\ConfigCacheService;
 use App\Services\InstanceService;
 use App\Services\ModLogService;
-use App\Services\SnowflakeService;
-use App\Services\StatusService;
-use App\Services\PublicTimelineService;
 use App\Services\NetworkTimelineService;
 use App\Services\NotificationService;
-use App\Http\Resources\AdminInstance;
-use App\Http\Resources\AdminUser;
-use App\Jobs\DeletePipeline\DeleteAccountPipeline;
-use App\Jobs\DeletePipeline\DeleteRemoteProfilePipeline;
-use App\Jobs\DeletePipeline\DeleteRemoteStatusPipeline;
+use App\Services\PublicTimelineService;
+use App\Services\SnowflakeService;
+use App\Services\StatusService;
+use App\Status;
+use App\User;
+use Cache;
+use DB;
+use Illuminate\Http\Request;
 
 class AdminApiController extends Controller
 {
     public function supported(Request $request)
     {
-        abort_if(!$request->user(), 404);
+        abort_if(! $request->user() || ! $request->user()->token(), 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(), 404);
+        abort_if(! $request->user() || ! $request->user()->token(), 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')
             ->whereNull('appeal_handled_at')
             ->count();
+
         return $res;
     }
 
     public function autospam(Request $request)
     {
-        abort_if(!$request->user(), 404);
+        abort_if(! $request->user() || ! $request->user()->token(), 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')
             ->latest()
             ->simplePaginate(6)
-            ->map(function($report) {
+            ->map(function ($report) {
                 $r = [
                     'id' => $report->id,
                     'type' => $report->type,
                     'item_id' => $report->item_id,
                     'item_type' => $report->item_type,
-                    'created_at' => $report->created_at
+                    'created_at' => $report->created_at,
                 ];
-                if($report->item_type === 'App\\Status') {
+                if ($report->item_type === 'App\\Status') {
                     $status = StatusService::get($report->item_id, false);
-                    if(!$status) {
+                    if (! $status) {
                         return;
                     }
 
                     $r['status'] = $status;
 
-                    if($status['in_reply_to_id']) {
+                    if ($status['in_reply_to_id']) {
                         $r['parent'] = StatusService::get($status['in_reply_to_id'], false);
                     }
                 }
+
                 return $r;
             });
 
@@ -95,12 +98,14 @@ class AdminApiController extends Controller
 
     public function autospamHandle(Request $request)
     {
-        abort_if(!$request->user(), 404);
+        abort_if(! $request->user() || ! $request->user()->token(), 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',
-            'id' => 'required'
+            'id' => 'required',
         ]);
 
         $action = $request->input('action');
@@ -114,18 +119,19 @@ class AdminApiController extends Controller
         $user = $appeal->user;
         $profile = $user->profile;
 
-        if($action == 'dismiss') {
+        if ($action == 'dismiss') {
             $appeal->is_spam = true;
             $appeal->appeal_handled_at = $now;
             $appeal->save();
 
-            Cache::forget('pf:bouncer_v0:exemption_by_pid:' . $profile->id);
-            Cache::forget('pf:bouncer_v0:recent_by_pid:' . $profile->id);
+            Cache::forget('pf:bouncer_v0:exemption_by_pid:'.$profile->id);
+            Cache::forget('pf:bouncer_v0:recent_by_pid:'.$profile->id);
             Cache::forget('admin-dash:reports:spam-count');
+
             return $res;
         }
 
-        if($action == 'delete-post') {
+        if ($action == 'delete-post') {
             $appeal->appeal_handled_at = now();
             $appeal->is_spam = true;
             $appeal->save();
@@ -140,10 +146,11 @@ class AdminApiController extends Controller
             PublicTimelineService::deleteByProfileId($profile->id);
             StatusDelete::dispatch($appeal->status)->onQueue('high');
             Cache::forget('admin-dash:reports:spam-count');
+
             return $res;
         }
 
-        if($action == 'delete-account') {
+        if ($action == 'delete-account') {
             abort_if($user->is_admin, 400, 'Cannot delete an admin account.');
             $appeal->appeal_handled_at = now();
             $appeal->is_spam = true;
@@ -159,22 +166,24 @@ class AdminApiController extends Controller
             PublicTimelineService::deleteByProfileId($profile->id);
             DeleteAccountPipeline::dispatch($appeal->user)->onQueue('high');
             Cache::forget('admin-dash:reports:spam-count');
+
             return $res;
         }
 
-        if($action == 'dismiss-all') {
+        if ($action == 'dismiss-all') {
             AccountInterstitial::whereType('post.autospam')
                 ->whereItemType('App\Status')
                 ->whereNull('appeal_handled_at')
                 ->whereUserId($appeal->user_id)
                 ->update(['appeal_handled_at' => $now, 'is_spam' => true]);
-            Cache::forget('pf:bouncer_v0:exemption_by_pid:' . $appeal->user->profile_id);
-            Cache::forget('pf:bouncer_v0:recent_by_pid:' . $appeal->user->profile_id);
+            Cache::forget('pf:bouncer_v0:exemption_by_pid:'.$appeal->user->profile_id);
+            Cache::forget('pf:bouncer_v0:recent_by_pid:'.$appeal->user->profile_id);
             Cache::forget('admin-dash:reports:spam-count');
+
             return $res;
         }
 
-        if($action == 'approve') {
+        if ($action == 'approve') {
             $status = $appeal->status;
             $status->is_nsfw = $meta->is_nsfw;
             $status->scope = 'public';
@@ -190,29 +199,30 @@ class AdminApiController extends Controller
             Notification::whereAction('autospam.warning')
                 ->whereProfileId($appeal->user->profile_id)
                 ->get()
-                ->each(function($n) use($appeal) {
+                ->each(function ($n) use ($appeal) {
                     NotificationService::del($appeal->user->profile_id, $n->id);
                     $n->forceDelete();
                 });
 
-            Cache::forget('pf:bouncer_v0:exemption_by_pid:' . $appeal->user->profile_id);
-            Cache::forget('pf:bouncer_v0:recent_by_pid:' . $appeal->user->profile_id);
+            Cache::forget('pf:bouncer_v0:exemption_by_pid:'.$appeal->user->profile_id);
+            Cache::forget('pf:bouncer_v0:recent_by_pid:'.$appeal->user->profile_id);
             Cache::forget('admin-dash:reports:spam-count');
+
             return $res;
         }
 
-        if($action == 'approve-all') {
+        if ($action == 'approve-all') {
             AccountInterstitial::whereType('post.autospam')
                 ->whereItemType('App\Status')
                 ->whereNull('appeal_handled_at')
                 ->whereUserId($appeal->user_id)
                 ->get()
-                ->each(function($report) use($meta) {
+                ->each(function ($report) use ($meta) {
                     $report->is_spam = false;
                     $report->appeal_handled_at = now();
                     $report->save();
                     $status = Status::find($report->item_id);
-                    if($status) {
+                    if ($status) {
                         $status->is_nsfw = $meta->is_nsfw;
                         $status->scope = 'public';
                         $status->visibility = 'public';
@@ -223,14 +233,15 @@ class AdminApiController extends Controller
                     Notification::whereAction('autospam.warning')
                         ->whereProfileId($report->user->profile_id)
                         ->get()
-                        ->each(function($n) use($report) {
+                        ->each(function ($n) use ($report) {
                             NotificationService::del($report->user->profile_id, $n->id);
                             $n->forceDelete();
                         });
                 });
-            Cache::forget('pf:bouncer_v0:exemption_by_pid:' . $appeal->user->profile_id);
-            Cache::forget('pf:bouncer_v0:recent_by_pid:' . $appeal->user->profile_id);
+            Cache::forget('pf:bouncer_v0:exemption_by_pid:'.$appeal->user->profile_id);
+            Cache::forget('pf:bouncer_v0:recent_by_pid:'.$appeal->user->profile_id);
             Cache::forget('admin-dash:reports:spam-count');
+
             return $res;
         }
 
@@ -239,42 +250,48 @@ class AdminApiController extends Controller
 
     public function modReports(Request $request)
     {
-        abort_if(!$request->user(), 404);
+        abort_if(! $request->user() || ! $request->user()->token(), 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')
+            ->orderBy('created_at', 'desc')
             ->paginate(6)
-            ->map(function($report) {
+            ->map(function ($report) {
                 $r = [
                     'id' => $report->id,
                     'type' => $report->type,
                     'message' => $report->message,
                     'object_id' => $report->object_id,
                     'object_type' => $report->object_type,
-                    'created_at' => $report->created_at
+                    'created_at' => $report->created_at,
                 ];
 
-                if($report->profile_id) {
+                if ($report->profile_id) {
                     $r['reported_by_account'] = AccountService::get($report->profile_id, true);
                 }
 
-                if($report->object_type === 'App\\Status') {
+                if ($report->object_type === 'App\\Status') {
                     $status = StatusService::get($report->object_id, false);
-                    if(!$status) {
+                    if (! $status) {
                         return;
                     }
 
                     $r['status'] = $status;
 
-                    if($status['in_reply_to_id']) {
+                    if (isset($status['in_reply_to_id'])) {
                         $r['parent'] = StatusService::get($status['in_reply_to_id'], false);
                     }
                 }
 
-                if($report->object_type === 'App\\Profile') {
-                    $r['account'] = AccountService::get($report->object_id, false);
+                if ($report->object_type === 'App\\Profile') {
+                    $acct = AccountService::get($report->object_id, true);
+                    if ($acct) {
+                        $r['account'] = $acct;
+                    }
                 }
+
                 return $r;
             })
             ->filter()
@@ -285,12 +302,14 @@ class AdminApiController extends Controller
 
     public function modReportHandle(Request $request)
     {
-        abort_if(!$request->user(), 404);
+        abort_if(! $request->user() || ! $request->user()->token(), 404);
+
         abort_unless($request->user()->is_admin == 1, 404);
+        abort_unless($request->user()->tokenCan('admin:write'), 404);
 
         $this->validate($request, [
-            'action'    => 'required|string',
-            'id' => 'required'
+            'action' => 'required|string',
+            'id' => 'required',
         ]);
 
         $action = $request->input('action');
@@ -299,10 +318,10 @@ class AdminApiController extends Controller
         $actions = [
             'ignore',
             'cw',
-            'unlist'
+            'unlist',
         ];
 
-        if (!in_array($action, $actions)) {
+        if (! in_array($action, $actions)) {
             return abort(403);
         }
 
@@ -343,56 +362,63 @@ class AdminApiController extends Controller
 
     public function getConfiguration(Request $request)
     {
-        abort_if(!$request->user(), 404);
+        abort_if(! $request->user() || ! $request->user()->token(), 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([
             [
                 'name' => 'ActivityPub Federation',
                 'description' => 'Enable activitypub federation support, compatible with Pixelfed, Mastodon and other platforms.',
-                'key' => 'federation.activitypub.enabled'
+                'key' => 'federation.activitypub.enabled',
             ],
 
             [
                 'name' => 'Open Registration',
                 'description' => 'Allow new account registrations.',
-                'key' => 'pixelfed.open_registration'
+                'key' => 'pixelfed.open_registration',
             ],
 
             [
                 'name' => 'Stories',
                 'description' => 'Enable the ephemeral Stories feature.',
-                'key' => 'instance.stories.enabled'
+                'key' => 'instance.stories.enabled',
             ],
 
             [
                 'name' => 'Require Email Verification',
                 'description' => 'Require new accounts to verify their email address.',
-                'key' => 'pixelfed.enforce_email_verification'
+                'key' => 'pixelfed.enforce_email_verification',
             ],
 
             [
                 'name' => 'AutoSpam Detection',
                 'description' => 'Detect and remove spam from public timelines.',
-                'key' => 'pixelfed.bouncer.enabled'
+                'key' => 'pixelfed.bouncer.enabled',
             ],
         ])
-        ->map(function($s) {
-            $s['state'] = (bool) config_cache($s['key']);
-            return $s;
-        });
+            ->map(function ($s) {
+                $s['state'] = (bool) config_cache($s['key']);
+
+                return $s;
+            });
     }
 
     public function updateConfiguration(Request $request)
     {
-        abort_if(!$request->user(), 404);
+        abort_if(! $request->user() || ! $request->user()->token(), 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, [
             'key' => 'required',
-            'value' => 'required'
+            'value' => 'required',
         ]);
 
         $allowedKeys = [
@@ -405,76 +431,84 @@ class AdminApiController extends Controller
 
         $key = $request->input('key');
         $value = (bool) filter_var($request->input('value'), FILTER_VALIDATE_BOOLEAN);
-        abort_if(!in_array($key, $allowedKeys), 400, 'Invalid cache key.');
+        abort_if(! in_array($key, $allowedKeys), 400, 'Invalid cache key.');
 
         ConfigCacheService::put($key, $value);
 
-                return collect([
+        return collect([
             [
                 'name' => 'ActivityPub Federation',
                 'description' => 'Enable activitypub federation support, compatible with Pixelfed, Mastodon and other platforms.',
-                'key' => 'federation.activitypub.enabled'
+                'key' => 'federation.activitypub.enabled',
             ],
 
             [
                 'name' => 'Open Registration',
                 'description' => 'Allow new account registrations.',
-                'key' => 'pixelfed.open_registration'
+                'key' => 'pixelfed.open_registration',
             ],
 
             [
                 'name' => 'Stories',
                 'description' => 'Enable the ephemeral Stories feature.',
-                'key' => 'instance.stories.enabled'
+                'key' => 'instance.stories.enabled',
             ],
 
             [
                 'name' => 'Require Email Verification',
                 'description' => 'Require new accounts to verify their email address.',
-                'key' => 'pixelfed.enforce_email_verification'
+                'key' => 'pixelfed.enforce_email_verification',
             ],
 
             [
                 'name' => 'AutoSpam Detection',
                 'description' => 'Detect and remove spam from public timelines.',
-                'key' => 'pixelfed.bouncer.enabled'
+                'key' => 'pixelfed.bouncer.enabled',
             ],
         ])
-        ->map(function($s) {
-            $s['state'] = (bool) config_cache($s['key']);
-            return $s;
-        });
+            ->map(function ($s) {
+                $s['state'] = (bool) config_cache($s['key']);
+
+                return $s;
+            });
     }
 
     public function getUsers(Request $request)
     {
-        abort_if(!$request->user(), 404);
+        abort_if(! $request->user() || ! $request->user()->token(), 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',
         ]);
         $q = $request->input('q');
         $sort = $request->input('sort', 'desc') === 'asc' ? 'asc' : 'desc';
         $res = User::whereNull('status')
-            ->when($q, function($query, $q) {
-                return $query->where('username', 'like', '%' . $q . '%');
+            ->when($q, function ($query, $q) {
+                return $query->where('username', 'like', '%'.$q.'%');
             })
             ->orderBy('id', $sort)
             ->cursorPaginate(10);
+
         return AdminUser::collection($res);
     }
 
     public function getUser(Request $request)
     {
-        abort_if(!$request->user(), 404);
+        abort_if(! $request->user() || ! $request->user()->token(), 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;
-        if($request->has('refresh')) {
+        $key = 'pf-admin-api:getUser:byId:'.$id;
+        if ($request->has('refresh')) {
             Cache::forget($key);
         }
-        return Cache::remember($key, 86400, function() use($id) {
+
+        return Cache::remember($key, 86400, function () use ($id) {
             $user = User::findOrFail($id);
             $profile = $user->profile;
             $account = AccountService::get($user->profile_id, true);
@@ -487,8 +521,8 @@ class AdminApiController extends Controller
                 'moderation' => [
                     'unlisted' => (bool) $profile->unlisted,
                     'cw' => (bool) $profile->cw,
-                    'no_autolink' => (bool) $profile->no_autolink
-                ]
+                    'no_autolink' => (bool) $profile->no_autolink,
+                ],
             ]]);
 
             return $res;
@@ -497,13 +531,15 @@ class AdminApiController extends Controller
 
     public function userAdminAction(Request $request)
     {
-        abort_if(!$request->user(), 404);
+        abort_if(! $request->user() || ! $request->user()->token(), 404);
+
         abort_unless($request->user()->is_admin == 1, 404);
+        abort_unless($request->user()->tokenCan('admin:write'), 404);
 
         $this->validate($request, [
             'id' => 'required',
             'action' => 'required|in:unlisted,cw,no_autolink,refresh_stats,verify_email,delete',
-            'value' => 'sometimes'
+            'value' => 'sometimes',
         ]);
 
         $id = $request->input('id');
@@ -513,8 +549,8 @@ class AdminApiController extends Controller
 
         abort_if($user->is_admin == true && $action !== 'refresh_stats', 400, 'Cannot moderate admin accounts');
 
-        if($action === 'delete') {
-            if(config('pixelfed.account_deletion') == false) {
+        if ($action === 'delete') {
+            if (config('pixelfed.account_deletion') == false) {
                 abort(404);
             }
 
@@ -542,7 +578,7 @@ class AdminApiController extends Controller
             PublicTimelineService::deleteByProfileId($profile->id);
             NetworkTimelineService::deleteByProfileId($profile->id);
 
-            if($profile->user_id) {
+            if ($profile->user_id) {
                 DB::table('oauth_access_tokens')->whereUserId($user->id)->delete();
                 DB::table('oauth_auth_codes')->whereUserId($user->id)->delete();
                 $user->email = $user->id;
@@ -561,11 +597,12 @@ class AdminApiController extends Controller
                 AccountService::del($profile->id);
                 DeleteRemoteProfilePipeline::dispatch($profile)->onQueue('high');
             }
+
             return [
                 'status' => 200,
                 'msg' => 'deleted',
             ];
-        } else if($action === 'refresh_stats') {
+        } elseif ($action === 'refresh_stats') {
             $profile->following_count = DB::table('followers')->whereProfileId($user->profile_id)->count();
             $profile->followers_count = DB::table('followers')->whereFollowingId($user->profile_id)->count();
             $statusCount = Status::whereProfileId($user->profile_id)
@@ -575,7 +612,7 @@ class AdminApiController extends Controller
                 ->count();
             $profile->status_count = $statusCount;
             $profile->save();
-        } else if($action === 'verify_email') {
+        } elseif ($action === 'verify_email') {
             $user->email_verified_at = now();
             $user->save();
 
@@ -587,11 +624,11 @@ class AdminApiController extends Controller
                 ->action('admin.user.moderate')
                 ->metadata([
                     'action' => 'Manually verified email address',
-                    'message' => 'Success!'
+                    'message' => 'Success!',
                 ])
                 ->accessLevel('admin')
                 ->save();
-        } else if($action === 'unlisted') {
+        } elseif ($action === 'unlisted') {
             ModLogService::boot()
                 ->objectUid($profile->id)
                 ->objectId($profile->id)
@@ -600,13 +637,13 @@ class AdminApiController extends Controller
                 ->action('admin.user.moderate')
                 ->metadata([
                     'action' => $action,
-                    'message' => 'Success!'
+                    'message' => 'Success!',
                 ])
                 ->accessLevel('admin')
                 ->save();
-            $profile->unlisted = !$profile->unlisted;
+            $profile->unlisted = ! $profile->unlisted;
             $profile->save();
-        } else if($action === 'cw') {
+        } elseif ($action === 'cw') {
             ModLogService::boot()
                 ->objectUid($profile->id)
                 ->objectId($profile->id)
@@ -615,13 +652,13 @@ class AdminApiController extends Controller
                 ->action('admin.user.moderate')
                 ->metadata([
                     'action' => $action,
-                    'message' => 'Success!'
+                    'message' => 'Success!',
                 ])
                 ->accessLevel('admin')
                 ->save();
-            $profile->cw = !$profile->cw;
+            $profile->cw = ! $profile->cw;
             $profile->save();
-        } else if($action === 'no_autolink') {
+        } elseif ($action === 'no_autolink') {
             ModLogService::boot()
                 ->objectUid($profile->id)
                 ->objectId($profile->id)
@@ -630,11 +667,11 @@ class AdminApiController extends Controller
                 ->action('admin.user.moderate')
                 ->metadata([
                     'action' => $action,
-                    'message' => 'Success!'
+                    'message' => 'Success!',
                 ])
                 ->accessLevel('admin')
                 ->save();
-            $profile->no_autolink = !$profile->no_autolink;
+            $profile->no_autolink = ! $profile->no_autolink;
             $profile->save();
         } else {
             $profile->{$action} = filter_var($request->input('value'), FILTER_VALIDATE_BOOLEAN);
@@ -648,7 +685,7 @@ class AdminApiController extends Controller
                 ->action('admin.user.moderate')
                 ->metadata([
                     'action' => $action,
-                    'message' => 'Success!'
+                    'message' => 'Success!',
                 ])
                 ->accessLevel('admin')
                 ->save();
@@ -662,15 +699,17 @@ class AdminApiController extends Controller
             'moderation' => [
                 'unlisted' => (bool) $profile->unlisted,
                 'cw' => (bool) $profile->cw,
-                'no_autolink' => (bool) $profile->no_autolink
-            ]
+                'no_autolink' => (bool) $profile->no_autolink,
+            ],
         ]]);
     }
 
     public function instances(Request $request)
     {
-        abort_if(!$request->user(), 404);
+        abort_if(! $request->user() || ! $request->user()->token(), 404);
+
         abort_unless($request->user()->is_admin == 1, 404);
+        abort_unless($request->user()->tokenCan('admin:write'), 404);
 
         $this->validate($request, [
             'q' => 'sometimes',
@@ -684,19 +723,19 @@ class AdminApiController extends Controller
         $sortBy = $request->input('sort_by', 'id');
         $filter = $request->input('filter');
 
-        $res = Instance::when($q, function($query, $q) {
-                return $query->where('domain', 'like', '%' . $q . '%');
-            })
-            ->when($filter, function($query, $filter) {
-                if($filter === 'all') {
+        $res = Instance::when($q, function ($query, $q) {
+            return $query->where('domain', 'like', '%'.$q.'%');
+        })
+            ->when($filter, function ($query, $filter) {
+                if ($filter === 'all') {
                     return $query;
                 } else {
                     return $query->where($filter, true);
                 }
             })
-            ->when($sortBy, function($query, $sortBy) use($sort) {
+            ->when($sortBy, function ($query, $sortBy) use ($sort) {
                 return $query->orderBy($sortBy, $sort);
-            }, function($query) {
+            }, function ($query) {
                 return $query->orderBy('id', 'desc');
             })
             ->cursorPaginate(10)
@@ -707,8 +746,10 @@ class AdminApiController extends Controller
 
     public function getInstance(Request $request)
     {
-        abort_if(!$request->user(), 404);
+        abort_if(! $request->user() || ! $request->user()->token(), 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);
@@ -718,13 +759,15 @@ class AdminApiController extends Controller
 
     public function moderateInstance(Request $request)
     {
-        abort_if(!$request->user(), 404);
+        abort_if(! $request->user() || ! $request->user()->token(), 404);
+
         abort_unless($request->user()->is_admin == 1, 404);
+        abort_unless($request->user()->tokenCan('admin:write'), 404);
 
         $this->validate($request, [
             'id' => 'required',
             'key' => 'required|in:unlisted,auto_cw,banned',
-            'value' => 'required'
+            'value' => 'required',
         ]);
 
         $id = $request->input('id');
@@ -742,8 +785,10 @@ class AdminApiController extends Controller
 
     public function refreshInstanceStats(Request $request)
     {
-        abort_if(!$request->user(), 404);
+        abort_if(! $request->user() || ! $request->user()->token(), 404);
+
         abort_unless($request->user()->is_admin == 1, 404);
+        abort_unless($request->user()->tokenCan('admin:write'), 404);
 
         $this->validate($request, [
             'id' => 'required',
@@ -760,49 +805,51 @@ class AdminApiController extends Controller
 
     public function getAllStats(Request $request)
     {
-        abort_if(!$request->user(), 404);
-        abort_unless($request->user()->is_admin === 1, 404);
+        abort_if(! $request->user() || ! $request->user()->token(), 404);
 
-        if($request->has('refresh')) {
+        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');
         }
 
-        return Cache::remember('admin-api:instance-all-stats-v1', 1209600, function() {
+        return Cache::remember('admin-api:instance-all-stats-v1', 1209600, function () {
             $days = range(1, 7);
             $res = [
                 'cached_at' => now()->format('c'),
             ];
             $minStatusId = SnowflakeService::byDate(now()->subDays(7));
 
-            foreach($days as $day) {
+            foreach ($days as $day) {
                 $label = now()->subDays($day)->format('D');
                 $labelShort = substr($label, 0, 1);
                 $res['users']['days'][] = [
                     'date' => now()->subDays($day)->format('M j Y'),
                     'label_full' => $label,
                     'label' => $labelShort,
-                    'count' => User::whereDate('created_at', now()->subDays($day))->count()
+                    'count' => User::whereDate('created_at', now()->subDays($day))->count(),
                 ];
 
                 $res['posts']['days'][] = [
                     'date' => now()->subDays($day)->format('M j Y'),
                     'label_full' => $label,
                     'label' => $labelShort,
-                    'count' => Status::whereNull('uri')->where('id', '>', $minStatusId)->whereDate('created_at', now()->subDays($day))->count()
+                    'count' => Status::whereNull('uri')->where('id', '>', $minStatusId)->whereDate('created_at', now()->subDays($day))->count(),
                 ];
 
                 $res['instances']['days'][] = [
                     'date' => now()->subDays($day)->format('M j Y'),
                     'label_full' => $label,
                     'label' => $labelShort,
-                    'count' => Instance::whereDate('created_at', now()->subDays($day))->count()
+                    'count' => Instance::whereDate('created_at', now()->subDays($day))->count(),
                 ];
             }
 
             $res['users']['total'] = DB::table('users')->count();
             $res['users']['min'] = collect($res['users']['days'])->min('count');
             $res['users']['max'] = collect($res['users']['days'])->max('count');
-            $res['users']['change'] = collect($res['users']['days'])->sum('count');;
+            $res['users']['change'] = collect($res['users']['days'])->sum('count');
             $res['posts']['total'] = DB::table('statuses')->whereNull('uri')->count();
             $res['posts']['min'] = collect($res['posts']['days'])->min('count');
             $res['posts']['max'] = collect($res['posts']['days'])->max('count');
diff --git a/app/Http/Controllers/Api/ApiController.php b/app/Http/Controllers/Api/ApiController.php
new file mode 100644
index 000000000..d8ba76668
--- /dev/null
+++ b/app/Http/Controllers/Api/ApiController.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+
+class ApiController extends Controller {
+  public function json($res, $headers = [], $code = 200) {
+    return response()->json($res, $code, $this->filterHeaders($headers), JSON_UNESCAPED_SLASHES);
+  }
+
+  public function linksForCollection($paginator) {
+    $link = null;
+
+    if ($paginator->onFirstPage()) {
+      if ($paginator->hasMorePages()) {
+          $link = '<'.$paginator->nextPageUrl().'>; rel="prev"';
+      }
+    } else {
+      if ($paginator->previousPageUrl()) {
+          $link = '<'.$paginator->previousPageUrl().'>; rel="next"';
+      }
+
+      if ($paginator->hasMorePages()) {
+          $link .= ($link ? ', ' : '').'<'.$paginator->nextPageUrl().'>; rel="prev"';
+      }
+    }
+
+    return $link;
+  }
+
+  private function filterHeaders($headers) {
+    return array_filter($headers, function($v, $k) {
+      return $v != null;
+    }, ARRAY_FILTER_USE_BOTH);
+  }
+}
diff --git a/app/Http/Controllers/Api/ApiV1Controller.php b/app/Http/Controllers/Api/ApiV1Controller.php
index 9e8f7ef23..3a309145c 100644
--- a/app/Http/Controllers/Api/ApiV1Controller.php
+++ b/app/Http/Controllers/Api/ApiV1Controller.php
@@ -2,3805 +2,4349 @@
 
 namespace App\Http\Controllers\Api;
 
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use Illuminate\Support\Str;
-use App\Util\ActivityPub\Helpers;
-use App\Util\Media\Filter;
-use Laravel\Passport\Passport;
-use Auth, Cache, DB, Storage, URL;
-use Illuminate\Support\Facades\Redis;
-use App\{
-	Avatar,
-	Bookmark,
-	Collection,
-	CollectionItem,
-	DirectMessage,
-	Follower,
-	FollowRequest,
-	Hashtag,
-	HashtagFollow,
-	Instance,
-	Like,
-	Media,
-	Notification,
-	Profile,
-	Status,
-	StatusHashtag,
-	User,
-	UserSetting,
-	UserFilter,
-};
-use League\Fractal;
-use App\Transformer\Api\Mastodon\v1\{
-	AccountTransformer,
-	MediaTransformer,
-	NotificationTransformer,
-	StatusTransformer,
-};
-use App\Transformer\Api\{
-	RelationshipTransformer,
-};
-use App\Http\Controllers\FollowerController;
-use League\Fractal\Serializer\ArraySerializer;
-use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use App\Avatar;
+use App\Bookmark;
+use App\Collection;
+use App\CollectionItem;
+use App\DirectMessage;
+use App\Follower;
+use App\FollowRequest;
+use App\Hashtag;
 use App\Http\Controllers\AccountController;
+use App\Http\Controllers\Controller;
+use App\Http\Controllers\FollowerController;
 use App\Http\Controllers\StatusController;
-
+use App\Instance;
 use App\Jobs\AvatarPipeline\AvatarOptimize;
 use App\Jobs\CommentPipeline\CommentPipeline;
+use App\Jobs\FollowPipeline\FollowAcceptPipeline;
+use App\Jobs\FollowPipeline\FollowPipeline;
+use App\Jobs\FollowPipeline\FollowRejectPipeline;
+use App\Jobs\FollowPipeline\UnfollowPipeline;
+use App\Jobs\HomeFeedPipeline\FeedWarmCachePipeline;
+use App\Jobs\ImageOptimizePipeline\ImageOptimize;
 use App\Jobs\LikePipeline\LikePipeline;
 use App\Jobs\MediaPipeline\MediaDeletePipeline;
+use App\Jobs\MediaPipeline\MediaSyncLicensePipeline;
 use App\Jobs\SharePipeline\SharePipeline;
 use App\Jobs\SharePipeline\UndoSharePipeline;
 use App\Jobs\StatusPipeline\NewStatusPipeline;
 use App\Jobs\StatusPipeline\StatusDelete;
-use App\Jobs\FollowPipeline\FollowPipeline;
-use App\Jobs\FollowPipeline\UnfollowPipeline;
-use App\Jobs\ImageOptimizePipeline\ImageOptimize;
-use App\Jobs\VideoPipeline\{
-	VideoOptimize,
-	VideoPostProcess,
-	VideoThumbnail
-};
-
-use App\Services\{
-	AccountService,
-	BookmarkService,
-	BouncerService,
-	CollectionService,
-	FollowerService,
-	HashtagService,
-	InstanceService,
-	LikeService,
-	NetworkTimelineService,
-	NotificationService,
-	MediaService,
-	MediaPathService,
-    ProfileStatusService,
-	PublicTimelineService,
-	ReblogService,
-	RelationshipService,
-	SearchApiV2Service,
-	StatusService,
-	MediaBlocklistService,
-	SnowflakeService,
-	UserFilterService
-};
+use App\Jobs\VideoPipeline\VideoThumbnail;
+use App\Like;
+use App\Media;
+use App\Models\Conversation;
+use App\Notification;
+use App\Profile;
+use App\Services\AccountService;
+use App\Services\AdminShadowFilterService;
+use App\Services\BookmarkService;
+use App\Services\BouncerService;
+use App\Services\CollectionService;
+use App\Services\CustomEmojiService;
+use App\Services\DiscoverService;
+use App\Services\FollowerService;
+use App\Services\HomeTimelineService;
+use App\Services\InstanceService;
+use App\Services\LikeService;
+use App\Services\MarkerService;
+use App\Services\MediaBlocklistService;
+use App\Services\MediaPathService;
+use App\Services\MediaService;
+use App\Services\NetworkTimelineService;
+use App\Services\NotificationService;
+use App\Services\PublicTimelineService;
+use App\Services\ReblogService;
+use App\Services\RelationshipService;
+use App\Services\SnowflakeService;
+use App\Services\StatusService;
+use App\Services\UserFilterService;
+use App\Services\UserRoleService;
+use App\Services\UserStorageService;
+use App\Status;
+use App\StatusHashtag;
+use App\Transformer\Api\Mastodon\v1\AccountTransformer;
+use App\Transformer\Api\Mastodon\v1\MediaTransformer;
+use App\Transformer\Api\Mastodon\v1\NotificationTransformer;
+use App\Transformer\Api\Mastodon\v1\StatusTransformer;
+use App\Transformer\Api\RelationshipTransformer;
+use App\User;
+use App\UserFilter;
+use App\UserSetting;
 use App\Util\Lexer\Autolink;
 use App\Util\Lexer\PrettyNumber;
 use App\Util\Localization\Localization;
+use App\Util\Media\Filter;
 use App\Util\Media\License;
-use App\Jobs\MediaPipeline\MediaSyncLicensePipeline;
-use App\Services\DiscoverService;
-use App\Services\CustomEmojiService;
-use App\Services\MarkerService;
-use App\Models\Conversation;
-use App\Jobs\FollowPipeline\FollowAcceptPipeline;
-use App\Jobs\FollowPipeline\FollowRejectPipeline;
-use Illuminate\Support\Facades\RateLimiter;
-use Purify;
+use Cache;
 use Carbon\Carbon;
-use App\Http\Resources\MastoApi\FollowedTagResource;
+use DB;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\RateLimiter;
+use Illuminate\Support\Str;
+use Laravel\Passport\Passport;
+use League\Fractal;
+use League\Fractal\Serializer\ArraySerializer;
+use Purify;
+use Storage;
 
 class ApiV1Controller extends Controller
 {
-	protected $fractal;
-	const PF_API_ENTITY_KEY = "_pe";
-
-	public function __construct()
-	{
-		$this->fractal = new Fractal\Manager();
-		$this->fractal->setSerializer(new ArraySerializer());
-	}
-
-	public function json($res, $code = 200, $headers = [])
-	{
-		return response()->json($res, $code, $headers, JSON_UNESCAPED_SLASHES);
-	}
-
-	public function getApp(Request $request)
-	{
-		if(!$request->user()) {
-			return response('', 403);
-		}
-
-		$client = $request->user()->token()->client;
-		$res = [
-			'name' => $client->name,
-			'website' => null,
-			'vapid_key' => null
-		];
-
-		return $this->json($res);
-	}
-
-	public function apps(Request $request)
-	{
-		abort_if(!config_cache('pixelfed.oauth_enabled'), 404);
-
-		$this->validate($request, [
-			'client_name' 		=> 'required',
-			'redirect_uris' 	=> 'required'
-		]);
-
-		$uris = implode(',', explode('\n', $request->redirect_uris));
-
-		$client = Passport::client()->forceFill([
-			'user_id' => null,
-			'name' => e($request->client_name),
-			'secret' => Str::random(40),
-			'redirect' => $uris,
-			'personal_access_client' => false,
-			'password_client' => false,
-			'revoked' => false,
-		]);
-
-		$client->save();
-
-		$res = [
-			'id' => (string) $client->id,
-			'name' => $client->name,
-			'website' => null,
-			'redirect_uri' => $client->redirect,
-			'client_id' => (string) $client->id,
-			'client_secret' => $client->secret,
-			'vapid_key' => null
-		];
-
-		return $this->json($res, 200, [
-			'Access-Control-Allow-Origin' => '*'
-		]);
-	}
-
-	/**
-	 * GET /api/v1/accounts/verify_credentials
-	 *
-	 *
-	 * @return \App\Transformer\Api\AccountTransformer
-	 */
-	public function verifyCredentials(Request $request)
-	{
-		$user = $request->user();
-
-		abort_if(!$user, 403);
-		abort_if($user->status != null, 403);
-
-		$res = $request->has(self::PF_API_ENTITY_KEY) ? AccountService::get($user->profile_id) : AccountService::getMastodon($user->profile_id);
-
-		$res['source'] = [
-			'privacy' => $res['locked'] ? 'private' : 'public',
-			'sensitive' => false,
-			'language' => $user->language ?? 'en',
-			'note' => strip_tags($res['note']),
-			'fields' => []
-		];
-
-		return $this->json($res);
-	}
-
-	/**
-	 * GET /api/v1/accounts/{id}
-	 *
-	 * @param  integer  $id
-	 *
-	 * @return \App\Transformer\Api\AccountTransformer
-	 */
-	public function accountById(Request $request, $id)
-	{
-		$res = $request->has(self::PF_API_ENTITY_KEY) ? AccountService::get($id, true) : AccountService::getMastodon($id, true);
-		if(!$res) {
-			return response()->json(['error' => 'Record not found'], 404);
-		}
-		return $this->json($res);
-	}
-
-	/**
-	 * PATCH /api/v1/accounts/update_credentials
-	 *
-	 * @return \App\Transformer\Api\AccountTransformer
-	 */
-	public function accountUpdateCredentials(Request $request)
-	{
-		abort_if(!$request->user(), 403);
-
-		if(config('pixelfed.bouncer.cloud_ips.ban_api')) {
-			abort_if(BouncerService::checkIp($request->ip()), 404);
-		}
-
-		$this->validate($request, [
-			'avatar'			=> 'sometimes|mimetypes:image/jpeg,image/png|max:' . config('pixelfed.max_avatar_size'),
-			'display_name'      => 'nullable|string|max:30',
-			'note'              => 'nullable|string|max:200',
-			'locked'            => 'nullable',
-			'website'			=> 'nullable|string|max:120',
-			// 'source.privacy'    => 'nullable|in:unlisted,public,private',
-			// 'source.sensitive'  => 'nullable|boolean'
-		], [
-			'required' => 'The :attribute field is required.',
-			'avatar.mimetypes' => 'The file must be in jpeg or png format',
-			'avatar.max' => 'The :attribute exceeds the file size limit of ' . PrettyNumber::size(config('pixelfed.max_avatar_size'), true, false),
-		]);
-
-		$user = $request->user();
-		$profile = $user->profile;
-		$settings = $user->settings;
-
-		$changes = false;
-		$other = array_merge(AccountService::defaultSettings()['other'], $settings->other ?? []);
-		$syncLicenses = false;
-		$licenseChanged = false;
-		$composeSettings = array_merge(AccountService::defaultSettings()['compose_settings'], $settings->compose_settings ?? []);
-
-		if($request->has('avatar')) {
-			$av = Avatar::whereProfileId($profile->id)->first();
-			if($av) {
-				$currentAvatar = storage_path('app/'.$av->media_path);
-				$file = $request->file('avatar');
-				$path = "public/avatars/{$profile->id}";
-				$name = strtolower(str_random(6)). '.' . $file->guessExtension();
-				$request->file('avatar')->storePubliclyAs($path, $name);
-				$av->media_path = "{$path}/{$name}";
-				$av->save();
-				Cache::forget("avatar:{$profile->id}");
-				Cache::forget('user:account:id:'.$user->id);
-				AvatarOptimize::dispatch($user->profile, $currentAvatar);
-			}
-			$changes = true;
-		}
-
-		if($request->has('source[language]')) {
-			$lang = $request->input('source[language]');
-			if(in_array($lang, Localization::languages())) {
-				$user->language = $lang;
-				$changes = true;
-				$other['language'] = $lang;
-			}
-		}
-
-		if($request->has('website')) {
-			$website = $request->input('website');
-			if($website != $profile->website) {
-				if($website) {
-					if(!strpos($website, '.')) {
-						$website = null;
-					}
-
-					if($website && !strpos($website, '://')) {
-						$website = 'https://' . $website;
-					}
-
-					$host = parse_url($website, PHP_URL_HOST);
-
-					$bannedInstances = InstanceService::getBannedDomains();
-					if(in_array($host, $bannedInstances)) {
-						$website = null;
-					}
-				}
-				$profile->website = $website ? $website : null;
-				$changes = true;
-			}
-		}
-
-		if($request->has('display_name')) {
-			$displayName = $request->input('display_name');
-			if($displayName !== $user->name) {
-				$user->name = $displayName;
-				$profile->name = $displayName;
-				$changes = true;
-			}
-		}
-
-		if($request->has('note')) {
-			$note = $request->input('note');
-			if($note !== strip_tags($profile->bio)) {
-				$profile->bio = Autolink::create()->autolink(strip_tags($note));
-				$changes = true;
-			}
-		}
-
-		if($request->has('locked')) {
-			$locked = $request->input('locked') == 'true';
-			if($profile->is_private != $locked) {
-				$profile->is_private = $locked;
-				$changes = true;
-			}
-		}
-
-		if($request->has('reduce_motion')) {
-			$reduced = $request->input('reduce_motion');
-			if($settings->reduce_motion != $reduced) {
-				$settings->reduce_motion = $reduced;
-				$changes = true;
-			}
-		}
-
-		if($request->has('high_contrast_mode')) {
-			$contrast = $request->input('high_contrast_mode');
-			if($settings->high_contrast_mode != $contrast) {
-				$settings->high_contrast_mode = $contrast;
-				$changes = true;
-			}
-		}
-
-		if($request->has('video_autoplay')) {
-			$autoplay = $request->input('video_autoplay');
-			if($settings->video_autoplay != $autoplay) {
-				$settings->video_autoplay = $autoplay;
-				$changes = true;
-			}
-		}
-
-		if($request->has('license')) {
-			$license = $request->input('license');
-			abort_if(!in_array($license, License::keys()), 422, 'Invalid media license id');
-			$syncLicenses = $request->input('sync_licenses') == true;
-			abort_if($syncLicenses && Cache::get('pf:settings:mls_recently:'.$user->id) == 2, 422, 'You can only sync licenses twice per 24 hours');
-			if($composeSettings['default_license'] != $license) {
-				$composeSettings['default_license'] = $license;
-				$licenseChanged = true;
-				$changes = true;
-			}
-		}
-
-		if($request->has('media_descriptions')) {
-			$md = $request->input('media_descriptions') == true;
-			if($composeSettings['media_descriptions'] != $md) {
-				$composeSettings['media_descriptions'] = $md;
-				$changes = true;
-			}
-		}
-
-		if($request->has('crawlable')) {
-			$crawlable = $request->input('crawlable');
-			if($settings->crawlable != $crawlable) {
-				$settings->crawlable = $crawlable;
-				$changes = true;
-			}
-		}
-
-		if($request->has('show_profile_follower_count')) {
-			$show_profile_follower_count = $request->input('show_profile_follower_count');
-			if($settings->show_profile_follower_count != $show_profile_follower_count) {
-				$settings->show_profile_follower_count = $show_profile_follower_count;
-				$changes = true;
-			}
-		}
-
-		if($request->has('show_profile_following_count')) {
-			$show_profile_following_count = $request->input('show_profile_following_count');
-			if($settings->show_profile_following_count != $show_profile_following_count) {
-				$settings->show_profile_following_count = $show_profile_following_count;
-				$changes = true;
-			}
-		}
-
-		if($request->has('public_dm')) {
-			$public_dm = $request->input('public_dm');
-			if($settings->public_dm != $public_dm) {
-				$settings->public_dm = $public_dm;
-				$changes = true;
-			}
-		}
-
-		if($request->has('source[privacy]')) {
-			$scope = $request->input('source[privacy]');
-			if(in_array($scope, ['public', 'private', 'unlisted'])) {
-				if($composeSettings['default_scope'] != $scope) {
-					$composeSettings['default_scope'] = $profile->is_private ? 'private' : $scope;
-					$changes = true;
-				}
-			}
-		}
-
-		if($request->has('disable_embeds')) {
-			$disabledEmbeds = $request->input('disable_embeds');
-			if($other['disable_embeds'] != $disabledEmbeds) {
-				$other['disable_embeds'] = $disabledEmbeds;
-				$changes = true;
-			}
-		}
-
-		if($changes) {
-			$settings->other = $other;
-			$settings->compose_settings = $composeSettings;
-			$settings->save();
-			$user->save();
-			$profile->save();
-			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:embed:' . $profile->id);
-			Cache::forget('profile:compose:settings:' . $user->id);
-			Cache::forget('profile:view:'.$user->username);
-			AccountService::del($user->profile_id);
-		}
-
-		if($syncLicenses && $licenseChanged) {
-			$key = 'pf:settings:mls_recently:'.$user->id;
-			$val = Cache::has($key) ? 2 : 1;
-			Cache::put($key, $val, 86400);
-			MediaSyncLicensePipeline::dispatch($user->id, $request->input('license'));
-		}
-
-        if($request->has(self::PF_API_ENTITY_KEY)) {
-            $res = AccountService::get($user->profile_id, true);
-        } else {
-           $res = AccountService::getMastodon($user->profile_id, true);
-           $res['bio'] = strip_tags($res['note']);
-           $res = array_merge($res, $other);
-       }
-
-		return $this->json($res);
-	}
-
-	/**
-	 * GET /api/v1/accounts/{id}/followers
-	 *
-	 * @param  integer  $id
-	 *
-	 * @return \App\Transformer\Api\AccountTransformer
-	 */
-	public function accountFollowersById(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
-
-		$account = AccountService::get($id);
-		abort_if(!$account, 404);
-		$pid = $request->user()->profile_id;
-		$this->validate($request, [
-			'limit' => 'sometimes|integer|min:1|max:80'
-		]);
-		$limit = $request->input('limit', 10);
-		$napi = $request->has(self::PF_API_ENTITY_KEY);
-
-		if(intval($pid) !== intval($account['id'])) {
-			if($account['locked']) {
-				if(!FollowerService::follows($pid, $account['id'])) {
-					return [];
-				}
-			}
-
-			if(AccountService::hiddenFollowers($id)) {
-				return [];
-			}
-
-			if($request->has('page') && $request->user()->is_admin == false) {
-				$page = (int) $request->input('page');
-				if(($page * $limit) >= 100) {
-					return [];
-				}
-			}
-		}
-		if($request->has('page')) {
-			$res = DB::table('followers')
-				->select('id', 'profile_id', 'following_id')
-				->whereFollowingId($account['id'])
-				->orderByDesc('id')
-				->simplePaginate($limit)
-				->map(function($follower) use($napi) {
-					return $napi ? AccountService::get($follower->profile_id, true) : AccountService::getMastodon($follower->profile_id, true);
-				})
-				->filter(function($account) {
-					return $account && isset($account['id']);
-				})
-				->values()
-				->toArray();
-
-			return $this->json($res);
-		}
-
-		$paginator = DB::table('followers')
-			->select('id', 'profile_id', 'following_id')
-			->whereFollowingId($account['id'])
-			->orderByDesc('id')
-			->cursorPaginate($limit)
-			->withQueryString();
-
-		$link = null;
-
-		if($paginator->onFirstPage()) {
-			if($paginator->hasMorePages()) {
-				$link = '<'.$paginator->nextPageUrl().'>; rel="prev"';
-			}
-		} else {
-			if($paginator->previousPageUrl()) {
-				$link = '<'.$paginator->previousPageUrl().'>; rel="next"';
-			}
-
-			if($paginator->hasMorePages()) {
-				$link .= ($link ? ', ' : '') . '<'.$paginator->nextPageUrl().'>; rel="prev"';
-			}
-		}
-
-		$res = $paginator->map(function($follower) use($napi) {
-				return $napi ? AccountService::get($follower->profile_id, true) : AccountService::getMastodon($follower->profile_id, true);
-			})
-			->filter(function($account) {
-				return $account && isset($account['id']);
-			})
-			->values()
-			->toArray();
-
-		$headers = isset($link) ? ['Link' => $link] : [];
-		return $this->json($res, 200, $headers);
-	}
-
-	/**
-	 * GET /api/v1/accounts/{id}/following
-	 *
-	 * @param  integer  $id
-	 *
-	 * @return \App\Transformer\Api\AccountTransformer
-	 */
-	public function accountFollowingById(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
-
-		$account = AccountService::get($id);
-		abort_if(!$account, 404);
-		$pid = $request->user()->profile_id;
-		$this->validate($request, [
-			'limit' => 'sometimes|integer|min:1|max:80'
-		]);
-		$limit = $request->input('limit', 10);
-		$napi = $request->has(self::PF_API_ENTITY_KEY);
-
-		if(intval($pid) !== intval($account['id'])) {
-			if($account['locked']) {
-				if(!FollowerService::follows($pid, $account['id'])) {
-					return [];
-				}
-			}
-
-			if(AccountService::hiddenFollowing($id)) {
-				return [];
-			}
-
-			if($request->has('page') && $request->user()->is_admin == false) {
-				$page = (int) $request->input('page');
-				if(($page * $limit) >= 100) {
-					return [];
-				}
-			}
-		}
-
-		if($request->has('page')) {
-			$res = DB::table('followers')
-				->select('id', 'profile_id', 'following_id')
-				->whereProfileId($account['id'])
-				->orderByDesc('id')
-				->simplePaginate($limit)
-				->map(function($follower) use($napi) {
-					return $napi ? AccountService::get($follower->following_id, true) : AccountService::getMastodon($follower->following_id, true);
-				})
-				->filter(function($account) {
-					return $account && isset($account['id']);
-				})
-				->values()
-				->toArray();
-			return $this->json($res);
-		}
-
-		$paginator = DB::table('followers')
-			->select('id', 'profile_id', 'following_id')
-			->whereProfileId($account['id'])
-			->orderByDesc('id')
-			->cursorPaginate($limit)
-			->withQueryString();
-
-		$link = null;
-
-		if($paginator->onFirstPage()) {
-			if($paginator->hasMorePages()) {
-				$link = '<'.$paginator->nextPageUrl().'>; rel="prev"';
-			}
-		} else {
-			if($paginator->previousPageUrl()) {
-				$link = '<'.$paginator->previousPageUrl().'>; rel="next"';
-			}
-
-			if($paginator->hasMorePages()) {
-				$link .= ($link ? ', ' : '') . '<'.$paginator->nextPageUrl().'>; rel="prev"';
-			}
-		}
-
-		$res = $paginator->map(function($follower) use($napi) {
-				return $napi ? AccountService::get($follower->following_id, true) : AccountService::getMastodon($follower->following_id, true);
-			})
-			->filter(function($account) {
-				return $account && isset($account['id']);
-			})
-			->values()
-			->toArray();
-
-		$headers = isset($link) ? ['Link' => $link] : [];
-		return $this->json($res, 200, $headers);
-	}
-
-	/**
-	 * GET /api/v1/accounts/{id}/statuses
-	 *
-	 * @param  integer  $id
-	 *
-	 * @return \App\Transformer\Api\StatusTransformer
-	 */
-	public function accountStatusesById(Request $request, $id)
-	{
-		$user = $request->user();
-
-		$this->validate($request, [
-			'only_media' => 'nullable',
-			'media_type' => 'sometimes|string|in:photo,video',
-			'pinned' => 'nullable',
-			'exclude_replies' => 'nullable',
-			'max_id' => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
-			'since_id' => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
-			'min_id' => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
-			'limit' => 'nullable|integer|min:1|max:100'
-		]);
-
-		$napi = $request->has(self::PF_API_ENTITY_KEY);
-		$profile = $napi ? AccountService::get($id, true) : AccountService::getMastodon($id, true);
-
-        if(!$profile || !isset($profile['id']) || !$user) {
-        	return $this->json(['error' => 'Account not found'], 404);
+    protected $fractal;
+
+    const PF_API_ENTITY_KEY = '_pe';
+
+    public function __construct()
+    {
+        $this->fractal = new Fractal\Manager;
+        $this->fractal->setSerializer(new ArraySerializer);
+    }
+
+    public function json($res, $code = 200, $headers = [])
+    {
+        return response()->json($res, $code, $headers, JSON_UNESCAPED_SLASHES);
+    }
+
+    /**
+     * GET /api/v1/apps/verify_credentials
+     */
+    public function getApp(Request $request)
+    {
+        // FIXME: /api/v1/apps/verify_credentials should be accessible with any
+        // valid Access Token, not just a user's access token (i.e., client
+        // credentails grant flow access tokens)
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+
+        $client = $request->user()->token()->client;
+        $res = [
+            'name' => $client->name,
+            'website' => null,
+            'vapid_key' => null,
+        ];
+
+        return $this->json($res);
+    }
+
+    /**
+     * POST /api/v1/apps
+     */
+    public function apps(Request $request)
+    {
+        abort_if(! (bool) config_cache('pixelfed.oauth_enabled'), 404);
+
+        $this->validate($request, [
+            'client_name' => 'required',
+            'redirect_uris' => 'required',
+        ]);
+
+        $uris = implode(',', explode('\n', $request->redirect_uris));
+
+        $client = Passport::client()->forceFill([
+            'user_id' => null,
+            'name' => e($request->client_name),
+            'secret' => Str::random(40),
+            'redirect' => $uris,
+            'personal_access_client' => false,
+            'password_client' => false,
+            'revoked' => false,
+        ]);
+
+        $client->save();
+
+        $res = [
+            'id' => (string) $client->id,
+            'name' => $client->name,
+            'website' => null,
+            'redirect_uri' => $client->redirect,
+            'client_id' => (string) $client->id,
+            'client_secret' => $client->secret,
+            'vapid_key' => null,
+        ];
+
+        return $this->json($res, 200, [
+            'Access-Control-Allow-Origin' => '*',
+        ]);
+    }
+
+    /**
+     * GET /api/v1/accounts/verify_credentials
+     *
+     *
+     * @return \App\Transformer\Api\AccountTransformer
+     */
+    public function verifyCredentials(Request $request)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
+
+        $user = $request->user();
+
+        abort_if($user->status != null, 403);
+        AccountService::setLastActive($user->id);
+
+        $res = $request->has(self::PF_API_ENTITY_KEY) ? AccountService::get($user->profile_id) : AccountService::getMastodon($user->profile_id);
+
+        $res['source'] = [
+            'privacy' => $res['locked'] ? 'private' : 'public',
+            'sensitive' => false,
+            'language' => $user->language ?? 'en',
+            'note' => strip_tags($res['note']),
+            'fields' => [],
+        ];
+
+        if ($request->has(self::PF_API_ENTITY_KEY)) {
+            $res['settings'] = AccountService::getAccountSettings($user->profile_id);
         }
 
-		$limit = $request->limit ?? 20;
-		$max_id = $request->max_id;
-		$min_id = $request->min_id;
+        return $this->json($res);
+    }
 
-		if(!$max_id && !$min_id) {
-			$min_id = 1;
-		}
+    /**
+     * GET /api/v1/accounts/{id}
+     *
+     * @param  int  $id
+     * @return \App\Transformer\Api\AccountTransformer
+     */
+    public function accountById(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
 
-		$pid = $request->user()->profile_id;
-		$scope = $request->only_media == true ?
-			['photo', 'photo:album', 'video', 'video:album'] :
-			['photo', 'photo:album', 'video', 'video:album', 'share', 'reply'];
+        $withInstanceMeta = $request->has('_wim');
+        $res = $request->has(self::PF_API_ENTITY_KEY) ? AccountService::get($id, true) : AccountService::getMastodon($id, true);
+        if (! $res) {
+            return response()->json(['error' => 'Record not found'], 404);
+        }
+        if ($res && strpos($res['acct'], '@') != -1) {
+            $domain = parse_url($res['url'], PHP_URL_HOST);
+            abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
+        }
 
-		if($request->only_media && $request->has('media_type')) {
-			$mt = $request->input('media_type');
-			if($mt == 'video') {
-				$scope = ['video', 'video:album'];
-			}
-		}
+        return $this->json($res);
+    }
 
-		if(intval($pid) === intval($profile['id'])) {
-			$visibility = ['public', 'unlisted', 'private'];
-		} else if($profile['locked']) {
-			$following = FollowerService::follows($pid, $profile['id']);
-			if(!$following) {
-				return response('', 403);
-			}
-			$visibility = ['public', 'unlisted', 'private'];
-		} else {
-			$following = FollowerService::follows($pid, $profile['id']);
-			$visibility = $following ? ['public', 'unlisted', 'private'] : ['public', 'unlisted'];
-		}
+    /**
+     * PATCH /api/v1/accounts/update_credentials
+     *
+     * @return \App\Transformer\Api\AccountTransformer
+     */
+    public function accountUpdateCredentials(Request $request)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('write'), 403);
 
-		$dir = $min_id ? '>' : '<';
-		$id = $min_id ?? $max_id;
-		$res = Status::whereProfileId($profile['id'])
-		->whereNull('in_reply_to_id')
-		->whereNull('reblog_of_id')
-		->whereIn('type', $scope)
-		->where('id', $dir, $id)
-		->whereIn('scope', $visibility)
-		->limit($limit)
-		->orderByDesc('id')
-		->get()
-		->map(function($s) use($user, $napi, $profile) {
-            try {
-                $status = $napi ? StatusService::get($s->id, false) : StatusService::getMastodon($s->id, false);
-            } catch (\Exception $e) {
-                return false;
+        if (config('pixelfed.bouncer.cloud_ips.ban_api')) {
+            abort_if(BouncerService::checkIp($request->ip()), 404);
+        }
+
+        $this->validate($request, [
+            'avatar' => 'sometimes|mimetypes:image/jpeg,image/png|max:'.config('pixelfed.max_avatar_size'),
+            'display_name' => 'nullable|string|max:30',
+            'note' => 'nullable|string|max:200',
+            'locked' => 'nullable',
+            'website' => 'nullable|string|max:120',
+            // 'source.privacy'    => 'nullable|in:unlisted,public,private',
+            // 'source.sensitive'  => 'nullable|boolean'
+        ], [
+            'required' => 'The :attribute field is required.',
+            'avatar.mimetypes' => 'The file must be in jpeg or png format',
+            'avatar.max' => 'The :attribute exceeds the file size limit of '.PrettyNumber::size(config('pixelfed.max_avatar_size'), true, false),
+        ]);
+
+        $user = $request->user();
+        AccountService::setLastActive($user->id);
+        $profile = $user->profile;
+        $settings = $user->settings;
+
+        $changes = false;
+        $other = array_merge(AccountService::defaultSettings()['other'], $settings->other ?? []);
+        $syncLicenses = false;
+        $licenseChanged = false;
+        $composeSettings = array_merge(AccountService::defaultSettings()['compose_settings'], $settings->compose_settings ?? []);
+
+        if ($request->has('avatar')) {
+            $av = Avatar::whereProfileId($profile->id)->first();
+            if ($av) {
+                $currentAvatar = storage_path('app/'.$av->media_path);
+                $file = $request->file('avatar');
+                $path = "public/avatars/{$profile->id}";
+                $name = strtolower(str_random(6)).'.'.$file->guessExtension();
+                $request->file('avatar')->storePubliclyAs($path, $name);
+                $av->media_path = "{$path}/{$name}";
+                $av->save();
+                Cache::forget("avatar:{$profile->id}");
+                Cache::forget('user:account:id:'.$user->id);
+                AvatarOptimize::dispatch($user->profile, $currentAvatar);
+            }
+            $changes = true;
+        }
+
+        if ($request->has('source[language]')) {
+            $lang = $request->input('source[language]');
+            if (in_array($lang, Localization::languages())) {
+                $user->language = $lang;
+                $changes = true;
+                $other['language'] = $lang;
+            }
+        }
+
+        if ($request->has('website')) {
+            $website = $request->input('website');
+            if ($website != $profile->website) {
+                if ($website) {
+                    if (! strpos($website, '.')) {
+                        $website = null;
+                    }
+
+                    if ($website && ! strpos($website, '://')) {
+                        $website = 'https://'.$website;
+                    }
+
+                    $host = parse_url($website, PHP_URL_HOST);
+
+                    $bannedInstances = InstanceService::getBannedDomains();
+                    if (in_array($host, $bannedInstances)) {
+                        $website = null;
+                    }
+                }
+                $profile->website = $website ? $website : null;
+                $changes = true;
+            }
+        }
+
+        if ($request->has('display_name')) {
+            $displayName = $request->input('display_name');
+            if ($displayName !== $user->name) {
+                $user->name = $displayName;
+                $profile->name = $displayName;
+                $changes = true;
+            }
+        }
+
+        if ($request->has('note')) {
+            $note = $request->input('note');
+            if ($note !== strip_tags($profile->bio)) {
+                $profile->bio = Autolink::create()->autolink(strip_tags($note));
+                $changes = true;
+            }
+        }
+
+        if ($request->has('locked')) {
+            $locked = $request->boolean('locked');
+            if ($profile->is_private != $locked) {
+                $profile->is_private = $locked;
+                $changes = true;
+            }
+        }
+
+        if ($request->has('reduce_motion')) {
+            $reduced = $request->boolean('reduce_motion');
+            if ($settings->reduce_motion != $reduced) {
+                $settings->reduce_motion = $reduced;
+                $changes = true;
+            }
+        }
+
+        if ($request->has('high_contrast_mode')) {
+            $contrast = $request->boolean('high_contrast_mode');
+            if ($settings->high_contrast_mode != $contrast) {
+                $settings->high_contrast_mode = $contrast;
+                $changes = true;
+            }
+        }
+
+        if ($request->has('video_autoplay')) {
+            $autoplay = $request->boolean('video_autoplay');
+            if ($settings->video_autoplay != $autoplay) {
+                $settings->video_autoplay = $autoplay;
+                $changes = true;
+            }
+        }
+
+        if ($request->has('license')) {
+            $license = $request->input('license');
+            abort_if(! in_array($license, License::keys()), 422, 'Invalid media license id');
+            $syncLicenses = $request->input('sync_licenses') == true;
+            abort_if($syncLicenses && Cache::get('pf:settings:mls_recently:'.$user->id) == 2, 422, 'You can only sync licenses twice per 24 hours');
+            if ($composeSettings['default_license'] != $license) {
+                $composeSettings['default_license'] = $license;
+                $licenseChanged = true;
+                $changes = true;
+            }
+        }
+
+        if ($request->has('media_descriptions')) {
+            $md = $request->boolean('media_descriptions');
+            if ($composeSettings['media_descriptions'] != $md) {
+                $composeSettings['media_descriptions'] = $md;
+                $changes = true;
+            }
+        }
+
+        if ($request->has('crawlable')) {
+            $crawlable = $request->boolean('crawlable');
+            if ($settings->crawlable != $crawlable) {
+                $settings->crawlable = $crawlable;
+                $changes = true;
+            }
+        }
+
+        if ($request->has('show_profile_follower_count')) {
+            $show_profile_follower_count = $request->boolean('show_profile_follower_count');
+            if ($settings->show_profile_follower_count != $show_profile_follower_count) {
+                $settings->show_profile_follower_count = $show_profile_follower_count;
+                $changes = true;
+                Cache::forget('pf:acct-trans:hideFollowers:'.$profile->id);
+            }
+        }
+
+        if ($request->has('show_profile_following_count')) {
+            $show_profile_following_count = $request->boolean('show_profile_following_count');
+            if ($settings->show_profile_following_count != $show_profile_following_count) {
+                $settings->show_profile_following_count = $show_profile_following_count;
+                $changes = true;
+                Cache::forget('pf:acct-trans:hideFollowing:'.$profile->id);
+            }
+        }
+
+        if ($request->has('public_dm')) {
+            $public_dm = $request->boolean('public_dm');
+            if ($settings->public_dm != $public_dm) {
+                $settings->public_dm = $public_dm;
+                $changes = true;
+            }
+        }
+
+        if ($request->has('source[privacy]')) {
+            $scope = $request->input('source[privacy]');
+            if (in_array($scope, ['public', 'private', 'unlisted'])) {
+                if ($composeSettings['default_scope'] != $scope) {
+                    $composeSettings['default_scope'] = $profile->is_private ? 'private' : $scope;
+                    $changes = true;
+                }
+            }
+        }
+
+        if ($request->has('disable_embeds')) {
+            $disabledEmbeds = $request->boolean('disable_embeds');
+            if ($other['disable_embeds'] != $disabledEmbeds) {
+                $other['disable_embeds'] = $disabledEmbeds;
+                $changes = true;
+            }
+        }
+
+        if ($changes) {
+            $settings->other = $other;
+            $settings->compose_settings = $composeSettings;
+            $settings->save();
+            $user->save();
+            $profile->save();
+            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:embed:'.$profile->id);
+            Cache::forget('profile:compose:settings:'.$user->id);
+            Cache::forget('profile:view:'.$profile->username);
+            Cache::forget('profile:atom:enabled:'.$profile->id);
+            Cache::forget('pfc:cached-user:wt:'.strtolower($profile->username));
+            Cache::forget('pfc:cached-user:wot:'.strtolower($profile->username));
+            Cache::forget('pf:acct:settings:hidden-followers:'.$profile->id);
+            Cache::forget('pf:acct:settings:hidden-following:'.$profile->id);
+            Cache::forget('pf:acct-trans:hideFollowing:'.$profile->id);
+            Cache::forget('pf:acct-trans:hideFollowers:'.$profile->id);
+            AccountService::del($user->profile_id);
+            AccountService::forgetAccountSettings($profile->id);
+        }
+
+        if ($syncLicenses && $licenseChanged) {
+            $key = 'pf:settings:mls_recently:'.$user->id;
+            $val = Cache::has($key) ? 2 : 1;
+            Cache::put($key, $val, 86400);
+            MediaSyncLicensePipeline::dispatch($user->id, $request->input('license'));
+        }
+
+        if ($request->has(self::PF_API_ENTITY_KEY)) {
+            $res = AccountService::get($user->profile_id, true);
+        } else {
+            $res = AccountService::getMastodon($user->profile_id, true);
+            $res['bio'] = strip_tags($res['note']);
+            $res = array_merge($res, $other);
+        }
+
+        return $this->json($res);
+    }
+
+    /**
+     * GET /api/v1/accounts/{id}/followers
+     *
+     * @param  int  $id
+     * @return \App\Transformer\Api\AccountTransformer
+     */
+    public function accountFollowersById(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
+
+        $account = AccountService::get($id);
+        abort_if(! $account, 404);
+        abort_if(isset($account['moved'], $account['moved']['id']), 404, 'Account moved');
+        $pid = $request->user()->profile_id;
+        $this->validate($request, [
+            'limit' => 'sometimes|integer|min:1',
+        ]);
+        $limit = $request->input('limit', 10);
+        if ($limit > 80) {
+            $limit = 80;
+        }
+        $napi = $request->has(self::PF_API_ENTITY_KEY);
+
+        if ($account && strpos($account['acct'], '@') != -1) {
+            $domain = parse_url($account['url'], PHP_URL_HOST);
+            abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
+        }
+
+        if (intval($pid) !== intval($account['id'])) {
+            if ($account['locked']) {
+                if (! FollowerService::follows($pid, $account['id'])) {
+                    return [];
+                }
             }
 
-			if($profile) {
-				$status['account'] = $profile;
-			}
+            if (AccountService::hiddenFollowers($id)) {
+                return [];
+            }
 
-			if($user && $status) {
-				$status['favourited'] = (bool) LikeService::liked($user->profile_id, $s->id);
-                $status['reblogged'] = (bool) ReblogService::get($user->profile_id, $s->id);
-                $status['bookmarked'] = (bool) BookmarkService::get($user->profile_id, $s->id);
-			}
-			return $status;
-		})
-		->filter(function($s) {
-			return $s;
-		})
-		->values();
-
-		return $this->json($res);
-	}
-
-	/**
-	 * POST /api/v1/accounts/{id}/follow
-	 *
-	 * @param  integer  $id
-	 *
-	 * @return \App\Transformer\Api\RelationshipTransformer
-	 */
-	public function accountFollowById(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
-
-		$user = $request->user();
-
-		$target = Profile::where('id', '!=', $user->profile_id)
-			->whereNull('status')
-			->findOrFail($id);
-
-		$private = (bool) $target->is_private;
-		$remote = (bool) $target->domain;
-		$blocked = UserFilter::whereUserId($target->id)
-				->whereFilterType('block')
-				->whereFilterableId($user->profile_id)
-				->whereFilterableType('App\Profile')
-				->exists();
-
-		if($blocked == true) {
-			abort(400, 'You cannot follow this user.');
-		}
-
-		$isFollowing = Follower::whereProfileId($user->profile_id)
-			->whereFollowingId($target->id)
-			->exists();
-
-		// Following already, return empty relationship
-		if($isFollowing == true) {
-			$res = RelationshipService::get($user->profile_id, $target->id) ?? [];
-			return $this->json($res);
-		}
-
-		// Rate limits, max 7500 followers per account
-		if($user->profile->following_count && $user->profile->following_count >= Follower::MAX_FOLLOWING) {
-			abort(400, 'You cannot follow more than ' . Follower::MAX_FOLLOWING . ' accounts');
-		}
-
-		if($private == true) {
-			$follow = FollowRequest::firstOrCreate([
-				'follower_id' => $user->profile_id,
-				'following_id' => $target->id
-			]);
-			if($remote == true && config('federation.activitypub.remoteFollow') == true) {
-				(new FollowerController())->sendFollow($user->profile, $target);
-			}
-		} else {
-			$follower = Follower::firstOrCreate([
-				'profile_id' => $user->profile_id,
-				'following_id' => $target->id
-			]);
-
-			if($remote == true && config('federation.activitypub.remoteFollow') == true) {
-				(new FollowerController())->sendFollow($user->profile, $target);
-			}
-			FollowPipeline::dispatch($follower)->onQueue('high');
-		}
-
-		RelationshipService::refresh($user->profile_id, $target->id);
-		Cache::forget('profile:following:'.$target->id);
-		Cache::forget('profile:followers:'.$target->id);
-		Cache::forget('profile:following:'.$user->profile_id);
-		Cache::forget('profile:followers:'.$user->profile_id);
-		Cache::forget('api:local:exp:rec:'.$user->profile_id);
-		Cache::forget('user:account:id:'.$target->user_id);
-		Cache::forget('user:account:id:'.$user->id);
-		Cache::forget('profile:follower_count:'.$target->id);
-		Cache::forget('profile:follower_count:'.$user->profile_id);
-		Cache::forget('profile:following_count:'.$target->id);
-		Cache::forget('profile:following_count:'.$user->profile_id);
-		AccountService::del($user->profile_id);
-		AccountService::del($target->id);
-
-		$res = RelationshipService::get($user->profile_id, $target->id);
-
-		return $this->json($res);
-	}
-
-	/**
-	 * POST /api/v1/accounts/{id}/unfollow
-	 *
-	 * @param  integer  $id
-	 *
-	 * @return \App\Transformer\Api\RelationshipTransformer
-	 */
-	public function accountUnfollowById(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
-
-		$user = $request->user();
-
-		$target = Profile::where('id', '!=', $user->profile_id)
-			->whereNull('status')
-			->findOrFail($id);
-
-		$private = (bool) $target->is_private;
-		$remote = (bool) $target->domain;
-
-		$isFollowing = Follower::whereProfileId($user->profile_id)
-			->whereFollowingId($target->id)
-			->exists();
-
-		if($isFollowing == false) {
-			$followRequest = FollowRequest::whereFollowerId($user->profile_id)
-				->whereFollowingId($target->id)
-				->first();
-			if($followRequest) {
-				$followRequest->delete();
-				RelationshipService::refresh($target->id, $user->profile_id);
-			}
-			$resource = new Fractal\Resource\Item($target, new RelationshipTransformer());
-			$res = $this->fractal->createData($resource)->toArray();
-
-			return $this->json($res);
-		}
-
-		Follower::whereProfileId($user->profile_id)
-			->whereFollowingId($target->id)
-			->delete();
-
-		UnfollowPipeline::dispatch($user->profile_id, $target->id)->onQueue('high');
-
-		if($remote == true && config('federation.activitypub.remoteFollow') == true) {
-			(new FollowerController())->sendUndoFollow($user->profile, $target);
-		}
-
-		RelationshipService::refresh($user->profile_id, $target->id);
-		Cache::forget('profile:following:'.$target->id);
-		Cache::forget('profile:followers:'.$target->id);
-		Cache::forget('profile:following:'.$user->profile_id);
-		Cache::forget('profile:followers:'.$user->profile_id);
-		Cache::forget('api:local:exp:rec:'.$user->profile_id);
-		Cache::forget('user:account:id:'.$target->user_id);
-		Cache::forget('user:account:id:'.$user->id);
-		Cache::forget('profile:follower_count:'.$target->id);
-		Cache::forget('profile:follower_count:'.$user->profile_id);
-		Cache::forget('profile:following_count:'.$target->id);
-		Cache::forget('profile:following_count:'.$user->profile_id);
-		AccountService::del($user->profile_id);
-		AccountService::del($target->id);
-
-		$res = RelationshipService::get($user->profile_id, $target->id);
-
-		return $this->json($res);
-	}
-
-	/**
-	 * GET /api/v1/accounts/relationships
-	 *
-	 * @param  array|integer  $id
-	 *
-	 * @return \App\Services\RelationshipService
-	 */
-	public function accountRelationshipsById(Request $request)
-	{
-		abort_if(!$request->user(), 403);
-
-		$this->validate($request, [
-			'id'    => 'required|array|min:1|max:20',
-			'id.*'  => 'required|integer|min:1|max:' . PHP_INT_MAX
-		]);
-		$napi = $request->has(self::PF_API_ENTITY_KEY);
-		$pid = $request->user()->profile_id ?? $request->user()->profile->id;
-		$res = collect($request->input('id'))
-			->filter(function($id) use($pid) {
-				return intval($id) !== intval($pid);
-			})
-			->map(function($id) use($pid, $napi) {
-				return $napi ?
-				 RelationshipService::getWithDate($pid, $id) :
-				 RelationshipService::get($pid, $id);
-		});
-		return $this->json($res);
-	}
-
-	/**
-	 * GET /api/v1/accounts/search
-	 *
-	 *
-	 *
-	 * @return \App\Transformer\Api\AccountTransformer
-	 */
-	public function accountSearch(Request $request)
-	{
-		abort_if(!$request->user(), 403);
-
-		$this->validate($request, [
-			'q'         => 'required|string|min:1|max:255',
-			'limit'     => 'nullable|integer|min:1|max:40',
-			'resolve'   => 'nullable'
-		]);
-
-		$user = $request->user();
-		$query = $request->input('q');
-		$limit = $request->input('limit') ?? 20;
-		$resolve = (bool) $request->input('resolve', false);
-		$q = '%' . $query . '%';
-
-		$profiles = Cache::remember('api:v1:accounts:search:' . sha1($query) . ':limit:' . $limit, 86400, function() use($q, $limit) {
-            return Profile::whereNull('status')
-    			->where('username', 'like', $q)
-    			->orWhere('name', 'like', $q)
-    			->limit($limit)
-    			->pluck('id')
-                ->map(function($id) {
-                    return AccountService::getMastodon($id);
+            if ($request->has('page') && $request->user()->is_admin == false) {
+                $page = (int) $request->input('page');
+                if (($page * $limit) >= 100) {
+                    return [];
+                }
+            }
+        }
+        if ($request->has('page')) {
+            $res = DB::table('followers')
+                ->select('id', 'profile_id', 'following_id')
+                ->whereFollowingId($account['id'])
+                ->orderByDesc('id')
+                ->simplePaginate($limit)
+                ->map(function ($follower) use ($napi) {
+                    return $napi ? AccountService::get($follower->profile_id, true) : AccountService::getMastodon($follower->profile_id, true);
                 })
-                ->filter(function($account) {
+                ->filter(function ($account) {
                     return $account && isset($account['id']);
-                });
+                })
+                ->values()
+                ->toArray();
+
+            return $this->json($res);
+        }
+
+        $paginator = DB::table('followers')
+            ->select('id', 'profile_id', 'following_id')
+            ->whereFollowingId($account['id'])
+            ->orderByDesc('id')
+            ->cursorPaginate($limit)
+            ->withQueryString();
+
+        $link = null;
+
+        if ($paginator->onFirstPage()) {
+            if ($paginator->hasMorePages()) {
+                $link = '<'.$paginator->nextPageUrl().'>; rel="prev"';
+            }
+        } else {
+            if ($paginator->previousPageUrl()) {
+                $link = '<'.$paginator->previousPageUrl().'>; rel="next"';
+            }
+
+            if ($paginator->hasMorePages()) {
+                $link .= ($link ? ', ' : '').'<'.$paginator->nextPageUrl().'>; rel="prev"';
+            }
+        }
+
+        $res = $paginator->map(function ($follower) use ($napi) {
+            return $napi ? AccountService::get($follower->profile_id, true) : AccountService::getMastodon($follower->profile_id, true);
+        })
+            ->filter(function ($account) {
+                return $account && isset($account['id']);
+            })
+            ->values()
+            ->toArray();
+
+        $headers = isset($link) ? ['Link' => $link] : [];
+
+        return $this->json($res, 200, $headers);
+    }
+
+    /**
+     * GET /api/v1/accounts/{id}/following
+     *
+     * @param  int  $id
+     * @return \App\Transformer\Api\AccountTransformer
+     */
+    public function accountFollowingById(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
+
+        $account = AccountService::get($id);
+        abort_if(! $account, 404);
+        abort_if(isset($account['moved'], $account['moved']['id']), 404, 'Account moved');
+        $pid = $request->user()->profile_id;
+        $this->validate($request, [
+            'limit' => 'sometimes|integer|min:1',
+        ]);
+        $limit = $request->input('limit', 10);
+        if ($limit > 80) {
+            $limit = 80;
+        }
+        $napi = $request->has(self::PF_API_ENTITY_KEY);
+
+        if ($account && strpos($account['acct'], '@') != -1) {
+            $domain = parse_url($account['url'], PHP_URL_HOST);
+            abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
+        }
+
+        if (intval($pid) !== intval($account['id'])) {
+            if ($account['locked']) {
+                if (! FollowerService::follows($pid, $account['id'])) {
+                    return [];
+                }
+            }
+
+            if (AccountService::hiddenFollowing($id)) {
+                return [];
+            }
+
+            if ($request->has('page') && $request->user()->is_admin == false) {
+                $page = (int) $request->input('page');
+                if (($page * $limit) >= 100) {
+                    return [];
+                }
+            }
+        }
+
+        if ($request->has('page')) {
+            $res = DB::table('followers')
+                ->select('id', 'profile_id', 'following_id')
+                ->whereProfileId($account['id'])
+                ->orderByDesc('id')
+                ->simplePaginate($limit)
+                ->map(function ($follower) use ($napi) {
+                    return $napi ? AccountService::get($follower->following_id, true) : AccountService::getMastodon($follower->following_id, true);
+                })
+                ->filter(function ($account) {
+                    return $account && isset($account['id']);
+                })
+                ->values()
+                ->toArray();
+
+            return $this->json($res);
+        }
+
+        $paginator = DB::table('followers')
+            ->select('id', 'profile_id', 'following_id')
+            ->whereProfileId($account['id'])
+            ->orderByDesc('id')
+            ->cursorPaginate($limit)
+            ->withQueryString();
+
+        $link = null;
+
+        if ($paginator->onFirstPage()) {
+            if ($paginator->hasMorePages()) {
+                $link = '<'.$paginator->nextPageUrl().'>; rel="prev"';
+            }
+        } else {
+            if ($paginator->previousPageUrl()) {
+                $link = '<'.$paginator->previousPageUrl().'>; rel="next"';
+            }
+
+            if ($paginator->hasMorePages()) {
+                $link .= ($link ? ', ' : '').'<'.$paginator->nextPageUrl().'>; rel="prev"';
+            }
+        }
+
+        $res = $paginator->map(function ($follower) use ($napi) {
+            return $napi ? AccountService::get($follower->following_id, true) : AccountService::getMastodon($follower->following_id, true);
+        })
+            ->filter(function ($account) {
+                return $account && isset($account['id']);
+            })
+            ->values()
+            ->toArray();
+
+        $headers = isset($link) ? ['Link' => $link] : [];
+
+        return $this->json($res, 200, $headers);
+    }
+
+    /**
+     * GET /api/v1/accounts/{id}/statuses
+     *
+     * @param  int  $id
+     * @return \App\Transformer\Api\StatusTransformer
+     */
+    public function accountStatusesById(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
+
+        $user = $request->user();
+
+        $this->validate($request, [
+            'only_media' => 'nullable',
+            'media_type' => 'sometimes|string|in:photo,video',
+            'pinned' => 'nullable',
+            'exclude_replies' => 'nullable',
+            'max_id' => 'nullable|integer|min:0|max:'.PHP_INT_MAX,
+            'since_id' => 'nullable|integer|min:0|max:'.PHP_INT_MAX,
+            'min_id' => 'nullable|integer|min:0|max:'.PHP_INT_MAX,
+            'limit' => 'nullable|integer|min:1',
+        ]);
+
+        $napi = $request->has(self::PF_API_ENTITY_KEY);
+        $profile = $napi ? AccountService::get($id, true) : AccountService::getMastodon($id, true);
+
+        if (! $profile || ! isset($profile['id']) || ! $user) {
+            return $this->json(['error' => 'Account not found'], 404);
+        }
+
+        if ($profile && strpos($profile['acct'], '@') != -1) {
+            $domain = parse_url($profile['url'], PHP_URL_HOST);
+            abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
+        }
+
+        $limit = $request->input('limit') ?? 20;
+        if ($limit > 40) {
+            $limit = 40;
+        }
+        $max_id = $request->max_id;
+        $min_id = $request->min_id;
+
+        if (! $max_id && ! $min_id) {
+            $min_id = 1;
+        }
+
+        $pid = $request->user()->profile_id;
+        $scope = $request->only_media == true ?
+            ['photo', 'photo:album', 'video', 'video:album'] :
+            ['photo', 'photo:album', 'video', 'video:album', 'share', 'reply'];
+
+        if ($request->only_media && $request->has('media_type')) {
+            $mt = $request->input('media_type');
+            if ($mt == 'video') {
+                $scope = ['video', 'video:album'];
+            }
+        }
+
+        if (intval($pid) === intval($profile['id'])) {
+            $visibility = ['public', 'unlisted', 'private'];
+        } elseif ($profile['locked']) {
+            $following = FollowerService::follows($pid, $profile['id']);
+            if (! $following) {
+                return response('', 403);
+            }
+            $visibility = ['public', 'unlisted', 'private'];
+        } else {
+            $following = FollowerService::follows($pid, $profile['id']);
+            $visibility = $following ? ['public', 'unlisted', 'private'] : ['public', 'unlisted'];
+        }
+
+        $dir = $min_id ? '>' : '<';
+        $id = $min_id ?? $max_id;
+        $res = Status::select(
+            'profile_id',
+            'in_reply_to_id',
+            'reblog_of_id',
+            'type',
+            'id',
+            'scope'
+        )
+            ->whereProfileId($profile['id'])
+            ->whereNull('in_reply_to_id')
+            ->whereNull('reblog_of_id')
+            ->whereIn('type', $scope)
+            ->where('id', $dir, $id)
+            ->whereIn('scope', $visibility)
+            ->limit($limit)
+            ->orderByDesc('id')
+            ->get()
+            ->map(function ($s) use ($user, $napi, $profile) {
+                try {
+                    $status = $napi ? StatusService::get($s->id, false) : StatusService::getMastodon($s->id, false);
+                } catch (\Exception $e) {
+                    return false;
+                }
+
+                if ($profile) {
+                    $status['account'] = $profile;
+                }
+
+                if ($user && $status) {
+                    $status['favourited'] = (bool) LikeService::liked($user->profile_id, $s->id);
+                    $status['reblogged'] = (bool) ReblogService::get($user->profile_id, $s->id);
+                    $status['bookmarked'] = (bool) BookmarkService::get($user->profile_id, $s->id);
+                }
+
+                return $status;
+            })
+            ->filter(function ($s) {
+                return $s;
+            })
+            ->values();
+
+        return $this->json($res);
+    }
+
+    /**
+     * POST /api/v1/accounts/{id}/follow
+     *
+     * @param  int  $id
+     * @return \App\Transformer\Api\RelationshipTransformer
+     */
+    public function accountFollowById(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('follow'), 403);
+
+        $user = $request->user();
+        abort_if($user->has_roles && ! UserRoleService::can('can-follow', $user->id), 403, 'Invalid permissions for this action');
+
+        AccountService::setLastActive($user->id);
+
+        $target = Profile::where('id', '!=', $user->profile_id)
+            ->whereNull('status')
+            ->findOrFail($id);
+
+        abort_if($target && $target->moved_to_profile_id, 400, 'Cannot follow an account that has moved!');
+
+        if ($target && $target->domain) {
+            $domain = $target->domain;
+            abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
+        }
+
+        $private = (bool) $target->is_private;
+        $remote = (bool) $target->domain;
+        $blocked = UserFilter::whereUserId($target->id)
+            ->whereFilterType('block')
+            ->whereFilterableId($user->profile_id)
+            ->whereFilterableType('App\Profile')
+            ->exists();
+
+        if ($blocked == true) {
+            abort(400, 'You cannot follow this user.');
+        }
+
+        $isFollowing = Follower::whereProfileId($user->profile_id)
+            ->whereFollowingId($target->id)
+            ->exists();
+
+        // Following already, return empty relationship
+        if ($isFollowing == true) {
+            $res = RelationshipService::get($user->profile_id, $target->id) ?? [];
+
+            return $this->json($res);
+        }
+
+        // Rate limits, max 7500 followers per account
+        if ($user->profile->following_count && $user->profile->following_count >= Follower::MAX_FOLLOWING) {
+            abort(400, 'You cannot follow more than '.Follower::MAX_FOLLOWING.' accounts');
+        }
+
+        if ($private == true) {
+            $follow = FollowRequest::firstOrCreate([
+                'follower_id' => $user->profile_id,
+                'following_id' => $target->id,
+            ]);
+            if ($remote == true && config('federation.activitypub.remoteFollow') == true) {
+                (new FollowerController)->sendFollow($user->profile, $target);
+            }
+        } else {
+            $follower = Follower::firstOrCreate([
+                'profile_id' => $user->profile_id,
+                'following_id' => $target->id,
+            ]);
+
+            if ($remote == true && config('federation.activitypub.remoteFollow') == true) {
+                (new FollowerController)->sendFollow($user->profile, $target);
+            }
+            FollowPipeline::dispatch($follower)->onQueue('high');
+        }
+
+        RelationshipService::refresh($user->profile_id, $target->id);
+        Cache::forget('profile:following:'.$target->id);
+        Cache::forget('profile:followers:'.$target->id);
+        Cache::forget('profile:following:'.$user->profile_id);
+        Cache::forget('profile:followers:'.$user->profile_id);
+        Cache::forget('api:local:exp:rec:'.$user->profile_id);
+        Cache::forget('user:account:id:'.$target->user_id);
+        Cache::forget('user:account:id:'.$user->id);
+        Cache::forget('profile:follower_count:'.$target->id);
+        Cache::forget('profile:follower_count:'.$user->profile_id);
+        Cache::forget('profile:following_count:'.$target->id);
+        Cache::forget('profile:following_count:'.$user->profile_id);
+        AccountService::del($user->profile_id);
+        AccountService::del($target->id);
+
+        $res = RelationshipService::get($user->profile_id, $target->id);
+
+        return $this->json($res);
+    }
+
+    /**
+     * POST /api/v1/accounts/{id}/unfollow
+     *
+     * @param  int  $id
+     * @return \App\Transformer\Api\RelationshipTransformer
+     */
+    public function accountUnfollowById(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('follow'), 403);
+
+        $user = $request->user();
+
+        AccountService::setLastActive($user->id);
+
+        $target = Profile::where('id', '!=', $user->profile_id)
+            ->whereNull('status')
+            ->findOrFail($id);
+
+        $private = (bool) $target->is_private;
+        $remote = (bool) $target->domain;
+
+        $isFollowing = Follower::whereProfileId($user->profile_id)
+            ->whereFollowingId($target->id)
+            ->exists();
+
+        if ($isFollowing == false) {
+            $followRequest = FollowRequest::whereFollowerId($user->profile_id)
+                ->whereFollowingId($target->id)
+                ->first();
+            if ($followRequest) {
+                $followRequest->delete();
+                RelationshipService::refresh($target->id, $user->profile_id);
+            }
+            $resource = new Fractal\Resource\Item($target, new RelationshipTransformer);
+            $res = $this->fractal->createData($resource)->toArray();
+
+            return $this->json($res);
+        }
+
+        Follower::whereProfileId($user->profile_id)
+            ->whereFollowingId($target->id)
+            ->delete();
+
+        UnfollowPipeline::dispatch($user->profile_id, $target->id)->onQueue('high');
+
+        if ($remote == true && config('federation.activitypub.remoteFollow') == true) {
+            (new FollowerController)->sendUndoFollow($user->profile, $target);
+        }
+
+        RelationshipService::refresh($user->profile_id, $target->id);
+        Cache::forget('profile:following:'.$target->id);
+        Cache::forget('profile:followers:'.$target->id);
+        Cache::forget('profile:following:'.$user->profile_id);
+        Cache::forget('profile:followers:'.$user->profile_id);
+        Cache::forget('api:local:exp:rec:'.$user->profile_id);
+        Cache::forget('user:account:id:'.$target->user_id);
+        Cache::forget('user:account:id:'.$user->id);
+        Cache::forget('profile:follower_count:'.$target->id);
+        Cache::forget('profile:follower_count:'.$user->profile_id);
+        Cache::forget('profile:following_count:'.$target->id);
+        Cache::forget('profile:following_count:'.$user->profile_id);
+        AccountService::del($user->profile_id);
+        AccountService::del($target->id);
+
+        $res = RelationshipService::get($user->profile_id, $target->id);
+
+        return $this->json($res);
+    }
+
+    /**
+     * GET /api/v1/accounts/relationships
+     *
+     * @param  array|int  $id
+     * @return \App\Services\RelationshipService
+     */
+    public function accountRelationshipsById(Request $request)
+    {
+        abort_if(! $request->user(), 403);
+
+        $this->validate($request, [
+            'id' => 'required|array|min:1',
+            'id.*' => 'required|integer|min:1|max:'.PHP_INT_MAX,
+        ]);
+        $ids = $request->input('id');
+        if (count($ids) > 20) {
+            $ids = collect($ids)->take(20)->toArray();
+        }
+        $napi = $request->has(self::PF_API_ENTITY_KEY);
+        $pid = $request->user()->profile_id ?? $request->user()->profile->id;
+        $res = collect($ids)
+            ->map(function ($id) use ($pid, $napi) {
+                if (intval($id) === intval($pid)) {
+                    return [
+                        'id' => $id,
+                        'following' => false,
+                        'followed_by' => false,
+                        'blocking' => false,
+                        'muting' => false,
+                        'muting_notifications' => false,
+                        'requested' => false,
+                        'domain_blocking' => false,
+                        'showing_reblogs' => false,
+                        'endorsed' => false,
+                    ];
+                }
+
+                return $napi ?
+                 RelationshipService::getWithDate($pid, $id) :
+                 RelationshipService::get($pid, $id);
+            });
+
+        return $this->json($res);
+    }
+
+    /**
+     * GET /api/v1/accounts/search
+     *
+     *
+     *
+     * @return \App\Transformer\Api\AccountTransformer
+     */
+    public function accountSearch(Request $request)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
+
+        $this->validate($request, [
+            'q' => 'required|string|min:1|max:30',
+            'limit' => 'nullable|integer|min:1',
+            'resolve' => 'nullable',
+        ]);
+
+        $user = $request->user();
+        abort_if($user->has_roles && ! UserRoleService::can('can-view-discover', $user->id), 403, 'Invalid permissions for this action');
+
+        AccountService::setLastActive($user->id);
+        $query = $request->input('q');
+        $limit = $request->input('limit') ?? 20;
+        if ($limit > 20) {
+            $limit = 20;
+        }
+        $resolve = $request->boolean('resolve', false);
+        $q = $query.'%';
+
+        $profiles = Profile::where('username', 'like', $q)
+            ->orderByDesc('followers_count')
+            ->limit($limit)
+            ->pluck('id')
+            ->map(function ($id) {
+                return AccountService::getMastodon($id);
+            })
+            ->filter(function ($account) {
+                return $account && isset($account['id']);
+            })
+            ->values();
+
+        return $this->json($profiles);
+    }
+
+    /**
+     * GET /api/v1/blocks
+     *
+     *
+     *
+     * @return \App\Transformer\Api\AccountTransformer
+     */
+    public function accountBlocks(Request $request)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
+
+        $this->validate($request, [
+            'limit' => 'sometimes|integer|min:1',
+            'page' => 'sometimes|integer|min:1',
+        ]);
+
+        $user = $request->user();
+        $limit = $request->input('limit') ?? 40;
+        if ($limit > 80) {
+            $limit = 80;
+        }
+
+        $blocks = UserFilter::select('filterable_id', 'filterable_type', 'filter_type', 'user_id')
+            ->whereUserId($user->profile_id)
+            ->whereFilterableType('App\Profile')
+            ->whereFilterType('block')
+            ->orderByDesc('id')
+            ->simplePaginate($limit)
+            ->withQueryString();
+
+        $res = $blocks->pluck('filterable_id')
+            ->map(function ($id) {
+                return AccountService::get($id, true);
+            })
+            ->filter(function ($account) {
+                return $account && isset($account['id']);
+            })
+            ->values();
+
+        $baseUrl = config('app.url').'/api/v1/blocks?limit='.$limit.'&';
+        $next = $blocks->nextPageUrl();
+        $prev = $blocks->previousPageUrl();
+
+        if ($next && ! $prev) {
+            $link = '<'.$next.'>; rel="next"';
+        }
+
+        if (! $next && $prev) {
+            $link = '<'.$prev.'>; rel="prev"';
+        }
+
+        if ($next && $prev) {
+            $link = '<'.$next.'>; rel="next",<'.$prev.'>; rel="prev"';
+        }
+        $headers = isset($link) ? ['Link' => $link] : [];
+
+        return $this->json($res, 200, $headers);
+    }
+
+    /**
+     * POST /api/v1/accounts/{id}/block
+     *
+     * @param  int  $id
+     * @return \App\Transformer\Api\RelationshipTransformer
+     */
+    public function accountBlockById(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('write'), 403);
+
+        $user = $request->user();
+        $pid = $user->profile_id ?? $user->profile->id;
+        AccountService::setLastActive($user->id);
+
+        if (intval($id) === intval($pid)) {
+            abort(400, 'You cannot block yourself');
+        }
+
+        $profile = Profile::findOrFail($id);
+
+        abort_if($profile->moved_to_profile_id, 422, 'Cannot block an account that has migrated!');
+
+        if ($profile->user && $profile->user->is_admin == true) {
+            abort(400, 'You cannot block an admin');
+        }
+
+        $count = UserFilterService::blockCount($pid);
+        $maxLimit = (int) config_cache('instance.user_filters.max_user_blocks');
+        if ($count == 0) {
+            $filterCount = UserFilter::whereUserId($pid)
+                ->whereFilterType('block')
+                ->get()
+                ->map(function ($rec) {
+                    return AccountService::get($rec->filterable_id, true);
+                })
+                ->filter(function ($account) {
+                    return $account && isset($account['id']);
+                })
+                ->values()
+                ->count();
+            abort_if($filterCount >= $maxLimit, 422, AccountController::FILTER_LIMIT_BLOCK_TEXT.$maxLimit.' accounts');
+        } else {
+            abort_if($count >= $maxLimit, 422, AccountController::FILTER_LIMIT_BLOCK_TEXT.$maxLimit.' accounts');
+        }
+
+        $followed = Follower::whereProfileId($profile->id)->whereFollowingId($pid)->first();
+        if ($followed) {
+            $followed->delete();
+            $profile->following_count = Follower::whereProfileId($profile->id)->count();
+            $profile->save();
+            $selfProfile = $user->profile;
+            $selfProfile->followers_count = Follower::whereFollowingId($pid)->count();
+            $selfProfile->save();
+            FollowerService::remove($profile->id, $pid);
+            AccountService::del($pid);
+            AccountService::del($profile->id);
+        }
+
+        $following = Follower::whereProfileId($pid)->whereFollowingId($profile->id)->first();
+        if ($following) {
+            $following->delete();
+            $profile->followers_count = Follower::whereFollowingId($profile->id)->count();
+            $profile->save();
+            $selfProfile = $user->profile;
+            $selfProfile->following_count = Follower::whereProfileId($pid)->count();
+            $selfProfile->save();
+            FollowerService::remove($pid, $profile->pid);
+            AccountService::del($pid);
+            AccountService::del($profile->id);
+        }
+
+        Notification::whereProfileId($pid)
+            ->whereActorId($profile->id)
+            ->get()
+            ->map(function ($n) use ($pid) {
+                NotificationService::del($pid, $n['id']);
+                $n->forceDelete();
+            });
+
+        $filter = UserFilter::firstOrCreate([
+            'user_id' => $pid,
+            'filterable_id' => $profile->id,
+            'filterable_type' => 'App\Profile',
+            'filter_type' => 'block',
+        ]);
+
+        UserFilterService::block($pid, $id);
+        RelationshipService::refresh($pid, $id);
+        $resource = new Fractal\Resource\Item($profile, new RelationshipTransformer);
+        $res = $this->fractal->createData($resource)->toArray();
+
+        return $this->json($res);
+    }
+
+    /**
+     * POST /api/v1/accounts/{id}/unblock
+     *
+     * @param  int  $id
+     * @return \App\Transformer\Api\RelationshipTransformer
+     */
+    public function accountUnblockById(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('write'), 403);
+
+        $user = $request->user();
+        $pid = $user->profile_id ?? $user->profile->id;
+        AccountService::setLastActive($user->id);
+
+        if (intval($id) === intval($pid)) {
+            abort(400, 'You cannot unblock yourself');
+        }
+
+        $profile = Profile::findOrFail($id);
+
+        abort_if($profile->moved_to_profile_id, 422, 'Cannot unblock an account that has migrated!');
+
+        $filter = UserFilter::whereUserId($pid)
+            ->whereFilterableId($profile->id)
+            ->whereFilterableType('App\Profile')
+            ->whereFilterType('block')
+            ->first();
+
+        if ($filter) {
+            $filter->delete();
+            UserFilterService::unblock($pid, $profile->id);
+        }
+        RelationshipService::refresh($pid, $id);
+
+        $resource = new Fractal\Resource\Item($profile, new RelationshipTransformer);
+        $res = $this->fractal->createData($resource)->toArray();
+
+        return $this->json($res);
+    }
+
+    /**
+     * GET /api/v1/custom_emojis
+     *
+     * Return custom emoji
+     *
+     * @return array
+     */
+    public function customEmojis()
+    {
+        return response(CustomEmojiService::all())->header('Content-Type', 'application/json');
+    }
+
+    /**
+     * GET /api/v1/domain_blocks
+     *
+     * Return empty array
+     *
+     * @return array
+     */
+    public function accountDomainBlocks(Request $request)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
+
+        return response()->json([]);
+    }
+
+    /**
+     * GET /api/v1/endorsements
+     *
+     * Return empty array
+     *
+     * @return array
+     */
+    public function accountEndorsements(Request $request)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
+
+        return response()->json([]);
+    }
+
+    /**
+     * GET /api/v1/favourites
+     *
+     * Returns collection of liked statuses
+     *
+     * @return \App\Transformer\Api\StatusTransformer
+     */
+    public function accountFavourites(Request $request)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
+
+        $this->validate($request, [
+            'limit' => 'sometimes|integer|min:1',
+        ]);
+
+        $user = $request->user();
+        $maxId = $request->input('max_id');
+        $minId = $request->input('min_id');
+        $limit = $request->input('limit') ?? 10;
+        if ($limit > 40) {
+            $limit = 40;
+        }
+
+        $res = Like::whereProfileId($user->profile_id)
+            ->when($maxId, function ($q, $maxId) {
+                return $q->where('id', '<', $maxId);
+            })
+            ->when($minId, function ($q, $minId) {
+                return $q->where('id', '>', $minId);
+            })
+            ->orderByDesc('id')
+            ->limit($limit)
+            ->get()
+            ->map(function ($like) {
+                $status = StatusService::getMastodon($like['status_id'], false);
+                $status['favourited'] = true;
+                $status['like_id'] = $like->id;
+                $status['liked_at'] = str_replace('+00:00', 'Z', $like->created_at->format(DATE_RFC3339_EXTENDED));
+
+                return $status;
+            })
+            ->filter(function ($status) {
+                return $status && isset($status['id'], $status['like_id']);
+            })
+            ->values();
+
+        if ($res->count()) {
+            $ids = $res->map(function ($status) {
+                return $status['like_id'];
+            })->filter();
+
+            $max = $ids->min() - 1;
+            $min = $ids->max();
+
+            $baseUrl = config('app.url').'/api/v1/favourites?limit='.$limit.'&';
+            if ($maxId) {
+                $link = '<'.$baseUrl.'max_id='.$max.'>; rel="next",<'.$baseUrl.'min_id='.$min.'>; rel="prev"';
+            } else {
+                $link = '<'.$baseUrl.'max_id='.$max.'>; rel="next"';
+            }
+
+            return $this->json($res, 200, ['Link' => $link]);
+        } else {
+            return $this->json($res);
+        }
+    }
+
+    /**
+     * POST /api/v1/statuses/{id}/favourite
+     *
+     * @param  int  $id
+     * @return \App\Transformer\Api\StatusTransformer
+     */
+    public function statusFavouriteById(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('write'), 403);
+
+        $user = $request->user();
+        abort_if($user->has_roles && ! UserRoleService::can('can-like', $user->id), 403, 'Invalid permissions for this action');
+
+        $napi = $request->has(self::PF_API_ENTITY_KEY);
+        $status = $napi ? StatusService::get($id, false) : StatusService::getMastodon($id, false);
+
+        abort_unless($status, 404);
+
+        abort_if(isset($status['moved'], $status['moved']['id']), 422, 'Cannot like a post from an account that has migrated');
+
+        if ($status && isset($status['account'], $status['account']['acct']) && strpos($status['account']['acct'], '@') != -1) {
+            $domain = parse_url($status['account']['url'], PHP_URL_HOST);
+            abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
+        }
+
+        $spid = $status['account']['id'];
+
+        AccountService::setLastActive($user->id);
+
+        if (intval($spid) !== intval($user->profile_id)) {
+            if ($status['visibility'] == 'private') {
+                abort_if(! FollowerService::follows($user->profile_id, $spid), 403);
+            } else {
+                abort_if(! in_array($status['visibility'], ['public', 'unlisted']), 403);
+            }
+        }
+
+        abort_if(
+            Like::whereProfileId($user->profile_id)
+                ->where('created_at', '>', now()->subDay())
+                ->count() >= Like::MAX_PER_DAY,
+            429
+        );
+
+        $blocks = UserFilterService::blocks($spid);
+        if ($blocks && in_array($user->profile_id, $blocks)) {
+            abort(422);
+        }
+
+        $like = Like::firstOrCreate([
+            'profile_id' => $user->profile_id,
+            'status_id' => $status['id'],
+        ]);
+
+        if ($like->wasRecentlyCreated == true) {
+            $like->status_profile_id = $spid;
+            $like->is_comment = ! empty($status['in_reply_to_id']);
+            $like->save();
+            Status::findOrFail($status['id'])->update([
+                'likes_count' => ($status['favourites_count'] ?? 0) + 1,
+            ]);
+            LikePipeline::dispatch($like)->onQueue('feed');
+        }
+
+        $status['favourited'] = true;
+        $status['favourites_count'] = $status['favourites_count'] + 1;
+        $status['bookmarked'] = BookmarkService::get($user->profile_id, $status['id']);
+        $status['reblogged'] = ReblogService::get($user->profile_id, $status['id']);
+
+        return $this->json($status);
+    }
+
+    /**
+     * POST /api/v1/statuses/{id}/unfavourite
+     *
+     * @param  int  $id
+     * @return \App\Transformer\Api\StatusTransformer
+     */
+    public function statusUnfavouriteById(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('write'), 403);
+
+        $user = $request->user();
+        abort_if($user->has_roles && ! UserRoleService::can('can-like', $user->id), 403, 'Invalid permissions for this action');
+
+        $napi = $request->has(self::PF_API_ENTITY_KEY);
+        $status = $napi ? StatusService::get($id, false) : StatusService::getMastodon($id, false);
+
+        abort_unless($status && isset($status['account']), 404);
+        abort_if(isset($status['moved'], $status['moved']['id']), 422, 'Cannot unlike a post from an account that has migrated');
+
+        if ($status && isset($status['account'], $status['account']['acct']) && strpos($status['account']['acct'], '@') != -1) {
+            $domain = parse_url($status['account']['url'], PHP_URL_HOST);
+            abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
+        }
+
+        $spid = $status['account']['id'];
+
+        AccountService::setLastActive($user->id);
+
+        if (intval($spid) !== intval($user->profile_id)) {
+            if ($status['visibility'] == 'private') {
+                abort_if(! FollowerService::follows($user->profile_id, $spid), 403);
+            } else {
+                abort_if(! in_array($status['visibility'], ['public', 'unlisted']), 403);
+            }
+        }
+
+        $like = Like::whereProfileId($user->profile_id)
+            ->whereStatusId($status['id'])
+            ->first();
+
+        if ($like) {
+            $like->forceDelete();
+            $ogStatus = Status::find($status['id']);
+            if ($ogStatus) {
+                $ogStatus->likes_count = $ogStatus->likes_count > 1 ? $ogStatus->likes_count - 1 : 0;
+                $ogStatus->save();
+            }
+        }
+
+        StatusService::del($status['id']);
+
+        $status['favourited'] = false;
+        $status['favourites_count'] = isset($ogStatus) ? $ogStatus->likes_count : $status['favourites_count'] - 1;
+        $status['bookmarked'] = BookmarkService::get($user->profile_id, $status['id']);
+        $status['reblogged'] = ReblogService::get($user->profile_id, $status['id']);
+
+        return $this->json($status);
+    }
+
+    /**
+     * GET /api/v1/filters
+     *
+     *  Return empty response since we filter server side
+     *
+     * @return array
+     */
+    public function accountFilters(Request $request)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
+
+        return response()->json([]);
+    }
+
+    /**
+     * GET /api/v1/follow_requests
+     *
+     *  Return array of Accounts that have sent follow requests
+     *
+     * @return \App\Transformer\Api\AccountTransformer
+     */
+    public function accountFollowRequests(Request $request)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
+
+        $this->validate($request, [
+            'limit' => 'sometimes|integer|min:1|max:100',
+        ]);
+
+        $user = $request->user();
+
+        $res = FollowRequest::whereFollowingId($user->profile->id)
+            ->limit($request->input('limit', 40))
+            ->pluck('follower_id')
+            ->map(function ($id) {
+                return AccountService::getMastodon($id, true);
+            })
+            ->filter(function ($acct) {
+                return $acct && isset($acct['id']);
+            })
+            ->values();
+
+        return $this->json($res);
+    }
+
+    /**
+     * POST /api/v1/follow_requests/{id}/authorize
+     *
+     * @param  int  $id
+     * @return null
+     */
+    public function accountFollowRequestAccept(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('follow'), 403);
+
+        $pid = $request->user()->profile_id;
+        $target = AccountService::getMastodon($id);
+
+        abort_if(isset($target['moved'], $target['moved']['id']), 422, 'Cannot accept a request from an account that has migrated!');
+
+        if (! $target) {
+            return response()->json(['error' => 'Record not found'], 404);
+        }
+
+        if ($target && strpos($target['acct'], '@') != -1) {
+            $domain = parse_url($target['url'], PHP_URL_HOST);
+            abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
+        }
+
+        $followRequest = FollowRequest::whereFollowingId($pid)->whereFollowerId($id)->first();
+
+        if (! $followRequest) {
+            return response()->json(['error' => 'Record not found'], 404);
+        }
+
+        $follower = $followRequest->follower;
+        $follow = new Follower;
+        $follow->profile_id = $follower->id;
+        $follow->following_id = $pid;
+        $follow->save();
+
+        $profile = Profile::findOrFail($pid);
+        $profile->followers_count++;
+        $profile->save();
+        AccountService::del($profile->id);
+
+        $profile = Profile::findOrFail($follower->id);
+        $profile->following_count++;
+        $profile->save();
+        AccountService::del($profile->id);
+
+        if ($follower->domain != null && $follower->private_key === null) {
+            FollowAcceptPipeline::dispatch($followRequest)->onQueue('follow');
+        } else {
+            FollowPipeline::dispatch($follow);
+            $followRequest->delete();
+        }
+
+        RelationshipService::refresh($pid, $id);
+        $res = RelationshipService::get($pid, $id);
+        $res['followed_by'] = true;
+
+        return $this->json($res);
+    }
+
+    /**
+     * POST /api/v1/follow_requests/{id}/reject
+     *
+     * @param  int  $id
+     * @return null
+     */
+    public function accountFollowRequestReject(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('follow'), 403);
+
+        $pid = $request->user()->profile_id;
+        $target = AccountService::getMastodon($id);
+
+        if (! $target) {
+            return response()->json(['error' => 'Record not found'], 404);
+        }
+
+        abort_if(isset($target['moved'], $target['moved']['id']), 422, 'Cannot reject a request from an account that has migrated!');
+
+        $followRequest = FollowRequest::whereFollowingId($pid)->whereFollowerId($id)->first();
+
+        if (! $followRequest) {
+            return response()->json(['error' => 'Record not found'], 404);
+        }
+
+        $follower = $followRequest->follower;
+
+        if ($follower->domain != null && $follower->private_key === null) {
+            FollowRejectPipeline::dispatch($followRequest)->onQueue('follow');
+        } else {
+            $followRequest->delete();
+        }
+
+        RelationshipService::refresh($pid, $id);
+        $res = RelationshipService::get($pid, $id);
+
+        return $this->json($res);
+    }
+
+    /**
+     * GET /api/v1/suggestions
+     *
+     *   Return empty array as we don't support suggestions
+     *
+     * @return null
+     */
+    public function accountSuggestions(Request $request)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
+
+        // todo
+
+        return response()->json([]);
+    }
+
+    /**
+     * GET /api/v1/instance
+     *
+     *   Information about the server.
+     *
+     * @return Instance
+     */
+    public function instance(Request $request)
+    {
+        $res = Cache::remember('api:v1:instance-data-response-v1', 1800, function () {
+            $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;
+            });
+
+            $stats = Cache::remember('api:v1:instance-data:stats:v0', 43200, function () {
+                return [
+                    'user_count' => (int) User::count(),
+                    'status_count' => (int) StatusService::totalLocalStatuses(),
+                    'domain_count' => (int) Instance::count(),
+                ];
+            });
+
+            $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() : [];
+            });
+
+            return [
+                'uri' => config('pixelfed.domain.app'),
+                'title' => config_cache('app.name'),
+                'short_description' => config_cache('app.short_description'),
+                'description' => config_cache('app.description'),
+                'email' => config('instance.email'),
+                'version' => '3.5.3 (compatible; Pixelfed '.config('pixelfed.version').')',
+                'urls' => [
+                    'streaming_api' => null,
+                ],
+                'stats' => $stats,
+                'thumbnail' => config_cache('app.banner_image') ?? url(Storage::url('public/headers/default.jpg')),
+                'languages' => [config('app.locale')],
+                'registrations' => (bool) config_cache('pixelfed.open_registration'),
+                'approval_required' => (bool) config_cache('instance.curated_registration.enabled'),
+                'contact_account' => $contact,
+                'rules' => $rules,
+                'configuration' => [
+                    'media_attachments' => [
+                        'image_matrix_limit' => 16777216,
+                        'image_size_limit' => config_cache('pixelfed.max_photo_size') * 1024,
+                        'supported_mime_types' => explode(',', config_cache('pixelfed.media_types')),
+                        'video_frame_rate_limit' => 120,
+                        'video_matrix_limit' => 2304000,
+                        'video_size_limit' => config_cache('pixelfed.max_photo_size') * 1024,
+                    ],
+                    'polls' => [
+                        'max_characters_per_option' => 50,
+                        'max_expiration' => 2629746,
+                        'max_options' => 4,
+                        'min_expiration' => 300,
+                    ],
+                    'statuses' => [
+                        'characters_reserved_per_url' => 23,
+                        'max_characters' => (int) config_cache('pixelfed.max_caption_length'),
+                        'max_media_attachments' => (int) config_cache('pixelfed.max_album_length'),
+                    ],
+                ],
+            ];
         });
 
-		return $this->json($profiles);
-	}
-
-	/**
-	 * GET /api/v1/blocks
-	 *
-	 *
-	 *
-	 * @return \App\Transformer\Api\AccountTransformer
-	 */
-	public function accountBlocks(Request $request)
-	{
-		abort_if(!$request->user(), 403);
-
-		$this->validate($request, [
-			'limit'     => 'nullable|integer|min:1|max:40',
-			'page'      => 'nullable|integer|min:1|max:10'
-		]);
-
-		$user = $request->user();
-		$limit = $request->input('limit') ?? 40;
-
-		$blocked = UserFilter::select('filterable_id','filterable_type','filter_type','user_id')
-			->whereUserId($user->profile_id)
-			->whereFilterableType('App\Profile')
-			->whereFilterType('block')
-			->orderByDesc('id')
-			->simplePaginate($limit)
-			->pluck('filterable_id')
-			->map(function($id) {
-				return AccountService::get($id, true);
-			})
-			->filter(function($account) {
-				return $account && isset($account['id']);
-			})
-			->values();
-
-		return $this->json($blocked);
-	}
-
-	/**
-	 * POST /api/v1/accounts/{id}/block
-	 *
-	 * @param  integer  $id
-	 *
-	 * @return \App\Transformer\Api\RelationshipTransformer
-	 */
-	public function accountBlockById(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
-
-		$user = $request->user();
-		$pid = $user->profile_id ?? $user->profile->id;
-
-		if(intval($id) === intval($pid)) {
-			abort(400, 'You cannot block yourself');
-		}
-
-		$profile = Profile::findOrFail($id);
-
-		if($profile->user && $profile->user->is_admin == true) {
-			abort(400, 'You cannot block an admin');
-		}
-
-		$count = UserFilterService::blockCount($pid);
-		$maxLimit = intval(config('instance.user_filters.max_user_blocks'));
-		if($count == 0) {
-			$filterCount = UserFilter::whereUserId($pid)
-				->whereFilterType('block')
-				->get()
-				->map(function($rec) {
-					return AccountService::get($rec->filterable_id, true);
-				})
-				->filter(function($account) {
-					return $account && isset($account['id']);
-				})
-				->values()
-				->count();
-			abort_if($filterCount >= $maxLimit, 422, AccountController::FILTER_LIMIT_BLOCK_TEXT . $maxLimit . ' accounts');
-		} else {
-			abort_if($count >= $maxLimit, 422, AccountController::FILTER_LIMIT_BLOCK_TEXT . $maxLimit . ' accounts');
-		}
-
-		$followed = Follower::whereProfileId($profile->id)->whereFollowingId($pid)->first();
-		if($followed) {
-			$followed->delete();
-			$profile->following_count = Follower::whereProfileId($profile->id)->count();
-			$profile->save();
-			$selfProfile = $user->profile;
-			$selfProfile->followers_count = Follower::whereFollowingId($pid)->count();
-			$selfProfile->save();
-			FollowerService::remove($profile->id, $pid);
-			AccountService::del($pid);
-			AccountService::del($profile->id);
-		}
-
-		$following = Follower::whereProfileId($pid)->whereFollowingId($profile->id)->first();
-		if($following) {
-			$following->delete();
-			$profile->followers_count = Follower::whereFollowingId($profile->id)->count();
-			$profile->save();
-			$selfProfile = $user->profile;
-			$selfProfile->following_count = Follower::whereProfileId($pid)->count();
-			$selfProfile->save();
-			FollowerService::remove($pid, $profile->pid);
-			AccountService::del($pid);
-			AccountService::del($profile->id);
-		}
-
-		Notification::whereProfileId($pid)
-			->whereActorId($profile->id)
-			->get()
-			->map(function($n) use($pid) {
-				NotificationService::del($pid, $n['id']);
-				$n->forceDelete();
-		});
-
-		$filter = UserFilter::firstOrCreate([
-			'user_id'         => $pid,
-			'filterable_id'   => $profile->id,
-			'filterable_type' => 'App\Profile',
-			'filter_type'     => 'block',
-		]);
-
-		UserFilterService::block($pid, $id);
-		RelationshipService::refresh($pid, $id);
-		$resource = new Fractal\Resource\Item($profile, new RelationshipTransformer());
-		$res = $this->fractal->createData($resource)->toArray();
-
-		return $this->json($res);
-	}
-
-	/**
-	 * POST /api/v1/accounts/{id}/unblock
-	 *
-	 * @param  integer  $id
-	 *
-	 * @return \App\Transformer\Api\RelationshipTransformer
-	 */
-	public function accountUnblockById(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
-
-		$user = $request->user();
-		$pid = $user->profile_id ?? $user->profile->id;
-
-		if(intval($id) === intval($pid)) {
-			abort(400, 'You cannot unblock yourself');
-		}
-
-		$profile = Profile::findOrFail($id);
-
-		$filter = UserFilter::whereUserId($pid)
-			->whereFilterableId($profile->id)
-			->whereFilterableType('App\Profile')
-			->whereFilterType('block')
-			->first();
-
-		if($filter) {
-			$filter->delete();
-			UserFilterService::unblock($pid, $profile->id);
-			RelationshipService::refresh($pid, $id);
-		}
-
-		$resource = new Fractal\Resource\Item($profile, new RelationshipTransformer());
-		$res = $this->fractal->createData($resource)->toArray();
-
-		return $this->json($res);
-	}
-
-	/**
-	 * GET /api/v1/custom_emojis
-	 *
-	 * Return custom emoji
-	 *
-	 * @return array
-	 */
-	public function customEmojis()
-	{
-		return response(CustomEmojiService::all())->header('Content-Type', 'application/json');
-	}
-
-	/**
-	 * GET /api/v1/domain_blocks
-	 *
-	 * Return empty array
-	 *
-	 * @return array
-	 */
-	public function accountDomainBlocks(Request $request)
-	{
-		abort_if(!$request->user(), 403);
-		return response()->json([]);
-	}
-
-	/**
-	 * GET /api/v1/endorsements
-	 *
-	 * Return empty array
-	 *
-	 * @return array
-	 */
-	public function accountEndorsements(Request $request)
-	{
-		abort_if(!$request->user(), 403);
-		return response()->json([]);
-	}
-
-	/**
-	 * GET /api/v1/favourites
-	 *
-	 * Returns collection of liked statuses
-	 *
-	 * @return \App\Transformer\Api\StatusTransformer
-	 */
-	public function accountFavourites(Request $request)
-	{
-		abort_if(!$request->user(), 403);
-		$this->validate($request, [
-			'limit' => 'sometimes|integer|min:1|max:20'
-		]);
-
-		$user = $request->user();
-		$maxId = $request->input('max_id');
-		$minId = $request->input('min_id');
-		$limit = $request->input('limit') ?? 10;
-
-		$res = Like::whereProfileId($user->profile_id)
-			->when($maxId, function($q, $maxId) {
-				return $q->where('id', '<', $maxId);
-			})
-			->when($minId, function($q, $minId) {
-				return $q->where('id', '>', $minId);
-			})
-			->orderByDesc('id')
-			->limit($limit)
-			->get()
-			->map(function($like) {
-				$status =  StatusService::getMastodon($like['status_id'], false);
-				$status['favourited'] = true;
-				$status['like_id'] = $like->id;
-				$status['liked_at'] = str_replace('+00:00', 'Z', $like->created_at->format(DATE_RFC3339_EXTENDED));
-				return $status;
-			})
-			->filter(function($status) {
-				return $status && isset($status['id'], $status['like_id']);
-			})
-			->values();
-
-		if($res->count()) {
-			$ids = $res->map(function($status) {
-				return $status['like_id'];
-			});
-			$max = $ids->max();
-			$min = $ids->min();
-
-			$baseUrl = config('app.url') . '/api/v1/favourites?limit=' . $limit . '&';
-			$link = '<'.$baseUrl.'max_id='.$max.'>; rel="next",<'.$baseUrl.'min_id='.$min.'>; rel="prev"';
-			return $this->json($res, 200, ['Link' => $link]);
-		} else {
-			return $this->json($res);
-		}
-	}
-
-	/**
-	 * POST /api/v1/statuses/{id}/favourite
-	 *
-	 * @param  integer  $id
-	 *
-	 * @return \App\Transformer\Api\StatusTransformer
-	 */
-	public function statusFavouriteById(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
-
-		$user = $request->user();
-
-		$status = StatusService::getMastodon($id, false);
-
-		abort_unless($status, 400);
-
-		$spid = $status['account']['id'];
-
-		if(intval($spid) !== intval($user->profile_id)) {
-			if($status['visibility'] == 'private') {
-				abort_if(!FollowerService::follows($user->profile_id, $spid), 403);
-			} else {
-				abort_if(!in_array($status['visibility'], ['public','unlisted']), 403);
-			}
-		}
-
-		abort_if(
-			Like::whereProfileId($user->profile_id)
-				->where('created_at', '>', now()->subDay())
-				->count() >= Like::MAX_PER_DAY,
-			429
-		);
-
-		$blocks = UserFilterService::blocks($spid);
-		if($blocks && in_array($user->profile_id, $blocks)) {
-			abort(422);
-		}
-
-		$like = Like::firstOrCreate([
-			'profile_id' => $user->profile_id,
-			'status_id' => $status['id']
-		]);
-
-		if($like->wasRecentlyCreated == true) {
-			$like->status_profile_id = $spid;
-			$like->is_comment = !empty($status['in_reply_to_id']);
-			$like->save();
-			Status::findOrFail($status['id'])->update([
-				'likes_count' => ($status['favourites_count'] ?? 0) + 1
-			]);
-			LikePipeline::dispatch($like)->onQueue('feed');
-		}
-
-		$status['favourited'] = true;
-		$status['favourites_count'] = $status['favourites_count'] + 1;
-		return $this->json($status);
-	}
-
-	/**
-	 * POST /api/v1/statuses/{id}/unfavourite
-	 *
-	 * @param  integer  $id
-	 *
-	 * @return \App\Transformer\Api\StatusTransformer
-	 */
-	public function statusUnfavouriteById(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
-
-		$user = $request->user();
-
-		$status = Status::findOrFail($id);
-
-		if(intval($status->profile_id) !== intval($user->profile_id)) {
-			if($status->scope == 'private') {
-				abort_if(!$status->profile->followedBy($user->profile), 403);
-			} else {
-				abort_if(!in_array($status->scope, ['public','unlisted']), 403);
-			}
-		}
-
-		$like = Like::whereProfileId($user->profile_id)
-			->whereStatusId($status->id)
-			->first();
-
-		if($like) {
-			$like->forceDelete();
-			$status->likes_count = $status->likes_count > 1 ? $status->likes_count - 1 : 0;
-			$status->save();
-		}
-
-		StatusService::del($status->id);
-
-		$res = StatusService::getMastodon($status->id, false);
-		$res['favourited'] = false;
-		return $this->json($res);
-	}
-
-	/**
-	 * GET /api/v1/filters
-	 *
-	 *  Return empty response since we filter server side
-	 *
-	 * @return array
-	 */
-	public function accountFilters(Request $request)
-	{
-		abort_if(!$request->user(), 403);
-
-		return response()->json([]);
-	}
-
-	/**
-	 * GET /api/v1/follow_requests
-	 *
-	 *  Return array of Accounts that have sent follow requests
-	 *
-	 * @return \App\Transformer\Api\AccountTransformer
-	 */
-	public function accountFollowRequests(Request $request)
-	{
-		abort_if(!$request->user(), 403);
-		$this->validate($request, [
-			'limit' => 'sometimes|integer|min:1|max:100'
-		]);
-
-		$user = $request->user();
-
-		$res = FollowRequest::whereFollowingId($user->profile->id)
-			->limit($request->input('limit', 40))
-			->pluck('follower_id')
-			->map(function($id) {
-				return AccountService::getMastodon($id, true);
-			})
-			->filter(function($acct) {
-				return $acct && isset($acct['id']);
-			})
-			->values();
-
-		return $this->json($res);
-	}
-
-	/**
-	 * POST /api/v1/follow_requests/{id}/authorize
-	 *
-	 * @param  integer  $id
-	 *
-	 * @return null
-	 */
-	public function accountFollowRequestAccept(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
-		$pid = $request->user()->profile_id;
-		$target = AccountService::getMastodon($id);
-
-		if(!$target) {
-			return response()->json(['error' => 'Record not found'], 404);
-		}
-
-		$followRequest = FollowRequest::whereFollowingId($pid)->whereFollowerId($id)->first();
-
-		if(!$followRequest) {
-			return response()->json(['error' => 'Record not found'], 404);
-		}
-
-		$follower = $followRequest->follower;
-		$follow = new Follower();
-		$follow->profile_id = $follower->id;
-		$follow->following_id = $pid;
-		$follow->save();
-
-		$profile = Profile::findOrFail($pid);
-		$profile->followers_count++;
-		$profile->save();
-		AccountService::del($profile->id);
-
-		$profile = Profile::findOrFail($follower->id);
-		$profile->following_count++;
-		$profile->save();
-		AccountService::del($profile->id);
-
-		if($follower->domain != null && $follower->private_key === null) {
-			FollowAcceptPipeline::dispatch($followRequest)->onQueue('follow');
-		} else {
-			FollowPipeline::dispatch($follow);
-			$followRequest->delete();
-		}
-
-		RelationshipService::refresh($pid, $id);
-		$res = RelationshipService::get($pid, $id);
-		$res['followed_by'] = true;
-		return $this->json($res);
-	}
-
-	/**
-	 * POST /api/v1/follow_requests/{id}/reject
-	 *
-	 * @param  integer  $id
-	 *
-	 * @return null
-	 */
-	public function accountFollowRequestReject(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
-		$pid = $request->user()->profile_id;
-		$target = AccountService::getMastodon($id);
-
-		if(!$target) {
-			return response()->json(['error' => 'Record not found'], 404);
-		}
-
-		$followRequest = FollowRequest::whereFollowingId($pid)->whereFollowerId($id)->first();
-
-		if(!$followRequest) {
-			return response()->json(['error' => 'Record not found'], 404);
-		}
-
-		$follower = $followRequest->follower;
-
-		if($follower->domain != null && $follower->private_key === null) {
-			FollowRejectPipeline::dispatch($followRequest)->onQueue('follow');
-		} else {
-			$followRequest->delete();
-		}
-
-		RelationshipService::refresh($pid, $id);
-		$res = RelationshipService::get($pid, $id);
-		return $this->json($res);
-	}
-
-	/**
-	 * GET /api/v1/suggestions
-	 *
-	 *   Return empty array as we don't support suggestions
-	 *
-	 * @return null
-	 */
-	public function accountSuggestions(Request $request)
-	{
-		abort_if(!$request->user(), 403);
-
-		// todo
-
-		return response()->json([]);
-	}
-
-	/**
-	 * GET /api/v1/instance
-	 *
-	 *   Information about the server.
-	 *
-	 * @return Instance
-	 */
-	public function instance(Request $request)
-	{
-		$res = Cache::remember('api:v1:instance-data-response-v1', 1800, function () {
-			$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;
-			});
-
-			$stats = Cache::remember('api:v1:instance-data:stats', 43200, function () {
-				return [
-					'user_count' => User::count(),
-					'status_count' => Status::whereNull('uri')->count(),
-					'domain_count' => Instance::count(),
-				];
-			});
-
-			$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() : [];
-			});
-
-			return [
-				'uri' => config('pixelfed.domain.app'),
-				'title' => config('app.name'),
-				'short_description' => config_cache('app.short_description'),
-				'description' => config_cache('app.description'),
-				'email' => config('instance.email'),
-				'version' => '2.7.2 (compatible; Pixelfed ' . config('pixelfed.version') .')',
-				'urls' => [
-					'streaming_api' => 'wss://' . config('pixelfed.domain.app')
-				],
-				'stats' => $stats,
-				'thumbnail' => config_cache('app.banner_image') ?? url(Storage::url('public/headers/default.jpg')),
-				'languages' => [config('app.locale')],
-				'registrations' => (bool) config_cache('pixelfed.open_registration'),
-				'approval_required' => false,
-				'contact_account' => $contact,
-				'rules' => $rules,
-				'configuration' => [
-					'media_attachments' => [
-						'image_matrix_limit' => 16777216,
-						'image_size_limit' => config('pixelfed.max_photo_size') * 1024,
-						'supported_mime_types' => explode(',', config('pixelfed.media_types')),
-						'video_frame_rate_limit' => 120,
-						'video_matrix_limit' => 2304000,
-						'video_size_limit' => config('pixelfed.max_photo_size') * 1024,
-					],
-					'polls' => [
-						'max_characters_per_option' => 50,
-						'max_expiration' => 2629746,
-						'max_options' => 4,
-						'min_expiration' => 300
-					],
-					'statuses' => [
-						'characters_reserved_per_url' => 23,
-						'max_characters' => (int) config('pixelfed.max_caption_length'),
-						'max_media_attachments' => (int) config('pixelfed.max_album_length')
-					]
-				]
-			];
-		});
-
-		return $this->json($res);
-	}
-
-	/**
-	 * GET /api/v1/lists
-	 *
-	 *   Return empty array as we don't support lists
-	 *
-	 * @return null
-	 */
-	public function accountLists(Request $request)
-	{
-		abort_if(!$request->user(), 403);
-
-		return response()->json([]);
-	}
-
-	/**
-	 * GET /api/v1/accounts/{id}/lists
-	 *
-	 * @param  integer  $id
-	 *
-	 * @return null
-	 */
-	public function accountListsById(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
-
-		return response()->json([]);
-	}
-
-	/**
-	 * POST /api/v1/media
-	 *
-	 *
-	 * @return MediaTransformer
-	 */
-	public function mediaUpload(Request $request)
-	{
-		abort_if(!$request->user(), 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')
-		]);
-
-		$user = $request->user();
-
-		if($user->last_active_at == null) {
-			return [];
-		}
-
-		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();
-
-			return $dailyLimit >= 1250;
-		});
-		abort_if($limitReached == true, 429);
-
-		$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.');
-			}
-		}
-
-		$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');
-
-		$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();
-
-		// if($photo->getMimeType() == 'image/heic') {
-		// 	abort_if(config('image.driver') !== 'imagick', 422, 'Invalid media type');
-		// 	abort_if(!in_array('HEIC', \Imagick::queryformats()), 422, 'Unsupported media type');
-		// 	$oldPath = $path;
-		// 	$path = str_replace('.heic', '.jpg', $path);
-		// 	$mime = 'image/jpeg';
-		// 	\Image::make($photo)->save(storage_path("app/{$path}"));
-		// 	@unlink(storage_path("app/{$oldPath}"));
-		// }
-
-		$settings = UserSetting::whereUserId($user->id)->first();
-
-		if($settings && !empty($settings->compose_settings)) {
-			$compose = $settings->compose_settings;
-
-			if(isset($compose['default_license']) && $compose['default_license'] != 1) {
-				$license = $compose['default_license'];
-			}
-		}
-
-		abort_if(MediaBlocklistService::exists($hash) == true, 451);
-
-		$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;
-
-			case 'video/mp4':
-				VideoThumbnail::dispatch($media)->onQueue('mmo');
-				$preview_url = '/storage/no-preview.png';
-				$url = '/storage/no-preview.png';
-				break;
-		}
-
-		Cache::forget($limitKey);
-		$resource = new Fractal\Resource\Item($media, new MediaTransformer());
-		$res = $this->fractal->createData($resource)->toArray();
-		$res['preview_url'] = $media->url(). '?v=' . time();
-		$res['url'] = $media->url(). '?v=' . time();
-		return $this->json($res);
-	}
-
-	/**
-	 * PUT /api/v1/media/{id}
-	 *
-	 * @param  integer  $id
-	 *
-	 * @return MediaTransformer
-	 */
-	public function mediaUpdate(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
-
-		$this->validate($request, [
-		  'description' => 'nullable|string|max:' . config_cache('pixelfed.max_altext_length')
-		]);
-
-		$user = $request->user();
-
-		$media = Media::whereUserId($user->id)
-			->whereProfileId($user->profile_id)
-			->findOrFail($id);
-
-		$executed = RateLimiter::attempt(
-			'media:update:'.$user->id,
-			10,
-			function() use($media, $request) {
-				$caption = Purify::clean($request->input('description'));
-
-				if($caption != $media->caption) {
-					$media->caption = $caption;
-					$media->save();
-
-					if($media->status_id) {
-						MediaService::del($media->status_id);
-						StatusService::del($media->status_id);
-					}
-				}
-		});
-
-		if(!$executed) {
-			return response()->json([
-				'error' => 'Too many attempts. Try again in a few minutes.'
-			], 429);
-		};
-
-		$fractal = new Fractal\Manager();
-		$fractal->setSerializer(new ArraySerializer());
-		$resource = new Fractal\Resource\Item($media, new MediaTransformer());
-		return $this->json($fractal->createData($resource)->toArray());
-	}
-
-	/**
-	 * GET /api/v1/media/{id}
-	 *
-	 * @param  integer  $id
-	 *
-	 * @return MediaTransformer
-	 */
-	public function mediaGet(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
-
-		$user = $request->user();
-
-		$media = Media::whereUserId($user->id)
-			->whereNull('status_id')
-			->findOrFail($id);
-
-		$resource = new Fractal\Resource\Item($media, new MediaTransformer());
-		$res = $this->fractal->createData($resource)->toArray();
-		return $this->json($res);
-	}
-
-	/**
-	 * POST /api/v2/media
-	 *
-	 *
-	 * @return MediaTransformer
-	 */
-	public function mediaUploadV2(Request $request)
-	{
-		abort_if(!$request->user(), 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'
-		]);
-
-		$user = $request->user();
-
-		if($user->last_active_at == null) {
-			return [];
-		}
-
-		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();
-
-			return $dailyLimit >= 1250;
-		});
-		abort_if($limitReached == true, 429);
-
-		$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.');
-			}
-		}
-
-		$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');
-
-		$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();
-
-		$settings = UserSetting::whereUserId($user->id)->first();
-
-		if($settings && !empty($settings->compose_settings)) {
-			$compose = $settings->compose_settings;
-
-			if(isset($compose['default_license']) && $compose['default_license'] != 1) {
-				$license = $compose['default_license'];
-			}
-		}
-
-		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) {
-				$dateTime = Carbon::now();
-				MediaDeletePipeline::dispatch($removeMedia)
-					->onQueue('mmo')
-					->delay($dateTime->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();
-
-		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;
-		}
-
-		Cache::forget($limitKey);
-		$resource = new Fractal\Resource\Item($media, new MediaTransformer());
-		$res = $this->fractal->createData($resource)->toArray();
-		$res['preview_url'] = $media->url(). '?v=' . time();
-		$res['url'] = null;
-		return $this->json($res, 202);
-	}
-
-	/**
-	 * GET /api/v1/mutes
-	 *
-	 *
-	 * @return AccountTransformer
-	 */
-	public function accountMutes(Request $request)
-	{
-		abort_if(!$request->user(), 403);
-
-		$this->validate($request, [
-			'limit' => 'nullable|integer|min:1|max:40'
-		]);
-
-		$user = $request->user();
-		$limit = $request->input('limit', 40);
-
-		$mutes = UserFilter::whereUserId($user->profile_id)
-			->whereFilterableType('App\Profile')
-			->whereFilterType('mute')
-			->orderByDesc('id')
-			->simplePaginate($limit)
-			->pluck('filterable_id')
-			->map(function($id) {
-				return AccountService::get($id, true);
-			})
-			->filter(function($account) {
-				return $account && isset($account['id']);
-			})
-			->values();
-
-		return $this->json($mutes);
-	}
-
-	/**
-	 * POST /api/v1/accounts/{id}/mute
-	 *
-	 * @param  integer  $id
-	 *
-	 * @return RelationshipTransformer
-	 */
-	public function accountMuteById(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
-
-		$user = $request->user();
-		$pid = $user->profile_id;
-
-        if(intval($pid) === intval($id)) {
+        return $this->json($res);
+    }
+
+    /**
+     * GET /api/v1/lists
+     *
+     *   Return empty array as we don't support lists
+     *
+     * @return null
+     */
+    public function accountLists(Request $request)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
+
+        return response()->json([]);
+    }
+
+    /**
+     * GET /api/v1/accounts/{id}/lists
+     *
+     * @param  int  $id
+     * @return null
+     */
+    public function accountListsById(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
+
+        return response()->json([]);
+    }
+
+    /**
+     * POST /api/v1/media
+     *
+     *
+     * @return MediaTransformer
+     */
+    public function mediaUpload(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'),
+        ]);
+
+        $user = $request->user();
+        abort_if($user->has_roles && ! UserRoleService::can('can-post', $user->id), 403, 'Invalid permissions for this action');
+
+        AccountService::setLastActive($user->id);
+
+        if ($user->last_active_at == null) {
+            return [];
+        }
+
+        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();
+
+            return $dailyLimit >= 1250;
+        });
+        abort_if($limitReached == true, 429);
+
+        $profile = $user->profile;
+
+        $accountSize = UserStorageService::get($user->id);
+        abort_if($accountSize === -1, 403, 'Invalid request.');
+        $photo = $request->file('file');
+        $fileSize = $photo->getSize();
+        $sizeInKbs = (int) ceil($fileSize / 1000);
+        $updatedAccountSize = (int) $accountSize + (int) $sizeInKbs;
+
+        if ((bool) config_cache('pixelfed.enforce_account_limit') == true) {
+            $limit = (int) config_cache('pixelfed.max_account_size');
+            if ($updatedAccountSize >= $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;
+
+        $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();
+
+        // if($photo->getMimeType() == 'image/heic') {
+        //  abort_if(config('image.driver') !== 'imagick', 422, 'Invalid media type');
+        //  abort_if(!in_array('HEIC', \Imagick::queryformats()), 422, 'Unsupported media type');
+        //  $oldPath = $path;
+        //  $path = str_replace('.heic', '.jpg', $path);
+        //  $mime = 'image/jpeg';
+        //  \Image::make($photo)->save(storage_path("app/{$path}"));
+        //  @unlink(storage_path("app/{$oldPath}"));
+        // }
+
+        $settings = UserSetting::whereUserId($user->id)->first();
+
+        if ($settings && ! empty($settings->compose_settings)) {
+            $compose = $settings->compose_settings;
+
+            if (isset($compose['default_license']) && $compose['default_license'] != 1) {
+                $license = $compose['default_license'];
+            }
+        }
+
+        abort_if(MediaBlocklistService::exists($hash) == true, 451);
+
+        $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;
+
+            case 'video/mp4':
+                VideoThumbnail::dispatch($media)->onQueue('mmo');
+                $preview_url = '/storage/no-preview.png';
+                $url = '/storage/no-preview.png';
+                break;
+        }
+
+        $user->storage_used = (int) $updatedAccountSize;
+        $user->storage_used_updated_at = now();
+        $user->save();
+
+        Cache::forget($limitKey);
+        $resource = new Fractal\Resource\Item($media, new MediaTransformer);
+        $res = $this->fractal->createData($resource)->toArray();
+        $res['preview_url'] = $media->url().'?v='.time();
+        $res['url'] = $media->url().'?v='.time();
+
+        return $this->json($res);
+    }
+
+    /**
+     * PUT /api/v1/media/{id}
+     *
+     * @param  int  $id
+     * @return MediaTransformer
+     */
+    public function mediaUpdate(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('write'), 403);
+
+        $this->validate($request, [
+            'description' => 'nullable|string|max:'.config_cache('pixelfed.max_altext_length'),
+        ]);
+
+        $user = $request->user();
+        abort_if($user->has_roles && ! UserRoleService::can('can-post', $user->id), 403, 'Invalid permissions for this action');
+
+        AccountService::setLastActive($user->id);
+
+        $media = Media::whereUserId($user->id)
+            ->whereProfileId($user->profile_id)
+            ->findOrFail($id);
+
+        $executed = RateLimiter::attempt(
+            'media:update:'.$user->id,
+            10,
+            function () use ($media, $request) {
+                $caption = Purify::clean($request->input('description'));
+
+                if ($caption != $media->caption) {
+                    $media->caption = $caption;
+                    $media->save();
+
+                    if ($media->status_id) {
+                        MediaService::del($media->status_id);
+                        StatusService::del($media->status_id);
+                    }
+                }
+            });
+
+        if (! $executed) {
+            return response()->json([
+                'error' => 'Too many attempts. Try again in a few minutes.',
+            ], 429);
+        }
+
+        $fractal = new Fractal\Manager;
+        $fractal->setSerializer(new ArraySerializer);
+        $resource = new Fractal\Resource\Item($media, new MediaTransformer);
+
+        return $this->json($fractal->createData($resource)->toArray());
+    }
+
+    /**
+     * GET /api/v1/media/{id}
+     *
+     * @param  int  $id
+     * @return MediaTransformer
+     */
+    public function mediaGet(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
+
+        $user = $request->user();
+        abort_if($user->has_roles && ! UserRoleService::can('can-post', $user->id), 403, 'Invalid permissions for this action');
+        AccountService::setLastActive($user->id);
+
+        $media = Media::whereUserId($user->id)
+            ->whereNull('status_id')
+            ->findOrFail($id);
+
+        $resource = new Fractal\Resource\Item($media, new MediaTransformer);
+        $res = $this->fractal->createData($resource)->toArray();
+
+        return $this->json($res);
+    }
+
+    /**
+     * 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',
+        ]);
+
+        $user = $request->user();
+        abort_if($user->has_roles && ! UserRoleService::can('can-post', $user->id), 403, 'Invalid permissions for this action');
+
+        if ($user->last_active_at == null) {
+            return [];
+        }
+
+        AccountService::setLastActive($user->id);
+
+        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();
+
+            return $dailyLimit >= 1250;
+        });
+        abort_if($limitReached == true, 429);
+
+        $profile = $user->profile;
+
+        $accountSize = UserStorageService::get($user->id);
+        abort_if($accountSize === -1, 403, 'Invalid request.');
+        $photo = $request->file('file');
+        $fileSize = $photo->getSize();
+        $sizeInKbs = (int) ceil($fileSize / 1000);
+        $updatedAccountSize = (int) $accountSize + (int) $sizeInKbs;
+
+        if ((bool) config_cache('pixelfed.enforce_account_limit') == true) {
+            $limit = (int) config_cache('pixelfed.max_account_size');
+            if ($updatedAccountSize >= $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;
+
+        $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();
+
+        $settings = UserSetting::whereUserId($user->id)->first();
+
+        if ($settings && ! empty($settings->compose_settings)) {
+            $compose = $settings->compose_settings;
+
+            if (isset($compose['default_license']) && $compose['default_license'] != 1) {
+                $license = $compose['default_license'];
+            }
+        }
+
+        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) {
+                $dateTime = Carbon::now();
+                MediaDeletePipeline::dispatch($removeMedia)
+                    ->onQueue('mmo')
+                    ->delay($dateTime->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();
+
+        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;
+        }
+
+        $user->storage_used = (int) $updatedAccountSize;
+        $user->storage_used_updated_at = now();
+        $user->save();
+
+        Cache::forget($limitKey);
+        $resource = new Fractal\Resource\Item($media, new MediaTransformer);
+        $res = $this->fractal->createData($resource)->toArray();
+        $res['preview_url'] = $media->url().'?v='.time();
+        $res['url'] = null;
+
+        return $this->json($res, 202);
+    }
+
+    /**
+     * GET /api/v1/mutes
+     *
+     *
+     * @return AccountTransformer
+     */
+    public function accountMutes(Request $request)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
+
+        $this->validate($request, [
+            'limit' => 'sometimes|integer|min:1',
+        ]);
+
+        $user = $request->user();
+        $limit = $request->input('limit', 40);
+        if ($limit > 80) {
+            $limit = 80;
+        }
+
+        $mutes = UserFilter::whereUserId($user->profile_id)
+            ->whereFilterableType('App\Profile')
+            ->whereFilterType('mute')
+            ->orderByDesc('id')
+            ->simplePaginate($limit)
+            ->withQueryString();
+
+        $res = $mutes->pluck('filterable_id')
+            ->map(function ($id) {
+                return AccountService::get($id, true);
+            })
+            ->filter(function ($account) {
+                return $account && isset($account['id']);
+            })
+            ->values();
+
+        $baseUrl = config('app.url').'/api/v1/mutes?limit='.$limit.'&';
+        $next = $mutes->nextPageUrl();
+        $prev = $mutes->previousPageUrl();
+
+        if ($next && ! $prev) {
+            $link = '<'.$next.'>; rel="next"';
+        }
+
+        if (! $next && $prev) {
+            $link = '<'.$prev.'>; rel="prev"';
+        }
+
+        if ($next && $prev) {
+            $link = '<'.$next.'>; rel="next",<'.$prev.'>; rel="prev"';
+        }
+        $headers = isset($link) ? ['Link' => $link] : [];
+
+        return $this->json($res, 200, $headers);
+    }
+
+    /**
+     * POST /api/v1/accounts/{id}/mute
+     *
+     * @param  int  $id
+     * @return RelationshipTransformer
+     */
+    public function accountMuteById(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('write'), 403);
+
+        $user = $request->user();
+        $pid = $user->profile_id;
+
+        if (intval($pid) === intval($id)) {
             return $this->json(['error' => 'You cannot mute yourself'], 500);
         }
 
-		$account = Profile::findOrFail($id);
+        $account = Profile::findOrFail($id);
 
-		$count = UserFilterService::muteCount($pid);
-		$maxLimit = intval(config('instance.user_filters.max_user_mutes'));
-		if($count == 0) {
-			$filterCount = UserFilter::whereUserId($pid)
-				->whereFilterType('mute')
-				->get()
-				->map(function($rec) {
-					return AccountService::get($rec->filterable_id, true);
-				})
-				->filter(function($account) {
-					return $account && isset($account['id']);
-				})
-				->values()
-				->count();
-			abort_if($filterCount >= $maxLimit, 422, AccountController::FILTER_LIMIT_MUTE_TEXT . $maxLimit . ' accounts');
-		} else {
-			abort_if($count >= $maxLimit, 422, AccountController::FILTER_LIMIT_MUTE_TEXT . $maxLimit . ' accounts');
-		}
+        abort_if($account->moved_to_profile_id, 422, 'Cannot mute an account that has migrated!');
 
-		$filter = UserFilter::firstOrCreate([
-			'user_id'         => $pid,
-			'filterable_id'   => $account->id,
-			'filterable_type' => 'App\Profile',
-			'filter_type'     => 'mute',
-		]);
+        if ($account && $account->domain) {
+            $domain = $account->domain;
+            abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
+        }
 
-		RelationshipService::refresh($pid, $id);
+        $count = UserFilterService::muteCount($pid);
+        $maxLimit = (int) config_cache('instance.user_filters.max_user_mutes');
+        if ($count == 0) {
+            $filterCount = UserFilter::whereUserId($pid)
+                ->whereFilterType('mute')
+                ->get()
+                ->map(function ($rec) {
+                    return AccountService::get($rec->filterable_id, true);
+                })
+                ->filter(function ($account) {
+                    return $account && isset($account['id']);
+                })
+                ->values()
+                ->count();
+            abort_if($filterCount >= $maxLimit, 422, AccountController::FILTER_LIMIT_MUTE_TEXT.$maxLimit.' accounts');
+        } else {
+            abort_if($count >= $maxLimit, 422, AccountController::FILTER_LIMIT_MUTE_TEXT.$maxLimit.' accounts');
+        }
 
-		$resource = new Fractal\Resource\Item($account, new RelationshipTransformer());
-		$res = $this->fractal->createData($resource)->toArray();
-		return $this->json($res);
-	}
+        $filter = UserFilter::firstOrCreate([
+            'user_id' => $pid,
+            'filterable_id' => $account->id,
+            'filterable_type' => 'App\Profile',
+            'filter_type' => 'mute',
+        ]);
 
-	/**
-	 * POST /api/v1/accounts/{id}/unmute
-	 *
-	 * @param  integer  $id
-	 *
-	 * @return RelationshipTransformer
-	 */
-	public function accountUnmuteById(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
+        RelationshipService::refresh($pid, $id);
 
-		$user = $request->user();
-		$pid = $user->profile_id;
+        $resource = new Fractal\Resource\Item($account, new RelationshipTransformer);
+        $res = $this->fractal->createData($resource)->toArray();
 
-        if(intval($pid) === intval($id)) {
+        return $this->json($res);
+    }
+
+    /**
+     * POST /api/v1/accounts/{id}/unmute
+     *
+     * @param  int  $id
+     * @return RelationshipTransformer
+     */
+    public function accountUnmuteById(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('write'), 403);
+
+        $user = $request->user();
+        $pid = $user->profile_id;
+
+        if (intval($pid) === intval($id)) {
             return $this->json(['error' => 'You cannot unmute yourself'], 500);
         }
 
-		$profile = Profile::findOrFail($id);
+        $profile = Profile::findOrFail($id);
 
-		$filter = UserFilter::whereUserId($pid)
-			->whereFilterableId($profile->id)
-			->whereFilterableType('App\Profile')
-			->whereFilterType('mute')
-			->first();
+        abort_if($profile->moved_to_profile_id, 422, 'Cannot unmute an account that has migrated!');
 
-		if($filter) {
-			$filter->delete();
-			UserFilterService::unmute($pid, $profile->id);
-			RelationshipService::refresh($pid, $id);
-		}
+        $filter = UserFilter::whereUserId($pid)
+            ->whereFilterableId($profile->id)
+            ->whereFilterableType('App\Profile')
+            ->whereFilterType('mute')
+            ->first();
 
-		$resource = new Fractal\Resource\Item($profile, new RelationshipTransformer());
-		$res = $this->fractal->createData($resource)->toArray();
-		return $this->json($res);
-	}
-
-	/**
-	 * GET /api/v1/notifications
-	 *
-	 *
-	 * @return NotificationTransformer
-	 */
-	public function accountNotifications(Request $request)
-	{
-		abort_if(!$request->user(), 403);
-
-		$this->validate($request, [
-			'limit' => 'nullable|integer|min:1|max:100',
-			'min_id' => 'nullable|integer|min:1|max:'.PHP_INT_MAX,
-			'max_id' => 'nullable|integer|min:1|max:'.PHP_INT_MAX,
-			'since_id' => 'nullable|integer|min:1|max:'.PHP_INT_MAX,
-		]);
-
-		$pid = $request->user()->profile_id;
-		$limit = $request->input('limit', 20);
-
-		$since = $request->input('since_id');
-		$min = $request->input('min_id');
-		$max = $request->input('max_id');
-
-		if(!$since && !$min && !$max) {
-			$min = 1;
-		}
-
-		$maxId = null;
-		$minId = null;
-
-		if($max) {
-			$res = NotificationService::getMaxMastodon($pid, $max, $limit);
-			$ids = NotificationService::getRankedMaxId($pid, $max, $limit);
-			if(!empty($ids)) {
-				$maxId = max($ids);
-				$minId = min($ids);
-			}
-		} else {
-			$res = NotificationService::getMinMastodon($pid, $min ?? $since, $limit);
-			$ids = NotificationService::getRankedMinId($pid, $min ?? $since, $limit);
-			if(!empty($ids)) {
-				$maxId = max($ids);
-				$minId = min($ids);
-			}
-		}
-
-		if(empty($res) && !Cache::has('pf:services:notifications:hasSynced:'.$pid)) {
-			Cache::put('pf:services:notifications:hasSynced:'.$pid, 1, 1209600);
-			NotificationService::warmCache($pid, 400, true);
-		}
-
-		$baseUrl = config('app.url') . '/api/v1/notifications?limit=' . $limit . '&';
-
-		if($minId == $maxId) {
-			$minId = null;
-		}
-
-		if($maxId) {
-			$link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next"';
-		}
-
-		if($minId) {
-			$link = '<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"';
-		}
-
-		if($maxId && $minId) {
-			$link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next",<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"';
-		}
-
-		$headers = isset($link) ? ['Link' => $link] : [];
-		return $this->json($res, 200, $headers);
-	}
-
-	/**
-	 * GET /api/v1/timelines/home
-	 *
-	 *
-	 * @return StatusTransformer
-	 */
-	public function timelineHome(Request $request)
-	{
-		$this->validate($request,[
-		  'page'        => 'sometimes|integer|max:40',
-		  'min_id'      => 'sometimes|integer|min:0|max:' . PHP_INT_MAX,
-		  'max_id'      => 'sometimes|integer|min:0|max:' . PHP_INT_MAX,
-		  'limit'       => 'sometimes|integer|min:1|max:100',
-          'include_reblogs' => 'sometimes',
-		]);
-
-		$napi = $request->has(self::PF_API_ENTITY_KEY);
-		$page = $request->input('page');
-		$min = $request->input('min_id');
-		$max = $request->input('max_id');
-		$limit = $request->input('limit') ?? 20;
-		$pid = $request->user()->profile_id;
-        $includeReblogs = $request->filled('include_reblogs');
-        $nullFields = $includeReblogs ?
-            ['in_reply_to_id'] :
-            ['in_reply_to_id', 'reblog_of_id'];
-        $inTypes = $includeReblogs ?
-            ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album', 'share'] :
-            ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'];
-
-		$following = Cache::remember('profile:following:'.$pid, 1209600, function() use($pid) {
-			$following = Follower::whereProfileId($pid)->pluck('following_id');
-			return $following->push($pid)->toArray();
-		});
-
-		if($min || $max) {
-			$dir = $min ? '>' : '<';
-			$id = $min ?? $max;
-			$res = Status::select(
-				'id',
-				'profile_id',
-				'type',
-				'visibility',
-				'in_reply_to_id',
-				'reblog_of_id'
-			)
-			->where('id', $dir, $id)
-			->whereNull($nullFields)
-			->whereIntegerInRaw('profile_id', $following)
-			->whereIn('type', $inTypes)
-			->whereIn('visibility',['public', 'unlisted', 'private'])
-			->orderByDesc('id')
-			->take(($limit * 2))
-			->get()
-			->map(function($s) use($pid, $napi) {
-				try {
-					$account = $napi ? AccountService::get($s['profile_id'], true) : AccountService::getMastodon($s['profile_id'], true);
-					if(!$account) {
-						return false;
-					}
-					$status = $napi ? StatusService::get($s['id'], false) : StatusService::getMastodon($s['id'], false);
-					if(!$status || !isset($status['account']) || !isset($status['account']['id'])) {
-						return false;
-					}
-				} catch(\Exception $e) {
-					return false;
-				}
-
-				$status['account'] = $account;
-
-				if($pid) {
-					$status['favourited'] = (bool) LikeService::liked($pid, $s['id']);
-					$status['reblogged'] = (bool) ReblogService::get($pid, $status['id']);
-                    $status['bookmarked'] = (bool) BookmarkService::get($pid, $status['id']);
-				}
-				return $status;
-			})
-			->filter(function($status) {
-				return $status && isset($status['account']);
-			})
-            ->map(function($status) use($pid) {
-                if(!empty($status['reblog'])) {
-                    $status['reblog']['favourited'] = (bool) LikeService::liked($pid, $status['reblog']['id']);
-                    $status['reblog']['reblogged'] = (bool) ReblogService::get($pid, $status['reblog']['id']);
-                    $status['bookmarked'] = (bool) BookmarkService::get($pid, $status['id']);
-                }
-
-                return $status;
-            })
-			->take($limit)
-			->values();
-		} else {
-			$res = Status::select(
-				'id',
-				'profile_id',
-				'type',
-				'visibility',
-				'in_reply_to_id',
-				'reblog_of_id',
-			)
-			->whereNull($nullFields)
-			->whereIntegerInRaw('profile_id', $following)
-			->whereIn('type', $inTypes)
-			->whereIn('visibility',['public', 'unlisted', 'private'])
-			->orderByDesc('id')
-			->take(($limit * 2))
-			->get()
-			->map(function($s) use($pid, $napi) {
-				try {
-					$account = $napi ? AccountService::get($s['profile_id'], true) : AccountService::getMastodon($s['profile_id'], true);
-					if(!$account) {
-						return false;
-					}
-					$status = $napi ? StatusService::get($s['id'], false) : StatusService::getMastodon($s['id'], false);
-					if(!$status || !isset($status['account']) || !isset($status['account']['id'])) {
-						return false;
-					}
-				} catch(\Exception $e) {
-					return false;
-				}
-
-				$status['account'] = $account;
-
-				if($pid) {
-					$status['favourited'] = (bool) LikeService::liked($pid, $s['id']);
-					$status['reblogged'] = (bool) ReblogService::get($pid, $status['id']);
-                    $status['bookmarked'] = (bool) BookmarkService::get($pid, $status['id']);
-				}
-				return $status;
-			})
-			->filter(function($status) {
-				return $status && isset($status['account']);
-			})
-            ->map(function($status) use($pid) {
-                if(!empty($status['reblog'])) {
-                    $status['reblog']['favourited'] = (bool) LikeService::liked($pid, $status['reblog']['id']);
-                    $status['reblog']['reblogged'] = (bool) ReblogService::get($pid, $status['reblog']['id']);
-                    $status['bookmarked'] = (bool) BookmarkService::get($pid, $status['id']);
-                }
-
-                return $status;
-            })
-			->take($limit)
-			->values();
-		}
-
-		$baseUrl = config('app.url') . '/api/v1/timelines/home?limit=' . $limit . '&';
-		$minId = $res->map(function($s) {
-			return ['id' => $s['id']];
-		})->min('id');
-		$maxId = $res->map(function($s) {
-			return ['id' => $s['id']];
-		})->max('id');
-
-		if($minId == $maxId) {
-			$minId = null;
-		}
-
-		if($maxId) {
-			$link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next"';
-		}
-
-		if($minId) {
-			$link = '<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"';
-		}
-
-		if($maxId && $minId) {
-			$link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next",<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"';
-		}
-
-		$headers = isset($link) ? ['Link' => $link] : [];
-		return $this->json($res->toArray(), 200, $headers);
-	}
-
-	/**
-	 * GET /api/v1/timelines/public
-	 *
-	 *
-	 * @return StatusTransformer
-	 */
-	public function timelinePublic(Request $request)
-	{
-		$this->validate($request,[
-		  'min_id'      => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
-		  'max_id'      => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
-		  'limit'       => 'nullable|integer|max:100',
-		  'remote'		=> 'sometimes',
-		  'local'		=> 'sometimes'
-		]);
-
-		$napi = $request->has(self::PF_API_ENTITY_KEY);
-		$min = $request->input('min_id');
-		$max = $request->input('max_id');
-		$limit = $request->input('limit') ?? 20;
-		$user = $request->user();
-		$remote = ($request->has('remote') && $request->input('remote') == true) || ($request->filled('local') && $request->input('local') != true);
-        $filtered = $user ? UserFilterService::filters($user->profile_id) : [];
-
-        if((!$request->has('local') || $remote) && config('instance.timeline.network.cached')) {
-			Cache::remember('api:v1:timelines:network:cache_check', 10368000, function() {
-				if(NetworkTimelineService::count() == 0) {
-					NetworkTimelineService::warmCache(true, config('instance.timeline.network.cache_dropoff'));
-				}
-			});
-
-			if ($max) {
-				$feed = NetworkTimelineService::getRankedMaxId($max, $limit + 5);
-			} else if ($min) {
-				$feed = NetworkTimelineService::getRankedMinId($min, $limit + 5);
-			} else {
-				$feed = NetworkTimelineService::get(0, $limit + 5);
-			}
-        } else {
-			Cache::remember('api:v1:timelines:public:cache_check', 10368000, function() {
-				if(PublicTimelineService::count() == 0) {
-					PublicTimelineService::warmCache(true, 400);
-				}
-			});
-
-			if ($max) {
-				$feed = PublicTimelineService::getRankedMaxId($max, $limit + 5);
-			} else if ($min) {
-				$feed = PublicTimelineService::getRankedMinId($min, $limit + 5);
-			} else {
-				$feed = PublicTimelineService::get(0, $limit + 5);
-			}
+        if ($filter) {
+            $filter->delete();
+            UserFilterService::unmute($pid, $profile->id);
         }
 
-		$res = collect($feed)
-		->filter(function($k) use($min, $max) {
-			if(!$min && !$max) {
-				return true;
-			}
+        RelationshipService::refresh($pid, $id);
 
-			if($min) {
-				return $min != $k;
-			}
+        $resource = new Fractal\Resource\Item($profile, new RelationshipTransformer);
+        $res = $this->fractal->createData($resource)->toArray();
 
-			if($max) {
-				return $max != $k;
-			}
-		})
-		->map(function($k) use($user, $napi) {
-			try {
-				$status = $napi ? StatusService::get($k) : StatusService::getMastodon($k);
-				if(!$status || !isset($status['account']) || !isset($status['account']['id'])) {
-					return false;
-				}
-			} catch(\Exception $e) {
-				return false;
-			}
+        return $this->json($res);
+    }
 
-			$account = $napi ? AccountService::get($status['account']['id'], true) : AccountService::getMastodon($status['account']['id'], true);
-			if(!$account) {
-				return false;
-			}
+    /**
+     * GET /api/v1/notifications
+     *
+     *
+     * @return NotificationTransformer
+     */
+    public function accountNotifications(Request $request)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
 
-			$status['account'] = $account;
+        $this->validate($request, [
+            'limit' => 'sometimes|integer|min:1',
+            'min_id' => 'nullable|integer|min:1|max:'.PHP_INT_MAX,
+            'max_id' => 'nullable|integer|min:1|max:'.PHP_INT_MAX,
+            'since_id' => 'nullable|integer|min:1|max:'.PHP_INT_MAX,
+            'types[]' => 'sometimes|array',
+            'types[].*' => 'string|in:mention,reblog,follow,favourite',
+            'type' => 'sometimes|string|in:mention,reblog,follow,favourite',
+            '_pe' => 'sometimes',
+        ]);
 
-			if($user) {
-				$status['favourited'] = (bool) LikeService::liked($user->profile_id, $k);
-				$status['reblogged'] = (bool) ReblogService::get($user->profile_id, $status['id']);
-                $status['bookmarked'] = (bool) BookmarkService::get($user->profile_id, $status['id']);
-			}
-			return $status;
-		})
-		->filter(function($s) use($filtered) {
-			return $s && isset($s['account']) && in_array($s['account']['id'], $filtered) == false;
-		})
-		->take($limit)
-		->values();
+        $pid = $request->user()->profile_id;
+        $limit = $request->input('limit', 20);
+        $ogLimit = $request->input('limit', 20);
+        if ($limit > 40) {
+            $limit = 40;
+            $ogLimit = 40;
+        }
 
-		$baseUrl = config('app.url') . '/api/v1/timelines/public?limit=' . $limit . '&';
-		if($remote) {
-			$baseUrl .= 'remote=1&';
-		}
-		$minId = $res->map(function($s) {
-			return ['id' => $s['id']];
-		})->min('id');
-		$maxId = $res->map(function($s) {
-			return ['id' => $s['id']];
-		})->max('id');
+        $since = $request->input('since_id');
+        $min = $request->input('min_id');
+        $max = $request->input('max_id');
+        $pe = $request->filled('_pe');
 
-		if($minId == $maxId) {
-			$minId = null;
-		}
+        if (! $since && ! $min && ! $max) {
+            $min = 1;
+        }
 
-		if($maxId) {
-			$link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next"';
-		}
+        if ($since) {
+            $min = $since + 1;
+        }
 
-		if($minId) {
-			$link = '<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"';
-		}
+        $types = $request->input('types');
 
-		if($maxId && $minId) {
-			$link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next",<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"';
-		}
+        if ($request->has('types')) {
+            $limit = 150;
+        }
 
-		$headers = isset($link) ? ['Link' => $link] : [];
-		return $this->json($res->toArray(), 200, $headers);
-	}
+        $maxId = null;
+        $minId = null;
+        AccountService::setLastActive($request->user()->id);
 
-	/**
-	 * GET /api/v1/conversations
-	 *
-	 *   Not implemented
-	 *
-	 * @return array
-	 */
-	public function conversations(Request $request)
-	{
-		abort_if(!$request->user(), 403);
-		$this->validate($request, [
-			'limit' => 'min:1|max:40',
-			'scope' => 'nullable|in:inbox,sent,requests'
-		]);
+        $res = $max ?
+            NotificationService::getMaxMastodon($pid, $max, $limit) :
+            NotificationService::getMinMastodon($pid, $min ?? $since, $limit);
+        $ids = $max ?
+            NotificationService::getRankedMaxId($pid, $max, $limit) :
+            NotificationService::getRankedMinId($pid, $min ?? $since, $limit);
+        if (! empty($ids)) {
+            $maxId = max($ids);
+            $minId = min($ids);
+        }
 
-		$limit = $request->input('limit', 20);
-		$scope = $request->input('scope', 'inbox');
-		$pid = $request->user()->profile_id;
+        if (empty($res)) {
+            if (! Cache::has('pf:services:notifications:hasSynced:'.$pid)) {
+                Cache::put('pf:services:notifications:hasSynced:'.$pid, 1, 1209600);
+                NotificationService::warmCache($pid, 400, true);
+            }
+        }
 
-		if(config('database.default') == 'pgsql') {
-			$dms = DirectMessage::when($scope === 'inbox', function($q, $scope) use($pid) {
-					return $q->whereIsHidden(false)->where('to_id', $pid)->orWhere('from_id', $pid);
-				})
-				->when($scope === 'sent', function($q, $scope) use($pid) {
-					return $q->whereFromId($pid)->groupBy(['to_id', 'id']);
-				})
-				->when($scope === 'requests', function($q, $scope) use($pid) {
-					return $q->whereToId($pid)->whereIsHidden(true);
-				});
-		} else {
-			$dms = Conversation::when($scope === 'inbox', function($q, $scope) use($pid) {
-				return $q->whereIsHidden(false)
-					->where('to_id', $pid)
-					->orWhere('from_id', $pid)
-					->orderByDesc('status_id')
-					->groupBy(['to_id', 'from_id']);
-			})
-			->when($scope === 'sent', function($q, $scope) use($pid) {
-				return $q->whereFromId($pid)->groupBy('to_id');
-			})
-			->when($scope === 'requests', function($q, $scope) use($pid) {
-				return $q->whereToId($pid)->whereIsHidden(true);
-			});
-		}
+        if ($request->has('types')) {
+            $typesParams = collect($types)->implode('&types[]=');
+            $baseUrl = config('app.url').'/api/v1/notifications?types[]='.$typesParams.'&limit='.$ogLimit.'&';
+        } else {
+            $baseUrl = config('app.url').'/api/v1/notifications?limit='.$ogLimit.'&';
+        }
 
-		$dms = $dms->orderByDesc('status_id')
-			->simplePaginate($limit)
-			->map(function($dm) use($pid) {
-				$from = $pid == $dm->to_id ? $dm->from_id : $dm->to_id;
-				$res = [
-					'id' => $dm->id,
-					'unread' => false,
-					'accounts' => [
-						AccountService::getMastodon($from, true)
-					],
-					'last_status' => StatusService::getDirectMessage($dm->status_id)
-				];
-				return $res;
-			})
-			->filter(function($dm) {
-				if(!$dm || empty($dm['last_status']) || !isset($dm['accounts']) || !count($dm['accounts']) || !isset($dm['accounts'][0]) || !isset($dm['accounts'][0]['id'])) {
-					return false;
-				}
-				return true;
-			})
-			->unique(function($item, $key) {
-				return $item['accounts'][0]['id'];
-			})
-			->values();
+        if ($minId == $maxId) {
+            $minId = null;
+        }
 
-		return $this->json($dms);
-	}
+        $res = collect($res)
+            ->map(function ($n) use ($pe) {
+                if (! $pe) {
+                    if ($n['type'] == 'comment') {
+                        $n['type'] = 'mention';
 
-	/**
-	 * GET /api/v1/statuses/{id}
-	 *
-	 * @param  integer  $id
-	 *
-	 * @return StatusTransformer
-	 */
-	public function statusById(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
+                        return $n;
+                    }
 
-		$pid = $request->user()->profile_id;
+                    return $n;
+                }
 
-		$res = $request->has(self::PF_API_ENTITY_KEY) ? StatusService::get($id, false) : StatusService::getMastodon($id, false);
-		if(!$res || !isset($res['visibility'])) {
-			abort(404);
-		}
+                return $n;
+            })
+            ->filter(function ($n) use ($pe) {
+                if (in_array($n['type'], ['mention', 'reblog', 'favourite'])) {
+                    return isset($n['status'], $n['status']['id']);
+                }
 
-		$scope = $res['visibility'];
-		if(!in_array($scope, ['public', 'unlisted'])) {
-			if($scope === 'private') {
-				if(intval($res['account']['id']) !== intval($pid)) {
-					abort_unless(FollowerService::follows($pid, $res['account']['id']), 403);
-				}
-			} else {
-				abort(400, 'Invalid request');
-			}
-		}
+                if (! $pe) {
+                    if (in_array($n['type'], [
+                        'tagged',
+                        'modlog',
+                        'story:react',
+                        'story:comment',
+                        'group:comment',
+                        'group:join:approved',
+                        'group:join:rejected',
+                    ])) {
+                        return false;
+                    }
 
-        if(!empty($res['reblog']) && isset($res['reblog']['id'])) {
+                    return isset($n['account'], $n['account']['id']);
+                }
+
+                return true;
+            })
+            ->filter(function ($n) use ($types) {
+                if (! $types) {
+                    return true;
+                }
+
+                return in_array($n['type'], $types);
+            })
+            ->take($ogLimit)
+            ->values();
+
+        if ($maxId) {
+            $link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next"';
+        }
+
+        if ($minId) {
+            $link = '<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"';
+        }
+
+        if ($maxId && $minId) {
+            $link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next",<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"';
+        }
+
+        $headers = isset($link) ? ['Link' => $link] : [];
+
+        return $this->json($res, 200, $headers);
+    }
+
+    /**
+     * GET /api/v1/timelines/home
+     *
+     *
+     * @return StatusTransformer
+     */
+    public function timelineHome(Request $request)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
+
+        $this->validate($request, [
+            'page' => 'sometimes|integer|max:40',
+            'min_id' => 'sometimes|integer|min:0|max:'.PHP_INT_MAX,
+            'max_id' => 'sometimes|integer|min:0|max:'.PHP_INT_MAX,
+            'limit' => 'sometimes|integer|min:1',
+            'include_reblogs' => 'sometimes',
+        ]);
+
+        $napi = $request->has(self::PF_API_ENTITY_KEY);
+        $page = $request->input('page');
+        $min = $request->input('min_id');
+        $max = $request->input('max_id');
+        $limit = $request->input('limit') ?? 20;
+        if ($limit > 40) {
+            $limit = 40;
+        }
+        $pid = $request->user()->profile_id;
+        $includeReblogs = $request->filled('include_reblogs') ? $request->boolean('include_reblogs') : false;
+        $nullFields = $includeReblogs ?
+        ['in_reply_to_id'] :
+        ['in_reply_to_id', 'reblog_of_id'];
+        $inTypes = $includeReblogs ?
+        ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album', 'share'] :
+        ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'];
+        AccountService::setLastActive($request->user()->id);
+
+        if (config('exp.cached_home_timeline')) {
+            $paddedLimit = $includeReblogs ? $limit + 10 : $limit + 50;
+            if ($min || $max) {
+                if ($request->has('min_id')) {
+                    $res = HomeTimelineService::getRankedMinId($pid, $min ?? 0, $paddedLimit);
+                } else {
+                    $res = HomeTimelineService::getRankedMaxId($pid, $max ?? 0, $paddedLimit);
+                }
+            } else {
+                $res = HomeTimelineService::get($pid, 0, $paddedLimit);
+            }
+
+            if (! $res) {
+                $res = Cache::has('pf:services:apiv1:home:cached:coldbootcheck:'.$pid);
+                if (! $res) {
+                    Cache::set('pf:services:apiv1:home:cached:coldbootcheck:'.$pid, 1, 86400);
+                    FeedWarmCachePipeline::dispatchSync($pid);
+
+                    return response()->json([], 206);
+                } else {
+                    Cache::set('pf:services:apiv1:home:cached:coldbootcheck:'.$pid, 1, 86400);
+
+                    return response()->json([], 206);
+                }
+            }
+
+            $res = collect($res)
+                ->map(function ($id) use ($napi) {
+                    return $napi ? StatusService::get($id, false) : StatusService::getMastodon($id, false);
+                })
+                ->filter(function ($res) {
+                    return $res && isset($res['account']);
+                })
+                ->filter(function ($s) use ($includeReblogs) {
+                    return $includeReblogs ? true : $s['reblog'] == null;
+                })
+                ->take($limit)
+                ->map(function ($status) use ($pid) {
+                    if ($pid) {
+                        $status['favourited'] = (bool) LikeService::liked($pid, $status['id']);
+                        $status['reblogged'] = (bool) ReblogService::get($pid, $status['id']);
+                        $status['bookmarked'] = (bool) BookmarkService::get($pid, $status['id']);
+                    }
+
+                    return $status;
+                })
+                ->values();
+
+            $baseUrl = config('app.url').'/api/v1/timelines/home?limit='.$limit.'&';
+            $minId = $res->map(function ($s) {
+                return ['id' => $s['id']];
+            })->min('id');
+            $maxId = $res->map(function ($s) {
+                return ['id' => $s['id']];
+            })->max('id');
+
+            if ($minId == $maxId) {
+                $minId = null;
+            }
+
+            if ($maxId) {
+                $link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next"';
+            }
+
+            if ($minId) {
+                $link = '<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"';
+            }
+
+            if ($maxId && $minId) {
+                $link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next",<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"';
+            }
+
+            $headers = isset($link) ? ['Link' => $link] : [];
+
+            return $this->json($res->toArray(), 200, $headers);
+        }
+
+        $following = Cache::remember('profile:following:'.$pid, 1209600, function () use ($pid) {
+            $following = Follower::whereProfileId($pid)->pluck('following_id');
+
+            return $following->push($pid)->toArray();
+        });
+
+        $muted = UserFilterService::mutes($pid);
+
+        if ($muted && count($muted)) {
+            $following = array_diff($following, $muted);
+        }
+
+        if ($min || $max) {
+            $dir = $min ? '>' : '<';
+            $id = $min ?? $max;
+            $res = Status::select(
+                'id',
+                'profile_id',
+                'type',
+                'visibility',
+                'in_reply_to_id',
+                'reblog_of_id'
+            )
+                ->where('id', $dir, $id)
+                ->whereNull($nullFields)
+                ->whereIntegerInRaw('profile_id', $following)
+                ->whereIn('type', $inTypes)
+                ->whereIn('visibility', ['public', 'unlisted', 'private'])
+                ->orderByDesc('id')
+                ->take(($limit * 2))
+                ->get()
+                ->map(function ($s) use ($pid, $napi) {
+                    try {
+                        $account = $napi ? AccountService::get($s['profile_id'], true) : AccountService::getMastodon($s['profile_id'], true);
+                        if (! $account) {
+                            return false;
+                        }
+                        $status = $napi ? StatusService::get($s['id'], false) : StatusService::getMastodon($s['id'], false);
+                        if (! $status || ! isset($status['account']) || ! isset($status['account']['id'])) {
+                            return false;
+                        }
+                    } catch (\Exception $e) {
+                        return false;
+                    }
+
+                    $status['account'] = $account;
+
+                    if ($pid) {
+                        $status['favourited'] = (bool) LikeService::liked($pid, $s['id']);
+                        $status['reblogged'] = (bool) ReblogService::get($pid, $status['id']);
+                        $status['bookmarked'] = (bool) BookmarkService::get($pid, $status['id']);
+                    }
+
+                    return $status;
+                })
+                ->filter(function ($status) {
+                    return $status && isset($status['account']);
+                })
+                ->map(function ($status) use ($pid) {
+                    if (! empty($status['reblog'])) {
+                        $status['reblog']['favourited'] = (bool) LikeService::liked($pid, $status['reblog']['id']);
+                        $status['reblog']['reblogged'] = (bool) ReblogService::get($pid, $status['reblog']['id']);
+                        $status['bookmarked'] = (bool) BookmarkService::get($pid, $status['id']);
+                    }
+
+                    return $status;
+                })
+                ->take($limit)
+                ->values();
+        } else {
+            $res = Status::select(
+                'id',
+                'profile_id',
+                'type',
+                'visibility',
+                'in_reply_to_id',
+                'reblog_of_id',
+            )
+                ->whereNull($nullFields)
+                ->whereIntegerInRaw('profile_id', $following)
+                ->whereIn('type', $inTypes)
+                ->whereIn('visibility', ['public', 'unlisted', 'private'])
+                ->orderByDesc('id')
+                ->take(($limit * 2))
+                ->get()
+                ->map(function ($s) use ($pid, $napi) {
+                    try {
+                        $account = $napi ? AccountService::get($s['profile_id'], true) : AccountService::getMastodon($s['profile_id'], true);
+                        if (! $account) {
+                            return false;
+                        }
+                        $status = $napi ? StatusService::get($s['id'], false) : StatusService::getMastodon($s['id'], false);
+                        if (! $status || ! isset($status['account']) || ! isset($status['account']['id'])) {
+                            return false;
+                        }
+                    } catch (\Exception $e) {
+                        return false;
+                    }
+
+                    $status['account'] = $account;
+
+                    if ($pid) {
+                        $status['favourited'] = (bool) LikeService::liked($pid, $s['id']);
+                        $status['reblogged'] = (bool) ReblogService::get($pid, $status['id']);
+                        $status['bookmarked'] = (bool) BookmarkService::get($pid, $status['id']);
+                    }
+
+                    return $status;
+                })
+                ->filter(function ($status) {
+                    return $status && isset($status['account']);
+                })
+                ->map(function ($status) use ($pid) {
+                    if (! empty($status['reblog'])) {
+                        $status['reblog']['favourited'] = (bool) LikeService::liked($pid, $status['reblog']['id']);
+                        $status['reblog']['reblogged'] = (bool) ReblogService::get($pid, $status['reblog']['id']);
+                        $status['bookmarked'] = (bool) BookmarkService::get($pid, $status['id']);
+                    }
+
+                    return $status;
+                })
+                ->take($limit)
+                ->values();
+        }
+
+        $baseUrl = config('app.url').'/api/v1/timelines/home?limit='.$limit.'&';
+        $minId = $res->map(function ($s) {
+            return ['id' => $s['id']];
+        })->min('id');
+        $maxId = $res->map(function ($s) {
+            return ['id' => $s['id']];
+        })->max('id');
+
+        if ($minId == $maxId) {
+            $minId = null;
+        }
+
+        if ($maxId) {
+            $link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next"';
+        }
+
+        if ($minId) {
+            $link = '<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"';
+        }
+
+        if ($maxId && $minId) {
+            $link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next",<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"';
+        }
+
+        $headers = isset($link) ? ['Link' => $link] : [];
+
+        return $this->json($res->toArray(), 200, $headers);
+    }
+
+    /**
+     * GET /api/v1/timelines/public
+     *
+     *
+     * @return StatusTransformer
+     */
+    public function timelinePublic(Request $request)
+    {
+        $this->validate($request, [
+            'min_id' => 'nullable|integer|min:0|max:'.PHP_INT_MAX,
+            'max_id' => 'nullable|integer|min:0|max:'.PHP_INT_MAX,
+            'limit' => 'sometimes|integer|min:1',
+            'remote' => 'sometimes',
+            'local' => 'sometimes',
+        ]);
+
+        $napi = $request->has(self::PF_API_ENTITY_KEY);
+        $min = $request->input('min_id');
+        $max = $request->input('max_id');
+        if ($max == 0) {
+            $min = 1;
+        }
+        $minOrMax = $request->anyFilled(['max_id', 'min_id']);
+        $limit = $request->input('limit') ?? 20;
+        if ($limit > 40) {
+            $limit = 40;
+        }
+        $user = $request->user();
+
+        $remote = $request->has('remote') && $request->boolean('remote');
+        $local = $request->boolean('local');
+        $userRoleKey = $remote ? 'can-view-network-feed' : 'can-view-public-feed';
+        if ($user->has_roles && ! UserRoleService::can($userRoleKey, $user->id)) {
+            return [];
+        }
+        $filtered = $user ? UserFilterService::filters($user->profile_id) : [];
+        AccountService::setLastActive($user->id);
+        $domainBlocks = UserFilterService::domainBlocks($user->profile_id);
+        $hideNsfw = config('instance.hide_nsfw_on_public_feeds');
+        $amin = SnowflakeService::byDate(now()->subDays(config('federation.network_timeline_days_falloff')));
+        $asf = AdminShadowFilterService::getHideFromPublicFeedsList();
+        if ($local && $remote) {
+            $feed = Status::select(
+                'id',
+                'uri',
+                'type',
+                'scope',
+                'created_at',
+                'profile_id',
+                'in_reply_to_id',
+                'reblog_of_id'
+            )
+                ->when($minOrMax, function ($q, $minOrMax) use ($min, $max) {
+                    $dir = $min ? '>' : '<';
+                    $id = $min ?? $max;
+
+                    return $q->where('id', $dir, $id);
+                })
+                ->whereNull(['in_reply_to_id', 'reblog_of_id'])
+                ->when($hideNsfw, function ($q, $hideNsfw) {
+                    return $q->where('is_nsfw', false);
+                })
+                ->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])
+                ->whereScope('public')
+                ->where('id', '>', $amin)
+                ->orderByDesc('id')
+                ->limit(($limit * 2))
+                ->pluck('id')
+                ->values()
+                ->toArray();
+        } elseif ($remote && ! $local) {
+            if (config('instance.timeline.network.cached')) {
+                Cache::remember('api:v1:timelines:network:cache_check', 10368000, function () {
+                    if (NetworkTimelineService::count() == 0) {
+                        NetworkTimelineService::warmCache(true, config('instance.timeline.network.cache_dropoff'));
+                    }
+                });
+
+                if ($max) {
+                    $feed = NetworkTimelineService::getRankedMaxId($max, $limit + 5);
+                } elseif ($min) {
+                    $feed = NetworkTimelineService::getRankedMinId($min, $limit + 5);
+                } else {
+                    $feed = NetworkTimelineService::get(0, $limit + 5);
+                }
+            } else {
+                $feed = Status::select(
+                    'id',
+                    'uri',
+                    'type',
+                    'scope',
+                    'local',
+                    'created_at',
+                    'profile_id',
+                    'in_reply_to_id',
+                    'reblog_of_id'
+                )
+                    ->when($minOrMax, function ($q, $minOrMax) use ($min, $max) {
+                        $dir = $min ? '>' : '<';
+                        $id = $min ?? $max;
+
+                        return $q->where('id', $dir, $id);
+                    })
+                    ->whereNull(['in_reply_to_id', 'reblog_of_id'])
+                    ->when($hideNsfw, function ($q, $hideNsfw) {
+                        return $q->where('is_nsfw', false);
+                    })
+                    ->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])
+                    ->whereLocal(false)
+                    ->whereScope('public')
+                    ->where('id', '>', $amin)
+                    ->orderByDesc('id')
+                    ->limit(($limit * 2))
+                    ->pluck('id')
+                    ->values()
+                    ->toArray();
+            }
+        } else {
+            if (config('instance.timeline.local.cached')) {
+                Cache::remember('api:v1:timelines:public:cache_check', 10368000, function () {
+                    if (PublicTimelineService::count() == 0) {
+                        PublicTimelineService::warmCache(true, 400);
+                    }
+                });
+
+                if ($max) {
+                    $feed = PublicTimelineService::getRankedMaxId($max, $limit + 5);
+                } elseif ($min) {
+                    $feed = PublicTimelineService::getRankedMinId($min, $limit + 5);
+                } else {
+                    $feed = PublicTimelineService::get(0, $limit + 5);
+                }
+            } else {
+                $feed = Status::select(
+                    'id',
+                    'uri',
+                    'type',
+                    'scope',
+                    'local',
+                    'created_at',
+                    'profile_id',
+                    'in_reply_to_id',
+                    'reblog_of_id'
+                )
+                    ->when($minOrMax, function ($q, $minOrMax) use ($min, $max) {
+                        $dir = $min ? '>' : '<';
+                        $id = $min ?? $max;
+
+                        return $q->where('id', $dir, $id);
+                    })
+                    ->whereNull(['in_reply_to_id', 'reblog_of_id'])
+                    ->when($hideNsfw, function ($q, $hideNsfw) {
+                        return $q->where('is_nsfw', false);
+                    })
+                    ->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])
+                    ->whereLocal(true)
+                    ->whereScope('public')
+                    ->where('id', '>', $amin)
+                    ->orderByDesc('id')
+                    ->limit(($limit * 2))
+                    ->pluck('id')
+                    ->values()
+                    ->toArray();
+            }
+        }
+
+        $res = collect($feed)
+            ->filter(function ($k) use ($min, $max) {
+                if (! $min && ! $max) {
+                    return true;
+                }
+
+                if ($min) {
+                    return $min != $k;
+                }
+
+                if ($max) {
+                    return $max != $k;
+                }
+            })
+            ->map(function ($k) use ($user, $napi) {
+                try {
+                    $status = $napi ? StatusService::get($k) : StatusService::getMastodon($k);
+                    if (! $status || ! isset($status['account']) || ! isset($status['account']['id'])) {
+                        return false;
+                    }
+                } catch (\Exception $e) {
+                    return false;
+                }
+
+                $account = $napi ? AccountService::get($status['account']['id'], true) : AccountService::getMastodon($status['account']['id'], true);
+                if (! $account) {
+                    return false;
+                }
+
+                $status['account'] = $account;
+
+                if ($user) {
+                    $status['favourited'] = (bool) LikeService::liked($user->profile_id, $k);
+                    $status['reblogged'] = (bool) ReblogService::get($user->profile_id, $status['id']);
+                    $status['bookmarked'] = (bool) BookmarkService::get($user->profile_id, $status['id']);
+                }
+
+                return $status;
+            })
+            ->filter(function ($s) use ($filtered) {
+                return $s && isset($s['account']) && in_array($s['account']['id'], $filtered) == false;
+            })
+            ->filter(function ($s) use ($domainBlocks) {
+                if (! $domainBlocks || ! count($domainBlocks)) {
+                    return $s;
+                }
+                $domain = strtolower(parse_url($s['url'], PHP_URL_HOST));
+
+                return ! in_array($domain, $domainBlocks);
+            })
+            ->filter(function ($s) use ($asf, $user) {
+                if (! $asf || count($asf) === 0) {
+                    return true;
+                }
+
+                if (in_array($s['account']['id'], $asf)) {
+                    if ($user->profile_id == $s['account']['id']) {
+                        return true;
+                    }
+
+                    return false;
+                }
+
+                return true;
+            })
+            ->take($limit)
+            ->values();
+
+        $baseUrl = config('app.url').'/api/v1/timelines/public?limit='.$limit.'&';
+        if ($remote) {
+            $baseUrl .= 'remote=1&';
+        }
+        if ($local) {
+            $baseUrl .= 'local=1&';
+        }
+        $minId = $res->map(function ($s) {
+            return ['id' => $s['id']];
+        })->min('id');
+        $maxId = $res->map(function ($s) {
+            return ['id' => $s['id']];
+        })->max('id');
+
+        if ($minId == $maxId) {
+            $minId = null;
+        }
+
+        if ($maxId) {
+            $link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next"';
+        }
+
+        if ($minId) {
+            $link = '<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"';
+        }
+
+        if ($maxId && $minId) {
+            $link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next",<'.$baseUrl.'min_id='.$maxId.'>; rel="prev"';
+        }
+
+        $headers = isset($link) ? ['Link' => $link] : [];
+
+        return $this->json($res->toArray(), 200, $headers);
+    }
+
+    /**
+     * GET /api/v1/conversations
+     *
+     *   Not implemented
+     *
+     * @return array
+     */
+    public function conversations(Request $request)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
+
+        $this->validate($request, [
+            'limit' => 'min:1|max:40',
+            'scope' => 'nullable|in:inbox,sent,requests',
+        ]);
+
+        $limit = $request->input('limit', 20);
+        $scope = $request->input('scope', 'inbox');
+        $user = $request->user();
+        if ($user->has_roles && ! UserRoleService::can('can-direct-message', $user->id)) {
+            return [];
+        }
+        $pid = $user->profile_id;
+
+        if (config('database.default') == 'pgsql') {
+            $dms = DirectMessage::when($scope === 'inbox', function ($q, $scope) use ($pid) {
+                return $q->whereIsHidden(false)->where('to_id', $pid)->orWhere('from_id', $pid);
+            })
+                ->when($scope === 'sent', function ($q, $scope) use ($pid) {
+                    return $q->whereFromId($pid)->groupBy(['to_id', 'id']);
+                })
+                ->when($scope === 'requests', function ($q, $scope) use ($pid) {
+                    return $q->whereToId($pid)->whereIsHidden(true);
+                });
+        } else {
+            $dms = Conversation::when($scope === 'inbox', function ($q, $scope) use ($pid) {
+                return $q->whereIsHidden(false)
+                    ->where('to_id', $pid)
+                    ->orWhere('from_id', $pid)
+                    ->orderByDesc('status_id')
+                    ->groupBy(['to_id', 'from_id']);
+            })
+                ->when($scope === 'sent', function ($q, $scope) use ($pid) {
+                    return $q->whereFromId($pid)->groupBy('to_id');
+                })
+                ->when($scope === 'requests', function ($q, $scope) use ($pid) {
+                    return $q->whereToId($pid)->whereIsHidden(true);
+                });
+        }
+
+        $dms = $dms->orderByDesc('status_id')
+            ->simplePaginate($limit)
+            ->map(function ($dm) use ($pid) {
+                $from = $pid == $dm->to_id ? $dm->from_id : $dm->to_id;
+                $res = [
+                    'id' => $dm->id,
+                    'unread' => false,
+                    'accounts' => [
+                        AccountService::getMastodon($from, true),
+                    ],
+                    'last_status' => StatusService::getDirectMessage($dm->status_id),
+                ];
+
+                return $res;
+            })
+            ->filter(function ($dm) {
+                if (! $dm || empty($dm['last_status']) || ! isset($dm['accounts']) || ! count($dm['accounts']) || ! isset($dm['accounts'][0]) || ! isset($dm['accounts'][0]['id'])) {
+                    return false;
+                }
+
+                return true;
+            })
+            ->unique(function ($item, $key) {
+                return $item['accounts'][0]['id'];
+            })
+            ->values();
+
+        return $this->json($dms);
+    }
+
+    /**
+     * GET /api/v1/statuses/{id}
+     *
+     * @param  int  $id
+     * @return StatusTransformer
+     */
+    public function statusById(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
+
+        AccountService::setLastActive($request->user()->id);
+        $pid = $request->user()->profile_id;
+
+        $res = $request->has(self::PF_API_ENTITY_KEY) ? StatusService::get($id, false) : StatusService::getMastodon($id, false);
+        if (! $res || ! isset($res['visibility'])) {
+            abort(404);
+        }
+
+        if ($res && isset($res['account'], $res['account']['acct'], $res['account']['url']) && strpos($res['account']['acct'], '@') != -1) {
+            $domain = parse_url($res['account']['url'], PHP_URL_HOST);
+            abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
+        }
+
+        $scope = $res['visibility'];
+        if (! in_array($scope, ['public', 'unlisted'])) {
+            if ($scope === 'private') {
+                if (intval($res['account']['id']) !== intval($pid)) {
+                    abort_unless(FollowerService::follows($pid, $res['account']['id']), 403);
+                }
+            } else {
+                abort(400, 'Invalid request');
+            }
+        }
+
+        if (! empty($res['reblog']) && isset($res['reblog']['id'])) {
             $res['reblog']['favourited'] = (bool) LikeService::liked($pid, $res['reblog']['id']);
             $res['reblog']['reblogged'] = (bool) ReblogService::get($pid, $res['reblog']['id']);
             $res['reblog']['bookmarked'] = BookmarkService::get($pid, $res['reblog']['id']);
         }
 
-		$res['favourited'] = LikeService::liked($pid, $res['id']);
-		$res['reblogged'] = ReblogService::get($pid, $res['id']);
-		$res['bookmarked'] = BookmarkService::get($pid, $res['id']);
-
-		return $this->json($res);
-	}
-
-	/**
-	 * GET /api/v1/statuses/{id}/context
-	 *
-	 * @param  integer  $id
-	 *
-	 * @return StatusTransformer
-	 */
-	public function statusContext(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
-
-		$user = $request->user();
-		$pid = $user->profile_id;
-		$status = StatusService::getMastodon($id, false);
-
-		if(!$status || !isset($status['account'])) {
-			return response('', 404);
-		}
-
-		if(intval($status['account']['id']) !== intval($user->profile_id)) {
-			if($status['visibility'] == 'private') {
-				if(!FollowerService::follows($user->profile_id, $status['account']['id'])) {
-					return response('', 404);
-				}
-			} else {
-				if(!in_array($status['visibility'], ['public','unlisted'])) {
-					return response('', 404);
-				}
-			}
-		}
-
-		$ancestors = [];
-		$descendants = [];
-
-		if($status['in_reply_to_id']) {
-			$ancestors[] = StatusService::getMastodon($status['in_reply_to_id'], false);
-		}
-
-		if($status['replies_count']) {
-			$filters = UserFilterService::filters($pid);
-
-			$descendants = DB::table('statuses')
-				->where('in_reply_to_id', $id)
-				->limit(20)
-				->pluck('id')
-				->map(function($sid) {
-					return StatusService::getMastodon($sid, false);
-				})
-				->filter(function($post) use($filters) {
-					return $post && isset($post['account'], $post['account']['id']) && !in_array($post['account']['id'], $filters);
-				})
-				->map(function($status) use($pid) {
-					$status['favourited'] = LikeService::liked($pid, $status['id']);
-					$status['reblogged'] = ReblogService::get($pid, $status['id']);
-					return $status;
-				})
-				->values();
-		}
-
-		$res = [
-			'ancestors' => $ancestors,
-			'descendants' => $descendants
-		];
-
-		return $this->json($res);
-	}
-
-	/**
-	 * GET /api/v1/statuses/{id}/card
-	 *
-	 * @param  integer  $id
-	 *
-	 * @return StatusTransformer
-	 */
-	public function statusCard(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
-		$res = [];
-		return response()->json($res);
-	}
-
-	/**
-	 * GET /api/v1/statuses/{id}/reblogged_by
-	 *
-	 * @param  integer  $id
-	 *
-	 * @return AccountTransformer
-	 */
-	public function statusRebloggedBy(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
-
-		$this->validate($request, [
-			'limit' => 'sometimes|integer|min:1|max:80'
-		]);
-
-		$limit = $request->input('limit', 10);
-		$user = $request->user();
-		$pid = $user->profile_id;
-		$status = Status::findOrFail($id);
-		$account = AccountService::get($status->profile_id, true);
-		abort_if(!$account, 404);
-		$author = intval($status->profile_id) === intval($pid) || $user->is_admin;
-		$napi = $request->has(self::PF_API_ENTITY_KEY);
-
-		abort_if(
-			!$status->type ||
-			!in_array($status->type, ['photo','photo:album', 'photo:video:album', 'reply', 'text', 'video', 'video:album']),
-			404,
-		);
-
-		if(!$author) {
-			if($status->scope == 'private') {
-				abort_if(!FollowerService::follows($pid, $status->profile_id), 403);
-			} else {
-				abort_if(!in_array($status->scope, ['public','unlisted']), 403);
-			}
-
-			if($request->has('cursor')) {
-				return $this->json([]);
-			}
-		}
-
-		$res = Status::where('reblog_of_id', $status->id)
-		->orderByDesc('id')
-		->cursorPaginate($limit)
-		->withQueryString();
-
-		if(!$res) {
-			return $this->json([]);
-		}
-
-		$headers = [];
-		if($author && $res->hasPages()) {
-			$links = '';
-			if($res->onFirstPage()) {
-				if($res->nextPageUrl()) {
-					$links = '<' . $res->nextPageUrl() .'>; rel="prev"';
-				}
-			} else {
-				if($res->previousPageUrl()) {
-					$links = '<' . $res->previousPageUrl() .'>; rel="next"';
-				}
-
-				if($res->nextPageUrl()) {
-					if(!empty($links)) {
-						$links .= ', ';
-					}
-					$links .= '<' . $res->nextPageUrl() .'>; rel="prev"';
-				}
-			}
-
-			$headers = ['Link' => $links];
-		}
-
-		$res = $res->map(function($status) use($pid, $napi) {
-			$account = $napi ? AccountService::get($status->profile_id, true) : AccountService::getMastodon($status->profile_id, true);
-			if(!$account) {
-				return false;
-			}
-			if($napi) {
-				$account['follows'] = $status->profile_id == $pid ? null : FollowerService::follows($pid, $status->profile_id);
-			}
-			return $account;
-		})
-		->filter(function($account) {
-			return $account && isset($account['id']);
-		})
-		->values();
-
-		return $this->json($res, 200, $headers);
-	}
-
-	/**
-	 * GET /api/v1/statuses/{id}/favourited_by
-	 *
-	 * @param  integer  $id
-	 *
-	 * @return AccountTransformer
-	 */
-	public function statusFavouritedBy(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
-
-		$this->validate($request, [
-			'limit' => 'nullable|integer|min:1|max:80'
-		]);
-
-		$limit = $request->input('limit', 10);
-		$user = $request->user();
-		$pid = $user->profile_id;
-		$status = Status::findOrFail($id);
-		$account = AccountService::get($status->profile_id, true);
-		abort_if(!$account, 404);
-		$author = intval($status->profile_id) === intval($pid) || $user->is_admin;
-		$napi = $request->has(self::PF_API_ENTITY_KEY);
-
-		abort_if(
-			!$status->type ||
-			!in_array($status->type, ['photo','photo:album', 'photo:video:album', 'reply', 'text', 'video', 'video:album']),
-			404,
-		);
-
-		if(!$author) {
-			if($status->scope == 'private') {
-				abort_if(!FollowerService::follows($pid, $status->profile_id), 403);
-			} else {
-				abort_if(!in_array($status->scope, ['public','unlisted']), 403);
-			}
-
-			if($request->has('cursor')) {
-				return $this->json([]);
-			}
-		}
-
-		$res = Like::where('status_id', $status->id)
-		->orderByDesc('id')
-		->cursorPaginate($limit)
-		->withQueryString();
-
-		if(!$res) {
-			return $this->json([]);
-		}
-
-		$headers = [];
-		if($author && $res->hasPages()) {
-			$links = '';
-
-			if($res->onFirstPage()) {
-				if($res->nextPageUrl()) {
-					$links = '<' . $res->nextPageUrl() .'>; rel="prev"';
-				}
-			} else {
-				if($res->previousPageUrl()) {
-					$links = '<' . $res->previousPageUrl() .'>; rel="next"';
-				}
-
-				if($res->nextPageUrl()) {
-					if(!empty($links)) {
-						$links .= ', ';
-					}
-					$links .= '<' . $res->nextPageUrl() .'>; rel="prev"';
-				}
-			}
-
-			$headers = ['Link' => $links];
-		}
-
-		$res = $res->map(function($like) use($pid, $napi) {
-			$account = $napi ? AccountService::get($like->profile_id, true) : AccountService::getMastodon($like->profile_id, true);
-			if(!$account) {
-				return false;
-			}
-
-			if($napi) {
-				$account['follows'] = $like->profile_id == $pid ? null : FollowerService::follows($pid, $like->profile_id);
-			}
-			return $account;
-		})
-		->filter(function($account) {
-			return $account && isset($account['id']);
-		})
-		->values();
-
-		return $this->json($res, 200, $headers);
-	}
-
-	/**
-	 * POST /api/v1/statuses
-	 *
-	 *
-	 * @return StatusTransformer
-	 */
-	public function statusCreate(Request $request)
-	{
-		abort_if(!$request->user(), 403);
-
-		$this->validate($request, [
-			'status' => 'nullable|string',
-			'in_reply_to_id' => 'nullable',
-			'media_ids' => 'sometimes|array|max:' . config_cache('pixelfed.max_album_length'),
-			'sensitive' => 'nullable',
-			'visibility' => 'string|in:private,unlisted,public',
-			'spoiler_text' => 'sometimes|max:140',
-			'place_id' => 'sometimes|integer|min:1|max:128769',
-			'collection_ids' => 'sometimes|array|max:3',
-			'comments_disabled' => 'sometimes|boolean',
-		]);
-
-		if($request->hasHeader('idempotency-key')) {
-			$key = 'pf:api:v1:status:idempotency-key:' . $request->user()->id . ':' . hash('sha1', $request->header('idempotency-key'));
-			$exists = Cache::has($key);
-			abort_if($exists, 400, 'Duplicate idempotency key.');
-			Cache::put($key, 1, 3600);
-		}
-
-		if(config('costar.enabled') == true) {
-			$blockedKeywords = config('costar.keyword.block');
-			if($blockedKeywords !== null && $request->status) {
-				$keywords = config('costar.keyword.block');
-				foreach($keywords as $kw) {
-					if(Str::contains($request->status, $kw) == true) {
-						abort(400, 'Invalid object. Contains banned keyword.');
-					}
-				}
-			}
-		}
-
-		if(!$request->filled('media_ids') && !$request->filled('in_reply_to_id')) {
-			abort(403, 'Empty statuses are not allowed');
-		}
-
-		$ids = $request->input('media_ids');
-		$in_reply_to_id = $request->input('in_reply_to_id');
-
-		$user = $request->user();
-		$profile = $user->profile;
-
-		$limitKey = 'compose:rate-limit:store:' . $user->id;
-		$limitTtl = now()->addMinutes(15);
-		$limitReached = Cache::remember($limitKey, $limitTtl, function() use($user) {
-			$dailyLimit = Status::whereProfileId($user->profile_id)
-				->whereNull('in_reply_to_id')
-				->whereNull('reblog_of_id')
-				->where('created_at', '>', now()->subDays(1))
-				->count();
-
-			return $dailyLimit >= 1000;
-		});
-
-		abort_if($limitReached == true, 429);
-
-		$visibility = $profile->is_private ? 'private' : (
-			$profile->unlisted == true &&
-			$request->input('visibility', 'public') == 'public' ?
-			'unlisted' :
-			$request->input('visibility', 'public'));
-
-		if($user->last_active_at == null) {
-			return [];
-		}
-
-		$content = strip_tags($request->input('status'));
-		$rendered = Autolink::create()->autolink($content);
-		$cw = $user->profile->cw == true ? true : $request->input('sensitive', false);
-		$spoilerText = $cw && $request->filled('spoiler_text') ? $request->input('spoiler_text') : null;
-
-		if($in_reply_to_id) {
-			$parent = Status::findOrFail($in_reply_to_id);
-			if($parent->comments_disabled) {
-				return $this->json("Comments have been disabled on this post", 422);
-			}
-			$blocks = UserFilterService::blocks($parent->profile_id);
-			abort_if(in_array($profile->id, $blocks), 422, 'Cannot reply to this post at this time.');
-
-			$status = new Status;
-			$status->caption = $content;
-			$status->rendered = $rendered;
-			$status->scope = $visibility;
-			$status->visibility = $visibility;
-			$status->profile_id = $user->profile_id;
-			$status->is_nsfw = $cw;
-			$status->cw_summary = $spoilerText;
-			$status->in_reply_to_id = $parent->id;
-			$status->in_reply_to_profile_id = $parent->profile_id;
-			$status->save();
-			StatusService::del($parent->id);
-			Cache::forget('status:replies:all:' . $parent->id);
-		}
-
-		if($ids) {
-			if(Media::whereUserId($user->id)
-				->whereNull('status_id')
-				->find($ids)
-				->count() == 0
-			) {
-				abort(400, 'Invalid media_ids');
-			}
-
-			if(!$in_reply_to_id) {
-				$status = new Status;
-				$status->caption = $content;
-				$status->rendered = $rendered;
-				$status->profile_id = $user->profile_id;
-				$status->is_nsfw = $cw;
-				$status->cw_summary = $spoilerText;
-				$status->scope = 'draft';
-				$status->visibility = 'draft';
-				if($request->has('place_id')) {
-					$status->place_id = $request->input('place_id');
-				}
-				$status->save();
-			}
-
-			$mimes = [];
-
-			foreach($ids as $k => $v) {
-				if($k + 1 > config_cache('pixelfed.max_album_length')) {
-					continue;
-				}
-				$m = Media::whereUserId($user->id)->whereNull('status_id')->findOrFail($v);
-				if($m->profile_id !== $user->profile_id || $m->status_id) {
-					abort(403, 'Invalid media id');
-				}
-				$m->order = $k + 1;
-				$m->status_id = $status->id;
-				$m->save();
-				array_push($mimes, $m->mime);
-			}
-
-			if(empty($mimes)) {
-				$status->delete();
-				abort(400, 'Invalid media ids');
-			}
-
-			if($request->has('comments_disabled') && $request->input('comments_disabled')) {
-				$status->comments_disabled = true;
-			}
-
-			$status->scope = $visibility;
-			$status->visibility = $visibility;
-			$status->type = StatusController::mimeTypeCheck($mimes);
-			$status->save();
-		}
-
-		if(!$status) {
-			abort(500, 'An error occured.');
-		}
-
-		NewStatusPipeline::dispatch($status);
-		if($status->in_reply_to_id) {
-        	CommentPipeline::dispatch($parent, $status);
-		}
-		Cache::forget('user:account:id:'.$user->id);
-		Cache::forget('_api:statuses:recent_9:'.$user->profile_id);
-		Cache::forget('profile:status_count:'.$user->profile_id);
-		Cache::forget($user->storageUsedKey());
-		Cache::forget('profile:embed:' . $status->profile_id);
-		Cache::forget($limitKey);
-
-		if($request->has('collection_ids') && $ids) {
-			$collections = Collection::whereProfileId($user->profile_id)
-				->find($request->input('collection_ids'))
-				->each(function($collection) use($status) {
-					$count = $collection->items()->count();
-			        $item = CollectionItem::firstOrCreate([
-			            'collection_id' => $collection->id,
-			            'object_type'   => 'App\Status',
-			            'object_id'     => $status->id
-			        ],[
-			            'order'         => $count,
-			        ]);
-
-			        CollectionService::addItem(
-			        	$collection->id,
-			        	$status->id,
-			        	$count
-			        );
+        $res['favourited'] = LikeService::liked($pid, $res['id']);
+        $res['reblogged'] = ReblogService::get($pid, $res['id']);
+        $res['bookmarked'] = BookmarkService::get($pid, $res['id']);
+
+        return $this->json($res);
+    }
+
+    /**
+     * GET /api/v1/statuses/{id}/context
+     *
+     * @param  int  $id
+     * @return StatusTransformer
+     */
+    public function statusContext(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
+
+        $user = $request->user();
+        $pid = $user->profile_id;
+        $status = StatusService::getMastodon($id, false);
+        $pe = $request->has(self::PF_API_ENTITY_KEY);
+
+        if (! $status || ! isset($status['account'])) {
+            return response('', 404);
+        }
+
+        if ($status && isset($status['account'], $status['account']['acct']) && strpos($status['account']['acct'], '@') != -1) {
+            $domain = parse_url($status['account']['url'], PHP_URL_HOST);
+            abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
+        }
+
+        if (intval($status['account']['id']) !== intval($user->profile_id)) {
+            if ($status['visibility'] == 'private') {
+                if (! FollowerService::follows($user->profile_id, $status['account']['id'])) {
+                    return response('', 404);
+                }
+            } else {
+                if (! in_array($status['visibility'], ['public', 'unlisted'])) {
+                    return response('', 404);
+                }
+            }
+        }
+
+        $ancestors = [];
+        $descendants = [];
+
+        if ($status['in_reply_to_id']) {
+            $ancestors[] = $pe ?
+            StatusService::get($status['in_reply_to_id'], false) :
+            StatusService::getMastodon($status['in_reply_to_id'], false);
+        }
+
+        if ($status['replies_count']) {
+            $filters = UserFilterService::filters($pid);
+
+            $descendants = DB::table('statuses')
+                ->where('in_reply_to_id', $id)
+                ->limit(20)
+                ->pluck('id')
+                ->map(function ($sid) use ($pe) {
+                    return $pe ?
+                     StatusService::get($sid, false) :
+                     StatusService::getMastodon($sid, false);
+                })
+                ->filter(function ($post) use ($filters) {
+                    return $post && isset($post['account'], $post['account']['id']) && ! in_array($post['account']['id'], $filters);
+                })
+                ->map(function ($status) use ($pid) {
+                    $status['favourited'] = LikeService::liked($pid, $status['id']);
+                    $status['reblogged'] = ReblogService::get($pid, $status['id']);
+
+                    return $status;
+                })
+                ->values();
+        }
+
+        $res = [
+            'ancestors' => $ancestors,
+            'descendants' => $descendants,
+        ];
+
+        return $this->json($res);
+    }
+
+    /**
+     * GET /api/v1/statuses/{id}/card
+     *
+     * @param  int  $id
+     * @return StatusTransformer
+     */
+    public function statusCard(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
+
+        $res = [];
+
+        return response()->json($res);
+    }
+
+    /**
+     * GET /api/v1/statuses/{id}/reblogged_by
+     *
+     * @param  int  $id
+     * @return AccountTransformer
+     */
+    public function statusRebloggedBy(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
+
+        $this->validate($request, [
+            'limit' => 'sometimes|integer|min:1|max:80',
+        ]);
+
+        $limit = $request->input('limit', 10);
+        $user = $request->user();
+        $pid = $user->profile_id;
+        $status = Status::findOrFail($id);
+        $account = AccountService::get($status->profile_id, true);
+        abort_if(! $account, 404);
+        abort_if(isset($account['moved'], $account['moved']['id']), 404, 'Account moved');
+        if ($account && strpos($account['acct'], '@') != -1) {
+            $domain = parse_url($account['url'], PHP_URL_HOST);
+            abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
+        }
+        $author = intval($status->profile_id) === intval($pid) || $user->is_admin;
+        $napi = $request->has(self::PF_API_ENTITY_KEY);
+
+        abort_if(
+            ! $status->type ||
+            ! in_array($status->type, ['photo', 'photo:album', 'photo:video:album', 'reply', 'text', 'video', 'video:album']),
+            404,
+        );
+
+        if (! $author) {
+            if ($status->scope == 'private') {
+                abort_if(! FollowerService::follows($pid, $status->profile_id), 403);
+            } else {
+                abort_if(! in_array($status->scope, ['public', 'unlisted']), 403);
+            }
+
+            if ($request->has('cursor')) {
+                return $this->json([]);
+            }
+        }
+
+        $res = Status::where('reblog_of_id', $status->id)
+            ->orderByDesc('id')
+            ->cursorPaginate($limit)
+            ->withQueryString();
+
+        if (! $res) {
+            return $this->json([]);
+        }
+
+        $headers = [];
+        if ($author && $res->hasPages()) {
+            $links = '';
+            if ($res->onFirstPage()) {
+                if ($res->nextPageUrl()) {
+                    $links = '<'.$res->nextPageUrl().'>; rel="prev"';
+                }
+            } else {
+                if ($res->previousPageUrl()) {
+                    $links = '<'.$res->previousPageUrl().'>; rel="next"';
+                }
+
+                if ($res->nextPageUrl()) {
+                    if (! empty($links)) {
+                        $links .= ', ';
+                    }
+                    $links .= '<'.$res->nextPageUrl().'>; rel="prev"';
+                }
+            }
+
+            $headers = ['Link' => $links];
+        }
+
+        $res = $res->map(function ($status) use ($pid, $napi) {
+            $account = $napi ? AccountService::get($status->profile_id, true) : AccountService::getMastodon($status->profile_id, true);
+            if (! $account) {
+                return false;
+            }
+            if ($napi) {
+                $account['follows'] = $status->profile_id == $pid ? null : FollowerService::follows($pid, $status->profile_id);
+            }
+
+            return $account;
+        })
+            ->filter(function ($account) {
+                return $account && isset($account['id']);
+            })
+            ->values();
+
+        return $this->json($res, 200, $headers);
+    }
+
+    /**
+     * GET /api/v1/statuses/{id}/favourited_by
+     *
+     * @param  int  $id
+     * @return AccountTransformer
+     */
+    public function statusFavouritedBy(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
+
+        $this->validate($request, [
+            'limit' => 'sometimes|integer|min:1',
+        ]);
+
+        $limit = $request->input('limit', 40);
+        if ($limit > 80) {
+            $limit = 80;
+        }
+        $user = $request->user();
+        $pid = $user->profile_id;
+        $status = Status::findOrFail($id);
+        $account = AccountService::get($status->profile_id, true);
+        abort_if(! $account, 404);
+        abort_if(isset($account['moved'], $account['moved']['id']), 404, 'Account moved');
+        if ($account && strpos($account['acct'], '@') != -1) {
+            $domain = parse_url($account['url'], PHP_URL_HOST);
+            abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
+        }
+        $author = intval($status->profile_id) === intval($pid) || $user->is_admin;
+        $napi = $request->has(self::PF_API_ENTITY_KEY);
+
+        abort_if(
+            ! $status->type ||
+            ! in_array($status->type, ['photo', 'photo:album', 'photo:video:album', 'reply', 'text', 'video', 'video:album']),
+            404,
+        );
+
+        if (! $author) {
+            if ($status->scope == 'private') {
+                abort_if(! FollowerService::follows($pid, $status->profile_id), 403);
+            } else {
+                abort_if(! in_array($status->scope, ['public', 'unlisted']), 403);
+            }
+
+            if ($request->has('cursor')) {
+                return $this->json([]);
+            }
+        }
+
+        $res = Like::where('status_id', $status->id)
+            ->orderByDesc('id')
+            ->cursorPaginate($limit)
+            ->withQueryString();
+
+        if (! $res) {
+            return $this->json([]);
+        }
+
+        $headers = [];
+        if ($author && $res->hasPages()) {
+            $links = '';
+
+            if ($res->onFirstPage()) {
+                if ($res->nextPageUrl()) {
+                    $links = '<'.$res->nextPageUrl().'>; rel="prev"';
+                }
+            } else {
+                if ($res->previousPageUrl()) {
+                    $links = '<'.$res->previousPageUrl().'>; rel="next"';
+                }
+
+                if ($res->nextPageUrl()) {
+                    if (! empty($links)) {
+                        $links .= ', ';
+                    }
+                    $links .= '<'.$res->nextPageUrl().'>; rel="prev"';
+                }
+            }
+
+            $headers = ['Link' => $links];
+        }
+
+        $res = $res->map(function ($like) use ($pid, $napi) {
+            $account = $napi ? AccountService::get($like->profile_id, true) : AccountService::getMastodon($like->profile_id, true);
+            if (! $account) {
+                return false;
+            }
+
+            if ($napi) {
+                $account['follows'] = $like->profile_id == $pid ? null : FollowerService::follows($pid, $like->profile_id);
+            }
+
+            return $account;
+        })
+            ->filter(function ($account) {
+                return $account && isset($account['id']);
+            })
+            ->values();
+
+        return $this->json($res, 200, $headers);
+    }
+
+    /**
+     * POST /api/v1/statuses
+     *
+     *
+     * @return StatusTransformer
+     */
+    public function statusCreate(Request $request)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('write'), 403);
+
+        $this->validate($request, [
+            'status' => 'nullable|string|max:'.(int) config_cache('pixelfed.max_caption_length'),
+            'in_reply_to_id' => 'nullable',
+            'media_ids' => 'sometimes|array|max:'.(int) config_cache('pixelfed.max_album_length'),
+            'sensitive' => 'nullable',
+            'visibility' => 'string|in:private,unlisted,public',
+            'spoiler_text' => 'sometimes|max:140',
+            'place_id' => 'sometimes|integer|min:1|max:128769',
+            'collection_ids' => 'sometimes|array|max:3',
+            'comments_disabled' => 'sometimes|boolean',
+        ]);
+
+        if ($request->hasHeader('idempotency-key')) {
+            $key = 'pf:api:v1:status:idempotency-key:'.$request->user()->id.':'.hash('sha1', $request->header('idempotency-key'));
+            $exists = Cache::has($key);
+            abort_if($exists, 400, 'Duplicate idempotency key.');
+            Cache::put($key, 1, 3600);
+        }
+
+        if (config('costar.enabled') == true) {
+            $blockedKeywords = config('costar.keyword.block');
+            if ($blockedKeywords !== null && $request->status) {
+                $keywords = config('costar.keyword.block');
+                foreach ($keywords as $kw) {
+                    if (Str::contains($request->status, $kw) == true) {
+                        abort(400, 'Invalid object. Contains banned keyword.');
+                    }
+                }
+            }
+        }
+
+        if (! $request->filled('media_ids') && ! $request->filled('in_reply_to_id')) {
+            abort(403, 'Empty statuses are not allowed');
+        }
+
+        $ids = $request->input('media_ids');
+        $in_reply_to_id = $request->input('in_reply_to_id');
+
+        $user = $request->user();
+
+        if ($user->has_roles) {
+            if ($in_reply_to_id != null) {
+                abort_if(! UserRoleService::can('can-comment', $user->id), 403, 'Invalid permissions for this action');
+            } else {
+                abort_if(! UserRoleService::can('can-post', $user->id), 403, 'Invalid permissions for this action');
+            }
+        }
+
+        $profile = $user->profile;
+
+        $limitKey = 'compose:rate-limit:store:'.$user->id;
+        $limitTtl = now()->addMinutes(15);
+        $limitReached = Cache::remember($limitKey, $limitTtl, function () use ($user) {
+            $minId = SnowflakeService::byDate(now()->subDays(1));
+            $dailyLimit = Status::whereProfileId($user->profile_id)
+                ->where('id', '>', $minId)
+                ->count();
+
+            return $dailyLimit >= 1000;
+        });
+
+        abort_if($limitReached == true, 429);
+
+        $visibility = $profile->is_private ? 'private' : (
+            $profile->unlisted == true &&
+            $request->input('visibility', 'public') == 'public' ?
+            'unlisted' :
+            $request->input('visibility', 'public'));
+
+        if ($user->last_active_at == null) {
+            return [];
+        }
+
+        $defaultCaption = config_cache('database.default') === 'mysql' ? null : "";
+        $content = $request->filled('status') ? strip_tags($request->input('status')) : $defaultCaption;
+        $cw = $user->profile->cw == true ? true : $request->boolean('sensitive', false);
+        $spoilerText = $cw && $request->filled('spoiler_text') ? $request->input('spoiler_text') : null;
+
+        if ($in_reply_to_id) {
+            $parent = Status::findOrFail($in_reply_to_id);
+            if ($parent->comments_disabled) {
+                return $this->json('Comments have been disabled on this post', 422);
+            }
+            $blocks = UserFilterService::blocks($parent->profile_id);
+            abort_if(in_array($profile->id, $blocks), 422, 'Cannot reply to this post at this time.');
+
+            $status = new Status;
+            $status->caption = $content;
+            $status->rendered = $defaultCaption;
+            $status->scope = $visibility;
+            $status->visibility = $visibility;
+            $status->profile_id = $user->profile_id;
+            $status->is_nsfw = $cw;
+            $status->cw_summary = $spoilerText;
+            $status->in_reply_to_id = $parent->id;
+            $status->in_reply_to_profile_id = $parent->profile_id;
+            $status->save();
+            StatusService::del($parent->id);
+            Cache::forget('status:replies:all:'.$parent->id);
+        }
+
+        if ($ids) {
+            if (Media::whereUserId($user->id)
+                ->whereNull('status_id')
+                ->find($ids)
+                ->count() == 0
+            ) {
+                abort(400, 'Invalid media_ids');
+            }
+
+            if (! $in_reply_to_id) {
+                $status = new Status;
+                $status->caption = $content;
+                $status->rendered = $defaultCaption;
+                $status->profile_id = $user->profile_id;
+                $status->is_nsfw = $cw;
+                $status->cw_summary = $spoilerText;
+                $status->scope = 'draft';
+                $status->visibility = 'draft';
+                if ($request->has('place_id')) {
+                    $status->place_id = $request->input('place_id');
+                }
+                $status->save();
+            }
+
+            $mimes = [];
+
+            foreach ($ids as $k => $v) {
+                if ($k + 1 > (int) config_cache('pixelfed.max_album_length')) {
+                    continue;
+                }
+                $m = Media::whereUserId($user->id)->whereNull('status_id')->findOrFail($v);
+                if ($m->profile_id !== $user->profile_id || $m->status_id) {
+                    abort(403, 'Invalid media id');
+                }
+                $m->order = $k + 1;
+                $m->status_id = $status->id;
+                $m->save();
+                array_push($mimes, $m->mime);
+            }
+
+            if (empty($mimes)) {
+                $status->delete();
+                abort(400, 'Invalid media ids');
+            }
+
+            if ($request->has('comments_disabled') && $request->input('comments_disabled')) {
+                $status->comments_disabled = true;
+            }
+
+            $status->scope = $visibility;
+            $status->visibility = $visibility;
+            $status->type = StatusController::mimeTypeCheck($mimes);
+            $status->save();
+        }
+
+        if (! $status) {
+            abort(500, 'An error occured.');
+        }
+
+        NewStatusPipeline::dispatch($status);
+        if ($status->in_reply_to_id) {
+            CommentPipeline::dispatch($parent, $status);
+        }
+        Cache::forget('user:account:id:'.$user->id);
+        Cache::forget('_api:statuses:recent_9:'.$user->profile_id);
+        Cache::forget('profile:status_count:'.$user->profile_id);
+        Cache::forget($user->storageUsedKey());
+        Cache::forget('profile:embed:'.$status->profile_id);
+        Cache::forget($limitKey);
+
+        if ($request->has('collection_ids') && $ids) {
+            $collections = Collection::whereProfileId($user->profile_id)
+                ->find($request->input('collection_ids'))
+                ->each(function ($collection) use ($status) {
+                    $count = $collection->items()->count();
+                    $item = CollectionItem::firstOrCreate([
+                        'collection_id' => $collection->id,
+                        'object_type' => 'App\Status',
+                        'object_id' => $status->id,
+                    ], [
+                        'order' => $count,
+                    ]);
+
+                    CollectionService::addItem(
+                        $collection->id,
+                        $status->id,
+                        $count
+                    );
                     $collection->updated_at = now();
                     $collection->save();
                     CollectionService::setCollection($collection->id, $collection);
-				});
-		}
+                });
+        }
 
-		$res = StatusService::getMastodon($status->id, false);
-		$res['favourited'] = false;
-		$res['language'] = 'en';
-		$res['bookmarked'] = false;
-		$res['card'] = null;
-		return $this->json($res);
-	}
+        $res = StatusService::getMastodon($status->id, false);
+        $res['favourited'] = false;
+        $res['language'] = 'en';
+        $res['bookmarked'] = false;
+        $res['card'] = null;
 
-	/**
-	 * DELETE /api/v1/statuses
-	 *
-	 * @param  integer  $id
-	 *
-	 * @return null
-	 */
-	public function statusDelete(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
+        return $this->json($res);
+    }
 
-		$status = Status::whereProfileId($request->user()->profile->id)
-		->findOrFail($id);
+    /**
+     * DELETE /api/v1/statuses
+     *
+     * @param  int  $id
+     * @return null
+     */
+    public function statusDelete(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('write'), 403);
 
-		$resource = new Fractal\Resource\Item($status, new StatusTransformer());
+        AccountService::setLastActive($request->user()->id);
+        $status = Status::whereProfileId($request->user()->profile->id)
+            ->findOrFail($id);
 
-		Cache::forget('profile:status_count:'.$status->profile_id);
-		StatusDelete::dispatch($status);
+        $resource = new Fractal\Resource\Item($status, new StatusTransformer);
 
-		$res = $this->fractal->createData($resource)->toArray();
-		$res['text'] = $res['content'];
-		unset($res['content']);
+        Cache::forget('profile:status_count:'.$status->profile_id);
+        StatusDelete::dispatch($status);
 
-		return $this->json($res);
-	}
+        $res = $this->fractal->createData($resource)->toArray();
+        $res['text'] = $res['content'];
+        unset($res['content']);
 
-	/**
-	 * POST /api/v1/statuses/{id}/reblog
-	 *
-	 * @param  integer  $id
-	 *
-	 * @return StatusTransformer
-	 */
-	public function statusShare(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
+        return $this->json($res);
+    }
 
-		$user = $request->user();
-		$status = Status::whereScope('public')->findOrFail($id);
+    /**
+     * POST /api/v1/statuses/{id}/reblog
+     *
+     * @param  int  $id
+     * @return StatusTransformer
+     */
+    public function statusShare(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('write'), 403);
 
-		if(intval($status->profile_id) !== intval($user->profile_id)) {
-			if($status->scope == 'private') {
-				abort_if(!FollowerService::follows($user->profile_id, $status->profile_id), 403);
-			} else {
-				abort_if(!in_array($status->scope, ['public','unlisted']), 403);
-			}
+        $user = $request->user();
+        abort_if($user->has_roles && ! UserRoleService::can('can-share', $user->id), 403, 'Invalid permissions for this action');
+        AccountService::setLastActive($user->id);
+        $status = Status::whereScope('public')->findOrFail($id);
+        $account = AccountService::get($status->profile_id);
+        abort_if(isset($account['moved'], $account['moved']['id']), 422, 'Cannot share a post from an account that has migrated');
+        if ($status && ($status->uri || $status->url || $status->object_url)) {
+            $url = $status->uri ?? $status->url ?? $status->object_url;
+            $domain = parse_url($url, PHP_URL_HOST);
+            abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
+        }
+        if (intval($status->profile_id) !== intval($user->profile_id)) {
+            if ($status->scope == 'private') {
+                abort_if(! FollowerService::follows($user->profile_id, $status->profile_id), 403);
+            } else {
+                abort_if(! in_array($status->scope, ['public', 'unlisted']), 403);
+            }
 
-			$blocks = UserFilterService::blocks($status->profile_id);
-			if($blocks && in_array($user->profile_id, $blocks)) {
-				abort(422);
-			}
-		}
+            $blocks = UserFilterService::blocks($status->profile_id);
+            if ($blocks && in_array($user->profile_id, $blocks)) {
+                abort(422);
+            }
+        }
 
-		$share = Status::firstOrCreate([
-			'profile_id' => $user->profile_id,
-			'reblog_of_id' => $status->id,
-			'type' => 'share',
-			'in_reply_to_profile_id' => $status->profile_id,
-			'scope' => 'public',
-			'visibility' => 'public'
-		]);
+        $defaultCaption = config_cache('database.default') === 'mysql' ? null : "";
+        $share = Status::firstOrCreate([
+            'caption' => $defaultCaption,
+            'rendered' => $defaultCaption,
+            'profile_id' => $user->profile_id,
+            'reblog_of_id' => $status->id,
+            'type' => 'share',
+            'in_reply_to_profile_id' => $status->profile_id,
+            'scope' => 'public',
+            'visibility' => 'public',
+        ]);
 
-		SharePipeline::dispatch($share)->onQueue('low');
+        SharePipeline::dispatch($share)->onQueue('low');
 
-		StatusService::del($status->id);
-		ReblogService::add($user->profile_id, $status->id);
-		$res = StatusService::getMastodon($status->id);
-		$res['reblogged'] = true;
+        StatusService::del($status->id);
+        ReblogService::add($user->profile_id, $status->id);
+        $res = StatusService::getMastodon($status->id);
+        $res['reblogged'] = true;
+        $res['favourited'] = LikeService::liked($user->profile_id, $status->id);
+        $res['bookmarked'] = BookmarkService::get($user->profile_id, $status->id);
 
-		return $this->json($res);
-	}
+        return $this->json($res);
+    }
 
-	/**
-	 * POST /api/v1/statuses/{id}/unreblog
-	 *
-	 * @param  integer  $id
-	 *
-	 * @return StatusTransformer
-	 */
-	public function statusUnshare(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
+    /**
+     * POST /api/v1/statuses/{id}/unreblog
+     *
+     * @param  int  $id
+     * @return StatusTransformer
+     */
+    public function statusUnshare(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('write'), 403);
 
-		$user = $request->user();
-		$status = Status::whereScope('public')->findOrFail($id);
+        $user = $request->user();
+        abort_if($user->has_roles && ! UserRoleService::can('can-share', $user->id), 403, 'Invalid permissions for this action');
+        AccountService::setLastActive($user->id);
+        $status = Status::whereScope('public')->findOrFail($id);
+        $account = AccountService::get($status->profile_id);
+        abort_if(isset($account['moved'], $account['moved']['id']), 422, 'Cannot unshare a post from an account that has migrated');
 
-		if(intval($status->profile_id) !== intval($user->profile_id)) {
-			if($status->scope == 'private') {
-				abort_if(!FollowerService::follows($user->profile_id, $status->profile_id), 403);
-			} else {
-				abort_if(!in_array($status->scope, ['public','unlisted']), 403);
-			}
-		}
+        if (intval($status->profile_id) !== intval($user->profile_id)) {
+            if ($status->scope == 'private') {
+                abort_if(! FollowerService::follows($user->profile_id, $status->profile_id), 403);
+            } else {
+                abort_if(! in_array($status->scope, ['public', 'unlisted']), 403);
+            }
+        }
 
-		$reblog = Status::whereProfileId($user->profile_id)
-		  ->whereReblogOfId($status->id)
-		  ->first();
+        $reblog = Status::whereProfileId($user->profile_id)
+            ->whereReblogOfId($status->id)
+            ->first();
 
-		if(!$reblog) {
-			$res = StatusService::getMastodon($status->id);
-			$res['reblogged'] = false;
-			return $this->json($res);
-		}
+        if (! $reblog) {
+            $res = StatusService::getMastodon($status->id);
+            $res['reblogged'] = false;
 
-		UndoSharePipeline::dispatch($reblog)->onQueue('low');
-		ReblogService::del($user->profile_id, $status->id);
+            return $this->json($res);
+        }
 
-		$res = StatusService::getMastodon($status->id);
-		$res['reblogged'] = false;
+        UndoSharePipeline::dispatch($reblog)->onQueue('low');
+        ReblogService::del($user->profile_id, $status->id);
 
-		return $this->json($res);
-	}
+        $res = StatusService::getMastodon($status->id);
+        $res['reblogged'] = false;
+        $res['favourited'] = LikeService::liked($user->profile_id, $status->id);
+        $res['bookmarked'] = BookmarkService::get($user->profile_id, $status->id);
 
-	/**
-	 * GET /api/v1/timelines/tag/{hashtag}
-	 *
-	 * @param  string  $hashtag
-	 *
-	 * @return StatusTransformer
-	 */
-	public function timelineHashtag(Request $request, $hashtag)
-	{
-		abort_if(!$request->user(), 403);
+        return $this->json($res);
+    }
 
-		$this->validate($request,[
-		  'page'        => 'nullable|integer|max:40',
-		  'min_id'      => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
-		  'max_id'      => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
-		  'limit'       => 'nullable|integer|max:100',
-		  'only_media'  => 'sometimes|boolean',
-		  '_pe'			=> 'sometimes'
-		]);
+    /**
+     * GET /api/v1/timelines/tag/{hashtag}
+     *
+     * @param  string  $hashtag
+     * @return StatusTransformer
+     */
+    public function timelineHashtag(Request $request, $hashtag)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
 
-		if(config('database.default') === 'pgsql') {
-			$tag = Hashtag::where('name', 'ilike', $hashtag)
-				->orWhere('slug', 'ilike', $hashtag)
-				->first();
-		} else {
-			$tag = Hashtag::whereName($hashtag)
-			  ->orWhere('slug', $hashtag)
-			  ->first();
-		}
+        $this->validate($request, [
+            'page' => 'nullable|integer|max:40',
+            'min_id' => 'nullable|integer|min:0|max:'.PHP_INT_MAX,
+            'max_id' => 'nullable|integer|min:0|max:'.PHP_INT_MAX,
+            'limit' => 'sometimes|integer|min:1',
+            'only_media' => 'sometimes',
+            '_pe' => 'sometimes',
+        ]);
 
-		if(!$tag) {
-			return response()->json([]);
-		}
+        $user = $request->user();
+        abort_if(
+            $user->has_roles && ! UserRoleService::can('can-view-hashtag-feed', $user->id),
+            403,
+            'Invalid permissions for this action'
+        );
 
-		if($tag->is_banned == true) {
-			return $this->json([]);
-		}
+        if (config('database.default') === 'pgsql') {
+            $tag = Hashtag::where('name', 'ilike', $hashtag)
+                ->orWhere('slug', 'ilike', $hashtag)
+                ->first();
+        } else {
+            $tag = Hashtag::whereName($hashtag)
+                ->orWhere('slug', $hashtag)
+                ->first();
+        }
 
-		$min = $request->input('min_id');
-		$max = $request->input('max_id');
-		$limit = $request->input('limit', 20);
-		$onlyMedia = $request->input('only_media', true);
-		$pe = $request->has(self::PF_API_ENTITY_KEY);
+        if (! $tag) {
+            return response()->json([]);
+        }
 
-		if($min || $max) {
-			$minMax = SnowflakeService::byDate(now()->subMonths(6));
-			if($min && intval($min) < $minMax) {
-				return [];
-			}
-			if($max && intval($max) < $minMax) {
-				return [];
-			}
-		}
+        if ($tag->is_banned == true) {
+            return $this->json([]);
+        }
 
-		$filters = UserFilterService::filters($request->user()->profile_id);
+        $min = $request->input('min_id');
+        $max = $request->input('max_id');
+        $limit = $request->input('limit', 20);
+        if ($limit > 40) {
+            $limit = 40;
+        }
+        $onlyMedia = $request->boolean('only_media', true);
+        $pe = $request->has(self::PF_API_ENTITY_KEY);
+        $pid = $request->user()->profile_id;
 
-		if(!$min && !$max) {
-			$id = 1;
-			$dir = '>';
-		} else {
-			$dir = $min ? '>' : '<';
-			$id = $min ?? $max;
-		}
+        if ($min || $max) {
+            $minMax = SnowflakeService::byDate(now()->subMonths(6));
+            if ($min && intval($min) < $minMax) {
+                return [];
+            }
+            if ($max && intval($max) < $minMax) {
+                return [];
+            }
+        }
 
-		$res = StatusHashtag::whereHashtagId($tag->id)
-			->whereStatusVisibility('public')
-			->where('status_id', $dir, $id)
-			->orderBy('status_id', 'desc')
-			->limit($limit)
-			->pluck('status_id')
-			->map(function ($i) use($pe) {
-				return $pe ? StatusService::get($i) : StatusService::getMastodon($i);
-			})
-			->filter(function($i) use($onlyMedia) {
-				if(!$i) {
-					return false;
-				}
-				if($onlyMedia && !isset($i['media_attachments']) || !count($i['media_attachments'])) {
-					return false;
-				}
-				return $i && isset($i['account']);
-			})
-			->filter(function($i) use($filters) {
-				return !in_array($i['account']['id'], $filters);
-			})
-			->values()
-			->toArray();
+        $filters = UserFilterService::filters($pid);
+        $domainBlocks = UserFilterService::domainBlocks($pid);
 
-		return $this->json($res);
-	}
+        if (! $min && ! $max) {
+            $id = 1;
+            $dir = '>';
+        } else {
+            $dir = $min ? '>' : '<';
+            $id = $min ?? $max;
+        }
 
-	/**
-	 * GET /api/v1/bookmarks
-	 *
-	 *
-	 *
-	 * @return StatusTransformer
-	 */
-	public function bookmarks(Request $request)
-	{
-		abort_if(!$request->user(), 403);
+        $res = StatusHashtag::whereHashtagId($tag->id)
+            ->where('status_id', $dir, $id)
+            ->orderBy('status_id', 'desc')
+            ->limit(100)
+            ->pluck('status_id')
+            ->map(function ($i) use ($pe) {
+                return $pe ? StatusService::get($i, false) : StatusService::getMastodon($i, false);
+            })
+            ->filter(function ($i) use ($onlyMedia, $pid) {
+                if (! $i || ! isset($i['account'], $i['account']['id'])) {
+                    return false;
+                }
+                if ($i['visibility'] === 'unlisted') {
+                    if ((int) $i['account']['id'] !== $pid) {
+                        return false;
+                    }
+                }
+                // if ($i['visibility'] === 'private') {
+                //     if ((int) $i['account']['id'] !== $pid) {
+                //         return FollowerService::follows($pid, $i['account']['id'], true);
+                //     }
+                // }
+                if ($onlyMedia == true) {
+                    if (! isset($i['media_attachments']) || ! count($i['media_attachments'])) {
+                        return false;
+                    }
+                }
 
-		$this->validate($request, [
-			'limit' => 'nullable|integer|min:1|max:40',
-			'max_id' => 'nullable|integer|min:0',
-			'since_id' => 'nullable|integer|min:0',
-			'min_id' => 'nullable|integer|min:0'
-		]);
+                return $i && isset($i['account'], $i['url']);
+            })
+            ->filter(function ($i) use ($filters, $domainBlocks) {
+                $domain = strtolower(parse_url($i['url'], PHP_URL_HOST));
 
-		$pe = $request->has('_pe');
-		$pid = $request->user()->profile_id;
-		$limit = $request->input('limit') ?? 20;
-		$max_id = $request->input('max_id');
-		$since_id = $request->input('since_id');
-		$min_id = $request->input('min_id');
+                return ! in_array($i['account']['id'], $filters) && ! in_array($domain, $domainBlocks);
+            })
+            ->take($limit)
+            ->values()
+            ->toArray();
 
-		$dir = $min_id ? '>' : '<';
-		$id = $min_id ?? $max_id;
+        return $this->json($res);
+    }
 
-		$bookmarkQuery = Bookmark::whereProfileId($pid)
+    /**
+     * GET /api/v1/bookmarks
+     *
+     *
+     *
+     * @return StatusTransformer
+     */
+    public function bookmarks(Request $request)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
+
+        $this->validate($request, [
+            'limit' => 'sometimes|integer|min:1',
+            'max_id' => 'nullable|integer|min:0',
+            'since_id' => 'nullable|integer|min:0',
+            'min_id' => 'nullable|integer|min:0',
+        ]);
+
+        $pe = $request->has('_pe');
+        $pid = $request->user()->profile_id;
+        $limit = $request->input('limit') ?? 20;
+        if ($limit > 40) {
+            $limit = 40;
+        }
+        $max_id = $request->input('max_id');
+        $since_id = $request->input('since_id');
+        $min_id = $request->input('min_id');
+
+        $dir = $min_id ? '>' : '<';
+        $id = $min_id ?? $max_id;
+
+        $bookmarkQuery = Bookmark::whereProfileId($pid)
             ->orderByDesc('id')
             ->cursorPaginate($limit);
 
-        $bookmarks = $bookmarkQuery->map(function($bookmark) use($pid, $pe) {
-				$status = $pe ? StatusService::get($bookmark->status_id, false) : StatusService::getMastodon($bookmark->status_id, false);
+        $bookmarks = $bookmarkQuery->map(function ($bookmark) use ($pid, $pe) {
+            $status = $pe ? StatusService::get($bookmark->status_id, false) : StatusService::getMastodon($bookmark->status_id, false);
 
-				if($status) {
-					$status['bookmarked'] = true;
-					$status['favourited'] = LikeService::liked($pid, $status['id']);
-					$status['reblogged'] = ReblogService::get($pid, $status['id']);
-				}
-				return $status;
-			})
-			->filter()
-			->values()
-			->toArray();
+            if ($status) {
+                $status['bookmarked'] = true;
+                $status['favourited'] = LikeService::liked($pid, $status['id']);
+                $status['reblogged'] = ReblogService::get($pid, $status['id']);
+            }
+
+            return $status;
+        })
+            ->filter()
+            ->values()
+            ->toArray();
 
         $links = null;
         $headers = [];
 
-        if($bookmarkQuery->nextCursor()) {
+        if ($bookmarkQuery->nextCursor()) {
             $links .= '<'.$bookmarkQuery->nextPageUrl().'&limit='.$limit.'>; rel="next"';
         }
 
-        if($bookmarkQuery->previousCursor()) {
-            if($links != null) {
+        if ($bookmarkQuery->previousCursor()) {
+            if ($links != null) {
                 $links .= ', ';
             }
             $links .= '<'.$bookmarkQuery->previousPageUrl().'&limit='.$limit.'>; rel="prev"';
         }
 
-        if($links) {
+        if ($links) {
             $headers = ['Link' => $links];
         }
 
-		return $this->json($bookmarks, 200, $headers);
-	}
+        return $this->json($bookmarks, 200, $headers);
+    }
 
-	/**
-	 * POST /api/v1/statuses/{id}/bookmark
-	 *
-	 *
-	 *
-	 * @return StatusTransformer
-	 */
-	public function bookmarkStatus(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
+    /**
+     * POST /api/v1/statuses/{id}/bookmark
+     *
+     *
+     *
+     * @return StatusTransformer
+     */
+    public function bookmarkStatus(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('write'), 403);
 
-		$status = Status::findOrFail($id);
-		$pid = $request->user()->profile_id;
+        $status = Status::findOrFail($id);
+        $user = $request->user();
+        $pid = $request->user()->profile_id;
+        $account = AccountService::get($status->profile_id);
+        abort_if(isset($account['moved'], $account['moved']['id']), 422, 'Cannot bookmark a post from an account that has migrated');
+        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') {
+            abort_if(
+                $pid !== $status->profile_id && ! FollowerService::follows($pid, $status->profile_id),
+                404,
+                'Error: You cannot bookmark private posts from accounts you do not follow.'
+            );
+        }
 
-		if($status->scope == 'private') {
-			abort_if(
-				$pid !== $status->profile_id && !FollowerService::follows($pid, $status->profile_id),
-				404,
-				'Error: You cannot bookmark private posts from accounts you do not follow.'
-			);
-		}
+        Bookmark::firstOrCreate([
+            'status_id' => $status->id,
+            'profile_id' => $pid,
+        ]);
 
-		Bookmark::firstOrCreate([
-			'status_id' => $status->id,
-			'profile_id' => $pid
-		]);
+        BookmarkService::add($pid, $status->id);
 
-		BookmarkService::add($pid, $status->id);
+        $res = StatusService::getMastodon($status->id, false);
+        $res['bookmarked'] = true;
 
-		$res = StatusService::getMastodon($status->id, false);
-		$res['bookmarked'] = true;
+        return $this->json($res);
+    }
 
-		return $this->json($res);
-	}
+    /**
+     * POST /api/v1/statuses/{id}/unbookmark
+     *
+     *
+     *
+     * @return StatusTransformer
+     */
+    public function unbookmarkStatus(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('write'), 403);
 
-	/**
-	 * POST /api/v1/statuses/{id}/unbookmark
-	 *
-	 *
-	 *
-	 * @return StatusTransformer
-	 */
-	public function unbookmarkStatus(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
+        $status = Status::findOrFail($id);
+        $pid = $request->user()->profile_id;
+        $user = $request->user();
 
-		$status = Status::findOrFail($id);
-		$pid = $request->user()->profile_id;
+        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);
+        $bookmark = Bookmark::whereStatusId($status->id)
+            ->whereProfileId($pid)
+            ->first();
 
-		$bookmark = Bookmark::whereStatusId($status->id)
-			->whereProfileId($pid)
-			->first();
+        if ($bookmark) {
+            BookmarkService::del($pid, $status->id);
+            $bookmark->delete();
+        }
+        $res = StatusService::getMastodon($status->id, false);
+        $res['bookmarked'] = false;
 
-		if($bookmark) {
-			BookmarkService::del($pid, $status->id);
-			$bookmark->delete();
-		}
-		$res = StatusService::getMastodon($status->id, false);
-		$res['bookmarked'] = false;
+        return $this->json($res);
+    }
 
-		return $this->json($res);
-	}
+    /**
+     * GET /api/v1/discover/posts
+     *
+     *
+     * @return array
+     */
+    public function discoverPosts(Request $request)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
 
-	/**
-	 * GET /api/v1/discover/posts
-	 *
-	 *
-	 * @return array
-	 */
-	public function discoverPosts(Request $request)
-	{
-		abort_if(!$request->user(), 403);
+        $this->validate($request, [
+            'limit' => 'integer|min:1|max:40',
+        ]);
 
-		$this->validate($request, [
-			'limit' => 'integer|min:1|max:40'
-		]);
-
-		$limit = $request->input('limit', 40);
-		$pid = $request->user()->profile_id;
-		$filters = UserFilterService::filters($pid);
-		$forYou = DiscoverService::getForYou();
-		$posts = $forYou->take(50)->map(function($post) {
-			return StatusService::getMastodon($post);
-		})
-		->filter(function($post) use($filters) {
-			return $post &&
-				isset($post['account']) &&
-				isset($post['account']['id']) &&
-				!in_array($post['account']['id'], $filters);
-		})
-		->take(12)
-		->values();
-		return $this->json(compact('posts'));
-	}
-
-	/**
-	* GET /api/v2/statuses/{id}/replies
-	*
-	*
-	* @return array
-	*/
-	public function statusReplies(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
-
-		$this->validate($request, [
-			'limit' => 'int|min:1|max:10',
-			'sort' => 'in:all,newest,popular'
-		]);
-
-		$limit = $request->input('limit', 3);
-		$pid = $request->user()->profile_id;
-		$status = StatusService::getMastodon($id, false);
-
-		abort_if(!$status, 404);
-
-		if($status['visibility'] == 'private') {
-			if($pid != $status['account']['id']) {
-				abort_unless(FollowerService::follows($pid, $status['account']['id']), 404);
-			}
-		}
-
-		$sortBy = $request->input('sort', 'all');
-
-		if($sortBy == 'all' && isset($status['replies_count']) && $status['replies_count'] && $request->has('refresh_cache')) {
-			if(!Cache::has('status:replies:all-rc:' . $id)) {
-				Cache::forget('status:replies:all:' . $id);
-				Cache::put('status:replies:all-rc:' . $id, true, 300);
-			}
-		}
-
-		if($sortBy == 'all' && !$request->has('cursor')) {
-			$ids = Cache::remember('status:replies:all:' . $id, 3600, function() use($id) {
-				return DB::table('statuses')
-					->where('in_reply_to_id', $id)
-					->orderBy('id')
-					->cursorPaginate(3);
-			});
-		} else {
-			$ids = DB::table('statuses')
-				->where('in_reply_to_id', $id)
-				->when($sortBy, function($q, $sortBy) {
-					if($sortBy === 'all') {
-						return $q->orderBy('id');
-					}
-
-					if($sortBy === 'newest') {
-						return $q->orderByDesc('created_at');
-					}
-
-					if($sortBy === 'popular') {
-						return $q->orderByDesc('likes_count');
-					}
-				})
-				->cursorPaginate($limit);
-		}
-
-		$filters = UserFilterService::filters($pid);
-		$data = $ids->filter(function($post) use($filters) {
-			return !in_array($post->profile_id, $filters);
-		})
-		->map(function($post) use($pid) {
-			$status = StatusService::get($post->id, false);
-
-			if(!$status || !isset($status['id'])) {
-				return false;
-			}
-
-			$status['favourited'] = LikeService::liked($pid, $post->id);
-			return $status;
-		})
-		->map(function($post) {
-			if(isset($post['account']) && isset($post['account']['id'])) {
-				$account = AccountService::get($post['account']['id'], true);
-				$post['account'] = $account;
-			}
-			return $post;
-		})
-		->filter(function($post) {
-			return $post && isset($post['id']) && isset($post['account']) && isset($post['account']['id']);
-		})
-		->values();
-
-		$res = [
-			'data' => $data,
-			'next' => $ids->nextPageUrl()
-		];
-
-		return $this->json($res);
-	}
-
-	/**
-	* GET /api/v2/statuses/{id}/state
-	*
-	*
-	* @return array
-	*/
-	public function statusState(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
-
-		$status = Status::findOrFail($id);
-		$pid = $request->user()->profile_id;
-		abort_if(!in_array($status->scope, ['public', 'unlisted', 'private']), 404);
-
-		return $this->json(StatusService::getState($status->id, $pid));
-	}
-
-	/**
-	* GET /api/v1.1/discover/accounts/popular
-	*
-	*
-	* @return array
-	*/
-	public function discoverAccountsPopular(Request $request)
-	{
-		abort_if(!$request->user(), 403);
-
-		$pid = $request->user()->profile_id;
-
-		$ids = Cache::remember('api:v1.1:discover:accounts:popular', 86400, function() {
-			return DB::table('profiles')
-			->where('is_private', false)
-			->whereNull('status')
-			->orderByDesc('profiles.followers_count')
-			->limit(20)
-			->get();
-		});
-
-		$ids = $ids->map(function($profile) {
-			return AccountService::get($profile->id, true);
-		})
-		->filter(function($profile) use($pid) {
-			return $profile && isset($profile['id']);
-		})
-		->filter(function($profile) use($pid) {
-			return $profile['id'] != $pid;
-		})
-        ->map(function($profile) {
-            $ids = collect(ProfileStatusService::get($profile['id'], 0, 9))
-                ->map(function($id) {
-                    return StatusService::get($id, true);
-                })
-                ->filter(function($post) {
-                    return $post && isset($post['id']);
-                })
-                ->take(3)
-                ->values();
-            $profile['recent_posts'] = $ids;
-            return $profile;
+        $limit = $request->input('limit', 40);
+        $pid = $request->user()->profile_id;
+        $filters = UserFilterService::filters($pid);
+        $forYou = DiscoverService::getForYou();
+        $posts = $forYou->take(50)->map(function ($post) {
+            return StatusService::getMastodon($post);
         })
-		->take(6)
-		->values();
+            ->filter(function ($post) use ($filters) {
+                return $post &&
+                    isset($post['account']) &&
+                    isset($post['account']['id']) &&
+                    ! in_array($post['account']['id'], $filters);
+            })
+            ->take(12)
+            ->values();
 
-		return $this->json($ids);
-	}
+        return $this->json(compact('posts'));
+    }
 
-	/**
-	* GET /api/v1/preferences
-	*
-	*
-	* @return array
-	*/
-	public function getPreferences(Request $request)
-	{
-		abort_if(!$request->user(), 403);
+    /**
+     * GET /api/v2/statuses/{id}/replies
+     *
+     *
+     * @return array
+     */
+    public function statusReplies(Request $request, $id)
+    {
+        abort_if(! $request->user(), 403);
 
-		$pid = $request->user()->profile_id;
-		$account = AccountService::get($pid);
+        $this->validate($request, [
+            'limit' => 'sometimes|integer|min:1',
+            'sort' => 'in:all,newest,popular',
+        ]);
 
-		return $this->json([
-			'posting:default:visibility'		=>  $account['locked'] ? 'private' : 'public',
-			'posting:default:sensitive'			=>  false,
-			'posting:default:language'			=>  null,
-			'reading:expand:media'				=>  'default',
-			'reading:expand:spoilers'			=>  false
-		]);
-	}
+        $limit = $request->input('limit', 3);
+        if ($limit > 10) {
+            $limit = 10;
+        }
+        $pid = $request->user()->profile_id;
+        $status = StatusService::getMastodon($id, false);
+        abort_if(! $status, 404);
+        abort_if(isset($status['account'], $account['account']['moved']['id']), 404, 'Account moved');
 
-	/**
-	* GET /api/v1/trends
-	*
-	*
-	* @return array
-	*/
-	public function getTrends(Request $request)
-	{
-		abort_if(!$request->user(), 403);
+        if ($status['visibility'] == 'private') {
+            if ($pid != $status['account']['id']) {
+                abort_unless(FollowerService::follows($pid, $status['account']['id']), 404);
+            }
+        }
 
-		return $this->json([]);
-	}
+        $sortBy = $request->input('sort', 'all');
 
-	/**
-	* GET /api/v1/announcements
-	*
-	*
-	* @return array
-	*/
-	public function getAnnouncements(Request $request)
-	{
-		abort_if(!$request->user(), 403);
+        if ($sortBy == 'all' && isset($status['replies_count']) && $status['replies_count'] && $request->has('refresh_cache')) {
+            if (! Cache::has('status:replies:all-rc:'.$id)) {
+                Cache::forget('status:replies:all:'.$id);
+                Cache::put('status:replies:all-rc:'.$id, true, 300);
+            }
+        }
 
-		return $this->json([]);
-	}
+        if ($sortBy == 'all' && ! $request->has('cursor')) {
+            $ids = Cache::remember('status:replies:all:'.$id, 3600, function () use ($id) {
+                return DB::table('statuses')
+                    ->where('in_reply_to_id', $id)
+                    ->orderBy('id')
+                    ->cursorPaginate(3);
+            });
+        } else {
+            $ids = DB::table('statuses')
+                ->where('in_reply_to_id', $id)
+                ->when($sortBy, function ($q, $sortBy) {
+                    if ($sortBy === 'all') {
+                        return $q->orderBy('id');
+                    }
 
-	/**
-	* GET /api/v1/markers
-	*
-	*
-	* @return array
-	*/
-	public function getMarkers(Request $request)
-	{
-		abort_if(!$request->user(), 403);
+                    if ($sortBy === 'newest') {
+                        return $q->orderByDesc('created_at');
+                    }
 
-		$type = $request->input('timeline');
-		if(is_array($type)) {
-			$type = $type[0];
-		}
-		if(!$type || !in_array($type, ['home', 'notifications'])) {
-			return $this->json([]);
-		}
-		$pid = $request->user()->profile_id;
-		return $this->json(MarkerService::get($pid, $type));
-	}
+                    if ($sortBy === 'popular') {
+                        return $q->orderByDesc('likes_count');
+                    }
+                })
+                ->cursorPaginate($limit);
+        }
 
-	/**
-	* POST /api/v1/markers
-	*
-	*
-	* @return array
-	*/
-	public function setMarkers(Request $request)
-	{
-		abort_if(!$request->user(), 403);
+        $filters = UserFilterService::filters($pid);
+        $data = $ids->filter(function ($post) use ($filters) {
+            return ! in_array($post->profile_id, $filters);
+        })
+            ->map(function ($post) use ($pid) {
+                $status = StatusService::get($post->id, false);
 
-		$pid = $request->user()->profile_id;
-		$home = $request->input('home[last_read_id]');
-		$notifications = $request->input('notifications[last_read_id]');
+                if (! $status || ! isset($status['id'])) {
+                    return false;
+                }
 
-		if($home) {
-			return $this->json(MarkerService::set($pid, 'home', $home));
-		}
+                $status['favourited'] = LikeService::liked($pid, $post->id);
 
-		if($notifications) {
-			return $this->json(MarkerService::set($pid, 'notifications', $notifications));
-		}
+                return $status;
+            })
+            ->map(function ($post) {
+                if (isset($post['account']) && isset($post['account']['id'])) {
+                    $account = AccountService::get($post['account']['id'], true);
+                    $post['account'] = $account;
+                }
 
-		return $this->json([]);
-	}
+                return $post;
+            })
+            ->filter(function ($post) {
+                return $post && isset($post['id']) && isset($post['account']) && isset($post['account']['id']);
+            })
+            ->values();
 
-	/**
-	* GET /api/v1/followed_tags
-	*
-	*
-	* @return array
-	*/
-	public function getFollowedTags(Request $request)
-	{
-		abort_if(!$request->user(), 403);
+        $res = [
+            'data' => $data,
+            'next' => $ids->nextPageUrl(),
+        ];
 
-		$account = AccountService::get($request->user()->profile_id);
+        return $this->json($res);
+    }
 
-		$this->validate($request, [
-			'cursor' => 'sometimes',
-			'limit' => 'sometimes|integer|min:1|max:200'
-		]);
-		$limit = $request->input('limit', 100);
+    /**
+     * GET /api/v2/statuses/{id}/state
+     *
+     *
+     * @return array
+     */
+    public function statusState(Request $request, $id)
+    {
+        abort_if(! $request->user(), 403);
 
-		$res = HashtagFollow::whereProfileId($account['id'])
-			->orderByDesc('id')
-			->cursorPaginate($limit)->withQueryString();
+        $status = StatusService::get($id, false, true);
+        abort_if(! $status, 404);
+        abort_if(! in_array($status['visibility'], ['public', 'unlisted', 'private']), 404);
 
-		$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"';
-		}
+        return $this->json(StatusService::getState($status['id'], $request->user()->profile_id));
+    }
 
-		if($pagination) {
-			return response()->json(FollowedTagResource::collection($res)->collection)
-				->header('Link', $pagination);
-		}
-		return response()->json(FollowedTagResource::collection($res)->collection);
-	}
+    /**
+     * GET /api/v1.1/discover/accounts/popular
+     *
+     *
+     * @return array
+     */
+    public function discoverAccountsPopular(Request $request)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
 
-	/**
-	* POST /api/v1/tags/:id/follow
-	*
-	*
-	* @return object
-	*/
-	public function followHashtag(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
+        $pid = $request->user()->profile_id;
 
-		$pid = $request->user()->profile_id;
-		$account = AccountService::get($pid);
+        $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();
 
-		$operator = config('database.default') == 'pgsql' ? 'ilike' : 'like';
-		$tag = Hashtag::where('name', $operator, $id)
-			->orWhere('slug', $operator, $id)
-			->first();
+        return $this->json($ids);
+    }
 
-		abort_if(!$tag, 422, 'Unknown hashtag');
+    /**
+     * GET /api/v1/preferences
+     *
+     *
+     * @return array
+     */
+    public function getPreferences(Request $request)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
 
-		abort_if(
-			HashtagFollow::whereProfileId($pid)->count() >= HashtagFollow::MAX_LIMIT,
-			422,
-			'You cannot follow more than ' . HashtagFollow::MAX_LIMIT . ' hashtags.'
-		);
+        $pid = $request->user()->profile_id;
+        $account = AccountService::get($pid);
 
-		$follows = HashtagFollow::updateOrCreate(
-			[
-				'profile_id' => $account['id'],
-				'hashtag_id' => $tag->id
-			],
-			[
-				'user_id' => $request->user()->id
-			]
-		);
+        return $this->json([
+            'posting:default:visibility' => $account['locked'] ? 'private' : 'public',
+            'posting:default:sensitive' => false,
+            'posting:default:language' => null,
+            'reading:expand:media' => 'default',
+            'reading:expand:spoilers' => false,
+        ]);
+    }
 
-		HashtagService::follow($pid, $tag->id);
+    /**
+     * GET /api/v1/trends
+     *
+     *
+     * @return array
+     */
+    public function getTrends(Request $request)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
 
-		return response()->json(FollowedTagResource::make($follows)->toArray($request));
-	}
+        return $this->json([]);
+    }
 
-	/**
-	* POST /api/v1/tags/:id/unfollow
-	*
-	*
-	* @return object
-	*/
-	public function unfollowHashtag(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
+    /**
+     * GET /api/v1/announcements
+     *
+     *
+     * @return array
+     */
+    public function getAnnouncements(Request $request)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
 
-		$pid = $request->user()->profile_id;
-		$account = AccountService::get($pid);
+        return $this->json([]);
+    }
 
-		$operator = config('database.default') == 'pgsql' ? 'ilike' : 'like';
-		$tag = Hashtag::where('name', $operator, $id)
-			->orWhere('slug', $operator, $id)
-			->first();
+    /**
+     * GET /api/v1/markers
+     *
+     *
+     * @return array
+     */
+    public function getMarkers(Request $request)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
 
-		abort_if(!$tag, 422, 'Unknown hashtag');
+        $type = $request->input('timeline');
+        if (is_array($type)) {
+            $type = $type[0];
+        }
+        if (! $type || ! in_array($type, ['home', 'notifications'])) {
+            return $this->json([]);
+        }
+        $pid = $request->user()->profile_id;
 
-		$follows = HashtagFollow::whereProfileId($pid)
-			->whereHashtagId($tag->id)
-			->first();
+        return $this->json(MarkerService::get($pid, $type));
+    }
 
-		if(!$follows) {
-			return [
-				'name' => $tag->name,
-				'url' => config('app.url') . '/i/web/hashtag/' . $tag->slug,
-				'history' => [],
-				'following' => false
-			];
-		}
+    /**
+     * POST /api/v1/markers
+     *
+     *
+     * @return array
+     */
+    public function setMarkers(Request $request)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('write'), 403);
 
-		if($follows) {
-			HashtagService::unfollow($pid, $tag->id);
-			$follows->delete();
-		}
+        $pid = $request->user()->profile_id;
+        $home = $request->input('home[last_read_id]');
+        $notifications = $request->input('notifications[last_read_id]');
 
-		$res = FollowedTagResource::make($follows)->toArray($request);
-		$res['following'] = false;
-		return response()->json($res);
-	}
+        if ($home) {
+            return $this->json(MarkerService::set($pid, 'home', $home));
+        }
 
-	/**
-	* GET /api/v1/tags/:id
-	*
-	*
-	* @return object
-	*/
-	public function getHashtag(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
+        if ($notifications) {
+            return $this->json(MarkerService::set($pid, 'notifications', $notifications));
+        }
 
-		$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();
+        return $this->json([]);
+    }
 
-		if(!$tag) {
-			return [
-				'name' => $id,
-				'url' => config('app.url') . '/i/web/hashtag/' . $id,
-				'history' => [],
-				'following' => false
-			];
-		}
+    /**
+     * GET /api/v1/instance/peers
+     *
+     *
+     * @return array
+     */
+    public function instancePeers(Request $request)
+    {
+        if ((bool) config('instance.show_peers') == false) {
+            return $this->json([]);
+        }
 
-		$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);
-	}
+        return $this->json(
+            Cache::remember(InstanceService::CACHE_KEY_API_PEERS_LIST, now()->addHours(24), function () {
+                return Instance::whereNotNull('nodeinfo_last_fetched')
+                    ->whereBanned(false)
+                    ->where('nodeinfo_last_fetched', '>', now()->subDays(8))
+                    ->pluck('domain');
+            })
+        );
+    }
 }
diff --git a/app/Http/Controllers/Api/ApiV1Dot1Controller.php b/app/Http/Controllers/Api/ApiV1Dot1Controller.php
index 298deb705..bb82521b6 100644
--- a/app/Http/Controllers/Api/ApiV1Dot1Controller.php
+++ b/app/Http/Controllers/Api/ApiV1Dot1Controller.php
@@ -2,891 +2,929 @@
 
 namespace App\Http\Controllers\Api;
 
-use Cache;
-use DB;
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use League\Fractal;
-use League\Fractal\Serializer\ArraySerializer;
-use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use App\AccountLog;
 use App\EmailVerification;
-use App\Follower;
+use App\Http\Controllers\Controller;
+use App\Http\Controllers\StatusController;
+use App\Http\Resources\StatusStateless;
+use App\Jobs\ImageOptimizePipeline\ImageOptimize;
+use App\Jobs\ReportPipeline\ReportNotifyAdminViaEmail;
+use App\Jobs\StatusPipeline\NewStatusPipeline;
+use App\Jobs\StatusPipeline\RemoteStatusDelete;
+use App\Jobs\StatusPipeline\StatusDelete;
+use App\Jobs\VideoPipeline\VideoThumbnail;
+use App\Mail\ConfirmAppEmail;
+use App\Mail\PasswordChange;
+use App\Media;
 use App\Place;
-use App\Status;
-use App\Report;
 use App\Profile;
+use App\Report;
+use App\Rules\ExpoPushTokenRule;
+use App\Services\AccountService;
+use App\Services\BouncerService;
+use App\Services\EmailService;
+use App\Services\FollowerService;
+use App\Services\MediaBlocklistService;
+use App\Services\MediaPathService;
+use App\Services\NetworkTimelineService;
+use App\Services\NotificationAppGatewayService;
+use App\Services\ProfileStatusService;
+use App\Services\PublicTimelineService;
+use App\Services\PushNotificationService;
+use App\Services\StatusService;
+use App\Services\UserStorageService;
+use App\Status;
 use App\StatusArchived;
 use App\User;
 use App\UserSetting;
-use App\Services\AccountService;
-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;
-use App\Services\BouncerService;
-use App\Services\EmailService;
-use Illuminate\Support\Str;
+use Cache;
+use DB;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
-use Jenssegers\Agent\Agent;
-use Mail;
-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;
+use Illuminate\Support\Str;
+use Jenssegers\Agent\Agent;
+use League\Fractal;
+use League\Fractal\Serializer\ArraySerializer;
+use Mail;
+use Purify;
 
 class ApiV1Dot1Controller extends Controller
 {
-	protected $fractal;
-
-	public function __construct()
-	{
-		$this->fractal = new Fractal\Manager();
-		$this->fractal->setSerializer(new ArraySerializer());
-	}
-
-	public function json($res, $code = 200, $headers = [])
-	{
-		return response()->json($res, $code, $headers, JSON_UNESCAPED_SLASHES);
-	}
-
-	public function error($msg, $code = 400, $extra = [], $headers = [])
-	{
-		$res = [
-			"msg" => $msg,
-			"code" => $code
-		];
-		return response()->json(array_merge($res, $extra), $code, $headers, JSON_UNESCAPED_SLASHES);
-	}
-
-	public function report(Request $request)
-	{
-		$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);
-		}
-
-		$report_type = $request->input('report_type');
-		$object_id = $request->input('object_id');
-		$object_type = $request->input('object_type');
-
-		$types = [
-			'spam',
-			'sensitive',
-			'abusive',
-			'underage',
-			'violence',
-			'copyright',
-			'impersonation',
-			'scam',
-			'terrorism'
-		];
-
-		if (!$report_type || !$object_id || !$object_type) {
-			return $this->error("Invalid or missing parameters", 400, ["error_code" => "ERROR_INVALID_PARAMS"]);
-		}
-
-		if (!in_array($report_type, $types)) {
-			return $this->error("Invalid report type", 400, ["error_code" => "ERROR_TYPE_INVALID"]);
-		}
-
-		if ($object_type === "user" && $object_id == $user->profile_id) {
-			return $this->error("Cannot self report", 400, ["error_code" => "ERROR_NO_SELF_REPORTS"]);
-		}
-
-		$rpid = null;
-
-		switch ($object_type) {
-			case 'post':
-				$object = Status::find($object_id);
-				if (!$object) {
-					return $this->error("Invalid object id", 400, ["error_code" => "ERROR_INVALID_OBJECT_ID"]);
-				}
-				$object_type = 'App\Status';
-				$exists = Report::whereUserId($user->id)
-					->whereObjectId($object->id)
-					->whereObjectType('App\Status')
-					->count();
-
-				$rpid = $object->profile_id;
-			break;
-
-			case 'user':
-				$object = Profile::find($object_id);
-				if (!$object) {
-					return $this->error("Invalid object id", 400, ["error_code" => "ERROR_INVALID_OBJECT_ID"]);
-				}
-				$object_type = 'App\Profile';
-				$exists = Report::whereUserId($user->id)
-					->whereObjectId($object->id)
-					->whereObjectType('App\Profile')
-					->count();
-				$rpid = $object->id;
-			break;
-
-			default:
-				return $this->error("Invalid report type", 400, ["error_code" => "ERROR_REPORT_OBJECT_TYPE_INVALID"]);
-			break;
-	  }
-
-		if ($exists !== 0) {
-			return $this->error("Duplicate report", 400, ["error_code" => "ERROR_REPORT_DUPLICATE"]);
-		}
-
-		if ($object->profile_id == $user->profile_id) {
-			return $this->error("Cannot self report", 400, ["error_code" => "ERROR_NO_SELF_REPORTS"]);
-		}
-
-		$report = new Report;
-		$report->profile_id = $user->profile_id;
-		$report->user_id = $user->id;
-		$report->object_id = $object->id;
-		$report->object_type = $object_type;
-		$report->reported_profile_id = $rpid;
-		$report->type = $report_type;
-		$report->save();
-
-		if(config('instance.reports.email.enabled')) {
-			ReportNotifyAdminViaEmail::dispatch($report)->onQueue('default');
-		}
-
-		$res = [
-			"msg" => "Successfully sent report",
-			"code" => 200
-		];
-		return $this->json($res);
-	}
-
-	/**
-	 * DELETE /api/v1.1/accounts/avatar
-	 *
-	 * @return \App\Transformer\Api\AccountTransformer
-	 */
-	public function deleteAvatar(Request $request)
-	{
-		$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);
-		}
-
-		$avatar = $user->profile->avatar;
-
-		if( $avatar->media_path == 'public/avatars/default.png' ||
-			$avatar->media_path == 'public/avatars/default.jpg'
-		) {
-			return AccountService::get($user->profile_id);
-		}
-
-		if(is_file(storage_path('app/' . $avatar->media_path))) {
-			@unlink(storage_path('app/' . $avatar->media_path));
-		}
-
-		$avatar->media_path = 'public/avatars/default.jpg';
-		$avatar->change_count = $avatar->change_count + 1;
-		$avatar->save();
-
-		Cache::forget('avatar:' . $user->profile_id);
-		Cache::forget("avatar:{$user->profile_id}");
-		Cache::forget('user:account:id:'.$user->id);
-		AccountService::del($user->profile_id);
-
-		return AccountService::get($user->profile_id);
-	}
-
-	/**
-	 * GET /api/v1.1/accounts/{id}/posts
-	 *
-	 * @return \App\Transformer\Api\StatusTransformer
-	 */
-	public function accountPosts(Request $request, $id)
-	{
-		$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);
-		}
-
-		$account = AccountService::get($id);
-
-		if(!$account || $account['username'] !== $request->input('username')) {
-			return $this->json([]);
-		}
-
-		$posts = ProfileStatusService::get($id);
-
-		if(!$posts) {
-			return $this->json([]);
-		}
-
-		$res = collect($posts)
-			->map(function($id) {
-				return StatusService::get($id);
-			})
-			->filter(function($post) {
-				return $post && isset($post['account']);
-			})
-			->toArray();
-
-		return $this->json($res);
-	}
-
-	/**
-	 * POST /api/v1.1/accounts/change-password
-	 *
-	 * @return \App\Transformer\Api\AccountTransformer
-	 */
-	public function accountChangePassword(Request $request)
-	{
-		$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);
-		}
-
-		$this->validate($request, [
-			'current_password' => 'bail|required|current_password',
-			'new_password' => 'required|min:' . config('pixelfed.min_password_length', 8),
-			'confirm_password' => 'required|same:new_password'
-		],[
-			'current_password' => 'The password you entered is incorrect'
-		]);
-
-		$user->password = bcrypt($request->input('new_password'));
-		$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();
-
-		Mail::to($request->user())->send(new PasswordChange($user));
-
-		return $this->json(AccountService::get($user->profile_id));
-	}
-
-	/**
-	 * GET /api/v1.1/accounts/login-activity
-	 *
-	 * @return array
-	 */
-	public function accountLoginActivity(Request $request)
-	{
-		$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);
-		}
-		$agent = new Agent();
-		$currentIp = $request->ip();
-
-		$activity = AccountLog::whereUserId($user->id)
-			->whereAction('auth.login')
-			->orderBy('created_at', 'desc')
-			->groupBy('ip_address')
-			->limit(10)
-			->get()
-			->map(function($item) use($agent, $currentIp) {
-				$agent->setUserAgent($item->user_agent);
-				return [
-					'id' => $item->id,
-					'action' => $item->action,
-					'ip' => $item->ip_address,
-					'ip_current' => $item->ip_address === $currentIp,
-					'is_mobile' => $agent->isMobile(),
-					'device' => $agent->device(),
-					'browser' => $agent->browser(),
-					'platform' => $agent->platform(),
-					'created_at' => $item->created_at->format('c')
-				];
-			});
-
-		return $this->json($activity);
-	}
-
-	/**
-	 * GET /api/v1.1/accounts/two-factor
-	 *
-	 * @return array
-	 */
-	public function accountTwoFactor(Request $request)
-	{
-		$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);
-		}
-
-		$res = [
-			'active' => (bool) $user->{'2fa_enabled'},
-			'setup_at' => $user->{'2fa_setup_at'}
-		];
-		return $this->json($res);
-	}
-
-	/**
-	 * GET /api/v1.1/accounts/emails-from-pixelfed
-	 *
-	 * @return array
-	 */
-	public function accountEmailsFromPixelfed(Request $request)
-	{
-		$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);
-		}
-		$from = config('mail.from.address');
-
-		$emailVerifications = EmailVerification::whereUserId($user->id)
-			->orderByDesc('id')
-			->where('created_at', '>', now()->subDays(14))
-			->limit(10)
-			->get()
-			->map(function($mail) use($user, $from) {
-				return [
-					'type' => 'Email Verification',
-					'subject' => 'Confirm Email',
-					'to_address' => $user->email,
-					'from_address' => $from,
-					'created_at' => str_replace('@', 'at', $mail->created_at->format('M j, Y @ g:i:s A'))
-				];
-			})
-			->toArray();
-
-		$passwordResets = DB::table('password_resets')
-			->whereEmail($user->email)
-			->where('created_at', '>', now()->subDays(14))
-			->orderByDesc('created_at')
-			->limit(10)
-			->get()
-			->map(function($mail) use($user, $from) {
-				return [
-					'type' => 'Password Reset',
-					'subject' => 'Reset Password Notification',
-					'to_address' => $user->email,
-					'from_address' => $from,
-					'created_at' => str_replace('@', 'at', now()->parse($mail->created_at)->format('M j, Y @ g:i:s A'))
-				];
-			})
-			->toArray();
-
-		$passwordChanges = AccountLog::whereUserId($user->id)
-			->whereAction('account.edit.password')
-			->where('created_at', '>', now()->subDays(14))
-			->orderByDesc('created_at')
-			->limit(10)
-			->get()
-			->map(function($mail) use($user, $from) {
-				return [
-					'type' => 'Password Change',
-					'subject' => 'Password Change',
-					'to_address' => $user->email,
-					'from_address' => $from,
-					'created_at' => str_replace('@', 'at', now()->parse($mail->created_at)->format('M j, Y @ g:i:s A'))
-				];
-			})
-			->toArray();
-
-		$res = collect([])
-			->merge($emailVerifications)
-			->merge($passwordResets)
-			->merge($passwordChanges)
-			->sortByDesc('created_at')
-			->values();
-
-		return $this->json($res);
-	}
-
-	/**
-	 * GET /api/v1.1/accounts/apps-and-applications
-	 *
-	 * @return array
-	 */
-	public function accountApps(Request $request)
-	{
-		$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);
-		}
-
-		$res = $user->tokens->sortByDesc('created_at')->take(10)->map(function($token, $key) use($request) {
-			return [
-				'id' => $token->id,
-				'current_session' => $request->user()->token()->id == $token->id,
-				'name' => $token->client->name,
-				'scopes' => $token->scopes,
-				'revoked' => $token->revoked,
-				'created_at' => str_replace('@', 'at', now()->parse($token->created_at)->format('M j, Y @ g:i:s A')),
-				'expires_at' => str_replace('@', 'at', now()->parse($token->expires_at)->format('M j, Y @ g:i:s A'))
-			];
-		});
-
-		return $this->json($res);
-	}
-
-	public function inAppRegistrationPreFlightCheck(Request $request)
-	{
-		return [
-			'open' => (bool) config_cache('pixelfed.open_registration'),
-			'iara' => config('pixelfed.allow_app_registration')
-		];
-	}
-
-	public function inAppRegistration(Request $request)
-	{
-		abort_if($request->user(), 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));
-		abort_if(!$rl, 400, 'Too many requests');
-
-		$this->validate($request, [
-			'email' => [
-				'required',
-				'string',
-				'email',
-				'max:255',
-				'unique:users',
-				function ($attribute, $value, $fail) {
-					$banned = EmailService::isBanned($value);
-					if($banned) {
-						return $fail('Email is invalid.');
-					}
-				},
-			],
-			'username' => [
-				'required',
-				'min:2',
-				'max:15',
-				'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.');
-					}
-				},
-			],
-			'password' => 'required|string|min:8',
-		]);
-
-		$email = $request->input('email');
-		$username = $request->input('username');
-		$password = $request->input('password');
-
-		if(config('database.default') == 'pgsql') {
-			$username = strtolower($username);
-			$email = strtolower($email);
-		}
-
-		$user = new User;
-		$user->name = $username;
-		$user->username = $username;
-		$user->email = $email;
-		$user->password = Hash::make($password);
-		$user->register_source = 'app';
-		$user->app_register_ip = $request->ip();
-		$user->app_register_token = Str::random(40);
-		$user->save();
-
-		$rtoken = Str::random(64);
-
-		$verify = new EmailVerification();
-		$verify->user_id = $user->id;
-		$verify->email = $user->email;
-		$verify->user_token = $user->app_register_token;
-		$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);
-
-		Mail::to($user->email)->send(new ConfirmAppEmail($verify, $appUrl));
-
-		return response()->json([
-			'success' => true,
-		]);
-	}
-
-	public function inAppRegistrationEmailRedirect(Request $request)
-	{
-		$this->validate($request, [
-			'ut' => 'required',
-			'rt' => 'required',
-			'ea' => 'required'
-		]);
-		$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;
-		return redirect()->away($url);
-	}
-
-	public function inAppRegistrationConfirm(Request $request)
-	{
-		abort_if($request->user(), 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');
-
-		$this->validate($request, [
-			'user_token' => 'required',
-			'random_token' => 'required',
-			'email' => 'required'
-		]);
-
-		$verify = EmailVerification::whereEmail($request->input('email'))
-			->whereUserToken($request->input('user_token'))
-			->whereRandomToken($request->input('random_token'))
-			->first();
-
-		if(!$verify) {
-			return response()->json(['error' => 'Invalid tokens'], 403);
-		}
-
-		if($verify->created_at->lt(now()->subHours(24))) {
-			$verify->delete();
-			return response()->json(['error' => 'Invalid tokens'], 403);
-		}
-
-		$user = User::findOrFail($verify->user_id);
-		$user->email_verified_at = now();
-		$user->last_active_at = now();
-		$user->save();
-
-		$token = $user->createToken('Pixelfed');
-
-		return response()->json([
-			'access_token' => $token->accessToken
-		]);
-	}
-
-	public function archive(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
-
-		if(config('pixelfed.bouncer.cloud_ips.ban_signups')) {
-			abort_if(BouncerService::checkIp($request->ip()), 404);
-		}
-
-		$status = Status::whereNull('in_reply_to_id')
-			->whereNull('reblog_of_id')
-			->whereProfileId($request->user()->profile_id)
-			->findOrFail($id);
-
-		if($status->scope === 'archived') {
-			return [200];
-		}
-
-		$archive = new StatusArchived;
-		$archive->status_id = $status->id;
-		$archive->profile_id = $status->profile_id;
-		$archive->original_scope = $status->scope;
-		$archive->save();
-
-		$status->scope = 'archived';
-		$status->visibility = 'draft';
-		$status->save();
-		StatusService::del($status->id, true);
-		AccountService::syncPostCount($status->profile_id);
-
-		return [200];
-	}
-
-	public function unarchive(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
-
-		if(config('pixelfed.bouncer.cloud_ips.ban_signups')) {
-			abort_if(BouncerService::checkIp($request->ip()), 404);
-		}
-
-		$status = Status::whereNull('in_reply_to_id')
-			->whereNull('reblog_of_id')
-			->whereProfileId($request->user()->profile_id)
-			->findOrFail($id);
-
-		if($status->scope !== 'archived') {
-			return [200];
-		}
-
-		$archive = StatusArchived::whereStatusId($status->id)
-			->whereProfileId($status->profile_id)
-			->firstOrFail();
-
-		$status->scope = $archive->original_scope;
-		$status->visibility = $archive->original_scope;
-		$status->save();
-		$archive->delete();
-		StatusService::del($status->id, true);
-		AccountService::syncPostCount($status->profile_id);
-
-		return [200];
-	}
-
-	public function archivedPosts(Request $request)
-	{
-		abort_if(!$request->user(), 403);
-
-		if(config('pixelfed.bouncer.cloud_ips.ban_signups')) {
-			abort_if(BouncerService::checkIp($request->ip()), 404);
-		}
-
-		$statuses = Status::whereProfileId($request->user()->profile_id)
-			->whereScope('archived')
-			->orderByDesc('id')
-			->cursorPaginate(10);
-
-		return StatusStateless::collection($statuses);
-	}
-
-	public function placesById(Request $request, $id, $slug)
-	{
-		abort_if(!$request->user(), 403);
-
-		if(config('pixelfed.bouncer.cloud_ips.ban_signups')) {
-			abort_if(BouncerService::checkIp($request->ip()), 404);
-		}
-
-		$place = Place::whereSlug($slug)->findOrFail($id);
-
-		$posts = Cache::remember('pf-api:v1.1:places-by-id:' . $place->id, 3600, function() use($place) {
-			return Status::wherePlaceId($place->id)
-				->whereNull('uri')
-				->whereScope('public')
-				->orderByDesc('created_at')
-				->limit(60)
-				->pluck('id');
-		});
-
-		$posts = $posts->map(function($id) {
-			return StatusService::get($id);
-		})
-		->filter()
-		->values();
-
-		return [
-			'place' =>
-			[
-				'id' => $place->id,
-				'name' => $place->name,
-				'slug' => $place->slug,
-				'country' => $place->country,
-				'lat' => $place->lat,
-				'long' => $place->long
-			],
-		'posts' => $posts];
-	}
-
-	public function moderatePost(Request $request, $id)
-	{
-		abort_if(!$request->user(), 403);
-		abort_if($request->user()->is_admin != true, 403);
-
-		if(config('pixelfed.bouncer.cloud_ips.ban_signups')) {
-			abort_if(BouncerService::checkIp($request->ip()), 404);
-		}
-
-		$this->validate($request, [
-			'action' => 'required|in:cw,mark-public,mark-unlisted,mark-private,mark-spammer,delete'
-		]);
-
-		$action = $request->input('action');
-		$status = Status::find($id);
-
-		if(!$status) {
-			return response()->json(['error' => 'Cannot find status'], 400);
-		}
-
-		if($status->uri == null) {
-			if($status->profile->user && $status->profile->user->is_admin) {
-				return response()->json(['error' => 'Cannot moderate admin accounts'], 400);
-			}
-		}
-
-		if($action == 'mark-spammer') {
-			$status->profile->update([
-				'unlisted' => true,
-				'cw' => true,
-				'no_autolink' => true
-			]);
-
-			Status::whereProfileId($status->profile_id)
-				->get()
-				->each(function($s) {
-					if(in_array($s->scope, ['public', 'unlisted'])) {
-						$s->scope = 'private';
-						$s->visibility = 'private';
-					}
-					$s->is_nsfw = true;
-					$s->save();
-					StatusService::del($s->id, true);
-				});
-
-			Cache::forget('pf:bouncer_v0:exemption_by_pid:' . $status->profile_id);
-			Cache::forget('pf:bouncer_v0:recent_by_pid:' . $status->profile_id);
-			Cache::forget('admin-dash:reports:spam-count');
-		} else if ($action == 'cw') {
-			$state = $status->is_nsfw;
-			$status->is_nsfw = !$state;
-			$status->save();
-			StatusService::del($status->id);
-		} else if ($action == 'mark-public') {
-			$state = $status->scope;
-			$status->scope = 'public';
-			$status->visibility = 'public';
-			$status->save();
-			StatusService::del($status->id, true);
-			if($state !== 'public') {
-				if($status->uri) {
-					if($status->in_reply_to_id == null && $status->reblog_of_id == null) {
-						NetworkTimelineService::add($status->id);
-					}
-				} else {
-					if($status->in_reply_to_id == null && $status->reblog_of_id == null) {
-						PublicTimelineService::add($status->id);
-					}
-				}
-			}
-		} else if ($action == 'mark-unlisted') {
-			$state = $status->scope;
-			$status->scope = 'unlisted';
-			$status->visibility = 'unlisted';
-			$status->save();
-			StatusService::del($status->id);
-			if($state == 'public') {
-				PublicTimelineService::del($status->id);
-				NetworkTimelineService::del($status->id);
-			}
-		} else if ($action == 'mark-private') {
-			$state = $status->scope;
-			$status->scope = 'private';
-			$status->visibility = 'private';
-			$status->save();
-			StatusService::del($status->id);
-			if($state == 'public') {
-				PublicTimelineService::del($status->id);
-				NetworkTimelineService::del($status->id);
-			}
-		} else if ($action == 'delete') {
-			PublicTimelineService::del($status->id);
-			NetworkTimelineService::del($status->id);
-			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);
-			return [];
-		}
-
-		Cache::forget('_api:statuses:recent_9:'.$status->profile_id);
-
-		return StatusService::get($status->id, false);
-	}
-
-	public function getWebSettings(Request $request)
-	{
-		abort_if(!$request->user(), 403);
-        $uid = $request->user()->id;
-        $settings = UserSetting::firstOrCreate([
-            'user_id' => $uid
+    protected $fractal;
+
+    public function __construct()
+    {
+        $this->fractal = new Fractal\Manager;
+        $this->fractal->setSerializer(new ArraySerializer);
+    }
+
+    public function json($res, $code = 200, $headers = [])
+    {
+        return response()->json($res, $code, $headers, JSON_UNESCAPED_SLASHES);
+    }
+
+    public function error($msg, $code = 400, $extra = [], $headers = [])
+    {
+        $res = [
+            'msg' => $msg,
+            'code' => $code,
+        ];
+
+        return response()->json(array_merge($res, $extra), $code, $headers, JSON_UNESCAPED_SLASHES);
+    }
+
+    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->status != null, 403);
+
+        if (config('pixelfed.bouncer.cloud_ips.ban_signups')) {
+            abort_if(BouncerService::checkIp($request->ip()), 404);
+        }
+
+        $report_type = $request->input('report_type');
+        $object_id = $request->input('object_id');
+        $object_type = $request->input('object_type');
+
+        $types = [
+            'spam',
+            'sensitive',
+            'abusive',
+            'underage',
+            'violence',
+            'copyright',
+            'impersonation',
+            'scam',
+            'terrorism',
+        ];
+
+        if (! $report_type || ! $object_id || ! $object_type) {
+            return $this->error('Invalid or missing parameters', 400, ['error_code' => 'ERROR_INVALID_PARAMS']);
+        }
+
+        if (! in_array($report_type, $types)) {
+            return $this->error('Invalid report type', 400, ['error_code' => 'ERROR_TYPE_INVALID']);
+        }
+
+        if ($object_type === 'user' && $object_id == $user->profile_id) {
+            return $this->error('Cannot self report', 400, ['error_code' => 'ERROR_NO_SELF_REPORTS']);
+        }
+
+        $rpid = null;
+
+        switch ($object_type) {
+            case 'post':
+                $object = Status::find($object_id);
+                if (! $object) {
+                    return $this->error('Invalid object id', 400, ['error_code' => 'ERROR_INVALID_OBJECT_ID']);
+                }
+                $object_type = 'App\Status';
+                $exists = Report::whereUserId($user->id)
+                    ->whereObjectId($object->id)
+                    ->whereObjectType('App\Status')
+                    ->count();
+
+                $rpid = $object->profile_id;
+                break;
+
+            case 'user':
+                $object = Profile::find($object_id);
+                if (! $object) {
+                    return $this->error('Invalid object id', 400, ['error_code' => 'ERROR_INVALID_OBJECT_ID']);
+                }
+                $object_type = 'App\Profile';
+                $exists = Report::whereUserId($user->id)
+                    ->whereObjectId($object->id)
+                    ->whereObjectType('App\Profile')
+                    ->count();
+                $rpid = $object->id;
+                break;
+
+            default:
+                return $this->error('Invalid report type', 400, ['error_code' => 'ERROR_REPORT_OBJECT_TYPE_INVALID']);
+                break;
+        }
+
+        if ($exists !== 0) {
+            return $this->error('Duplicate report', 400, ['error_code' => 'ERROR_REPORT_DUPLICATE']);
+        }
+
+        if ($object->profile_id == $user->profile_id) {
+            return $this->error('Cannot self report', 400, ['error_code' => 'ERROR_NO_SELF_REPORTS']);
+        }
+
+        $report = new Report;
+        $report->profile_id = $user->profile_id;
+        $report->user_id = $user->id;
+        $report->object_id = $object->id;
+        $report->object_type = $object_type;
+        $report->reported_profile_id = $rpid;
+        $report->type = $report_type;
+        $report->save();
+
+        if (config('instance.reports.email.enabled')) {
+            ReportNotifyAdminViaEmail::dispatch($report)->onQueue('default');
+        }
+
+        $res = [
+            'msg' => 'Successfully sent report',
+            'code' => 200,
+        ];
+
+        return $this->json($res);
+    }
+
+    /**
+     * DELETE /api/v1.1/accounts/avatar
+     *
+     * @return \App\Transformer\Api\AccountTransformer
+     */
+    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->status != null, 403);
+
+        if (config('pixelfed.bouncer.cloud_ips.ban_signups')) {
+            abort_if(BouncerService::checkIp($request->ip()), 404);
+        }
+
+        $avatar = $user->profile->avatar;
+
+        if ($avatar->media_path == 'public/avatars/default.png' ||
+            $avatar->media_path == 'public/avatars/default.jpg'
+        ) {
+            return AccountService::get($user->profile_id);
+        }
+
+        if (is_file(storage_path('app/'.$avatar->media_path))) {
+            @unlink(storage_path('app/'.$avatar->media_path));
+        }
+
+        $avatar->media_path = 'public/avatars/default.jpg';
+        $avatar->change_count = $avatar->change_count + 1;
+        $avatar->save();
+
+        Cache::forget('avatar:'.$user->profile_id);
+        Cache::forget("avatar:{$user->profile_id}");
+        Cache::forget('user:account:id:'.$user->id);
+        AccountService::del($user->profile_id);
+
+        return AccountService::get($user->profile_id);
+    }
+
+    /**
+     * GET /api/v1.1/accounts/{id}/posts
+     *
+     * @return \App\Transformer\Api\StatusTransformer
+     */
+    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->status != null, 403);
+
+        if (config('pixelfed.bouncer.cloud_ips.ban_signups')) {
+            abort_if(BouncerService::checkIp($request->ip()), 404);
+        }
+
+        $account = AccountService::get($id);
+
+        if (! $account || $account['username'] !== $request->input('username')) {
+            return $this->json([]);
+        }
+
+        $posts = ProfileStatusService::get($id);
+
+        if (! $posts) {
+            return $this->json([]);
+        }
+
+        $res = collect($posts)
+            ->map(function ($id) {
+                return StatusService::get($id);
+            })
+            ->filter(function ($post) {
+                return $post && isset($post['account']);
+            })
+            ->toArray();
+
+        return $this->json($res);
+    }
+
+    /**
+     * POST /api/v1.1/accounts/change-password
+     *
+     * @return \App\Transformer\Api\AccountTransformer
+     */
+    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->status != null, 403);
+        if (config('pixelfed.bouncer.cloud_ips.ban_signups')) {
+            abort_if(BouncerService::checkIp($request->ip()), 404);
+        }
+
+        $this->validate($request, [
+            'current_password' => 'bail|required|current_password',
+            'new_password' => 'required|min:'.config('pixelfed.min_password_length', 8),
+            'confirm_password' => 'required|same:new_password',
+        ], [
+            'current_password' => 'The password you entered is incorrect',
         ]);
-        if(!$settings->other) {
+
+        $user->password = bcrypt($request->input('new_password'));
+        $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();
+
+        Mail::to($request->user())->send(new PasswordChange($user));
+
+        return $this->json(AccountService::get($user->profile_id));
+    }
+
+    /**
+     * GET /api/v1.1/accounts/login-activity
+     *
+     * @return array
+     */
+    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->status != null, 403);
+        if (config('pixelfed.bouncer.cloud_ips.ban_signups')) {
+            abort_if(BouncerService::checkIp($request->ip()), 404);
+        }
+        $agent = new Agent;
+        $currentIp = $request->ip();
+
+        $activity = AccountLog::whereUserId($user->id)
+            ->whereAction('auth.login')
+            ->orderBy('created_at', 'desc')
+            ->groupBy('ip_address')
+            ->limit(10)
+            ->get()
+            ->map(function ($item) use ($agent, $currentIp) {
+                $agent->setUserAgent($item->user_agent);
+
+                return [
+                    'id' => $item->id,
+                    'action' => $item->action,
+                    'ip' => $item->ip_address,
+                    'ip_current' => $item->ip_address === $currentIp,
+                    'is_mobile' => $agent->isMobile(),
+                    'device' => $agent->device(),
+                    'browser' => $agent->browser(),
+                    'platform' => $agent->platform(),
+                    'created_at' => $item->created_at->format('c'),
+                ];
+            });
+
+        return $this->json($activity);
+    }
+
+    /**
+     * GET /api/v1.1/accounts/two-factor
+     *
+     * @return array
+     */
+    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->status != null, 403);
+
+        if (config('pixelfed.bouncer.cloud_ips.ban_signups')) {
+            abort_if(BouncerService::checkIp($request->ip()), 404);
+        }
+
+        $res = [
+            'active' => (bool) $user->{'2fa_enabled'},
+            'setup_at' => $user->{'2fa_setup_at'},
+        ];
+
+        return $this->json($res);
+    }
+
+    /**
+     * GET /api/v1.1/accounts/emails-from-pixelfed
+     *
+     * @return array
+     */
+    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->status != null, 403);
+        if (config('pixelfed.bouncer.cloud_ips.ban_signups')) {
+            abort_if(BouncerService::checkIp($request->ip()), 404);
+        }
+        $from = config('mail.from.address');
+
+        $emailVerifications = EmailVerification::whereUserId($user->id)
+            ->orderByDesc('id')
+            ->where('created_at', '>', now()->subDays(14))
+            ->limit(10)
+            ->get()
+            ->map(function ($mail) use ($user, $from) {
+                return [
+                    'type' => 'Email Verification',
+                    'subject' => 'Confirm Email',
+                    'to_address' => $user->email,
+                    'from_address' => $from,
+                    'created_at' => str_replace('@', 'at', $mail->created_at->format('M j, Y @ g:i:s A')),
+                ];
+            })
+            ->toArray();
+
+        $passwordResets = DB::table('password_resets')
+            ->whereEmail($user->email)
+            ->where('created_at', '>', now()->subDays(14))
+            ->orderByDesc('created_at')
+            ->limit(10)
+            ->get()
+            ->map(function ($mail) use ($user, $from) {
+                return [
+                    'type' => 'Password Reset',
+                    'subject' => 'Reset Password Notification',
+                    'to_address' => $user->email,
+                    'from_address' => $from,
+                    'created_at' => str_replace('@', 'at', now()->parse($mail->created_at)->format('M j, Y @ g:i:s A')),
+                ];
+            })
+            ->toArray();
+
+        $passwordChanges = AccountLog::whereUserId($user->id)
+            ->whereAction('account.edit.password')
+            ->where('created_at', '>', now()->subDays(14))
+            ->orderByDesc('created_at')
+            ->limit(10)
+            ->get()
+            ->map(function ($mail) use ($user, $from) {
+                return [
+                    'type' => 'Password Change',
+                    'subject' => 'Password Change',
+                    'to_address' => $user->email,
+                    'from_address' => $from,
+                    'created_at' => str_replace('@', 'at', now()->parse($mail->created_at)->format('M j, Y @ g:i:s A')),
+                ];
+            })
+            ->toArray();
+
+        $res = collect([])
+            ->merge($emailVerifications)
+            ->merge($passwordResets)
+            ->merge($passwordChanges)
+            ->sortByDesc('created_at')
+            ->values();
+
+        return $this->json($res);
+    }
+
+    /**
+     * GET /api/v1.1/accounts/apps-and-applications
+     *
+     * @return array
+     */
+    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->status != null, 403);
+
+        if (config('pixelfed.bouncer.cloud_ips.ban_signups')) {
+            abort_if(BouncerService::checkIp($request->ip()), 404);
+        }
+
+        $res = $user->tokens->sortByDesc('created_at')->take(10)->map(function ($token, $key) use ($request) {
+            return [
+                'id' => $token->id,
+                'current_session' => $request->user()->token()->id == $token->id,
+                'name' => $token->client->name,
+                'scopes' => $token->scopes,
+                'revoked' => $token->revoked,
+                'created_at' => str_replace('@', 'at', now()->parse($token->created_at)->format('M j, Y @ g:i:s A')),
+                'expires_at' => str_replace('@', 'at', now()->parse($token->expires_at)->format('M j, Y @ g:i:s A')),
+            ];
+        });
+
+        return $this->json($res);
+    }
+
+    public function inAppRegistrationPreFlightCheck(Request $request)
+    {
+        return [
+            'open' => (bool) config_cache('pixelfed.open_registration'),
+            'iara' => (bool) config_cache('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($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));
+        abort_if(! $rl, 400, 'Too many requests');
+
+        $this->validate($request, [
+            'email' => [
+                'required',
+                'string',
+                'email',
+                'max:255',
+                'unique:users',
+                function ($attribute, $value, $fail) {
+                    $banned = EmailService::isBanned($value);
+                    if ($banned) {
+                        return $fail('Email is invalid.');
+                    }
+                },
+            ],
+            'username' => [
+                'required',
+                'min:2',
+                'max:15',
+                '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.');
+                    }
+                },
+            ],
+            'password' => 'required|string|min:8',
+        ]);
+
+        $email = $request->input('email');
+        $username = $request->input('username');
+        $password = $request->input('password');
+
+        if (config('database.default') == 'pgsql') {
+            $username = strtolower($username);
+            $email = strtolower($email);
+        }
+
+        $user = new User;
+        $user->name = $username;
+        $user->username = $username;
+        $user->email = $email;
+        $user->password = Hash::make($password);
+        $user->register_source = 'app';
+        $user->app_register_ip = $request->ip();
+        $user->app_register_token = Str::random(40);
+        $user->save();
+
+        $rtoken = Str::random(64);
+
+        $verify = new EmailVerification;
+        $verify->user_id = $user->id;
+        $verify->email = $user->email;
+        $verify->user_token = $user->app_register_token;
+        $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);
+
+        Mail::to($user->email)->send(new ConfirmAppEmail($verify, $appUrl));
+
+        return response()->json([
+            'success' => true,
+        ]);
+    }
+
+    public function inAppRegistrationEmailRedirect(Request $request)
+    {
+        $this->validate($request, [
+            'ut' => 'required',
+            'rt' => 'required',
+            'ea' => 'required',
+        ]);
+        $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;
+
+        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($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');
+
+        $request->validate([
+            'user_token' => 'required',
+            'random_token' => 'required',
+            'email' => 'required',
+        ]);
+
+        $verify = EmailVerification::whereEmail($request->input('email'))
+            ->whereUserToken($request->input('user_token'))
+            ->whereRandomToken($request->input('random_token'))
+            ->first();
+
+        if (! $verify) {
+            return response()->json(['error' => 'Invalid tokens'], 403);
+        }
+
+        if ($verify->created_at->lt(now()->subHours(24))) {
+            $verify->delete();
+
+            return response()->json(['error' => 'Invalid tokens'], 403);
+        }
+
+        $user = User::findOrFail($verify->user_id);
+        $user->email_verified_at = now();
+        $user->last_active_at = now();
+        $user->save();
+
+        $token = $user->createToken('Pixelfed', ['read', 'write', 'follow', 'admin:read', 'admin:write', 'push']);
+
+        return response()->json([
+            'access_token' => $token->accessToken,
+        ]);
+    }
+
+    public function archive(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('write'), 403);
+
+        if (config('pixelfed.bouncer.cloud_ips.ban_signups')) {
+            abort_if(BouncerService::checkIp($request->ip()), 404);
+        }
+
+        $status = Status::whereNull('in_reply_to_id')
+            ->whereNull('reblog_of_id')
+            ->whereProfileId($request->user()->profile_id)
+            ->findOrFail($id);
+
+        if ($status->scope === 'archived') {
+            return [200];
+        }
+
+        $archive = new StatusArchived;
+        $archive->status_id = $status->id;
+        $archive->profile_id = $status->profile_id;
+        $archive->original_scope = $status->scope;
+        $archive->save();
+
+        $status->scope = 'archived';
+        $status->visibility = 'draft';
+        $status->save();
+        StatusService::del($status->id, true);
+        AccountService::syncPostCount($status->profile_id);
+
+        return [200];
+    }
+
+    public function unarchive(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('write'), 403);
+
+        if (config('pixelfed.bouncer.cloud_ips.ban_signups')) {
+            abort_if(BouncerService::checkIp($request->ip()), 404);
+        }
+
+        $status = Status::whereNull('in_reply_to_id')
+            ->whereNull('reblog_of_id')
+            ->whereProfileId($request->user()->profile_id)
+            ->findOrFail($id);
+
+        if ($status->scope !== 'archived') {
+            return [200];
+        }
+
+        $archive = StatusArchived::whereStatusId($status->id)
+            ->whereProfileId($status->profile_id)
+            ->firstOrFail();
+
+        $status->scope = $archive->original_scope;
+        $status->visibility = $archive->original_scope;
+        $status->save();
+        $archive->delete();
+        StatusService::del($status->id, true);
+        AccountService::syncPostCount($status->profile_id);
+
+        return [200];
+    }
+
+    public function archivedPosts(Request $request)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
+
+        if (config('pixelfed.bouncer.cloud_ips.ban_signups')) {
+            abort_if(BouncerService::checkIp($request->ip()), 404);
+        }
+
+        $statuses = Status::whereProfileId($request->user()->profile_id)
+            ->whereScope('archived')
+            ->orderByDesc('id')
+            ->cursorPaginate(10);
+
+        return StatusStateless::collection($statuses);
+    }
+
+    public function placesById(Request $request, $id, $slug)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
+
+        if (config('pixelfed.bouncer.cloud_ips.ban_signups')) {
+            abort_if(BouncerService::checkIp($request->ip()), 404);
+        }
+
+        $place = Place::whereSlug($slug)->findOrFail($id);
+
+        $posts = Cache::remember('pf-api:v1.1:places-by-id:'.$place->id, 3600, function () use ($place) {
+            return Status::wherePlaceId($place->id)
+                ->whereNull('uri')
+                ->whereScope('public')
+                ->orderByDesc('created_at')
+                ->limit(60)
+                ->pluck('id');
+        });
+
+        $posts = $posts->map(function ($id) {
+            return StatusService::get($id);
+        })
+            ->filter()
+            ->values();
+
+        return [
+            'place' => [
+                'id' => $place->id,
+                'name' => $place->name,
+                'slug' => $place->slug,
+                'country' => $place->country,
+                'lat' => $place->lat,
+                'long' => $place->long,
+            ],
+            'posts' => $posts];
+    }
+
+    public function moderatePost(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 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);
+        }
+
+        $this->validate($request, [
+            'action' => 'required|in:cw,mark-public,mark-unlisted,mark-private,mark-spammer,delete',
+        ]);
+
+        $action = $request->input('action');
+        $status = Status::find($id);
+
+        if (! $status) {
+            return response()->json(['error' => 'Cannot find status'], 400);
+        }
+
+        if ($status->uri == null) {
+            if ($status->profile->user && $status->profile->user->is_admin) {
+                return response()->json(['error' => 'Cannot moderate admin accounts'], 400);
+            }
+        }
+
+        if ($action == 'mark-spammer') {
+            $status->profile->update([
+                'unlisted' => true,
+                'cw' => true,
+                'no_autolink' => true,
+            ]);
+
+            Status::whereProfileId($status->profile_id)
+                ->get()
+                ->each(function ($s) {
+                    if (in_array($s->scope, ['public', 'unlisted'])) {
+                        $s->scope = 'private';
+                        $s->visibility = 'private';
+                    }
+                    $s->is_nsfw = true;
+                    $s->save();
+                    StatusService::del($s->id, true);
+                });
+
+            Cache::forget('pf:bouncer_v0:exemption_by_pid:'.$status->profile_id);
+            Cache::forget('pf:bouncer_v0:recent_by_pid:'.$status->profile_id);
+            Cache::forget('admin-dash:reports:spam-count');
+        } elseif ($action == 'cw') {
+            $state = $status->is_nsfw;
+            $status->is_nsfw = ! $state;
+            $status->save();
+            StatusService::del($status->id);
+        } elseif ($action == 'mark-public') {
+            $state = $status->scope;
+            $status->scope = 'public';
+            $status->visibility = 'public';
+            $status->save();
+            StatusService::del($status->id, true);
+            if ($state !== 'public') {
+                if ($status->uri) {
+                    if ($status->in_reply_to_id == null && $status->reblog_of_id == null) {
+                        NetworkTimelineService::add($status->id);
+                    }
+                } else {
+                    if ($status->in_reply_to_id == null && $status->reblog_of_id == null) {
+                        PublicTimelineService::add($status->id);
+                    }
+                }
+            }
+        } elseif ($action == 'mark-unlisted') {
+            $state = $status->scope;
+            $status->scope = 'unlisted';
+            $status->visibility = 'unlisted';
+            $status->save();
+            StatusService::del($status->id);
+            if ($state == 'public') {
+                PublicTimelineService::del($status->id);
+                NetworkTimelineService::del($status->id);
+            }
+        } elseif ($action == 'mark-private') {
+            $state = $status->scope;
+            $status->scope = 'private';
+            $status->visibility = 'private';
+            $status->save();
+            StatusService::del($status->id);
+            if ($state == 'public') {
+                PublicTimelineService::del($status->id);
+                NetworkTimelineService::del($status->id);
+            }
+        } elseif ($action == 'delete') {
+            PublicTimelineService::del($status->id);
+            NetworkTimelineService::del($status->id);
+            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);
+
             return [];
         }
-		return $settings->other;
-	}
+
+        Cache::forget('_api:statuses:recent_9:'.$status->profile_id);
+
+        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(), 403);
+        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'
+            'value' => 'required',
         ]);
         $field = $request->input('field');
         $value = $request->input('value');
         $settings = UserSetting::firstOrCreate([
-            'user_id' => $request->user()->id
+            'user_id' => $request->user()->id,
         ]);
-        if(!$settings->other) {
+        if (! $settings->other) {
             $other = [];
         } else {
             $other = $settings->other;
@@ -897,4 +935,439 @@ class ApiV1Dot1Controller extends Controller
 
         return [200];
     }
+
+    public function getMutualAccounts(Request $request, $id)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('follow'), 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);
+    }
+
+    public function accountUsernameToId(Request $request, $username)
+    {
+        abort_if(! $request->user() || ! $request->user()->token() || ! $username, 403);
+        abort_unless($request->user()->tokenCan('read'), 403);
+        $username = trim($username);
+        $rateLimiting = (bool) config_cache('api.rate-limits.v1Dot1.accounts.usernameToId.enabled');
+        $ipRateLimiting = (bool) config_cache('api.rate-limits.v1Dot1.accounts.usernameToId.ip_enabled');
+        if ($ipRateLimiting) {
+            $userLimit = (int) config_cache('api.rate-limits.v1Dot1.accounts.usernameToId.ip_limit');
+            $userDecay = (int) config_cache('api.rate-limits.v1Dot1.accounts.usernameToId.ip_decay');
+            $userKey = 'pf:apiv1.1:acctU2ID:byIp:'.$request->ip();
+
+            if (RateLimiter::tooManyAttempts($userKey, $userLimit)) {
+                $limits = [
+                    'X-Rate-Limit-Limit' => $userLimit,
+                    'X-Rate-Limit-Remaining' => RateLimiter::remaining($userKey, $userLimit),
+                    'X-Rate-Limit-Reset' => RateLimiter::availableIn($userKey),
+                ];
+
+                return $this->json(['error' => 'Too many attempts!'], 429, $limits);
+            }
+
+            RateLimiter::increment($userKey, $userDecay);
+            $limits = [
+                'X-Rate-Limit-Limit' => $userLimit,
+                'X-Rate-Limit-Remaining' => RateLimiter::remaining($userKey, $userLimit),
+                'X-Rate-Limit-Reset' => RateLimiter::availableIn($userKey),
+            ];
+        }
+        if ($rateLimiting) {
+            $userLimit = (int) config_cache('api.rate-limits.v1Dot1.accounts.usernameToId.limit');
+            $userDecay = (int) config_cache('api.rate-limits.v1Dot1.accounts.usernameToId.decay');
+            $userKey = 'pf:apiv1.1:acctU2ID:byUid:'.$request->user()->id;
+
+            if (RateLimiter::tooManyAttempts($userKey, $userLimit)) {
+                $limits = [
+                    'X-Rate-Limit-Limit' => $userLimit,
+                    'X-Rate-Limit-Remaining' => RateLimiter::remaining($userKey, $userLimit),
+                    'X-Rate-Limit-Reset' => RateLimiter::availableIn($userKey),
+                ];
+
+                return $this->json(['error' => 'Too many attempts!'], 429, $limits);
+            }
+
+            RateLimiter::increment($userKey, $userDecay);
+            $limits = [
+                'X-Rate-Limit-Limit' => $userLimit,
+                'X-Rate-Limit-Remaining' => RateLimiter::remaining($userKey, $userLimit),
+                'X-Rate-Limit-Reset' => RateLimiter::availableIn($userKey),
+            ];
+        }
+        if (str_ends_with($username, config_cache('pixelfed.domain.app'))) {
+            $pre = str_starts_with($username, '@') ? substr($username, 1) : $username;
+            $parts = explode('@', $pre);
+            $username = $parts[0];
+        }
+        $accountId = AccountService::usernameToId($username, true);
+        if (! $accountId) {
+            return [];
+        }
+        $account = AccountService::get($accountId);
+
+        return $this->json($account, 200, $rateLimiting ? $limits : []);
+    }
+
+    public function getPushState(Request $request)
+    {
+        abort_unless($request->hasHeader('X-PIXELFED-APP'), 404, 'Not found');
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('push'), 403);
+        abort_unless(NotificationAppGatewayService::enabled(), 404, 'Push notifications are not supported on this server.');
+        $user = $request->user();
+        abort_if($user->status, 422, 'Cannot access this resource at this time');
+        $res = [
+            'version' => PushNotificationService::PUSH_GATEWAY_VERSION,
+            'username' => (string) $user->username,
+            'profile_id' => (string) $user->profile_id,
+            'notify_enabled' => (bool) $user->notify_enabled,
+            'has_token' => (bool) $user->expo_token,
+            'notify_like' => (bool) $user->notify_like,
+            'notify_follow' => (bool) $user->notify_follow,
+            'notify_mention' => (bool) $user->notify_mention,
+            'notify_comment' => (bool) $user->notify_comment,
+        ];
+
+        return $this->json($res);
+    }
+
+    public function disablePush(Request $request)
+    {
+        abort_unless($request->hasHeader('X-PIXELFED-APP'), 404, 'Not found');
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('push'), 403);
+        abort_unless(NotificationAppGatewayService::enabled(), 404, 'Push notifications are not supported on this server.');
+        abort_if($request->user()->status, 422, 'Cannot access this resource at this time');
+
+        $request->user()->update([
+            'notify_enabled' => false,
+            'expo_token' => null,
+            'notify_like' => false,
+            'notify_follow' => false,
+            'notify_mention' => false,
+            'notify_comment' => false,
+        ]);
+
+        PushNotificationService::removeMemberFromAll($request->user()->profile_id);
+
+        $user = $request->user();
+
+        return $this->json([
+            'version' => PushNotificationService::PUSH_GATEWAY_VERSION,
+            'username' => (string) $user->username,
+            'profile_id' => (string) $user->profile_id,
+            'notify_enabled' => (bool) $user->notify_enabled,
+            'has_token' => (bool) $user->expo_token,
+            'notify_like' => (bool) $user->notify_like,
+            'notify_follow' => (bool) $user->notify_follow,
+            'notify_mention' => (bool) $user->notify_mention,
+            'notify_comment' => (bool) $user->notify_comment,
+        ]);
+    }
+
+    public function comparePush(Request $request)
+    {
+        abort_unless($request->hasHeader('X-PIXELFED-APP'), 404, 'Not found');
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('push'), 403);
+        abort_unless(NotificationAppGatewayService::enabled(), 404, 'Push notifications are not supported on this server.');
+        abort_if($request->user()->status, 422, 'Cannot access this resource at this time');
+
+        $this->validate($request, [
+            'expo_token' => ['required', 'string', new ExpoPushTokenRule],
+        ]);
+
+        $user = $request->user();
+
+        if (empty($user->expo_token)) {
+            return $this->json([
+                'version' => PushNotificationService::PUSH_GATEWAY_VERSION,
+                'username' => (string) $user->username,
+                'profile_id' => (string) $user->profile_id,
+                'notify_enabled' => (bool) $user->notify_enabled,
+                'match' => false,
+                'has_existing' => false,
+            ]);
+        }
+
+        $token = $request->input('expo_token');
+        $knownToken = $user->expo_token;
+        $match = hash_equals($knownToken, $token);
+
+        return $this->json([
+            'version' => PushNotificationService::PUSH_GATEWAY_VERSION,
+            'username' => (string) $user->username,
+            'profile_id' => (string) $user->profile_id,
+            'notify_enabled' => (bool) $user->notify_enabled,
+            'match' => $match,
+            'has_existing' => true,
+        ]);
+    }
+
+    public function updatePush(Request $request)
+    {
+        abort_unless($request->hasHeader('X-PIXELFED-APP'), 404, 'Not found');
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('push'), 403);
+        abort_unless(NotificationAppGatewayService::enabled(), 404, 'Push notifications are not supported on this server.');
+        abort_if($request->user()->status, 422, 'Cannot access this resource at this time');
+
+        $this->validate($request, [
+            'notify_enabled' => 'required',
+            'token' => ['required', 'string', new ExpoPushTokenRule],
+            'notify_like' => 'sometimes',
+            'notify_follow' => 'sometimes',
+            'notify_mention' => 'sometimes',
+            'notify_comment' => 'sometimes',
+        ]);
+
+        $pid = $request->user()->profile_id;
+        abort_if(! $pid, 422, 'An error occured');
+        $expoToken = $request->input('token');
+
+        $existing = User::where('profile_id', '!=', $pid)->whereExpoToken($expoToken)->count();
+        abort_if($existing && $existing > 5, 400, 'Push token is already used by another account');
+
+        $request->user()->update([
+            'notify_enabled' => $request->boolean('notify_enabled'),
+            'expo_token' => $expoToken,
+        ]);
+
+        if ($request->filled('notify_like')) {
+            $request->user()->update(['notify_like' => (bool) $request->boolean('notify_like')]);
+            $request->boolean('notify_like') == true ?
+                PushNotificationService::set('like', $pid) :
+                PushNotificationService::removeMember('like', $pid);
+        }
+        if ($request->filled('notify_follow')) {
+            $request->user()->update(['notify_follow' => (bool) $request->boolean('notify_follow')]);
+            $request->boolean('notify_follow') == true ?
+                PushNotificationService::set('follow', $pid) :
+                PushNotificationService::removeMember('follow', $pid);
+        }
+        if ($request->filled('notify_mention')) {
+            $request->user()->update(['notify_mention' => (bool) $request->boolean('notify_mention')]);
+            $request->boolean('notify_mention') == true ?
+                PushNotificationService::set('mention', $pid) :
+                PushNotificationService::removeMember('mention', $pid);
+        }
+        if ($request->filled('notify_comment')) {
+            $request->user()->update(['notify_comment' => (bool) $request->boolean('notify_comment')]);
+            $request->boolean('notify_comment') == true ?
+                PushNotificationService::set('comment', $pid) :
+                PushNotificationService::removeMember('comment', $pid);
+        }
+
+        if ($request->boolean('notify_enabled') == false) {
+            PushNotificationService::removeMemberFromAll($request->user()->profile_id);
+        }
+
+        $user = $request->user();
+
+        $res = [
+            'version' => PushNotificationService::PUSH_GATEWAY_VERSION,
+            'notify_enabled' => (bool) $user->notify_enabled,
+            'has_token' => (bool) $user->expo_token,
+            'notify_like' => (bool) $user->notify_like,
+            'notify_follow' => (bool) $user->notify_follow,
+            'notify_mention' => (bool) $user->notify_mention,
+            'notify_comment' => (bool) $user->notify_comment,
+        ];
+
+        return $this->json($res);
+    }
+
+    /**
+     * POST /api/v1.1/status/create
+     *
+     *
+     * @return StatusTransformer
+     */
+    public function statusCreate(Request $request)
+    {
+        abort_if(! $request->user() || ! $request->user()->token(), 403);
+        abort_unless($request->user()->tokenCan('write'), 403);
+
+        $this->validate($request, [
+            'status' => 'nullable|string|max:'.(int) config_cache('pixelfed.max_caption_length'),
+            'file' => [
+                'required',
+                'file',
+                'mimetypes:'.config_cache('pixelfed.media_types'),
+                'max:'.config_cache('pixelfed.max_photo_size'),
+                function ($attribute, $value, $fail) {
+                    if (is_array($value) && count($value) > 1) {
+                        $fail('Only one file can be uploaded at a time.');
+                    }
+                },
+            ],
+            'sensitive' => 'nullable',
+            'visibility' => 'string|in:private,unlisted,public',
+            'spoiler_text' => 'sometimes|max:140',
+        ]);
+
+        if ($request->hasHeader('idempotency-key')) {
+            $key = 'pf:api:v1:status:idempotency-key:'.$request->user()->id.':'.hash('sha1', $request->header('idempotency-key'));
+            $exists = Cache::has($key);
+            abort_if($exists, 400, 'Duplicate idempotency key.');
+            Cache::put($key, 1, 3600);
+        }
+
+        if (config('costar.enabled') == true) {
+            $blockedKeywords = config('costar.keyword.block');
+            if ($blockedKeywords !== null && $request->status) {
+                $keywords = config('costar.keyword.block');
+                foreach ($keywords as $kw) {
+                    if (Str::contains($request->status, $kw) == true) {
+                        abort(400, 'Invalid object. Contains banned keyword.');
+                    }
+                }
+            }
+        }
+        $user = $request->user();
+
+        if ($user->has_roles) {
+            abort_if(! UserRoleService::can('can-post', $user->id), 403, 'Invalid permissions for this action');
+        }
+
+        $profile = $user->profile;
+
+        $limitKey = 'compose:rate-limit:media-upload:'.$user->id;
+        $photo = $request->file('file');
+        $fileSize = $photo->getSize();
+        $sizeInKbs = (int) ceil($fileSize / 1000);
+        $accountSize = UserStorageService::get($user->id);
+        abort_if($accountSize === -1, 403, 'Invalid request.');
+        $updatedAccountSize = (int) $accountSize + (int) $sizeInKbs;
+
+        if ((bool) config_cache('pixelfed.enforce_account_limit') == true) {
+            $limit = (int) config_cache('pixelfed.max_account_size');
+            if ($updatedAccountSize >= $limit) {
+                abort(403, 'Account size limit reached.');
+            }
+        }
+
+        $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();
+
+        $settings = UserSetting::whereUserId($user->id)->first();
+
+        if ($settings && ! empty($settings->compose_settings)) {
+            $compose = $settings->compose_settings;
+
+            if (isset($compose['default_license']) && $compose['default_license'] != 1) {
+                $license = $compose['default_license'];
+            }
+        }
+
+        abort_if(MediaBlocklistService::exists($hash) == true, 451);
+
+        $visibility = $profile->is_private ? 'private' : (
+            $profile->unlisted == true &&
+            $request->input('visibility', 'public') == 'public' ?
+            'unlisted' :
+            $request->input('visibility', 'public'));
+
+        if ($user->last_active_at == null) {
+            return [];
+        }
+        $defaultCaption = config_cache('database.default') === 'mysql' ? null : "";
+        $content = $request->filled('status') ? strip_tags(Purify::clean($request->input('status'))) : $defaultCaption;
+        $cw = $user->profile->cw == true ? true : $request->boolean('sensitive', false);
+        $spoilerText = $cw && $request->filled('spoiler_text') ? $request->input('spoiler_text') : null;
+
+        $status = new Status;
+        $status->caption = $content;
+        $status->rendered = $defaultCaption;
+        $status->profile_id = $user->profile_id;
+        $status->is_nsfw = $cw;
+        $status->cw_summary = $spoilerText;
+        $status->scope = $visibility;
+        $status->visibility = $visibility;
+        $status->type = StatusController::mimeTypeCheck([$mime]);
+        $status->save();
+
+        if (! $status) {
+            abort(500, 'An error occured.');
+        }
+
+        $media = new Media;
+        $media->status_id = $status->id;
+        $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->order = 1;
+        $media->caption = $request->input('description');
+        if ($license) {
+            $media->license = $license;
+        }
+        $media->save();
+
+        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;
+        }
+
+        $user->storage_used = (int) $updatedAccountSize;
+        $user->storage_used_updated_at = now();
+        $user->save();
+
+        NewStatusPipeline::dispatch($status);
+
+        Cache::forget('user:account:id:'.$user->id);
+        Cache::forget('_api:statuses:recent_9:'.$user->profile_id);
+        Cache::forget('profile:status_count:'.$user->profile_id);
+        Cache::forget($user->storageUsedKey());
+        Cache::forget('profile:embed:'.$status->profile_id);
+        Cache::forget($limitKey);
+
+        $res = StatusService::getMastodon($status->id, false);
+        $res['favourited'] = false;
+        $res['language'] = 'en';
+        $res['bookmarked'] = false;
+        $res['card'] = null;
+
+        return $this->json($res);
+    }
+
+    public function nagState(Request $request)
+    {
+        abort_unless((bool) config_cache('pixelfed.oauth_enabled'), 404);
+
+        return [
+            'active' => NotificationAppGatewayService::enabled(),
+        ];
+    }
 }
diff --git a/app/Http/Controllers/Api/ApiV2Controller.php b/app/Http/Controllers/Api/ApiV2Controller.php
index 2ca5b96c5..ee193e8af 100644
--- a/app/Http/Controllers/Api/ApiV2Controller.php
+++ b/app/Http/Controllers/Api/ApiV2Controller.php
@@ -2,319 +2,337 @@
 
 namespace App\Http\Controllers\Api;
 
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use App\Jobs\ImageOptimizePipeline\ImageOptimize;
+use App\Jobs\MediaPipeline\MediaDeletePipeline;
+use App\Jobs\VideoPipeline\VideoThumbnail;
 use App\Media;
-use App\UserSetting;
-use App\User;
-use Illuminate\Support\Facades\Cache;
 use App\Services\AccountService;
-use App\Services\BouncerService;
 use App\Services\InstanceService;
 use App\Services\MediaBlocklistService;
 use App\Services\MediaPathService;
 use App\Services\SearchApiV2Service;
+use App\Services\UserRoleService;
+use App\Services\UserStorageService;
+use App\Transformer\Api\Mastodon\v1\MediaTransformer;
+use App\User;
+use App\UserSetting;
 use App\Util\Media\Filter;
-use App\Jobs\MediaPipeline\MediaDeletePipeline;
-use App\Jobs\VideoPipeline\{
-	VideoOptimize,
-	VideoPostProcess,
-	VideoThumbnail
-};
-use App\Jobs\ImageOptimizePipeline\ImageOptimize;
+use App\Util\Site\Nodeinfo;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Storage;
 use League\Fractal;
 use League\Fractal\Serializer\ArraySerializer;
-use League\Fractal\Pagination\IlluminatePaginatorAdapter;
-use App\Transformer\Api\Mastodon\v1\{
-	AccountTransformer,
-	MediaTransformer,
-	NotificationTransformer,
-	StatusTransformer,
-};
-use App\Transformer\Api\{
-	RelationshipTransformer,
-};
-use App\Util\Site\Nodeinfo;
 
 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();
 
-		$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() : [];
-		});
+            return $admin && isset($admin->profile_id) ?
+                AccountService::getMastodon($admin->profile_id, true) :
+                null;
+        });
 
-		$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) 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' => '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
-		];
+        $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 response()->json($res, 200, [], JSON_UNESCAPED_SLASHES);
+                        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['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);
     }
 
-	/**
-	 * GET /api/v2/search
-	 *
-	 *
-	 * @return array
-	 */
-	public function search(Request $request)
-	{
-		abort_if(!$request->user(), 403);
+    /**
+     * 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);
 
-		$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',
+        ]);
 
-		$mastodonMode = !$request->has('_pe');
-		return $this->json(SearchApiV2Service::query($request, $mastodonMode));
-	}
+        if ($request->user()->has_roles && ! UserRoleService::can('can-view-discover', $request->user()->id)) {
+            return [
+                'accounts' => [],
+                'hashtags' => [],
+                'statuses' => [],
+            ];
+        }
 
-	/**
-	 * 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')
-		] : [];
-	}
+        $mastodonMode = ! $request->has('_pe');
 
-	/**
-	 * POST /api/v2/media
-	 *
-	 *
-	 * @return MediaTransformer
-	 */
-	public function mediaUploadV2(Request $request)
-	{
-		abort_if(!$request->user(), 403);
+        return $this->json(SearchApiV2Service::query($request, $mastodonMode));
+    }
 
-		$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'
-		]);
+    /**
+     * 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'),
+        ] : [];
+    }
 
-		$user = $request->user();
+    /**
+     * 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);
 
-		if($user->last_active_at == null) {
-			return [];
-		}
+        $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',
+        ]);
 
-		if(empty($request->file('file'))) {
-			return response('', 422);
-		}
+        $user = $request->user();
 
-		$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();
+        if ($user->last_active_at == null) {
+            return [];
+        }
 
-			return $dailyLimit >= 1250;
-		});
-		abort_if($limitReached == true, 429);
+        if (empty($request->file('file'))) {
+            return response('', 422);
+        }
 
-		$profile = $user->profile;
+        $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();
 
-		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.');
-			}
-		}
+            return $dailyLimit >= 1250;
+        });
+        abort_if($limitReached == true, 429);
 
-		$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;
+        $profile = $user->profile;
 
-		$photo = $request->file('file');
+        $accountSize = UserStorageService::get($user->id);
+        abort_if($accountSize === -1, 403, 'Invalid request.');
+        $photo = $request->file('file');
+        $fileSize = $photo->getSize();
+        $sizeInKbs = (int) ceil($fileSize / 1000);
+        $updatedAccountSize = (int) $accountSize + (int) $sizeInKbs;
 
-		$mimes = explode(',', config_cache('pixelfed.media_types'));
-		if(in_array($photo->getMimeType(), $mimes) == false) {
-			abort(403, 'Invalid or unsupported mime type.');
-		}
+        if ((bool) config_cache('pixelfed.enforce_account_limit') == true) {
+            $limit = (int) config_cache('pixelfed.max_account_size');
+            if ($updatedAccountSize >= $limit) {
+                abort(403, 'Account size limit reached.');
+            }
+        }
 
-		$storagePath = MediaPathService::get($user, 2);
-		$path = $photo->storePublicly($storagePath);
-		$hash = \hash_file('sha256', $photo);
-		$license = null;
-		$mime = $photo->getMimeType();
+        $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;
 
-		$settings = UserSetting::whereUserId($user->id)->first();
+        $mimes = explode(',', config_cache('pixelfed.media_types'));
+        if (in_array($photo->getMimeType(), $mimes) == false) {
+            abort(403, 'Invalid or unsupported mime type.');
+        }
 
-		if($settings && !empty($settings->compose_settings)) {
-			$compose = $settings->compose_settings;
+        $storagePath = MediaPathService::get($user, 2);
+        $path = $photo->storePublicly($storagePath);
+        $hash = \hash_file('sha256', $photo);
+        $license = null;
+        $mime = $photo->getMimeType();
 
-			if(isset($compose['default_license']) && $compose['default_license'] != 1) {
-				$license = $compose['default_license'];
-			}
-		}
+        $settings = UserSetting::whereUserId($user->id)->first();
 
-		abort_if(MediaBlocklistService::exists($hash) == true, 451);
+        if ($settings && ! empty($settings->compose_settings)) {
+            $compose = $settings->compose_settings;
 
-		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 (isset($compose['default_license']) && $compose['default_license'] != 1) {
+                $license = $compose['default_license'];
+            }
+        }
 
-		$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();
+        abort_if(MediaBlocklistService::exists($hash) == true, 451);
 
-		switch ($media->mime) {
-			case 'image/jpeg':
-			case 'image/png':
-				ImageOptimize::dispatch($media)->onQueue('mmo');
-				break;
+        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));
+            }
+        }
 
-			case 'video/mp4':
-				VideoThumbnail::dispatch($media)->onQueue('mmo');
-				$preview_url = '/storage/no-preview.png';
-				$url = '/storage/no-preview.png';
-				break;
-		}
+        $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();
 
-		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);
-	}
+        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;
+        }
+
+        $user->storage_used = (int) $updatedAccountSize;
+        $user->storage_used_updated_at = now();
+        $user->save();
+
+        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);
+    }
 }
diff --git a/app/Http/Controllers/Api/BaseApiController.php b/app/Http/Controllers/Api/BaseApiController.php
index 2e1fb5678..7ac73b4d0 100644
--- a/app/Http/Controllers/Api/BaseApiController.php
+++ b/app/Http/Controllers/Api/BaseApiController.php
@@ -99,6 +99,7 @@ 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'),
         ]);
@@ -134,9 +135,10 @@ class BaseApiController extends Controller
 
     public function verifyCredentials(Request $request)
     {
+        abort_if(!$request->user(), 403);
+
         $user = $request->user();
-        abort_if(!$user, 403);
-        if($user->status != null) {
+        if ($user->status != null) {
             Auth::logout();
             abort(403);
         }
@@ -147,6 +149,7 @@ 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'
diff --git a/app/Http/Controllers/Api/InstanceApiController.php b/app/Http/Controllers/Api/InstanceApiController.php
index 6edd27de3..37b597a31 100644
--- a/app/Http/Controllers/Api/InstanceApiController.php
+++ b/app/Http/Controllers/Api/InstanceApiController.php
@@ -4,8 +4,9 @@ namespace App\Http\Controllers\Api;
 
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
-use App\{Profile, Status, User};
+use App\{Profile, Instance, Status, User};
 use Cache;
+use App\Services\StatusService;
 
 class InstanceApiController extends Controller {
 
@@ -40,11 +41,8 @@ class InstanceApiController extends Controller {
 			'urls' => [],
 			'stats' => [
 				'user_count' => User::count(),
-				'status_count' => Status::whereNull('uri')->count(),
-				'domain_count' => Profile::whereNotNull('domain')
-					->groupBy('domain')
-					->pluck('domain')
-					->count()
+				'status_count' => StatusService::totalLocalStatuses(),
+				'domain_count' => Instance::count()
 			],
 			'thumbnail' => '',
 			'languages' => [],
diff --git a/app/Http/Controllers/Api/V1/Admin/DomainBlocksController.php b/app/Http/Controllers/Api/V1/Admin/DomainBlocksController.php
new file mode 100644
index 000000000..95e399720
--- /dev/null
+++ b/app/Http/Controllers/Api/V1/Admin/DomainBlocksController.php
@@ -0,0 +1,147 @@
+<?php
+
+namespace App\Http\Controllers\Api\V1\Admin;
+
+use Illuminate\Http\Request;
+use Illuminate\Validation\Rule;
+use App\Http\Controllers\Api\ApiController;
+use App\Instance;
+use App\Services\InstanceService;
+use App\Http\Resources\MastoApi\Admin\DomainBlockResource;
+
+class DomainBlocksController extends ApiController {
+
+  public function __construct() {
+    $this->middleware(['auth:api', 'api.admin', 'scope:admin:read,admin:read:domain_blocks'])->only(['index', 'show']);
+    $this->middleware(['auth:api', 'api.admin', 'scope:admin:write,admin:write:domain_blocks'])->only(['create', 'update', 'delete']);
+  }
+
+  public function index(Request $request) {
+    $this->validate($request, [
+      'limit' => 'sometimes|integer|max:100|min:1',
+    ]);
+
+    $limit = $request->input('limit', 100);
+
+    $res = Instance::moderated()
+      ->orderBy('id')
+      ->cursorPaginate($limit)
+      ->withQueryString();
+
+    return $this->json(DomainBlockResource::collection($res), [
+      'Link' => $this->linksForCollection($res)
+    ]);
+  }
+
+  public function show(Request $request, $id) {
+    $domain_block = Instance::moderated()->find($id);
+
+    if (!$domain_block) {
+      return $this->json([ 'error' => 'Record not found'], [], 404);
+    }
+
+    return $this->json(new DomainBlockResource($domain_block));
+  }
+
+  public function create(Request $request) {
+    $this->validate($request, [
+      'domain' => 'required|string|min:1|max:120',
+      'severity' => [
+        'sometimes',
+        Rule::in(['noop', 'silence', 'suspend'])
+      ],
+      'reject_media' => 'sometimes|required|boolean',
+      'reject_reports' => 'sometimes|required|boolean',
+      'private_comment' => 'sometimes|string|min:1|max:1000',
+      'public_comment' => 'sometimes|string|min:1|max:1000',
+      'obfuscate' => 'sometimes|required|boolean'
+    ]);
+
+    $domain = $request->input('domain');
+    $severity = $request->input('severity', 'silence');
+    $private_comment = $request->input('private_comment');
+
+    abort_if(!strpos($domain, '.'), 400, 'Invalid domain');
+    abort_if(!filter_var($domain, FILTER_VALIDATE_DOMAIN), 400, 'Invalid domain');
+
+    // This is because Pixelfed can't currently support wildcard domain blocks
+    // We have to find something that could plausibly be an instance
+    $parts = explode('.', $domain);
+    if ($parts[0] == '*') {
+      // If we only have two parts, e.g., "*", "example", then we want to fail:
+      abort_if(count($parts) <= 2, 400, 'Invalid domain: This API does not support wildcard domain blocks yet');
+
+      // Otherwise we convert the *.foo.example to foo.example
+      $domain = implode('.', array_slice($parts, 1));
+    }
+
+    // Double check we definitely haven't let anything through:
+    abort_if(str_contains($domain, '*'), 400, 'Invalid domain');
+
+    $existing_domain_block = Instance::moderated()->whereDomain($domain)->first();
+
+    if ($existing_domain_block) {
+      return $this->json([
+        'error' => 'A domain block already exists for this domain',
+        'existing_domain_block' => new DomainBlockResource($existing_domain_block)
+      ], [], 422);
+    }
+
+    $domain_block = Instance::updateOrCreate(
+      [ 'domain' => $domain ],
+      [ 'banned' => $severity === 'suspend', 'unlisted' => $severity === 'silence', 'notes' => [$private_comment]]
+    );
+
+    InstanceService::refresh();
+
+    return $this->json(new DomainBlockResource($domain_block));
+  }
+
+  public function update(Request $request, $id) {
+    $this->validate($request, [
+      'severity' => [
+        'sometimes',
+        Rule::in(['noop', 'silence', 'suspend'])
+      ],
+      'reject_media' => 'sometimes|required|boolean',
+      'reject_reports' => 'sometimes|required|boolean',
+      'private_comment' => 'sometimes|string|min:1|max:1000',
+      'public_comment' => 'sometimes|string|min:1|max:1000',
+      'obfuscate' => 'sometimes|required|boolean'
+    ]);
+
+    $severity = $request->input('severity', 'silence');
+    $private_comment = $request->input('private_comment');
+
+    $domain_block = Instance::moderated()->find($id);
+
+    if (!$domain_block) {
+      return $this->json([ 'error' => 'Record not found'], [], 404);
+    }
+
+    $domain_block->banned = $severity === 'suspend';
+    $domain_block->unlisted = $severity === 'silence';
+    $domain_block->notes = [$private_comment];
+    $domain_block->save();
+
+    InstanceService::refresh();
+
+    return $this->json(new DomainBlockResource($domain_block));
+  }
+
+  public function delete(Request $request, $id) {
+    $domain_block = Instance::moderated()->find($id);
+
+    if (!$domain_block) {
+      return $this->json([ 'error' => 'Record not found'], [], 404);
+    }
+
+    $domain_block->banned = false;
+    $domain_block->unlisted = false;
+    $domain_block->save();
+
+    InstanceService::refresh();
+
+    return $this->json(null, [], 200);
+  }
+}
diff --git a/app/Http/Controllers/Api/V1/DomainBlockController.php b/app/Http/Controllers/Api/V1/DomainBlockController.php
new file mode 100644
index 000000000..3b6730789
--- /dev/null
+++ b/app/Http/Controllers/Api/V1/DomainBlockController.php
@@ -0,0 +1,119 @@
+<?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([]);
+    }
+}
diff --git a/app/Http/Controllers/Api/V1/TagsController.php b/app/Http/Controllers/Api/V1/TagsController.php
new file mode 100644
index 000000000..2f7acf4a0
--- /dev/null
+++ b/app/Http/Controllers/Api/V1/TagsController.php
@@ -0,0 +1,209 @@
+<?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);
+    }
+}
diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
index 618c495e2..22562e985 100644
--- a/app/Http/Controllers/Auth/ForgotPasswordController.php
+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -62,7 +62,7 @@ class ForgotPasswordController extends Controller
 
 		usleep(random_int(100000, 3000000));
 
-    	if(config('captcha.enabled')) {
+    	if((bool) config_cache('captcha.enabled')) {
             $rules = [
 	    		'email' => 'required|email',
             	'h-captcha-response' => 'required|captcha'
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 3861d3272..86ee52c84 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -71,20 +71,21 @@ class LoginController extends Controller
             $this->username() => 'required|email',
             'password'        => 'required|string|min:6',
         ];
+        $messages = [];
 
         if(
-        	config('captcha.enabled') ||
-        	config('captcha.active.login') ||
+        	(bool) config_cache('captcha.enabled') &&
+        	(bool) config_cache('captcha.active.login') ||
         	(
-				config('captcha.triggers.login.enabled') &&
+				(bool) config_cache('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';
         }
-        
-        $this->validate($request, $rules);
+        $request->validate($rules, $messages);
     }
 
     /**
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 5eb1159fe..230daea85 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -3,230 +3,239 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
+use App\Services\BouncerService;
+use App\Services\EmailService;
 use App\User;
-use Purify;
 use App\Util\Lexer\RestrictedNames;
+use Illuminate\Auth\Events\Registered;
 use Illuminate\Foundation\Auth\RegistersUsers;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
-use Illuminate\Auth\Events\Registered;
-use Illuminate\Http\Request;
-use App\Services\EmailService;
-use App\Services\BouncerService;
+use Purify;
 
 class RegisterController extends Controller
 {
-	/*
-	|--------------------------------------------------------------------------
-	| Register Controller
-	|--------------------------------------------------------------------------
-	|
-	| This controller handles the registration of new users as well as their
-	| validation and creation. By default this controller uses a trait to
-	| provide this functionality without requiring any additional code.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Register Controller
+    |--------------------------------------------------------------------------
+    |
+    | This controller handles the registration of new users as well as their
+    | validation and creation. By default this controller uses a trait to
+    | provide this functionality without requiring any additional code.
+    |
+    */
 
-	use RegistersUsers;
+    use RegistersUsers;
 
-	/**
-	 * Where to redirect users after registration.
-	 *
-	 * @var string
-	 */
-	protected $redirectTo = '/i/web';
+    /**
+     * Where to redirect users after registration.
+     *
+     * @var string
+     */
+    protected $redirectTo = '/i/web';
 
-	/**
-	 * Create a new controller instance.
-	 *
-	 * @return void
-	 */
-	public function __construct()
-	{
-		$this->middleware('guest');
-	}
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('guest');
+    }
 
-	public function getRegisterToken()
-	{
-		return \Cache::remember('pf:register:rt', 900, function() {
-			return str_random(40);
-		});
-	}
+    public function getRegisterToken()
+    {
+        return \Cache::remember('pf:register:rt', 900, function () {
+            return str_random(40);
+        });
+    }
 
-	/**
-	 * Get a validator for an incoming registration request.
-	 *
-	 * @param array $data
-	 *
-	 * @return \Illuminate\Contracts\Validation\Validator
-	 */
-	protected function validator(array $data)
-	{
-		if(config('database.default') == 'pgsql') {
-			$data['username'] = strtolower($data['username']);
-			$data['email'] = strtolower($data['email']);
-		}
+    /**
+     * Get a validator for an incoming registration request.
+     *
+     *
+     * @return \Illuminate\Contracts\Validation\Validator
+     */
+    public function validator(array $data)
+    {
+        if (config('database.default') == 'pgsql') {
+            $data['username'] = strtolower($data['username']);
+            $data['email'] = strtolower($data['email']);
+        }
 
-		$usernameRules = [
-			'required',
-			'min:2',
-			'max:15',
-			'unique:users',
-			function ($attribute, $value, $fail) {
-				$dash = substr_count($value, '-');
-				$underscore = substr_count($value, '_');
-				$period = substr_count($value, '.');
+        $usernameRules = [
+            'required',
+            'min:2',
+            'max:15',
+            '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 (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 (($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[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.');
-				}
+                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 (_).');
-				}
+                $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.');
-				}
-			},
-		];
+                if (! preg_match('/[a-zA-Z]/', $value)) {
+                    return $fail('Username is invalid. Must contain at least one alphabetical character.');
+                }
 
-		$emailRules = [
-			'required',
-			'string',
-			'email',
-			'max:255',
-			'unique:users',
-			function ($attribute, $value, $fail) {
-				$banned = EmailService::isBanned($value);
-				if($banned) {
-					return $fail('Email is invalid.');
-				}
-			},
-		];
+                $restricted = RestrictedNames::get();
+                if (in_array(strtolower($value), array_map('strtolower', $restricted))) {
+                    return $fail('Username cannot be used.');
+                }
+            },
+        ];
 
-		$rt = [
-			'required',
-			function ($attribute, $value, $fail) {
-				if($value !== $this->getRegisterToken()) {
-					return $fail('Something went wrong');
-				}
-			}
-		];
+        $emailRules = [
+            'required',
+            'string',
+            'email',
+            'max:255',
+            'unique:users',
+            function ($attribute, $value, $fail) {
+                $banned = EmailService::isBanned($value);
+                if ($banned) {
+                    return $fail('Email is invalid.');
+                }
+            },
+        ];
 
-		$rules = [
-			'agecheck' => 'required|accepted',
-			'rt' 	   => $rt,
-			'name'     => 'nullable|string|max:'.config('pixelfed.max_name_length'),
-			'username' => $usernameRules,
-			'email'    => $emailRules,
-			'password' => 'required|string|min:'.config('pixelfed.min_password_length').'|confirmed',
-		];
+        $rt = [
+            'required',
+            function ($attribute, $value, $fail) {
+                if ($value !== $this->getRegisterToken()) {
+                    return $fail('Something went wrong');
+                }
+            },
+        ];
 
-		if(config('captcha.enabled') || config('captcha.active.register')) {
-			$rules['h-captcha-response'] = 'required|captcha';
-		}
+        $rules = [
+            'agecheck' => 'required|accepted',
+            'rt' => $rt,
+            'name' => 'nullable|string|max:'.config('pixelfed.max_name_length'),
+            'username' => $usernameRules,
+            'email' => $emailRules,
+            'password' => 'required|string|min:'.config('pixelfed.min_password_length').'|confirmed',
+        ];
 
-		return Validator::make($data, $rules);
-	}
+        if ((bool) config_cache('captcha.enabled') && (bool) config_cache('captcha.active.register')) {
+            $rules['h-captcha-response'] = 'required|captcha';
+        }
 
-	/**
-	 * Create a new user instance after a valid registration.
-	 *
-	 * @param array $data
-	 *
-	 * @return \App\User
-	 */
-	protected function create(array $data)
-	{
-		if(config('database.default') == 'pgsql') {
-			$data['username'] = strtolower($data['username']);
-			$data['email'] = strtolower($data['email']);
-		}
+        return Validator::make($data, $rules);
+    }
 
-		return User::create([
-			'name'     => Purify::clean($data['name']),
-			'username' => $data['username'],
-			'email'    => $data['email'],
-			'password' => Hash::make($data['password']),
-			'app_register_ip' => request()->ip()
-		]);
-	}
+    /**
+     * Create a new user instance after a valid registration.
+     *
+     *
+     * @return \App\User
+     */
+    public function create(array $data)
+    {
+        if (config('database.default') == 'pgsql') {
+            $data['username'] = strtolower($data['username']);
+            $data['email'] = strtolower($data['email']);
+        }
 
-	/**
-	 * Show the application registration form.
-	 *
-	 * @return \Illuminate\Http\Response
-	 */
-	public function showRegistrationForm()
-	{
-		if(config_cache('pixelfed.open_registration')) {
-			if(config('pixelfed.bouncer.cloud_ips.ban_signups')) {
-				abort_if(BouncerService::checkIp(request()->ip()), 404);
-			}
-			$hasLimit = config('pixelfed.enforce_max_users');
-			if($hasLimit) {
-				$limit = config('pixelfed.max_users');
-				$count = User::where(function($q){ return $q->whereNull('status')->orWhereNotIn('status', ['deleted','delete']); })->count();
-				if($limit <= $count) {
-					return redirect(route('help.instance-max-users-limit'));
-				}
-				abort_if($limit <= $count, 404);
-				return view('auth.register');
-			} else {
-				return view('auth.register');
-			}
-		} else {
-			abort(404);
-		}
-	}
+        return User::create([
+            'name' => Purify::clean($data['name']),
+            'username' => $data['username'],
+            'email' => $data['email'],
+            'password' => Hash::make($data['password']),
+            'app_register_ip' => request()->ip(),
+        ]);
+    }
 
-	/**
-	 * Handle a registration request for the application.
-	 *
-	 * @param  \Illuminate\Http\Request  $request
-	 * @return \Illuminate\Http\Response
-	 */
-	public function register(Request $request)
-	{
-		abort_if(config_cache('pixelfed.open_registration') == false, 400);
+    /**
+     * Show the application registration form.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function showRegistrationForm()
+    {
+        if ((bool) config_cache('pixelfed.open_registration')) {
+            if (config('pixelfed.bouncer.cloud_ips.ban_signups')) {
+                abort_if(BouncerService::checkIp(request()->ip()), 404);
+            }
+            $hasLimit = config('pixelfed.enforce_max_users');
+            if ($hasLimit) {
+                $limit = config('pixelfed.max_users');
+                $count = User::where(function ($q) {
+                    return $q->whereNull('status')->orWhereNotIn('status', ['deleted', 'delete']);
+                })->count();
+                if ($limit <= $count) {
+                    return redirect(route('help.instance-max-users-limit'));
+                }
+                abort_if($limit <= $count, 404);
 
-		if(config('pixelfed.bouncer.cloud_ips.ban_signups')) {
-			abort_if(BouncerService::checkIp($request->ip()), 404);
-		}
+                return view('auth.register');
+            } else {
+                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);
+            }
+        }
+    }
 
-		$hasLimit = config('pixelfed.enforce_max_users');
-		if($hasLimit) {
-			$count = User::where(function($q){ return $q->whereNull('status')->orWhereNotIn('status', ['deleted','delete']); })->count();
-			$limit = config('pixelfed.max_users');
+    /**
+     * Handle a registration request for the application.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function register(Request $request)
+    {
+        abort_if(config_cache('pixelfed.open_registration') == false, 400);
 
-    		if($limit && $limit <= $count) {
-    			return redirect(route('help.instance-max-users-limit'));
-    		}
-		}
+        if (config('pixelfed.bouncer.cloud_ips.ban_signups')) {
+            abort_if(BouncerService::checkIp($request->ip()), 404);
+        }
 
+        $hasLimit = config('pixelfed.enforce_max_users');
+        if ($hasLimit) {
+            $count = User::where(function ($q) {
+                return $q->whereNull('status')->orWhereNotIn('status', ['deleted', 'delete']);
+            })->count();
+            $limit = config('pixelfed.max_users');
 
-		$this->validator($request->all())->validate();
+            if ($limit && $limit <= $count) {
+                return redirect(route('help.instance-max-users-limit'));
+            }
+        }
 
-		event(new Registered($user = $this->create($request->all())));
+        $this->validator($request->all())->validate();
 
-		$this->guard()->login($user);
+        event(new Registered($user = $this->create($request->all())));
 
-		return $this->registered($request, $user)
-			?: redirect($this->redirectPath());
-	}
+        $this->guard()->login($user);
+
+        return $this->registered($request, $user)
+            ?: redirect($this->redirectPath());
+    }
 }
diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
index a92c4e38d..166ec01e3 100644
--- a/app/Http/Controllers/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -50,7 +50,7 @@ class ResetPasswordController extends Controller
     {
     	usleep(random_int(100000, 3000000));
 
-        if(config('captcha.enabled')) {
+        if((bool) config_cache('captcha.enabled')) {
             return [
 	            'token' => 'required',
 	            'email' => 'required|email',
diff --git a/app/Http/Controllers/AuthorizeInteractionController.php b/app/Http/Controllers/AuthorizeInteractionController.php
new file mode 100644
index 000000000..701ee06f1
--- /dev/null
+++ b/app/Http/Controllers/AuthorizeInteractionController.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Util\ActivityPub\Helpers;
+use Illuminate\Http\Request;
+
+class AuthorizeInteractionController extends Controller
+{
+    public function get(Request $request)
+    {
+        $request->validate([
+            'uri' => 'required|url',
+        ]);
+
+        abort_unless((bool) config_cache('federation.activitypub.enabled'), 404);
+
+        $uri = Helpers::validateUrl($request->input('uri'), true);
+        abort_unless($uri, 404);
+
+        if (! $request->user()) {
+            return redirect('/login?next='.urlencode($uri));
+        }
+
+        $status = Helpers::statusFetch($uri);
+        if ($status && isset($status['id'])) {
+            return redirect('/i/web/post/'.$status['id']);
+        }
+
+        $profile = Helpers::profileFetch($uri);
+        if ($profile && isset($profile['id'])) {
+            return redirect('/i/web/profile/'.$profile['id']);
+        }
+
+        return redirect('/i/web');
+    }
+}
diff --git a/app/Http/Controllers/BookmarkController.php b/app/Http/Controllers/BookmarkController.php
index a24520d64..14b1d9e3f 100644
--- a/app/Http/Controllers/BookmarkController.php
+++ b/app/Http/Controllers/BookmarkController.php
@@ -3,65 +3,62 @@
 namespace App\Http\Controllers;
 
 use App\Bookmark;
-use App\Status;
-use Auth;
-use Illuminate\Http\Request;
+use App\Services\AccountService;
 use App\Services\BookmarkService;
 use App\Services\FollowerService;
+use App\Services\UserRoleService;
+use App\Status;
+use Illuminate\Http\Request;
 
 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',
+        ]);
 
-		$profile = Auth::user()->profile;
-		$status = Status::findOrFail($request->input('item'));
+        $user = $request->user();
+        $status = Status::findOrFail($request->input('item'));
+        $account = AccountService::get($status->profile_id);
+        abort_if(isset($account['moved'], $account['moved']['id']), 422, 'Cannot bookmark or unbookmark a post from an account that has migrated');
+        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);
-		}
-
-		if ($request->ajax()) {
-			$response = ['code' => 200, 'msg' => 'Bookmark saved!'];
-		} else {
-			$response = redirect()->back();
-		}
-
-		return $response;
-	}
+        return $request->expectsJson() ? ['code' => 200, 'msg' => 'Bookmark saved!'] : redirect()->back();
+    }
 }
diff --git a/app/Http/Controllers/CollectionController.php b/app/Http/Controllers/CollectionController.php
index 6cd4bda57..447490433 100644
--- a/app/Http/Controllers/CollectionController.php
+++ b/app/Http/Controllers/CollectionController.php
@@ -2,72 +2,65 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-use Auth;
-use App\{
-    Collection,
-    CollectionItem,
-    Profile,
-    Status
-};
-use League\Fractal;
-use App\Transformer\Api\{
-    AccountTransformer,
-    StatusTransformer,
-};
-use League\Fractal\Serializer\ArraySerializer;
-use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use App\Collection;
+use App\CollectionItem;
 use App\Services\AccountService;
 use App\Services\CollectionService;
 use App\Services\FollowerService;
 use App\Services\StatusService;
+use App\Status;
+use Auth;
+use Illuminate\Http\Request;
 
 class CollectionController extends Controller
 {
     public function create(Request $request)
     {
-        abort_if(!Auth::check(), 403);
+        abort_if(! Auth::check(), 403);
         $profile = Auth::user()->profile;
 
         $collection = Collection::firstOrCreate([
             'profile_id' => $profile->id,
-            'published_at' => null
+            'published_at' => null,
         ]);
         $collection->visibility = 'draft';
         $collection->save();
+
         return view('collection.create', compact('collection'));
     }
 
     public function show(Request $request, int $id)
     {
         $user = $request->user();
-		$collection = CollectionService::getCollection($id);
-		abort_if(!$collection, 404);
-		if($collection['published_at'] == null || $collection['visibility'] != 'public') {
-			abort_if(!$user, 404);
-			if($user->profile_id != $collection['pid']) {
-				if(!$user->is_admin) {
-					abort_if($collection['visibility'] != 'private', 404);
-					abort_if(!FollowerService::follows($user->profile_id, $collection['pid']), 404);
-				}
-			}
-		}
-    	return view('collection.show', compact('collection'));
+        $collection = CollectionService::getCollection($id);
+        abort_if(! $collection, 404);
+        if ($collection['published_at'] == null || $collection['visibility'] != 'public') {
+            abort_if(! $user, 404);
+            if ($user->profile_id != $collection['pid']) {
+                if (! $user->is_admin) {
+                    abort_if($collection['visibility'] != 'private', 404);
+                    abort_if(! FollowerService::follows($user->profile_id, $collection['pid']), 404);
+                }
+            }
+        }
+
+        return view('collection.show', compact('collection'));
     }
 
     public function index(Request $request)
     {
-        abort_if(!Auth::check(), 403);
-    	return $request->all();
+        abort_if(! Auth::check(), 403);
+
+        return $request->all();
     }
 
     public function store(Request $request, $id)
     {
-        abort_if(!$request->user(), 403);
+        abort_if(! $request->user(), 403);
         $this->validate($request, [
-            'title'         => 'nullable|max:50',
-            'description'   => 'nullable|max:500',
-            'visibility'    => 'nullable|string|in:public,private,draft'
+            'title' => 'nullable|max:50',
+            'description' => 'nullable|max:500',
+            'visibility' => 'nullable|string|in:public,private,draft',
         ]);
 
         $pid = $request->user()->profile_id;
@@ -78,20 +71,21 @@ class CollectionController extends Controller
         $collection->save();
 
         CollectionService::deleteCollection($id);
+
         return CollectionService::setCollection($collection->id, $collection);
     }
 
     public function publish(Request $request, int $id)
     {
-        abort_if(!$request->user(), 403);
+        abort_if(! $request->user(), 403);
         $this->validate($request, [
-            'title'         => 'nullable|max:50',
-            'description'   => 'nullable|max:500',
-            'visibility'    => 'required|alpha|in:public,private,draft'
+            'title' => 'nullable|max:50',
+            'description' => 'nullable|max:500',
+            'visibility' => 'required|alpha|in:public,private,draft',
         ]);
-        $profile = Auth::user()->profile;   
+        $profile = Auth::user()->profile;
         $collection = Collection::whereProfileId($profile->id)->findOrFail($id);
-        if($collection->items()->count() == 0) {
+        if ($collection->items()->count() == 0) {
             abort(404);
         }
         $collection->title = strip_tags($request->input('title'));
@@ -99,12 +93,13 @@ class CollectionController extends Controller
         $collection->visibility = $request->input('visibility');
         $collection->published_at = now();
         $collection->save();
+
         return CollectionService::setCollection($collection->id, $collection);
     }
 
     public function delete(Request $request, int $id)
     {
-        abort_if(!$request->user(), 403);
+        abort_if(! $request->user(), 403);
         $user = $request->user();
 
         $collection = Collection::whereProfileId($user->profile_id)->findOrFail($id);
@@ -113,7 +108,7 @@ class CollectionController extends Controller
 
         CollectionService::deleteCollection($id);
 
-        if($request->wantsJson()) {
+        if ($request->wantsJson()) {
             return 200;
         }
 
@@ -122,13 +117,13 @@ class CollectionController extends Controller
 
     public function storeId(Request $request)
     {
-        abort_if(!$request->user(), 403);
+        abort_if(! $request->user(), 403);
 
         $this->validate($request, [
             'collection_id' => 'required|int|min:1|exists:collections,id',
-            'post_id'       => 'required|int|min:1'
+            'post_id' => 'required|int|min:1',
         ]);
-        
+
         $profileId = $request->user()->profile_id;
         $collectionId = $request->input('collection_id');
         $postId = $request->input('post_id');
@@ -136,157 +131,153 @@ class CollectionController extends Controller
         $collection = Collection::whereProfileId($profileId)->findOrFail($collectionId);
         $count = $collection->items()->count();
 
-        if($count) {
+        if ($count) {
             CollectionItem::whereCollectionId($collection->id)
                 ->get()
-                ->filter(function($col) {
+                ->filter(function ($col) {
                     return StatusService::get($col->object_id, false) == null;
                 })
-                ->each(function($col) use($collectionId) {
+                ->each(function ($col) use ($collectionId) {
                     CollectionService::removeItem($collectionId, $col->object_id);
                     $col->delete();
                 });
         }
 
         $max = config('pixelfed.max_collection_length');
-        if($count >= $max) {
+        if ($count >= $max) {
             abort(400, 'You can only add '.$max.' posts per collection');
         }
 
-        $status = Status::whereScope('public')
+        $status = Status::whereIn('scope', ['public', 'unlisted'])
             ->whereProfileId($profileId)
             ->whereIn('type', ['photo', 'photo:album', 'video'])
             ->findOrFail($postId);
 
         $item = CollectionItem::firstOrCreate([
             'collection_id' => $collection->id,
-            'object_type'   => 'App\Status',
-            'object_id'     => $status->id
-        ],[
-            'order'         => $count,
+            'object_type' => 'App\Status',
+            'object_id' => $status->id,
+        ], [
+            'order' => $count,
         ]);
 
-        CollectionService::addItem(
-        	$collection->id,
-        	$status->id,
-        	$count
-        );
+        CollectionService::deleteCollection($collection->id);
 
         $collection->updated_at = now();
         $collection->save();
         CollectionService::setCollection($collection->id, $collection);
 
-        return StatusService::get($status->id);
+        return StatusService::get($status->id, false);
     }
 
     public function getCollection(Request $request, $id)
     {
-		$user = $request->user();
-		$collection = CollectionService::getCollection($id);
+        $user = $request->user();
+        $collection = CollectionService::getCollection($id);
 
-        if(!$collection) {
+        if (! $collection) {
             return response()->json([], 404);
         }
 
-		if($collection['published_at'] == null || $collection['visibility'] != 'public') {
-			abort_unless($user, 404);
-			if($user->profile_id != $collection['pid']) {
-				if(!$user->is_admin) {
-					abort_if($collection['visibility'] != 'private', 404);
-					abort_if(!FollowerService::follows($user->profile_id, $collection['pid']), 404);
-				}
-			}
-		}
+        if ($collection['published_at'] == null || $collection['visibility'] != 'public') {
+            abort_unless($user, 404);
+            if ($user->profile_id != $collection['pid']) {
+                if (! $user->is_admin) {
+                    abort_if($collection['visibility'] != 'private', 404);
+                    abort_if(! FollowerService::follows($user->profile_id, $collection['pid']), 404);
+                }
+            }
+        }
 
         return $collection;
     }
 
     public function getItems(Request $request, int $id)
     {
-    	$user = $request->user();
-    	$collection = CollectionService::getCollection($id);
+        $user = $request->user();
+        $collection = CollectionService::getCollection($id);
 
-        if(!$collection) {
+        if (! $collection) {
             return response()->json([], 404);
         }
 
-        if($collection['published_at'] == null || $collection['visibility'] != 'public') {
-			abort_unless($user, 404);
-			if($user->profile_id != $collection['pid']) {
-				if(!$user->is_admin) {
-					abort_if($collection['visibility'] != 'private', 404);
-					abort_if(!FollowerService::follows($user->profile_id, $collection['pid']), 404);
-				}
-			}
-		}
+        if ($collection['published_at'] == null || $collection['visibility'] != 'public') {
+            abort_unless($user, 404);
+            if ($user->profile_id != $collection['pid']) {
+                if (! $user->is_admin) {
+                    abort_if($collection['visibility'] != 'private', 404);
+                    abort_if(! FollowerService::follows($user->profile_id, $collection['pid']), 404);
+                }
+            }
+        }
         $page = $request->input('page') ?? 1;
         $start = $page == 1 ? 0 : ($page * 10 - 10);
         $end = $start + 10;
         $items = CollectionService::getItems($id, $start, $end);
 
         return collect($items)
-        	->map(function($id) {
-        		return StatusService::get($id);
-        	})
-        	->filter(function($item) {
-        		return $item && isset($item['account'], $item['media_attachments']);
-        	})
-        	->values();
+            ->map(function ($id) {
+                return StatusService::get($id, false);
+            })
+            ->filter(function ($item) {
+                return $item && ($item['visibility'] == 'public' || $item['visibility'] == 'unlisted') && isset($item['account'], $item['media_attachments']);
+            })
+            ->values();
     }
 
     public function getUserCollections(Request $request, int $id)
     {
-    	$user = $request->user();
-    	$pid = $user ? $user->profile_id : null;
-    	$follows = false;
-    	$visibility = ['public'];
+        $user = $request->user();
+        $pid = $user ? $user->profile_id : null;
+        $follows = false;
+        $visibility = ['public'];
 
         $profile = AccountService::get($id, true);
-        if(!$profile || !isset($profile['id'])) {
+        if (! $profile || ! isset($profile['id'])) {
             return response()->json([], 404);
         }
 
-        if($pid) {
-        	$follows = FollowerService::follows($pid, $profile['id']);
+        if ($pid) {
+            $follows = FollowerService::follows($pid, $profile['id']);
         }
 
-        if($profile['locked']) {
-            abort_if(!$pid, 404);
-            if(!$user->is_admin) {
-            	abort_if($profile['id'] != $pid && $follows == false, 404);
+        if ($profile['locked']) {
+            abort_if(! $pid, 404);
+            if (! $user->is_admin) {
+                abort_if($profile['id'] != $pid && $follows == false, 404);
             }
         }
 
         $owner = $pid ? $pid == $profile['id'] : false;
 
-        if($follows) {
-        	$visibility = ['public', 'private'];
+        if ($follows) {
+            $visibility = ['public', 'private'];
         }
 
-        if($pid && $pid == $profile['id']) {
-        	$visibility = ['public', 'private', 'draft'];
+        if ($pid && $pid == $profile['id']) {
+            $visibility = ['public', 'private', 'draft'];
         }
 
         return Collection::whereProfileId($profile['id'])
-        	->whereIn('visibility', $visibility)
-        	->when(!$owner, function($q, $owner) {
-        		return $q->whereNotNull('published_at');
-        	})
+            ->whereIn('visibility', $visibility)
+            ->when(! $owner, function ($q, $owner) {
+                return $q->whereNotNull('published_at');
+            })
             ->orderByDesc('id')
             ->paginate(9)
-            ->map(function($collection) {
-            	return CollectionService::getCollection($collection->id);
-        });
+            ->map(function ($collection) {
+                return CollectionService::getCollection($collection->id);
+            });
     }
 
     public function deleteId(Request $request)
     {
-        abort_if(!$request->user(), 403);
+        abort_if(! $request->user(), 403);
         $this->validate($request, [
             'collection_id' => 'required|int|min:1|exists:collections,id',
-            'post_id'       => 'required|int|min:1'
+            'post_id' => 'required|int|min:1',
         ]);
-        
+
         $profileId = $request->user()->profile_id;
         $collectionId = $request->input('collection_id');
         $postId = $request->input('post_id');
@@ -294,11 +285,11 @@ class CollectionController extends Controller
         $collection = Collection::whereProfileId($profileId)->findOrFail($collectionId);
         $count = $collection->items()->count();
 
-        if($count == 1) {
+        if ($count == 1) {
             abort(400, 'You cannot delete the only post of a collection!');
         }
 
-        $status = Status::whereScope('public')
+        $status = Status::whereIn('scope', ['public', 'unlisted'])
             ->whereIn('type', ['photo', 'photo:album', 'video'])
             ->findOrFail($postId);
 
@@ -312,7 +303,7 @@ class CollectionController extends Controller
         CollectionItem::whereCollectionId($collection->id)
             ->orderBy('created_at')
             ->get()
-            ->each(function($item, $index) {
+            ->each(function ($item, $index) {
                 $item->order = $index;
                 $item->save();
             });
@@ -323,4 +314,31 @@ class CollectionController extends Controller
 
         return 200;
     }
+
+    public function getSelfCollections(Request $request)
+    {
+        abort_if(! $request->user(), 404);
+        $user = $request->user();
+        $pid = $user->profile_id;
+
+        $profile = AccountService::get($pid, true);
+        if (! $profile || ! isset($profile['id'])) {
+            return response()->json([], 404);
+        }
+
+        return Collection::whereProfileId($pid)
+            ->orderByDesc('id')
+            ->paginate(9)
+            ->map(function ($collection) {
+                $c = CollectionService::getCollection($collection->id);
+                $c['items'] = collect(CollectionService::getItems($collection->id))
+                    ->map(function ($id) {
+                        return StatusService::get($id, false);
+                    })->filter()->values();
+
+                return $c;
+            })
+            ->filter()
+            ->values();
+    }
 }
diff --git a/app/Http/Controllers/CommentController.php b/app/Http/Controllers/CommentController.php
index 42a5490d0..f529b0ebd 100644
--- a/app/Http/Controllers/CommentController.php
+++ b/app/Http/Controllers/CommentController.php
@@ -2,23 +2,18 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-use Auth;
-use DB;
-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;
+use App\Status;
+use App\Transformer\Api\StatusTransformer;
+use App\UserFilter;
+use Auth;
+use DB;
+use Illuminate\Http\Request;
+use League\Fractal;
+use League\Fractal\Serializer\ArraySerializer;
+use Purify;
 
 class CommentController extends Controller
 {
@@ -33,9 +28,9 @@ class CommentController extends Controller
             abort(403);
         }
         $this->validate($request, [
-            'item'    => 'required|integer|min:1',
-            'comment' => 'required|string|max:'.(int) config('pixelfed.max_caption_length'),
-            'sensitive' => 'nullable|boolean'
+            'item' => 'required|integer|min:1',
+            'comment' => 'required|string|max:'.config_cache('pixelfed.max_caption_length'),
+            'sensitive' => 'nullable|boolean',
         ]);
         $comment = $request->input('comment');
         $statusId = $request->input('item');
@@ -45,7 +40,7 @@ class CommentController extends Controller
         $profile = $user->profile;
         $status = Status::findOrFail($statusId);
 
-        if($status->comments_disabled == true) {
+        if ($status->comments_disabled == true) {
             return;
         }
 
@@ -55,18 +50,19 @@ 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) {
+            $defaultCaption = config_cache('database.default') === 'mysql' ? null : "";
+
             $scope = $profile->is_private == true ? 'private' : 'public';
-            $autolink = Autolink::create()->autolink($comment);
-            $reply = new Status();
+            $reply = new Status;
             $reply->profile_id = $profile->id;
             $reply->is_nsfw = $nsfw;
-            $reply->caption = e($comment);
-            $reply->rendered = $autolink;
+            $reply->caption = Purify::clean($comment);
+            $reply->rendered = $defaultCaption;
             $reply->in_reply_to_id = $status->id;
             $reply->in_reply_to_profile_id = $status->profile_id;
             $reply->scope = $scope;
@@ -81,9 +77,9 @@ class CommentController extends Controller
         CommentPipeline::dispatch($status, $reply);
 
         if ($request->ajax()) {
-            $fractal = new Fractal\Manager();
-            $fractal->setSerializer(new ArraySerializer());
-            $entity = new Fractal\Resource\Item($reply, new StatusTransformer());
+            $fractal = new Fractal\Manager;
+            $fractal->setSerializer(new ArraySerializer);
+            $entity = new Fractal\Resource\Item($reply, new StatusTransformer);
             $entity = $fractal->createData($entity)->toArray();
             $response = [
                 'code' => 200,
diff --git a/app/Http/Controllers/ComposeController.php b/app/Http/Controllers/ComposeController.php
index 9be50f346..2069e2693 100644
--- a/app/Http/Controllers/ComposeController.php
+++ b/app/Http/Controllers/ComposeController.php
@@ -2,293 +2,295 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-use Auth, Cache, DB, Storage, URL;
-use Carbon\Carbon;
-use App\{
-	Avatar,
-	Collection,
-	CollectionItem,
-	Hashtag,
-	Like,
-	Media,
-	MediaTag,
-	Notification,
-	Profile,
-	Place,
-	Status,
-	UserFilter,
-	UserSetting
-};
-use App\Models\Poll;
-use App\Transformer\Api\{
-	MediaTransformer,
-	MediaDraftTransformer,
-	StatusTransformer,
-	StatusStatelessTransformer
-};
-use League\Fractal;
-use App\Util\Media\Filter;
-use League\Fractal\Serializer\ArraySerializer;
-use League\Fractal\Pagination\IlluminatePaginatorAdapter;
-use App\Jobs\AvatarPipeline\AvatarOptimize;
+use App\Collection;
+use App\CollectionItem;
+use App\Hashtag;
 use App\Jobs\ImageOptimizePipeline\ImageOptimize;
-use App\Jobs\ImageOptimizePipeline\ImageThumbnail;
 use App\Jobs\StatusPipeline\NewStatusPipeline;
-use App\Jobs\VideoPipeline\{
-	VideoOptimize,
-	VideoPostProcess,
-	VideoThumbnail
-};
+use App\Jobs\VideoPipeline\VideoThumbnail;
+use App\Media;
+use App\MediaTag;
+use App\Models\Poll;
+use App\Notification;
+use App\Profile;
 use App\Services\AccountService;
 use App\Services\CollectionService;
-use App\Services\NotificationService;
-use App\Services\MediaPathService;
 use App\Services\MediaBlocklistService;
+use App\Services\MediaPathService;
 use App\Services\MediaStorageService;
 use App\Services\MediaTagService;
-use App\Services\StatusService;
 use App\Services\SnowflakeService;
-use Illuminate\Support\Str;
-use App\Util\Lexer\Autolink;
-use App\Util\Lexer\Extractor;
+use App\Services\UserRoleService;
+use App\Services\UserStorageService;
+use App\Status;
+use App\Transformer\Api\MediaTransformer;
+use App\UserFilter;
+use App\Util\Media\Filter;
 use App\Util\Media\License;
-use Image;
+use Auth;
+use Cache;
+use DB;
+use Purify;
+use Illuminate\Http\Request;
+use Illuminate\Support\Str;
+use League\Fractal;
+use League\Fractal\Serializer\ArraySerializer;
 
 class ComposeController extends Controller
 {
-	protected $fractal;
+    protected $fractal;
 
-	public function __construct()
-	{
-		$this->middleware('auth');
-		$this->fractal = new Fractal\Manager();
-		$this->fractal->setSerializer(new ArraySerializer());
-	}
+    public function __construct()
+    {
+        $this->middleware('auth');
+        $this->fractal = new Fractal\Manager;
+        $this->fractal->setSerializer(new ArraySerializer);
+    }
 
-	public function show(Request $request)
-	{
-		return view('status.compose');
-	}
+    public function show(Request $request)
+    {
+        return view('status.compose');
+    }
 
-	public function mediaUpload(Request $request)
-	{
-		abort_if(!$request->user(), 403);
+    public function mediaUpload(Request $request)
+    {
+        abort_if(! $request->user(), 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'
-		]);
+        $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',
+        ]);
 
-		$user = Auth::user();
-		$profile = $user->profile;
+        $user = $request->user();
+        $profile = $user->profile;
+        abort_if($user->has_roles && ! UserRoleService::can('can-post', $user->id), 403, 'Invalid permissions for this action');
 
-		$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;
-		});
+            return $dailyLimit >= 1250;
+        });
 
-		abort_if($limitReached == true, 429);
+        abort_if($limitReached == true, 429);
 
-		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;
+        $accountSize = UserStorageService::get($user->id);
+        abort_if($accountSize === -1, 403, 'Invalid request.');
+        $photo = $request->file('file');
+        $fileSize = $photo->getSize();
+        $sizeInKbs = (int) ceil($fileSize / 1000);
+        $updatedAccountSize = (int) $accountSize + (int) $sizeInKbs;
 
-		$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;
+        if ((bool) config_cache('pixelfed.enforce_account_limit') == true) {
+            $limit = (int) config_cache('pixelfed.max_account_size');
+            if ($updatedAccountSize >= $limit) {
+                abort(403, 'Account size limit reached.');
+            }
+        }
 
-		$photo = $request->file('file');
+        $mimes = explode(',', config_cache('pixelfed.media_types'));
 
-		$mimes = explode(',', config_cache('pixelfed.media_types'));
+        abort_if(in_array($photo->getMimeType(), $mimes) == false, 400, 'Invalid media format');
 
-		abort_if(in_array($photo->getMimeType(), $mimes) == false, 400, 'Invalid media format');
+        $storagePath = MediaPathService::get($user, 2);
+        $path = $photo->storePublicly($storagePath);
+        $hash = \hash_file('sha256', $photo);
+        $mime = $photo->getMimeType();
 
-		$storagePath = MediaPathService::get($user, 2);
-		$path = $photo->storePublicly($storagePath);
-		$hash = \hash_file('sha256', $photo);
-		$mime = $photo->getMimeType();
+        abort_if(MediaBlocklistService::exists($hash) == true, 451);
 
-		abort_if(MediaBlocklistService::exists($hash) == true, 451);
+        $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->caption = '';
+        $media->mime = $mime;
+        $media->filter_class = $filterClass;
+        $media->filter_name = $filterName;
+        $media->version = '3';
+        $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->filter_class = $filterClass;
-		$media->filter_name = $filterName;
-		$media->version = 3;
-		$media->save();
+        $preview_url = $media->url().'?v='.time();
+        $url = $media->url().'?v='.time();
 
-		$preview_url = $media->url() . '?v=' . time();
-		$url = $media->url() . '?v=' . time();
+        switch ($media->mime) {
+            case 'image/jpeg':
+            case 'image/png':
+            case 'image/webp':
+                ImageOptimize::dispatch($media)->onQueue('mmo');
+                break;
 
-		switch ($media->mime) {
-			case 'image/jpeg':
-			case 'image/png':
-			case 'image/webp':
-			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;
+            default:
+                break;
+        }
 
-			default:
-			break;
-		}
+        $user->storage_used = (int) $updatedAccountSize;
+        $user->storage_used_updated_at = now();
+        $user->save();
 
-		Cache::forget($limitKey);
-		$resource = new Fractal\Resource\Item($media, new MediaTransformer());
-		$res = $this->fractal->createData($resource)->toArray();
-		$res['preview_url'] = $preview_url;
-		$res['url'] = $url;
-		return response()->json($res);
-	}
+        Cache::forget($limitKey);
+        $resource = new Fractal\Resource\Item($media, new MediaTransformer);
+        $res = $this->fractal->createData($resource)->toArray();
+        $res['preview_url'] = $preview_url;
+        $res['url'] = $url;
 
-	public function mediaUpdate(Request $request)
-	{
-		$this->validate($request, [
-			'id' => 'required',
-			'file' => function() {
-				return [
-					'required',
-					'mimetypes:' . config_cache('pixelfed.media_types'),
-					'max:' . config_cache('pixelfed.max_photo_size'),
-				];
-			},
-		]);
+        return response()->json($res);
+    }
 
-		$user = Auth::user();
+    public function mediaUpdate(Request $request)
+    {
+        $this->validate($request, [
+            'id' => 'required',
+            'file' => function () {
+                return [
+                    'required',
+                    'mimetypes:'.config_cache('pixelfed.media_types'),
+                    'max:'.config_cache('pixelfed.max_photo_size'),
+                ];
+            },
+        ]);
 
-		$limitKey = 'compose:rate-limit:media-updates:' . $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();
+        $user = Auth::user();
+        abort_if($user->has_roles && ! UserRoleService::can('can-post', $user->id), 403, 'Invalid permissions for this action');
 
-			return $dailyLimit >= 1500;
-		});
+        $limitKey = 'compose:rate-limit:media-updates:'.$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();
 
-		abort_if($limitReached == true, 429);
+            return $dailyLimit >= 1500;
+        });
 
-		$photo = $request->file('file');
-		$id = $request->input('id');
+        abort_if($limitReached == true, 429);
 
-		$media = Media::whereUserId($user->id)
-		->whereProfileId($user->profile_id)
-		->whereNull('status_id')
-		->findOrFail($id);
+        $photo = $request->file('file');
+        $id = $request->input('id');
 
-		$media->save();
+        $media = Media::whereUserId($user->id)
+            ->whereProfileId($user->profile_id)
+            ->whereNull('status_id')
+            ->findOrFail($id);
 
-		$fragments = explode('/', $media->media_path);
-		$name = last($fragments);
-		array_pop($fragments);
-		$dir = implode('/', $fragments);
-		$path = $photo->storePubliclyAs($dir, $name);
-		$res = [
-			'url' => $media->url() . '?v=' . time()
-		];
-		ImageOptimize::dispatch($media)->onQueue('mmo');
-		Cache::forget($limitKey);
-		return $res;
-	}
+        $media->save();
 
-	public function mediaDelete(Request $request)
-	{
-		abort_if(!$request->user(), 403);
+        $fragments = explode('/', $media->media_path);
+        $name = last($fragments);
+        array_pop($fragments);
+        $dir = implode('/', $fragments);
+        $path = $photo->storePubliclyAs($dir, $name);
+        $res = [
+            'url' => $media->url().'?v='.time(),
+        ];
+        ImageOptimize::dispatch($media)->onQueue('mmo');
+        Cache::forget($limitKey);
+        UserStorageService::recalculateUpdateStorageUsed($request->user()->id);
 
-		$this->validate($request, [
-			'id' => 'required|integer|min:1|exists:media,id'
-		]);
+        return $res;
+    }
 
-		$media = Media::whereNull('status_id')
-		->whereUserId(Auth::id())
-		->findOrFail($request->input('id'));
+    public function mediaDelete(Request $request)
+    {
+        abort_if(! $request->user(), 403);
 
-		MediaStorageService::delete($media, true);
+        $this->validate($request, [
+            'id' => 'required|integer|min:1|exists:media,id',
+        ]);
 
-		return response()->json([
-			'msg' => 'Successfully deleted',
-			'code' => 200
-		]);
-	}
+        abort_if($request->user()->has_roles && ! UserRoleService::can('can-post', $request->user()->id), 403, 'Invalid permissions for this action');
 
-	public function searchTag(Request $request)
-	{
-		abort_if(!$request->user(), 403);
+        $media = Media::whereNull('status_id')
+            ->whereUserId(Auth::id())
+            ->findOrFail($request->input('id'));
 
-		$this->validate($request, [
-			'q' => 'required|string|min:1|max:50'
-		]);
+        MediaStorageService::delete($media, true);
 
-		$q = $request->input('q');
+        UserStorageService::recalculateUpdateStorageUsed($request->user()->id);
 
-		if(Str::of($q)->startsWith('@')) {
-			if(strlen($q) < 3) {
-				return [];
-			}
-			$q = mb_substr($q, 1);
-		}
+        return response()->json([
+            'msg' => 'Successfully deleted',
+            'code' => 200,
+        ]);
+    }
 
-		$blocked = UserFilter::whereFilterableType('App\Profile')
-			->whereFilterType('block')
-			->whereFilterableId($request->user()->profile_id)
-			->pluck('user_id');
+    public function searchTag(Request $request)
+    {
+        abort_if(! $request->user(), 403);
 
-		$blocked->push($request->user()->profile_id);
+        $this->validate($request, [
+            'q' => 'required|string|min:1|max:50',
+        ]);
 
-		$results = Profile::select('id','domain','username')
-			->whereNotIn('id', $blocked)
-			->whereNull('domain')
-			->where('username','like','%'.$q.'%')
-			->limit(15)
-			->get()
-			->map(function($r) {
-				return [
-					'id' => (string) $r->id,
-					'name' => $r->username,
-					'privacy' => true,
-					'avatar' => $r->avatarUrl()
-				];
-		});
+        $q = $request->input('q');
 
-		return $results;
-	}
+        if (Str::of($q)->startsWith('@')) {
+            if (strlen($q) < 3) {
+                return [];
+            }
+            $q = mb_substr($q, 1);
+        }
+
+        $user = $request->user();
+
+        abort_if($user->has_roles && ! UserRoleService::can('can-post', $user->id), 403, 'Invalid permissions for this action');
+
+        $blocked = UserFilter::whereFilterableType('App\Profile')
+            ->whereFilterType('block')
+            ->whereFilterableId($request->user()->profile_id)
+            ->pluck('user_id');
+
+        $blocked->push($request->user()->profile_id);
+
+        $results = Profile::select('id', 'domain', 'username')
+            ->whereNotIn('id', $blocked)
+            ->whereNull('domain')
+            ->where('username', 'like', '%'.$q.'%')
+            ->limit(15)
+            ->get()
+            ->map(function ($r) {
+                return [
+                    'id' => (string) $r->id,
+                    'name' => $r->username,
+                    'privacy' => true,
+                    'avatar' => $r->avatarUrl(),
+                ];
+            });
+
+        return $results;
+    }
 
     public function searchUntag(Request $request)
     {
-        abort_if(!$request->user(), 403);
+        abort_if(! $request->user(), 403);
 
         $this->validate($request, [
             'status_id' => 'required',
-            'profile_id' => 'required'
+            'profile_id' => 'required',
         ]);
 
+        abort_if($request->user()->has_roles && ! UserRoleService::can('can-post', $request->user()->id), 403, 'Invalid permissions for this action');
+
         $user = $request->user();
         $status_id = $request->input('status_id');
         $profile_id = (int) $request->input('profile_id');
@@ -299,7 +301,7 @@ class ComposeController extends Controller
             ->whereProfileId($profile_id)
             ->first();
 
-        if(!$tag) {
+        if (! $tag) {
             return [];
         }
         Notification::whereItemType('App\MediaTag')
@@ -313,506 +315,521 @@ class ComposeController extends Controller
         return [200];
     }
 
-	public function searchLocation(Request $request)
-	{
-		abort_if(!$request->user(), 403);
-		$this->validate($request, [
-			'q' => 'required|string|max:100'
-		]);
-		$pid = $request->user()->profile_id;
-		abort_if(!$pid, 400);
-		$q = e($request->input('q'));
+    public function searchLocation(Request $request)
+    {
+        abort_if(! $request->user(), 403);
+        $this->validate($request, [
+            'q' => 'required|string|max:100',
+        ]);
+        abort_if($request->user()->has_roles && ! UserRoleService::can('can-post', $request->user()->id), 403, 'Invalid permissions for this action');
+        $pid = $request->user()->profile_id;
+        abort_if(! $pid, 400);
+        $q = e($request->input('q'));
 
-		$popular = Cache::remember('pf:search:location:v1:popular', 1209600, function() {
-			$minId = SnowflakeService::byDate(now()->subDays(290));
-			if(config('database.default') == 'pgsql') {
-				return Status::selectRaw('id, place_id, count(place_id) as pc')
-				->whereNotNull('place_id')
-				->where('id', '>', $minId)
-				->orderByDesc('pc')
-				->groupBy(['place_id', 'id'])
-				->limit(400)
-				->get()
-				->filter(function($post) {
-					return $post;
-				})
-				->map(function($place) {
-					return [
-						'id' => $place->place_id,
-						'count' => $place->pc
-					];
-				})
-				->unique('id')
-				->values();
-			}
-			return Status::selectRaw('id, place_id, count(place_id) as pc')
-				->whereNotNull('place_id')
-				->where('id', '>', $minId)
-				->groupBy('place_id')
-				->orderByDesc('pc')
-				->limit(400)
-				->get()
-				->filter(function($post) {
-					return $post;
-				})
-				->map(function($place) {
-					return [
-						'id' => $place->place_id,
-						'count' => $place->pc
-					];
-				});
-		});
-		$q = '%' . $q . '%';
-		$wildcard = config('database.default') === 'pgsql' ? 'ilike' : 'like';
+        $popular = Cache::remember('pf:search:location:v1:popular', 1209600, function () {
+            $minId = SnowflakeService::byDate(now()->subDays(290));
+            if (config('database.default') == 'pgsql') {
+                return Status::selectRaw('id, place_id, count(place_id) as pc')
+                    ->whereNotNull('place_id')
+                    ->where('id', '>', $minId)
+                    ->orderByDesc('pc')
+                    ->groupBy(['place_id', 'id'])
+                    ->limit(400)
+                    ->get()
+                    ->filter(function ($post) {
+                        return $post;
+                    })
+                    ->map(function ($place) {
+                        return [
+                            'id' => $place->place_id,
+                            'count' => $place->pc,
+                        ];
+                    })
+                    ->unique('id')
+                    ->values();
+            }
 
-		$places = DB::table('places')
-		->where('name', $wildcard, $q)
-		->limit((strlen($q) > 5 ? 360 : 30))
-		->get()
-		->sortByDesc(function($place, $key) use($popular) {
-			return $popular->filter(function($p) use($place) {
-				return $p['id'] == $place->id;
-			})->map(function($p) use($place) {
-				return in_array($place->country, ['Canada', 'USA', 'France', 'Germany', 'United Kingdom']) ? $p['count'] : 1;
-			})->values();
-		})
-		->map(function($r) {
-			return [
-				'id' => $r->id,
-				'name' => $r->name,
-				'country' => $r->country,
-				'url'   => url('/discover/places/' . $r->id . '/' . $r->slug)
-			];
-		})
-		->values()
-		->all();
-		return $places;
-	}
+            return Status::selectRaw('id, place_id, count(place_id) as pc')
+                ->whereNotNull('place_id')
+                ->where('id', '>', $minId)
+                ->groupBy('place_id')
+                ->orderByDesc('pc')
+                ->limit(400)
+                ->get()
+                ->filter(function ($post) {
+                    return $post;
+                })
+                ->map(function ($place) {
+                    return [
+                        'id' => $place->place_id,
+                        'count' => $place->pc,
+                    ];
+                });
+        });
+        $q = '%'.$q.'%';
+        $wildcard = config('database.default') === 'pgsql' ? 'ilike' : 'like';
 
-	public function searchMentionAutocomplete(Request $request)
-	{
-		abort_if(!$request->user(), 403);
-
-		$this->validate($request, [
-			'q' => 'required|string|min:2|max:50'
-		]);
-
-		$q = $request->input('q');
-
-		if(Str::of($q)->startsWith('@')) {
-			if(strlen($q) < 3) {
-				return [];
-			}
-		}
-
-		$blocked = UserFilter::whereFilterableType('App\Profile')
-			->whereFilterType('block')
-			->whereFilterableId($request->user()->profile_id)
-			->pluck('user_id');
-
-		$blocked->push($request->user()->profile_id);
-
-		$results = Profile::select('id','domain','username')
-			->whereNotIn('id', $blocked)
-			->where('username','like','%'.$q.'%')
-			->groupBy('id', 'domain')
-			->limit(15)
-			->get()
-			->map(function($profile) {
-				$username = $profile->domain ? substr($profile->username, 1) : $profile->username;
+        $places = DB::table('places')
+            ->where('name', $wildcard, $q)
+            ->limit((strlen($q) > 5 ? 360 : 30))
+            ->get()
+            ->sortByDesc(function ($place, $key) use ($popular) {
+                return $popular->filter(function ($p) use ($place) {
+                    return $p['id'] == $place->id;
+                })->map(function ($p) use ($place) {
+                    return in_array($place->country, ['Canada', 'USA', 'France', 'Germany', 'United Kingdom']) ? $p['count'] : 1;
+                })->values();
+            })
+            ->map(function ($r) {
                 return [
-                    'key' => '@' . str_limit($username, 30),
+                    'id' => $r->id,
+                    'name' => $r->name,
+                    'country' => $r->country,
+                    'url' => url('/discover/places/'.$r->id.'/'.$r->slug),
+                ];
+            })
+            ->values()
+            ->all();
+
+        return $places;
+    }
+
+    public function searchMentionAutocomplete(Request $request)
+    {
+        abort_if(! $request->user(), 403);
+
+        $this->validate($request, [
+            'q' => 'required|string|min:2|max:50',
+        ]);
+
+        abort_if($request->user()->has_roles && ! UserRoleService::can('can-post', $request->user()->id), 403, 'Invalid permissions for this action');
+
+        $q = $request->input('q');
+
+        if (Str::of($q)->startsWith('@')) {
+            if (strlen($q) < 3) {
+                return [];
+            }
+        }
+
+        $blocked = UserFilter::whereFilterableType('App\Profile')
+            ->whereFilterType('block')
+            ->whereFilterableId($request->user()->profile_id)
+            ->pluck('user_id');
+
+        $blocked->push($request->user()->profile_id);
+
+        $results = Profile::select('id', 'domain', 'username')
+            ->whereNotIn('id', $blocked)
+            ->where('username', 'like', '%'.$q.'%')
+            ->groupBy('id', 'domain')
+            ->limit(15)
+            ->get()
+            ->map(function ($profile) {
+                $username = $profile->domain ? substr($profile->username, 1) : $profile->username;
+
+                return [
+                    'key' => '@'.str_limit($username, 30),
                     'value' => $username,
                 ];
-		});
+            });
 
-		return $results;
-	}
+        return $results;
+    }
 
-	public function searchHashtagAutocomplete(Request $request)
-	{
-		abort_if(!$request->user(), 403);
+    public function searchHashtagAutocomplete(Request $request)
+    {
+        abort_if(! $request->user(), 403);
 
-		$this->validate($request, [
-			'q' => 'required|string|min:2|max:50'
-		]);
+        $this->validate($request, [
+            'q' => 'required|string|min:2|max:50',
+        ]);
 
-		$q = $request->input('q');
+        abort_if($request->user()->has_roles && ! UserRoleService::can('can-post', $request->user()->id), 403, 'Invalid permissions for this action');
 
-		$results = Hashtag::select('slug')
-			->where('slug', 'like', '%'.$q.'%')
-			->whereIsNsfw(false)
-			->whereIsBanned(false)
-			->limit(5)
-			->get()
-			->map(function($tag) {
-				return [
-					'key' => '#' . $tag->slug,
-					'value' => $tag->slug
-				];
-		});
+        $q = $request->input('q');
 
-		return $results;
-	}
+        $results = Hashtag::select('slug')
+            ->where('slug', 'like', '%'.$q.'%')
+            ->whereIsNsfw(false)
+            ->whereIsBanned(false)
+            ->limit(5)
+            ->get()
+            ->map(function ($tag) {
+                return [
+                    'key' => '#'.$tag->slug,
+                    'value' => $tag->slug,
+                ];
+            });
 
-	public function store(Request $request)
-	{
-		$this->validate($request, [
-			'caption' => 'nullable|string|max:'.config('pixelfed.max_caption_length', 500),
-			'media.*'   => 'required',
-			'media.*.id' => 'required|integer|min:1',
-			'media.*.filter_class' => 'nullable|alpha_dash|max:30',
-			'media.*.license' => 'nullable|string|max:140',
-			'media.*.alt' => 'nullable|string|max:'.config_cache('pixelfed.max_altext_length'),
-			'cw' => 'nullable|boolean',
-			'visibility' => 'required|string|in:public,private,unlisted|min:2|max:10',
-			'place' => 'nullable',
-			'comments_disabled' => 'nullable',
-			'tagged' => 'nullable',
-			'license' => 'nullable|integer|min:1|max:16',
-			'collections' => 'sometimes|array|min:1|max:5',
-			'spoiler_text' => 'nullable|string|max:140',
-			// 'optimize_media' => 'nullable'
-		]);
+        return $results;
+    }
 
-		if(config('costar.enabled') == true) {
-			$blockedKeywords = config('costar.keyword.block');
-			if($blockedKeywords !== null && $request->caption) {
-				$keywords = config('costar.keyword.block');
-				foreach($keywords as $kw) {
-					if(Str::contains($request->caption, $kw) == true) {
-						abort(400, 'Invalid object');
-					}
-				}
-			}
-		}
+    public function store(Request $request)
+    {
+        $this->validate($request, [
+            'caption' => 'nullable|string|max:'.config_cache('pixelfed.max_caption_length', 500),
+            'media.*' => 'required',
+            'media.*.id' => 'required|integer|min:1',
+            'media.*.filter_class' => 'nullable|alpha_dash|max:30',
+            'media.*.license' => 'nullable|string|max:140',
+            'media.*.alt' => 'nullable|string|max:'.config_cache('pixelfed.max_altext_length'),
+            'cw' => 'nullable|boolean',
+            'visibility' => 'required|string|in:public,private,unlisted|min:2|max:10',
+            'place' => 'nullable',
+            'comments_disabled' => 'nullable',
+            'tagged' => 'nullable',
+            'license' => 'nullable|integer|min:1|max:16',
+            'collections' => 'sometimes|array|min:1|max:5',
+            'spoiler_text' => 'nullable|string|max:140',
+            // 'optimize_media' => 'nullable'
+        ]);
 
-		$user = Auth::user();
-		$profile = $user->profile;
+        abort_if($request->user()->has_roles && ! UserRoleService::can('can-post', $request->user()->id), 403, 'Invalid permissions for this action');
 
-		$limitKey = 'compose:rate-limit:store:' . $user->id;
-		$limitTtl = now()->addMinutes(15);
-		$limitReached = Cache::remember($limitKey, $limitTtl, function() use($user) {
-			$dailyLimit = Status::whereProfileId($user->profile_id)
-				->whereNull('in_reply_to_id')
-				->whereNull('reblog_of_id')
-				->where('created_at', '>', now()->subDays(1))
-				->count();
+        if (config('costar.enabled') == true) {
+            $blockedKeywords = config('costar.keyword.block');
+            if ($blockedKeywords !== null && $request->caption) {
+                $keywords = config('costar.keyword.block');
+                foreach ($keywords as $kw) {
+                    if (Str::contains($request->caption, $kw) == true) {
+                        abort(400, 'Invalid object');
+                    }
+                }
+            }
+        }
 
-			return $dailyLimit >= 1000;
-		});
+        $user = $request->user();
+        $profile = $user->profile;
 
-		abort_if($limitReached == true, 429);
+        $limitKey = 'compose:rate-limit:store:'.$user->id;
+        $limitTtl = now()->addMinutes(15);
+        // $limitReached = Cache::remember($limitKey, $limitTtl, function () use ($user) {
+        //     $dailyLimit = Status::whereProfileId($user->profile_id)
+        //         ->whereNull('in_reply_to_id')
+        //         ->whereNull('reblog_of_id')
+        //         ->where('created_at', '>', now()->subDays(1))
+        //         ->count();
 
-		$license = in_array($request->input('license'), License::keys()) ? $request->input('license') : null;
+        //     return $dailyLimit >= 1000;
+        // });
 
-		$visibility = $request->input('visibility');
-		$medias = $request->input('media');
-		$attachments = [];
-		$status = new Status;
-		$mimes = [];
-		$place = $request->input('place');
-		$cw = $request->input('cw');
-		$tagged = $request->input('tagged');
-		$optimize_media = (bool) $request->input('optimize_media');
+        // abort_if($limitReached == true, 429);
 
-		foreach($medias as $k => $media) {
-			if($k + 1 > config_cache('pixelfed.max_album_length')) {
-				continue;
-			}
-			$m = Media::findOrFail($media['id']);
-			if($m->profile_id !== $profile->id || $m->status_id) {
-				abort(403, 'Invalid media id');
-			}
-			$m->filter_class = in_array($media['filter_class'], Filter::classes()) ? $media['filter_class'] : null;
-			$m->license = $license;
-			$m->caption = isset($media['alt']) ? strip_tags($media['alt']) : null;
-			$m->order = isset($media['cursor']) && is_int($media['cursor']) ? (int) $media['cursor'] : $k;
+        $license = in_array($request->input('license'), License::keys()) ? $request->input('license') : null;
 
-			if($cw == true || $profile->cw == true) {
-				$m->is_nsfw = $cw;
-				$status->is_nsfw = $cw;
-			}
-			$m->save();
-			$attachments[] = $m;
-			array_push($mimes, $m->mime);
-		}
+        $visibility = $request->input('visibility');
+        $medias = $request->input('media');
+        $attachments = [];
+        $status = new Status;
+        $mimes = [];
+        $place = $request->input('place');
+        $cw = $request->input('cw');
+        $tagged = $request->input('tagged');
+        $optimize_media = (bool) $request->input('optimize_media');
 
-		abort_if(empty($attachments), 422);
+        foreach ($medias as $k => $media) {
+            if ($k + 1 > config_cache('pixelfed.max_album_length')) {
+                continue;
+            }
+            $m = Media::findOrFail($media['id']);
+            if ($m->profile_id !== $profile->id || $m->status_id) {
+                abort(403, 'Invalid media id');
+            }
+            $m->filter_class = in_array($media['filter_class'], Filter::classes()) ? $media['filter_class'] : null;
+            $m->license = $license;
+            $m->caption = isset($media['alt']) ? strip_tags($media['alt']) : null;
+            $m->order = isset($media['cursor']) && is_int($media['cursor']) ? (int) $media['cursor'] : $k;
 
-		$mediaType = StatusController::mimeTypeCheck($mimes);
+            if ($cw == true || $profile->cw == true) {
+                $m->is_nsfw = $cw;
+                $status->is_nsfw = $cw;
+            }
+            $m->save();
+            $attachments[] = $m;
+            array_push($mimes, $m->mime);
+        }
 
-		if(in_array($mediaType, ['photo', 'video', 'photo:album']) == false) {
-			abort(400, __('exception.compose.invalid.album'));
-		}
+        abort_if(empty($attachments), 422);
 
-		if($place && is_array($place)) {
-			$status->place_id = $place['id'];
-		}
+        $mediaType = StatusController::mimeTypeCheck($mimes);
 
-		if($request->filled('comments_disabled')) {
-			$status->comments_disabled = (bool) $request->input('comments_disabled');
-		}
+        if (in_array($mediaType, ['photo', 'video', 'photo:album']) == false) {
+            abort(400, __('exception.compose.invalid.album'));
+        }
 
-		if($request->filled('spoiler_text') && $cw) {
-			$status->cw_summary = $request->input('spoiler_text');
-		}
+        if ($place && is_array($place)) {
+            $status->place_id = $place['id'];
+        }
 
-		$status->caption = strip_tags($request->caption);
-		$status->rendered = Autolink::create()->autolink($status->caption);
-		$status->scope = 'draft';
-		$status->visibility = 'draft';
-		$status->profile_id = $profile->id;
-		$status->save();
+        if ($request->filled('comments_disabled')) {
+            $status->comments_disabled = (bool) $request->input('comments_disabled');
+        }
 
-		foreach($attachments as $media) {
-			$media->status_id = $status->id;
-			$media->save();
-		}
+        if ($request->filled('spoiler_text') && $cw) {
+            $status->cw_summary = $request->input('spoiler_text');
+        }
 
-		$visibility = $profile->unlisted == true && $visibility == 'public' ? 'unlisted' : $visibility;
-		$visibility = $profile->is_private ? 'private' : $visibility;
-		$cw = $profile->cw == true ? true : $cw;
-		$status->is_nsfw = $cw;
-		$status->visibility = $visibility;
-		$status->scope = $visibility;
-		$status->type = $mediaType;
-		$status->save();
+        $defaultCaption = config_cache('database.default') === 'mysql' ? null : "";
+        $status->caption = strip_tags($request->input('caption')) ?? $defaultCaption;
+        $status->rendered = $defaultCaption;
+        $status->scope = 'draft';
+        $status->visibility = 'draft';
+        $status->profile_id = $profile->id;
+        $status->save();
 
-		foreach($tagged as $tg) {
-			$mt = new MediaTag;
-			$mt->status_id = $status->id;
-			$mt->media_id = $status->media->first()->id;
-			$mt->profile_id = $tg['id'];
-			$mt->tagged_username = $tg['name'];
-			$mt->is_public = true;
-			$mt->metadata = json_encode([
-				'_v' => 1,
-			]);
-			$mt->save();
-			MediaTagService::set($mt->status_id, $mt->profile_id);
-			MediaTagService::sendNotification($mt);
-		}
+        foreach ($attachments as $media) {
+            $media->status_id = $status->id;
+            $media->save();
+        }
 
-		if($request->filled('collections')) {
-			$collections = Collection::whereProfileId($profile->id)
-				->find($request->input('collections'))
-				->each(function($collection) use($status) {
-					$count = $collection->items()->count();
-					CollectionItem::firstOrCreate([
-						'collection_id' => $collection->id,
-						'object_type' => 'App\Status',
-						'object_id' => $status->id
-					], [
-						'order' => $count
-					]);
+        $visibility = $profile->unlisted == true && $visibility == 'public' ? 'unlisted' : $visibility;
+        $visibility = $profile->is_private ? 'private' : $visibility;
+        $cw = $profile->cw == true ? true : $cw;
+        $status->is_nsfw = $cw;
+        $status->visibility = $visibility;
+        $status->scope = $visibility;
+        $status->type = $mediaType;
+        $status->save();
 
-					CollectionService::addItem(
-						$collection->id,
-						$status->id,
-						$count
-					);
+        foreach ($tagged as $tg) {
+            $mt = new MediaTag;
+            $mt->status_id = $status->id;
+            $mt->media_id = $status->media->first()->id;
+            $mt->profile_id = $tg['id'];
+            $mt->tagged_username = $tg['name'];
+            $mt->is_public = true;
+            $mt->metadata = json_encode([
+                '_v' => 1,
+            ]);
+            $mt->save();
+            MediaTagService::set($mt->status_id, $mt->profile_id);
+            MediaTagService::sendNotification($mt);
+        }
 
-					$collection->updated_at = now();
+        if ($request->filled('collections')) {
+            $collections = Collection::whereProfileId($profile->id)
+                ->find($request->input('collections'))
+                ->each(function ($collection) use ($status) {
+                    $count = $collection->items()->count();
+                    CollectionItem::firstOrCreate([
+                        'collection_id' => $collection->id,
+                        'object_type' => 'App\Status',
+                        'object_id' => $status->id,
+                    ], [
+                        'order' => $count,
+                    ]);
+
+                    CollectionService::addItem(
+                        $collection->id,
+                        $status->id,
+                        $count
+                    );
+
+                    $collection->updated_at = now();
                     $collection->save();
                     CollectionService::setCollection($collection->id, $collection);
-				});
-		}
+                });
+        }
 
-		NewStatusPipeline::dispatch($status);
-		Cache::forget('user:account:id:'.$profile->user_id);
-		Cache::forget('_api:statuses:recent_9:'.$profile->id);
-		Cache::forget('profile:status_count:'.$profile->id);
-		Cache::forget('status:transformer:media:attachments:'.$status->id);
-		Cache::forget($user->storageUsedKey());
-		Cache::forget('profile:embed:' . $status->profile_id);
-		Cache::forget($limitKey);
+        NewStatusPipeline::dispatch($status);
+        Cache::forget('user:account:id:'.$profile->user_id);
+        Cache::forget('_api:statuses:recent_9:'.$profile->id);
+        Cache::forget('profile:status_count:'.$profile->id);
+        Cache::forget('status:transformer:media:attachments:'.$status->id);
+        Cache::forget('profile:embed:'.$status->profile_id);
+        Cache::forget($limitKey);
 
-		return $status->url();
-	}
+        return $status->url();
+    }
 
-	public function storeText(Request $request)
-	{
-		abort_unless(config('exp.top'), 404);
-		$this->validate($request, [
-			'caption' => 'nullable|string|max:'.config('pixelfed.max_caption_length', 500),
-			'cw' => 'nullable|boolean',
-			'visibility' => 'required|string|in:public,private,unlisted|min:2|max:10',
-			'place' => 'nullable',
-			'comments_disabled' => 'nullable',
-			'tagged' => 'nullable',
-		]);
+    public function storeText(Request $request)
+    {
+        abort_unless(config('exp.top'), 404);
+        $this->validate($request, [
+            'caption' => 'nullable|string|max:'.config_cache('pixelfed.max_caption_length', 500),
+            'cw' => 'nullable|boolean',
+            'visibility' => 'required|string|in:public,private,unlisted|min:2|max:10',
+            'place' => 'nullable',
+            'comments_disabled' => 'nullable',
+            'tagged' => 'nullable',
+        ]);
 
-		if(config('costar.enabled') == true) {
-			$blockedKeywords = config('costar.keyword.block');
-			if($blockedKeywords !== null && $request->caption) {
-				$keywords = config('costar.keyword.block');
-				foreach($keywords as $kw) {
-					if(Str::contains($request->caption, $kw) == true) {
-						abort(400, 'Invalid object');
-					}
-				}
-			}
-		}
+        abort_if($request->user()->has_roles && ! UserRoleService::can('can-post', $request->user()->id), 403, 'Invalid permissions for this action');
 
-		$user = Auth::user();
-		$profile = $user->profile;
-		$visibility = $request->input('visibility');
-		$status = new Status;
-		$place = $request->input('place');
-		$cw = $request->input('cw');
-		$tagged = $request->input('tagged');
+        if (config('costar.enabled') == true) {
+            $blockedKeywords = config('costar.keyword.block');
+            if ($blockedKeywords !== null && $request->caption) {
+                $keywords = config('costar.keyword.block');
+                foreach ($keywords as $kw) {
+                    if (Str::contains($request->caption, $kw) == true) {
+                        abort(400, 'Invalid object');
+                    }
+                }
+            }
+        }
 
-		if($place && is_array($place)) {
-			$status->place_id = $place['id'];
-		}
+        $user = $request->user();
+        $profile = $user->profile;
+        $visibility = $request->input('visibility');
+        $status = new Status;
+        $place = $request->input('place');
+        $cw = $request->input('cw');
+        $tagged = $request->input('tagged');
+        $defaultCaption = config_cache('database.default') === 'mysql' ? null : "";
 
-		if($request->filled('comments_disabled')) {
-			$status->comments_disabled = (bool) $request->input('comments_disabled');
-		}
+        if ($place && is_array($place)) {
+            $status->place_id = $place['id'];
+        }
 
-		$status->caption = strip_tags($request->caption);
-		$status->profile_id = $profile->id;
-		$entities = [];
-		$visibility = $profile->unlisted == true && $visibility == 'public' ? 'unlisted' : $visibility;
-		$cw = $profile->cw == true ? true : $cw;
-		$status->is_nsfw = $cw;
-		$status->visibility = $visibility;
-		$status->scope = $visibility;
-		$status->type = 'text';
-		$status->rendered = Autolink::create()->autolink($status->caption);
-		$status->entities = json_encode(array_merge([
-			'timg' => [
-				'version' => 0,
-				'bg_id' => 1,
-				'font_size' => strlen($status->caption) <= 140 ? 'h1' : 'h3',
-				'length' => strlen($status->caption),
-			]
-		], $entities), JSON_UNESCAPED_SLASHES);
-		$status->save();
+        if ($request->filled('comments_disabled')) {
+            $status->comments_disabled = (bool) $request->input('comments_disabled');
+        }
 
-		foreach($tagged as $tg) {
-			$mt = new MediaTag;
-			$mt->status_id = $status->id;
-			$mt->media_id = $status->media->first()->id;
-			$mt->profile_id = $tg['id'];
-			$mt->tagged_username = $tg['name'];
-			$mt->is_public = true;
-			$mt->metadata = json_encode([
-				'_v' => 1,
-			]);
-			$mt->save();
-			MediaTagService::set($mt->status_id, $mt->profile_id);
-			MediaTagService::sendNotification($mt);
-		}
+        $status->caption = $request->filled('caption') ? strip_tags($request->caption) : $defaultCaption;
+        $status->rendered = $defaultCaption;
+        $status->profile_id = $profile->id;
+        $entities = [];
+        $visibility = $profile->unlisted == true && $visibility == 'public' ? 'unlisted' : $visibility;
+        $cw = $profile->cw == true ? true : $cw;
+        $status->is_nsfw = $cw;
+        $status->visibility = $visibility;
+        $status->scope = $visibility;
+        $status->type = 'text';
+        $status->entities = json_encode(array_merge([
+            'timg' => [
+                'version' => 0,
+                'bg_id' => 1,
+                'font_size' => strlen($status->caption) <= 140 ? 'h1' : 'h3',
+                'length' => strlen($status->caption),
+            ],
+        ], $entities), JSON_UNESCAPED_SLASHES);
+        $status->save();
 
+        foreach ($tagged as $tg) {
+            $mt = new MediaTag;
+            $mt->status_id = $status->id;
+            $mt->media_id = $status->media->first()->id;
+            $mt->profile_id = $tg['id'];
+            $mt->tagged_username = $tg['name'];
+            $mt->is_public = true;
+            $mt->metadata = json_encode([
+                '_v' => 1,
+            ]);
+            $mt->save();
+            MediaTagService::set($mt->status_id, $mt->profile_id);
+            MediaTagService::sendNotification($mt);
+        }
 
-		Cache::forget('user:account:id:'.$profile->user_id);
-		Cache::forget('_api:statuses:recent_9:'.$profile->id);
-		Cache::forget('profile:status_count:'.$profile->id);
+        Cache::forget('user:account:id:'.$profile->user_id);
+        Cache::forget('_api:statuses:recent_9:'.$profile->id);
+        Cache::forget('profile:status_count:'.$profile->id);
 
-		return $status->url();
-	}
+        return $status->url();
+    }
 
-	public function mediaProcessingCheck(Request $request)
-	{
-		$this->validate($request, [
-			'id' => 'required|integer|min:1'
-		]);
+    public function mediaProcessingCheck(Request $request)
+    {
+        $this->validate($request, [
+            'id' => 'required|integer|min:1',
+        ]);
 
-		$media = Media::whereUserId($request->user()->id)
-			->whereNull('status_id')
-			->findOrFail($request->input('id'));
+        abort_if($request->user()->has_roles && ! UserRoleService::can('can-post', $request->user()->id), 403, 'Invalid permissions for this action');
 
-		if(config('pixelfed.media_fast_process')) {
-			return [
-				'finished' => true
-			];
-		}
+        $media = Media::whereUserId($request->user()->id)
+            ->whereNull('status_id')
+            ->findOrFail($request->input('id'));
 
-		$finished = false;
+        if (config('pixelfed.media_fast_process')) {
+            return [
+                'finished' => true,
+            ];
+        }
 
-		switch ($media->mime) {
-			case 'image/jpeg':
-			case 'image/png':
-			case 'video/mp4':
-				$finished = config_cache('pixelfed.cloud_storage') ? (bool) $media->cdn_url : (bool) $media->processed_at;
-				break;
+        $finished = false;
 
-			default:
-				# code...
-				break;
-		}
+        switch ($media->mime) {
+            case 'image/jpeg':
+            case 'image/png':
+            case 'video/mp4':
+                $finished = (bool) config_cache('pixelfed.cloud_storage') ? (bool) $media->cdn_url : (bool) $media->processed_at;
+                break;
 
-		return [
-			'finished' => $finished
-		];
-	}
+            default:
+                // code...
+                break;
+        }
 
-	public function composeSettings(Request $request)
-	{
-		$uid = $request->user()->id;
-		$default = [
-			'default_license' => 1,
-			'media_descriptions' => false,
-			'max_altext_length' => config_cache('pixelfed.max_altext_length')
-		];
-		$settings = AccountService::settings($uid);
-		if(isset($settings['other']) && isset($settings['other']['scope'])) {
-			$s = $settings['compose_settings'];
-			$s['default_scope'] = $settings['other']['scope'];
-			$settings['compose_settings'] = $s;
-		}
+        return [
+            'finished' => $finished,
+        ];
+    }
 
-		return array_merge($default, $settings['compose_settings']);
-	}
+    public function composeSettings(Request $request)
+    {
+        $uid = $request->user()->id;
+        abort_if($request->user()->has_roles && ! UserRoleService::can('can-post', $request->user()->id), 403, 'Invalid permissions for this action');
 
-	public function createPoll(Request $request)
-	{
-		$this->validate($request, [
-			'caption' => 'nullable|string|max:'.config('pixelfed.max_caption_length', 500),
-			'cw' => 'nullable|boolean',
-			'visibility' => 'required|string|in:public,private',
-			'comments_disabled' => 'nullable',
-			'expiry' => 'required|in:60,360,1440,10080',
-			'pollOptions' => 'required|array|min:1|max:4'
-		]);
+        $default = [
+            'default_license' => 1,
+            'media_descriptions' => false,
+            'max_altext_length' => config_cache('pixelfed.max_altext_length'),
+        ];
+        $settings = AccountService::settings($uid);
+        if (isset($settings['other']) && isset($settings['other']['scope'])) {
+            $s = $settings['compose_settings'];
+            $s['default_scope'] = $settings['other']['scope'];
+            $settings['compose_settings'] = $s;
+        }
 
-		abort_if(config('instance.polls.enabled') == false, 404, 'Polls not enabled');
+        return array_merge($default, $settings['compose_settings']);
+    }
 
-		abort_if(Status::whereType('poll')
-			->whereProfileId($request->user()->profile_id)
-			->whereCaption($request->input('caption'))
-			->where('created_at', '>', now()->subDays(2))
-			->exists()
-		, 422, 'Duplicate detected.');
+    public function createPoll(Request $request)
+    {
+        $this->validate($request, [
+            'caption' => 'nullable|string|max:'.config_cache('pixelfed.max_caption_length', 500),
+            'cw' => 'nullable|boolean',
+            'visibility' => 'required|string|in:public,private',
+            'comments_disabled' => 'nullable',
+            'expiry' => 'required|in:60,360,1440,10080',
+            'pollOptions' => 'required|array|min:1|max:4',
+        ]);
+        abort(404);
+        abort_if(config('instance.polls.enabled') == false, 404, 'Polls not enabled');
+        abort_if($request->user()->has_roles && ! UserRoleService::can('can-post', $request->user()->id), 403, 'Invalid permissions for this action');
 
-		$status = new Status;
-		$status->profile_id = $request->user()->profile_id;
-		$status->caption = $request->input('caption');
-		$status->rendered = Autolink::create()->autolink($status->caption);
-		$status->visibility = 'draft';
-		$status->scope = 'draft';
-		$status->type = 'poll';
-		$status->local = true;
-		$status->save();
+        abort_if(Status::whereType('poll')
+            ->whereProfileId($request->user()->profile_id)
+            ->whereCaption($request->input('caption'))
+            ->where('created_at', '>', now()->subDays(2))
+            ->exists(), 422, 'Duplicate detected.');
 
-		$poll = new Poll;
-		$poll->status_id = $status->id;
-		$poll->profile_id = $status->profile_id;
-		$poll->poll_options = $request->input('pollOptions');
-		$poll->expires_at = now()->addMinutes($request->input('expiry'));
-		$poll->cached_tallies = collect($poll->poll_options)->map(function($o) {
-			return 0;
-		})->toArray();
-		$poll->save();
+        $status = new Status;
+        $status->profile_id = $request->user()->profile_id;
+        $status->caption = $request->input('caption');
+        $status->visibility = 'draft';
+        $status->scope = 'draft';
+        $status->type = 'poll';
+        $status->local = true;
+        $status->save();
 
-		$status->visibility = $request->input('visibility');
-		$status->scope = $request->input('visibility');
-		$status->save();
+        $poll = new Poll;
+        $poll->status_id = $status->id;
+        $poll->profile_id = $status->profile_id;
+        $poll->poll_options = $request->input('pollOptions');
+        $poll->expires_at = now()->addMinutes($request->input('expiry'));
+        $poll->cached_tallies = collect($poll->poll_options)->map(function ($o) {
+            return 0;
+        })->toArray();
+        $poll->save();
 
-		NewStatusPipeline::dispatch($status);
+        $status->visibility = $request->input('visibility');
+        $status->scope = $request->input('visibility');
+        $status->save();
 
-		return ['url' => $status->url()];
-	}
+        NewStatusPipeline::dispatch($status);
+
+        return ['url' => $status->url()];
+    }
 }
diff --git a/app/Http/Controllers/ContactController.php b/app/Http/Controllers/ContactController.php
index 3123b8d16..dbba9599a 100644
--- a/app/Http/Controllers/ContactController.php
+++ b/app/Http/Controllers/ContactController.php
@@ -50,4 +50,15 @@ class ContactController extends Controller
 
 		return redirect()->back()->with('status', 'Success - Your message has been sent to admins.');
 	}
+
+    public function showAdminResponse(Request $request, $id)
+    {
+        abort_if(!$request->user(), 404);
+        $uid = $request->user()->id;
+        $contact = Contact::whereUserId($uid)
+            ->whereNotNull('response')
+            ->whereNotNull('responded_at')
+            ->findOrFail($id);
+        return view('site.contact.admin-response', compact('contact'));
+    }
 }
diff --git a/app/Http/Controllers/CuratedRegisterController.php b/app/Http/Controllers/CuratedRegisterController.php
new file mode 100644
index 000000000..58bddb498
--- /dev/null
+++ b/app/Http/Controllers/CuratedRegisterController.php
@@ -0,0 +1,399 @@
+<?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));
+    }
+}
diff --git a/app/Http/Controllers/DirectMessageController.php b/app/Http/Controllers/DirectMessageController.php
index 1f7e04e59..b2e0df3a2 100644
--- a/app/Http/Controllers/DirectMessageController.php
+++ b/app/Http/Controllers/DirectMessageController.php
@@ -2,857 +2,909 @@
 
 namespace App\Http\Controllers;
 
-use Auth, Cache;
-use Illuminate\Http\Request;
-use App\{
-	DirectMessage,
-	Media,
-	Notification,
-	Profile,
-	Status,
-	User,
-	UserFilter,
-	UserSetting
-};
-use App\Services\MediaPathService;
-use App\Services\MediaBlocklistService;
-use App\Jobs\StatusPipeline\NewStatusPipeline;
-use Illuminate\Support\Str;
-use App\Util\ActivityPub\Helpers;
-use App\Services\AccountService;
-use App\Services\StatusService;
-use App\Services\WebfingerService;
+use App\DirectMessage;
+use App\Jobs\DirectPipeline\DirectDeletePipeline;
+use App\Jobs\DirectPipeline\DirectDeliverPipeline;
+use App\Jobs\StatusPipeline\StatusDelete;
+use App\Media;
 use App\Models\Conversation;
+use App\Notification;
+use App\Profile;
+use App\Services\AccountService;
+use App\Services\MediaBlocklistService;
+use App\Services\MediaPathService;
+use App\Services\MediaService;
+use App\Services\StatusService;
+use App\Services\UserFilterService;
+use App\Services\UserRoleService;
+use App\Services\UserStorageService;
+use App\Services\WebfingerService;
+use App\Status;
+use App\UserFilter;
+use App\Util\ActivityPub\Helpers;
+use App\Util\Lexer\Autolink;
+use Illuminate\Http\Request;
+use Illuminate\Support\Str;
 
 class DirectMessageController extends Controller
 {
-	public function __construct()
-	{
-		$this->middleware('auth');
-	}
-
-	public function browse(Request $request)
-	{
-		$this->validate($request, [
-			'a' => 'nullable|string|in:inbox,sent,filtered',
-			'page' => 'nullable|integer|min:1|max:99'
-		]);
-
-		$profile = $request->user()->profile_id;
-		$action = $request->input('a', 'inbox');
-		$page = $request->input('page');
-
-		if(config('database.default') == 'pgsql') {
-			if($action == 'inbox') {
-				$dms = DirectMessage::select('id', 'type', 'to_id', 'from_id', 'id', 'status_id', 'is_hidden', 'meta', 'created_at', 'read_at')
-				->whereToId($profile)
-				->with(['author','status'])
-				->whereIsHidden(false)
-				->when($page, function($q, $page) {
-					if($page > 1) {
-						return $q->offset($page * 8 - 8);
-					}
-				})
-				->latest()
-				->get()
-				->unique('from_id')
-				->take(8)
-				->map(function($r) use($profile) {
-					return $r->from_id !== $profile ? [
-						'id' => (string) $r->from_id,
-						'name' => $r->author->name,
-						'username' => $r->author->username,
-						'avatar' => $r->author->avatarUrl(),
-						'url' => $r->author->url(),
-						'isLocal' => (bool) !$r->author->domain,
-						'domain' => $r->author->domain,
-						'timeAgo' => $r->created_at->diffForHumans(null, true, true),
-						'lastMessage' => $r->status->caption,
-						'messages' => []
-					] : [
-						'id' => (string) $r->to_id,
-						'name' => $r->recipient->name,
-						'username' => $r->recipient->username,
-						'avatar' => $r->recipient->avatarUrl(),
-						'url' => $r->recipient->url(),
-						'isLocal' => (bool) !$r->recipient->domain,
-						'domain' => $r->recipient->domain,
-						'timeAgo' => $r->created_at->diffForHumans(null, true, true),
-						'lastMessage' => $r->status->caption,
-						'messages' => []
-					];
-				})->values();
-			}
-
-			if($action == 'sent') {
-				$dms = DirectMessage::select('id', 'type', 'to_id', 'from_id', 'id', 'status_id', 'is_hidden', 'meta', 'created_at', 'read_at')
-				->whereFromId($profile)
-				->with(['author','status'])
-				->orderBy('id', 'desc')
-				->when($page, function($q, $page) {
-					if($page > 1) {
-						return $q->offset($page * 8 - 8);
-					}
-				})
-				->get()
-				->unique('to_id')
-				->take(8)
-				->map(function($r) use($profile) {
-					return $r->from_id !== $profile ? [
-						'id' => (string) $r->from_id,
-						'name' => $r->author->name,
-						'username' => $r->author->username,
-						'avatar' => $r->author->avatarUrl(),
-						'url' => $r->author->url(),
-						'isLocal' => (bool) !$r->author->domain,
-						'domain' => $r->author->domain,
-						'timeAgo' => $r->created_at->diffForHumans(null, true, true),
-						'lastMessage' => $r->status->caption,
-						'messages' => []
-					] : [
-						'id' => (string) $r->to_id,
-						'name' => $r->recipient->name,
-						'username' => $r->recipient->username,
-						'avatar' => $r->recipient->avatarUrl(),
-						'url' => $r->recipient->url(),
-						'isLocal' => (bool) !$r->recipient->domain,
-						'domain' => $r->recipient->domain,
-						'timeAgo' => $r->created_at->diffForHumans(null, true, true),
-						'lastMessage' => $r->status->caption,
-						'messages' => []
-					];
-				});
-			}
-
-			if($action == 'filtered') {
-				$dms = DirectMessage::select('id', 'type', 'to_id', 'from_id', 'id', 'status_id', 'is_hidden', 'meta', 'created_at', 'read_at')
-				->whereToId($profile)
-				->with(['author','status'])
-				->whereIsHidden(true)
-				->orderBy('id', 'desc')
-				->when($page, function($q, $page) {
-					if($page > 1) {
-						return $q->offset($page * 8 - 8);
-					}
-				})
-				->get()
-				->unique('from_id')
-				->take(8)
-				->map(function($r) use($profile) {
-					return $r->from_id !== $profile ? [
-						'id' => (string) $r->from_id,
-						'name' => $r->author->name,
-						'username' => $r->author->username,
-						'avatar' => $r->author->avatarUrl(),
-						'url' => $r->author->url(),
-						'isLocal' => (bool) !$r->author->domain,
-						'domain' => $r->author->domain,
-						'timeAgo' => $r->created_at->diffForHumans(null, true, true),
-						'lastMessage' => $r->status->caption,
-						'messages' => []
-					] : [
-						'id' => (string) $r->to_id,
-						'name' => $r->recipient->name,
-						'username' => $r->recipient->username,
-						'avatar' => $r->recipient->avatarUrl(),
-						'url' => $r->recipient->url(),
-						'isLocal' => (bool) !$r->recipient->domain,
-						'domain' => $r->recipient->domain,
-						'timeAgo' => $r->created_at->diffForHumans(null, true, true),
-						'lastMessage' => $r->status->caption,
-						'messages' => []
-					];
-				});
-			}
-		} elseif(config('database.default') == 'mysql') {
-			if($action == 'inbox') {
-				$dms = DirectMessage::selectRaw('*, max(created_at) as createdAt')
-				->whereToId($profile)
-				->with(['author','status'])
-				->whereIsHidden(false)
-				->groupBy('from_id')
-				->latest()
-				->when($page, function($q, $page) {
-					if($page > 1) {
-						return $q->offset($page * 8 - 8);
-					}
-				})
-				->limit(8)
-				->get()
-				->map(function($r) use($profile) {
-					return $r->from_id !== $profile ? [
-						'id' => (string) $r->from_id,
-						'name' => $r->author->name,
-						'username' => $r->author->username,
-						'avatar' => $r->author->avatarUrl(),
-						'url' => $r->author->url(),
-						'isLocal' => (bool) !$r->author->domain,
-						'domain' => $r->author->domain,
-						'timeAgo' => $r->created_at->diffForHumans(null, true, true),
-						'lastMessage' => $r->status->caption,
-						'messages' => []
-					] : [
-						'id' => (string) $r->to_id,
-						'name' => $r->recipient->name,
-						'username' => $r->recipient->username,
-						'avatar' => $r->recipient->avatarUrl(),
-						'url' => $r->recipient->url(),
-						'isLocal' => (bool) !$r->recipient->domain,
-						'domain' => $r->recipient->domain,
-						'timeAgo' => $r->created_at->diffForHumans(null, true, true),
-						'lastMessage' => $r->status->caption,
-						'messages' => []
-					];
-				});
-			}
-
-			if($action == 'sent') {
-				$dms = DirectMessage::selectRaw('*, max(created_at) as createdAt')
-				->whereFromId($profile)
-				->with(['author','status'])
-				->groupBy('to_id')
-				->orderBy('createdAt', 'desc')
-				->when($page, function($q, $page) {
-					if($page > 1) {
-						return $q->offset($page * 8 - 8);
-					}
-				})
-				->limit(8)
-				->get()
-				->map(function($r) use($profile) {
-					return $r->from_id !== $profile ? [
-						'id' => (string) $r->from_id,
-						'name' => $r->author->name,
-						'username' => $r->author->username,
-						'avatar' => $r->author->avatarUrl(),
-						'url' => $r->author->url(),
-						'isLocal' => (bool) !$r->author->domain,
-						'domain' => $r->author->domain,
-						'timeAgo' => $r->created_at->diffForHumans(null, true, true),
-						'lastMessage' => $r->status->caption,
-						'messages' => []
-					] : [
-						'id' => (string) $r->to_id,
-						'name' => $r->recipient->name,
-						'username' => $r->recipient->username,
-						'avatar' => $r->recipient->avatarUrl(),
-						'url' => $r->recipient->url(),
-						'isLocal' => (bool) !$r->recipient->domain,
-						'domain' => $r->recipient->domain,
-						'timeAgo' => $r->created_at->diffForHumans(null, true, true),
-						'lastMessage' => $r->status->caption,
-						'messages' => []
-					];
-				});
-			}
-
-			if($action == 'filtered') {
-				$dms = DirectMessage::selectRaw('*, max(created_at) as createdAt')
-				->whereToId($profile)
-				->with(['author','status'])
-				->whereIsHidden(true)
-				->groupBy('from_id')
-				->orderBy('createdAt', 'desc')
-				->when($page, function($q, $page) {
-					if($page > 1) {
-						return $q->offset($page * 8 - 8);
-					}
-				})
-				->limit(8)
-				->get()
-				->map(function($r) use($profile) {
-					return $r->from_id !== $profile ? [
-						'id' => (string) $r->from_id,
-						'name' => $r->author->name,
-						'username' => $r->author->username,
-						'avatar' => $r->author->avatarUrl(),
-						'url' => $r->author->url(),
-						'isLocal' => (bool) !$r->author->domain,
-						'domain' => $r->author->domain,
-						'timeAgo' => $r->created_at->diffForHumans(null, true, true),
-						'lastMessage' => $r->status->caption,
-						'messages' => []
-					] : [
-						'id' => (string) $r->to_id,
-						'name' => $r->recipient->name,
-						'username' => $r->recipient->username,
-						'avatar' => $r->recipient->avatarUrl(),
-						'url' => $r->recipient->url(),
-						'isLocal' => (bool) !$r->recipient->domain,
-						'domain' => $r->recipient->domain,
-						'timeAgo' => $r->created_at->diffForHumans(null, true, true),
-						'lastMessage' => $r->status->caption,
-						'messages' => []
-					];
-				});
-			}
-		}
-
-		return response()->json($dms->all());
-	}
-
-	public function create(Request $request)
-	{
-		$this->validate($request, [
-			'to_id' => 'required',
-			'message' => 'required|string|min:1|max:500',
-			'type'  => 'required|in:text,emoji'
-		]);
-
-		$profile = $request->user()->profile;
-		$recipient = Profile::where('id', '!=', $profile->id)->findOrFail($request->input('to_id'));
-
-		abort_if(in_array($profile->id, $recipient->blockedIds()->toArray()), 403);
-		$msg = $request->input('message');
-
-		if((!$recipient->domain && $recipient->user->settings->public_dm == false) || $recipient->is_private) {
-			if($recipient->follows($profile) == true) {
-				$hidden = false;
-			} else {
-				$hidden = true;
-			}
-		} else {
-			$hidden = false;
-		}
-
-		$status = new Status;
-		$status->profile_id = $profile->id;
-		$status->caption = $msg;
-		$status->rendered = $msg;
-		$status->visibility = 'direct';
-		$status->scope = 'direct';
-		$status->in_reply_to_profile_id = $recipient->id;
-		$status->save();
-
-		$dm = new DirectMessage;
-		$dm->to_id = $recipient->id;
-		$dm->from_id = $profile->id;
-		$dm->status_id = $status->id;
-		$dm->is_hidden = $hidden;
-		$dm->type = $request->input('type');
-		$dm->save();
-
-		Conversation::updateOrInsert(
-			[
-				'to_id' => $recipient->id,
-				'from_id' => $profile->id
-			],
-			[
-				'type' => $dm->type,
-				'status_id' => $status->id,
-				'dm_id' => $dm->id,
-				'is_hidden' => $hidden
-			]
-		);
-
-		if(filter_var($msg, FILTER_VALIDATE_URL)) {
-			if(Helpers::validateUrl($msg)) {
-				$dm->type = 'link';
-				$dm->meta = [
-					'domain' => parse_url($msg, PHP_URL_HOST),
-					'local' => parse_url($msg, PHP_URL_HOST) ==
-					parse_url(config('app.url'), PHP_URL_HOST)
-				];
-				$dm->save();
-			}
-		}
-
-		$nf = UserFilter::whereUserId($recipient->id)
-		->whereFilterableId($profile->id)
-		->whereFilterableType('App\Profile')
-		->whereFilterType('dm.mute')
-		->exists();
-
-		if($recipient->domain == null && $hidden == false && !$nf) {
-			$notification = new Notification();
-			$notification->profile_id = $recipient->id;
-			$notification->actor_id = $profile->id;
-			$notification->action = 'dm';
-			$notification->item_id = $dm->id;
-			$notification->item_type = "App\DirectMessage";
-			$notification->save();
-		}
-
-		if($recipient->domain) {
-			$this->remoteDeliver($dm);
-		}
-
-		$res = [
-			'id' => (string) $dm->id,
-			'isAuthor' => $profile->id == $dm->from_id,
-			'reportId' => (string) $dm->status_id,
-			'hidden' => (bool) $dm->is_hidden,
-			'type'  => $dm->type,
-			'text' => $dm->status->caption,
-			'media' => null,
-			'timeAgo' => $dm->created_at->diffForHumans(null,null,true),
-			'seen' => $dm->read_at != null,
-			'meta' => $dm->meta
-		];
-
-		return response()->json($res);
-	}
-
-	public function thread(Request $request)
-	{
-		$this->validate($request, [
-			'pid' => 'required'
-		]);
-		$uid = $request->user()->profile_id;
-		$pid = $request->input('pid');
-		$max_id = $request->input('max_id');
-		$min_id = $request->input('min_id');
-
-		$r = Profile::findOrFail($pid);
-
-		if($min_id) {
-			$res = DirectMessage::select('*')
-			->where('id', '>', $min_id)
-			->where(function($q) use($pid,$uid) {
-				return $q->where([['from_id',$pid],['to_id',$uid]
-			])->orWhere([['from_id',$uid],['to_id',$pid]]);
-			})
-			->latest()
-			->take(8)
-			->get();
-		} else if ($max_id) {
-			$res = DirectMessage::select('*')
-			->where('id', '<', $max_id)
-			->where(function($q) use($pid,$uid) {
-				return $q->where([['from_id',$pid],['to_id',$uid]
-			])->orWhere([['from_id',$uid],['to_id',$pid]]);
-			})
-			->latest()
-			->take(8)
-			->get();
-		} else {
-			$res = DirectMessage::where(function($q) use($pid,$uid) {
-				return $q->where([['from_id',$pid],['to_id',$uid]
-			])->orWhere([['from_id',$uid],['to_id',$pid]]);
-			})
-			->latest()
-			->take(8)
-			->get();
-		}
-
-		$res = $res->filter(function($s) {
-			return $s && $s->status;
-		})
-		->map(function($s) use ($uid) {
-			return [
-				'id' => (string) $s->id,
-				'hidden' => (bool) $s->is_hidden,
-				'isAuthor' => $uid == $s->from_id,
-				'type'  => $s->type,
-				'text' => $s->status->caption,
-				'media' => $s->status->firstMedia() ? $s->status->firstMedia()->url() : null,
-				'timeAgo' => $s->created_at->diffForHumans(null,null,true),
-				'seen' => $s->read_at != null,
-				'reportId' => (string) $s->status_id,
-				'meta' => json_decode($s->meta,true)
-			];
-		})
-		->values();
-
-		$w = [
-			'id' => (string) $r->id,
-			'name' => $r->name,
-			'username' => $r->username,
-			'avatar' => $r->avatarUrl(),
-			'url' => $r->url(),
-			'muted' => UserFilter::whereUserId($uid)
-				->whereFilterableId($r->id)
-				->whereFilterableType('App\Profile')
-				->whereFilterType('dm.mute')
-				->first() ? true : false,
-			'isLocal' => (bool) !$r->domain,
-			'domain' => $r->domain,
-			'timeAgo' => $r->created_at->diffForHumans(null, true, true),
-			'lastMessage' => '',
-			'messages' => $res
-		];
-
-		return response()->json($w, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
-	}
-
-	public function delete(Request $request)
-	{
-		$this->validate($request, [
-			'id' => 'required'
-		]);
-
-		$sid = $request->input('id');
-		$pid = $request->user()->profile_id;
-
-		$dm = DirectMessage::whereFromId($pid)
-			->whereStatusId($sid)
-			->firstOrFail();
-
-		$status = Status::whereProfileId($pid)
-			->findOrFail($dm->status_id);
-
-		$recipient = AccountService::get($dm->to_id);
-
-		if(!$recipient) {
-			return response('', 422);
-		}
-
-		if($recipient['local'] == false) {
-			$dmc = $dm;
-			$this->remoteDelete($dmc);
-		}
-
-		if(Conversation::whereStatusId($sid)->count()) {
-			$latest = DirectMessage::where(['from_id' => $dm->from_id, 'to_id' => $dm->to_id])
-				->orWhere(['to_id' => $dm->from_id, 'from_id' => $dm->to_id])
-				->latest()
-				->first();
-
-			if($latest->status_id == $sid) {
-				Conversation::where(['to_id' => $dm->from_id, 'from_id' => $dm->to_id])
-					->update([
-						'updated_at' => $latest->updated_at,
-						'status_id' => $latest->status_id,
-						'type' => $latest->type,
-						'is_hidden' => false
-					]);
-
-				Conversation::where(['to_id' => $dm->to_id, 'from_id' => $dm->from_id])
-					->update([
-						'updated_at' => $latest->updated_at,
-						'status_id' => $latest->status_id,
-						'type' => $latest->type,
-						'is_hidden' => false
-					]);
-			} else {
-				Conversation::where([
-					'status_id' => $sid,
-					'to_id' => $dm->from_id,
-					'from_id' => $dm->to_id
-				])->delete();
-
-				Conversation::where([
-					'status_id' => $sid,
-					'from_id' => $dm->from_id,
-					'to_id' => $dm->to_id
-				])->delete();
-			}
-		}
-
-		StatusService::del($status->id, true);
-
-		$status->delete();
-		$dm->delete();
-
-		return [200];
-	}
-
-	public function get(Request $request, $id)
-	{
-		$pid = $request->user()->profile_id;
-		$dm = DirectMessage::whereStatusId($id)->firstOrFail();
-		abort_if($pid !== $dm->to_id && $pid !== $dm->from_id, 404);
-		return response()->json($dm, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
-	}
-
-	public function mediaUpload(Request $request)
-	{
-		$this->validate($request, [
-			'file'      => function() {
-				return [
-					'required',
-					'mimetypes:' . config_cache('pixelfed.media_types'),
-					'max:' . config_cache('pixelfed.max_photo_size'),
-				];
-			},
-			'to_id'     => 'required'
-		]);
-
-		$user = $request->user();
-		$profile = $user->profile;
-		$recipient = Profile::where('id', '!=', $profile->id)->findOrFail($request->input('to_id'));
-		abort_if(in_array($profile->id, $recipient->blockedIds()->toArray()), 403);
-
-		if((!$recipient->domain && $recipient->user->settings->public_dm == false) || $recipient->is_private) {
-			if($recipient->follows($profile) == true) {
-				$hidden = false;
-			} else {
-				$hidden = true;
-			}
-		} else {
-			$hidden = false;
-		}
-
-		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.');
-			}
-		}
-		$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.');
-		}
-
-		$storagePath = MediaPathService::get($user, 2) . Str::random(8);
-		$path = $photo->storePublicly($storagePath);
-		$hash = \hash_file('sha256', $photo);
-
-		abort_if(MediaBlocklistService::exists($hash) == true, 451);
-
-		$status = new Status;
-		$status->profile_id = $profile->id;
-		$status->caption = null;
-		$status->rendered = null;
-		$status->visibility = 'direct';
-		$status->scope = 'direct';
-		$status->in_reply_to_profile_id = $recipient->id;
-		$status->save();
-
-		$media = new Media();
-		$media->status_id = $status->id;
-		$media->profile_id = $profile->id;
-		$media->user_id = $user->id;
-		$media->media_path = $path;
-		$media->original_sha256 = $hash;
-		$media->size = $photo->getSize();
-		$media->mime = $photo->getMimeType();
-		$media->caption = null;
-		$media->filter_class = null;
-		$media->filter_name = null;
-		$media->save();
-
-		$dm = new DirectMessage;
-		$dm->to_id = $recipient->id;
-		$dm->from_id = $profile->id;
-		$dm->status_id = $status->id;
-		$dm->type = array_first(explode('/', $media->mime)) == 'video' ? 'video' : 'photo';
-		$dm->is_hidden = $hidden;
-		$dm->save();
-
-		Conversation::updateOrInsert(
-			[
-				'to_id' => $recipient->id,
-				'from_id' => $profile->id
-			],
-			[
-				'type' => $dm->type,
-				'status_id' => $status->id,
-				'dm_id' => $dm->id,
-				'is_hidden' => $hidden
-			]
-		);
-
-		if($recipient->domain) {
-			$this->remoteDeliver($dm);
-		}
-
-		return [
-			'id' => $dm->id,
-			'reportId' => (string) $dm->status_id,
-			'type' => $dm->type,
-			'url' => $media->url()
-		];
-	}
-
-	public function composeLookup(Request $request)
-	{
-		$this->validate($request, [
-			'q' => 'required|string|min:2|max:50',
-			'remote' => 'nullable',
-		]);
-
-		$q = $request->input('q');
-		$r = $request->input('remote', false);
-
-		if($r && !Str::of($q)->contains('.')) {
-			return [];
-		}
-
-		if($r && Helpers::validateUrl($q)) {
-			Helpers::profileFetch($q);
-		}
-
-		if(Str::of($q)->startsWith('@')) {
-			if(strlen($q) < 3) {
-				return [];
-			}
-			if(substr_count($q, '@') == 2) {
-				WebfingerService::lookup($q);
-			}
-			$q = mb_substr($q, 1);
-		}
-
-		$blocked = UserFilter::whereFilterableType('App\Profile')
-		->whereFilterType('block')
-		->whereFilterableId($request->user()->profile_id)
-		->pluck('user_id');
-
-		$blocked->push($request->user()->profile_id);
-
-		$results = Profile::select('id','domain','username')
-		->whereNotIn('id', $blocked)
-		->where('username','like','%'.$q.'%')
-		->orderBy('domain')
-		->limit(8)
-		->get()
-		->map(function($r) {
-			$acct = AccountService::get($r->id);
-			return [
-				'local' => (bool) !$r->domain,
-				'id' => (string) $r->id,
-				'name' => $r->username,
-				'privacy' => true,
-				'avatar' => $r->avatarUrl(),
-				'account' => $acct
-			];
-		});
-
-		return $results;
-	}
-
-	public function read(Request $request)
-	{
-		$this->validate($request, [
-			'pid' => 'required',
-			'sid' => 'required'
-		]);
-
-		$pid = $request->input('pid');
-		$sid = $request->input('sid');
-
-		$dms = DirectMessage::whereToId($request->user()->profile_id)
-		->whereFromId($pid)
-		->where('status_id', '>=', $sid)
-		->get();
-
-		$now = now();
-		foreach($dms as $dm) {
-			$dm->read_at = $now;
-			$dm->save();
-		}
-
-		return response()->json($dms->pluck('id'));
-	}
-
-	public function mute(Request $request)
-	{
-		$this->validate($request, [
-			'id' => 'required'
-		]);
-
-		$fid = $request->input('id');
-		$pid = $request->user()->profile_id;
-
-		UserFilter::firstOrCreate(
-			[
-				'user_id' => $pid,
-				'filterable_id' => $fid,
-				'filterable_type' => 'App\Profile',
-				'filter_type' => 'dm.mute'
-			]
-		);
-
-		return [200];
-	}
-
-	public function unmute(Request $request)
-	{
-		$this->validate($request, [
-			'id' => 'required'
-		]);
-
-		$fid = $request->input('id');
-		$pid = $request->user()->profile_id;
-
-		$f = UserFilter::whereUserId($pid)
-		->whereFilterableId($fid)
-		->whereFilterableType('App\Profile')
-		->whereFilterType('dm.mute')
-		->firstOrFail();
-
-		$f->delete();
-
-		return [200];
-	}
-
-	public function remoteDeliver($dm)
-	{
-		$profile = $dm->author;
-		$url = $dm->recipient->sharedInbox ?? $dm->recipient->inbox_url;
-
-		$tags = [
-			[
-				'type' => 'Mention',
-				'href' => $dm->recipient->permalink(),
-				'name' => $dm->recipient->emailUrl(),
-			]
-		];
-
-		$body = [
-			'@context' => [
-				'https://w3id.org/security/v1',
-				'https://www.w3.org/ns/activitystreams',
-			],
-			'id'                    => $dm->status->permalink(),
-			'type'                  => 'Create',
-			'actor'                 => $dm->status->profile->permalink(),
-			'published'             => $dm->status->created_at->toAtomString(),
-			'to'                    => [$dm->recipient->permalink()],
-			'cc'                    => [],
-			'object' => [
-				'id'                => $dm->status->url(),
-				'type'              => 'Note',
-				'summary'           => null,
-				'content'           => $dm->status->rendered ?? $dm->status->caption,
-				'inReplyTo'         => null,
-				'published'         => $dm->status->created_at->toAtomString(),
-				'url'               => $dm->status->url(),
-				'attributedTo'      => $dm->status->profile->permalink(),
-				'to'                => [$dm->recipient->permalink()],
-				'cc'                => [],
-				'sensitive'         => (bool) $dm->status->is_nsfw,
-				'attachment'        => $dm->status->media()->orderBy('order')->get()->map(function ($media) {
-					return [
-						'type'      => $media->activityVerb(),
-						'mediaType' => $media->mime,
-						'url'       => $media->url(),
-						'name'      => $media->caption,
-					];
-				})->toArray(),
-				'tag'               => $tags,
-			]
-		];
-
-		Helpers::sendSignedObject($profile, $url, $body);
-	}
-
-	public function remoteDelete($dm)
-	{
-		$profile = $dm->author;
-		$url = $dm->recipient->sharedInbox ?? $dm->recipient->inbox_url;
-
-		$body = [
-			'@context' => [
-				'https://www.w3.org/ns/activitystreams',
-			],
-			'id' => $dm->status->permalink('#delete'),
-			'to' => [
-				'https://www.w3.org/ns/activitystreams#Public'
-			],
-			'type' => 'Delete',
-			'actor' => $dm->status->profile->permalink(),
-			'object' => [
-				'id' => $dm->status->url(),
-				'type' => 'Tombstone'
-			]
-		];
-
-		Helpers::sendSignedObject($profile, $url, $body);
-	}
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    public function browse(Request $request)
+    {
+        $this->validate($request, [
+            'a' => 'nullable|string|in:inbox,sent,filtered',
+            'page' => 'nullable|integer|min:1|max:99',
+        ]);
+
+        $user = $request->user();
+        if ($user->has_roles && ! UserRoleService::can('can-direct-message', $user->id)) {
+            return [];
+        }
+        $profile = $user->profile_id;
+        $action = $request->input('a', 'inbox');
+        $page = $request->input('page');
+
+        if (config('database.default') == 'pgsql') {
+            if ($action == 'inbox') {
+                $dms = DirectMessage::select('id', 'type', 'to_id', 'from_id', 'id', 'status_id', 'is_hidden', 'meta', 'created_at', 'read_at')
+                    ->whereToId($profile)
+                    ->with(['author', 'status'])
+                    ->whereIsHidden(false)
+                    ->when($page, function ($q, $page) {
+                        if ($page > 1) {
+                            return $q->offset($page * 8 - 8);
+                        }
+                    })
+                    ->latest()
+                    ->get()
+                    ->unique('from_id')
+                    ->take(8)
+                    ->map(function ($r) use ($profile) {
+                        return $r->from_id !== $profile ? [
+                            'id' => (string) $r->from_id,
+                            'name' => $r->author->name,
+                            'username' => $r->author->username,
+                            'avatar' => $r->author->avatarUrl(),
+                            'url' => $r->author->url(),
+                            'isLocal' => (bool) ! $r->author->domain,
+                            'domain' => $r->author->domain,
+                            'timeAgo' => $r->created_at->diffForHumans(null, true, true),
+                            'lastMessage' => $r->status->caption,
+                            'messages' => [],
+                        ] : [
+                            'id' => (string) $r->to_id,
+                            'name' => $r->recipient->name,
+                            'username' => $r->recipient->username,
+                            'avatar' => $r->recipient->avatarUrl(),
+                            'url' => $r->recipient->url(),
+                            'isLocal' => (bool) ! $r->recipient->domain,
+                            'domain' => $r->recipient->domain,
+                            'timeAgo' => $r->created_at->diffForHumans(null, true, true),
+                            'lastMessage' => $r->status->caption,
+                            'messages' => [],
+                        ];
+                    })->values();
+            }
+
+            if ($action == 'sent') {
+                $dms = DirectMessage::select('id', 'type', 'to_id', 'from_id', 'id', 'status_id', 'is_hidden', 'meta', 'created_at', 'read_at')
+                    ->whereFromId($profile)
+                    ->with(['author', 'status'])
+                    ->orderBy('id', 'desc')
+                    ->when($page, function ($q, $page) {
+                        if ($page > 1) {
+                            return $q->offset($page * 8 - 8);
+                        }
+                    })
+                    ->get()
+                    ->unique('to_id')
+                    ->take(8)
+                    ->map(function ($r) use ($profile) {
+                        return $r->from_id !== $profile ? [
+                            'id' => (string) $r->from_id,
+                            'name' => $r->author->name,
+                            'username' => $r->author->username,
+                            'avatar' => $r->author->avatarUrl(),
+                            'url' => $r->author->url(),
+                            'isLocal' => (bool) ! $r->author->domain,
+                            'domain' => $r->author->domain,
+                            'timeAgo' => $r->created_at->diffForHumans(null, true, true),
+                            'lastMessage' => $r->status->caption,
+                            'messages' => [],
+                        ] : [
+                            'id' => (string) $r->to_id,
+                            'name' => $r->recipient->name,
+                            'username' => $r->recipient->username,
+                            'avatar' => $r->recipient->avatarUrl(),
+                            'url' => $r->recipient->url(),
+                            'isLocal' => (bool) ! $r->recipient->domain,
+                            'domain' => $r->recipient->domain,
+                            'timeAgo' => $r->created_at->diffForHumans(null, true, true),
+                            'lastMessage' => $r->status->caption,
+                            'messages' => [],
+                        ];
+                    });
+            }
+
+            if ($action == 'filtered') {
+                $dms = DirectMessage::select('id', 'type', 'to_id', 'from_id', 'id', 'status_id', 'is_hidden', 'meta', 'created_at', 'read_at')
+                    ->whereToId($profile)
+                    ->with(['author', 'status'])
+                    ->whereIsHidden(true)
+                    ->orderBy('id', 'desc')
+                    ->when($page, function ($q, $page) {
+                        if ($page > 1) {
+                            return $q->offset($page * 8 - 8);
+                        }
+                    })
+                    ->get()
+                    ->unique('from_id')
+                    ->take(8)
+                    ->map(function ($r) use ($profile) {
+                        return $r->from_id !== $profile ? [
+                            'id' => (string) $r->from_id,
+                            'name' => $r->author->name,
+                            'username' => $r->author->username,
+                            'avatar' => $r->author->avatarUrl(),
+                            'url' => $r->author->url(),
+                            'isLocal' => (bool) ! $r->author->domain,
+                            'domain' => $r->author->domain,
+                            'timeAgo' => $r->created_at->diffForHumans(null, true, true),
+                            'lastMessage' => $r->status->caption,
+                            'messages' => [],
+                        ] : [
+                            'id' => (string) $r->to_id,
+                            'name' => $r->recipient->name,
+                            'username' => $r->recipient->username,
+                            'avatar' => $r->recipient->avatarUrl(),
+                            'url' => $r->recipient->url(),
+                            'isLocal' => (bool) ! $r->recipient->domain,
+                            'domain' => $r->recipient->domain,
+                            'timeAgo' => $r->created_at->diffForHumans(null, true, true),
+                            'lastMessage' => $r->status->caption,
+                            'messages' => [],
+                        ];
+                    });
+            }
+        } elseif (config('database.default') == 'mysql') {
+            if ($action == 'inbox') {
+                $dms = DirectMessage::selectRaw('*, max(created_at) as createdAt')
+                    ->whereToId($profile)
+                    ->with(['author', 'status'])
+                    ->whereIsHidden(false)
+                    ->groupBy('from_id')
+                    ->latest()
+                    ->when($page, function ($q, $page) {
+                        if ($page > 1) {
+                            return $q->offset($page * 8 - 8);
+                        }
+                    })
+                    ->limit(8)
+                    ->get()
+                    ->map(function ($r) use ($profile) {
+                        return $r->from_id !== $profile ? [
+                            'id' => (string) $r->from_id,
+                            'name' => $r->author->name,
+                            'username' => $r->author->username,
+                            'avatar' => $r->author->avatarUrl(),
+                            'url' => $r->author->url(),
+                            'isLocal' => (bool) ! $r->author->domain,
+                            'domain' => $r->author->domain,
+                            'timeAgo' => $r->created_at->diffForHumans(null, true, true),
+                            'lastMessage' => $r->status->caption,
+                            'messages' => [],
+                        ] : [
+                            'id' => (string) $r->to_id,
+                            'name' => $r->recipient->name,
+                            'username' => $r->recipient->username,
+                            'avatar' => $r->recipient->avatarUrl(),
+                            'url' => $r->recipient->url(),
+                            'isLocal' => (bool) ! $r->recipient->domain,
+                            'domain' => $r->recipient->domain,
+                            'timeAgo' => $r->created_at->diffForHumans(null, true, true),
+                            'lastMessage' => $r->status->caption,
+                            'messages' => [],
+                        ];
+                    });
+            }
+
+            if ($action == 'sent') {
+                $dms = DirectMessage::selectRaw('*, max(created_at) as createdAt')
+                    ->whereFromId($profile)
+                    ->with(['author', 'status'])
+                    ->groupBy('to_id')
+                    ->orderBy('createdAt', 'desc')
+                    ->when($page, function ($q, $page) {
+                        if ($page > 1) {
+                            return $q->offset($page * 8 - 8);
+                        }
+                    })
+                    ->limit(8)
+                    ->get()
+                    ->map(function ($r) use ($profile) {
+                        return $r->from_id !== $profile ? [
+                            'id' => (string) $r->from_id,
+                            'name' => $r->author->name,
+                            'username' => $r->author->username,
+                            'avatar' => $r->author->avatarUrl(),
+                            'url' => $r->author->url(),
+                            'isLocal' => (bool) ! $r->author->domain,
+                            'domain' => $r->author->domain,
+                            'timeAgo' => $r->created_at->diffForHumans(null, true, true),
+                            'lastMessage' => $r->status->caption,
+                            'messages' => [],
+                        ] : [
+                            'id' => (string) $r->to_id,
+                            'name' => $r->recipient->name,
+                            'username' => $r->recipient->username,
+                            'avatar' => $r->recipient->avatarUrl(),
+                            'url' => $r->recipient->url(),
+                            'isLocal' => (bool) ! $r->recipient->domain,
+                            'domain' => $r->recipient->domain,
+                            'timeAgo' => $r->created_at->diffForHumans(null, true, true),
+                            'lastMessage' => $r->status->caption,
+                            'messages' => [],
+                        ];
+                    });
+            }
+
+            if ($action == 'filtered') {
+                $dms = DirectMessage::selectRaw('*, max(created_at) as createdAt')
+                    ->whereToId($profile)
+                    ->with(['author', 'status'])
+                    ->whereIsHidden(true)
+                    ->groupBy('from_id')
+                    ->orderBy('createdAt', 'desc')
+                    ->when($page, function ($q, $page) {
+                        if ($page > 1) {
+                            return $q->offset($page * 8 - 8);
+                        }
+                    })
+                    ->limit(8)
+                    ->get()
+                    ->map(function ($r) use ($profile) {
+                        return $r->from_id !== $profile ? [
+                            'id' => (string) $r->from_id,
+                            'name' => $r->author->name,
+                            'username' => $r->author->username,
+                            'avatar' => $r->author->avatarUrl(),
+                            'url' => $r->author->url(),
+                            'isLocal' => (bool) ! $r->author->domain,
+                            'domain' => $r->author->domain,
+                            'timeAgo' => $r->created_at->diffForHumans(null, true, true),
+                            'lastMessage' => $r->status->caption,
+                            'messages' => [],
+                        ] : [
+                            'id' => (string) $r->to_id,
+                            'name' => $r->recipient->name,
+                            'username' => $r->recipient->username,
+                            'avatar' => $r->recipient->avatarUrl(),
+                            'url' => $r->recipient->url(),
+                            'isLocal' => (bool) ! $r->recipient->domain,
+                            'domain' => $r->recipient->domain,
+                            'timeAgo' => $r->created_at->diffForHumans(null, true, true),
+                            'lastMessage' => $r->status->caption,
+                            'messages' => [],
+                        ];
+                    });
+            }
+        }
+
+        return response()->json($dms->all());
+    }
+
+    public function create(Request $request)
+    {
+        $this->validate($request, [
+            'to_id' => 'required',
+            'message' => 'required|string|min:1|max:500',
+            'type' => 'required|in:text,emoji',
+        ]);
+
+        $user = $request->user();
+        abort_if($user->has_roles && ! UserRoleService::can('can-direct-message', $user->id), 403, 'Invalid permissions for this action');
+        if (! $user->is_admin) {
+            abort_if($user->created_at->gt(now()->subHours(72)), 400, 'You need to wait a bit before you can DM another account');
+        }
+        $profile = $user->profile;
+        $recipient = Profile::where('id', '!=', $profile->id)->findOrFail($request->input('to_id'));
+
+        abort_if(in_array($profile->id, $recipient->blockedIds()->toArray()), 403);
+        $msg = $request->input('message');
+
+        if ((! $recipient->domain && $recipient->user->settings->public_dm == false) || $recipient->is_private) {
+            if ($recipient->follows($profile) == true) {
+                $hidden = false;
+            } else {
+                $hidden = true;
+            }
+        } else {
+            $hidden = false;
+        }
+
+        $status = new Status;
+        $status->profile_id = $profile->id;
+        $status->caption = $msg;
+        $status->visibility = 'direct';
+        $status->scope = 'direct';
+        $status->in_reply_to_profile_id = $recipient->id;
+        $status->save();
+
+        $dm = new DirectMessage;
+        $dm->to_id = $recipient->id;
+        $dm->from_id = $profile->id;
+        $dm->status_id = $status->id;
+        $dm->is_hidden = $hidden;
+        $dm->type = $request->input('type');
+        $dm->save();
+
+        Conversation::updateOrInsert(
+            [
+                'to_id' => $recipient->id,
+                'from_id' => $profile->id,
+            ],
+            [
+                'type' => $dm->type,
+                'status_id' => $status->id,
+                'dm_id' => $dm->id,
+                'is_hidden' => $hidden,
+            ]
+        );
+
+        if (filter_var($msg, FILTER_VALIDATE_URL)) {
+            if (Helpers::validateUrl($msg)) {
+                $dm->type = 'link';
+                $dm->meta = [
+                    'domain' => parse_url($msg, PHP_URL_HOST),
+                    'local' => parse_url($msg, PHP_URL_HOST) ==
+                    parse_url(config('app.url'), PHP_URL_HOST),
+                ];
+                $dm->save();
+            }
+        }
+
+        $nf = UserFilter::whereUserId($recipient->id)
+            ->whereFilterableId($profile->id)
+            ->whereFilterableType('App\Profile')
+            ->whereFilterType('dm.mute')
+            ->exists();
+
+        if ($recipient->domain == null && $hidden == false && ! $nf) {
+            $notification = new Notification;
+            $notification->profile_id = $recipient->id;
+            $notification->actor_id = $profile->id;
+            $notification->action = 'dm';
+            $notification->item_id = $dm->id;
+            $notification->item_type = "App\DirectMessage";
+            $notification->save();
+        }
+
+        if ($recipient->domain) {
+            $this->remoteDeliver($dm);
+        }
+
+        $res = [
+            'id' => (string) $dm->id,
+            'isAuthor' => $profile->id == $dm->from_id,
+            'reportId' => (string) $dm->status_id,
+            'hidden' => (bool) $dm->is_hidden,
+            'type' => $dm->type,
+            'text' => $dm->status->caption,
+            'media' => null,
+            'timeAgo' => $dm->created_at->diffForHumans(null, null, true),
+            'seen' => $dm->read_at != null,
+            'meta' => $dm->meta,
+        ];
+
+        return response()->json($res);
+    }
+
+    public function thread(Request $request)
+    {
+        $this->validate($request, [
+            'pid' => 'required',
+            'max_id' => 'sometimes|integer',
+            'min_id' => 'sometimes|integer',
+        ]);
+        $user = $request->user();
+        abort_if($user->has_roles && ! UserRoleService::can('can-direct-message', $user->id), 403, 'Invalid permissions for this action');
+
+        $uid = $user->profile_id;
+        $pid = $request->input('pid');
+        $max_id = $request->input('max_id');
+        $min_id = $request->input('min_id');
+
+        $r = Profile::findOrFail($pid);
+
+        if ($min_id) {
+            $res = DirectMessage::select('*')
+                ->where('id', '>', $min_id)
+                ->where(function ($query) use ($pid, $uid) {
+                    $query->where('from_id', $pid)->where('to_id', $uid);
+                })->orWhere(function ($query) use ($pid, $uid) {
+                    $query->where('from_id', $uid)->where('to_id', $pid);
+                })
+                ->orderBy('id', 'asc')
+                ->take(8)
+                ->get()
+                ->reverse();
+        } elseif ($max_id) {
+            $res = DirectMessage::select('*')
+                ->where('id', '<', $max_id)
+                ->where(function ($query) use ($pid, $uid) {
+                    $query->where('from_id', $pid)->where('to_id', $uid);
+                })->orWhere(function ($query) use ($pid, $uid) {
+                    $query->where('from_id', $uid)->where('to_id', $pid);
+                })
+                ->orderBy('id', 'desc')
+                ->take(8)
+                ->get();
+        } else {
+            $res = DirectMessage::where(function ($query) use ($pid, $uid) {
+                $query->where('from_id', $pid)->where('to_id', $uid);
+            })->orWhere(function ($query) use ($pid, $uid) {
+                $query->where('from_id', $uid)->where('to_id', $pid);
+            })
+                ->orderBy('id', 'desc')
+                ->take(8)
+                ->get();
+        }
+
+        $res = $res->filter(function ($s) {
+            return $s && $s->status;
+        })
+            ->map(function ($s) use ($uid) {
+                return [
+                    'id' => (string) $s->id,
+                    'hidden' => (bool) $s->is_hidden,
+                    'isAuthor' => $uid == $s->from_id,
+                    'type' => $s->type,
+                    'text' => $s->status->caption,
+                    'media' => $s->status->firstMedia() ? $s->status->firstMedia()->url() : null,
+                    'carousel' => MediaService::get($s->status_id),
+                    'created_at' => $s->created_at->format('c'),
+                    'timeAgo' => $s->created_at->diffForHumans(null, null, true),
+                    'seen' => $s->read_at != null,
+                    'reportId' => (string) $s->status_id,
+                    'meta' => json_decode($s->meta, true),
+                ];
+            })
+            ->values();
+
+        $filters = UserFilterService::mutes($uid);
+
+        $w = [
+            'id' => (string) $r->id,
+            'name' => $r->name,
+            'username' => $r->username,
+            'avatar' => $r->avatarUrl(),
+            'url' => $r->url(),
+            'muted' => in_array($r->id, $filters),
+            'isLocal' => (bool) ! $r->domain,
+            'domain' => $r->domain,
+            'created_at' => $r->created_at->format('c'),
+            'updated_at' => $r->updated_at->format('c'),
+            'timeAgo' => $r->created_at->diffForHumans(null, true, true),
+            'lastMessage' => '',
+            'messages' => $res,
+        ];
+
+        return response()->json($w, 200, [], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+    }
+
+    public function delete(Request $request)
+    {
+        $this->validate($request, [
+            'id' => 'required',
+        ]);
+
+        $sid = $request->input('id');
+        $pid = $request->user()->profile_id;
+
+        $dm = DirectMessage::whereFromId($pid)
+            ->whereStatusId($sid)
+            ->firstOrFail();
+
+        $status = Status::whereProfileId($pid)
+            ->findOrFail($dm->status_id);
+
+        $recipient = AccountService::get($dm->to_id);
+
+        if (! $recipient) {
+            return response('', 422);
+        }
+
+        if ($recipient['local'] == false) {
+            $dmc = $dm;
+            $this->remoteDelete($dmc);
+        } else {
+            StatusDelete::dispatch($status)->onQueue('high');
+        }
+
+        if (Conversation::whereStatusId($sid)->count()) {
+            $latest = DirectMessage::where(['from_id' => $dm->from_id, 'to_id' => $dm->to_id])
+                ->orWhere(['to_id' => $dm->from_id, 'from_id' => $dm->to_id])
+                ->latest()
+                ->first();
+
+            if ($latest->status_id == $sid) {
+                Conversation::where(['to_id' => $dm->from_id, 'from_id' => $dm->to_id])
+                    ->update([
+                        'updated_at' => $latest->updated_at,
+                        'status_id' => $latest->status_id,
+                        'type' => $latest->type,
+                        'is_hidden' => false,
+                    ]);
+
+                Conversation::where(['to_id' => $dm->to_id, 'from_id' => $dm->from_id])
+                    ->update([
+                        'updated_at' => $latest->updated_at,
+                        'status_id' => $latest->status_id,
+                        'type' => $latest->type,
+                        'is_hidden' => false,
+                    ]);
+            } else {
+                Conversation::where([
+                    'status_id' => $sid,
+                    'to_id' => $dm->from_id,
+                    'from_id' => $dm->to_id,
+                ])->delete();
+
+                Conversation::where([
+                    'status_id' => $sid,
+                    'from_id' => $dm->from_id,
+                    'to_id' => $dm->to_id,
+                ])->delete();
+            }
+        }
+
+        StatusService::del($status->id, true);
+
+        $status->forceDeleteQuietly();
+
+        return [200];
+    }
+
+    public function get(Request $request, $id)
+    {
+        $user = $request->user();
+        abort_if($user->has_roles && ! UserRoleService::can('can-direct-message', $user->id), 403, 'Invalid permissions for this action');
+
+        $pid = $request->user()->profile_id;
+        $dm = DirectMessage::whereStatusId($id)->firstOrFail();
+        abort_if($pid !== $dm->to_id && $pid !== $dm->from_id, 404);
+
+        return response()->json($dm, 200, [], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+    }
+
+    public function mediaUpload(Request $request)
+    {
+        $this->validate($request, [
+            'file' => function () {
+                return [
+                    'required',
+                    'mimetypes:'.config_cache('pixelfed.media_types'),
+                    'max:'.config_cache('pixelfed.max_photo_size'),
+                ];
+            },
+            'to_id' => 'required',
+        ]);
+
+        $user = $request->user();
+        abort_if($user->has_roles && ! UserRoleService::can('can-direct-message', $user->id), 403, 'Invalid permissions for this action');
+        $profile = $user->profile;
+        $recipient = Profile::where('id', '!=', $profile->id)->findOrFail($request->input('to_id'));
+        abort_if(in_array($profile->id, $recipient->blockedIds()->toArray()), 403);
+
+        if ((! $recipient->domain && $recipient->user->settings->public_dm == false) || $recipient->is_private) {
+            if ($recipient->follows($profile) == true) {
+                $hidden = false;
+            } else {
+                $hidden = true;
+            }
+        } else {
+            $hidden = false;
+        }
+
+        $accountSize = UserStorageService::get($user->id);
+        abort_if($accountSize === -1, 403, 'Invalid request.');
+        $photo = $request->file('file');
+        $fileSize = $photo->getSize();
+        $sizeInKbs = (int) ceil($fileSize / 1000);
+        $updatedAccountSize = (int) $accountSize + (int) $sizeInKbs;
+
+        if ((bool) config_cache('pixelfed.enforce_account_limit') == true) {
+            $limit = (int) config_cache('pixelfed.max_account_size');
+            if ($updatedAccountSize >= $limit) {
+                abort(403, 'Account size limit reached.');
+            }
+        }
+
+        $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).Str::random(8);
+        $path = $photo->storePublicly($storagePath);
+        $hash = \hash_file('sha256', $photo);
+
+        abort_if(MediaBlocklistService::exists($hash) == true, 451);
+
+        $status = new Status;
+        $status->profile_id = $profile->id;
+        $status->caption = null;
+        $status->visibility = 'direct';
+        $status->scope = 'direct';
+        $status->in_reply_to_profile_id = $recipient->id;
+        $status->save();
+
+        $media = new Media;
+        $media->status_id = $status->id;
+        $media->profile_id = $profile->id;
+        $media->user_id = $user->id;
+        $media->media_path = $path;
+        $media->original_sha256 = $hash;
+        $media->size = $photo->getSize();
+        $media->mime = $photo->getMimeType();
+        $media->caption = null;
+        $media->filter_class = null;
+        $media->filter_name = null;
+        $media->save();
+
+        $dm = new DirectMessage;
+        $dm->to_id = $recipient->id;
+        $dm->from_id = $profile->id;
+        $dm->status_id = $status->id;
+        $dm->type = array_first(explode('/', $media->mime)) == 'video' ? 'video' : 'photo';
+        $dm->is_hidden = $hidden;
+        $dm->save();
+
+        Conversation::updateOrInsert(
+            [
+                'to_id' => $recipient->id,
+                'from_id' => $profile->id,
+            ],
+            [
+                'type' => $dm->type,
+                'status_id' => $status->id,
+                'dm_id' => $dm->id,
+                'is_hidden' => $hidden,
+            ]
+        );
+
+        $user->storage_used = (int) $updatedAccountSize;
+        $user->storage_used_updated_at = now();
+        $user->save();
+
+        if ($recipient->domain) {
+            $this->remoteDeliver($dm);
+        }
+
+        return [
+            'id' => $dm->id,
+            'reportId' => (string) $dm->status_id,
+            'type' => $dm->type,
+            'url' => $media->url(),
+        ];
+    }
+
+    public function composeLookup(Request $request)
+    {
+        $this->validate($request, [
+            'q' => 'required|string|min:2|max:50',
+            'remote' => 'nullable',
+        ]);
+
+        $user = $request->user();
+        if ($user->has_roles && ! UserRoleService::can('can-direct-message', $user->id)) {
+            return [];
+        }
+
+        $q = $request->input('q');
+        $r = $request->input('remote', false);
+
+        if ($r && ! Str::of($q)->contains('.')) {
+            return [];
+        }
+
+        if ($r && Helpers::validateUrl($q)) {
+            Helpers::profileFetch($q);
+        }
+
+        if (Str::of($q)->startsWith('@')) {
+            if (strlen($q) < 3) {
+                return [];
+            }
+            if (substr_count($q, '@') == 2) {
+                WebfingerService::lookup($q);
+            }
+            $q = mb_substr($q, 1);
+        }
+
+        $blocked = UserFilter::whereFilterableType('App\Profile')
+            ->whereFilterType('block')
+            ->whereFilterableId($request->user()->profile_id)
+            ->pluck('user_id');
+
+        $blocked->push($request->user()->profile_id);
+
+        $results = Profile::select('id', 'domain', 'username')
+            ->whereNotIn('id', $blocked)
+            ->where('username', 'like', '%'.$q.'%')
+            ->orderBy('domain')
+            ->limit(8)
+            ->get()
+            ->map(function ($r) {
+                $acct = AccountService::get($r->id);
+
+                return [
+                    'local' => (bool) ! $r->domain,
+                    'id' => (string) $r->id,
+                    'name' => $r->username,
+                    'privacy' => true,
+                    'avatar' => $r->avatarUrl(),
+                    'account' => $acct,
+                ];
+            });
+
+        return $results;
+    }
+
+    public function read(Request $request)
+    {
+        $this->validate($request, [
+            'pid' => 'required',
+            'sid' => 'required',
+        ]);
+
+        $pid = $request->input('pid');
+        $sid = $request->input('sid');
+        $user = $request->user();
+        abort_if($user->has_roles && ! UserRoleService::can('can-direct-message', $user->id), 403, 'Invalid permissions for this action');
+
+        $dms = DirectMessage::whereToId($request->user()->profile_id)
+            ->whereFromId($pid)
+            ->where('status_id', '>=', $sid)
+            ->get();
+
+        $now = now();
+        foreach ($dms as $dm) {
+            $dm->read_at = $now;
+            $dm->save();
+        }
+
+        return response()->json($dms->pluck('id'));
+    }
+
+    public function mute(Request $request)
+    {
+        $this->validate($request, [
+            'id' => 'required',
+        ]);
+
+        $user = $request->user();
+        abort_if($user->has_roles && ! UserRoleService::can('can-direct-message', $user->id), 403, 'Invalid permissions for this action');
+        $fid = $request->input('id');
+        $pid = $request->user()->profile_id;
+
+        UserFilter::firstOrCreate(
+            [
+                'user_id' => $pid,
+                'filterable_id' => $fid,
+                'filterable_type' => 'App\Profile',
+                'filter_type' => 'dm.mute',
+            ]
+        );
+
+        return [200];
+    }
+
+    public function unmute(Request $request)
+    {
+        $this->validate($request, [
+            'id' => 'required',
+        ]);
+
+        $user = $request->user();
+        abort_if($user->has_roles && ! UserRoleService::can('can-direct-message', $user->id), 403, 'Invalid permissions for this action');
+
+        $fid = $request->input('id');
+        $pid = $request->user()->profile_id;
+
+        $f = UserFilter::whereUserId($pid)
+            ->whereFilterableId($fid)
+            ->whereFilterableType('App\Profile')
+            ->whereFilterType('dm.mute')
+            ->firstOrFail();
+
+        $f->delete();
+
+        return [200];
+    }
+
+    public function remoteDeliver($dm)
+    {
+        $profile = $dm->author;
+        $url = $dm->recipient->sharedInbox ?? $dm->recipient->inbox_url;
+        $status = $dm->status;
+
+        if (! $status) {
+            return;
+        }
+
+        $tags = [
+            [
+                'type' => 'Mention',
+                'href' => $dm->recipient->permalink(),
+                'name' => $dm->recipient->emailUrl(),
+            ],
+        ];
+
+        $content = $status->caption ? Autolink::create()->autolink($status->caption) : null;
+
+        $body = [
+            '@context' => [
+                'https://w3id.org/security/v1',
+                'https://www.w3.org/ns/activitystreams',
+            ],
+            'id' => $dm->status->permalink(),
+            'type' => 'Create',
+            'actor' => $dm->status->profile->permalink(),
+            'published' => $dm->status->created_at->toAtomString(),
+            'to' => [$dm->recipient->permalink()],
+            'cc' => [],
+            'object' => [
+                'id' => $dm->status->url(),
+                'type' => 'Note',
+                'summary' => null,
+                'content' => $content,
+                'inReplyTo' => null,
+                'published' => $dm->status->created_at->toAtomString(),
+                'url' => $dm->status->url(),
+                'attributedTo' => $dm->status->profile->permalink(),
+                'to' => [$dm->recipient->permalink()],
+                'cc' => [],
+                'sensitive' => (bool) $dm->status->is_nsfw,
+                'attachment' => $dm->status->media()->orderBy('order')->get()->map(function ($media) {
+                    return [
+                        'type' => $media->activityVerb(),
+                        'mediaType' => $media->mime,
+                        'url' => $media->url(),
+                        'name' => $media->caption,
+                    ];
+                })->toArray(),
+                'tag' => $tags,
+            ],
+        ];
+
+        DirectDeliverPipeline::dispatch($profile, $url, $body)->onQueue('high');
+    }
+
+    public function remoteDelete($dm)
+    {
+        $profile = $dm->author;
+        $url = $dm->recipient->sharedInbox ?? $dm->recipient->inbox_url;
+
+        $body = [
+            '@context' => [
+                'https://www.w3.org/ns/activitystreams',
+            ],
+            'id' => $dm->status->permalink('#delete'),
+            'to' => [
+                'https://www.w3.org/ns/activitystreams#Public',
+            ],
+            'type' => 'Delete',
+            'actor' => $dm->status->profile->permalink(),
+            'object' => [
+                'id' => $dm->status->url(),
+                'type' => 'Tombstone',
+            ],
+        ];
+        DirectDeletePipeline::dispatch($profile, $url, $body)->onQueue('high');
+    }
 }
diff --git a/app/Http/Controllers/DiscoverController.php b/app/Http/Controllers/DiscoverController.php
index 4bb7277a4..b3047ff79 100644
--- a/app/Http/Controllers/DiscoverController.php
+++ b/app/Http/Controllers/DiscoverController.php
@@ -2,366 +2,430 @@
 
 namespace App\Http\Controllers;
 
-use App\{
-	DiscoverCategory,
-	Follower,
-	Hashtag,
-	HashtagFollow,
-	Instance,
-	Like,
-	Profile,
-	Status,
-	StatusHashtag,
-	UserFilter
-};
-use Auth, DB, Cache;
-use Illuminate\Http\Request;
+use App\Hashtag;
+use App\Instance;
+use App\Like;
+use App\Services\AccountService;
+use App\Services\AdminShadowFilterService;
 use App\Services\BookmarkService;
 use App\Services\ConfigCacheService;
+use App\Services\FollowerService;
 use App\Services\HashtagService;
+use App\Services\Internal\BeagleService;
 use App\Services\LikeService;
 use App\Services\ReblogService;
-use App\Services\StatusHashtagService;
 use App\Services\SnowflakeService;
+use App\Services\StatusHashtagService;
 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);
-		return view('discover.home');
-	}
+    public function home(Request $request)
+    {
+        abort_if(! Auth::check() && config('instance.discover.public') == false, 403);
 
-	public function showTags(Request $request, $hashtag)
-	{
-			abort_if(!config('instance.discover.tags.is_public') && !Auth::check(), 403);
+        return view('discover.home');
+    }
 
-			$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'));
-	}
+    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);
 
-	public function getHashtags(Request $request)
-	{
-		$user = $request->user();
-		abort_if(!config('instance.discover.tags.is_public') && !$user, 403);
+        $tag = Hashtag::whereName($hashtag)
+            ->orWhere('slug', $hashtag)
+            ->where('is_banned', '!=', true)
+            ->firstOrFail();
+        $tagCount = $tag->cached_count ?? 0;
 
-		$this->validate($request, [
-			'hashtag' => 'required|string|min:1|max:124',
-			'page' => 'nullable|integer|min:1|max:' . ($user ? 29 : 3)
-		]);
+        return view('discover.tags.show', compact('tag', 'tagCount'));
+    }
 
-		$page = $request->input('page') ?? '1';
-		$end = $page > 1 ? $page * 9 : 0;
-		$tag = $request->input('hashtag');
+    public function getHashtags(Request $request)
+    {
+        $user = $request->user();
+        abort_if(! config('instance.discover.tags.is_public') && ! $user, 403);
 
-		if(config('database.default') === 'pgsql') {
-			$hashtag = Hashtag::where('name', 'ilike', $tag)->firstOrFail();
-		} else {
-			$hashtag = Hashtag::whereName($tag)->firstOrFail();
-		}
+        $this->validate($request, [
+            'hashtag' => 'required|string|min:1|max:124',
+            'page' => 'nullable|integer|min:1|max:'.($user ? 29 : 3),
+        ]);
 
-		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;
-	}
+        $page = $request->input('page') ?? '1';
+        $end = $page > 1 ? $page * 9 : 0;
+        $tag = $request->input('hashtag');
 
-	public function profilesDirectory(Request $request)
-	{
-		return redirect('/')->with('statusRedirect', 'The Profile Directory is unavailable at this time.');
-	}
+        if (config('database.default') === 'pgsql') {
+            $hashtag = Hashtag::where('name', 'ilike', $tag)->firstOrFail();
+        } else {
+            $hashtag = Hashtag::whereName($tag)->firstOrFail();
+        }
 
-	public function profilesDirectoryApi(Request $request)
-	{
-		return ['error' => 'Temporarily unavailable.'];
-	}
+        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 trendingApi(Request $request)
-	{
-		abort_if(config('instance.discover.public') == false && !$request->user(), 403);
+                    return $tag;
+                })
+                ->filter(function ($tag) {
+                    if (! StatusService::get($tag['status']['id'])) {
+                        return false;
+                    }
 
-		$this->validate($request, [
-			'range' => 'nullable|string|in:daily,monthly,yearly',
-		]);
+                    return true;
+                })
+                ->values();
+        } else {
+            if ($page != 1) {
+                $res['tags'] = [];
 
-		$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 $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;
+                        }
 
-		$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();
+            });
+            $res['tags'] = collect($tags)
+                ->filter(function ($tag) {
+                    if (! StatusService::get($tag['status']['id'])) {
+                        return false;
+                    }
 
-		$filtered = Auth::check() ? UserFilterService::filters(Auth::user()->profile_id) : [];
+                    return true;
+                })
+                ->values();
+        }
 
-		$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();
+        return $res;
+    }
 
-		return response()->json($res);
-	}
+    public function profilesDirectory(Request $request)
+    {
+        return redirect('/')->with('statusRedirect', 'The Profile Directory is unavailable at this time.');
+    }
 
-	public function trendingHashtags(Request $request)
-	{
-		abort_if(!$request->user(), 403);
+    public function profilesDirectoryApi(Request $request)
+    {
+        return ['error' => 'Temporarily unavailable.'];
+    }
 
-		$res = TrendingHashtagService::getTrending();
-		return $res;
-	}
+    public function trendingApi(Request $request)
+    {
+        abort_if(config('instance.discover.public') == false && ! $request->user(), 403);
 
-	public function trendingPlaces(Request $request)
-	{
-		return [];
-	}
+        $this->validate($request, [
+            'range' => 'nullable|string|in:daily,monthly,yearly',
+        ]);
 
-	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';
+        $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;
 
-		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;
+        $ids = Cache::remember($key, $ttls[$days], function () use ($days) {
+            $min_id = SnowflakeService::byDate(now()->subDays($days));
 
-			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 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 $res;
-	}
+        $filtered = Auth::check() ? UserFilterService::filters(Auth::user()->profile_id) : [];
 
-	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();
-		});
+        $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();
 
-		return $posts;
-	}
+        return response()->json($res);
+    }
 
-	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 trendingHashtags(Request $request)
+    {
+        abort_if(! $request->user(), 403);
 
-	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 = TrendingHashtagService::getTrending();
 
-		$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;
-	}
+        return $res;
+    }
 
-	public function enabledFeatures(Request $request)
-	{
-		abort_if(!$request->user(), 404);
-		return $this->config();
-	}
+    public function trendingPlaces(Request $request)
+    {
+        return [];
+    }
 
-	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 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 discoverNetworkTrending(Request $request)
+    {
+        abort_if(! $request->user(), 404);
+
+        return BeagleService::getDiscoverPosts();
+    }
 }
diff --git a/app/Http/Controllers/FederationController.php b/app/Http/Controllers/FederationController.php
index c4b5e86bf..15570eb6b 100644
--- a/app/Http/Controllers/FederationController.php
+++ b/app/Http/Controllers/FederationController.php
@@ -2,265 +2,304 @@
 
 namespace App\Http\Controllers;
 
-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\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\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\Util\Lexer\Nickname;
+use App\Util\Site\Nodeinfo;
+use App\Util\Webfinger\Webfinger;
+use Cache;
+use Illuminate\Http\Request;
 
 class FederationController extends Controller
 {
-	public function nodeinfoWellKnown()
-	{
-		abort_if(!config('federation.nodeinfo.enabled'), 404);
-		return response()->json(Nodeinfo::wellKnown(), 200, [], JSON_UNESCAPED_SLASHES)
-			->header('Access-Control-Allow-Origin','*');
-	}
+    public function nodeinfoWellKnown()
+    {
+        abort_if(! config('federation.nodeinfo.enabled'), 404);
 
-	public function nodeinfo()
-	{
-		abort_if(!config('federation.nodeinfo.enabled'), 404);
-		return response()->json(Nodeinfo::get(), 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 webfinger(Request $request)
-	{
-		if (!config('federation.webfinger.enabled') ||
-			!$request->has('resource') ||
-			!$request->filled('resource')
-		) {
-			return response('', 400);
-		}
+    public function nodeinfo()
+    {
+        abort_if(! config('federation.nodeinfo.enabled'), 404);
 
-		$resource = $request->input('resource');
-		$domain = config('pixelfed.domain.app');
+        return response()->json(Nodeinfo::get(), 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'
-					]
-				]
-			];
-			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);
+    public function webfinger(Request $request)
+    {
+        if (! config('federation.webfinger.enabled') ||
+            ! $request->has('resource') ||
+            ! $request->filled('resource')
+        ) {
+            return response('', 400);
+        }
 
-		return response()->json($webfinger, 200, [], JSON_UNESCAPED_SLASHES)
-			->header('Access-Control-Allow-Origin','*');
-	}
+        $resource = $request->input('resource');
+        $domain = config('pixelfed.domain.app');
 
-	public function hostMeta(Request $request)
-	{
-		abort_if(!config('federation.webfinger.enabled'), 404);
+        // Instance Actor
+        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',
+                    ],
+                    [
+                        'rel' => 'http://ostatus.org/schema/1.0/subscribe',
+                        'template' => 'https://'.$domain.'/authorize_interaction?uri={uri}',
+                    ],
+                ],
+            ];
 
-		$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($res, 200, [], JSON_UNESCAPED_SLASHES);
+        }
 
-		return response($xml)->header('Content-Type', 'application/xrd+xml');
-	}
+        if (str_starts_with($resource, 'https://')) {
+            if (str_starts_with($resource, 'https://'.$domain.'/users/')) {
+                $username = str_replace('https://'.$domain.'/users/', '', $resource);
+                if (strlen($username) > 15) {
+                    return response('', 400);
+                }
+                $stripped = str_replace(['_', '.', '-'], '', $username);
+                if (! ctype_alnum($stripped)) {
+                    return response('', 400);
+                }
+                $key = 'federation:webfinger:sha256:url-username:'.$username;
+                if ($cached = Cache::get($key)) {
+                    return response()->json($cached, 200, [], JSON_UNESCAPED_SLASHES);
+                }
+                $profile = Profile::whereUsername($username)->first();
+                if (! $profile || $profile->status !== null || $profile->domain) {
+                    return response('', 400);
+                }
+                $webfinger = (new Webfinger($profile))->generate();
+                Cache::put($key, $webfinger, 1209600);
 
-	public function userOutbox(Request $request, $username)
-	{
-		abort_if(!config_cache('federation.activitypub.enabled'), 404);
+                return response()->json($webfinger, 200, [], JSON_UNESCAPED_SLASHES)
+                    ->header('Access-Control-Allow-Origin', '*');
+            } else {
+                return response('', 400);
+            }
+        }
+        $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::whereUsername($username)->first();
+        if (! $profile || $profile->status !== null || $profile->domain) {
+            return response('', 400);
+        }
+        $webfinger = (new Webfinger($profile))->generate();
+        Cache::put($key, $webfinger, 1209600);
 
-		if(!$request->wantsJson()) {
-			return redirect('/' . $username);
-		}
+        return response()->json($webfinger, 200, [], JSON_UNESCAPED_SLASHES)
+            ->header('Access-Control-Allow-Origin', '*');
+    }
 
-		$res = [
-			'@context' => 'https://www.w3.org/ns/activitystreams',
-			'id' => 'https://' . config('pixelfed.domain.app') . '/users/' . $username . '/outbox',
-			'type' => 'OrderedCollection',
-			'totalItems' => 0,
-			'orderedItems' => []
-		];
+    public function hostMeta(Request $request)
+    {
+        abort_if(! config('federation.webfinger.enabled'), 404);
 
-		return response(json_encode($res, JSON_UNESCAPED_SLASHES))->header('Content-Type', 'application/activity+json');
-	}
+        $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>';
 
-	public function userInbox(Request $request, $username)
-	{
-		abort_if(!config_cache('federation.activitypub.enabled'), 404);
-		abort_if(!config('federation.activitypub.inbox'), 404);
+        return response($xml)->header('Content-Type', 'application/xrd+xml');
+    }
 
-		$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;
-		}
+    public function userOutbox(Request $request, $username)
+    {
+        abort_if(! (bool) config_cache('federation.activitypub.enabled'), 404);
 
-		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 (! $request->wantsJson()) {
+            return redirect('/'.$username);
+        }
 
-				if($obj['object']['type'] === 'Tombstone') {
-					if(Status::whereObjectUrl($obj['object']['id'])->exists()) {
-						dispatch(new DeleteWorker($headers, $payload))->onQueue('delete');
-						return;
-					}
-				}
+        $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,
+        ];
 
-				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;
-	}
+        return response(json_encode($res, JSON_UNESCAPED_SLASHES))->header('Content-Type', 'application/activity+json');
+    }
 
-	public function sharedInbox(Request $request)
-	{
-		abort_if(!config_cache('federation.activitypub.enabled'), 404);
-		abort_if(!config('federation.activitypub.sharedInbox'), 404);
+    public function userInbox(Request $request, $username)
+    {
+        abort_if(! (bool) config_cache('federation.activitypub.enabled'), 404);
+        abort_if(! config('federation.activitypub.inbox'), 404);
 
-		$headers = $request->headers->all();
-		$payload = $request->getContent();
+        $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(!$payload || empty($payload)) {
-			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');
 
-		$obj = json_decode($payload, true, 8);
-		if(!isset($obj['id'])) {
-			return;
-		}
+                        return;
+                    }
+                }
 
-		$domain = parse_url($obj['id'], PHP_URL_HOST);
-		if(in_array($domain, InstanceService::getBannedDomains())) {
-			return;
-		}
+                if ($obj['object']['type'] === 'Tombstone') {
+                    if (Status::whereObjectUrl($obj['object']['id'])->exists()) {
+                        dispatch(new DeleteWorker($headers, $payload))->onQueue('delete');
 
-		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;
+                    }
+                }
 
-				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');
 
-				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;
-	}
+                    return;
+                }
+            }
 
-	public function userFollowing(Request $request, $username)
-	{
-		abort_if(!config_cache('federation.activitypub.enabled'), 404);
+            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');
+        }
 
-		$obj = [
-			'@context' => 'https://www.w3.org/ns/activitystreams',
-			'id'       => $request->getUri(),
-			'type'     => 'OrderedCollectionPage',
-			'totalItems' => 0,
-			'orderedItems' => []
-		];
-		return response()->json($obj);
-	}
+    }
 
-	public function userFollowers(Request $request, $username)
-	{
-		abort_if(!config_cache('federation.activitypub.enabled'), 404);
+    public function sharedInbox(Request $request)
+    {
+        abort_if(! (bool) config_cache('federation.activitypub.enabled'), 404);
+        abort_if(! config('federation.activitypub.sharedInbox'), 404);
 
-		$obj = [
-			'@context' => 'https://www.w3.org/ns/activitystreams',
-			'id'       => $request->getUri(),
-			'type'     => 'OrderedCollectionPage',
-			'totalItems' => 0,
-			'orderedItems' => []
-		];
+        $headers = $request->headers->all();
+        $payload = $request->getContent();
 
-		return response()->json($obj);
-	}
+        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 (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');
+    }
 }
diff --git a/app/Http/Controllers/GroupController.php b/app/Http/Controllers/GroupController.php
new file mode 100644
index 000000000..881d31f01
--- /dev/null
+++ b/app/Http/Controllers/GroupController.php
@@ -0,0 +1,671 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Instance;
+use App\Models\Group;
+use App\Models\GroupBlock;
+use App\Models\GroupCategory;
+use App\Models\GroupInvitation;
+use App\Models\GroupLike;
+use App\Models\GroupLimit;
+use App\Models\GroupMember;
+use App\Models\GroupPost;
+use App\Models\GroupReport;
+use App\Profile;
+use App\Services\AccountService;
+use App\Services\GroupService;
+use App\Services\HashidService;
+use App\Services\StatusService;
+use App\Status;
+use App\User;
+use Illuminate\Http\Request;
+use Storage;
+
+class GroupController extends GroupFederationController
+{
+    public function __construct()
+    {
+        $this->middleware('auth');
+        abort_unless(config('groups.enabled'), 404);
+    }
+
+    public function index(Request $request)
+    {
+        abort_if(! $request->user(), 404);
+
+        return view('layouts.spa');
+    }
+
+    public function home(Request $request)
+    {
+        abort_if(! $request->user(), 404);
+
+        return view('layouts.spa');
+    }
+
+    public function show(Request $request, $id, $path = false)
+    {
+        $group = Group::find($id);
+
+        if (! $group || $group->status) {
+            return response()->view('groups.unavailable')->setStatusCode(404);
+        }
+
+        if ($request->wantsJson()) {
+            return $this->showGroupObject($group);
+        }
+
+        return view('layouts.spa', compact('id', 'path'));
+    }
+
+    public function showStatus(Request $request, $gid, $sid)
+    {
+        $group = Group::find($gid);
+        $pid = optional($request->user())->profile_id ?? false;
+
+        if (! $group || $group->status) {
+            return response()->view('groups.unavailable')->setStatusCode(404);
+        }
+
+        if ($group->is_private) {
+            abort_if(! $request->user(), 404);
+            abort_if(! $group->isMember($pid), 404);
+        }
+
+        $gp = GroupPost::whereGroupId($gid)
+            ->findOrFail($sid);
+
+        return view('layouts.spa', compact('group', 'gp'));
+    }
+
+    public function getGroup(Request $request, $id)
+    {
+        $group = Group::whereNull('status')->findOrFail($id);
+        $pid = optional($request->user())->profile_id ?? false;
+
+        $group = $this->toJson($group, $pid);
+
+        return response()->json($group, 200, [], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+    }
+
+    public function showStatusLikes(Request $request, $id, $sid)
+    {
+        $group = Group::findOrFail($id);
+        $user = $request->user();
+        $pid = $user->profile_id;
+        abort_if(! $group->isMember($pid), 404);
+        $status = GroupPost::whereGroupId($id)->findOrFail($sid);
+        $likes = GroupLike::whereStatusId($sid)
+            ->cursorPaginate(10)
+            ->map(function ($l) use ($group) {
+                $account = AccountService::get($l->profile_id);
+                $account['url'] = "/groups/{$group->id}/user/{$account['id']}";
+
+                return $account;
+            })
+            ->filter(function ($l) {
+                return $l && isset($l['id']);
+            })
+            ->values();
+
+        return $likes;
+    }
+
+    public function groupSettings(Request $request, $id)
+    {
+        abort_if(! $request->user(), 404);
+        $group = Group::findOrFail($id);
+        $pid = $request->user()->profile_id;
+        abort_if(! $group->isMember($pid), 404);
+        abort_if(! in_array($group->selfRole($pid), ['founder', 'admin']), 404);
+
+        return view('groups.settings', compact('group'));
+    }
+
+    public function joinGroup(Request $request, $id)
+    {
+        $group = Group::findOrFail($id);
+        $pid = $request->user()->profile_id;
+        abort_if($group->isMember($pid), 404);
+
+        if (! $request->user()->is_admin) {
+            abort_if(GroupService::getRejoinTimeout($group->id, $pid), 422, 'Cannot re-join this group for 24 hours after leaving or cancelling a request to join');
+        }
+
+        $member = new GroupMember;
+        $member->group_id = $group->id;
+        $member->profile_id = $pid;
+        $member->role = 'member';
+        $member->local_group = true;
+        $member->local_profile = true;
+        $member->join_request = $group->is_private;
+        $member->save();
+
+        GroupService::delSelf($group->id, $pid);
+        GroupService::log(
+            $group->id,
+            $pid,
+            'group:joined',
+            null,
+            GroupMember::class,
+            $member->id
+        );
+
+        $group = $this->toJson($group, $pid);
+
+        return $group;
+    }
+
+    public function updateGroup(Request $request, $id)
+    {
+        $this->validate($request, [
+            'description' => 'nullable|max:500',
+            'membership' => 'required|in:all,local,private',
+            'avatar' => 'nullable',
+            'header' => 'nullable',
+            'discoverable' => 'required',
+            'activitypub' => 'required',
+            'is_nsfw' => 'required',
+            'category' => 'required|string|in:'.implode(',', GroupService::categories()),
+        ]);
+
+        $pid = $request->user()->profile_id;
+        $group = Group::whereProfileId($pid)->findOrFail($id);
+        $member = GroupMember::whereGroupId($group->id)->whereProfileId($pid)->firstOrFail();
+
+        abort_if($member->role != 'founder', 403, 'Invalid group permission');
+
+        $metadata = $group->metadata;
+        $len = $group->is_private ? 12 : 4;
+
+        if ($request->hasFile('avatar')) {
+            $avatar = $request->file('avatar');
+
+            if ($avatar) {
+                if (isset($metadata['avatar']) &&
+                    isset($metadata['avatar']['path']) &&
+                    Storage::exists($metadata['avatar']['path'])
+                ) {
+                    Storage::delete($metadata['avatar']['path']);
+                }
+
+                $fileName = 'avatar_'.strtolower(str_random($len)).'.'.$avatar->extension();
+                $path = $avatar->storePubliclyAs('public/g/'.$group->id.'/meta', $fileName);
+                $url = url(Storage::url($path));
+                $metadata['avatar'] = [
+                    'path' => $path,
+                    'url' => $url,
+                    'updated_at' => now(),
+                ];
+            }
+        }
+
+        if ($request->hasFile('header')) {
+            $header = $request->file('header');
+
+            if ($header) {
+                if (isset($metadata['header']) &&
+                    isset($metadata['header']['path']) &&
+                    Storage::exists($metadata['header']['path'])
+                ) {
+                    Storage::delete($metadata['header']['path']);
+                }
+
+                $fileName = 'header_'.strtolower(str_random($len)).'.'.$header->extension();
+                $path = $header->storePubliclyAs('public/g/'.$group->id.'/meta', $fileName);
+                $url = url(Storage::url($path));
+                $metadata['header'] = [
+                    'path' => $path,
+                    'url' => $url,
+                    'updated_at' => now(),
+                ];
+            }
+        }
+
+        $cat = GroupService::categoryById($group->category_id);
+        if ($request->category !== $cat['name']) {
+            $group->category_id = GroupCategory::whereName($request->category)->first()->id;
+        }
+
+        $changes = null;
+        $group->description = e($request->input('description', null));
+        $group->is_private = $request->input('membership') == 'private';
+        $group->local_only = $request->input('membership') == 'local';
+        $group->activitypub = $request->input('activitypub') == 'true';
+        $group->discoverable = $request->input('discoverable') == 'true';
+        $group->is_nsfw = $request->input('is_nsfw') == 'true';
+        $group->metadata = $metadata;
+        if ($group->isDirty()) {
+            $changes = $group->getDirty();
+        }
+        $group->save();
+
+        GroupService::log(
+            $group->id,
+            $pid,
+            'group:settings:updated',
+            $changes
+        );
+
+        GroupService::del($group->id);
+
+        $res = $this->toJson($group, $pid);
+
+        return $res;
+    }
+
+    protected function toJson($group, $pid = false)
+    {
+        return GroupService::get($group->id, $pid);
+    }
+
+    public function groupLeave(Request $request, $id)
+    {
+        abort_if(! $request->user(), 404);
+
+        $pid = $request->user()->profile_id;
+        $group = Group::findOrFail($id);
+
+        abort_if($pid == $group->profile_id, 422, 'Cannot leave a group you created');
+
+        abort_if(! $group->isMember($pid), 403, 'Not a member of group.');
+
+        GroupMember::whereGroupId($group->id)->whereProfileId($pid)->delete();
+        GroupService::del($group->id);
+        GroupService::delSelf($group->id, $pid);
+        GroupService::setRejoinTimeout($group->id, $pid);
+
+        return [200];
+    }
+
+    public function cancelJoinRequest(Request $request, $id)
+    {
+        abort_if(! $request->user(), 404);
+
+        $pid = $request->user()->profile_id;
+        $group = Group::findOrFail($id);
+
+        abort_if($pid == $group->profile_id, 422, 'Cannot leave a group you created');
+        abort_if($group->isMember($pid), 422, 'Cannot cancel approved join request, please leave group instead.');
+
+        GroupMember::whereGroupId($group->id)->whereProfileId($pid)->delete();
+        GroupService::del($group->id);
+        GroupService::delSelf($group->id, $pid);
+        GroupService::setRejoinTimeout($group->id, $pid);
+
+        return [200];
+    }
+
+    public function metaBlockSearch(Request $request, $id)
+    {
+        abort_if(! $request->user(), 404);
+        $group = Group::findOrFail($id);
+        $pid = $request->user()->profile_id;
+        abort_if(! $group->isMember($pid), 404);
+        abort_if(! in_array($group->selfRole($pid), ['founder', 'admin']), 404);
+
+        $type = $request->input('type');
+        $item = $request->input('item');
+
+        switch ($type) {
+            case 'instance':
+                $res = Instance::whereDomain($item)->first();
+                if ($res) {
+                    abort_if(GroupBlock::whereGroupId($group->id)->whereInstanceId($res->id)->exists(), 400);
+                }
+                break;
+
+            case 'user':
+                $res = Profile::whereUsername($item)->first();
+                if ($res) {
+                    abort_if(GroupBlock::whereGroupId($group->id)->whereProfileId($res->id)->exists(), 400);
+                }
+                if ($res->user_id != null) {
+                    abort_if(User::whereIsAdmin(true)->whereId($res->user_id)->exists(), 400);
+                }
+                break;
+        }
+
+        return response()->json((bool) $res, ($res ? 200 : 404));
+    }
+
+    public function reportCreate(Request $request, $id)
+    {
+        abort_if(! $request->user(), 404);
+        $group = Group::findOrFail($id);
+        $pid = $request->user()->profile_id;
+        abort_if(! $group->isMember($pid), 404);
+
+        $id = $request->input('id');
+        $type = $request->input('type');
+        $types = [
+            // original 3
+            'spam',
+            'sensitive',
+            'abusive',
+
+            // new
+            'underage',
+            'violence',
+            'copyright',
+            'impersonation',
+            'scam',
+            'terrorism',
+        ];
+
+        $gp = GroupPost::whereGroupId($group->id)->find($id);
+        abort_if(! $gp, 422, 'Cannot report an invalid or deleted post');
+        abort_if(! in_array($type, $types), 422, 'Invalid report type');
+        abort_if($gp->profile_id === $pid, 422, 'Cannot report your own post');
+        abort_if(
+            GroupReport::whereGroupId($group->id)
+                ->whereProfileId($pid)
+                ->whereItemType(GroupPost::class)
+                ->whereItemId($id)
+                ->exists(),
+            422,
+            'You already reported this'
+        );
+
+        $report = new GroupReport();
+        $report->group_id = $group->id;
+        $report->profile_id = $pid;
+        $report->type = $type;
+        $report->item_type = GroupPost::class;
+        $report->item_id = $id;
+        $report->open = true;
+        $report->save();
+
+        GroupService::log(
+            $group->id,
+            $pid,
+            'group:report:create',
+            [
+                'type' => $type,
+                'report_id' => $report->id,
+                'status_id' => $gp->status_id,
+                'profile_id' => $gp->profile_id,
+                'username' => optional(AccountService::get($gp->profile_id))['acct'],
+                'gpid' => $gp->id,
+                'url' => $gp->url(),
+            ],
+            GroupReport::class,
+            $report->id
+        );
+
+        return response([200]);
+    }
+
+    public function reportAction(Request $request, $id)
+    {
+        abort_if(! $request->user(), 404);
+        $group = Group::findOrFail($id);
+        $pid = $request->user()->profile_id;
+        abort_if(! $group->isMember($pid), 404);
+        abort_if(! in_array($group->selfRole($pid), ['founder', 'admin']), 404);
+
+        $this->validate($request, [
+            'action' => 'required|in:cw,delete,ignore',
+            'id' => 'required|string',
+        ]);
+
+        $action = $request->input('action');
+        $id = $request->input('id');
+
+        $report = GroupReport::whereGroupId($group->id)
+            ->findOrFail($id);
+        $status = Status::findOrFail($report->item_id);
+        $gp = GroupPost::whereGroupId($group->id)
+            ->whereStatusId($status->id)
+            ->firstOrFail();
+
+        switch ($action) {
+            case 'cw':
+                $status->is_nsfw = true;
+                $status->save();
+                StatusService::del($status->id);
+
+                GroupReport::whereGroupId($group->id)
+                    ->whereItemType($report->item_type)
+                    ->whereItemId($report->item_id)
+                    ->update(['open' => false]);
+
+                GroupService::log(
+                    $group->id,
+                    $pid,
+                    'group:moderation:action',
+                    [
+                        'type' => 'cw',
+                        'report_id' => $report->id,
+                        'status_id' => $status->id,
+                        'profile_id' => $status->profile_id,
+                        'status_url' => $gp->url(),
+                    ],
+                    GroupReport::class,
+                    $report->id
+                );
+
+                return response()->json([200]);
+                break;
+
+            case 'ignore':
+                GroupReport::whereGroupId($group->id)
+                    ->whereItemType($report->item_type)
+                    ->whereItemId($report->item_id)
+                    ->update(['open' => false]);
+
+                GroupService::log(
+                    $group->id,
+                    $pid,
+                    'group:moderation:action',
+                    [
+                        'type' => 'ignore',
+                        'report_id' => $report->id,
+                        'status_id' => $status->id,
+                        'profile_id' => $status->profile_id,
+                        'status_url' => $gp->url(),
+                    ],
+                    GroupReport::class,
+                    $report->id
+                );
+
+                return response()->json([200]);
+                break;
+        }
+    }
+
+    public function getMemberInteractionLimits(Request $request, $id)
+    {
+        abort_if(! $request->user(), 404);
+        $group = Group::findOrFail($id);
+        $pid = $request->user()->profile_id;
+        abort_if(! $group->isMember($pid), 404);
+        abort_if(! in_array($group->selfRole($pid), ['founder', 'admin']), 404);
+
+        $profile_id = $request->input('profile_id');
+        abort_if(! $group->isMember($profile_id), 404);
+        $limits = GroupService::getInteractionLimits($group->id, $profile_id);
+
+        return response()->json($limits);
+    }
+
+    public function updateMemberInteractionLimits(Request $request, $id)
+    {
+        abort_if(! $request->user(), 404);
+        $group = Group::findOrFail($id);
+        $pid = $request->user()->profile_id;
+        abort_if(! $group->isMember($pid), 404);
+        abort_if(! in_array($group->selfRole($pid), ['founder', 'admin']), 404);
+
+        $this->validate($request, [
+            'profile_id' => 'required|exists:profiles,id',
+            'can_post' => 'required',
+            'can_comment' => 'required',
+            'can_like' => 'required',
+        ]);
+
+        $member = $request->input('profile_id');
+        $can_post = $request->input('can_post');
+        $can_comment = $request->input('can_comment');
+        $can_like = $request->input('can_like');
+        $account = AccountService::get($member);
+
+        abort_if(! $account, 422, 'Invalid profile');
+        abort_if(! $group->isMember($member), 422, 'Invalid profile');
+
+        $limit = GroupLimit::firstOrCreate([
+            'profile_id' => $member,
+            'group_id' => $group->id,
+        ]);
+
+        if ($limit->wasRecentlyCreated) {
+            abort_if(GroupLimit::whereGroupId($group->id)->count() >= 25, 422, 'limit_reached');
+        }
+
+        $previousLimits = $limit->limits;
+
+        $limit->limits = [
+            'can_post' => $can_post,
+            'can_comment' => $can_comment,
+            'can_like' => $can_like,
+        ];
+        $limit->save();
+
+        GroupService::clearInteractionLimits($group->id, $member);
+
+        GroupService::log(
+            $group->id,
+            $pid,
+            'group:member-limits:updated',
+            [
+                'profile_id' => $account['id'],
+                'username' => $account['username'],
+                'previousLimits' => $previousLimits,
+                'newLimits' => $limit->limits,
+            ],
+            GroupLimit::class,
+            $limit->id
+        );
+
+        return $request->all();
+    }
+
+    public function showProfile(Request $request, $id, $pid)
+    {
+        $group = Group::find($id);
+
+        if (! $group || $group->status) {
+            return response()->view('groups.unavailable')->setStatusCode(404);
+        }
+
+        return view('layouts.spa');
+    }
+
+    public function showProfileByUsername(Request $request, $id, $pid)
+    {
+        abort_if(! $request->user(), 404);
+        if (! $request->user()) {
+            return redirect("/{$pid}");
+        }
+
+        $group = Group::find($id);
+        $cid = $request->user()->profile_id;
+
+        if (! $group || $group->status) {
+            return response()->view('groups.unavailable')->setStatusCode(404);
+        }
+
+        if (! $group->isMember($cid)) {
+            return redirect("/{$pid}");
+        }
+
+        $profile = Profile::whereUsername($pid)->first();
+
+        if (! $group->isMember($profile->id)) {
+            return redirect("/{$pid}");
+        }
+
+        if ($profile) {
+            $url = url("/groups/{$id}/user/{$profile->id}");
+
+            return redirect($url);
+        }
+
+        abort(404, 'Invalid username');
+    }
+
+    public function groupInviteLanding(Request $request, $id)
+    {
+        abort(404, 'Not yet implemented');
+        $group = Group::findOrFail($id);
+
+        return view('groups.invite', compact('group'));
+    }
+
+    public function groupShortLinkRedirect(Request $request, $hid)
+    {
+        $gid = HashidService::decode($hid);
+        $group = Group::findOrFail($gid);
+
+        return redirect($group->url());
+    }
+
+    public function groupInviteClaim(Request $request, $id)
+    {
+        $group = GroupService::get($id);
+        abort_if(! $group || empty($group), 404);
+
+        return view('groups.invite-claim', compact('group'));
+    }
+
+    public function groupMemberInviteCheck(Request $request, $id)
+    {
+        abort_if(! $request->user(), 404);
+        $pid = $request->user()->profile_id;
+        $group = Group::findOrFail($id);
+        abort_if($group->isMember($pid), 422, 'Already a member');
+
+        $exists = GroupInvitation::whereGroupId($id)->whereToProfileId($pid)->exists();
+
+        return response()->json([
+            'gid' => $id,
+            'can_join' => (bool) $exists,
+        ]);
+    }
+
+    public function groupMemberInviteAccept(Request $request, $id)
+    {
+        abort_if(! $request->user(), 404);
+        $pid = $request->user()->profile_id;
+        $group = Group::findOrFail($id);
+        abort_if($group->isMember($pid), 422, 'Already a member');
+
+        abort_if(! GroupInvitation::whereGroupId($id)->whereToProfileId($pid)->exists(), 422);
+
+        $gm = new GroupMember;
+        $gm->group_id = $id;
+        $gm->profile_id = $pid;
+        $gm->role = 'member';
+        $gm->local_group = $group->local;
+        $gm->local_profile = true;
+        $gm->join_request = false;
+        $gm->save();
+
+        GroupInvitation::whereGroupId($id)->whereToProfileId($pid)->delete();
+        GroupService::del($id);
+        GroupService::delSelf($id, $pid);
+
+        return ['next_url' => $group->url()];
+    }
+
+    public function groupMemberInviteDecline(Request $request, $id)
+    {
+        abort_if(! $request->user(), 404);
+        $pid = $request->user()->profile_id;
+        $group = Group::findOrFail($id);
+        abort_if($group->isMember($pid), 422, 'Already a member');
+
+        return ['next_url' => '/'];
+    }
+}
diff --git a/app/Http/Controllers/GroupFederationController.php b/app/Http/Controllers/GroupFederationController.php
new file mode 100644
index 000000000..0e5879b01
--- /dev/null
+++ b/app/Http/Controllers/GroupFederationController.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\Group;
+use App\Models\GroupPost;
+use App\Models\InstanceActor;
+use App\Services\MediaService;
+use App\Status;
+use App\Util\Lexer\Autolink;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
+
+class GroupFederationController extends Controller
+{
+    public function getGroupObject(Request $request, $id)
+    {
+        $group = Group::whereLocal(true)->whereActivitypub(true)->findOrFail($id);
+        $res = $this->showGroupObject($group);
+
+        return response()->json($res, 200, [], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+    }
+
+    public function showGroupObject($group)
+    {
+        return Cache::remember('ap:groups:object:'.$group->id, 3600, function () use ($group) {
+            return [
+                '@context' => 'https://www.w3.org/ns/activitystreams',
+                'id' => $group->url(),
+                'inbox' => $group->permalink('/inbox'),
+                'name' => $group->name,
+                'outbox' => $group->permalink('/outbox'),
+                'summary' => $group->description,
+                'type' => 'Group',
+                'attributedTo' => [
+                    'type' => 'Person',
+                    'id' => $group->admin->permalink(),
+                ],
+                // 'endpoints' => [
+                // 	'sharedInbox' => config('app.url') . '/f/inbox'
+                // ],
+                'preferredUsername' => 'gid_'.$group->id,
+                'publicKey' => [
+                    'id' => $group->permalink('#main-key'),
+                    'owner' => $group->permalink(),
+                    'publicKeyPem' => InstanceActor::first()->public_key,
+                ],
+                'url' => $group->permalink(),
+            ];
+
+            if ($group->metadata && isset($group->metadata['avatar'])) {
+                $res['icon'] = [
+                    'type' => 'Image',
+                    'url' => $group->metadata['avatar']['url'],
+                ];
+            }
+
+            if ($group->metadata && isset($group->metadata['header'])) {
+                $res['image'] = [
+                    'type' => 'Image',
+                    'url' => $group->metadata['header']['url'],
+                ];
+            }
+            ksort($res);
+
+            return $res;
+        });
+    }
+
+    public function getStatusObject(Request $request, $gid, $sid)
+    {
+        $group = Group::whereLocal(true)->whereActivitypub(true)->findOrFail($gid);
+        $gp = GroupPost::whereGroupId($gid)->findOrFail($sid);
+        $status = Status::findOrFail($gp->status_id);
+        // permission check
+        $content = $status->caption ? Autolink::create()->autolink($status->caption) : null;
+        $res = [
+            '@context' => 'https://www.w3.org/ns/activitystreams',
+            'id' => $gp->url(),
+
+            'type' => 'Note',
+
+            'summary' => null,
+            'content' => $content,
+            'inReplyTo' => null,
+
+            'published' => $status->created_at->toAtomString(),
+            'url' => $gp->url(),
+            'attributedTo' => $status->profile->permalink(),
+            'to' => [
+                'https://www.w3.org/ns/activitystreams#Public',
+                $group->permalink('/followers'),
+            ],
+            'cc' => [],
+            'sensitive' => (bool) $status->is_nsfw,
+            'attachment' => MediaService::activitypub($status->id),
+            'target' => [
+                'type' => 'Collection',
+                'id' => $group->permalink('/wall'),
+                'attributedTo' => $group->permalink(),
+            ],
+        ];
+
+        // ksort($res);
+        return response()->json($res, 200, [], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+    }
+}
diff --git a/app/Http/Controllers/GroupPostController.php b/app/Http/Controllers/GroupPostController.php
new file mode 100644
index 000000000..909037a00
--- /dev/null
+++ b/app/Http/Controllers/GroupPostController.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class GroupPostController extends Controller
+{
+    //
+}
diff --git a/app/Http/Controllers/Groups/CreateGroupsController.php b/app/Http/Controllers/Groups/CreateGroupsController.php
new file mode 100644
index 000000000..819c90c58
--- /dev/null
+++ b/app/Http/Controllers/Groups/CreateGroupsController.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace App\Http\Controllers\Groups;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use App\Services\GroupService;
+use App\Models\Group;
+use App\Models\GroupMember;
+
+class CreateGroupsController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    public function checkCreatePermission(Request $request)
+    {
+        abort_if(!$request->user(), 404);
+        $pid = $request->user()->profile_id;
+        $config = GroupService::config();
+        if($request->user()->is_admin) {
+            $allowed = true;
+        } else {
+            $max = $config['limits']['user']['create']['max'];
+            $allowed = Group::whereProfileId($pid)->count() <= $max;
+        }
+
+        return ['permission' => (bool) $allowed];
+    }
+
+    public function storeGroup(Request $request)
+    {
+        abort_if(!$request->user(), 404);
+
+        $this->validate($request, [
+            'name' => 'required',
+            'description' => 'nullable|max:500',
+            'membership' => 'required|in:public,private,local'
+        ]);
+
+        $pid = $request->user()->profile_id;
+
+        $config = GroupService::config();
+        abort_if($config['limits']['user']['create']['new'] == false && $request->user()->is_admin == false, 422, 'Invalid operation');
+        $max = $config['limits']['user']['create']['max'];
+        // abort_if(Group::whereProfileId($pid)->count() <= $max, 422, 'Group limit reached');
+
+        $group = new Group;
+        $group->profile_id = $pid;
+        $group->name = $request->input('name');
+        $group->description = $request->input('description', null);
+        $group->is_private = $request->input('membership') == 'private';
+        $group->local_only = $request->input('membership') == 'local';
+        $group->metadata = $request->input('configuration');
+        $group->save();
+
+        GroupService::log($group->id, $pid, 'group:created');
+
+        $member = new GroupMember;
+        $member->group_id = $group->id;
+        $member->profile_id = $pid;
+        $member->role = 'founder';
+        $member->local_group = true;
+        $member->local_profile = true;
+        $member->save();
+
+        GroupService::log(
+            $group->id,
+            $pid,
+            'group:joined',
+            null,
+            GroupMember::class,
+            $member->id
+        );
+
+        return [
+            'id' => $group->id,
+            'url' => $group->url()
+        ];
+    }
+}
diff --git a/app/Http/Controllers/Groups/GroupsAdminController.php b/app/Http/Controllers/Groups/GroupsAdminController.php
new file mode 100644
index 000000000..4bdf0f504
--- /dev/null
+++ b/app/Http/Controllers/Groups/GroupsAdminController.php
@@ -0,0 +1,353 @@
+<?php
+
+namespace App\Http\Controllers\Groups;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use App\Services\GroupService;
+use App\Instance;
+use App\Profile;
+use App\Models\Group;
+use App\Models\GroupBlock;
+use App\Models\GroupCategory;
+use App\Models\GroupInteraction;
+use App\Models\GroupPost;
+use App\Models\GroupMember;
+use App\Models\GroupReport;
+use App\Services\Groups\GroupAccountService;
+use App\Services\Groups\GroupPostService;
+
+class GroupsAdminController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    public function getAdminTabs(Request $request, $id)
+    {
+        abort_if(!$request->user(), 404);
+        $group = Group::findOrFail($id);
+        $pid = $request->user()->profile_id;
+        abort_if(!$group->isMember($pid), 404);
+        abort_if(!in_array($group->selfRole($pid), ['founder', 'admin']), 404);
+        abort_if($pid !== $group->profile_id, 404);
+
+        $reqs = GroupMember::whereGroupId($group->id)->whereJoinRequest(true)->count();
+        $mods = GroupReport::whereGroupId($group->id)->whereOpen(true)->count();
+        $tabs = [
+            'moderation_count' => $mods > 99 ? '99+' : $mods,
+            'request_count' => $reqs > 99 ? '99+' : $reqs
+        ];
+
+        return response()->json($tabs);
+    }
+
+    public function getInteractionLogs(Request $request, $id)
+    {
+        abort_if(!$request->user(), 404);
+        $group = Group::findOrFail($id);
+        $pid = $request->user()->profile_id;
+        abort_if(!$group->isMember($pid), 404);
+        abort_if(!in_array($group->selfRole($pid), ['founder', 'admin']), 404);
+
+        $logs = GroupInteraction::whereGroupId($id)
+            ->latest()
+            ->paginate(10)
+            ->map(function($log) use($group) {
+                return [
+                    'id' => $log->id,
+                    'profile' => GroupAccountService::get($group->id, $log->profile_id),
+                    'type' => $log->type,
+                    'metadata' => $log->metadata,
+                    'created_at' => $log->created_at->format('c')
+                ];
+            });
+
+        return response()->json($logs, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
+    }
+
+    public function getBlocks(Request $request, $id)
+    {
+        abort_if(!$request->user(), 404);
+        $group = Group::findOrFail($id);
+        $pid = $request->user()->profile_id;
+        abort_if(!$group->isMember($pid), 404);
+        abort_if(!in_array($group->selfRole($pid), ['founder', 'admin']), 404);
+
+        $blocks = [
+            'instances' => GroupBlock::whereGroupId($group->id)->whereNotNull('instance_id')->whereModerated(false)->latest()->take(3)->pluck('name'),
+            'users' => GroupBlock::whereGroupId($group->id)->whereNotNull('profile_id')->whereIsUser(true)->latest()->take(3)->pluck('name'),
+            'moderated' => GroupBlock::whereGroupId($group->id)->whereNotNull('instance_id')->whereModerated(true)->latest()->take(3)->pluck('name')
+        ];
+
+        return response()->json($blocks, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
+    }
+
+    public function exportBlocks(Request $request, $id)
+    {
+        abort_if(!$request->user(), 404);
+        $group = Group::findOrFail($id);
+        $pid = $request->user()->profile_id;
+        abort_if(!$group->isMember($pid), 404);
+        abort_if(!in_array($group->selfRole($pid), ['founder', 'admin']), 404);
+
+        $blocks = [
+            'instances' => GroupBlock::whereGroupId($group->id)->whereNotNull('instance_id')->whereModerated(false)->latest()->pluck('name'),
+            'users' => GroupBlock::whereGroupId($group->id)->whereNotNull('profile_id')->whereIsUser(true)->latest()->pluck('name'),
+            'moderated' => GroupBlock::whereGroupId($group->id)->whereNotNull('instance_id')->whereModerated(true)->latest()->pluck('name')
+        ];
+
+        $blocks['_created_at'] = now()->format('c');
+        $blocks['_version'] = '1.0.0';
+        ksort($blocks);
+
+        return response()->streamDownload(function() use($blocks) {
+            echo json_encode($blocks, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
+        });
+    }
+
+    public function addBlock(Request $request, $id)
+    {
+        abort_if(!$request->user(), 404);
+        $group = Group::findOrFail($id);
+        $pid = $request->user()->profile_id;
+        abort_if(!$group->isMember($pid), 404);
+        abort_if(!in_array($group->selfRole($pid), ['founder', 'admin']), 404);
+
+        $this->validate($request, [
+            'item' => 'required',
+            'type' => 'required|in:instance,user,moderate'
+        ]);
+
+        $item = $request->input('item');
+        $type = $request->input('type');
+
+        switch($type) {
+            case 'instance':
+                $instance = Instance::whereDomain($item)->first();
+                abort_if(!$instance, 422, 'This domain either isn\'nt known or is invalid');
+                $gb = new GroupBlock;
+                $gb->group_id = $group->id;
+                $gb->admin_id = $pid;
+                $gb->instance_id = $instance->id;
+                $gb->name = $instance->domain;
+                $gb->is_user = false;
+                $gb->moderated = false;
+                $gb->save();
+
+                GroupService::log(
+                    $group->id,
+                    $pid,
+                    'group:admin:block:instance',
+                    [
+                        'domain' => $instance->domain
+                    ],
+                    GroupBlock::class,
+                    $gb->id
+                );
+
+                return [200];
+            break;
+
+            case 'user':
+                $profile = Profile::whereUsername($item)->first();
+                abort_if(!$profile, 422, 'This user either isn\'nt known or is invalid');
+                $gb = new GroupBlock;
+                $gb->group_id = $group->id;
+                $gb->admin_id = $pid;
+                $gb->profile_id = $profile->id;
+                $gb->name = $profile->username;
+                $gb->is_user = true;
+                $gb->moderated = false;
+                $gb->save();
+
+                GroupService::log(
+                    $group->id,
+                    $pid,
+                    'group:admin:block:user',
+                    [
+                        'username' => $profile->username,
+                        'domain' => $profile->domain
+                    ],
+                    GroupBlock::class,
+                    $gb->id
+                );
+
+                return [200];
+            break;
+
+            case 'moderate':
+                $instance = Instance::whereDomain($item)->first();
+                abort_if(!$instance, 422, 'This domain either isn\'nt known or is invalid');
+                $gb = new GroupBlock;
+                $gb->group_id = $group->id;
+                $gb->admin_id = $pid;
+                $gb->instance_id = $instance->id;
+                $gb->name = $instance->domain;
+                $gb->is_user = false;
+                $gb->moderated = true;
+                $gb->save();
+
+                GroupService::log(
+                    $group->id,
+                    $pid,
+                    'group:admin:moderate:instance',
+                    [
+                        'domain' => $instance->domain
+                    ],
+                    GroupBlock::class,
+                    $gb->id
+                );
+
+                return [200];
+            break;
+
+            default:
+                return response()->json([], 422, []);
+            break;
+        }
+    }
+
+    public function undoBlock(Request $request, $id)
+    {
+        abort_if(!$request->user(), 404);
+        $group = Group::findOrFail($id);
+        $pid = $request->user()->profile_id;
+        abort_if(!$group->isMember($pid), 404);
+        abort_if(!in_array($group->selfRole($pid), ['founder', 'admin']), 404);
+
+        $this->validate($request, [
+            'item' => 'required',
+            'type' => 'required|in:instance,user,moderate'
+        ]);
+
+        $item = $request->input('item');
+        $type = $request->input('type');
+
+        switch($type) {
+            case 'instance':
+                $instance = Instance::whereDomain($item)->first();
+                abort_if(!$instance, 422, 'This domain either isn\'nt known or is invalid');
+
+                $gb = GroupBlock::whereGroupId($group->id)
+                    ->whereInstanceId($instance->id)
+                    ->whereModerated(false)
+                    ->first();
+
+                abort_if(!$gb, 422, 'Invalid group block');
+
+                GroupService::log(
+                    $group->id,
+                    $pid,
+                    'group:admin:unblock:instance',
+                    [
+                        'domain' => $instance->domain
+                    ],
+                    GroupBlock::class,
+                    $gb->id
+                );
+
+                $gb->delete();
+
+                return [200];
+            break;
+
+            case 'user':
+                $profile = Profile::whereUsername($item)->first();
+                abort_if(!$profile, 422, 'This user either isn\'nt known or is invalid');
+
+                $gb = GroupBlock::whereGroupId($group->id)
+                    ->whereProfileId($profile->id)
+                    ->whereIsUser(true)
+                    ->first();
+
+                abort_if(!$gb, 422, 'Invalid group block');
+
+                GroupService::log(
+                    $group->id,
+                    $pid,
+                    'group:admin:unblock:user',
+                    [
+                        'username' => $profile->username,
+                        'domain' => $profile->domain
+                    ],
+                    GroupBlock::class,
+                    $gb->id
+                );
+
+                $gb->delete();
+
+                return [200];
+            break;
+
+            case 'moderate':
+                $instance = Instance::whereDomain($item)->first();
+                abort_if(!$instance, 422, 'This domain either isn\'nt known or is invalid');
+
+                $gb = GroupBlock::whereGroupId($group->id)
+                    ->whereInstanceId($instance->id)
+                    ->whereModerated(true)
+                    ->first();
+
+                abort_if(!$gb, 422, 'Invalid group block');
+
+                GroupService::log(
+                    $group->id,
+                    $pid,
+                    'group:admin:moderate:instance',
+                    [
+                        'domain' => $instance->domain
+                    ],
+                    GroupBlock::class,
+                    $gb->id
+                );
+
+                $gb->delete();
+
+                return [200];
+            break;
+
+            default:
+                return response()->json([], 422, []);
+            break;
+        }
+    }
+
+    public function getReportList(Request $request, $id)
+    {
+        abort_if(!$request->user(), 404);
+        $group = Group::findOrFail($id);
+        $pid = $request->user()->profile_id;
+        abort_if(!$group->isMember($pid), 404);
+        abort_if(!in_array($group->selfRole($pid), ['founder', 'admin']), 404);
+
+        $scope = $request->input('scope', 'open');
+
+        $list = GroupReport::selectRaw('id, profile_id, item_type, item_id, type, created_at, count(*) as total')
+            ->whereGroupId($group->id)
+            ->groupBy('item_id')
+            ->when($scope == 'open', function($query, $scope) {
+                return $query->whereOpen(true);
+            })
+            ->latest()
+            ->simplePaginate(10)
+            ->map(function($report) use($group) {
+                $res = [
+                    'id' => (string) $report->id,
+                    'profile' => GroupAccountService::get($group->id, $report->profile_id),
+                    'type' => $report->type,
+                    'created_at' => $report->created_at->format('c'),
+                    'total_count' => $report->total
+                ];
+
+                if($report->item_type === GroupPost::class) {
+                    $res['status'] = GroupPostService::get($group->id, $report->item_id);
+                }
+
+                return $res;
+            });
+        return response()->json($list, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
+    }
+
+}
diff --git a/app/Http/Controllers/Groups/GroupsApiController.php b/app/Http/Controllers/Groups/GroupsApiController.php
new file mode 100644
index 000000000..13bbca640
--- /dev/null
+++ b/app/Http/Controllers/Groups/GroupsApiController.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace App\Http\Controllers\Groups;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use App\Services\GroupService;
+use App\Models\Group;
+use App\Models\GroupCategory;
+use App\Models\GroupMember;
+use App\Services\Groups\GroupAccountService;
+
+class GroupsApiController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    protected function toJson($group, $pid = false)
+    {
+        return GroupService::get($group->id, $pid);
+    }
+
+    public function getConfig(Request $request)
+    {
+        return GroupService::config();
+    }
+
+    public function getGroupAccount(Request $request, $gid, $pid)
+    {
+        $res = GroupAccountService::get($gid, $pid);
+
+        return response()->json($res);
+    }
+
+    public function getGroupCategories(Request $request)
+    {
+        $res = GroupService::categories();
+        return response()->json($res, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
+    }
+
+    public function getGroupsByCategory(Request $request)
+    {
+        $name = $request->input('name');
+        $category = GroupCategory::whereName($name)->firstOrFail();
+        $groups = Group::whereCategoryId($category->id)
+            ->simplePaginate(6)
+            ->map(function($group) {
+                return GroupService::get($group->id);
+            })
+            ->filter(function($group) {
+                return $group;
+            })
+            ->values();
+        return $groups;
+    }
+
+    public function getRecommendedGroups(Request $request)
+    {
+        return [];
+    }
+
+    public function getSelfGroups(Request $request)
+    {
+        $selfOnly = $request->input('self') == true;
+        $memberOnly = $request->input('member') == true;
+        $pid = $request->user()->profile_id;
+        $res = GroupMember::whereProfileId($request->user()->profile_id)
+            ->when($selfOnly, function($q, $selfOnly) {
+                return $q->whereRole('founder');
+            })
+            ->when($memberOnly, function($q, $memberOnly) {
+                return $q->whereRole('member');
+            })
+            ->simplePaginate(4)
+            ->map(function($member) use($pid) {
+                $group = $member->group;
+                return $this->toJson($group, $pid);
+        });
+
+        return response()->json($res);
+    }
+}
diff --git a/app/Http/Controllers/Groups/GroupsCommentController.php b/app/Http/Controllers/Groups/GroupsCommentController.php
new file mode 100644
index 000000000..435ed0d78
--- /dev/null
+++ b/app/Http/Controllers/Groups/GroupsCommentController.php
@@ -0,0 +1,361 @@
+<?php
+
+namespace App\Http\Controllers\Groups;
+
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\RateLimiter;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use App\Services\AccountService;
+use App\Services\GroupService;
+use App\Services\Groups\GroupCommentService;
+use App\Services\Groups\GroupMediaService;
+use App\Services\Groups\GroupPostService;
+use App\Services\Groups\GroupsLikeService;
+use App\Models\Group;
+use App\Models\GroupLike;
+use App\Models\GroupMedia;
+use App\Models\GroupPost;
+use App\Models\GroupComment;
+use Purify;
+use App\Util\Lexer\Autolink;
+use App\Jobs\GroupsPipeline\ImageResizePipeline;
+use App\Jobs\GroupsPipeline\ImageS3UploadPipeline;
+use App\Jobs\GroupsPipeline\NewPostPipeline;
+use App\Jobs\GroupsPipeline\NewCommentPipeline;
+use App\Jobs\GroupsPipeline\DeleteCommentPipeline;
+
+class GroupsCommentController extends Controller
+{
+    public function getComments(Request $request)
+    {
+        $this->validate($request, [
+            'gid' => 'required',
+            'sid' => 'required',
+            'cid' => 'sometimes',
+            'limit' => 'nullable|integer|min:3|max:10'
+        ]);
+
+        $pid = optional($request->user())->profile_id;
+        $gid = $request->input('gid');
+        $sid = $request->input('sid');
+        $cid = $request->has('cid') && $request->input('cid') == 1;
+        $limit = $request->input('limit', 3);
+        $maxId = $request->input('max_id', 0);
+
+        $group = Group::findOrFail($gid);
+
+        abort_if($group->is_private && !$group->isMember($pid), 403, 'Not a member of group.');
+
+        $status = $cid ? GroupComment::findOrFail($sid) : GroupPost::findOrFail($sid);
+
+        abort_if($status->group_id != $group->id, 400, 'Invalid group');
+
+        $replies = GroupComment::whereGroupId($group->id)
+            ->whereStatusId($status->id)
+            ->orderByDesc('id')
+            ->when($maxId, function($query, $maxId) {
+                return $query->where('id', '<', $maxId);
+            })
+            ->take($limit)
+            ->get()
+            ->map(function($gp) use($pid) {
+                $status = GroupCommentService::get($gp['group_id'], $gp['id']);
+                $status['reply_count'] = $gp['reply_count'];
+                $status['url'] = $gp->url();
+                $status['favourited'] = (bool) GroupsLikeService::liked($pid, $gp['id']);
+                $status['account']['url'] = url("/groups/{$gp['group_id']}/user/{$gp['profile_id']}");
+                return $status;
+            });
+
+        return $replies->toArray();
+    }
+
+    public function storeComment(Request $request)
+    {
+        $this->validate($request, [
+            'gid' => 'required|exists:groups,id',
+            'sid' => 'required|exists:group_posts,id',
+            'cid' => 'sometimes',
+            'content' => 'required|string|min:1|max:1500'
+        ]);
+
+        $pid = $request->user()->profile_id;
+        $gid = $request->input('gid');
+        $sid = $request->input('sid');
+        $cid = $request->input('cid');
+        $limit = $request->input('limit', 3);
+        $caption = e($request->input('content'));
+
+        $group = Group::findOrFail($gid);
+
+        abort_if(!$group->isMember($pid), 403, 'Not a member of group.');
+        abort_if(!GroupService::canComment($gid, $pid), 422, 'You cannot interact with this content at this time');
+
+
+        $parent = $cid == 1 ?
+            GroupComment::findOrFail($sid) :
+            GroupPost::whereGroupId($gid)->findOrFail($sid);
+        // $autolink = Purify::clean(Autolink::create()->autolink($caption));
+        // $autolink = str_replace('/discover/tags/', '/groups/' . $gid . '/topics/', $autolink);
+
+        $status = new GroupComment;
+        $status->group_id = $group->id;
+        $status->profile_id = $pid;
+        $status->status_id = $parent->id;
+        $status->caption = Purify::clean($caption);
+        $status->visibility = 'public';
+        $status->is_nsfw = false;
+        $status->local = true;
+        $status->save();
+
+        NewCommentPipeline::dispatch($parent, $status)->onQueue('groups');
+        // todo: perform in job
+        $parent->reply_count = $parent->reply_count ? $parent->reply_count + $parent->reply_count : 1;
+        $parent->save();
+        GroupPostService::del($parent->group_id, $parent->id);
+
+        GroupService::log(
+            $group->id,
+            $pid,
+            'group:comment:created',
+            [
+                'type' => 'group:post:comment',
+                'status_id' => $status->id
+            ],
+            GroupPost::class,
+            $status->id
+        );
+
+        //GroupCommentPipeline::dispatch($parent, $status, $gp);
+        //NewStatusPipeline::dispatch($status, $gp);
+        //GroupPostService::del($group->id, GroupService::sidToGid($group->id, $parent->id));
+
+        // todo: perform in job
+        $s = GroupCommentService::get($status->group_id, $status->id);
+
+        $s['pf_type'] = 'text';
+        $s['visibility'] = 'public';
+        $s['url'] = $status->url();
+
+        return $s;
+    }
+
+    public function storeCommentPhoto(Request $request)
+    {
+        $this->validate($request, [
+            'gid' => 'required|exists:groups,id',
+            'sid' => 'required|exists:group_posts,id',
+            'photo' => 'required|image'
+        ]);
+
+        $pid = $request->user()->profile_id;
+        $gid = $request->input('gid');
+        $sid = $request->input('sid');
+        $limit = $request->input('limit', 3);
+        $caption = $request->input('content');
+
+        $group = Group::findOrFail($gid);
+
+        abort_if(!$group->isMember($pid), 403, 'Not a member of group.');
+        abort_if(!GroupService::canComment($gid, $pid), 422, 'You cannot interact with this content at this time');
+        $parent = GroupPost::whereGroupId($gid)->findOrFail($sid);
+
+        $status = new GroupComment;
+        $status->status_id = $parent->id;
+        $status->group_id = $group->id;
+        $status->profile_id = $pid;
+        $status->caption = Purify::clean($caption);
+        $status->visibility = 'draft';
+        $status->is_nsfw = false;
+        $status->save();
+
+        $photo = $request->file('photo');
+        $storagePath = GroupMediaService::path($group->id, $pid, $status->id);
+        $storagePath = 'public/g/' . $group->id . '/p/' . $parent->id;
+        $path = $photo->storePublicly($storagePath);
+
+        $media = new GroupMedia();
+        $media->group_id = $group->id;
+        $media->status_id = $status->id;
+        $media->profile_id = $request->user()->profile_id;
+        $media->media_path = $path;
+        $media->size = $photo->getSize();
+        $media->mime = $photo->getMimeType();
+        $media->save();
+
+        ImageResizePipeline::dispatchSync($media);
+        ImageS3UploadPipeline::dispatchSync($media);
+
+        // $gp = new GroupPost;
+        // $gp->group_id = $group->id;
+        // $gp->profile_id = $pid;
+        // $gp->type = 'reply:photo';
+        // $gp->status_id = $status->id;
+        // $gp->in_reply_to_id = $parent->id;
+        // $gp->save();
+
+        // GroupService::log(
+        //  $group->id,
+        //  $pid,
+        //  'group:comment:created',
+        //  [
+        //      'type' => $gp->type,
+        //      'status_id' => $status->id
+        //  ],
+        //  GroupPost::class,
+        //  $gp->id
+        // );
+
+        // todo: perform in job
+        // $parent->reply_count = Status::whereInReplyToId($parent->id)->count();
+        // $parent->save();
+        // StatusService::del($parent->id);
+        // GroupPostService::del($group->id, GroupService::sidToGid($group->id, $parent->id));
+
+        // delay response while background job optimizes media
+        // sleep(5);
+
+        // todo: perform in job
+        $s = GroupCommentService::get($status->group_id, $status->id);
+
+        // $s['pf_type'] = 'text';
+        // $s['visibility'] = 'public';
+        // $s['url'] = $gp->url();
+
+        return $s;
+    }
+
+    public function deleteComment(Request $request)
+    {
+        abort_if(!$request->user(), 403);
+
+        $this->validate($request, [
+          'id'  => 'required|integer|min:1',
+          'gid' => 'required|integer|min:1'
+        ]);
+
+        $pid = $request->user()->profile_id;
+        $gid = $request->input('gid');
+        $group = Group::findOrFail($gid);
+        abort_if(!$group->isMember($pid), 403, 'Not a member of group.');
+
+        $gp = GroupComment::whereGroupId($group->id)->findOrFail($request->input('id'));
+        abort_if($gp->profile_id != $pid && $group->profile_id != $pid, 403);
+
+        $parent = GroupPost::find($gp->status_id);
+        abort_if(!$parent, 422, 'Invalid parent');
+
+        DeleteCommentPipeline::dispatch($parent, $gp)->onQueue('groups');
+        GroupService::log(
+            $group->id,
+            $pid,
+            'group:status:deleted',
+            [
+                'type' => $gp->type,
+                'status_id' => $gp->id,
+            ],
+            GroupComment::class,
+            $gp->id
+        );
+        $gp->delete();
+
+        if($request->wantsJson()) {
+            return response()->json(['Status successfully deleted.']);
+        } else {
+            return redirect('/groups/feed');
+        }
+    }
+
+    public function likePost(Request $request)
+    {
+        $this->validate($request, [
+            'gid' => 'required',
+            'sid' => 'required'
+        ]);
+
+        $pid = $request->user()->profile_id;
+        $gid = $request->input('gid');
+        $sid = $request->input('sid');
+
+        $group = GroupService::get($gid);
+        abort_if(!$group || $gid != $group['id'], 422, 'Invalid group');
+        abort_if(!GroupService::canLike($gid, $pid), 422, 'You cannot interact with this content at this time');
+        abort_if(!GroupService::isMember($gid, $pid), 403, 'Not a member of group');
+        $gp = GroupCommentService::get($gid, $sid);
+        abort_if(!$gp, 422, 'Invalid status');
+        $count = $gp['favourites_count'] ?? 0;
+
+        $like = GroupLike::firstOrCreate([
+            'group_id' => $gid,
+            'profile_id' => $pid,
+            'comment_id' => $sid,
+        ]);
+
+        if($like->wasRecentlyCreated) {
+            // update parent post like count
+            $parent = GroupComment::find($sid);
+            abort_if(!$parent || $parent->group_id != $gid, 422, 'Invalid status');
+            $parent->likes_count = $parent->likes_count + 1;
+            $parent->save();
+            GroupsLikeService::add($pid, $sid);
+            // invalidate cache
+            GroupCommentService::del($gid, $sid);
+            $count++;
+            GroupService::log(
+                $gid,
+                $pid,
+                'group:like',
+                null,
+                GroupLike::class,
+                $like->id
+            );
+        }
+
+        $response = ['code' => 200, 'msg' => 'Like saved', 'count' => $count];
+
+        return $response;
+    }
+
+    public function unlikePost(Request $request)
+    {
+        $this->validate($request, [
+            'gid' => 'required',
+            'sid' => 'required'
+        ]);
+
+        $pid = $request->user()->profile_id;
+        $gid = $request->input('gid');
+        $sid = $request->input('sid');
+
+        $group = GroupService::get($gid);
+        abort_if(!$group || $gid != $group['id'], 422, 'Invalid group');
+        abort_if(!GroupService::canLike($gid, $pid), 422, 'You cannot interact with this content at this time');
+        abort_if(!GroupService::isMember($gid, $pid), 403, 'Not a member of group');
+        $gp = GroupCommentService::get($gid, $sid);
+        abort_if(!$gp, 422, 'Invalid status');
+        $count = $gp['favourites_count'] ?? 0;
+
+        $like = GroupLike::where([
+            'group_id' => $gid,
+            'profile_id' => $pid,
+            'comment_id' => $sid,
+        ])->first();
+
+        if($like) {
+            $like->delete();
+            $parent = GroupComment::find($sid);
+            abort_if(!$parent || $parent->group_id != $gid, 422, 'Invalid status');
+            $parent->likes_count = $parent->likes_count - 1;
+            $parent->save();
+            GroupsLikeService::remove($pid, $sid);
+            // invalidate cache
+            GroupCommentService::del($gid, $sid);
+            $count--;
+        }
+
+        $response = ['code' => 200, 'msg' => 'Unliked post', 'count' => $count];
+
+        return $response;
+    }
+}
diff --git a/app/Http/Controllers/Groups/GroupsDiscoverController.php b/app/Http/Controllers/Groups/GroupsDiscoverController.php
new file mode 100644
index 000000000..2194807de
--- /dev/null
+++ b/app/Http/Controllers/Groups/GroupsDiscoverController.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Http\Controllers\Groups;
+
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\RateLimiter;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use App\Services\AccountService;
+use App\Services\GroupService;
+use App\Follower;
+use App\Profile;
+use App\Models\Group;
+use App\Models\GroupMember;
+use App\Models\GroupInvitation;
+
+class GroupsDiscoverController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    public function getDiscoverPopular(Request $request)
+    {
+        abort_if(!$request->user(), 404);
+        $groups = Group::orderByDesc('member_count')
+            ->take(12)
+            ->pluck('id')
+            ->map(function($id) {
+                return GroupService::get($id);
+            })
+            ->filter(function($id) {
+                return $id;
+            })
+            ->take(6)
+            ->values();
+        return $groups;
+    }
+
+    public function getDiscoverNew(Request $request)
+    {
+        abort_if(!$request->user(), 404);
+        $groups = Group::latest()
+            ->take(12)
+            ->pluck('id')
+            ->map(function($id) {
+                return GroupService::get($id);
+            })
+            ->filter(function($id) {
+                return $id;
+            })
+            ->take(6)
+            ->values();
+        return $groups;
+    }
+}
diff --git a/app/Http/Controllers/Groups/GroupsFeedController.php b/app/Http/Controllers/Groups/GroupsFeedController.php
new file mode 100644
index 000000000..bb04e2487
--- /dev/null
+++ b/app/Http/Controllers/Groups/GroupsFeedController.php
@@ -0,0 +1,188 @@
+<?php
+
+namespace App\Http\Controllers\Groups;
+
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\RateLimiter;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use App\Services\AccountService;
+use App\Services\GroupService;
+use App\Services\UserFilterService;
+use App\Services\Groups\GroupFeedService;
+use App\Services\Groups\GroupPostService;
+use App\Services\RelationshipService;
+use App\Services\Groups\GroupsLikeService;
+use App\Follower;
+use App\Profile;
+use App\Models\Group;
+use App\Models\GroupPost;
+use App\Models\GroupInvitation;
+
+class GroupsFeedController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    public function getSelfFeed(Request $request)
+    {
+        abort_if(!$request->user(), 404);
+        $pid = $request->user()->profile_id;
+        $limit = $request->input('limit', 5);
+        $page = $request->input('page');
+        $initial = $request->has('initial');
+
+        if($initial) {
+            $res = Cache::remember('groups:self:feed:' . $pid, 900, function() use($pid) {
+                return $this->getSelfFeedV0($pid, 5, null);
+            });
+        } else {
+            abort_if($page && $page > 5, 422);
+            $res = $this->getSelfFeedV0($pid, $limit, $page);
+        }
+
+        return response()->json($res, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
+    }
+
+    protected function getSelfFeedV0($pid, $limit, $page)
+    {
+        return GroupPost::join('group_members', 'group_posts.group_id', 'group_members.group_id')
+            ->select('group_posts.*', 'group_members.group_id', 'group_members.profile_id')
+            ->where('group_members.profile_id', $pid)
+            ->whereIn('group_posts.type', ['text', 'photo', 'video'])
+            ->orderByDesc('group_posts.id')
+            ->limit($limit)
+            // ->pluck('group_posts.status_id')
+            ->simplePaginate($limit)
+            ->map(function($gp) use($pid) {
+                $status = GroupPostService::get($gp['group_id'], $gp['id']);
+
+                if(!$status) {
+                    return false;
+                }
+
+                $status['favourited'] = (bool) GroupsLikeService::liked($pid, $gp['id']);
+                $status['favourites_count'] = GroupsLikeService::count($gp['id']);
+                $status['pf_type'] = $gp['type'];
+                $status['visibility'] = 'public';
+                $status['url'] = url("/groups/{$gp['group_id']}/p/{$gp['id']}");
+                $status['group'] = GroupService::get($gp['group_id']);
+                $status['account']['url'] = url("/groups/{$gp['group_id']}/user/{$status['account']['id']}");
+
+                return $status;
+        });
+    }
+
+    public function getGroupProfileFeed(Request $request, $id, $pid)
+    {
+        abort_if(!$request->user(), 404);
+        $cid = $request->user()->profile_id;
+
+        $group = Group::findOrFail($id);
+        abort_if(!$group->isMember($pid), 404);
+
+        $feed = GroupPost::whereGroupId($id)
+            ->whereProfileId($pid)
+            ->latest()
+            ->paginate(3)
+            ->map(function($gp) use($pid) {
+                $status = GroupPostService::get($gp['group_id'], $gp['id']);
+                if(!$status) {
+                    return false;
+                }
+                $status['favourited'] = (bool) GroupsLikeService::liked($pid, $gp['id']);
+                $status['favourites_count'] = GroupsLikeService::count($gp['id']);
+                $status['pf_type'] = $gp['type'];
+                $status['visibility'] = 'public';
+                $status['url'] = $gp->url();
+
+                // if($gp['type'] == 'poll') {
+                //     $status['poll'] = PollService::get($status['id']);
+                // }
+
+                $status['account']['url'] = "/groups/{$gp['group_id']}/user/{$status['account']['id']}";
+
+                return $status;
+            })
+            ->filter(function($status) {
+                return $status;
+            });
+
+        return $feed;
+    }
+
+    public function getGroupFeed(Request $request, $id)
+    {
+        $group = Group::findOrFail($id);
+        $user = $request->user();
+        $pid = optional($user)->profile_id ?? false;
+        abort_if(!$group->isMember($pid), 404);
+        $max = $request->input('max_id');
+        $limit = $request->limit ?? 3;
+        $filtered = $user ? UserFilterService::filters($user->profile_id) : [];
+
+        // $posts = GroupPost::whereGroupId($group->id)
+        //  ->when($maxId, function($q, $maxId) {
+        //      return $q->where('status_id', '<', $maxId);
+        //  })
+        //  ->whereNull('in_reply_to_id')
+        //  ->orderByDesc('status_id')
+        //  ->simplePaginate($limit)
+        //  ->map(function($gp) use($pid) {
+        //      $status = StatusService::get($gp['status_id'], false);
+        //      if(!$status) {
+        //          return false;
+        //      }
+        //      $status['favourited'] = (bool) LikeService::liked($pid, $gp['status_id']);
+        //      $status['favourites_count'] = LikeService::count($gp['status_id']);
+        //      $status['pf_type'] = $gp['type'];
+        //      $status['visibility'] = 'public';
+        //      $status['url'] = $gp->url();
+
+        //      if($gp['type'] == 'poll') {
+        //          $status['poll'] = PollService::get($status['id']);
+        //      }
+
+        //      $status['account']['url'] = url("/groups/{$gp['group_id']}/user/{$status['account']['id']}");
+
+        //      return $status;
+        //  })->filter(function($status) {
+        //      return $status;
+        //  });
+        // return $posts;
+
+        Cache::remember('api:v1:timelines:public:cache_check', 10368000, function() use($id) {
+            if(GroupFeedService::count($id) == 0) {
+                GroupFeedService::warmCache($id, true, 400);
+            }
+        });
+
+        if ($max) {
+            $feed = GroupFeedService::getRankedMaxId($id, $max, $limit);
+        } else {
+            $feed = GroupFeedService::get($id, 0, $limit);
+        }
+
+        $res = collect($feed)
+        ->map(function($k) use($user, $id) {
+            $status = GroupPostService::get($id, $k);
+            if($status && $user) {
+                $pid = $user->profile_id;
+                $sid = $status['account']['id'];
+                $status['favourited'] = (bool) GroupsLikeService::liked($pid, $status['id']);
+                $status['favourites_count'] = GroupsLikeService::count($status['id']);
+                $status['relationship'] = $pid == $sid ? [] : RelationshipService::get($pid, $sid);
+            }
+            return $status;
+        })
+        ->filter(function($s) use($filtered) {
+            return $s && in_array($s['account']['id'], $filtered) == false;
+        })
+        ->values()
+        ->toArray();
+
+        return $res;
+    }
+}
diff --git a/app/Http/Controllers/Groups/GroupsMemberController.php b/app/Http/Controllers/Groups/GroupsMemberController.php
new file mode 100644
index 000000000..3bfe086a2
--- /dev/null
+++ b/app/Http/Controllers/Groups/GroupsMemberController.php
@@ -0,0 +1,214 @@
+<?php
+
+namespace App\Http\Controllers\Groups;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use App\Services\GroupService;
+use App\Models\Group;
+use App\Models\GroupCategory;
+use App\Models\GroupHashtag;
+use App\Models\GroupPostHashtag;
+use App\Models\GroupMember;
+use App\Services\AccountService;
+use App\Services\FollowerService;
+use App\Services\Groups\GroupAccountService;
+use App\Services\Groups\GroupHashtagService;
+use App\Jobs\GroupsPipeline\MemberJoinApprovedPipeline;
+use App\Jobs\GroupsPipeline\MemberJoinRejectedPipeline;
+
+class GroupsMemberController extends Controller
+{
+    public function getGroupMembers(Request $request)
+    {
+        $this->validate($request, [
+            'gid' => 'required',
+            'limit' => 'nullable|integer|min:3|max:10'
+        ]);
+
+        abort_if(!$request->user(), 404);
+
+        $pid = $request->user()->profile_id;
+        $gid = $request->input('gid');
+        $group = Group::findOrFail($gid);
+
+        abort_if(!$group->isMember($pid), 403, 'Not a member of group.');
+
+        $members = GroupMember::whereGroupId($gid)
+            ->whereJoinRequest(false)
+            ->simplePaginate(10)
+            ->map(function($member) use($pid) {
+                $account = AccountService::get($member['profile_id']);
+                $account['role'] = $member['role'];
+                $account['joined'] = $member['created_at'];
+                $account['following'] = $pid != $member['profile_id'] ?
+                    FollowerService::follows($pid, $member['profile_id']) :
+                    null;
+                $account['url'] = url("/groups/{$member->group_id}/user/{$member['profile_id']}");
+                return $account;
+            });
+
+        return response()->json($members->toArray(), 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
+    }
+
+    public function getGroupMemberJoinRequests(Request $request)
+    {
+        abort_if(!$request->user(), 404);
+        $id = $request->input('gid');
+        $group = Group::findOrFail($id);
+        $pid = $request->user()->profile_id;
+        abort_if(!$group->isMember($pid), 404);
+        abort_if(!in_array($group->selfRole($pid), ['founder', 'admin']), 404);
+
+        return GroupMember::whereGroupId($group->id)
+            ->whereJoinRequest(true)
+            ->whereNull('rejected_at')
+            ->paginate(10)
+            ->map(function($member) {
+                return AccountService::get($member->profile_id);
+            });
+    }
+
+    public function handleGroupMemberJoinRequest(Request $request)
+    {
+        abort_if(!$request->user(), 404);
+        $id = $request->input('gid');
+        $group = Group::findOrFail($id);
+        $pid = $request->user()->profile_id;
+        abort_if(!$group->isMember($pid), 404);
+        abort_if(!in_array($group->selfRole($pid), ['founder', 'admin']), 404);
+        $mid = $request->input('pid');
+        abort_if($group->isMember($mid), 404);
+
+        $this->validate($request, [
+            'gid' => 'required',
+            'pid' => 'required',
+            'action' => 'required|in:approve,reject'
+        ]);
+
+        $action = $request->input('action');
+
+        $member = GroupMember::whereGroupId($group->id)
+            ->whereProfileId($mid)
+            ->firstOrFail();
+
+        if($action == 'approve') {
+            MemberJoinApprovedPipeline::dispatch($member)->onQueue('groups');
+        } else if ($action == 'reject') {
+            MemberJoinRejectedPipeline::dispatch($member)->onQueue('groups');
+        }
+
+        return $request->all();
+    }
+
+    public function getGroupMember(Request $request)
+    {
+        $this->validate($request, [
+            'gid' => 'required',
+            'pid' => 'required'
+        ]);
+
+        abort_if(!$request->user(), 404);
+        $gid = $request->input('gid');
+        $group = Group::findOrFail($gid);
+        $pid = $request->user()->profile_id;
+        abort_if(!$group->isMember($pid), 404);
+        abort_if(!in_array($group->selfRole($pid), ['founder', 'admin']), 404);
+
+        $member_id = $request->input('pid');
+        $member = GroupMember::whereGroupId($gid)
+            ->whereProfileId($member_id)
+            ->firstOrFail();
+
+        $account = GroupAccountService::get($group->id, $member['profile_id']);
+        $account['role'] = $member['role'];
+        $account['joined'] = $member['created_at'];
+        $account['following'] = $pid != $member['profile_id'] ?
+            FollowerService::follows($pid, $member['profile_id']) :
+            null;
+        $account['url'] = url("/groups/{$gid}/user/{$member_id}");
+
+        return response()->json($account, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
+    }
+
+    public function getGroupMemberCommonIntersections(Request $request)
+    {
+        abort_if(!$request->user(), 404);
+        $cid = $request->user()->profile_id;
+
+        // $this->validate($request, [
+        //  'gid' => 'required',
+        //  'pid' => 'required'
+        // ]);
+
+        $gid = $request->input('gid');
+        $pid = $request->input('pid');
+
+        if($pid === $cid) {
+            return [];
+        }
+
+        $group = Group::findOrFail($gid);
+        abort_if(!$group->isMember($cid), 404);
+        abort_if(!$group->isMember($pid), 404);
+
+        $self = GroupPostHashtag::selectRaw('group_post_hashtags.*, count(*) as countr')
+            ->whereProfileId($cid)
+            ->groupBy('hashtag_id')
+            ->orderByDesc('countr')
+            ->take(20)
+            ->pluck('hashtag_id');
+        $user = GroupPostHashtag::selectRaw('group_post_hashtags.*, count(*) as countr')
+            ->whereProfileId($pid)
+            ->groupBy('hashtag_id')
+            ->orderByDesc('countr')
+            ->take(20)
+            ->pluck('hashtag_id');
+
+        $topics = $self->intersect($user)
+            ->values()
+            ->shuffle()
+            ->take(3)
+            ->map(function($id) use($group) {
+                $tag = GroupHashtagService::get($id);
+                $tag['url'] = url("/groups/{$group->id}/topics/{$tag['slug']}?src=upt");
+                return $tag;
+            });
+
+        // $friends = DB::table('followers as u')
+        //  ->join('followers as s', 'u.following_id', '=', 's.following_id')
+        //  ->where('s.profile_id', $cid)
+        //  ->where('u.profile_id', $pid)
+        //  ->inRandomOrder()
+        //  ->take(10)
+        //  ->pluck('s.following_id')
+        //  ->map(function($id) use($gid) {
+        //      $res = AccountService::get($id);
+        //      $res['url'] = url("/groups/{$gid}/user/{$id}");
+        //      return $res;
+        //  });
+        $mutualGroups = GroupService::mutualGroups($cid, $pid, [$gid]);
+
+        $mutualFriends = collect(FollowerService::mutualIds($cid, $pid))
+            ->map(function($id) use($gid) {
+                $res = AccountService::get($id);
+                if(GroupService::isMember($gid, $id)) {
+                    $res['url'] = url("/groups/{$gid}/user/{$id}");
+                } else if(!$res['local']) {
+                    $res['url'] = url("/i/web/profile/_/{$id}");
+                }
+                return $res;
+            });
+        $mutualFriendsCount = FollowerService::mutualCount($cid, $pid);
+
+        $res = [
+            'groups_count' => $mutualGroups['count'],
+            'groups' => $mutualGroups['groups'],
+            'topics' => $topics,
+            'friends_count' => $mutualFriendsCount,
+            'friends' => $mutualFriends,
+        ];
+
+        return response()->json($res, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
+    }
+}
diff --git a/app/Http/Controllers/Groups/GroupsMetaController.php b/app/Http/Controllers/Groups/GroupsMetaController.php
new file mode 100644
index 000000000..bc1e58b33
--- /dev/null
+++ b/app/Http/Controllers/Groups/GroupsMetaController.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Controllers\Groups;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use App\Services\GroupService;
+use App\Models\Group;
+
+class GroupsMetaController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    public function deleteGroup(Request $request)
+    {
+        abort_if(!$request->user(), 404);
+        $id = $request->input('gid');
+        $group = Group::findOrFail($id);
+        $pid = $request->user()->profile_id;
+        abort_if(!$group->isMember($pid), 404);
+        abort_if(!in_array($group->selfRole($pid), ['founder', 'admin']), 404);
+
+        $group->status = "delete";
+        $group->save();
+        GroupService::del($group->id);
+        return [200];
+    }
+}
diff --git a/app/Http/Controllers/Groups/GroupsNotificationsController.php b/app/Http/Controllers/Groups/GroupsNotificationsController.php
new file mode 100644
index 000000000..dafc6c821
--- /dev/null
+++ b/app/Http/Controllers/Groups/GroupsNotificationsController.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Http\Controllers\Groups;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use App\Services\AccountService;
+use App\Services\StatusService;
+use App\Services\GroupService;
+use App\Models\Group;
+use App\Notification;
+
+class GroupsNotificationsController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    public function selfGlobalNotifications(Request $request)
+    {
+        abort_if(!$request->user(), 404);
+        $pid = $request->user()->profile_id;
+
+        $res = Notification::whereProfileId($pid)
+            ->where('action', 'like', 'group%')
+            ->latest()
+            ->paginate(10)
+            ->map(function($n) {
+                $res = [
+                    'id' => $n->id,
+                    'type' => $n->action,
+                    'account' => AccountService::get($n->actor_id),
+                    'object' => [
+                        'id' => $n->item_id,
+                        'type' => last(explode('\\', $n->item_type)),
+                    ],
+                    'created_at' => $n->created_at->format('c')
+                ];
+
+                if($res['object']['type'] == 'Status' || in_array($n->action, ['group:comment'])) {
+                    $res['status'] = StatusService::get($n->item_id, false);
+                    $res['group'] = GroupService::get($res['status']['gid']);
+                }
+
+                if($res['object']['type'] == 'Group') {
+                    $res['group'] = GroupService::get($n->item_id);
+                }
+
+                return $res;
+            });
+
+        return response()->json($res, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
+    }
+}
diff --git a/app/Http/Controllers/Groups/GroupsPostController.php b/app/Http/Controllers/Groups/GroupsPostController.php
new file mode 100644
index 000000000..11b4799fe
--- /dev/null
+++ b/app/Http/Controllers/Groups/GroupsPostController.php
@@ -0,0 +1,420 @@
+<?php
+
+namespace App\Http\Controllers\Groups;
+
+use Illuminate\Support\Facades\Bus;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Facades\RateLimiter;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use App\Services\AccountService;
+use App\Services\GroupService;
+use App\Services\Groups\GroupFeedService;
+use App\Services\Groups\GroupPostService;
+use App\Services\Groups\GroupMediaService;
+use App\Services\Groups\GroupsLikeService;
+use App\Follower;
+use App\Profile;
+use App\Models\Group;
+use App\Models\GroupHashtag;
+use App\Models\GroupPost;
+use App\Models\GroupLike;
+use App\Models\GroupMember;
+use App\Models\GroupInvitation;
+use App\Models\GroupMedia;
+use App\Jobs\GroupsPipeline\ImageResizePipeline;
+use App\Jobs\GroupsPipeline\ImageS3UploadPipeline;
+use App\Jobs\GroupsPipeline\NewPostPipeline;
+
+class GroupsPostController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    public function storePost(Request $request)
+    {
+        $this->validate($request, [
+            'group_id' => 'required|exists:groups,id',
+            'caption' => 'sometimes|string|max:'.config_cache('pixelfed.max_caption_length', 500),
+            'pollOptions' => 'sometimes|array|min:1|max:4'
+        ]);
+
+        $group = Group::findOrFail($request->input('group_id'));
+        $pid = $request->user()->profile_id;
+        $caption = $request->input('caption');
+        $type = $request->input('type', 'text');
+
+        abort_if(!GroupService::canPost($group->id, $pid), 422, 'You cannot create new posts at this time');
+
+        if($type == 'text') {
+            abort_if(strlen(e($caption)) == 0, 403);
+        }
+
+        $gp = new GroupPost;
+        $gp->group_id = $group->id;
+        $gp->profile_id = $pid;
+        $gp->caption = e($caption);
+        $gp->type = $type;
+        $gp->visibility = 'draft';
+        $gp->save();
+
+        $status = $gp;
+
+        NewPostPipeline::dispatchSync($gp);
+
+        // NewStatusPipeline::dispatch($status, $gp);
+
+        if($type == 'poll') {
+            // Polls not supported yet
+            // $poll = new Poll;
+            // $poll->status_id = $status->id;
+            // $poll->profile_id = $status->profile_id;
+            // $poll->poll_options = $request->input('pollOptions');
+            // $poll->expires_at = now()->addMinutes($request->input('expiry'));
+            // $poll->cached_tallies = collect($poll->poll_options)->map(function($o) {
+            //     return 0;
+            // })->toArray();
+            // $poll->save();
+            // sleep(5);
+        }
+        if($type == 'photo') {
+            $photo = $request->file('photo');
+            $storagePath = GroupMediaService::path($group->id, $pid, $status->id);
+            // $storagePath = 'public/g/' . $group->id . '/p/' . $status->id;
+            $path = $photo->storePublicly($storagePath);
+            // $hash = \hash_file('sha256', $photo);
+
+            $media = new GroupMedia();
+            $media->group_id = $group->id;
+            $media->status_id = $status->id;
+            $media->profile_id = $request->user()->profile_id;
+            $media->media_path = $path;
+            $media->size = $photo->getSize();
+            $media->mime = $photo->getMimeType();
+            $media->save();
+
+            // Bus::chain([
+            //     new ImageResizePipeline($media),
+            //     new ImageS3UploadPipeline($media),
+            // ])->dispatch($media);
+
+            ImageResizePipeline::dispatchSync($media);
+            ImageS3UploadPipeline::dispatchSync($media);
+            // ImageOptimize::dispatch($media);
+            // delay response while background job optimizes media
+            // sleep(5);
+        }
+        if($type == 'video') {
+            $video = $request->file('video');
+            $storagePath = 'public/g/' . $group->id . '/p/' . $status->id;
+            $path = $video->storePublicly($storagePath);
+            $hash = \hash_file('sha256', $video);
+
+            $media = new Media();
+            $media->status_id = $status->id;
+            $media->profile_id = $request->user()->profile_id;
+            $media->user_id = $request->user()->id;
+            $media->media_path = $path;
+            $media->original_sha256 = $hash;
+            $media->size = $video->getSize();
+            $media->mime = $video->getMimeType();
+            $media->save();
+
+            VideoThumbnail::dispatch($media);
+            sleep(15);
+        }
+
+        GroupService::log(
+            $group->id,
+            $pid,
+            'group:status:created',
+            [
+                'type' => $gp->type,
+                'status_id' => $status->id
+            ],
+            GroupPost::class,
+            $gp->id
+        );
+
+        $s = GroupPostService::get($status->group_id, $status->id);
+        GroupFeedService::add($group->id, $gp->id);
+        Cache::forget('groups:self:feed:' . $pid);
+
+        $s['pf_type'] = $type;
+        $s['visibility'] = 'public';
+        $s['url'] = $gp->url();
+
+        if($type == 'poll') {
+            $s['poll'] = PollService::get($status->id);
+        }
+
+        $group->last_active_at = now();
+        $group->save();
+
+        return $s;
+    }
+
+    public function deletePost(Request $request)
+    {
+        abort_if(!$request->user(), 403);
+
+        $this->validate($request, [
+          'id'  => 'required|integer|min:1',
+          'gid' => 'required|integer|min:1'
+        ]);
+
+        $pid = $request->user()->profile_id;
+        $gid = $request->input('gid');
+        $group = Group::findOrFail($gid);
+        abort_if(!$group->isMember($pid), 403, 'Not a member of group.');
+
+        $gp = GroupPost::whereGroupId($status->group_id)->findOrFail($request->input('id'));
+        abort_if($gp->profile_id != $pid && $group->profile_id != $pid, 403);
+        $cached = GroupPostService::get($status->group_id, $status->id);
+
+        if($cached) {
+            $cached = collect($cached)->filter(function($r, $k) {
+                return in_array($k, [
+                    'id',
+                    'sensitive',
+                    'pf_type',
+                    'media_attachments',
+                    'content_text',
+                    'created_at'
+                ]);
+            });
+        }
+
+        GroupService::log(
+            $status->group_id,
+            $request->user()->profile_id,
+            'group:status:deleted',
+            [
+                'type' => $gp->type,
+                'status_id' => $status->id,
+                'original' => $cached
+            ],
+            GroupPost::class,
+            $gp->id
+        );
+
+        $user = $request->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 = GroupPost::find($status->in_reply_to_id);
+            if($parent) {
+                $parent->reply_count = GroupPost::whereInReplyToId($parent->id)->count();
+                $parent->save();
+                GroupPostService::del($group->id, GroupService::sidToGid($group->id, $parent->id));
+            }
+        }
+
+        GroupPostService::del($group->id, $gp->id);
+        GroupFeedService::del($group->id, $gp->id);
+        if ($status->profile_id == $user->profile->id || $user->is_admin == 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 likePost(Request $request)
+    {
+        $this->validate($request, [
+            'gid' => 'required',
+            'sid' => 'required'
+        ]);
+
+        $pid = $request->user()->profile_id;
+        $gid = $request->input('gid');
+        $sid = $request->input('sid');
+
+        $group = GroupService::get($gid);
+        abort_if(!$group, 422, 'Invalid group');
+        abort_if(!GroupService::canLike($gid, $pid), 422, 'You cannot interact with this content at this time');
+        abort_if(!GroupService::isMember($gid, $pid), 403, 'Not a member of group');
+        $gp = GroupPostService::get($gid, $sid);
+        abort_if(!$gp, 422, 'Invalid status');
+        $count = $gp['favourites_count'] ?? 0;
+
+        $like = GroupLike::firstOrCreate([
+            'group_id' => $gid,
+            'profile_id' => $pid,
+            'status_id' => $sid,
+        ]);
+
+        if($like->wasRecentlyCreated) {
+            // update parent post like count
+            $parent = GroupPost::whereGroupId($gid)->find($sid);
+            abort_if(!$parent, 422, 'Invalid status');
+            $parent->likes_count = $parent->likes_count + 1;
+            $parent->save();
+            GroupsLikeService::add($pid, $sid);
+            // invalidate cache
+            GroupPostService::del($gid, $sid);
+            $count++;
+            GroupService::log(
+                $gid,
+                $pid,
+                'group:like',
+                null,
+                GroupLike::class,
+                $like->id
+            );
+        }
+        // if (GroupLike::whereGroupId($gid)->whereStatusId($sid)->whereProfileId($pid)->exists()) {
+        //     $like = GroupLike::whereProfileId($pid)->whereStatusId($sid)->firstOrFail();
+        //     // UnlikePipeline::dispatch($like);
+        //     $count = $gp->likes_count - 1;
+        //     $action = 'group:unlike';
+        // } else {
+        //     $count = $gp->likes_count;
+        //     $like = GroupLike::firstOrCreate([
+        //         'group_id' => $gid,
+        //         'profile_id' => $pid,
+        //         'status_id' => $sid
+        //     ]);
+        //     if($like->wasRecentlyCreated == true) {
+        //         $count++;
+        //         $gp->likes_count = $count;
+        //         $like->save();
+        //         $gp->save();
+        //         // LikePipeline::dispatch($like);
+        //         $action = 'group:like';
+        //     }
+        // }
+
+
+        // Cache::forget('status:'.$status->id.':likedby:userid:'.$request->user()->id);
+        // StatusService::del($status->id);
+
+        $response = ['code' => 200, 'msg' => 'Like saved', 'count' => $count];
+
+        return $response;
+    }
+
+    public function unlikePost(Request $request)
+    {
+        $this->validate($request, [
+            'gid' => 'required',
+            'sid' => 'required'
+        ]);
+
+        $pid = $request->user()->profile_id;
+        $gid = $request->input('gid');
+        $sid = $request->input('sid');
+
+        $group = GroupService::get($gid);
+        abort_if(!$group, 422, 'Invalid group');
+        abort_if(!GroupService::canLike($gid, $pid), 422, 'You cannot interact with this content at this time');
+        abort_if(!GroupService::isMember($gid, $pid), 403, 'Not a member of group');
+        $gp = GroupPostService::get($gid, $sid);
+        abort_if(!$gp, 422, 'Invalid status');
+        $count = $gp['favourites_count'] ?? 0;
+
+        $like = GroupLike::where([
+            'group_id' => $gid,
+            'profile_id' => $pid,
+            'status_id' => $sid,
+        ])->first();
+
+        if($like) {
+            $like->delete();
+            $parent = GroupPost::whereGroupId($gid)->find($sid);
+            abort_if(!$parent, 422, 'Invalid status');
+            $parent->likes_count = $parent->likes_count - 1;
+            $parent->save();
+            GroupsLikeService::remove($pid, $sid);
+            // invalidate cache
+            GroupPostService::del($gid, $sid);
+            $count--;
+        }
+
+        $response = ['code' => 200, 'msg' => 'Unliked post', 'count' => $count];
+
+        return $response;
+    }
+
+    public function getGroupMedia(Request $request)
+    {
+        $this->validate($request, [
+            'gid' => 'required',
+            'type' => 'required|in:photo,video'
+        ]);
+
+        abort_if(!$request->user(), 404);
+
+        $pid = $request->user()->profile_id;
+        $gid = $request->input('gid');
+        $type = $request->input('type');
+        $group = Group::findOrFail($gid);
+
+        abort_if(!$group->isMember($pid), 403, 'Not a member of group.');
+
+        $media = GroupPost::whereGroupId($gid)
+            ->whereType($type)
+            ->latest()
+            ->simplePaginate(20)
+            ->map(function($gp) use($pid) {
+                $status = GroupPostService::get($gp['group_id'], $gp['id']);
+                if(!$status) {
+                    return false;
+                }
+                $status['favourited'] = (bool) GroupsLikeService::liked($pid, $gp['id']);
+                $status['favourites_count'] = GroupsLikeService::count($gp['id']);
+                $status['pf_type'] = $gp['type'];
+                $status['visibility'] = 'public';
+                $status['url'] = $gp->url();
+
+                // if($gp['type'] == 'poll') {
+                //     $status['poll'] = PollService::get($status['id']);
+                // }
+
+                return $status;
+            })->filter(function($status) {
+                return $status;
+            });
+
+        return response()->json($media->toArray(), 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
+    }
+}
diff --git a/app/Http/Controllers/Groups/GroupsSearchController.php b/app/Http/Controllers/Groups/GroupsSearchController.php
new file mode 100644
index 000000000..560436f46
--- /dev/null
+++ b/app/Http/Controllers/Groups/GroupsSearchController.php
@@ -0,0 +1,221 @@
+<?php
+
+namespace App\Http\Controllers\Groups;
+
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\RateLimiter;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use App\Services\AccountService;
+use App\Services\GroupService;
+use App\Follower;
+use App\Profile;
+use App\Models\Group;
+use App\Models\GroupMember;
+use App\Models\GroupInvitation;
+use App\Util\ActivityPub\Helpers;
+use App\Services\Groups\GroupActivityPubService;
+
+class GroupsSearchController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    public function inviteFriendsToGroup(Request $request)
+    {
+        abort_if(!$request->user(), 404);
+        $this->validate($request, [
+            'uids' => 'required',
+            'g' => 'required',
+        ]);
+        $uid = $request->input('uids');
+        $gid = $request->input('g');
+        $pid = $request->user()->profile_id;
+        $group = Group::findOrFail($gid);
+        abort_if(!$group->isMember($pid), 404);
+        abort_if(
+            GroupInvitation::whereGroupId($group->id)
+                ->whereFromProfileId($pid)
+                ->count() >= 20,
+            422,
+            'Invite limit reached'
+        );
+
+        $profiles = collect($uid)
+            ->map(function($u) {
+                return Profile::find($u);
+            })
+            ->filter(function($u) use($pid) {
+                return $u &&
+                    $u->id != $pid &&
+                    isset($u->id) &&
+                    Follower::whereFollowingId($pid)
+                        ->whereProfileId($u->id)
+                        ->exists();
+            })
+            ->filter(function($u) use($group, $pid) {
+                return GroupInvitation::whereGroupId($group->id)
+                    ->whereFromProfileId($pid)
+                    ->whereToProfileId($u->id)
+                    ->exists() == false;
+            })
+            ->each(function($u) use($gid, $pid) {
+                $gi = new GroupInvitation;
+                $gi->group_id = $gid;
+                $gi->from_profile_id = $pid;
+                $gi->to_profile_id = $u->id;
+                $gi->to_local = true;
+                $gi->from_local = $u->domain == null;
+                $gi->save();
+                // GroupMemberInvite::dispatch($gi);
+            });
+        return [200];
+    }
+
+    public function searchFriendsToInvite(Request $request)
+    {
+        abort_if(!$request->user(), 404);
+        $this->validate($request, [
+            'q' => 'required|min:2|max:40',
+            'g' => 'required',
+            'v' => 'required|in:0.2'
+        ]);
+        $q = $request->input('q');
+        $gid = $request->input('g');
+        $pid = $request->user()->profile_id;
+        $group = Group::findOrFail($gid);
+        abort_if(!$group->isMember($pid), 404);
+
+        $res = Profile::where('username', 'like', "%{$q}%")
+            ->whereNull('profiles.domain')
+            ->join('followers', 'profiles.id', '=', 'followers.profile_id')
+            ->where('followers.following_id', $pid)
+            ->take(10)
+            ->get()
+            ->filter(function($p) use($group) {
+                return $group->isMember($p->profile_id) == false;
+            })
+            ->filter(function($p) use($group, $pid) {
+                return GroupInvitation::whereGroupId($group->id)
+                    ->whereFromProfileId($pid)
+                    ->whereToProfileId($p->profile_id)
+                    ->exists() == false;
+            })
+            ->map(function($gm) use ($gid) {
+                $a = AccountService::get($gm->profile_id);
+                return [
+                    'id' => (string) $gm->profile_id,
+                    'username' => $a['acct'],
+                    'url' => url("/groups/{$gid}/user/{$a['id']}?rf=group_search")
+                ];
+            })
+            ->values();
+
+        return $res;
+    }
+
+    public function searchGlobalResults(Request $request)
+    {
+        abort_if(!$request->user(), 404);
+        $this->validate($request, [
+            'q' => 'required|min:2|max:140',
+            'v' => 'required|in:0.2'
+        ]);
+        $q = $request->input('q');
+
+        if(str_starts_with($q, 'https://')) {
+            $res = Helpers::getSignedFetch($q);
+            if($res && $res = json_decode($res, true)) {
+
+            }
+            if($res && isset($res['type']) && in_array($res['type'], ['Group', 'Note', 'Page'])) {
+                if($res['type'] === 'Group') {
+                    return GroupActivityPubService::fetchGroup($q, true);
+                }
+                $resp = GroupActivityPubService::fetchGroupPost($q, true);
+                $resp['name'] = 'Group Post';
+                $resp['url'] = '/groups/' . $resp['group_id'] . '/p/' . $resp['id'];
+                return [$resp];
+            }
+        }
+        return Group::whereNull('status')
+            ->where('name', 'like', '%' . $q . '%')
+            ->orderBy('id')
+            ->take(10)
+            ->pluck('id')
+            ->map(function($group) {
+                return GroupService::get($group);
+            });
+    }
+
+    public function searchLocalAutocomplete(Request $request)
+    {
+        abort_if(!$request->user(), 404);
+        $this->validate($request, [
+            'q' => 'required|min:2|max:40',
+            'g' => 'required',
+            'v' => 'required|in:0.2'
+        ]);
+        $q = $request->input('q');
+        $gid = $request->input('g');
+        $pid = $request->user()->profile_id;
+        $group = Group::findOrFail($gid);
+        abort_if(!$group->isMember($pid), 404);
+
+        $res = GroupMember::whereGroupId($gid)
+            ->join('profiles', 'group_members.profile_id', '=', 'profiles.id')
+            ->where('profiles.username', 'like', "%{$q}%")
+            ->take(10)
+            ->get()
+            ->map(function($gm) use ($gid) {
+                $a = AccountService::get($gm->profile_id);
+                return [
+                    'username' => $a['username'],
+                    'url' => url("/groups/{$gid}/user/{$a['id']}?rf=group_search")
+                ];
+            });
+        return $res;
+    }
+
+    public function searchAddRecent(Request $request)
+    {
+        $this->validate($request, [
+            'q' => 'required|min:2|max:40',
+            'g' => 'required',
+        ]);
+        $q = $request->input('q');
+        $gid = $request->input('g');
+        $pid = $request->user()->profile_id;
+        $group = Group::findOrFail($gid);
+        abort_if(!$group->isMember($pid), 404);
+
+        $key = 'groups:search:recent:'.$gid.':pid:'.$pid;
+        $ttl = now()->addDays(14);
+        $res = Cache::get($key);
+        if(!$res) {
+            $val = json_encode([$q]);
+        } else {
+            $ex = collect(json_decode($res))
+                ->prepend($q)
+                ->unique('value')
+                ->slice(0, 3)
+                ->values()
+                ->all();
+            $val = json_encode($ex);
+        }
+        Cache::put($key, $val, $ttl);
+        return 200;
+    }
+
+    public function searchGetRecent(Request $request)
+    {
+        $gid = $request->input('g');
+        $pid = $request->user()->profile_id;
+        $group = Group::findOrFail($gid);
+        abort_if(!$group->isMember($pid), 404);
+        $key = 'groups:search:recent:'.$gid.':pid:'.$pid;
+        return Cache::get($key);
+    }
+}
diff --git a/app/Http/Controllers/Groups/GroupsTopicController.php b/app/Http/Controllers/Groups/GroupsTopicController.php
new file mode 100644
index 000000000..c3d8ecda7
--- /dev/null
+++ b/app/Http/Controllers/Groups/GroupsTopicController.php
@@ -0,0 +1,133 @@
+<?php
+
+namespace App\Http\Controllers\Groups;
+
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\RateLimiter;
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use App\Services\AccountService;
+use App\Services\GroupService;
+use App\Services\Groups\GroupPostService;
+use App\Services\Groups\GroupsLikeService;
+use App\Follower;
+use App\Profile;
+use App\Models\Group;
+use App\Models\GroupHashtag;
+use App\Models\GroupInvitation;
+use App\Models\GroupMember;
+use App\Models\GroupPostHashtag;
+use App\Models\GroupPost;
+
+class GroupsTopicController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    public function groupTopics(Request $request)
+    {
+        $this->validate($request, [
+            'gid' => 'required',
+        ]);
+
+        abort_if(!$request->user(), 404);
+
+        $pid = $request->user()->profile_id;
+        $gid = $request->input('gid');
+        $group = Group::findOrFail($gid);
+
+        abort_if(!$group->isMember($pid), 403, 'Not a member of group.');
+
+        $posts = GroupPostHashtag::join('group_hashtags', 'group_hashtags.id', '=', 'group_post_hashtags.hashtag_id')
+            ->selectRaw('group_hashtags.*, group_post_hashtags.*, count(group_post_hashtags.hashtag_id) as ht_count')
+            ->where('group_post_hashtags.group_id', $gid)
+            ->orderByDesc('ht_count')
+            ->limit(10)
+            ->pluck('group_post_hashtags.hashtag_id', 'ht_count')
+            ->map(function($id, $key) use ($gid) {
+                $tag = GroupHashtag::find($id);
+                return [
+                    'hid' => $id,
+                    'name' => $tag->name,
+                    'url' => url("/groups/{$gid}/topics/{$tag->slug}"),
+                    'count' => $key
+                ];
+            })->values();
+
+        return response()->json($posts, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
+    }
+
+    public function groupTopicTag(Request $request)
+    {
+        $this->validate($request, [
+            'gid' => 'required',
+            'name' => 'required'
+        ]);
+
+        abort_if(!$request->user(), 404);
+
+        $pid = $request->user()->profile_id;
+        $gid = $request->input('gid');
+        $limit = $request->input('limit', 3);
+        $group = Group::findOrFail($gid);
+
+        abort_if(!$group->isMember($pid), 403, 'Not a member of group.');
+
+        $name = $request->input('name');
+        $hashtag = GroupHashtag::whereName($name)->first();
+
+        if(!$hashtag) {
+            return [];
+        }
+
+        // $posts = GroupPost::whereGroupId($gid)
+        //  ->select('status_hashtags.*', 'group_posts.*')
+        //  ->where('status_hashtags.hashtag_id', $hashtag->id)
+        //  ->join('status_hashtags', 'group_posts.status_id', '=', 'status_hashtags.status_id')
+        //  ->orderByDesc('group_posts.status_id')
+        //  ->simplePaginate($limit)
+        //  ->map(function($gp) use($pid) {
+        //      $status = StatusService::get($gp['status_id'], false);
+        //      if(!$status) {
+        //          return false;
+        //      }
+        //      $status['favourited'] = (bool) LikeService::liked($pid, $gp['status_id']);
+        //      $status['favourites_count'] = LikeService::count($gp['status_id']);
+        //      $status['pf_type'] = $gp['type'];
+        //      $status['visibility'] = 'public';
+        //      $status['url'] = $gp->url();
+        //      return $status;
+        //  });
+
+        $posts = GroupPostHashtag::whereGroupId($gid)
+            ->whereHashtagId($hashtag->id)
+            ->orderByDesc('id')
+            ->simplePaginate($limit)
+            ->map(function($gp) use($pid) {
+                $status = GroupPostService::get($gp['group_id'], $gp['status_id']);
+                if(!$status) {
+                    return false;
+                }
+                $status['favourited'] = (bool) GroupsLikeService::liked($pid, $gp['status_id']);
+                $status['favourites_count'] = GroupsLikeService::count($gp['status_id']);
+                $status['pf_type'] = $status['pf_type'];
+                $status['visibility'] = 'public';
+                return $status;
+            });
+
+        return response()->json($posts, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
+    }
+
+    public function showTopicFeed(Request $request, $gid, $tag)
+    {
+        abort_if(!$request->user(), 404);
+
+        $pid = $request->user()->profile_id;
+        $group = Group::findOrFail($gid);
+        $gid = $group->id;
+        abort_if(!$group->isMember($pid), 403, 'Not a member of group.');
+        return view('groups.topic-feed', compact('gid', 'tag'));
+    }
+}
diff --git a/app/Http/Controllers/Import/Instagram.php b/app/Http/Controllers/Import/Instagram.php
index 95d290f61..f1b886d52 100644
--- a/app/Http/Controllers/Import/Instagram.php
+++ b/app/Http/Controllers/Import/Instagram.php
@@ -17,7 +17,7 @@ trait Instagram
 {
 	public function instagram()
 	{
-		if(config_cache('pixelfed.import.instagram.enabled') != true) {
+		if((bool) config_cache('pixelfed.import.instagram.enabled') != true) {
 			abort(404, 'Feature not enabled');
 		}
 		return view('settings.import.instagram.home');
@@ -25,6 +25,9 @@ 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')
@@ -38,6 +41,9 @@ 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')
@@ -61,6 +67,9 @@ 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')
@@ -72,6 +81,9 @@ 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,
@@ -114,6 +126,9 @@ 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')
@@ -125,6 +140,9 @@ 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'
     	]);
@@ -150,6 +168,9 @@ 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')
@@ -162,6 +183,9 @@ 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 {
diff --git a/app/Http/Controllers/ImportPostController.php b/app/Http/Controllers/ImportPostController.php
index e814c2b3a..84f230622 100644
--- a/app/Http/Controllers/ImportPostController.php
+++ b/app/Http/Controllers/ImportPostController.php
@@ -83,6 +83,17 @@ 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);
@@ -128,11 +139,11 @@ class ImportPostController extends Controller
             $ip->media = $c->map(function($m) {
                 return [
                     'uri' => $m['uri'],
-                    'title' => $m['title'],
+                    'title' => $this->formatHashtags($m['title']),
                     'creation_timestamp' => $m['creation_timestamp']
                 ];
             })->toArray();
-            $ip->caption = $c->count() > 1 ? $file['title'] : $ip->media[0]['title'];
+            $ip->caption = $c->count() > 1 ? $this->formatHashtags($file['title']) : $this->formatHashtags($ip->media[0]['title']);
             $ip->filename = last(explode('/', $ip->media[0]['uri']));
             $ip->metadata = $c->map(function($m) {
                 return [
@@ -168,7 +179,7 @@ class ImportPostController extends Controller
                 'required',
                 'file',
                 $mimes,
-                'max:' . config('pixelfed.max_photo_size')
+                'max:' . config_cache('pixelfed.max_photo_size')
             ]
         ]);
 
diff --git a/app/Http/Controllers/InternalApiController.php b/app/Http/Controllers/InternalApiController.php
index 299c9ceb6..e2795d6fc 100644
--- a/app/Http/Controllers/InternalApiController.php
+++ b/app/Http/Controllers/InternalApiController.php
@@ -2,442 +2,424 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-use App\{
-	AccountInterstitial,
-	Bookmark,
-	DirectMessage,
-	DiscoverCategory,
-	Hashtag,
-	Follower,
-	Like,
-	Media,
-	MediaTag,
-	Notification,
-	Profile,
-	StatusHashtag,
-	Status,
-	User,
-	UserFilter,
-};
-use Auth,Cache;
-use Illuminate\Support\Facades\Redis;
-use Carbon\Carbon;
-use League\Fractal;
-use App\Transformer\Api\{
-	AccountTransformer,
-	StatusTransformer,
-	// StatusMediaContainerTransformer,
-};
-use App\Util\Media\Filter;
-use App\Jobs\StatusPipeline\NewStatusPipeline;
+use App\AccountInterstitial;
+use App\Bookmark;
+use App\DirectMessage;
+use App\DiscoverCategory;
+use App\Follower;
 use App\Jobs\ModPipeline\HandleSpammerPipeline;
-use League\Fractal\Serializer\ArraySerializer;
-use League\Fractal\Pagination\IlluminatePaginatorAdapter;
-use Illuminate\Validation\Rule;
-use Illuminate\Support\Str;
-use App\Services\MediaTagService;
+use App\Profile;
+use App\Services\BookmarkService;
+use App\Services\DiscoverService;
 use App\Services\ModLogService;
 use App\Services\PublicTimelineService;
-use App\Services\SnowflakeService;
 use App\Services\StatusService;
 use App\Services\UserFilterService;
-use App\Services\DiscoverService;
-use App\Services\BookmarkService;
+use App\Status; // StatusMediaContainerTransformer,
+use App\Transformer\Api\StatusTransformer;
+use App\User;
+use Auth;
+use Cache;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Redis;
+use Illuminate\Validation\Rule;
+use League\Fractal;
+use League\Fractal\Serializer\ArraySerializer;
 
 class InternalApiController extends Controller
 {
-	protected $fractal;
+    protected $fractal;
 
-	public function __construct()
-	{
-		$this->middleware('auth');
-		$this->fractal = new Fractal\Manager();
-		$this->fractal->setSerializer(new ArraySerializer());
-	}
+    public function __construct()
+    {
+        $this->middleware('auth');
+        $this->fractal = new Fractal\Manager;
+        $this->fractal->setSerializer(new ArraySerializer);
+    }
 
-	// deprecated v2 compose api
-	public function compose(Request $request)
-	{
-		return redirect('/');
-	}
+    // deprecated v2 compose api
+    public function compose(Request $request)
+    {
+        return redirect('/');
+    }
 
-	// deprecated
-	public function discover(Request $request)
-	{
-		return;
-	}
+    // deprecated
+    public function discover(Request $request) {}
 
-	public function discoverPosts(Request $request)
-	{
-		$pid = $request->user()->profile_id;
-		$filters = UserFilterService::filters($pid);
-		$forYou = DiscoverService::getForYou();
-		$posts = $forYou->take(50)->map(function($post) {
-			return StatusService::get($post);
-		})
-		->filter(function($post) use($filters) {
-			return $post &&
-				isset($post['account']) &&
-				isset($post['account']['id']) &&
-				!in_array($post['account']['id'], $filters);
-		})
-		->take(12)
-		->values();
-		return response()->json(compact('posts'));
-	}
+    public function discoverPosts(Request $request)
+    {
+        $pid = $request->user()->profile_id;
+        $filters = UserFilterService::filters($pid);
+        $forYou = DiscoverService::getForYou();
+        $posts = $forYou->take(50)->map(function ($post) {
+            return StatusService::get($post);
+        })
+            ->filter(function ($post) use ($filters) {
+                return $post &&
+                    isset($post['account']) &&
+                    isset($post['account']['id']) &&
+                    ! in_array($post['account']['id'], $filters);
+            })
+            ->take(12)
+            ->values();
 
-	public function directMessage(Request $request, $profileId, $threadId)
-	{
-		$profile = Auth::user()->profile;
+        return response()->json(compact('posts'));
+    }
 
-		if($profileId != $profile->id) {
-			abort(403);
-		}
+    public function directMessage(Request $request, $profileId, $threadId)
+    {
+        $profile = Auth::user()->profile;
 
-		$msg = DirectMessage::whereToId($profile->id)
-			->orWhere('from_id',$profile->id)
-			->findOrFail($threadId);
+        if ($profileId != $profile->id) {
+            abort(403);
+        }
 
-		$thread = DirectMessage::with('status')->whereIn('to_id', [$profile->id, $msg->from_id])
-			->whereIn('from_id', [$profile->id,$msg->from_id])
-			->orderBy('created_at', 'asc')
-			->paginate(30);
+        $msg = DirectMessage::whereToId($profile->id)
+            ->orWhere('from_id', $profile->id)
+            ->findOrFail($threadId);
 
-		return response()->json(compact('msg', 'profile', 'thread'), 200, [], JSON_PRETTY_PRINT);
-	}
+        $thread = DirectMessage::with('status')->whereIn('to_id', [$profile->id, $msg->from_id])
+            ->whereIn('from_id', [$profile->id, $msg->from_id])
+            ->orderBy('created_at', 'asc')
+            ->paginate(30);
 
-	public function statusReplies(Request $request, int $id)
-	{
-		$this->validate($request, [
-			'limit' => 'nullable|int|min:1|max:6'
-		]);
-		$parent = Status::whereScope('public')->findOrFail($id);
-		$limit = $request->input('limit') ?? 3;
-		$children = Status::whereInReplyToId($parent->id)
-			->orderBy('created_at', 'desc')
-			->take($limit)
-			->get();
-		$resource = new Fractal\Resource\Collection($children, new StatusTransformer());
-		$res = $this->fractal->createData($resource)->toArray();
+        return response()->json(compact('msg', 'profile', 'thread'), 200, [], JSON_PRETTY_PRINT);
+    }
 
-		return response()->json($res);
-	}
+    public function statusReplies(Request $request, int $id)
+    {
+        $this->validate($request, [
+            'limit' => 'nullable|int|min:1|max:6',
+        ]);
+        $parent = Status::whereScope('public')->findOrFail($id);
+        $limit = $request->input('limit') ?? 3;
+        $children = Status::whereInReplyToId($parent->id)
+            ->orderBy('created_at', 'desc')
+            ->take($limit)
+            ->get();
+        $resource = new Fractal\Resource\Collection($children, new StatusTransformer);
+        $res = $this->fractal->createData($resource)->toArray();
 
-	public function stories(Request $request)
-	{
+        return response()->json($res);
+    }
 
-	}
+    public function stories(Request $request) {}
 
-	public function discoverCategories(Request $request)
-	{
-		$categories = DiscoverCategory::whereActive(true)->orderBy('order')->take(10)->get();
-		$res = $categories->map(function($item) {
-			return [
-				'name' => $item->name,
-				'url' => $item->url(),
-				'thumb' => $item->thumb()
-			];
-		});
-		return response()->json($res);
-	}
+    public function discoverCategories(Request $request)
+    {
+        $categories = DiscoverCategory::whereActive(true)->orderBy('order')->take(10)->get();
+        $res = $categories->map(function ($item) {
+            return [
+                'name' => $item->name,
+                'url' => $item->url(),
+                'thumb' => $item->thumb(),
+            ];
+        });
 
-	public function modAction(Request $request)
-	{
-		abort_unless(Auth::user()->is_admin, 400);
-		$this->validate($request, [
-			'action' => [
-				'required',
-				'string',
-				Rule::in([
-					'addcw',
-					'remcw',
-					'unlist',
-					'spammer'
-				])
-			],
-			'item_id' => 'required|integer|min:1',
-			'item_type' => [
-				'required',
-				'string',
-				Rule::in(['profile', 'status'])
-			]
-		]);
+        return response()->json($res);
+    }
 
-		$action = $request->input('action');
-		$item_id = $request->input('item_id');
-		$item_type = $request->input('item_type');
+    public function modAction(Request $request)
+    {
+        abort_unless(Auth::user()->is_admin, 400);
+        $this->validate($request, [
+            'action' => [
+                'required',
+                'string',
+                Rule::in([
+                    'addcw',
+                    'remcw',
+                    'unlist',
+                    'spammer',
+                ]),
+            ],
+            'item_id' => 'required|integer|min:1',
+            'item_type' => [
+                'required',
+                'string',
+                Rule::in(['profile', 'status']),
+            ],
+        ]);
 
-		$status = Status::findOrFail($item_id);
-		$author = User::whereProfileId($status->profile_id)->first();
-		abort_if($author && $author->is_admin, 422, 'Cannot moderate administrator accounts');
+        $action = $request->input('action');
+        $item_id = $request->input('item_id');
+        $item_type = $request->input('item_type');
 
-		switch($action) {
-			case 'addcw':
-				$status->is_nsfw = true;
-				$status->save();
-				ModLogService::boot()
-					->user(Auth::user())
-					->objectUid($status->profile->user_id)
-					->objectId($status->id)
-					->objectType('App\Status::class')
-					->action('admin.status.moderate')
-					->metadata([
-						'action' => 'cw',
-						'message' => 'Success!'
-					])
-					->accessLevel('admin')
-					->save();
+        $status = Status::findOrFail($item_id);
+        $author = User::whereProfileId($status->profile_id)->first();
+        abort_if($author && $author->is_admin, 422, 'Cannot moderate administrator accounts');
 
-				if($status->uri == null) {
-					$media = $status->media;
-					$ai = new AccountInterstitial;
-					$ai->user_id = $status->profile->user_id;
-					$ai->type = 'post.cw';
-					$ai->view = 'account.moderation.post.cw';
-					$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();
+        switch ($action) {
+            case 'addcw':
+                $status->is_nsfw = true;
+                $status->save();
+                ModLogService::boot()
+                    ->user(Auth::user())
+                    ->objectUid($status->profile->user_id)
+                    ->objectId($status->id)
+                    ->objectType('App\Status::class')
+                    ->action('admin.status.moderate')
+                    ->metadata([
+                        'action' => 'cw',
+                        'message' => 'Success!',
+                    ])
+                    ->accessLevel('admin')
+                    ->save();
 
-					$u = $status->profile->user;
-					$u->has_interstitial = true;
-					$u->save();
-				}
-			break;
+                if ($status->uri == null) {
+                    $media = $status->media;
+                    $ai = new AccountInterstitial;
+                    $ai->user_id = $status->profile->user_id;
+                    $ai->type = 'post.cw';
+                    $ai->view = 'account.moderation.post.cw';
+                    $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();
 
-			case 'remcw':
-				$status->is_nsfw = false;
-				$status->save();
-				ModLogService::boot()
-					->user(Auth::user())
-					->objectUid($status->profile->user_id)
-					->objectId($status->id)
-					->objectType('App\Status::class')
-					->action('admin.status.moderate')
-					->metadata([
-						'action' => 'remove_cw',
-						'message' => 'Success!'
-					])
-					->accessLevel('admin')
-					->save();
-				if($status->uri == null) {
-					$ai = AccountInterstitial::whereUserId($status->profile->user_id)
-						->whereType('post.cw')
-						->whereItemId($status->id)
-						->whereItemType('App\Status')
-						->first();
-					$ai->delete();
-				}
-			break;
+                    $u = $status->profile->user;
+                    $u->has_interstitial = true;
+                    $u->save();
+                }
+                break;
 
-			case 'unlist':
-				$status->scope = $status->visibility = 'unlisted';
-				$status->save();
-				PublicTimelineService::del($status->id);
-				ModLogService::boot()
-					->user(Auth::user())
-					->objectUid($status->profile->user_id)
-					->objectId($status->id)
-					->objectType('App\Status::class')
-					->action('admin.status.moderate')
-					->metadata([
-						'action' => 'unlist',
-						'message' => 'Success!'
-					])
-					->accessLevel('admin')
-					->save();
+            case 'remcw':
+                $status->is_nsfw = false;
+                $status->save();
+                ModLogService::boot()
+                    ->user(Auth::user())
+                    ->objectUid($status->profile->user_id)
+                    ->objectId($status->id)
+                    ->objectType('App\Status::class')
+                    ->action('admin.status.moderate')
+                    ->metadata([
+                        'action' => 'remove_cw',
+                        'message' => 'Success!',
+                    ])
+                    ->accessLevel('admin')
+                    ->save();
+                if ($status->uri == null) {
+                    $ai = AccountInterstitial::whereUserId($status->profile->user_id)
+                        ->whereType('post.cw')
+                        ->whereItemId($status->id)
+                        ->whereItemType('App\Status')
+                        ->first();
+                    $ai->delete();
+                }
+                break;
 
-				if($status->uri == null) {
-					$media = $status->media;
-					$ai = new AccountInterstitial;
-					$ai->user_id = $status->profile->user_id;
-					$ai->type = 'post.unlist';
-					$ai->view = 'account.moderation.post.unlist';
-					$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();
+            case 'unlist':
+                $status->scope = $status->visibility = 'unlisted';
+                $status->save();
+                PublicTimelineService::del($status->id);
+                ModLogService::boot()
+                    ->user(Auth::user())
+                    ->objectUid($status->profile->user_id)
+                    ->objectId($status->id)
+                    ->objectType('App\Status::class')
+                    ->action('admin.status.moderate')
+                    ->metadata([
+                        'action' => 'unlist',
+                        'message' => 'Success!',
+                    ])
+                    ->accessLevel('admin')
+                    ->save();
 
-					$u = $status->profile->user;
-					$u->has_interstitial = true;
-					$u->save();
-				}
-			break;
+                if ($status->uri == null) {
+                    $media = $status->media;
+                    $ai = new AccountInterstitial;
+                    $ai->user_id = $status->profile->user_id;
+                    $ai->type = 'post.unlist';
+                    $ai->view = 'account.moderation.post.unlist';
+                    $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();
 
-			case 'spammer':
-				HandleSpammerPipeline::dispatch($status->profile);
-				ModLogService::boot()
-					->user(Auth::user())
-					->objectUid($status->profile->user_id)
-					->objectId($status->id)
-					->objectType('App\User::class')
-					->action('admin.status.moderate')
-					->metadata([
-						'action' => 'spammer',
-						'message' => 'Success!'
-					])
-					->accessLevel('admin')
-					->save();
-			break;
-		}
+                    $u = $status->profile->user;
+                    $u->has_interstitial = true;
+                    $u->save();
+                }
+                break;
 
-		StatusService::del($status->id, true);
-		return ['msg' => 200];
-	}
+            case 'spammer':
+                HandleSpammerPipeline::dispatch($status->profile);
+                ModLogService::boot()
+                    ->user(Auth::user())
+                    ->objectUid($status->profile->user_id)
+                    ->objectId($status->id)
+                    ->objectType('App\User::class')
+                    ->action('admin.status.moderate')
+                    ->metadata([
+                        'action' => 'spammer',
+                        'message' => 'Success!',
+                    ])
+                    ->accessLevel('admin')
+                    ->save();
+                break;
+        }
 
-	public function composePost(Request $request)
-	{
-		abort(400, 'Endpoint deprecated');
-	}
+        StatusService::del($status->id, true);
 
-	public function bookmarks(Request $request)
-	{
-		$pid = $request->user()->profile_id;
-		$res = Bookmark::whereProfileId($pid)
-			->orderByDesc('created_at')
-			->simplePaginate(10)
-			->map(function($bookmark) use($pid) {
-				$status = StatusService::get($bookmark->status_id, false);
-				if(!$status) {
-					return false;
-				}
-				$status['bookmarked_at'] = str_replace('+00:00', 'Z', $bookmark->created_at->format(DATE_RFC3339_EXTENDED));
+        return ['msg' => 200];
+    }
 
-				if($status) {
-					BookmarkService::add($pid, $status['id']);
-				}
-				return $status;
-			})
-			->filter(function($bookmark) {
-				return $bookmark && isset($bookmark['id']);
-			})
-			->values();
+    public function composePost(Request $request)
+    {
+        abort(400, 'Endpoint deprecated');
+    }
 
-		return response()->json($res);
-	}
+    public function bookmarks(Request $request)
+    {
+        $pid = $request->user()->profile_id;
+        $res = Bookmark::whereProfileId($pid)
+            ->orderByDesc('created_at')
+            ->simplePaginate(10)
+            ->map(function ($bookmark) use ($pid) {
+                $status = StatusService::get($bookmark->status_id, false);
+                if (! $status) {
+                    return false;
+                }
+                $status['bookmarked_at'] = str_replace('+00:00', 'Z', $bookmark->created_at->format(DATE_RFC3339_EXTENDED));
 
-	public function accountStatuses(Request $request, $id)
-	{
-		$this->validate($request, [
-			'only_media' => 'nullable',
-			'pinned' => 'nullable',
-			'exclude_replies' => 'nullable',
-			'max_id' => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
-			'since_id' => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
-			'min_id' => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
-			'limit' => 'nullable|integer|min:1|max:24'
-		]);
+                if ($status) {
+                    BookmarkService::add($pid, $status['id']);
+                }
 
-		$profile = Profile::whereNull('status')->findOrFail($id);
+                return $status;
+            })
+            ->filter(function ($bookmark) {
+                return $bookmark && isset($bookmark['id']);
+            })
+            ->values();
 
-		$limit = $request->limit ?? 9;
-		$max_id = $request->max_id;
-		$min_id = $request->min_id;
-		$scope = $request->only_media == true ?
-			['photo', 'photo:album', 'video', 'video:album'] :
-			['photo', 'photo:album', 'video', 'video:album', 'share', 'reply'];
+        return response()->json($res);
+    }
 
-		if($profile->is_private) {
-			if(!Auth::check()) {
-				return response()->json([]);
-			}
-			$pid = Auth::user()->profile->id;
-			$following = Cache::remember('profile:following:'.$pid, now()->addMinutes(1440), function() use($pid) {
-				$following = Follower::whereProfileId($pid)->pluck('following_id');
-				return $following->push($pid)->toArray();
-			});
-			$visibility = true == in_array($profile->id, $following) ? ['public', 'unlisted', 'private'] : [];
-		} else {
-			if(Auth::check()) {
-				$pid = Auth::user()->profile->id;
-				$following = Cache::remember('profile:following:'.$pid, now()->addMinutes(1440), function() use($pid) {
-					$following = Follower::whereProfileId($pid)->pluck('following_id');
-					return $following->push($pid)->toArray();
-				});
-				$visibility = true == in_array($profile->id, $following) ? ['public', 'unlisted', 'private'] : ['public', 'unlisted'];
-			} else {
-				$visibility = ['public', 'unlisted'];
-			}
-		}
+    public function accountStatuses(Request $request, $id)
+    {
+        $this->validate($request, [
+            'only_media' => 'nullable',
+            'pinned' => 'nullable',
+            'exclude_replies' => 'nullable',
+            'max_id' => 'nullable|integer|min:0|max:'.PHP_INT_MAX,
+            'since_id' => 'nullable|integer|min:0|max:'.PHP_INT_MAX,
+            'min_id' => 'nullable|integer|min:0|max:'.PHP_INT_MAX,
+            'limit' => 'nullable|integer|min:1|max:24',
+        ]);
 
-		$dir = $min_id ? '>' : '<';
-		$id = $min_id ?? $max_id;
-		$timeline = Status::select(
-			'id',
-			'uri',
-			'caption',
-			'rendered',
-			'profile_id',
-			'type',
-			'in_reply_to_id',
-			'reblog_of_id',
-			'is_nsfw',
-			'likes_count',
-			'reblogs_count',
-			'scope',
-			'local',
-			'created_at',
-			'updated_at'
-		  )->whereProfileId($profile->id)
-		  ->whereIn('type', $scope)
-		  ->where('id', $dir, $id)
-		  ->whereIn('visibility', $visibility)
-		  ->latest()
-		  ->limit($limit)
-		  ->get();
+        $profile = Profile::whereNull('status')->findOrFail($id);
 
-		$resource = new Fractal\Resource\Collection($timeline, new StatusTransformer());
-		$res = $this->fractal->createData($resource)->toArray();
+        $limit = $request->limit ?? 9;
+        $max_id = $request->max_id;
+        $min_id = $request->min_id;
+        $scope = $request->only_media == true ?
+            ['photo', 'photo:album', 'video', 'video:album'] :
+            ['photo', 'photo:album', 'video', 'video:album', 'share', 'reply'];
 
-		return response()->json($res);
-	}
+        if ($profile->is_private) {
+            if (! Auth::check()) {
+                return response()->json([]);
+            }
+            $pid = Auth::user()->profile->id;
+            $following = Cache::remember('profile:following:'.$pid, now()->addMinutes(1440), function () use ($pid) {
+                $following = Follower::whereProfileId($pid)->pluck('following_id');
 
-	public function remoteProfile(Request $request, $id)
-	{
-		return redirect('/i/web/profile/' . $id);
-	}
+                return $following->push($pid)->toArray();
+            });
+            $visibility = in_array($profile->id, $following) == true ? ['public', 'unlisted', 'private'] : [];
+        } else {
+            if (Auth::check()) {
+                $pid = Auth::user()->profile->id;
+                $following = Cache::remember('profile:following:'.$pid, now()->addMinutes(1440), function () use ($pid) {
+                    $following = Follower::whereProfileId($pid)->pluck('following_id');
 
-	public function remoteStatus(Request $request, $profileId, $statusId)
-	{
-		return redirect('/i/web/post/' . $statusId);
-	}
+                    return $following->push($pid)->toArray();
+                });
+                $visibility = in_array($profile->id, $following) == true ? ['public', 'unlisted', 'private'] : ['public', 'unlisted'];
+            } else {
+                $visibility = ['public', 'unlisted'];
+            }
+        }
 
-	public function requestEmailVerification(Request $request)
-	{
-		$pid = $request->user()->profile_id;
-		$exists = Redis::sismember('email:manual', $pid);
-		return view('account.email.request_verification', compact('exists'));
-	}
+        $dir = $min_id ? '>' : '<';
+        $id = $min_id ?? $max_id;
+        $timeline = Status::select(
+            'id',
+            'uri',
+            'caption',
+            'profile_id',
+            'type',
+            'in_reply_to_id',
+            'reblog_of_id',
+            'is_nsfw',
+            'likes_count',
+            'reblogs_count',
+            'scope',
+            'local',
+            'created_at',
+            'updated_at'
+        )->whereProfileId($profile->id)
+            ->whereIn('type', $scope)
+            ->where('id', $dir, $id)
+            ->whereIn('visibility', $visibility)
+            ->latest()
+            ->limit($limit)
+            ->get();
 
-	public function requestEmailVerificationStore(Request $request)
-	{
-		$pid = $request->user()->profile_id;
-		Redis::sadd('email:manual', $pid);
-		return redirect('/i/verify-email')->with(['status' => 'Successfully sent manual verification request!']);
-	}
+        $resource = new Fractal\Resource\Collection($timeline, new StatusTransformer);
+        $res = $this->fractal->createData($resource)->toArray();
+
+        return response()->json($res);
+    }
+
+    public function remoteProfile(Request $request, $id)
+    {
+        return redirect('/i/web/profile/'.$id);
+    }
+
+    public function remoteStatus(Request $request, $profileId, $statusId)
+    {
+        return redirect('/i/web/post/'.$statusId);
+    }
+
+    public function requestEmailVerification(Request $request)
+    {
+        $pid = $request->user()->profile_id;
+        $exists = Redis::sismember('email:manual', $pid);
+
+        return view('account.email.request_verification', compact('exists'));
+    }
+
+    public function requestEmailVerificationStore(Request $request)
+    {
+        $pid = $request->user()->profile_id;
+        Redis::sadd('email:manual', $pid);
+
+        return redirect('/i/verify-email')->with(['status' => 'Successfully sent manual verification request!']);
+    }
 }
diff --git a/app/Http/Controllers/LandingController.php b/app/Http/Controllers/LandingController.php
index 5f9f0bba1..f90d84bc2 100644
--- a/app/Http/Controllers/LandingController.php
+++ b/app/Http/Controllers/LandingController.php
@@ -2,44 +2,43 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-use App\Profile;
-use App\Services\AccountService;
 use App\Http\Resources\DirectoryProfile;
+use App\Profile;
+use Illuminate\Http\Request;
 
 class LandingController extends Controller
 {
     public function directoryRedirect(Request $request)
     {
-    	if($request->user()) {
-    		return redirect('/');
-    	}
+        if ($request->user()) {
+            return redirect('/');
+        }
 
-    	abort_if(config_cache('instance.landing.show_directory') == false, 404);
+        abort_if((bool) 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(config_cache('instance.landing.show_explore') == false, 404);
+        abort_if((bool) config_cache('instance.landing.show_explore') == false, 404);
 
-    	return view('site.index');
+        return view('site.index');
     }
 
     public function getDirectoryApi(Request $request)
     {
-    	abort_if(config_cache('instance.landing.show_directory') == false, 404);
+        abort_if((bool) 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)
+        );
     }
 }
diff --git a/app/Http/Controllers/MediaController.php b/app/Http/Controllers/MediaController.php
index b10e75795..cbc08cb5a 100644
--- a/app/Http/Controllers/MediaController.php
+++ b/app/Http/Controllers/MediaController.php
@@ -2,30 +2,31 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
 use App\Media;
+use Illuminate\Http\Request;
 
 class MediaController extends Controller
 {
-	public function index(Request $request)
-	{
-		//return view('settings.drive.index');
-	}
+    public function index(Request $request)
+    {
+        //return view('settings.drive.index');
+        abort(404);
+    }
 
-	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(!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(! (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();
 
-		return redirect()->away($media->cdn_url);
-	}
+        return redirect()->away($media->cdn_url);
+    }
 }
diff --git a/app/Http/Controllers/MicroController.php b/app/Http/Controllers/MicroController.php
index 420083f0f..62e0ae969 100644
--- a/app/Http/Controllers/MicroController.php
+++ b/app/Http/Controllers/MicroController.php
@@ -2,66 +2,65 @@
 
 namespace App\Http\Controllers;
 
+use App\Status;
+use Auth;
+use DB;
 use Illuminate\Http\Request;
-use App\{
-	Profile, 
-	Status, 
-};
-use Auth, DB, Purify;
 use Illuminate\Validation\Rule;
 
 class MicroController extends Controller
 {
-	public function __construct()
-	{
-		$this->middleware('auth');
-	}
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
 
-	public function composeText(Request $request)
-	{
-		$this->validate($request, [
-			'type' => [
-				'required',
-				'string',
-				Rule::in(['text'])
-			],
-			'title' => 'nullable|string|max:140',
-			'content' => 'required|string|max:500',
-			'visibility' => [
-				'required',
-				'string',
-				Rule::in([
-					'public',
-					'unlisted',
-					'private',
-					'draft'
-				])
-			]
-		]);
-		$profile = Auth::user()->profile;
-		$title = $request->input('title');
-		$content = $request->input('content');
-		$visibility = $request->input('visibility');
+    public function composeText(Request $request)
+    {
+        $this->validate($request, [
+            'type' => [
+                'required',
+                'string',
+                Rule::in(['text']),
+            ],
+            'title' => 'nullable|string|max:140',
+            'content' => 'required|string|max:500',
+            'visibility' => [
+                'required',
+                'string',
+                Rule::in([
+                    'public',
+                    'unlisted',
+                    'private',
+                    'draft',
+                ]),
+            ],
+        ]);
+        $profile = Auth::user()->profile;
+        $title = $request->input('title');
+        $content = $request->input('content');
+        $visibility = $request->input('visibility');
 
-		$status = DB::transaction(function() use($profile, $content, $visibility, $title) {
-			$status = new Status;
-			$status->type = 'text';
-			$status->profile_id = $profile->id;
-			$status->caption = strip_tags($content);
-			$status->rendered = Purify::clean($content);
-			$status->is_nsfw = false;
+        $status = DB::transaction(function () use ($profile, $content, $visibility, $title) {
+            $status = new Status;
+            $status->type = 'text';
+            $status->profile_id = $profile->id;
+            $status->caption = strip_tags($content);
+            $status->is_nsfw = false;
 
-			// TODO: remove deprecated visibility in favor of scope
-			$status->visibility = $visibility;
-			$status->scope = $visibility;
-			$status->entities = json_encode(['title'=>$title]);
-			$status->save();
-			return $status;
-		});
+            // TODO: remove deprecated visibility in favor of scope
+            $status->visibility = $visibility;
+            $status->scope = $visibility;
+            $status->entities = json_encode(['title' => $title]);
+            $status->save();
 
-		$fractal = new \League\Fractal\Manager();
-		$fractal->setSerializer(new \League\Fractal\Serializer\ArraySerializer());
-		$s = new \League\Fractal\Resource\Item($status, new \App\Transformer\Api\StatusTransformer());
-		return $fractal->createData($s)->toArray();
-	}
+            return $status;
+        });
+
+        $fractal = new \League\Fractal\Manager;
+        $fractal->setSerializer(new \League\Fractal\Serializer\ArraySerializer);
+        $s = new \League\Fractal\Resource\Item($status, new \App\Transformer\Api\StatusTransformer);
+
+        return $fractal->createData($s)->toArray();
+    }
 }
diff --git a/app/Http/Controllers/OAuth/OobAuthorizationController.php b/app/Http/Controllers/OAuth/OobAuthorizationController.php
new file mode 100644
index 000000000..f69368b79
--- /dev/null
+++ b/app/Http/Controllers/OAuth/OobAuthorizationController.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace App\Http\Controllers\OAuth;
+
+use Laravel\Passport\Http\Controllers\ApproveAuthorizationController;
+use Illuminate\Http\Request;
+use League\OAuth2\Server\Exception\OAuthServerException;
+use Nyholm\Psr7\Response as Psr7Response;
+
+class OobAuthorizationController extends ApproveAuthorizationController
+{
+    /**
+     * Approve the authorization request.
+     *
+     * @param  Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function approve(Request $request)
+    {
+        $this->assertValidAuthToken($request);
+
+        $authRequest = $this->getAuthRequestFromSession($request);
+        $authRequest->setAuthorizationApproved(true);
+
+        return $this->withErrorHandling(function () use ($authRequest) {
+            $response = $this->server->completeAuthorizationRequest($authRequest, new Psr7Response);
+            
+            if ($this->isOutOfBandRequest($authRequest)) {
+                $code = $this->extractAuthorizationCode($response);
+                return response()->json([
+                    'code' => $code,
+                    'state' => $authRequest->getState()
+                ]);
+            }
+
+            return $this->convertResponse($response);
+        });
+    }
+
+    /**
+     * Check if the request is an out-of-band OAuth request.
+     *
+     * @param  \League\OAuth2\Server\RequestTypes\AuthorizationRequest  $authRequest
+     * @return bool
+     */
+    protected function isOutOfBandRequest($authRequest)
+    {
+        return $authRequest->getRedirectUri() === 'urn:ietf:wg:oauth:2.0:oob';
+    }
+
+    /**
+     * Extract the authorization code from the PSR-7 response.
+     *
+     * @param  \Psr\Http\Message\ResponseInterface  $response
+     * @return string
+     * @throws \League\OAuth2\Server\Exception\OAuthServerException
+     */
+    protected function extractAuthorizationCode($response)
+    {
+        $location = $response->getHeader('Location')[0] ?? '';
+        
+        if (empty($location)) {
+            throw OAuthServerException::serverError('Missing authorization code in response');
+        }
+
+        parse_str(parse_url($location, PHP_URL_QUERY), $params);
+        
+        if (!isset($params['code'])) {
+            throw OAuthServerException::serverError('Invalid authorization code format');
+        }
+
+        return $params['code'];
+    }
+
+    /**
+     * Handle OAuth errors for both redirect and OOB flows.
+     *
+     * @param  \Closure  $callback
+     * @return \Illuminate\Http\Response
+     */
+    protected function withErrorHandling($callback)
+    {
+        try {
+            return $callback();
+        } catch (OAuthServerException $e) {
+            if ($this->isOutOfBandRequest($this->getAuthRequestFromSession(request()))) {
+                return response()->json([
+                    'error' => $e->getErrorType(),
+                    'message' => $e->getMessage(),
+                    'hint' => $e->getHint()
+                ], $e->getHttpStatusCode());
+            }
+
+            return $this->convertResponse(
+                $e->generateHttpResponse(new Psr7Response)
+            );
+        }
+    }
+}
diff --git a/app/Http/Controllers/ParentalControlsController.php b/app/Http/Controllers/ParentalControlsController.php
new file mode 100644
index 000000000..7d8625863
--- /dev/null
+++ b/app/Http/Controllers/ParentalControlsController.php
@@ -0,0 +1,231 @@
+<?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;
+    }
+}
diff --git a/app/Http/Controllers/PixelfedDirectoryController.php b/app/Http/Controllers/PixelfedDirectoryController.php
index 6290cd398..d6a014d07 100644
--- a/app/Http/Controllers/PixelfedDirectoryController.php
+++ b/app/Http/Controllers/PixelfedDirectoryController.php
@@ -2,37 +2,41 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
 use App\Models\ConfigCache;
-use Storage;
 use App\Services\AccountService;
+use App\Services\InstanceService;
 use App\Services\StatusService;
+use App\User;
+use Cache;
+use Illuminate\Http\Request;
 use Illuminate\Support\Str;
+use Storage;
 
 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;
         }
 
@@ -41,70 +45,72 @@ 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 = ConfigCache::whereK('pixelfed.open_registration')->first();
-        if($openRegistration) {
-            $res['open_registration'] = (bool) $openRegistration;
-        }
+        $openRegistration = (bool) config_cache('pixelfed.open_registration');
+        $res['open_registration'] = $openRegistration;
+
+        $curatedOnboarding = (bool) config_cache('instance.curated_registration.enabled');
+        $res['curated_onboarding'] = $curatedOnboarding;
 
         $oauthEnabled = ConfigCache::whereK('pixelfed.oauth_enabled')->first();
-        if($oauthEnabled) {
-            $keys = file_exists(storage_path('oauth-public.key')) && file_exists(storage_path('oauth-private.key'));
+        if ($oauthEnabled) {
+            $keys = (file_exists(storage_path('oauth-public.key')) || config_cache('passport.public_key')) &&
+                (file_exists(storage_path('oauth-private.key')) || config_cache('passport.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' => config_cache('pixelfed.optimize_image'),
+            'optimize_image' => (bool) 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' => config_cache('pixelfed.enforce_account_limit'),
+            'enforce_account_limit' => (bool) 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' => config_cache('pixelfed.account_deletion'),
+            'account_deletion' => (bool) config_cache('pixelfed.account_deletion'),
         ];
 
         $res['is_eligible'] = $this->validVal($res, 'admin') &&
@@ -114,29 +120,34 @@ 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 = InstanceService::totalLocalStatuses();
+        $usersCount = Cache::remember('api:nodeinfo:users', 43200, function () {
+            return User::count();
+        });
         $res['stats'] = [
-            'user_count' => \App\User::count(),
-            'post_count' => \App\Status::whereNull('uri')->count(),
+            'user_count' => (int) $usersCount,
+            'post_count' => (int) $statusesCount,
         ];
 
         $res['primary_locale'] = config('app.locale');
@@ -149,19 +160,18 @@ 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];
     }
-
 }
diff --git a/app/Http/Controllers/ProfileAliasController.php b/app/Http/Controllers/ProfileAliasController.php
index 024005a8e..559dcb9a6 100644
--- a/app/Http/Controllers/ProfileAliasController.php
+++ b/app/Http/Controllers/ProfileAliasController.php
@@ -2,11 +2,13 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-use App\Util\Lexer\Nickname;
-use App\Util\Webfinger\WebfingerUrl;
 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
 {
@@ -18,31 +20,47 @@ class ProfileAliasController extends Controller
     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' => 'required',
         ]);
 
         $acct = $request->input('acct');
 
-        if($request->user()->profile->aliases->count() >= 3) {
+        $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);
-        if(!$webfingerService || !isset($webfingerService['url'])) {
+        $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 = $webfingerService['url'];
+        $alias->uri = $webfingerUrl;
         $alias->save();
 
+        Cache::forget('pf:activitypub:user-object:by-id:'.$request->user()->profile_id);
+
         return back()->with('status', 'Successfully added alias!');
     }
 
@@ -50,14 +68,25 @@ class ProfileAliasController extends Controller
     {
         $this->validate($request, [
             'acct' => 'required',
-            'id' => 'required|exists:profile_aliases'
+            'id' => 'required|exists:profile_aliases',
         ]);
-
-        $alias = ProfileAlias::where('profile_id', $request->user()->profile_id)
-            ->where('acct', $request->input('acct'))
+        $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!');
     }
diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
index 26e9e5398..5c6e4b082 100644
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -2,356 +2,393 @@
 
 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\Status;
-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\Util\Lexer\Nickname;
-use App\Util\Webfinger\Webfinger;
-use App\Transformer\ActivityPub\ProfileOutbox;
+use App\Status;
+use App\Story;
 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)
-	{
-		// 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);
-				}
-			}
-		}
+    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');
 
-		$user = Profile::whereNull('domain')
-			->whereNull('status')
-			->whereUsername($username)
-			->firstOrFail();
+            return $this->showActivityPub($request, $user);
+        }
 
+        // redirect authed users to Metro 2.0
+        if ($request->user() && !$request->filled('carousel')) {
+            // 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);
+                }
+            }
+        }
 
-		if($request->wantsJson() && config_cache('federation.activitypub.enabled')) {
-			return $this->showActivityPub($request, $user);
-		}
+        $user = $this->getCachedUser($username);
 
-		$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;
-			}
+        abort_unless($user, 404);
 
-			return false;
-		});
-		if($aiCheck) {
-			return redirect('/login');
-		}
-		return $this->buildProfile($request, $user);
-	}
+        $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;
+            }
 
-	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;
-			});
+            return false;
+        });
+        if ($aiCheck) {
+            return redirect('/login');
+        }
 
-			if ($user->is_private == true) {
-				$profile = null;
-				return view('profile.private', compact('user'));
-			}
+        return $this->buildProfile($request, $user);
+    }
 
-			$owner = false;
-			$is_following = false;
+    protected function buildProfile(Request $request, $user)
+    {
+        $carousel = (bool) $request->filled('carousel');
+        $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;
+            });
 
-			$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) {
+                $profile = null;
 
-			if ($user->is_private == true) {
-				$isPrivate = $this->privateProfileCheck($user, $loggedIn);
-			}
+                return view('profile.private', compact('user'));
+            }
 
-			$isBlocked = $this->blockedProfileCheck($user);
+            $owner = false;
+            $is_following = false;
 
-			$owner = $loggedIn && Auth::id() === $user->user_id;
-			$is_following = ($owner == false && Auth::check()) ? $user->followedBy(Auth::user()->profile) : 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,
+                ],
+            ];
 
-			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'));
-			}
+            if($carousel) {
+                return view('profile.show_carousel', compact('profile', 'settings'));
+            }
+            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;
+            });
 
-			$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'));
-		}
-	}
+            if ($user->is_private == true) {
+                $isPrivate = $this->privateProfileCheck($user, $loggedIn);
+            }
 
-	public function permalinkRedirect(Request $request, $username)
-	{
-		$user = Profile::whereNull('domain')->whereUsername($username)->firstOrFail();
+            $isBlocked = $this->blockedProfileCheck($user);
 
-		if ($request->wantsJson() && config_cache('federation.activitypub.enabled')) {
-			return $this->showActivityPub($request, $user);
-		}
+            $owner = $loggedIn && Auth::id() === $user->user_id;
+            $is_following = ($owner == false && Auth::check()) ? $user->followedBy(Auth::user()->profile) : false;
 
-		return redirect($user->url());
-	}
+            if ($isPrivate == true || $isBlocked == true) {
+                $requested = Auth::check() ? FollowRequest::whereFollowerId(Auth::user()->profile_id)
+                    ->whereFollowingId($user->id)
+                    ->exists() : false;
 
-	protected function privateProfileCheck(Profile $profile, $loggedIn)
-	{
-		if (!Auth::check()) {
-			return true;
-		}
+                return view('profile.private', compact('user', 'is_following', 'requested'));
+            }
 
-		$user = Auth::user()->profile;
-		if($user->id == $profile->id || !$profile->is_private) {
-			return false;
-		}
+            $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,
+                ],
+            ];
+            if($carousel) {
+                return view('profile.show_carousel', compact('profile', 'settings'));
+            }
+            return view('profile.show', compact('profile', 'settings'));
+        }
+    }
 
-		$follows = Follower::whereProfileId($user->id)->whereFollowingId($profile->id)->exists();
-		if ($follows == false) {
-			return true;
-		}
+    protected function getCachedUser($username, $withTrashed = false)
+    {
+        $val = str_replace(['_', '.', '-'], '', $username);
+        if (! ctype_alnum($val)) {
+            return;
+        }
+        $hash = ($withTrashed ? 'wt:' : 'wot:').strtolower($username);
 
-		return false;
-	}
+        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 static function accountCheck(Profile $profile)
-	{
-		switch ($profile->status) {
-			case 'disabled':
-			case 'suspended':
-			case 'delete':
-				return view('profile.disabled');
-				break;
+    public function permalinkRedirect(Request $request, $username)
+    {
+        if ($request->wantsJson() && (bool) config_cache('federation.activitypub.enabled')) {
+            $user = $this->getCachedUser($username, true);
 
-			default:
-				break;
-		}
-		return abort(404);
-	}
+            return $this->showActivityPub($request, $user);
+        }
 
-	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;
-		}
+        $user = $this->getCachedUser($username);
 
-		return false;
-	}
+        abort_if(! $user, 404);
 
-	public function showActivityPub(Request $request, $user)
-	{
-		abort_if(!config_cache('federation.activitypub.enabled'), 404);
-		abort_if($user->domain, 404);
+        return redirect($user->url());
+    }
 
-		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');
-		});
-	}
+    protected function privateProfileCheck(Profile $profile, $loggedIn)
+    {
+        if (! Auth::check()) {
+            return true;
+        }
 
-	public function showAtomFeed(Request $request, $user)
-	{
-		abort_if(!config('federation.atom.enabled'), 404);
+        $user = Auth::user()->profile;
+        if ($user->id == $profile->id || ! $profile->is_private) {
+            return false;
+        }
 
-		$pid = AccountService::usernameToId($user);
+        $follows = Follower::whereProfileId($user->id)->whereFollowingId($profile->id)->exists();
+        if ($follows == false) {
+            return true;
+        }
 
-		abort_if(!$pid, 404);
+        return false;
+    }
 
-		$profile = AccountService::get($pid, true);
+    public static function accountCheck(Profile $profile)
+    {
+        switch ($profile->status) {
+            case 'disabled':
+            case 'suspended':
+            case 'delete':
+                return view('profile.disabled');
+                break;
 
-		abort_if(!$profile || $profile['locked'] || !$profile['local'], 404);
+            default:
+                break;
+        }
 
-		$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 abort(404);
+    }
 
-			return false;
-		});
+    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;
+        }
 
-		abort_if($aiCheck, 404);
+        return false;
+    }
 
-		$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;
-			}
+    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 $settings->show_atom;
-		});
+        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();
 
-		abort_if(!$enabled, 404);
+            return response(json_encode($res['data']))->header('Content-Type', 'application/activity+json');
+        });
+    }
 
-		$data = Cache::remember('pf:atom:user-feed:by-id:' . $profile['id'], 900, 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'];
+    public function showAtomFeed(Request $request, $user)
+    {
+        abort_if(! config('federation.atom.enabled'), 404);
 
-			if($items && $items->count()) {
-				$headers['Last-Modified'] = now()->parse($items->first()['created_at'])->toRfc7231String();
-			}
+        $pid = AccountService::usernameToId($user);
 
-			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']);
-	}
+        abort_if(! $pid, 404);
 
-	public function meRedirect()
-	{
-		abort_if(!Auth::check(), 404);
-		return redirect(Auth::user()->url());
-	}
+        $profile = AccountService::get($pid, true);
 
-	public function embed(Request $request, $username)
-	{
-		$res = view('profile.embed-removed');
+        abort_if(! $profile || $profile['locked'] || ! $profile['local'], 404);
 
-		if(!config('instance.embed.profile')) {
-			return response($res)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
-		}
+        $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;
+            }
 
-		if(strlen($username) > 15 || strlen($username) < 2) {
-			return response($res)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
-		}
+            return false;
+        });
 
-		$profile = Profile::whereUsername($username)
-			->whereIsPrivate(false)
-			->whereNull('status')
-			->whereNull('domain')
-			->first();
+        abort_if($aiCheck, 404);
 
-		if(!$profile) {
-			return response($res)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
-		}
+        $enabled = Cache::remember('profile:atom:enabled:'.$profile['id'], 86400, function () use ($profile) {
+            $uid = User::whereProfileId($profile['id'])->first();
+            if (! $uid) {
+                return false;
+            }
+            $settings = UserSetting::whereUserId($uid->id)->first();
+            if (! $settings) {
+                return false;
+            }
 
-		$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 $settings->show_atom;
+        });
 
-			return false;
-		});
+        abort_if(! $enabled, 404);
 
-		if($aiCheck) {
-			return response($res)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
-		}
+        $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(AccountService::canEmbed($profile->user_id) == false) {
-			return response($res)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
-		}
+            if ($items && $items->count()) {
+                $headers['Last-Modified'] = now()->parse($items->first()['created_at'])->toRfc7231String();
+            }
 
-		$profile = AccountService::get($profile->id);
-		$res = view('profile.embed', compact('profile'));
-		return response($res)->withHeaders(['X-Frame-Options' => 'ALLOWALL']);
-	}
+            return compact('items', 'permalink', 'headers');
+        });
+        abort_if(! $data || ! isset($data['items']) || ! isset($data['permalink']), 404);
 
-	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'));
-	}
+        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->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'));
+    }
 }
diff --git a/app/Http/Controllers/ProfileMigrationController.php b/app/Http/Controllers/ProfileMigrationController.php
new file mode 100644
index 000000000..d62b96175
--- /dev/null
+++ b/app/Http/Controllers/ProfileMigrationController.php
@@ -0,0 +1,72 @@
+<?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!']);
+    }
+}
diff --git a/app/Http/Controllers/PublicApiController.php b/app/Http/Controllers/PublicApiController.php
index f888eb512..1c9781935 100644
--- a/app/Http/Controllers/PublicApiController.php
+++ b/app/Http/Controllers/PublicApiController.php
@@ -2,46 +2,28 @@
 
 namespace App\Http\Controllers;
 
+use App\Follower;
+use App\Profile;
+use App\Services\AccountService;
+use App\Services\BookmarkService;
+use App\Services\FollowerService;
+use App\Services\InstanceService;
+use App\Services\LikeService;
+use App\Services\NetworkTimelineService;
+use App\Services\PublicTimelineService;
+use App\Services\ReblogService;
+use App\Services\RelationshipService;
+use App\Services\SnowflakeService;
+use App\Services\StatusService;
+use App\Services\UserFilterService;
+use App\Status;
+use App\Transformer\Api\StatusStatelessTransformer;
+use Auth;
+use Cache;
 use Illuminate\Http\Request;
-use App\{
-    Hashtag,
-    Follower,
-    Like,
-    Media,
-    Notification,
-    Profile,
-    StatusHashtag,
-    Status,
-    StatusView,
-    UserFilter
-};
-use Auth, Cache, DB;
-use Illuminate\Support\Facades\Redis;
-use Carbon\Carbon;
 use League\Fractal;
-use App\Transformer\Api\{
-    AccountTransformer,
-    RelationshipTransformer,
-    StatusTransformer,
-    StatusStatelessTransformer
-};
-use App\Services\{
-    AccountService,
-    BookmarkService,
-    FollowerService,
-    LikeService,
-    PublicTimelineService,
-    ProfileService,
-    NetworkTimelineService,
-    ReblogService,
-    RelationshipService,
-    StatusService,
-    SnowflakeService,
-    UserFilterService
-};
-use App\Jobs\StatusPipeline\NewStatusPipeline;
-use League\Fractal\Serializer\ArraySerializer;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use League\Fractal\Serializer\ArraySerializer;
 
 class PublicApiController extends Controller
 {
@@ -49,13 +31,13 @@ class PublicApiController extends Controller
 
     public function __construct()
     {
-        $this->fractal = new Fractal\Manager();
-        $this->fractal->setSerializer(new ArraySerializer());
+        $this->fractal = new Fractal\Manager;
+        $this->fractal->setSerializer(new ArraySerializer);
     }
 
     protected function getUserData($user)
     {
-        if(!$user) {
+        if (! $user) {
             return [];
         } else {
             return AccountService::get($user->profile_id);
@@ -64,22 +46,22 @@ class PublicApiController extends Controller
 
     public function getStatus(Request $request, $id)
     {
-		abort_if(!$request->user(), 403);
-		$status = StatusService::get($id, false);
-		abort_if(!$status, 404);
-		if(in_array($status['visibility'], ['public', 'unlisted'])) {
-			return $status;
-		}
-		$pid = $request->user()->profile_id;
-		if($status['account']['id'] == $pid) {
-			return $status;
-		}
-		if($status['visibility'] == 'private') {
-			if(FollowerService::follows($pid, $status['account']['id'])) {
-				return $status;
-			}
-		}
-		abort(404);
+        abort_if(! $request->user(), 403);
+        $status = StatusService::get($id, false);
+        abort_if(! $status, 404);
+        if (in_array($status['visibility'], ['public', 'unlisted'])) {
+            return $status;
+        }
+        $pid = $request->user()->profile_id;
+        if ($status['account']['id'] == $pid) {
+            return $status;
+        }
+        if ($status['visibility'] == 'private') {
+            if (FollowerService::follows($pid, $status['account']['id'])) {
+                return $status;
+            }
+        }
+        abort(404);
     }
 
     public function status(Request $request, $username, int $postid)
@@ -87,12 +69,12 @@ class PublicApiController extends Controller
         $profile = Profile::whereUsername($username)->whereNull('status')->firstOrFail();
         $status = Status::whereProfileId($profile->id)->findOrFail($postid);
         $this->scopeCheck($profile, $status);
-        if(!$request->user()) {
+        if (! $request->user()) {
             $cached = StatusService::get($status->id, false);
-            abort_if(!in_array($cached['visibility'], ['public', 'unlisted']), 403);
+            abort_if(! in_array($cached['visibility'], ['public', 'unlisted']), 403);
             $res = ['status' => $cached];
         } else {
-            $item = new Fractal\Resource\Item($status, new StatusStatelessTransformer());
+            $item = new Fractal\Resource\Item($status, new StatusStatelessTransformer);
             $res = [
                 'status' => $this->fractal->createData($item)->toArray(),
             ];
@@ -106,7 +88,7 @@ class PublicApiController extends Controller
         $profile = Profile::whereUsername($username)->whereNull('status')->firstOrFail();
         $status = Status::whereProfileId($profile->id)->findOrFail($postid);
         $this->scopeCheck($profile, $status);
-        if(!Auth::check()) {
+        if (! Auth::check()) {
             $res = [
                 'user' => [],
                 'likes' => [],
@@ -117,6 +99,7 @@ class PublicApiController extends Controller
                     'bookmarked' => false,
                 ],
             ];
+
             return response()->json($res);
         }
         $res = [
@@ -129,15 +112,16 @@ class PublicApiController extends Controller
                 'bookmarked' => (bool) $status->bookmarked(),
             ],
         ];
+
         return response()->json($res);
     }
 
     public function statusComments(Request $request, $username, int $postId)
     {
         $this->validate($request, [
-            'min_id'    => 'nullable|integer|min:1',
-            'max_id'    => 'nullable|integer|min:1|max:'.PHP_INT_MAX,
-            'limit'     => 'nullable|integer|min:5|max:50'
+            'min_id' => 'nullable|integer|min:1',
+            'max_id' => 'nullable|integer|min:1|max:'.PHP_INT_MAX,
+            'limit' => 'nullable|integer|min:5|max:50',
         ]);
 
         $limit = $request->limit ?? 10;
@@ -145,50 +129,51 @@ class PublicApiController extends Controller
         $status = Status::whereProfileId($profile->id)->whereCommentsDisabled(false)->findOrFail($postId);
         $this->scopeCheck($profile, $status);
 
-        if(Auth::check()) {
+        if (Auth::check()) {
             $p = Auth::user()->profile;
-            $scope = $p->id == $status->profile_id || FollowerService::follows($p->id, $profile->id) ? ['public', 'private', 'unlisted'] : ['public','unlisted'];
+            $scope = $p->id == $status->profile_id || FollowerService::follows($p->id, $profile->id) ? ['public', 'private', 'unlisted'] : ['public', 'unlisted'];
         } else {
             $scope = ['public', 'unlisted'];
         }
 
-        if($request->filled('min_id') || $request->filled('max_id')) {
-            if($request->filled('min_id')) {
+        if ($request->filled('min_id') || $request->filled('max_id')) {
+            if ($request->filled('min_id')) {
                 $replies = $status->comments()
-                ->whereNull('reblog_of_id')
-                ->whereIn('scope', $scope)
-                ->select('id', 'caption', 'local', 'visibility', 'scope', 'is_nsfw', 'rendered', 'profile_id', 'in_reply_to_id', 'type', 'reply_count', 'created_at')
-                ->where('id', '>=', $request->min_id)
-                ->orderBy('id', 'desc')
-                ->paginate($limit);
+                    ->whereNull('reblog_of_id')
+                    ->whereIn('scope', $scope)
+                    ->select('id', 'caption', 'local', 'visibility', 'scope', 'is_nsfw', 'profile_id', 'in_reply_to_id', 'type', 'reply_count', 'created_at')
+                    ->where('id', '>=', $request->min_id)
+                    ->orderBy('id', 'desc')
+                    ->paginate($limit);
             }
-            if($request->filled('max_id')) {
+            if ($request->filled('max_id')) {
                 $replies = $status->comments()
-                ->whereNull('reblog_of_id')
-                ->whereIn('scope', $scope)
-                ->select('id', 'caption', 'local', 'visibility', 'scope', 'is_nsfw', 'rendered', 'profile_id', 'in_reply_to_id', 'type', 'reply_count', 'created_at')
-                ->where('id', '<=', $request->max_id)
-                ->orderBy('id', 'desc')
-                ->paginate($limit);
+                    ->whereNull('reblog_of_id')
+                    ->whereIn('scope', $scope)
+                    ->select('id', 'caption', 'local', 'visibility', 'scope', 'is_nsfw', 'profile_id', 'in_reply_to_id', 'type', 'reply_count', 'created_at')
+                    ->where('id', '<=', $request->max_id)
+                    ->orderBy('id', 'desc')
+                    ->paginate($limit);
             }
         } else {
             $replies = Status::whereInReplyToId($status->id)
-            ->whereNull('reblog_of_id')
-            ->whereIn('scope', $scope)
-            ->select('id', 'caption', 'local', 'visibility', 'scope', 'is_nsfw', 'rendered', 'profile_id', 'in_reply_to_id', 'type', 'reply_count', 'created_at')
-            ->orderBy('id', 'desc')
-            ->paginate($limit);
+                ->whereNull('reblog_of_id')
+                ->whereIn('scope', $scope)
+                ->select('id', 'caption', 'local', 'visibility', 'scope', 'is_nsfw', 'profile_id', 'in_reply_to_id', 'type', 'reply_count', 'created_at')
+                ->orderBy('id', 'desc')
+                ->paginate($limit);
         }
 
-        $resource = new Fractal\Resource\Collection($replies, new StatusStatelessTransformer(), 'data');
+        $resource = new Fractal\Resource\Collection($replies, new StatusStatelessTransformer, 'data');
         $resource->setPaginator(new IlluminatePaginatorAdapter($replies));
         $res = $this->fractal->createData($resource)->toArray();
+
         return response()->json($res, 200, [], JSON_PRETTY_PRINT);
     }
 
     protected function scopeCheck(Profile $profile, Status $status)
     {
-        if($profile->is_private == true && Auth::check() == false) {
+        if ($profile->is_private == true && Auth::check() == false) {
             abort(404);
         }
 
@@ -198,11 +183,11 @@ class PublicApiController extends Controller
                 break;
             case 'private':
                 $user = Auth::check() ? Auth::user() : false;
-                if(!$user) {
+                if (! $user) {
                     abort(403);
                 } else {
-                    $follows = $profile->followedBy($user->profile);
-                    if($follows == false && $profile->id !== $user->profile->id && $user->is_admin == false) {
+                    $follows = FollowerService::follows($profile->id, $user->profile_id);
+                    if ($follows == false && $profile->id !== $user->profile_id && $user->is_admin == false) {
                         abort(404);
                     }
                 }
@@ -224,14 +209,14 @@ class PublicApiController extends Controller
 
     public function publicTimelineApi(Request $request)
     {
-        $this->validate($request,[
-          'page'        => 'nullable|integer|max:40',
-          'min_id'      => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
-          'max_id'      => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
-          'limit'       => 'nullable|integer|max:30'
+        $this->validate($request, [
+            'page' => 'nullable|integer|max:40',
+            'min_id' => 'nullable|integer|min:0|max:'.PHP_INT_MAX,
+            'max_id' => 'nullable|integer|min:0|max:'.PHP_INT_MAX,
+            'limit' => 'nullable|integer|max:30',
         ]);
 
-        if(!$request->user()) {
+        if (! $request->user()) {
             return response('', 403);
         }
 
@@ -243,123 +228,125 @@ class PublicApiController extends Controller
         $filtered = $user ? UserFilterService::filters($user->profile_id) : [];
 
         $hideNsfw = config('instance.hide_nsfw_on_public_feeds');
-        if(config('exp.cached_public_timeline') == false) {
-            if($min || $max) {
+        if (config('exp.cached_public_timeline') == false) {
+            if ($min || $max) {
                 $dir = $min ? '>' : '<';
                 $id = $min ?? $max;
                 $timeline = Status::select(
-                            'id',
-                            'profile_id',
-                            'type',
-                            'scope',
-                            'local'
-                          )
-                          ->where('id', $dir, $id)
-                          ->whereNull(['in_reply_to_id', 'reblog_of_id'])
-                          ->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])
-                          ->whereLocal(true)
-                          ->when($hideNsfw, function($q, $hideNsfw) {
-                            return $q->where('is_nsfw', false);
-                          })
-                          ->whereScope('public')
-                          ->orderBy('id', 'desc')
-                          ->limit($limit)
-                          ->get()
-                          ->map(function($s) use ($user) {
-                               $status = StatusService::getFull($s->id, $user->profile_id);
-                               if(!$status) {
-                               		return false;
-                               }
-                               $status['favourited'] = (bool) LikeService::liked($user->profile_id, $s->id);
-                               $status['bookmarked'] = (bool) BookmarkService::get($user->profile_id, $s->id);
-                               $status['reblogged'] = (bool) ReblogService::get($user->profile_id, $s->id);
-                               return $status;
-                          })
-                          ->filter(function($s) use($filtered) {
-                                return $s && isset($s['account']) && in_array($s['account']['id'], $filtered) == false;
-                          })
-                          ->values();
+                    'id',
+                    'profile_id',
+                    'type',
+                    'scope',
+                    'local'
+                )
+                    ->where('id', $dir, $id)
+                    ->whereNull(['in_reply_to_id', 'reblog_of_id'])
+                    ->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])
+                    ->whereLocal(true)
+                    ->when($hideNsfw, function ($q, $hideNsfw) {
+                        return $q->where('is_nsfw', false);
+                    })
+                    ->whereScope('public')
+                    ->orderBy('id', 'desc')
+                    ->limit($limit)
+                    ->get()
+                    ->map(function ($s) use ($user) {
+                        $status = StatusService::getFull($s->id, $user->profile_id);
+                        if (! $status) {
+                            return false;
+                        }
+                        $status['favourited'] = (bool) LikeService::liked($user->profile_id, $s->id);
+                        $status['bookmarked'] = (bool) BookmarkService::get($user->profile_id, $s->id);
+                        $status['reblogged'] = (bool) ReblogService::get($user->profile_id, $s->id);
+
+                        return $status;
+                    })
+                    ->filter(function ($s) use ($filtered) {
+                        return $s && isset($s['account']) && in_array($s['account']['id'], $filtered) == false;
+                    })
+                    ->values();
                 $res = $timeline->toArray();
             } else {
                 $timeline = Status::select(
-                            'id',
-                            'uri',
-                            'caption',
-                            'rendered',
-                            'profile_id',
-                            'type',
-                            'in_reply_to_id',
-                            'reblog_of_id',
-                            'is_nsfw',
-                            'scope',
-                            'local',
-                            'reply_count',
-                            'comments_disabled',
-                            'created_at',
-                            'place_id',
-                            'likes_count',
-                            'reblogs_count',
-                            'updated_at'
-                          )
-                          ->whereNull(['in_reply_to_id', 'reblog_of_id'])
-                          ->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])
-                          ->whereLocal(true)
-                          ->when($hideNsfw, function($q, $hideNsfw) {
-                            return $q->where('is_nsfw', false);
-                          })
-                          ->whereScope('public')
-                          ->orderBy('id', 'desc')
-                          ->limit($limit)
-                          ->get()
-                          ->map(function($s) use ($user) {
-                               $status = StatusService::getFull($s->id, $user->profile_id);
-                               if(!$status) {
-                               		return false;
-                               }
-                               $status['favourited'] = (bool) LikeService::liked($user->profile_id, $s->id);
-                               $status['bookmarked'] = (bool) BookmarkService::get($user->profile_id, $s->id);
-                               $status['reblogged'] = (bool) ReblogService::get($user->profile_id, $s->id);
-                               return $status;
-                          })
-                          ->filter(function($s) use($filtered) {
-                                return $s && isset($s['account']) && in_array($s['account']['id'], $filtered) == false;
-                          })
-                          ->values();
+                    'id',
+                    'uri',
+                    'caption',
+                    'profile_id',
+                    'type',
+                    'in_reply_to_id',
+                    'reblog_of_id',
+                    'is_nsfw',
+                    'scope',
+                    'local',
+                    'reply_count',
+                    'comments_disabled',
+                    'created_at',
+                    'place_id',
+                    'likes_count',
+                    'reblogs_count',
+                    'updated_at'
+                )
+                    ->whereNull(['in_reply_to_id', 'reblog_of_id'])
+                    ->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])
+                    ->whereLocal(true)
+                    ->when($hideNsfw, function ($q, $hideNsfw) {
+                        return $q->where('is_nsfw', false);
+                    })
+                    ->whereScope('public')
+                    ->orderBy('id', 'desc')
+                    ->limit($limit)
+                    ->get()
+                    ->map(function ($s) use ($user) {
+                        $status = StatusService::getFull($s->id, $user->profile_id);
+                        if (! $status) {
+                            return false;
+                        }
+                        $status['favourited'] = (bool) LikeService::liked($user->profile_id, $s->id);
+                        $status['bookmarked'] = (bool) BookmarkService::get($user->profile_id, $s->id);
+                        $status['reblogged'] = (bool) ReblogService::get($user->profile_id, $s->id);
+
+                        return $status;
+                    })
+                    ->filter(function ($s) use ($filtered) {
+                        return $s && isset($s['account']) && in_array($s['account']['id'], $filtered) == false;
+                    })
+                    ->values();
 
                 $res = $timeline->toArray();
             }
         } else {
-            Cache::remember('api:v1:timelines:public:cache_check', 10368000, function() {
-                if(PublicTimelineService::count() == 0) {
+            Cache::remember('api:v1:timelines:public:cache_check', 10368000, function () {
+                if (PublicTimelineService::count() == 0) {
                     PublicTimelineService::warmCache(true, 400);
                 }
             });
 
             if ($max) {
                 $feed = PublicTimelineService::getRankedMaxId($max, $limit);
-            } else if ($min) {
+            } elseif ($min) {
                 $feed = PublicTimelineService::getRankedMinId($min, $limit);
             } else {
                 $feed = PublicTimelineService::get(0, $limit);
             }
 
             $res = collect($feed)
-            ->take($limit)
-            ->map(function($k) use($user) {
-                $status = StatusService::get($k);
-                if($status && isset($status['account']) && $user) {
-                    $status['favourited'] = (bool) LikeService::liked($user->profile_id, $k);
-                    $status['bookmarked'] = (bool) BookmarkService::get($user->profile_id, $k);
-                    $status['reblogged'] = (bool) ReblogService::get($user->profile_id, $k);
-                    $status['relationship'] = RelationshipService::get($user->profile_id, $status['account']['id']);
-                }
-                return $status;
-            })
-            ->filter(function($s) use($filtered) {
-                return $s && isset($s['account']) && in_array($s['account']['id'], $filtered) == false;
-            })
-            ->values()
-            ->toArray();
+                ->take($limit)
+                ->map(function ($k) use ($user) {
+                    $status = StatusService::get($k);
+                    if ($status && isset($status['account']) && $user) {
+                        $status['favourited'] = (bool) LikeService::liked($user->profile_id, $k);
+                        $status['bookmarked'] = (bool) BookmarkService::get($user->profile_id, $k);
+                        $status['reblogged'] = (bool) ReblogService::get($user->profile_id, $k);
+                        $status['relationship'] = RelationshipService::get($user->profile_id, $status['account']['id']);
+                    }
+
+                    return $status;
+                })
+                ->filter(function ($s) use ($filtered) {
+                    return $s && isset($s['account']) && in_array($s['account']['id'], $filtered) == false;
+                })
+                ->values()
+                ->toArray();
         }
 
         return response()->json($res);
@@ -367,17 +354,17 @@ class PublicApiController extends Controller
 
     public function homeTimelineApi(Request $request)
     {
-        if(!$request->user()) {
+        if (! $request->user()) {
             return response('', 403);
         }
 
-        $this->validate($request,[
-          'page'        => 'nullable|integer|max:40',
-          'min_id'      => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
-          'max_id'      => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
-          'limit'       => 'nullable|integer|max:40',
-          'recent_feed' => 'nullable',
-          'recent_min'  => 'nullable|integer'
+        $this->validate($request, [
+            'page' => 'nullable|integer|max:40',
+            'min_id' => 'nullable|integer|min:0|max:'.PHP_INT_MAX,
+            'max_id' => 'nullable|integer|min:0|max:'.PHP_INT_MAX,
+            'limit' => 'nullable|integer|max:40',
+            'recent_feed' => 'nullable',
+            'recent_min' => 'nullable|integer',
         ]);
 
         $recentFeed = $request->input('recent_feed') == 'true';
@@ -389,7 +376,7 @@ class PublicApiController extends Controller
         $user = $request->user();
 
         $key = 'user:last_active_at:id:'.$user->id;
-        if(Cache::get($key) == null) {
+        if (Cache::get($key) == null) {
             $user->last_active_at = now();
             $user->save();
             Cache::put($key, true, 43200);
@@ -397,8 +384,9 @@ class PublicApiController extends Controller
 
         $pid = $user->profile_id;
 
-        $following = Cache::remember('profile:following:'.$pid, 1209600, function() use($pid) {
+        $following = Cache::remember('profile:following:'.$pid, 1209600, function () use ($pid) {
             $following = Follower::whereProfileId($pid)->pluck('following_id');
+
             return $following->push($pid)->toArray();
         });
 
@@ -408,123 +396,124 @@ class PublicApiController extends Controller
 
         $textOnlyReplies = false;
 
-        if($min || $max) {
+        if ($min || $max) {
             $dir = $min ? '>' : '<';
             $id = $min ?? $max;
-           	return Status::select(
-                        'id',
-                        'uri',
-                        'caption',
-                        'rendered',
-                        'profile_id',
-                        'type',
-                        'in_reply_to_id',
-                        'reblog_of_id',
-                        'is_nsfw',
-                        'scope',
-                        'local',
-                        'reply_count',
-                        'comments_disabled',
-                        'place_id',
-                        'likes_count',
-                        'reblogs_count',
-                        'created_at',
-                        'updated_at'
-                      )
-                      ->whereIn('type', $types)
-                      ->when(!$textOnlyReplies, function($q, $textOnlyReplies) {
-                        return $q->whereNull('in_reply_to_id');
-                      })
-                      ->where('id', $dir, $id)
-                      ->whereIn('profile_id', $following)
-                      ->whereIn('visibility',['public', 'unlisted', 'private'])
-                      ->orderBy('created_at', 'desc')
-                      ->limit($limit)
-                      ->get()
-                      ->map(function($s) use ($user) {
-                      	try {
-                           $status = StatusService::get($s->id, false);
-                           if(!$status) {
-                           		return false;
-                           }
-                       } catch(\Exception $e) {
-                       	 return false;
-                       }
-                           $status['favourited'] = (bool) LikeService::liked($user->profile_id, $s->id);
-                           $status['bookmarked'] = (bool) BookmarkService::get($user->profile_id, $s->id);
-                           $status['reblogged'] = (bool) ReblogService::get($user->profile_id, $s->id);
-                           return $status;
-                      })
-                      ->filter(function($s) use($filtered) {
-                            return $s && in_array($s['account']['id'], $filtered) == false;
-                      })
-                      ->values()
-                      ->toArray();
+
+            return Status::select(
+                'id',
+                'uri',
+                'caption',
+                'profile_id',
+                'type',
+                'in_reply_to_id',
+                'reblog_of_id',
+                'is_nsfw',
+                'scope',
+                'local',
+                'reply_count',
+                'comments_disabled',
+                'place_id',
+                'likes_count',
+                'reblogs_count',
+                'created_at',
+                'updated_at'
+            )
+                ->whereIn('type', $types)
+                ->when(! $textOnlyReplies, function ($q, $textOnlyReplies) {
+                    return $q->whereNull('in_reply_to_id');
+                })
+                ->where('id', $dir, $id)
+                ->whereIn('profile_id', $following)
+                ->whereIn('visibility', ['public', 'unlisted', 'private'])
+                ->orderBy('created_at', 'desc')
+                ->limit($limit)
+                ->get()
+                ->map(function ($s) use ($user) {
+                    try {
+                        $status = StatusService::get($s->id, false);
+                        if (! $status) {
+                            return false;
+                        }
+                    } catch (\Exception $e) {
+                        return false;
+                    }
+                    $status['favourited'] = (bool) LikeService::liked($user->profile_id, $s->id);
+                    $status['bookmarked'] = (bool) BookmarkService::get($user->profile_id, $s->id);
+                    $status['reblogged'] = (bool) ReblogService::get($user->profile_id, $s->id);
+
+                    return $status;
+                })
+                ->filter(function ($s) use ($filtered) {
+                    return $s && in_array($s['account']['id'], $filtered) == false;
+                })
+                ->values()
+                ->toArray();
         } else {
             return Status::select(
-                        'id',
-                        'uri',
-                        'caption',
-                        'rendered',
-                        'profile_id',
-                        'type',
-                        'in_reply_to_id',
-                        'reblog_of_id',
-                        'is_nsfw',
-                        'scope',
-                        'local',
-                        'reply_count',
-                        'comments_disabled',
-                        'place_id',
-                        'likes_count',
-                        'reblogs_count',
-                        'created_at',
-                        'updated_at'
-                      )
-                      ->whereIn('type', $types)
-                      ->when(!$textOnlyReplies, function($q, $textOnlyReplies) {
-                        return $q->whereNull('in_reply_to_id');
-                      })
-                      ->whereIn('profile_id', $following)
-                      ->whereIn('visibility',['public', 'unlisted', 'private'])
-                      ->orderBy('created_at', 'desc')
-                      ->limit($limit)
-                      ->get()
-                      ->map(function($s) use ($user) {
-	                      	try {
-	                           $status = StatusService::get($s->id, false);
-	                           if(!$status) {
-	                           		return false;
-	                           }
-	                       } catch(\Exception $e) {
-	                       		return false;
-	                       }
-                           $status['favourited'] = (bool) LikeService::liked($user->profile_id, $s->id);
-                           $status['bookmarked'] = (bool) BookmarkService::get($user->profile_id, $s->id);
-                           $status['reblogged'] = (bool) ReblogService::get($user->profile_id, $s->id);
-                           return $status;
-                      })
-                      ->filter(function($s) use($filtered) {
-                            return $s && in_array($s['account']['id'], $filtered) == false;
-                      })
-                      ->values()
-                      ->toArray();
+                'id',
+                'uri',
+                'caption',
+                'profile_id',
+                'type',
+                'in_reply_to_id',
+                'reblog_of_id',
+                'is_nsfw',
+                'scope',
+                'local',
+                'reply_count',
+                'comments_disabled',
+                'place_id',
+                'likes_count',
+                'reblogs_count',
+                'created_at',
+                'updated_at'
+            )
+                ->whereIn('type', $types)
+                ->when(! $textOnlyReplies, function ($q, $textOnlyReplies) {
+                    return $q->whereNull('in_reply_to_id');
+                })
+                ->whereIn('profile_id', $following)
+                ->whereIn('visibility', ['public', 'unlisted', 'private'])
+                ->orderBy('created_at', 'desc')
+                ->limit($limit)
+                ->get()
+                ->map(function ($s) use ($user) {
+                    try {
+                        $status = StatusService::get($s->id, false);
+                        if (! $status) {
+                            return false;
+                        }
+                    } catch (\Exception $e) {
+                        return false;
+                    }
+                    $status['favourited'] = (bool) LikeService::liked($user->profile_id, $s->id);
+                    $status['bookmarked'] = (bool) BookmarkService::get($user->profile_id, $s->id);
+                    $status['reblogged'] = (bool) ReblogService::get($user->profile_id, $s->id);
+
+                    return $status;
+                })
+                ->filter(function ($s) use ($filtered) {
+                    return $s && in_array($s['account']['id'], $filtered) == false;
+                })
+                ->values()
+                ->toArray();
         }
     }
 
     public function networkTimelineApi(Request $request)
     {
-        if(!$request->user()) {
+        if (! $request->user()) {
             return response('', 403);
         }
 
         abort_if(config('federation.network_timeline') == false, 404);
 
-        $this->validate($request,[
-          'page'        => 'nullable|integer|max:40',
-          'min_id'      => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
-          'max_id'      => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
-          'limit'       => 'nullable|integer|max:30'
+        $this->validate($request, [
+            'page' => 'nullable|integer|max:40',
+            'min_id' => 'nullable|integer|min:0|max:'.PHP_INT_MAX,
+            'max_id' => 'nullable|integer|min:0|max:'.PHP_INT_MAX,
+            'limit' => 'nullable|integer|max:30',
         ]);
 
         $page = $request->input('page');
@@ -537,99 +526,102 @@ class PublicApiController extends Controller
         $filtered = $user ? UserFilterService::filters($user->profile_id) : [];
         $hideNsfw = config('instance.hide_nsfw_on_public_feeds');
 
-        if(config('instance.timeline.network.cached') == false) {
-	        if($min || $max) {
-	            $dir = $min ? '>' : '<';
-	            $id = $min ?? $max;
-	            $timeline = Status::select(
-	                        'id',
-	                        'uri',
-	                        'type',
-	                        'scope',
-	                        'created_at',
-	                      )
-                          ->where('id', $dir, $id)
-                          ->when($hideNsfw, function($q, $hideNsfw) {
-                            return $q->where('is_nsfw', false);
-                          })
-	                      ->whereNull(['in_reply_to_id', 'reblog_of_id'])
-	                      ->whereNotIn('profile_id', $filtered)
-	                      ->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])
-	                      ->whereNotNull('uri')
-	                      ->whereScope('public')
-	                      ->where('id', '>', $amin)
-	                      ->orderBy('created_at', 'desc')
-	                      ->limit($limit)
-	                      ->get()
-	                     ->map(function($s) use ($user) {
-	                            $status = StatusService::get($s->id);
-	                            $status['favourited'] = (bool) LikeService::liked($user->profile_id, $s->id);
-	                            $status['bookmarked'] = (bool) BookmarkService::get($user->profile_id, $s->id);
-	                            $status['reblogged'] = (bool) ReblogService::get($user->profile_id, $s->id);
-	                            return $status;
-	                      });
-	            $res = $timeline->toArray();
-	        } else {
-	                $timeline = Status::select(
-	                            'id',
-	                            'uri',
-	                            'type',
-	                            'scope',
-	                            'created_at',
-	                          )
-	                      	  ->whereNull(['in_reply_to_id', 'reblog_of_id'])
-	                          ->whereNotIn('profile_id', $filtered)
-                              ->when($hideNsfw, function($q, $hideNsfw) {
-                                return $q->where('is_nsfw', false);
-                              })
-	                          ->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])
-	                          ->whereNotNull('uri')
-	                          ->whereScope('public')
-	                          ->where('id', '>', $amin)
-	                          ->orderBy('created_at', 'desc')
-	                          ->limit($limit)
-	                          ->get()
-	                          ->map(function($s) use ($user) {
-	                                $status = StatusService::get($s->id);
-	                                $status['favourited'] = (bool) LikeService::liked($user->profile_id, $s->id);
-	                                $status['bookmarked'] = (bool) BookmarkService::get($user->profile_id, $s->id);
-	                                $status['reblogged'] = (bool) ReblogService::get($user->profile_id, $s->id);
-	                                return $status;
-	                          });
-	                $res = $timeline->toArray();
-	        }
-	    } else {
-            Cache::remember('api:v1:timelines:network:cache_check', 10368000, function() {
-                if(NetworkTimelineService::count() == 0) {
+        if (config('instance.timeline.network.cached') == false) {
+            if ($min || $max) {
+                $dir = $min ? '>' : '<';
+                $id = $min ?? $max;
+                $timeline = Status::select(
+                    'id',
+                    'uri',
+                    'type',
+                    'scope',
+                    'created_at',
+                )
+                    ->where('id', $dir, $id)
+                    ->when($hideNsfw, function ($q, $hideNsfw) {
+                        return $q->where('is_nsfw', false);
+                    })
+                    ->whereNull(['in_reply_to_id', 'reblog_of_id'])
+                    ->whereNotIn('profile_id', $filtered)
+                    ->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])
+                    ->whereNotNull('uri')
+                    ->whereScope('public')
+                    ->where('id', '>', $amin)
+                    ->orderBy('created_at', 'desc')
+                    ->limit($limit)
+                    ->get()
+                    ->map(function ($s) use ($user) {
+                        $status = StatusService::get($s->id);
+                        $status['favourited'] = (bool) LikeService::liked($user->profile_id, $s->id);
+                        $status['bookmarked'] = (bool) BookmarkService::get($user->profile_id, $s->id);
+                        $status['reblogged'] = (bool) ReblogService::get($user->profile_id, $s->id);
+
+                        return $status;
+                    });
+                $res = $timeline->toArray();
+            } else {
+                $timeline = Status::select(
+                    'id',
+                    'uri',
+                    'type',
+                    'scope',
+                    'created_at',
+                )
+                    ->whereNull(['in_reply_to_id', 'reblog_of_id'])
+                    ->whereNotIn('profile_id', $filtered)
+                    ->when($hideNsfw, function ($q, $hideNsfw) {
+                        return $q->where('is_nsfw', false);
+                    })
+                    ->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])
+                    ->whereNotNull('uri')
+                    ->whereScope('public')
+                    ->where('id', '>', $amin)
+                    ->orderBy('created_at', 'desc')
+                    ->limit($limit)
+                    ->get()
+                    ->map(function ($s) use ($user) {
+                        $status = StatusService::get($s->id);
+                        $status['favourited'] = (bool) LikeService::liked($user->profile_id, $s->id);
+                        $status['bookmarked'] = (bool) BookmarkService::get($user->profile_id, $s->id);
+                        $status['reblogged'] = (bool) ReblogService::get($user->profile_id, $s->id);
+
+                        return $status;
+                    });
+                $res = $timeline->toArray();
+            }
+        } else {
+            Cache::remember('api:v1:timelines:network:cache_check', 10368000, function () {
+                if (NetworkTimelineService::count() == 0) {
                     NetworkTimelineService::warmCache(true, 400);
                 }
             });
 
             if ($max) {
                 $feed = NetworkTimelineService::getRankedMaxId($max, $limit);
-            } else if ($min) {
+            } elseif ($min) {
                 $feed = NetworkTimelineService::getRankedMinId($min, $limit);
             } else {
                 $feed = NetworkTimelineService::get(0, $limit);
             }
 
             $res = collect($feed)
-            ->take($limit)
-            ->map(function($k) use($user) {
-                $status = StatusService::get($k);
-                if($status && isset($status['account']) && $user) {
-                    $status['favourited'] = (bool) LikeService::liked($user->profile_id, $k);
-                    $status['bookmarked'] = (bool) BookmarkService::get($user->profile_id, $k);
-                    $status['reblogged'] = (bool) ReblogService::get($user->profile_id, $k);
-                    $status['relationship'] = RelationshipService::get($user->profile_id, $status['account']['id']);
-                }
-                return $status;
-            })
-            ->filter(function($s) use($filtered) {
-                return $s && isset($s['account']) && in_array($s['account']['id'], $filtered) == false;
-            })
-            ->values()
-            ->toArray();
+                ->take($limit)
+                ->map(function ($k) use ($user) {
+                    $status = StatusService::get($k);
+                    if ($status && isset($status['account']) && $user) {
+                        $status['favourited'] = (bool) LikeService::liked($user->profile_id, $k);
+                        $status['bookmarked'] = (bool) BookmarkService::get($user->profile_id, $k);
+                        $status['reblogged'] = (bool) ReblogService::get($user->profile_id, $k);
+                        $status['relationship'] = RelationshipService::get($user->profile_id, $status['account']['id']);
+                    }
+
+                    return $status;
+                })
+                ->filter(function ($s) use ($filtered) {
+                    return $s && isset($s['account']) && in_array($s['account']['id'], $filtered) == false;
+                })
+                ->values()
+                ->toArray();
         }
 
         return response()->json($res);
@@ -637,23 +629,23 @@ class PublicApiController extends Controller
 
     public function relationships(Request $request)
     {
-        if(!Auth::check()) {
+        if (! Auth::check()) {
             return response()->json([]);
         }
 
         $pid = $request->user()->profile_id;
 
         $this->validate($request, [
-            'id'    => 'required|array|min:1|max:20',
-            'id.*'  => 'required|integer'
+            'id' => 'required|array|min:1|max:20',
+            'id.*' => 'required|integer',
         ]);
         $ids = collect($request->input('id'));
-        $res = $ids->filter(function($v) use($pid) {
+        $res = $ids->filter(function ($v) use ($pid) {
             return $v != $pid;
         })
-        ->map(function($id) use($pid) {
-            return RelationshipService::get($pid, $id);
-        });
+            ->map(function ($id) use ($pid) {
+                return RelationshipService::get($pid, $id);
+            });
 
         return response()->json($res);
     }
@@ -661,6 +653,11 @@ 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);
     }
 
@@ -670,15 +667,20 @@ class PublicApiController extends Controller
             'only_media' => 'nullable',
             'pinned' => 'nullable',
             'exclude_replies' => 'nullable',
-            'max_id' => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
-            'since_id' => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
-            'min_id' => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
-            'limit' => 'nullable|integer|min:1|max:24'
+            'max_id' => 'nullable|integer|min:0|max:'.PHP_INT_MAX,
+            'since_id' => 'nullable|integer|min:0|max:'.PHP_INT_MAX,
+            'min_id' => 'nullable|integer|min:0|max:'.PHP_INT_MAX,
+            'limit' => 'nullable|integer|min:1|max:24',
         ]);
 
         $user = $request->user();
         $profile = AccountService::get($id);
-        abort_if(!$profile, 404);
+        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;
@@ -686,28 +688,30 @@ class PublicApiController extends Controller
         $scope = ['photo', 'photo:album', 'video', 'video:album'];
         $onlyMedia = $request->input('only_media', true);
 
-        if(!$min_id && !$max_id) {
-        	$min_id = 1;
+        if (! $min_id && ! $max_id) {
+            $min_id = 1;
         }
 
-        if($profile['locked']) {
-            if(!$user) {
+        if ($profile['locked']) {
+            if (! $user) {
                 return response()->json([]);
             }
             $pid = $user->profile_id;
-            $following = Cache::remember('profile:following:'.$pid, now()->addMinutes(1440), function() use($pid) {
+            $following = Cache::remember('profile:following:'.$pid, now()->addMinutes(1440), function () use ($pid) {
                 $following = Follower::whereProfileId($pid)->pluck('following_id');
+
                 return $following->push($pid)->toArray();
             });
-            $visibility = true == in_array($profile['id'], $following) ? ['public', 'unlisted', 'private'] : [];
+            $visibility = in_array($profile['id'], $following) == true ? ['public', 'unlisted', 'private'] : [];
         } else {
-            if($user) {
+            if ($user) {
                 $pid = $user->profile_id;
-                $following = Cache::remember('profile:following:'.$pid, now()->addMinutes(1440), function() use($pid) {
+                $following = Cache::remember('profile:following:'.$pid, now()->addMinutes(1440), function () use ($pid) {
                     $following = Follower::whereProfileId($pid)->pluck('following_id');
+
                     return $following->push($pid)->toArray();
                 });
-                $visibility = true == in_array($profile['id'], $following) ? ['public', 'unlisted', 'private'] : ['public', 'unlisted'];
+                $visibility = in_array($profile['id'], $following) == true ? ['public', 'unlisted', 'private'] : ['public', 'unlisted'];
             } else {
                 $visibility = ['public', 'unlisted'];
             }
@@ -715,38 +719,40 @@ class PublicApiController extends Controller
         $dir = $min_id ? '>' : '<';
         $id = $min_id ?? $max_id;
         $res = Status::whereProfileId($profile['id'])
-        ->whereNull('in_reply_to_id')
-        ->whereNull('reblog_of_id')
-        ->whereIn('type', $scope)
-        ->where('id', $dir, $id)
-        ->whereIn('scope', $visibility)
-        ->limit($limit)
-        ->orderByDesc('id')
-        ->get()
-        ->map(function($s) use($user) {
-            try {
-                $status = StatusService::get($s->id, false);
-            } catch (\Exception $e) {
-                $status = false;
-            }
-            if($user && $status) {
-                $status['favourited'] = (bool) LikeService::liked($user->profile_id, $s->id);
-            }
-            return $status;
-        })
-        ->filter(function($s) use($onlyMedia) {
-        	if($onlyMedia) {
-        		if(
-        			!isset($s['media_attachments']) ||
-        			!is_array($s['media_attachments']) ||
-        			empty($s['media_attachments'])
-        		) {
-        			return false;
-        		}
-        	}
-            return $s;
-        })
-        ->values();
+            ->whereNull('in_reply_to_id')
+            ->whereNull('reblog_of_id')
+            ->whereIn('type', $scope)
+            ->where('id', $dir, $id)
+            ->whereIn('scope', $visibility)
+            ->limit($limit)
+            ->orderByDesc('id')
+            ->get()
+            ->map(function ($s) use ($user) {
+                try {
+                    $status = StatusService::get($s->id, false);
+                } catch (\Exception $e) {
+                    $status = false;
+                }
+                if ($user && $status) {
+                    $status['favourited'] = (bool) LikeService::liked($user->profile_id, $s->id);
+                }
+
+                return $status;
+            })
+            ->filter(function ($s) use ($onlyMedia) {
+                if ($onlyMedia) {
+                    if (
+                        ! isset($s['media_attachments']) ||
+                        ! is_array($s['media_attachments']) ||
+                        empty($s['media_attachments'])
+                    ) {
+                        return false;
+                    }
+                }
+
+                return $s;
+            })
+            ->values();
 
         return response()->json($res);
     }
diff --git a/app/Http/Controllers/RemoteAuthController.php b/app/Http/Controllers/RemoteAuthController.php
index e068f5d75..e0afd82ef 100644
--- a/app/Http/Controllers/RemoteAuthController.php
+++ b/app/Http/Controllers/RemoteAuthController.php
@@ -2,22 +2,20 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Support\Str;
-use Illuminate\Http\Request;
-use App\Services\Account\RemoteAuthService;
 use App\Models\RemoteAuth;
-use App\Profile;
-use App\Instance;
-use App\User;
-use Purify;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Hash;
-use Illuminate\Auth\Events\Registered;
-use App\Util\Lexer\RestrictedNames;
+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\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Str;
 use InvalidArgumentException;
+use Purify;
 
 class RemoteAuthController extends Controller
 {
@@ -30,9 +28,10 @@ class RemoteAuthController extends Controller
             config('remote-auth.mastodon.ignore_closed_state') &&
             config('remote-auth.mastodon.enabled')
         ), 404);
-        if($request->user()) {
+        if ($request->user()) {
             return redirect('/');
         }
+
         return view('auth.remote.start');
     }
 
@@ -51,25 +50,27 @@ class RemoteAuthController extends Controller
             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') &&
+        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)) {
+            if (! $res || ! strlen($res)) {
                 return [];
             }
             $res = explode(',', $res);
+
             return response()->json($res);
         }
 
@@ -93,57 +94,62 @@ class RemoteAuthController extends Controller
 
         $domain = $request->input('domain');
 
-        if(str_starts_with(strtolower($domain), 'http')) {
+        if (str_starts_with(strtolower($domain), 'http')) {
             $res = [
                 'domain' => $domain,
                 'ready' => false,
-                'action' => 'incompatible_domain'
+                'action' => 'incompatible_domain',
             ];
+
             return response()->json($res);
         }
 
-        $validateInstance = Helpers::validateUrl('https://' . $domain . '/?block-check=' . time());
+        $validateInstance = Helpers::validateUrl('https://'.$domain.'/?block-check='.time());
 
-        if(!$validateInstance) {
-             $res = [
+        if (! $validateInstance) {
+            $res = [
                 'domain' => $domain,
                 'ready' => false,
-                'action' => 'blocked_domain'
+                '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);
             }
         }
@@ -163,13 +169,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);
@@ -185,7 +191,7 @@ class RemoteAuthController extends Controller
             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');
         }
 
@@ -204,7 +210,7 @@ class RemoteAuthController extends Controller
 
         $domain = $request->session()->get('oauth_domain');
 
-        if($request->filled('code')) {
+        if ($request->filled('code')) {
             $code = $request->input('code');
             $state = $request->session()->pull('state');
 
@@ -216,12 +222,14 @@ 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');
         }
 
@@ -237,9 +245,10 @@ class RemoteAuthController extends Controller
             config('remote-auth.mastodon.ignore_closed_state') &&
             config('remote-auth.mastodon.enabled')
         ), 404);
-        if($request->user()) {
+        if ($request->user()) {
             return redirect('/');
         }
+
         return view('auth.remote.onboarding');
     }
 
@@ -261,36 +270,36 @@ 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',
         ]);
     }
 
@@ -311,7 +320,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']);
 
@@ -324,7 +333,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);
@@ -355,24 +364,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 (_).');
                     }
 
@@ -380,8 +389,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'));
 
@@ -390,7 +399,7 @@ class RemoteAuthController extends Controller
         return response()->json([
             'code' => 200,
             'username' => $username,
-            'exists' => $exists
+            'exists' => $exists,
         ]);
     }
 
@@ -411,7 +420,7 @@ class RemoteAuthController extends Controller
             'email' => [
                 'required',
                 'email:strict,filter_unicode,dns,spoof',
-            ]
+            ],
         ]);
 
         $email = $request->input('email');
@@ -422,7 +431,7 @@ class RemoteAuthController extends Controller
             'code' => 200,
             'email' => $email,
             'exists' => $exists,
-            'banned' => $banned
+            'banned' => $banned,
         ]);
     }
 
@@ -445,18 +454,18 @@ 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,
         ]);
     }
 
@@ -487,24 +496,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 (_).');
                     }
 
@@ -512,10 +521,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');
@@ -527,7 +536,7 @@ class RemoteAuthController extends Controller
             'name' => $name,
             'username' => $username,
             'password' => $password,
-            'email' => $email
+            'email' => $email,
         ]);
 
         $raid = $request->session()->pull('oauth_masto_raid');
@@ -541,7 +550,7 @@ class RemoteAuthController extends Controller
         return [
             'code' => 200,
             'msg' => 'Success',
-            'token' => $token
+            'token' => $token,
         ];
     }
 
@@ -585,7 +594,7 @@ class RemoteAuthController extends Controller
         abort_unless($request->session()->exists('oauth_remasto_id'), 403);
 
         $this->validate($request, [
-            'account' => 'required|url'
+            'account' => 'required|url',
         ]);
 
         $account = $request->input('account');
@@ -594,10 +603,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 [];
@@ -605,7 +614,7 @@ class RemoteAuthController extends Controller
         } else {
             try {
                 $profile = Helpers::profileFetch($account);
-                if($profile) {
+                if ($profile) {
                     return ['id' => (string) $profile->id];
                 } else {
                     return [];
@@ -635,13 +644,13 @@ 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, config_cache('pixelfed.cloud_storage') == false);
+        MediaStorageService::avatar($avatar, (bool) config_cache('pixelfed.cloud_storage') == false);
 
         return [200];
     }
@@ -657,7 +666,7 @@ class RemoteAuthController extends Controller
         ), 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,
@@ -691,19 +700,20 @@ 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);
diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index cbf21518b..8e4296e5b 100644
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -2,368 +2,376 @@
 
 namespace App\Http\Controllers;
 
-use Auth;
 use App\Hashtag;
 use App\Place;
 use App\Profile;
+use App\Services\WebfingerService;
 use App\Status;
-use Illuminate\Http\Request;
 use App\Util\ActivityPub\Helpers;
+use App\Util\Lexer\Autolink;
+use Auth;
+use Illuminate\Http\Request;
 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 $term = '';
-	public $hash = '';
-	public $cacheKey = 'api:search:tag:';
+    public $tokens = [];
 
-	public function __construct()
-	{
-		$this->middleware('auth');
-	}
+    public $term = '';
 
-	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 $hash = '';
 
-		$scope = $request->input('scope') ?? 'all';
-		$this->term = e(urldecode($request->input('q')));
-		$this->hash = hash('sha256', $this->term);
+    public $cacheKey = 'api:search:tag:';
 
-		switch ($scope) {
-			case 'all':
-				$this->getHashtags();
-				$this->getPosts();
-				$this->getProfiles();
-				// $this->getPlaces();
-				break;
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
 
-			case 'hashtag':
-				$this->getHashtags();
-				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 'profile':
-				$this->getProfiles();
-				break;
+        $scope = $request->input('scope') ?? 'all';
+        $this->term = e(urldecode($request->input('q')));
+        $this->hash = hash('sha256', $this->term);
 
-			case 'webfinger':
-				$this->webfingerSearch();
-				break;
+        switch ($scope) {
+            case 'all':
+                $this->getHashtags();
+                $this->getPosts();
+                $this->getProfiles();
+                // $this->getPlaces();
+                break;
 
-			case 'remote':
-				$this->remoteLookupSearch();
-				break;
+            case 'hashtag':
+                $this->getHashtags();
+                break;
 
-			case 'place':
-				$this->getPlaces();
-				break;
+            case 'profile':
+                $this->getProfiles();
+                break;
 
-			default:
-				break;
-		}
+            case 'webfinger':
+                $this->webfingerSearch();
+                break;
 
-		return response()->json($this->tokens, 200, [], JSON_PRETTY_PRINT);
-	}
+            case 'remote':
+                $this->remoteLookupSearch();
+                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();
+            case 'place':
+                $this->getPlaces();
+                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;
-			}
-		}
-	}
+            default:
+                break;
+        }
 
-	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;
-	}
+        return response()->json($this->tokens, 200, [], JSON_PRETTY_PRINT);
+    }
 
-	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()
-		];
-	}
+    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 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;
-				});
-			}
-		}
+            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;
+            }
+        }
+    }
 
-		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 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,
+                    ];
+                });
 
-				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()
-							]
-						];
-					});
-				}
-			});
-		}
-	}
+                return $tags;
+            }
+        });
+        $this->tokens['hashtags'] = $tokens;
+    }
 
-	public function results(Request $request)
-	{
-		$this->validate($request, [
-			'q' => 'required|string|min:1',
-		]);
+    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(),
+        ];
+    }
 
-		return view('search.results');
-	}
+    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(),
+                        ],
+                    ]];
 
-	protected function webfingerSearch()
-	{
-		$wfs = WebfingerService::lookup($this->term);
+                    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();
 
-		if(empty($wfs)) {
-			return;
-		}
+                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(),
+                            ],
+                        ];
+                    });
+                }
+            });
+        }
+    }
 
-		$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;
-	}
+    public function results(Request $request)
+    {
+        $this->validate($request, [
+            'q' => 'required|string|min:1',
+        ]);
 
-	protected function remotePostLookup()
-	{
-		$tag = $this->term;
-		$hash = hash('sha256', $tag);
-		$local = Helpers::validateLocalUrl($tag);
-		$valid = Helpers::validateUrl($tag);
+        return view('search.results');
+    }
 
-		if($valid == false || $local == true) {
-			return;
-		}
+    protected function webfingerSearch()
+    {
+        $wfs = WebfingerService::lookup($this->term);
 
-		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()
-			]];
-		}
+        if (empty($wfs)) {
+            return;
+        }
 
-		$remote = Helpers::fetchFromUrl($tag);
+        $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'],
+                ],
+            ],
+        ];
 
-		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 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();
+            if (! $item) {
+                return;
+            }
+            $media = $item->firstMedia();
+            $url = null;
+            if ($media) {
+                $url = $media->remote_url;
+            }
+            $content = $item->caption ? Autolink::create()->autolink($item->caption) : null;
+            $this->tokens['posts'] = [[
+                'count' => 0,
+                'url' => "/i/web/post/_/$item->profile_id/$item->id",
+                'type' => 'status',
+                'username' => $item->profile->username,
+                'caption' => $content,
+                'thumb' => $url,
+                'timestamp' => $item->created_at->diffForHumans(),
+            ]];
+        }
+
+        $remote = Helpers::fetchFromUrl($tag);
+
+        if (isset($remote['type']) && $remote['type'] == 'Note') {
+            $item = Helpers::statusFetch($tag);
+            if (! $item) {
+                return;
+            }
+            $media = $item->firstMedia();
+            $url = null;
+            if ($media) {
+                $url = $media->remote_url;
+            }
+            $content = $item->caption ? Autolink::create()->autolink($item->caption) : null;
+            $this->tokens['posts'] = [[
+                'count' => 0,
+                'url' => "/i/web/post/_/$item->profile_id/$item->id",
+                'type' => 'status',
+                'username' => $item->profile->username,
+                'caption' => $content,
+                'thumb' => $url,
+                'timestamp' => $item->created_at->diffForHumans(),
+            ]];
+        }
+    }
+
+    protected function remoteLookupSearch()
+    {
+        if (! Helpers::validateUrl($this->term)) {
+            return;
+        }
+        $this->getProfiles();
+        $this->remotePostLookup();
+    }
 }
diff --git a/app/Http/Controllers/Settings/HomeSettings.php b/app/Http/Controllers/Settings/HomeSettings.php
index 082a72af0..ce411e4fd 100644
--- a/app/Http/Controllers/Settings/HomeSettings.php
+++ b/app/Http/Controllers/Settings/HomeSettings.php
@@ -4,207 +4,206 @@ namespace App\Http\Controllers\Settings;
 
 use App\AccountLog;
 use App\EmailVerification;
+use App\Mail\PasswordChange;
 use App\Media;
-use App\Profile;
-use App\User;
-use App\UserFilter;
+use App\Services\AccountService;
+use App\Services\PronounService;
 use App\Util\Lexer\Autolink;
 use App\Util\Lexer\PrettyNumber;
 use Auth;
 use Cache;
-use DB;
+use Illuminate\Http\Request;
 use Mail;
 use Purify;
-use App\Mail\PasswordChange;
-use Illuminate\Http\Request;
-use App\Services\AccountService;
-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::forgetAccountSettings($profile->id);
+            AccountService::del($profile->id);
 
-		return redirect('/settings/home');
-	}
+            return redirect('/settings/home')->with('status', 'Profile successfully updated!');
+        }
 
-	public function password()
-	{
-		return view('settings.password');
-	}
+        return redirect('/settings/home');
+    }
 
-	public function passwordUpdate(Request $request)
-	{
-		$this->validate($request, [
-		'current'                => 'required|string',
-		'password'               => 'required|string',
-		'password_confirmation'  => 'required|string',
-	  ]);
+    public function password()
+    {
+        return view('settings.password');
+    }
 
-		$current = $request->input('current');
-		$new = $request->input('password');
-		$confirm = $request->input('password_confirmation');
+    public function passwordUpdate(Request $request)
+    {
+        $this->validate($request, [
+            'current' => 'required|string',
+            'password' => 'required|string',
+            'password_confirmation' => 'required|string',
+        ]);
 
-		$user = Auth::user();
+        $current = $request->input('current');
+        $new = $request->input('password');
+        $confirm = $request->input('password_confirmation');
 
-		if (password_verify($current, $user->password) && $new === $confirm) {
-			$user->password = bcrypt($new);
-			$user->save();
+        $user = Auth::user();
 
-			$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();
+        if (password_verify($current, $user->password) && $new === $confirm) {
+            $user->password = bcrypt($new);
+            $user->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.');
-		}
+            $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));
 
-	public function email()
-	{
-		return view('settings.email');
-	}
+            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 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');
+    public function email()
+    {
+        return view('settings.email');
+    }
 
-		if ($user->email != $email) {
-			$changes = true;
-			$user->email = $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;
 
-			if ($validate) {
-				$user->email_verified_at = null;
-				// Prevent old verifications from working
-				EmailVerification::whereUserId($user->id)->delete();
-			}
+        $validate = config_cache('pixelfed.enforce_email_verification');
 
-			$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 ($user->email != $email) {
+            $changes = true;
+            $user->email = $email;
 
-		if ($changes === true) {
-			Cache::forget('user:account:id:'.$user->id);
-			$user->save();
-			$profile->save();
+            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();
+            }
 
-			return redirect('/settings/home')->with('status', 'Email successfully updated!');
-		} else {
-			return redirect('/settings/email');
-		}
+            $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();
 
-	public function avatar()
-	{
-		return view('settings.avatar');
-	}
+            return redirect('/settings/email')->with('status', 'Email successfully updated!');
+        } else {
+            return redirect('/settings/email');
+        }
 
+    }
+
+    public function avatar()
+    {
+        return view('settings.avatar');
+    }
 }
diff --git a/app/Http/Controllers/Settings/PrivacySettings.php b/app/Http/Controllers/Settings/PrivacySettings.php
index 9a5febe83..c9caa168d 100644
--- a/app/Http/Controllers/Settings/PrivacySettings.php
+++ b/app/Http/Controllers/Settings/PrivacySettings.php
@@ -2,29 +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\User;
+use App\Services\AccountService;
+use App\Services\RelationshipService;
 use App\UserFilter;
-use App\Util\Lexer\PrettyNumber;
-use App\Util\ActivityPub\Helpers;
-use Auth, Cache, DB;
+use Auth;
+use Cache;
+use DB;
 use Illuminate\Http\Request;
 
 trait PrivacySettings
 {
-
     public function privacy()
     {
         $user = Auth::user();
         $settings = $user->settings;
         $profile = $user->profile;
         $is_private = $profile->is_private;
+        $cachedSettings = AccountService::getAccountSettings($profile->id);
         $settings['is_private'] = (bool) $is_private;
+        if ($cachedSettings && isset($cachedSettings['disable_embeds'])) {
+            $settings['disable_embeds'] = (bool) $cachedSettings['disable_embeds'];
+        } else {
+            $settings['disable_embeds'] = false;
+        }
 
         return view('settings.privacy', compact('settings', 'profile'));
     }
@@ -33,20 +35,31 @@ trait PrivacySettings
     {
         $settings = $request->user()->settings;
         $profile = $request->user()->profile;
+        $other = $settings->other;
         $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',
+            'indexable',
+            'show_atom',
         ];
 
         $profile->indexable = $request->input('indexable') == 'on';
         $profile->is_suggestable = $request->input('is_suggestable') == 'on';
         $profile->save();
 
+        if ($request->has('disable_embeds')) {
+            $other['disable_embeds'] = true;
+            $settings->other = $other;
+            $settings->save();
+        } else {
+            $other['disable_embeds'] = false;
+            $settings->other = $other;
+            $settings->save();
+        }
+
         foreach ($fields as $field) {
             $form = $request->input($field);
             if ($field == 'is_private') {
@@ -66,7 +79,7 @@ trait PrivacySettings
                 } else {
                     $settings->{$field} = true;
                 }
-             } elseif ($field == 'public_dm') {
+            } elseif ($field == 'public_dm') {
                 if ($form == 'on') {
                     $settings->{$field} = true;
                 } else {
@@ -83,29 +96,37 @@ trait PrivacySettings
             }
             $settings->save();
         }
-        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);
+        $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));
+        AccountService::forgetAccountSettings($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;
@@ -117,6 +138,8 @@ trait PrivacySettings
                 ->firstOrFail();
             $filter->delete();
         });
+        RelationshipService::refresh($pid, $fid);
+
         return redirect()->back();
     }
 
@@ -125,14 +148,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;
@@ -144,52 +167,32 @@ trait PrivacySettings
                 ->firstOrFail();
             $filter->delete();
         });
+        RelationshipService::refresh($pid, $fid);
+
         return redirect()->back();
     }
 
     public function blockedInstances()
     {
-        $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'));
+        // deprecated
+        abort(404);
+    }
+
+    public function domainBlocks()
+    {
+        return view('settings.privacy.domain-blocks');
     }
 
     public function blockedInstanceStore(Request $request)
     {
-        $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]);
+        // deprecated
+        abort(404);
     }
 
     public function blockedInstanceUnblock(Request $request)
     {
-        $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'));
+        // deprecated
+        abort(404);
     }
 
     public function blockedKeywords()
@@ -210,7 +213,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');
@@ -225,9 +228,9 @@ trait PrivacySettings
                 case 'remove-all':
                     Follower::whereFollowingId($profile->id)->delete();
                     break;
-                
+
                 default:
-                    # code...
+                    // code...
                     break;
             }
         }
@@ -237,6 +240,7 @@ trait PrivacySettings
         $settings->save();
         $profile->save();
         Cache::forget('profiles:private');
+
         return [200];
     }
 }
diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 2eb9df65f..981c47784 100644
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -2,270 +2,275 @@
 
 namespace App\Http\Controllers;
 
-use App\AccountLog;
-use App\Following;
-use App\ProfileSponsor;
-use App\Report;
-use App\UserFilter;
-use App\UserSetting;
-use Auth, Cookie, DB, Cache, Purify;
-use Illuminate\Support\Facades\Redis;
-use Carbon\Carbon;
-use Illuminate\Http\Request;
-use Illuminate\Support\Str;
-use App\Http\Controllers\Settings\{
-	ExportSettings,
-	LabsSettings,
-	HomeSettings,
-	PrivacySettings,
-	RelationshipSettings,
-	SecuritySettings
-};
+use App\Http\Controllers\Settings\ExportSettings;
+use App\Http\Controllers\Settings\HomeSettings;
+use App\Http\Controllers\Settings\LabsSettings;
+use App\Http\Controllers\Settings\PrivacySettings;
+use App\Http\Controllers\Settings\RelationshipSettings;
+use App\Http\Controllers\Settings\SecuritySettings;
 use App\Jobs\DeletePipeline\DeleteAccountPipeline;
 use App\Jobs\MediaPipeline\MediaSyncLicensePipeline;
+use App\ProfileSponsor;
 use App\Services\AccountService;
+use App\UserSetting;
+use Auth;
+use Cache;
+use Carbon\Carbon;
+use Cookie;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Redis;
+use Illuminate\Support\Str;
 
 class SettingsController extends Controller
 {
-	use ExportSettings,
-	LabsSettings,
-	HomeSettings,
-	PrivacySettings,
-	RelationshipSettings,
-	SecuritySettings;
+    use ExportSettings,
+        HomeSettings,
+        LabsSettings,
+        PrivacySettings,
+        RelationshipSettings,
+        SecuritySettings;
 
-	public function __construct()
-	{
-		$this->middleware('auth');
-	}
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
 
-	public function accessibility()
-	{
-		$settings = Auth::user()->settings;
+    public function accessibility()
+    {
+        $settings = Auth::user()->settings;
 
-		return view('settings.accessibility', compact('settings'));
-	}
+        return view('settings.accessibility', compact('settings'));
+    }
 
-	public function accessibilityStore(Request $request)
-	{
-		$settings = Auth::user()->settings;
-		$fields = [
-		  'compose_media_descriptions',
-		  'reduce_motion',
-		  'optimize_screen_reader',
-		  'high_contrast_mode',
-		  'video_autoplay',
-		];
-		foreach ($fields as $field) {
-			$form = $request->input($field);
-			if ($form == 'on') {
-				$settings->{$field} = true;
-			} else {
-				$settings->{$field} = false;
-			}
-			$settings->save();
-		}
+    public function accessibilityStore(Request $request)
+    {
+        $user = $request->user();
+        $settings = $user->settings;
+        $fields = [
+            'compose_media_descriptions',
+            'reduce_motion',
+            'optimize_screen_reader',
+            'high_contrast_mode',
+            'video_autoplay',
+        ];
+        foreach ($fields as $field) {
+            $form = $request->input($field);
+            if ($form == 'on') {
+                $settings->{$field} = true;
+            } else {
+                $settings->{$field} = false;
+            }
+            $settings->save();
+        }
+        AccountService::forgetAccountSettings($user->profile_id);
 
-		return redirect(route('settings.accessibility'))->with('status', 'Settings successfully updated!');
-	}
+        return redirect(route('settings.accessibility'))->with('status', 'Settings successfully updated!');
+    }
 
-	public function notifications()
-	{
-		return view('settings.notifications');
-	}
+    public function notifications()
+    {
+        return view('settings.notifications');
+    }
 
-	public function applications()
-	{
-		return view('settings.applications');
-	}
+    public function applications()
+    {
+        return view('settings.applications');
+    }
 
-	public function dataImport()
-	{
-		return view('settings.import.home');
-	}
+    public function dataImport()
+    {
+        return view('settings.import.home');
+    }
 
-	public function dataImportInstagram()
-	{
-		abort(404);
-	}
+    public function dataImportInstagram()
+    {
+        abort(404);
+    }
 
-	public function developers()
-	{
-		return view('settings.developers');
-	}
+    public function developers()
+    {
+        return view('settings.developers');
+    }
 
-	public function removeAccountTemporary(Request $request)
-	{
-		$user = Auth::user();
-		abort_if(!config('pixelfed.account_deletion'), 403);
-		abort_if($user->is_admin, 403);
+    public function removeAccountTemporary(Request $request)
+    {
+        $user = Auth::user();
+        abort_if(! config('pixelfed.account_deletion'), 403);
+        abort_if($user->is_admin, 403);
 
-		return view('settings.remove.temporary');
-	}
+        return view('settings.remove.temporary');
+    }
 
-	public function removeAccountTemporarySubmit(Request $request)
-	{
-		$user = Auth::user();
-		abort_if(!config('pixelfed.account_deletion'), 403);
-		abort_if($user->is_admin, 403);
-		$profile = $user->profile;
-		$user->status = 'disabled';
-		$profile->status = 'disabled';
-		$user->save();
-		$profile->save();
-		Auth::logout();
-		Cache::forget('profiles:private');
-		return redirect('/');
-	}
+    public function removeAccountTemporarySubmit(Request $request)
+    {
+        $user = Auth::user();
+        abort_if(! config('pixelfed.account_deletion'), 403);
+        abort_if($user->is_admin, 403);
+        $profile = $user->profile;
+        $user->status = 'disabled';
+        $profile->status = 'disabled';
+        $user->save();
+        $profile->save();
+        Auth::logout();
+        Cache::forget('profiles:private');
 
-	public function removeAccountPermanent(Request $request)
-	{
-		$user = Auth::user();
-		abort_if($user->is_admin, 403);
-		return view('settings.remove.permanent');
-	}
+        return redirect('/');
+    }
 
-	public function removeAccountPermanentSubmit(Request $request)
-	{
-		if(config('pixelfed.account_deletion') == false) {
-			abort(404);
-		}
-		$user = Auth::user();
-		abort_if(!config('pixelfed.account_deletion'), 403);
-		abort_if($user->is_admin, 403);
-		$profile = $user->profile;
-		$ts = Carbon::now()->addMonth();
-		$user->email = $user->id;
-		$user->password = '';
-		$user->status = 'delete';
-		$profile->status = 'delete';
-		$user->delete_after = $ts;
-		$profile->delete_after = $ts;
-		$user->save();
-		$profile->save();
-		Cache::forget('profiles:private');
-		AccountService::del($profile->id);
-		Auth::logout();
-		DeleteAccountPipeline::dispatch($user)->onQueue('low');
-		return redirect('/');
-	}
+    public function removeAccountPermanent(Request $request)
+    {
+        $user = Auth::user();
+        abort_if($user->is_admin, 403);
 
-	public function requestFullExport(Request $request)
-	{
-		$user = Auth::user();
-		return view('settings.export.show');
-	}
+        return view('settings.remove.permanent');
+    }
 
-	public function metroDarkMode(Request $request)
-	{
-		$this->validate($request, [
-			'mode' => 'required|string|in:light,dark'
-		]);
+    public function removeAccountPermanentSubmit(Request $request)
+    {
+        if (config('pixelfed.account_deletion') == false) {
+            abort(404);
+        }
+        $user = Auth::user();
+        abort_if(! config('pixelfed.account_deletion'), 403);
+        abort_if($user->is_admin, 403);
+        $profile = $user->profile;
+        $ts = Carbon::now()->addMonth();
+        $user->email = $user->id;
+        $user->password = '';
+        $user->status = 'delete';
+        $profile->status = 'delete';
+        $user->delete_after = $ts;
+        $profile->delete_after = $ts;
+        $user->save();
+        $profile->save();
+        Cache::forget('profiles:private');
+        AccountService::del($profile->id);
+        Auth::logout();
+        DeleteAccountPipeline::dispatch($user)->onQueue('low');
 
-		$mode = $request->input('mode');
+        return redirect('/');
+    }
 
-		if($mode == 'dark') {
-			$cookie = Cookie::make('dark-mode', 'true', 43800);
-		} else {
-			$cookie = Cookie::forget('dark-mode');
-		}
+    public function requestFullExport(Request $request)
+    {
+        $user = Auth::user();
 
-		return response()->json([200])->cookie($cookie);
-	}
+        return view('settings.export.show');
+    }
 
-	public function sponsor()
-	{
-		$default = [
-			'patreon' => null,
-			'liberapay' => null,
-			'opencollective' => null
-		];
-		$sponsors = ProfileSponsor::whereProfileId(Auth::user()->profile->id)->first();
-		$sponsors = $sponsors ? json_decode($sponsors->sponsors, true) : $default;
-		return view('settings.sponsor', compact('sponsors'));
-	}
-
-	public function sponsorStore(Request $request)
-	{
-		$this->validate($request, [
-			'patreon' => 'nullable|string',
-			'liberapay' => 'nullable|string',
-			'opencollective' => 'nullable|string'
-		]);
-
-		$patreon = Str::startsWith($request->input('patreon'), 'https://') ?
-			substr($request->input('patreon'), 8) :
-			$request->input('patreon');
-
-		$liberapay = Str::startsWith($request->input('liberapay'), 'https://') ?
-			substr($request->input('liberapay'), 8) :
-			$request->input('liberapay');
-
-		$opencollective = Str::startsWith($request->input('opencollective'), 'https://') ?
-			substr($request->input('opencollective'), 8) :
-			$request->input('opencollective');
-
-		$patreon = Str::startsWith($patreon, 'patreon.com/') ? e($patreon) : null;
-		$liberapay = Str::startsWith($liberapay, 'liberapay.com/') ? e($liberapay) : null;
-		$opencollective = Str::startsWith($opencollective, 'opencollective.com/') ? e($opencollective) : null;
-
-		if(empty($patreon) && empty($liberapay) && empty($opencollective)) {
-			return redirect(route('settings'))->with('error', 'An error occured. Please try again later.');
-		}
-
-		$res = [
-			'patreon' => $patreon,
-			'liberapay' => $liberapay,
-			'opencollective' => $opencollective
-		];
-
-		$sponsors = ProfileSponsor::firstOrCreate([
-			'profile_id' => Auth::user()->profile_id ?? Auth::user()->profile->id
-		]);
-		$sponsors->sponsors = json_encode($res);
-		$sponsors->save();
-		$sponsors = $res;
-		return redirect(route('settings'))->with('status', 'Sponsor settings successfully updated!');
-	}
-
-	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
+    public function metroDarkMode(Request $request)
+    {
+        $this->validate($request, [
+            'mode' => 'required|string|in:light,dark',
         ]);
-        if(!$userSettings || !$userSettings->other) {
+
+        $mode = $request->input('mode');
+
+        if ($mode == 'dark') {
+            $cookie = Cookie::make('dark-mode', 'true', 43800);
+        } else {
+            $cookie = Cookie::forget('dark-mode');
+        }
+
+        return response()->json([200])->cookie($cookie);
+    }
+
+    public function sponsor()
+    {
+        $default = [
+            'patreon' => null,
+            'liberapay' => null,
+            'opencollective' => null,
+        ];
+        $sponsors = ProfileSponsor::whereProfileId(Auth::user()->profile->id)->first();
+        $sponsors = $sponsors ? json_decode($sponsors->sponsors, true) : $default;
+
+        return view('settings.sponsor', compact('sponsors'));
+    }
+
+    public function sponsorStore(Request $request)
+    {
+        $this->validate($request, [
+            'patreon' => 'nullable|string',
+            'liberapay' => 'nullable|string',
+            'opencollective' => 'nullable|string',
+        ]);
+
+        $patreon = Str::startsWith($request->input('patreon'), 'https://') ?
+            substr($request->input('patreon'), 8) :
+            $request->input('patreon');
+
+        $liberapay = Str::startsWith($request->input('liberapay'), 'https://') ?
+            substr($request->input('liberapay'), 8) :
+            $request->input('liberapay');
+
+        $opencollective = Str::startsWith($request->input('opencollective'), 'https://') ?
+            substr($request->input('opencollective'), 8) :
+            $request->input('opencollective');
+
+        $patreon = Str::startsWith($patreon, 'patreon.com/') ? e($patreon) : null;
+        $liberapay = Str::startsWith($liberapay, 'liberapay.com/') ? e($liberapay) : null;
+        $opencollective = Str::startsWith($opencollective, 'opencollective.com/') ? e($opencollective) : null;
+
+        if (empty($patreon) && empty($liberapay) && empty($opencollective)) {
+            return redirect(route('settings'))->with('error', 'An error occured. Please try again later.');
+        }
+
+        $res = [
+            'patreon' => $patreon,
+            'liberapay' => $liberapay,
+            'opencollective' => $opencollective,
+        ];
+
+        $sponsors = ProfileSponsor::firstOrCreate([
+            'profile_id' => Auth::user()->profile_id ?? Auth::user()->profile->id,
+        ]);
+        $sponsors->sponsors = json_encode($res);
+        $sponsors->save();
+        $sponsors = $res;
+
+        return redirect(route('settings'))->with('status', 'Sponsor settings successfully updated!');
+    }
+
+    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
+                'photo_reblogs_only' => false,
             ];
         } else {
             $userSettings = array_merge([
                 'enable_reblogs' => false,
-                'photo_reblogs_only' => false
+                'photo_reblogs_only' => false,
             ],
-            $userSettings->other);
+                $userSettings->other);
         }
-		return view('settings.timeline', compact('top', 'replies', 'userSettings'));
-	}
 
-	public function updateTimelineSettings(Request $request)
-	{
+        return view('settings.timeline', compact('top', 'replies', 'userSettings'));
+    }
+
+    public function updateTimelineSettings(Request $request)
+    {
         $pid = $request->user()->profile_id;
-		$uid = $request->user()->id;
+        $uid = $request->user()->id;
         $this->validate($request, [
             'enable_reblogs' => 'sometimes',
-            'photo_reblogs_only' => 'sometimes'
+            'photo_reblogs_only' => 'sometimes',
         ]);
-		Redis::zrem('pf:tl:top', $pid);
-		Redis::zrem('pf:tl:replies', $pid);
+        Redis::zrem('pf:tl:top', $pid);
+        Redis::zrem('pf:tl:replies', $pid);
         $userSettings = UserSetting::firstOrCreate([
-            'user_id' => $uid
+            'user_id' => $uid,
         ]);
-		if($userSettings->other) {
+        if ($userSettings->other) {
             $other = $userSettings->other;
             $other['enable_reblogs'] = $request->has('enable_reblogs');
             $other['photo_reblogs_only'] = $request->has('photo_reblogs_only');
@@ -275,72 +280,74 @@ class SettingsController extends Controller
         }
         $userSettings->other = $other;
         $userSettings->save();
-		return redirect(route('settings'))->with('status', 'Timeline settings successfully updated!');
-	}
 
-	public function mediaSettings(Request $request)
-	{
-		$setting = UserSetting::whereUserId($request->user()->id)->firstOrFail();
-		$compose = $setting->compose_settings ? (
-			is_string($setting->compose_settings) ? json_decode($setting->compose_settings, true) : $setting->compose_settings
-			) : [
-			'default_license' => null,
-			'media_descriptions' => false
-		];
-		return view('settings.media', compact('compose'));
-	}
+        return redirect(route('settings'))->with('status', 'Timeline settings successfully updated!');
+    }
 
-	public function updateMediaSettings(Request $request)
-	{
-		$this->validate($request, [
-			'default' => 'required|int|min:1|max:16',
-			'sync' => 'nullable',
-			'media_descriptions' => 'nullable'
-		]);
+    public function mediaSettings(Request $request)
+    {
+        $setting = UserSetting::whereUserId($request->user()->id)->firstOrFail();
+        $compose = $setting->compose_settings ? (
+            is_string($setting->compose_settings) ? json_decode($setting->compose_settings, true) : $setting->compose_settings
+        ) : [
+            'default_license' => null,
+            'media_descriptions' => false,
+        ];
 
-		$license = $request->input('default');
-		$sync = $request->input('sync') == 'on';
-		$media_descriptions = $request->input('media_descriptions') == 'on';
-		$uid = $request->user()->id;
+        return view('settings.media', compact('compose'));
+    }
 
-		$setting = UserSetting::whereUserId($uid)->firstOrFail();
-		$compose = is_string($setting->compose_settings) ? json_decode($setting->compose_settings, true) : $setting->compose_settings;
-		$changed = false;
+    public function updateMediaSettings(Request $request)
+    {
+        $this->validate($request, [
+            'default' => 'required|int|min:1|max:16',
+            'sync' => 'nullable',
+            'media_descriptions' => 'nullable',
+        ]);
 
-		if($sync) {
-			$key = 'pf:settings:mls_recently:'.$uid;
-			if(Cache::get($key) == 2) {
-				$msg = 'You can only sync licenses twice per 24 hours. Try again later.';
-				return redirect(route('settings'))
-					->with('error', $msg);
-			}
-		}
+        $license = $request->input('default');
+        $sync = $request->input('sync') == 'on';
+        $media_descriptions = $request->input('media_descriptions') == 'on';
+        $uid = $request->user()->id;
 
-		if(!isset($compose['default_license']) || $compose['default_license'] !== $license) {
-			$compose['default_license'] = (int) $license;
-			$changed = true;
-		}
+        $setting = UserSetting::whereUserId($uid)->firstOrFail();
+        $compose = is_string($setting->compose_settings) ? json_decode($setting->compose_settings, true) : $setting->compose_settings;
+        $changed = false;
 
-		if(!isset($compose['media_descriptions']) || $compose['media_descriptions'] !== $media_descriptions) {
-			$compose['media_descriptions'] = $media_descriptions;
-			$changed = true;
-		}
+        if ($sync) {
+            $key = 'pf:settings:mls_recently:'.$uid;
+            if (Cache::get($key) == 2) {
+                $msg = 'You can only sync licenses twice per 24 hours. Try again later.';
 
-		if($changed) {
-			$setting->compose_settings = $compose;
-			$setting->save();
-			Cache::forget('profile:compose:settings:' . $request->user()->id);
-		}
+                return redirect(route('settings'))
+                    ->with('error', $msg);
+            }
+        }
 
-		if($sync) {
-			$val = Cache::has($key) ? 2 : 1;
-			Cache::put($key, $val, 86400);
-			MediaSyncLicensePipeline::dispatch($uid, $license);
-			return redirect(route('settings'))->with('status', 'Media licenses successfully synced! It may take a few minutes to take effect for every post.');
-		}
+        if (! isset($compose['default_license']) || $compose['default_license'] !== $license) {
+            $compose['default_license'] = (int) $license;
+            $changed = true;
+        }
 
-		return redirect(route('settings'))->with('status', 'Media settings successfully updated!');
-	}
+        if (! isset($compose['media_descriptions']) || $compose['media_descriptions'] !== $media_descriptions) {
+            $compose['media_descriptions'] = $media_descriptions;
+            $changed = true;
+        }
 
+        if ($changed) {
+            $setting->compose_settings = $compose;
+            $setting->save();
+            Cache::forget('profile:compose:settings:'.$request->user()->id);
+        }
+
+        if ($sync) {
+            $val = Cache::has($key) ? 2 : 1;
+            Cache::put($key, $val, 86400);
+            MediaSyncLicensePipeline::dispatch($uid, $license);
+
+            return redirect(route('settings'))->with('status', 'Media licenses successfully synced! It may take a few minutes to take effect for every post.');
+        }
+
+        return redirect(route('settings'))->with('status', 'Media settings successfully updated!');
+    }
 }
-
diff --git a/app/Http/Controllers/SiteController.php b/app/Http/Controllers/SiteController.php
index 379b24505..8c13e0b59 100644
--- a/app/Http/Controllers/SiteController.php
+++ b/app/Http/Controllers/SiteController.php
@@ -2,166 +2,202 @@
 
 namespace App\Http\Controllers;
 
+use App\Page;
+use App\Profile;
+use App\Services\FollowerService;
+use App\Services\StatusService;
+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 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;
+use View;
 
 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;
-			return view('site.about', compact('rules', 'user_count', 'post_count'))->render();
-		});
-	}
+    public function about()
+    {
+        return Cache::remember('site.about_v2', now()->addMinutes(15), function () {
+            $user_count = number_format(User::count());
+            $post_count = number_format(StatusService::totalLocalStatuses());
+            $rules = config_cache('app.rules') ? json_decode(config_cache('app.rules'), true) : null;
 
-	public function language()
-	{
-	  return view('site.language');
-	}
+            return view('site.about', compact('rules', 'user_count', 'post_count'))->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();
-			return View::make('site.help.community-guidelines')->with(compact('page'))->render();
-		});
-	}
+    public function language()
+    {
+        return view('site.language');
+    }
 
-	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();
-	}
+    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 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();
-	}
+            return View::make('site.help.community-guidelines')->with(compact('page'))->render();
+        });
+    }
 
-	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'));
-	}
+    public function privacy(Request $request)
+    {
+        $page = Cache::remember('site:privacy', now()->addDays(120), function () {
+            $slug = '/site/privacy';
 
-	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'));
-	}
+            return Page::whereSlug($slug)->whereActive(true)->first();
+        });
 
-	public function legacyProfileRedirect(Request $request, $username)
-	{
-		$username = Str::contains($username, '@') ? '@' . $username : $username;
-		if(str_contains($username, '@')) {
-			$profile = Profile::whereUsername($username)
-				->firstOrFail();
+        return View::make('site.privacy')->with(compact('page'))->render();
+    }
 
-			if($profile->domain == null) {
-				$url = "/$profile->username";
-			} else {
-				$url = "/i/web/profile/_/{$profile->id}";
-			}
+    public function terms(Request $request)
+    {
+        $page = Cache::remember('site:terms', now()->addDays(120), function () {
+            $slug = '/site/terms';
 
-		} else {
-			$profile = Profile::whereUsername($username)
-				->whereNull('domain')
-				->firstOrFail();
-			$url = "/$profile->username";
-		}
+            return Page::whereSlug($slug)->whereActive(true)->first();
+        });
 
-		return redirect($url);
-	}
+        return View::make('site.terms')->with(compact('page'))->render();
+    }
 
-	public function legacyWebfingerRedirect(Request $request, $username, $domain)
-	{
-		$un = '@'.$username.'@'.$domain;
-		$profile = Profile::whereUsername($un)
-			->firstOrFail();
+    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);
 
-		if($profile->domain == null) {
-			$url = "/$profile->username";
-		} else {
-			$url = $request->user() ? "/i/web/profile/_/{$profile->id}" : $profile->url();
-		}
+        return view('site.redirect', compact('url'));
+    }
 
-		return redirect($url);
-	}
+    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;
 
-	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();
-	}
+        return view('site.intents.follow', compact('profile', 'user', 'following'));
+    }
+
+    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]);
+    }
 }
diff --git a/app/Http/Controllers/SoftwareUpdateController.php b/app/Http/Controllers/SoftwareUpdateController.php
new file mode 100644
index 000000000..e29359830
--- /dev/null
+++ b/app/Http/Controllers/SoftwareUpdateController.php
@@ -0,0 +1,21 @@
+<?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;
+    }
+}
diff --git a/app/Http/Controllers/StatusController.php b/app/Http/Controllers/StatusController.php
index 873f5eace..b523f8add 100644
--- a/app/Http/Controllers/StatusController.php
+++ b/app/Http/Controllers/StatusController.php
@@ -2,458 +2,502 @@
 
 namespace App\Http\Controllers;
 
-use App\Jobs\ImageOptimizePipeline\ImageOptimize;
-use App\Jobs\StatusPipeline\NewStatusPipeline;
-use App\Jobs\StatusPipeline\StatusDelete;
-use App\Jobs\StatusPipeline\RemoteStatusDelete;
+use App\AccountInterstitial;
 use App\Jobs\SharePipeline\SharePipeline;
 use App\Jobs\SharePipeline\UndoSharePipeline;
-use App\AccountInterstitial;
-use App\Media;
+use App\Jobs\StatusPipeline\RemoteStatusDelete;
+use App\Jobs\StatusPipeline\StatusDelete;
 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\User;
-use Auth, DB, Cache;
+use App\Util\Media\License;
+use Auth;
+use Cache;
+use DB;
 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() && 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);
-				$status->uri ? RemoteStatusDelete::dispatch($status) : 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);
-			$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);
+            }
+        }
+
+        $status = StatusService::get($id, false);
+
+        abort_if(
+            ! $status ||
+            ! isset($status['account'], $status['account']['username']) ||
+            $status['account']['username'] != $username ||
+            isset($status['reblog']), 404);
+
+        abort_if(! in_array($status['visibility'], ['public', 'unlisted']) && ! $request->user(), 403, 'Invalid permission');
+
+        if ($request->wantsJson() && (bool) config_cache('federation.activitypub.enabled')) {
+            return $this->showActivityPub($request, $status);
+        }
+
+        $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);
+            }
+        }
+
+        $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) ||
+            isset($status['account']['moved'], $status['account']['moved']['id'])
+        ) {
+            $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');
+        }
+
+        $embedCheck = AccountService::canEmbed($profile['id']);
+
+        if (! $embedCheck) {
+            $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' ||
+            ! in_array($status['pf_type'], ['photo', 'photo:album'])
+        ) {
+            $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'));
+        $statusAccount = AccountService::get($status->profile_id);
+        abort_if(! $statusAccount || isset($statusAccount['moved'], $statusAccount['moved']['id']), 422, 'Account moved');
+
+        $count = $status->reblogs_count;
+        $defaultCaption = config_cache('database.default') === 'mysql' ? null : "";
+        $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->caption = $defaultCaption;
+            $share->rendered = $defaultCaption;
+            $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)
+    {
+        $key = 'pf:status:ap:v1:sid:'.$status['id'];
+
+        return Cache::remember($key, 3600, function () use ($status) {
+            $status = Status::findOrFail($status['id']);
+            $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);
+    }
 }
diff --git a/app/Http/Controllers/Stories/StoryApiV1Controller.php b/app/Http/Controllers/Stories/StoryApiV1Controller.php
index db2b1f533..48599fc3a 100644
--- a/app/Http/Controllers/Stories/StoryApiV1Controller.php
+++ b/app/Http/Controllers/Stories/StoryApiV1Controller.php
@@ -2,380 +2,513 @@
 
 namespace App\Http\Controllers\Stories;
 
-use App\Http\Controllers\Controller;
-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\Http\Controllers\Controller;
+use App\Http\Resources\StoryView as StoryViewResource;
 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\Http\Resources\StoryView as StoryViewResource;
+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
 {
-	public function carousel(Request $request)
-	{
-		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
-		$pid = $request->user()->profile_id;
+    const RECENT_KEY = 'pf:stories:recent-by-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();
-		}
+    const RECENT_TTL = 300;
 
-		$nodes = $s->map(function($s) use($pid) {
-			$profile = AccountService::get($s->profile_id, true);
-			if(!$profile || !isset($profile['id'])) {
-				return false;
-			}
+    public function carousel(Request $request)
+    {
+        abort_if(! (bool) config_cache('instance.stories.enabled') || ! $request->user(), 404);
+        $pid = $request->user()->profile_id;
 
-			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();
+        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;
 
-		$res = [
-			'self' => [],
-			'nodes' => $nodes,
-		];
+                        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();
+            });
+        }
 
-		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 = $s->map(function ($s) use ($pid) {
+            $profile = AccountService::get($s->profile_id, true);
+            if (! $profile || ! isset($profile['id'])) {
+                return false;
+            }
 
-				'nodes' => $selfStories,
-			];
-		}
-		return response()->json($res, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
-	}
+            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']}");
 
-	public function add(Request $request)
-	{
-		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
+                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();
 
-		$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'
-		]);
+        $res = [
+            'self' => [],
+            'nodes' => $nodes,
+        ];
 
-		$user = $request->user();
+        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,
+                ],
 
-		$count = Story::whereProfileId($user->profile_id)
-			->whereActive(true)
-			->where('expires_at', '>', now())
-			->count();
+                'nodes' => $selfStories,
+            ];
+        }
 
-		if($count >= Story::MAX_PER_DAY) {
-			abort(418, 'You have reached your limit for new Stories today.');
-		}
+        return response()->json($res, 200, [], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+    }
 
-		$photo = $request->file('file');
-		$path = $this->storeMedia($photo, $user);
+    public function selfCarousel(Request $request)
+    {
+        abort_if(! (bool) config_cache('instance.stories.enabled') || ! $request->user(), 404);
+        $pid = $request->user()->profile_id;
 
-		$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();
+        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;
 
-		$url = $story->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();
+            });
+        }
 
-		$res = [
-			'code' => 200,
-			'msg'  => 'Successfully added',
-			'media_id' => (string) $story->id,
-			'media_url' => url(Storage::url($url)) . '?v=' . time(),
-			'media_type' => $story->type
-		];
+        $nodes = $s->map(function ($s) use ($pid) {
+            $profile = AccountService::get($s->profile_id, true);
+            if (! $profile || ! isset($profile['id'])) {
+                return false;
+            }
 
-		return $res;
-	}
+            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']}");
 
-	public function publish(Request $request)
-	{
-		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
+                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();
 
-		$this->validate($request, [
-			'media_id' => 'required',
-			'duration' => 'required|integer|min:0|max:30',
-			'can_reply' => 'required|boolean',
-			'can_react' => 'required|boolean'
-		]);
+        $selfProfile = AccountService::get($pid, true);
+        $res = [
+            'self' => [
+                'user' => [
+                    'id' => (string) $selfProfile['id'],
+                    'username' => $selfProfile['acct'],
+                    'avatar' => $selfProfile['avatar'],
+                    'local' => $selfProfile['local'],
+                    'is_author' => true,
+                ],
 
-		$id = $request->input('media_id');
-		$user = $request->user();
-		$story = Story::whereProfileId($user->profile_id)
-			->findOrFail($id);
+                'nodes' => [],
+            ],
+            'nodes' => $nodes,
+        ];
 
-		$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();
+        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;
+        }
 
-		StoryService::delLatest($story->profile_id);
-		StoryFanout::dispatch($story)->onQueue('story');
-		StoryService::addRotateQueue($story->id);
+        return response()->json($res, 200, [], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+    }
 
-		return [
-			'code' => 200,
-			'msg'  => 'Successfully published',
-		];
-	}
+    public function add(Request $request)
+    {
+        abort_if(! (bool) config_cache('instance.stories.enabled') || ! $request->user(), 404);
 
-	public function delete(Request $request, $id)
-	{
-		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();
+        $user = $request->user();
 
-		$story = Story::whereProfileId($user->profile_id)
-			->findOrFail($id);
-		$story->active = false;
-		$story->save();
+        $count = Story::whereProfileId($user->profile_id)
+            ->whereActive(true)
+            ->where('expires_at', '>', now())
+            ->count();
 
-		StoryDelete::dispatch($story)->onQueue('story');
+        if ($count >= Story::MAX_PER_DAY) {
+            abort(418, 'You have reached your limit for new Stories today.');
+        }
 
-		return [
-			'code' => 200,
-			'msg'  => 'Successfully deleted'
-		];
-	}
+        $photo = $request->file('file');
+        $path = $this->storeMedia($photo, $user);
 
-	public function viewed(Request $request)
-	{
-		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
+        $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();
 
-		$this->validate($request, [
-			'id'	=> 'required|min:1',
-		]);
-		$id = $request->input('id');
+        $url = $story->path;
 
-		$authed = $request->user()->profile;
+        $res = [
+            'code' => 200,
+            'msg' => 'Successfully added',
+            'media_id' => (string) $story->id,
+            'media_url' => url(Storage::url($url)).'?v='.time(),
+            'media_type' => $story->type,
+        ];
 
-		$story = Story::with('profile')
-			->findOrFail($id);
-		$exp = $story->expires_at;
+        return $res;
+    }
 
-		$profile = $story->profile;
+    public function publish(Request $request)
+    {
+        abort_if(! (bool) config_cache('instance.stories.enabled') || ! $request->user(), 404);
 
-		if($story->profile_id == $authed->id) {
-			return [];
-		}
+        $this->validate($request, [
+            'media_id' => 'required',
+            'duration' => 'required|integer|min:0|max:30',
+            'can_reply' => 'required|boolean',
+            'can_react' => 'required|boolean',
+        ]);
 
-		$publicOnly = (bool) $profile->followedBy($authed);
-		abort_if(!$publicOnly, 403);
+        $id = $request->input('media_id');
+        $user = $request->user();
+        $story = Story::whereProfileId($user->profile_id)
+            ->findOrFail($id);
 
-		$v = StoryView::firstOrCreate([
-			'story_id' => $id,
-			'profile_id' => $authed->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();
 
-		if($v->wasRecentlyCreated) {
-			Story::findOrFail($story->id)->increment('view_count');
+        StoryService::delLatest($story->profile_id);
+        StoryFanout::dispatch($story)->onQueue('story');
+        StoryService::addRotateQueue($story->id);
 
-			if($story->local == false) {
-				StoryViewDeliver::dispatch($story, $authed)->onQueue('story');
-			}
-		}
+        return [
+            'code' => 200,
+            'msg' => 'Successfully published',
+        ];
+    }
 
-		Cache::forget('stories:recent:by_id:' . $authed->id);
-		StoryService::addSeen($authed->id, $story->id);
-		return ['code' => 200];
-	}
+    public function delete(Request $request, $id)
+    {
+        abort_if(! (bool) config_cache('instance.stories.enabled') || ! $request->user(), 404);
 
-	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');
+        $user = $request->user();
 
-		$story = Story::findOrFail($request->input('sid'));
+        $story = Story::whereProfileId($user->profile_id)
+            ->findOrFail($id);
+        $story->active = false;
+        $story->save();
 
-		abort_if(!$story->can_reply, 422);
+        StoryDelete::dispatch($story)->onQueue('story');
 
-		$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();
+        return [
+            'code' => 200,
+            'msg' => 'Successfully deleted',
+        ];
+    }
 
-		$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();
+    public function viewed(Request $request)
+    {
+        abort_if(! (bool) config_cache('instance.stories.enabled') || ! $request->user(), 404);
 
-		Conversation::updateOrInsert(
-			[
-				'to_id' => $story->profile_id,
-				'from_id' => $pid
-			],
-			[
-				'type' => 'story:comment',
-				'status_id' => $status->id,
-				'dm_id' => $dm->id,
-				'is_hidden' => false
-			]
-		);
+        $this->validate($request, [
+            'id' => 'required|min:1',
+        ]);
+        $id = $request->input('id');
 
-		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');
-		}
+        $authed = $request->user()->profile;
 
-		return [
-			'code' => 200,
-			'msg'  => 'Sent!'
-		];
-	}
+        $story = Story::with('profile')
+            ->findOrFail($id);
+        $exp = $story->expires_at;
 
-	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;
-		}
+        $profile = $story->profile;
 
-		$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;
-	}
+        if ($story->profile_id == $authed->id) {
+            return [];
+        }
 
-	public function viewers(Request $request)
-	{
-		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
+        $publicOnly = (bool) $profile->followedBy($authed);
+        abort_if(! $publicOnly, 403);
 
-		$this->validate($request, [
-			'sid' => 'required|string|min:1|max:50'
-		]);
+        $v = StoryView::firstOrCreate([
+            'story_id' => $id,
+            'profile_id' => $authed->id,
+        ]);
 
-		$pid = $request->user()->profile_id;
-		$sid = $request->input('sid');
+        if ($v->wasRecentlyCreated) {
+            Story::findOrFail($story->id)->increment('view_count');
 
-		$story = Story::whereProfileId($pid)
-			->whereActive(true)
-			->findOrFail($sid);
+            if ($story->local == false) {
+                StoryViewDeliver::dispatch($story, $authed)->onQueue('story');
+            }
+        }
 
-		$viewers = StoryView::whereStoryId($story->id)
+        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->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);
+            ->cursorPaginate(10);
 
-		return StoryViewResource::collection($viewers);
-	}
+        return StoryViewResource::collection($viewers);
+    }
 }
diff --git a/app/Http/Controllers/StoryComposeController.php b/app/Http/Controllers/StoryComposeController.php
index 8f9358b74..e02e2d219 100644
--- a/app/Http/Controllers/StoryComposeController.php
+++ b/app/Http/Controllers/StoryComposeController.php
@@ -2,333 +2,338 @@
 
 namespace App\Http\Controllers;
 
-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 App\Services\FollowerService;
-use App\Services\MediaPathService;
-use FFMpeg;
-use FFMpeg\Coordinate\Dimension;
-use FFMpeg\Format\Video\X264;
+use App\Jobs\StoryPipeline\StoryDelete;
+use App\Jobs\StoryPipeline\StoryFanout;
 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;
+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 Image as Intervention;
+use Storage;
 
 class StoryComposeController extends Controller
 {
     public function apiV1Add(Request $request)
-	{
-		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
+    {
+        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'),
-				];
-			},
-		]);
-
-		$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',
+        $this->validate($request, [
+            'file' => function () {
+                return [
+                    'required',
+                    'mimetypes:image/jpeg,image/png,video/mp4',
+                    'max:'.config_cache('pixelfed.max_photo_size'),
+                ];
+            },
         ]);
 
+        $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');
@@ -344,28 +349,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;
@@ -376,149 +381,149 @@ class StoryComposeController extends Controller
         $report->save();
 
         return [200];
-	}
+    }
 
-	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');
+    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'));
 
-		$story = Story::findOrFail($request->input('sid'));
+        abort_if(! $story->can_react, 422);
+        abort_if(StoryService::reactCounter($story->id, $pid) >= 5, 422, 'You have already reacted to this story');
 
-		abort_if(!$story->can_react, 422);
-		abort_if(StoryService::reactCounter($story->id, $pid) >= 5, 422, 'You have already reacted to this story');
+        $status = new Status;
+        $status->profile_id = $pid;
+        $status->type = 'story:reaction';
+        $status->caption = $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();
 
-		$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();
+        $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();
 
-		$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();
+        Conversation::updateOrInsert(
+            [
+                'to_id' => $story->profile_id,
+                'from_id' => $pid,
+            ],
+            [
+                'type' => 'story:react',
+                'status_id' => $status->id,
+                'dm_id' => $dm->id,
+                'is_hidden' => false,
+            ]
+        );
 
-		Conversation::updateOrInsert(
-			[
-				'to_id' => $story->profile_id,
-				'from_id' => $pid
-			],
-			[
-				'type' => 'story:react',
-				'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:react';
+            $n->save();
+        } else {
+            StoryReactionDeliver::dispatch($story, $status)->onQueue('story');
+        }
 
-		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');
-		}
+        StoryService::reactIncrement($story->id, $pid);
 
-		StoryService::reactIncrement($story->id, $pid);
+        return 200;
+    }
 
-		return 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');
+        $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 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');
+        abort_if(! $story->can_reply, 422);
 
-		$story = Story::findOrFail($request->input('sid'));
+        $status = new Status;
+        $status->type = 'story:reply';
+        $status->profile_id = $pid;
+        $status->caption = $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();
 
-		abort_if(!$story->can_reply, 422);
+        $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();
 
-		$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();
+        Conversation::updateOrInsert(
+            [
+                'to_id' => $story->profile_id,
+                'from_id' => $pid,
+            ],
+            [
+                'type' => 'story:comment',
+                '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: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();
+        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');
+        }
 
-		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;
-	}
+        return 200;
+    }
 }
diff --git a/app/Http/Controllers/StoryController.php b/app/Http/Controllers/StoryController.php
index 5a9fb5530..fede7c6d9 100644
--- a/app/Http/Controllers/StoryController.php
+++ b/app/Http/Controllers/StoryController.php
@@ -28,288 +28,308 @@ 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(!config_cache('instance.stories.enabled') || !$request->user(), 404);
-		$pid = $request->user()->profile_id;
+    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;
 
-		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(!config_cache('instance.stories.enabled') || !$request->user(), 404);
+    public function profile(Request $request, $id)
+    {
+        abort_if(!(bool) config_cache('instance.stories.enabled') || !$request->user(), 404);
 
-		$authed = $request->user()->profile_id;
-		$profile = Profile::findOrFail($id);
+        $user = $request->user();
+        if($user->has_roles && !UserRoleService::can('can-use-stories', $user->id)) {
+            return [];
+        }
+        $authed = $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(!config_cache('instance.stories.enabled') || !$request->user(), 404);
+    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');
+        $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;
 
-		$authed = $request->user()->profile;
+        $story = Story::with('profile')
+            ->findOrFail($id);
+        $exp = $story->expires_at;
 
-		$story = Story::with('profile')
-			->findOrFail($id);
-		$exp = $story->expires_at;
+        $profile = $story->profile;
 
-		$profile = $story->profile;
+        if($story->profile_id == $authed->id) {
+            return [];
+        }
 
-		if($story->profile_id == $authed->id) {
-			return [];
-		}
+        $publicOnly = (bool) $profile->followedBy($authed);
+        abort_if(!$publicOnly, 403);
 
-		$publicOnly = (bool) $profile->followedBy($authed);
-		abort_if(!$publicOnly, 403);
+        $v = StoryView::firstOrCreate([
+            'story_id' => $id,
+            'profile_id' => $authed->id
+        ]);
 
-		$v = StoryView::firstOrCreate([
-			'story_id' => $id,
-			'profile_id' => $authed->id
-		]);
+        if($v->wasRecentlyCreated) {
+            Story::findOrFail($story->id)->increment('view_count');
 
-		if($v->wasRecentlyCreated) {
-			Story::findOrFail($story->id)->increment('view_count');
+            if($story->local == false) {
+                StoryViewDeliver::dispatch($story, $authed)->onQueue('story');
+            }
+        }
 
-			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];
+    }
 
-		Cache::forget('stories:recent:by_id:' . $authed->id);
-		StoryService::addSeen($authed->id, $story->id);
-		return ['code' => 200];
-	}
+    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());
+    }
 
-	public function exists(Request $request, $id)
-	{
-		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
+    public function iRedirect(Request $request)
+    {
+        abort_if(!(bool) config_cache('instance.stories.enabled') || !$request->user(), 404);
 
-		return response()->json(Story::whereProfileId($id)
-		->whereActive(true)
-		->exists());
-	}
+        $user = $request->user();
+        abort_if(!$user, 404);
+        $username = $user->username;
+        return redirect("/stories/{$username}");
+    }
 
-	public function iRedirect(Request $request)
-	{
-		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
+    public function viewers(Request $request)
+    {
+        abort_if(!(bool) config_cache('instance.stories.enabled') || !$request->user(), 404);
 
-		$user = $request->user();
-		abort_if(!$user, 404);
-		$username = $user->username;
-		return redirect("/stories/{$username}");
-	}
+        $this->validate($request, [
+            'sid' => 'required|string'
+        ]);
 
-	public function viewers(Request $request)
-	{
-		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 response()->json([]);
+        }
 
-		$this->validate($request, [
-			'sid' => 'required|string'
-		]);
+        $pid = $request->user()->profile_id;
+        $sid = $request->input('sid');
 
-		$pid = $request->user()->profile_id;
-		$sid = $request->input('sid');
+        $story = Story::whereProfileId($pid)
+            ->whereActive(true)
+            ->findOrFail($sid);
 
-		$story = Story::whereProfileId($pid)
-			->whereActive(true)
-			->findOrFail($sid);
+        $viewers = StoryView::whereStoryId($story->id)
+            ->latest()
+            ->simplePaginate(10)
+            ->map(function($view) {
+                return AccountService::get($view->profile_id);
+            })
+            ->values();
 
-		$viewers = StoryView::whereStoryId($story->id)
-			->latest()
-			->simplePaginate(10)
-			->map(function($view) {
-				return AccountService::get($view->profile_id);
-			})
-			->values();
+        return response()->json($viewers, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
+    }
 
-		return response()->json($viewers, 200, [], JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES);
-	}
+    public function remoteStory(Request $request, $id)
+    {
+        abort_if(!(bool) config_cache('instance.stories.enabled') || !$request->user(), 404);
 
-	public function remoteStory(Request $request, $id)
-	{
-		abort_if(!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'));
+    }
 
-		$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 pollResults(Request $request)
+    {
+        abort_if(!(bool) config_cache('instance.stories.enabled') || !$request->user(), 404);
 
-	public function pollResults(Request $request)
-	{
-		abort_if(!config_cache('instance.stories.enabled') || !$request->user(), 404);
+        $this->validate($request, [
+            'sid' => 'required|string'
+        ]);
 
-		$this->validate($request, [
-			'sid' => 'required|string'
-		]);
+        $pid = $request->user()->profile_id;
+        $sid = $request->input('sid');
 
-		$pid = $request->user()->profile_id;
-		$sid = $request->input('sid');
+        $story = Story::whereProfileId($pid)
+            ->whereActive(true)
+            ->findOrFail($sid);
 
-		$story = Story::whereProfileId($pid)
-			->whereActive(true)
-			->findOrFail($sid);
+        return PollService::storyResults($sid);
+    }
 
-		return PollService::storyResults($sid);
-	}
+    public function getActivityObject(Request $request, $username, $id)
+    {
+        abort_if(!(bool) config_cache('instance.stories.enabled'), 404);
 
-	public function getActivityObject(Request $request, $username, $id)
-	{
-		abort_if(!config_cache('instance.stories.enabled'), 404);
+        if(!$request->wantsJson()) {
+            return redirect('/stories/' . $username);
+        }
 
-		if(!$request->wantsJson()) {
-			return redirect('/stories/' . $username);
-		}
+        abort_if(!$request->hasHeader('Authorization'), 404);
 
-		abort_if(!$request->hasHeader('Authorization'), 404);
+        $profile = Profile::whereUsername($username)->whereNull('domain')->firstOrFail();
+        $story = Story::whereActive(true)->whereProfileId($profile->id)->findOrFail($id);
 
-		$profile = Profile::whereUsername($username)->whereNull('domain')->firstOrFail();
-		$story = Story::whereActive(true)->whereProfileId($profile->id)->findOrFail($id);
+        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);
 
-		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);
+        $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);
+    }
 
-		$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');
-	}
+    public function showSystemStory()
+    {
+        // return view('stories.system');
+    }
 }
diff --git a/app/Http/Controllers/UserEmailForgotController.php b/app/Http/Controllers/UserEmailForgotController.php
new file mode 100644
index 000000000..3889b9802
--- /dev/null
+++ b/app/Http/Controllers/UserEmailForgotController.php
@@ -0,0 +1,131 @@
+<?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();
+        });
+    }
+}
diff --git a/app/Http/Controllers/UserRolesController.php b/app/Http/Controllers/UserRolesController.php
new file mode 100644
index 000000000..65a71d19d
--- /dev/null
+++ b/app/Http/Controllers/UserRolesController.php
@@ -0,0 +1,23 @@
+<?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);
+    }
+}
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 5cc99014b..4ec8832e8 100644
--- a/app/Http/Kernel.php
+++ b/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,
     ];
 
     /**
@@ -54,6 +54,7 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $routeMiddleware = [
+        'api.admin'     => \App\Http\Middleware\Api\Admin::class,
         'admin'         => \App\Http\Middleware\Admin::class,
         'auth'          => \Illuminate\Auth\Middleware\Authenticate::class,
         'auth.basic'    => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
@@ -68,6 +69,8 @@ class Kernel extends HttpKernel
         'twofactor'     => \App\Http\Middleware\TwoFactorAuth::class,
         'validemail'    => \App\Http\Middleware\EmailVerificationCheck::class,
         'interstitial'  => \App\Http\Middleware\AccountInterstitial::class,
+        'scopes'        => \Laravel\Passport\Http\Middleware\CheckScopes::class,
+        'scope'         => \Laravel\Passport\Http\Middleware\CheckForAnyScope::class,
         // 'restricted'    => \App\Http\Middleware\RestrictedAccess::class,
     ];
 }
diff --git a/app/Http/Middleware/Api/Admin.php b/app/Http/Middleware/Api/Admin.php
new file mode 100644
index 000000000..65d24758d
--- /dev/null
+++ b/app/Http/Middleware/Api/Admin.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Middleware\Api;
+
+use Auth;
+use Closure;
+
+class Admin
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure                 $next
+     *
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        if (Auth::check() == false || Auth::user()->is_admin == false) {
+          return abort(403, "You must be an administrator to do that");
+        }
+
+        return $next($request);
+    }
+}
diff --git a/app/Http/Requests/ProfileMigrationStoreRequest.php b/app/Http/Requests/ProfileMigrationStoreRequest.php
new file mode 100644
index 000000000..9b071511a
--- /dev/null
+++ b/app/Http/Requests/ProfileMigrationStoreRequest.php
@@ -0,0 +1,80 @@
+<?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';
+    }
+}
diff --git a/app/Http/Requests/Status/StoreStatusEditRequest.php b/app/Http/Requests/Status/StoreStatusEditRequest.php
index aa9364ca6..e8e2d22f5 100644
--- a/app/Http/Requests/Status/StoreStatusEditRequest.php
+++ b/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,24 +14,25 @@ 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;
     }
 
@@ -47,18 +48,18 @@ class StoreStatusEditRequest extends FormRequest
             'spoiler_text' => 'nullable|string|max:140',
             'sensitive' => 'sometimes|boolean',
             'media_ids' => [
-            	'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);
-				},
+                '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);
+                },
             ],
             'location' => 'sometimes|nullable',
             'location.id' => 'sometimes|integer|min:1|max:128769',
diff --git a/app/Http/Resources/Admin/AdminModeratedProfileResource.php b/app/Http/Resources/Admin/AdminModeratedProfileResource.php
new file mode 100644
index 000000000..d0ce5a617
--- /dev/null
+++ b/app/Http/Resources/Admin/AdminModeratedProfileResource.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Http\Resources\Admin;
+
+use App\Profile;
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class AdminModeratedProfileResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        $profileObj = [];
+        $profile = Profile::withTrashed()->find($this->profile_id);
+        if ($profile) {
+            $profileObj = [
+                'name' => $profile->name,
+                'username' => $profile->username,
+                'username_str' => explode('@', $profile->username)[1],
+                'remote_url' => $profile->remote_url,
+            ];
+        }
+
+        return [
+            'id' => $this->id,
+            'domain' => $this->domain,
+            'profile' => $profileObj,
+            'profile_id' => $this->profile_id,
+            'profile_url' => $this->profile_url,
+            'note' => $this->note,
+            'is_banned' => (bool) $this->is_banned,
+            'is_nsfw' => (bool) $this->is_nsfw,
+            'is_unlisted' => (bool) $this->is_unlisted,
+            'is_noautolink' => (bool) $this->is_noautolink,
+            'is_nodms' => (bool) $this->is_nodms,
+            'is_notrending' => (bool) $this->is_notrending,
+            'created_at' => now()->parse($this->created_at)->format('c'),
+        ];
+    }
+}
diff --git a/app/Http/Resources/AdminRemoteReport.php b/app/Http/Resources/AdminRemoteReport.php
new file mode 100644
index 000000000..a726e25cc
--- /dev/null
+++ b/app/Http/Resources/AdminRemoteReport.php
@@ -0,0 +1,49 @@
+<?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;
+    }
+}
diff --git a/app/Http/Resources/AdminReport.php b/app/Http/Resources/AdminReport.php
index c541e58cd..9b9681bcc 100644
--- a/app/Http/Resources/AdminReport.php
+++ b/app/Http/Resources/AdminReport.php
@@ -2,10 +2,11 @@
 
 namespace App\Http\Resources;
 
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
 use App\Services\AccountService;
 use App\Services\StatusService;
+use App\Story;
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
 
 class AdminReport extends JsonResource
 {
@@ -16,22 +17,29 @@ class AdminReport extends JsonResource
      */
     public function toArray(Request $request): array
     {
-    	$res = [
-    		'id' => $this->id,
-    		'reporter' => AccountService::get($this->profile_id, true),
-    		'type' => $this->type,
-    		'object_id' => (string) $this->object_id,
-    		'object_type' => $this->object_type,
-    		'reported' => AccountService::get($this->reported_profile_id, true),
-    		'status' => null,
-    		'reporter_message' => $this->message,
-    		'admin_seen_at' => $this->admin_seen,
-    		'created_at' => $this->created_at,
-    	];
+        $res = [
+            'id' => $this->id,
+            'reporter' => AccountService::get($this->profile_id, true),
+            'type' => $this->type,
+            'object_id' => (string) $this->object_id,
+            'object_type' => $this->object_type,
+            'reported' => AccountService::get($this->reported_profile_id, true),
+            'status' => null,
+            'reporter_message' => $this->message,
+            'admin_seen_at' => $this->admin_seen,
+            'created_at' => $this->created_at,
+        ];
 
-    	if($this->object_id && $this->object_type === 'App\Status') {
-    		$res['status'] = StatusService::get($this->object_id, false);
-    	}
+        if ($this->object_id && $this->object_type === 'App\Status') {
+            $res['status'] = StatusService::get($this->object_id, false);
+        }
+
+        if ($this->object_id && $this->object_type === 'App\Story') {
+            $story = Story::find($this->object_id);
+            if ($story) {
+                $res['story'] = $story->toAdminEntity();
+            }
+        }
 
         return $res;
     }
diff --git a/app/Http/Resources/AdminUser.php b/app/Http/Resources/AdminUser.php
index 75bac9f62..390c5c00e 100644
--- a/app/Http/Resources/AdminUser.php
+++ b/app/Http/Resources/AdminUser.php
@@ -2,8 +2,8 @@
 
 namespace App\Http\Resources;
 
-use Illuminate\Http\Resources\Json\JsonResource;
 use App\Services\AccountService;
+use Illuminate\Http\Resources\Json\JsonResource;
 
 class AdminUser extends JsonResource
 {
@@ -18,8 +18,8 @@ class AdminUser extends JsonResource
         $account = AccountService::get($this->profile_id, true);
 
         $res = [
-            'id' => $this->id,
-            'profile_id' => $this->profile_id,
+            'id' => (string) $this->id,
+            'profile_id' => (string) $this->profile_id,
             'name' => $this->name,
             'username' => $this->username,
             'is_admin' => (bool) $this->is_admin,
@@ -28,17 +28,18 @@ class AdminUser extends JsonResource
             'two_factor_enabled' => (bool) $this->{'2fa_enabled'},
             'register_source' => $this->register_source,
             'app_register_ip' => $this->app_register_ip,
+            'has_interstitial' => (bool) $this->has_interstitial,
             'last_active_at' => $this->last_active_at,
             'created_at' => $this->created_at,
         ];
 
-        if($account) {
+        if ($account) {
             $res['avatar'] = $account['avatar'];
             $res['bio'] = $account['note_text'];
-            $res['statuses_count'] = $account['statuses_count'];
-            $res['following_count'] = $account['following_count'];
-            $res['followers_count'] = $account['followers_count'];
-            $res['is_private'] = $account['locked'];
+            $res['statuses_count'] = (int) $account['statuses_count'];
+            $res['following_count'] = (int) $account['following_count'];
+            $res['followers_count'] = (int) $account['followers_count'];
+            $res['is_private'] = (bool) $account['locked'];
         }
 
         return $res;
diff --git a/app/Http/Resources/MastoApi/Admin/DomainBlockResource.php b/app/Http/Resources/MastoApi/Admin/DomainBlockResource.php
new file mode 100644
index 000000000..eeb3ddc09
--- /dev/null
+++ b/app/Http/Resources/MastoApi/Admin/DomainBlockResource.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Http\Resources\MastoApi\Admin;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class DomainBlockResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        $severity = 'noop';
+        if ($this->banned) {
+            $severity = 'suspend';
+        } else if ($this->unlisted) {
+            $severity = 'silence';
+        }
+
+        return [
+            'id' => $this->id,
+            'domain' => $this->domain,
+            // This property is coming in Mastodon 4.3, although it'll only be
+            // useful if Pixelfed supports obfuscating domains:
+            'digest' => hash('sha256', $this->domain),
+            'severity' => $severity,
+            // Using the updated_at value as this is going to be the closest to
+            // when the domain was banned
+            'created_at' => $this->updated_at,
+            // We don't have data for these fields
+            'reject_media' => false,
+            'reject_reports' => false,
+            'private_comment' => $this->notes ? join('; ', $this->notes) : null,
+            'public_comment' => $this->limit_reason,
+            'obfuscate' => false
+        ];
+    }
+}
diff --git a/app/Http/Resources/StatusStateless.php b/app/Http/Resources/StatusStateless.php
index df451cc53..0a7bbe8d4 100644
--- a/app/Http/Resources/StatusStateless.php
+++ b/app/Http/Resources/StatusStateless.php
@@ -2,18 +2,17 @@
 
 namespace App\Http\Resources;
 
-use Illuminate\Http\Resources\Json\JsonResource;
-use Cache;
+use App\Models\CustomEmoji;
 use App\Services\AccountService;
 use App\Services\HashidService;
 use App\Services\LikeService;
 use App\Services\MediaService;
 use App\Services\MediaTagService;
-use App\Services\StatusHashtagService;
-use App\Services\StatusLabelService;
-use App\Services\StatusMentionService;
 use App\Services\PollService;
-use App\Models\CustomEmoji;
+use App\Services\StatusHashtagService;
+use App\Services\StatusMentionService;
+use App\Util\Lexer\Autolink;
+use Illuminate\Http\Resources\Json\JsonResource;
 
 class StatusStateless extends JsonResource
 {
@@ -28,49 +27,50 @@ class StatusStateless extends JsonResource
         $status = $this;
         $taggedPeople = MediaTagService::get($status->id);
         $poll = $status->type === 'poll' ? PollService::get($status->id) : null;
+        $autoLink = $status->caption ? Autolink::create()->autolink($status->caption) : null;
 
         return [
-            '_v'                        => 1,
-            'id'                        => (string) $status->id,
+            '_v' => 1,
+            'id' => (string) $status->id,
             //'gid'                     => $status->group_id ? (string) $status->group_id : null,
-            'shortcode'                 => HashidService::encode($status->id),
-            'uri'                       => $status->url(),
-            'url'                       => $status->url(),
-            'in_reply_to_id'            => $status->in_reply_to_id ? (string) $status->in_reply_to_id : null,
-            'in_reply_to_account_id'    => $status->in_reply_to_profile_id ? (string) $status->in_reply_to_profile_id : null,
-            'reblog'                    => null,
-            'content'                   => $status->rendered ?? $status->caption,
-            'content_text'              => $status->caption,
-            'created_at'                => str_replace('+00:00', 'Z', $status->created_at->format(DATE_RFC3339_EXTENDED)),
-            'emojis'                    => CustomEmoji::scan($status->caption),
-            'reblogs_count'             => $status->reblogs_count ?? 0,
-            'favourites_count'          => $status->likes_count ?? 0,
-            'reblogged'                 => null,
-            'favourited'                => null,
-            'muted'                     => null,
-            'sensitive'                 => (bool) $status->is_nsfw,
-            'spoiler_text'              => $status->cw_summary ?? '',
-            'visibility'                => $status->scope ?? $status->visibility,
-            'application'               => [
-                'name'      => 'web',
-                'website'   => null
-             ],
-            'language'                  => null,
-            'mentions'                  => StatusMentionService::get($status->id),
-            'pf_type'                   => $status->type ?? $status->setType(),
-            'reply_count'               => (int) $status->reply_count,
-            'comments_disabled'         => (bool) $status->comments_disabled,
-            'thread'                    => false,
-            'replies'                   => [],
-            'parent'                    => [],
-            'place'                     => $status->place,
-            'local'                     => (bool) $status->local,
-            'taggedPeople'              => $taggedPeople,
-            'liked_by'                  => LikeService::likedBy($status),
-            'media_attachments'         => MediaService::get($status->id),
-            'account'                   => AccountService::get($status->profile_id, true),
-            'tags'                      => StatusHashtagService::statusTags($status->id),
-            'poll'                      => $poll
+            'shortcode' => HashidService::encode($status->id),
+            'uri' => $status->url(),
+            'url' => $status->url(),
+            'in_reply_to_id' => $status->in_reply_to_id ? (string) $status->in_reply_to_id : null,
+            'in_reply_to_account_id' => $status->in_reply_to_profile_id ? (string) $status->in_reply_to_profile_id : null,
+            'reblog' => null,
+            'content' => $autoLink,
+            'content_text' => $status->caption,
+            'created_at' => str_replace('+00:00', 'Z', $status->created_at->format(DATE_RFC3339_EXTENDED)),
+            'emojis' => CustomEmoji::scan($status->caption),
+            'reblogs_count' => $status->reblogs_count ?? 0,
+            'favourites_count' => $status->likes_count ?? 0,
+            'reblogged' => null,
+            'favourited' => null,
+            'muted' => null,
+            'sensitive' => (bool) $status->is_nsfw,
+            'spoiler_text' => $status->cw_summary ?? '',
+            'visibility' => $status->scope ?? $status->visibility,
+            'application' => [
+                'name' => 'web',
+                'website' => null,
+            ],
+            'language' => null,
+            'mentions' => StatusMentionService::get($status->id),
+            'pf_type' => $status->type ?? $status->setType(),
+            'reply_count' => (int) $status->reply_count,
+            'comments_disabled' => (bool) $status->comments_disabled,
+            'thread' => false,
+            'replies' => [],
+            'parent' => [],
+            'place' => $status->place,
+            'local' => (bool) $status->local,
+            'taggedPeople' => $taggedPeople,
+            'liked_by' => LikeService::likedBy($status),
+            'media_attachments' => MediaService::get($status->id),
+            'account' => AccountService::get($status->profile_id, true),
+            'tags' => StatusHashtagService::statusTags($status->id),
+            'poll' => $poll,
         ];
     }
 }
diff --git a/app/Instance.php b/app/Instance.php
index 6a7b8e6f2..a93d9e95e 100644
--- a/app/Instance.php
+++ b/app/Instance.php
@@ -6,63 +6,84 @@ use Illuminate\Database\Eloquent\Model;
 
 class Instance extends Model
 {
-	protected $fillable = ['domain', 'banned', 'auto_cw', 'unlisted', 'notes'];
+    protected $casts = [
+        'last_crawled_at' => 'datetime',
+        'actors_last_synced_at' => 'datetime',
+        'notes' => 'array',
+        'nodeinfo_last_fetched' => 'datetime',
+        'delivery_next_after' => 'datetime',
+    ];
 
-	public function profiles()
-	{
-		return $this->hasMany(Profile::class, 'domain', 'domain');
-	}
+    protected $fillable = [
+        'domain',
+        'banned',
+        'auto_cw',
+        'unlisted',
+        'notes'
+    ];
 
-	public function statuses()
-	{
-		return $this->hasManyThrough(
-			Status::class,
-			Profile::class,
-			'domain',
-			'profile_id',
-			'domain',
-			'id'
-		);
-	}
+    // To get all moderated instances, we need to search where (banned OR unlisted)
+    public function scopeModerated($query): void {
+        $query->where(function ($query) {
+            $query->where('banned', true)->orWhere('unlisted', true);
+        });
+    }
 
-	public function reported()
-	{
-		return $this->hasManyThrough(
-			Report::class,
-			Profile::class,
-			'domain',
-			'reported_profile_id',
-			'domain',
-			'id'
-		);
-	}
+    public function profiles()
+    {
+        return $this->hasMany(Profile::class, 'domain', 'domain');
+    }
 
-	public function reports()
-	{
-		return $this->hasManyThrough(
-			Report::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 media()
-	{
-		return $this->hasManyThrough(
-			Media::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 getUrl()
-	{
-		return url("/i/admin/instances/show/{$this->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 getUrl()
+    {
+        return url("/i/admin/instances/show/{$this->id}");
+    }
 }
diff --git a/app/Jobs/AvatarPipeline/AvatarOptimize.php b/app/Jobs/AvatarPipeline/AvatarOptimize.php
index 4464dff4e..8b50d8330 100644
--- a/app/Jobs/AvatarPipeline/AvatarOptimize.php
+++ b/app/Jobs/AvatarPipeline/AvatarOptimize.php
@@ -2,9 +2,9 @@
 
 namespace App\Jobs\AvatarPipeline;
 
-use Cache;
 use App\Avatar;
 use App\Profile;
+use Cache;
 use Carbon\Carbon;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -17,88 +17,88 @@ use Storage;
 
 class AvatarOptimize implements ShouldQueue
 {
-	use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-	protected $profile;
-	protected $current;
+    protected $profile;
 
-	/**
-	 * Delete the job if its models no longer exist.
-	 *
-	 * @var bool
-	 */
-	public $deleteWhenMissingModels = true;
+    protected $current;
 
-	/**
-	 * Create a new job instance.
-	 *
-	 * @return void
-	 */
-	public function __construct(Profile $profile, $current)
-	{
-		$this->profile = $profile;
-		$this->current = $current;
-	}
+    /**
+     * Delete the job if its models no longer exist.
+     *
+     * @var bool
+     */
+    public $deleteWhenMissingModels = true;
 
-	/**
-	 * Execute the job.
-	 *
-	 * @return void
-	 */
-	public function handle()
-	{
-		$avatar = $this->profile->avatar;
-		$file = storage_path("app/$avatar->media_path");
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct(Profile $profile, $current)
+    {
+        $this->profile = $profile;
+        $this->current = $current;
+    }
 
-		try {
-			$img = Intervention::make($file)->orientate();
-			$img->fit(200, 200, function ($constraint) {
-				$constraint->upsize();
-			});
-			$quality = config_cache('pixelfed.image_quality');
-			$img->save($file, $quality);
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $avatar = $this->profile->avatar;
+        $file = storage_path("app/$avatar->media_path");
 
-			$avatar = Avatar::whereProfileId($this->profile->id)->firstOrFail();
-			$avatar->change_count = ++$avatar->change_count;
-			$avatar->last_processed_at = Carbon::now();
-			$avatar->save();
-			Cache::forget('avatar:' . $avatar->profile_id);
-			$this->deleteOldAvatar($avatar->media_path, $this->current);
+        try {
+            $img = Intervention::make($file)->orientate();
+            $img->fit(200, 200, function ($constraint) {
+                $constraint->upsize();
+            });
+            $quality = config_cache('pixelfed.image_quality');
+            $img->save($file, $quality);
 
-			if(config_cache('pixelfed.cloud_storage') && config('instance.avatar.local_to_cloud')) {
-				$this->uploadToCloud($avatar);
-			} else {
-				$avatar->cdn_url = null;
-				$avatar->save();
-			}
-		} catch (Exception $e) {
-		}
-	}
+            $avatar = Avatar::whereProfileId($this->profile->id)->firstOrFail();
+            $avatar->change_count = ++$avatar->change_count;
+            $avatar->last_processed_at = Carbon::now();
+            $avatar->save();
+            Cache::forget('avatar:'.$avatar->profile_id);
+            $this->deleteOldAvatar($avatar->media_path, $this->current);
 
-	protected function deleteOldAvatar($new, $current)
-	{
-		if ( storage_path('app/'.$new) == $current ||
-			 Str::endsWith($current, 'avatars/default.png') ||
-			 Str::endsWith($current, 'avatars/default.jpg'))
-		{
-			return;
-		}
-		if (is_file($current)) {
-			@unlink($current);
-		}
-	}
+            if ((bool) config_cache('pixelfed.cloud_storage') && (bool) config_cache('instance.avatar.local_to_cloud')) {
+                $this->uploadToCloud($avatar);
+            } else {
+                $avatar->cdn_url = null;
+                $avatar->save();
+            }
+        } catch (Exception $e) {
+        }
+    }
 
-	protected function uploadToCloud($avatar)
-	{
-		$base = 'cache/avatars/' . $avatar->profile_id;
-		$disk = Storage::disk(config('filesystems.cloud'));
-		$disk->deleteDirectory($base);
-		$path = $base . '/' . 'avatar_' . strtolower(Str::random(random_int(3,6))) . $avatar->change_count . '.' . pathinfo($avatar->media_path, PATHINFO_EXTENSION);
-		$url = $disk->put($path, Storage::get($avatar->media_path));
-		$avatar->media_path = $path;
-		$avatar->cdn_url = $disk->url($path);
-		$avatar->save();
-		Storage::delete($avatar->media_path);
-		Cache::forget('avatar:' . $avatar->profile_id);
-	}
+    protected function deleteOldAvatar($new, $current)
+    {
+        if (storage_path('app/'.$new) == $current ||
+             Str::endsWith($current, 'avatars/default.png') ||
+             Str::endsWith($current, 'avatars/default.jpg')) {
+            return;
+        }
+        if (is_file($current)) {
+            @unlink($current);
+        }
+    }
+
+    protected function uploadToCloud($avatar)
+    {
+        $base = 'cache/avatars/'.$avatar->profile_id;
+        $disk = Storage::disk(config('filesystems.cloud'));
+        $disk->deleteDirectory($base);
+        $path = $base.'/'.'avatar_'.strtolower(Str::random(random_int(3, 6))).$avatar->change_count.'.'.pathinfo($avatar->media_path, PATHINFO_EXTENSION);
+        $url = $disk->put($path, Storage::get($avatar->media_path));
+        $avatar->media_path = $path;
+        $avatar->cdn_url = $disk->url($path);
+        $avatar->save();
+        Storage::delete($avatar->media_path);
+        Cache::forget('avatar:'.$avatar->profile_id);
+    }
 }
diff --git a/app/Jobs/AvatarPipeline/RemoteAvatarFetch.php b/app/Jobs/AvatarPipeline/RemoteAvatarFetch.php
index 4e4a1b2ec..c2a2b2a16 100644
--- a/app/Jobs/AvatarPipeline/RemoteAvatarFetch.php
+++ b/app/Jobs/AvatarPipeline/RemoteAvatarFetch.php
@@ -4,112 +4,107 @@ namespace App\Jobs\AvatarPipeline;
 
 use App\Avatar;
 use App\Profile;
+use App\Services\MediaStorageService;
+use App\Util\ActivityPub\Helpers;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use App\Util\ActivityPub\Helpers;
-use Illuminate\Support\Str;
-use Zttp\Zttp;
-use App\Http\Controllers\AvatarController;
-use Storage;
-use Log;
-use Illuminate\Http\File;
-use App\Services\MediaStorageService;
-use App\Services\ActivityPubFetchService;
 
 class RemoteAvatarFetch implements ShouldQueue
 {
-	use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-	protected $profile;
+    protected $profile;
 
-	/**
-	* Delete the job if its models no longer exist.
-	*
-	* @var bool
-	*/
-	public $deleteWhenMissingModels = true;
+    /**
+     * Delete the job if its models no longer exist.
+     *
+     * @var bool
+     */
+    public $deleteWhenMissingModels = true;
 
-	/**
-	 * The number of times the job may be attempted.
-	 *
-	 * @var int
-	 */
-	public $tries = 1;
-	public $timeout = 300;
-	public $maxExceptions = 1;
+    /**
+     * The number of times the job may be attempted.
+     *
+     * @var int
+     */
+    public $tries = 1;
 
-	/**
-	* Create a new job instance.
-	*
-	* @return void
-	*/
-	public function __construct(Profile $profile)
-	{
-		$this->profile = $profile;
-	}
+    public $timeout = 300;
 
-	/**
-	* Execute the job.
-	*
-	* @return void
-	*/
-	public function handle()
-	{
-		$profile = $this->profile;
+    public $maxExceptions = 1;
 
-		if(boolval(config_cache('pixelfed.cloud_storage')) == false && boolval(config_cache('federation.avatars.store_local')) == false) {
-			return 1;
-		}
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct(Profile $profile)
+    {
+        $this->profile = $profile;
+    }
 
-		if($profile->domain == null || $profile->private_key) {
-			return 1;
-		}
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $profile = $this->profile;
 
-		$avatar = Avatar::whereProfileId($profile->id)->first();
+        if ((bool) config_cache('pixelfed.cloud_storage') == false && (bool) config_cache('federation.avatars.store_local') == false) {
+            return 1;
+        }
 
-		if(!$avatar) {
-			$avatar = new Avatar;
-			$avatar->profile_id = $profile->id;
-			$avatar->save();
-		}
+        if ($profile->domain == null || $profile->private_key) {
+            return 1;
+        }
 
-		if($avatar->media_path == null && $avatar->remote_url == null) {
-			$avatar->media_path = 'public/avatars/default.jpg';
-			$avatar->is_remote = true;
-			$avatar->save();
-		}
+        $avatar = Avatar::whereProfileId($profile->id)->first();
 
-		$person = Helpers::fetchFromUrl($profile->remote_url);
+        if (! $avatar) {
+            $avatar = new Avatar;
+            $avatar->profile_id = $profile->id;
+            $avatar->save();
+        }
 
-		if(!$person || !isset($person['@context'])) {
-			return 1;
-		}
+        if ($avatar->media_path == null && $avatar->remote_url == null) {
+            $avatar->media_path = 'public/avatars/default.jpg';
+            $avatar->is_remote = true;
+            $avatar->save();
+        }
 
-		if( !isset($person['icon']) ||
-			!isset($person['icon']['type']) ||
-			!isset($person['icon']['url'])
-		) {
-			return 1;
-		}
+        $person = Helpers::fetchFromUrl($profile->remote_url);
 
-		if($person['icon']['type'] !== 'Image') {
-			return 1;
-		}
+        if (! $person || ! isset($person['@context'])) {
+            return 1;
+        }
 
-		if(!Helpers::validateUrl($person['icon']['url'])) {
-			return 1;
-		}
+        if (! isset($person['icon']) ||
+            ! isset($person['icon']['type']) ||
+            ! isset($person['icon']['url'])
+        ) {
+            return 1;
+        }
 
-		$icon = $person['icon'];
+        if ($person['icon']['type'] !== 'Image') {
+            return 1;
+        }
 
-		$avatar->remote_url = $icon['url'];
-		$avatar->save();
+        if (! Helpers::validateUrl($person['icon']['url'])) {
+            return 1;
+        }
 
-		MediaStorageService::avatar($avatar, boolval(config_cache('pixelfed.cloud_storage')) == false, true);
+        $icon = $person['icon'];
 
-		return 1;
-	}
+        $avatar->remote_url = $icon['url'];
+        $avatar->save();
+
+        MediaStorageService::avatar($avatar, (bool) config_cache('pixelfed.cloud_storage') == false, true);
+
+        return 1;
+    }
 }
diff --git a/app/Jobs/AvatarPipeline/RemoteAvatarFetchFromUrl.php b/app/Jobs/AvatarPipeline/RemoteAvatarFetchFromUrl.php
index c8c6820e4..f8a63c5bd 100644
--- a/app/Jobs/AvatarPipeline/RemoteAvatarFetchFromUrl.php
+++ b/app/Jobs/AvatarPipeline/RemoteAvatarFetchFromUrl.php
@@ -4,93 +4,88 @@ namespace App\Jobs\AvatarPipeline;
 
 use App\Avatar;
 use App\Profile;
+use App\Services\AccountService;
+use App\Services\MediaStorageService;
+use Cache;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use App\Util\ActivityPub\Helpers;
-use Illuminate\Support\Str;
-use Zttp\Zttp;
-use App\Http\Controllers\AvatarController;
-use Cache;
-use Storage;
-use Log;
-use Illuminate\Http\File;
-use App\Services\AccountService;
-use App\Services\MediaStorageService;
-use App\Services\ActivityPubFetchService;
 
 class RemoteAvatarFetchFromUrl implements ShouldQueue
 {
-	use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-	protected $profile;
-	protected $url;
+    protected $profile;
 
-	/**
-	* Delete the job if its models no longer exist.
-	*
-	* @var bool
-	*/
-	public $deleteWhenMissingModels = true;
+    protected $url;
 
-	/**
-	 * The number of times the job may be attempted.
-	 *
-	 * @var int
-	 */
-	public $tries = 1;
-	public $timeout = 300;
-	public $maxExceptions = 1;
+    /**
+     * Delete the job if its models no longer exist.
+     *
+     * @var bool
+     */
+    public $deleteWhenMissingModels = true;
 
-	/**
-	* Create a new job instance.
-	*
-	* @return void
-	*/
-	public function __construct(Profile $profile, $url)
-	{
-		$this->profile = $profile;
-		$this->url = $url;
-	}
+    /**
+     * The number of times the job may be attempted.
+     *
+     * @var int
+     */
+    public $tries = 1;
 
-	/**
-	* Execute the job.
-	*
-	* @return void
-	*/
-	public function handle()
-	{
-		$profile = $this->profile;
+    public $timeout = 300;
 
-		Cache::forget('avatar:' . $profile->id);
-		AccountService::del($profile->id);
+    public $maxExceptions = 1;
 
-		if(boolval(config_cache('pixelfed.cloud_storage')) == false && boolval(config_cache('federation.avatars.store_local')) == false) {
-			return 1;
-		}
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct(Profile $profile, $url)
+    {
+        $this->profile = $profile;
+        $this->url = $url;
+    }
 
-		if($profile->domain == null || $profile->private_key) {
-			return 1;
-		}
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $profile = $this->profile;
 
-		$avatar = Avatar::whereProfileId($profile->id)->first();
+        Cache::forget('avatar:'.$profile->id);
+        AccountService::del($profile->id);
 
-		if(!$avatar) {
-			$avatar = new Avatar;
-			$avatar->profile_id = $profile->id;
-			$avatar->is_remote = true;
-			$avatar->remote_url = $this->url;
-			$avatar->save();
-		} else {
-			$avatar->remote_url = $this->url;
-			$avatar->is_remote = true;
-			$avatar->save();
-		}
+        if ((bool) config_cache('pixelfed.cloud_storage') == false && (bool) config_cache('federation.avatars.store_local') == false) {
+            return 1;
+        }
 
-		MediaStorageService::avatar($avatar, boolval(config_cache('pixelfed.cloud_storage')) == false, true);
+        if ($profile->domain == null || $profile->private_key) {
+            return 1;
+        }
 
-		return 1;
-	}
+        $avatar = Avatar::whereProfileId($profile->id)->first();
+
+        if (! $avatar) {
+            $avatar = new Avatar;
+            $avatar->profile_id = $profile->id;
+            $avatar->is_remote = true;
+            $avatar->remote_url = $this->url;
+            $avatar->save();
+        } else {
+            $avatar->remote_url = $this->url;
+            $avatar->is_remote = true;
+            $avatar->save();
+        }
+
+        MediaStorageService::avatar($avatar, (bool) config_cache('pixelfed.cloud_storage') == false, true);
+
+        return 1;
+    }
 }
diff --git a/app/Jobs/CommentPipeline/CommentPipeline.php b/app/Jobs/CommentPipeline/CommentPipeline.php
index 3b2d896af..1917ecea5 100644
--- a/app/Jobs/CommentPipeline/CommentPipeline.php
+++ b/app/Jobs/CommentPipeline/CommentPipeline.php
@@ -91,19 +91,21 @@ class CommentPipeline implements ShouldQueue
             return;
         }
 
-        DB::transaction(function() use($target, $actor, $comment) {
-            $notification = new Notification();
-            $notification->profile_id = $target->id;
-            $notification->actor_id = $actor->id;
-            $notification->action = 'comment';
-            $notification->item_id = $comment->id;
-            $notification->item_type = "App\Status";
-            $notification->save();
+        if($target->user_id && $target->domain === null) {
+            DB::transaction(function() use($target, $actor, $comment) {
+                $notification = new Notification();
+                $notification->profile_id = $target->id;
+                $notification->actor_id = $actor->id;
+                $notification->action = 'comment';
+                $notification->item_id = $comment->id;
+                $notification->item_type = "App\Status";
+                $notification->save();
 
-            NotificationService::setNotification($notification);
-            NotificationService::set($notification->profile_id, $notification->id);
-            StatusService::del($comment->id);
-        });
+                NotificationService::setNotification($notification);
+                NotificationService::set($notification->profile_id, $notification->id);
+                StatusService::del($comment->id);
+            });
+        }
 
         if($exists = Cache::get('status:replies:all:' . $status->id)) {
         	if($exists && $exists->count() == 3) {
diff --git a/app/Jobs/CuratedOnboarding/CuratedOnboardingNotifyAdminNewApplicationPipeline.php b/app/Jobs/CuratedOnboarding/CuratedOnboardingNotifyAdminNewApplicationPipeline.php
new file mode 100644
index 000000000..a1b5f279a
--- /dev/null
+++ b/app/Jobs/CuratedOnboarding/CuratedOnboardingNotifyAdminNewApplicationPipeline.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Jobs\CuratedOnboarding;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use App\Models\CuratedRegister;
+use App\User;
+use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Storage;
+use App\Mail\CuratedRegisterNotifyAdmin;
+
+class CuratedOnboardingNotifyAdminNewApplicationPipeline implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $cr;
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct(CuratedRegister $cr)
+    {
+        $this->cr = $cr;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        if(!config('instance.curated_registration.notify.admin.on_verify_email.enabled')) {
+            return;
+        }
+
+        config('instance.curated_registration.notify.admin.on_verify_email.bundle') ?
+            $this->handleBundled() :
+            $this->handleUnbundled();
+    }
+
+    protected function handleBundled()
+    {
+        $cr = $this->cr;
+        Storage::append('conanap.json', json_encode([
+            'id' => $cr->id,
+            'email' => $cr->email,
+            'created_at' => $cr->created_at,
+            'updated_at' => $cr->updated_at,
+        ]));
+    }
+
+    protected function handleUnbundled()
+    {
+        $cr = $this->cr;
+        if($aid = config_cache('instance.admin.pid')) {
+            $admin = User::whereProfileId($aid)->first();
+            if($admin && $admin->email) {
+                Mail::to($admin->email)->send(new CuratedRegisterNotifyAdmin($cr));
+            }
+        }
+    }
+}
diff --git a/app/Jobs/DeletePipeline/DeleteRemoteStatusPipeline.php b/app/Jobs/DeletePipeline/DeleteRemoteStatusPipeline.php
index 4969fca2f..77cd5286f 100644
--- a/app/Jobs/DeletePipeline/DeleteRemoteStatusPipeline.php
+++ b/app/Jobs/DeletePipeline/DeleteRemoteStatusPipeline.php
@@ -22,9 +22,9 @@ use App\Notification;
 use App\Services\AccountService;
 use App\Services\NetworkTimelineService;
 use App\Services\StatusService;
-use App\Jobs\ProfilePipeline\DecrementPostCount;
 use App\Jobs\MediaPipeline\MediaDeletePipeline;
 use Cache;
+use App\Services\Account\AccountStatService;
 
 class DeleteRemoteStatusPipeline implements ShouldQueue
 {
@@ -56,10 +56,7 @@ class DeleteRemoteStatusPipeline implements ShouldQueue
     {
         $status = $this->status;
 
-        if(AccountService::get($status->profile_id, true)) {
-            DecrementPostCount::dispatch($status->profile_id)->onQueue('low');
-        }
-
+        AccountStatService::decrementPostCount($status->profile_id);
         NetworkTimelineService::del($status->id);
         StatusService::del($status->id, true);
         Bookmark::whereStatusId($status->id)->delete();
diff --git a/app/Jobs/DirectPipeline/DirectDeletePipeline.php b/app/Jobs/DirectPipeline/DirectDeletePipeline.php
new file mode 100644
index 000000000..947806422
--- /dev/null
+++ b/app/Jobs/DirectPipeline/DirectDeletePipeline.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Jobs\DirectPipeline;
+
+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\Util\ActivityPub\Helpers;
+
+class DirectDeletePipeline implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $timeout = 900;
+    public $tries = 3;
+    public $maxExceptions = 1;
+
+    protected $profile;
+    protected $url;
+    protected $payload;
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct($profile, $url, $payload)
+    {
+        $this->profile = $profile;
+        $this->url = $url;
+        $this->payload = $payload;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        Helpers::sendSignedObject($this->profile, $this->url, $this->payload);
+    }
+}
diff --git a/app/Jobs/DirectPipeline/DirectDeliverPipeline.php b/app/Jobs/DirectPipeline/DirectDeliverPipeline.php
new file mode 100644
index 000000000..7d20a406e
--- /dev/null
+++ b/app/Jobs/DirectPipeline/DirectDeliverPipeline.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Jobs\DirectPipeline;
+
+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\Util\ActivityPub\Helpers;
+
+class DirectDeliverPipeline implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $timeout = 900;
+    public $tries = 3;
+    public $maxExceptions = 1;
+
+    protected $profile;
+    protected $url;
+    protected $payload;
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct($profile, $url, $payload)
+    {
+        $this->profile = $profile;
+        $this->url = $url;
+        $this->payload = $payload;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        Helpers::sendSignedObject($this->profile, $this->url, $this->payload);
+    }
+}
diff --git a/app/Jobs/FollowPipeline/FollowPipeline.php b/app/Jobs/FollowPipeline/FollowPipeline.php
index 225334304..0df16206a 100644
--- a/app/Jobs/FollowPipeline/FollowPipeline.php
+++ b/app/Jobs/FollowPipeline/FollowPipeline.php
@@ -3,7 +3,13 @@
 namespace App\Jobs\FollowPipeline;
 
 use App\Follower;
+use App\Jobs\PushNotificationPipeline\FollowPushNotifyPipeline;
 use App\Notification;
+use App\Services\AccountService;
+use App\Services\FollowerService;
+use App\Services\NotificationAppGatewayService;
+use App\Services\PushNotificationService;
+use App\User;
 use Cache;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -11,9 +17,6 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Log;
-use Illuminate\Support\Facades\Redis;
-use App\Services\AccountService;
-use App\Services\FollowerService;
 
 class FollowPipeline implements ShouldQueue
 {
@@ -49,16 +52,16 @@ class FollowPipeline implements ShouldQueue
         $actor = $follower->actor;
         $target = $follower->target;
 
-        if(!$actor || !$target) {
+        if (! $actor || ! $target) {
             return;
         }
 
-        if($target->domain || !$target->private_key) {
+        if ($target->domain || ! $target->private_key) {
             return;
         }
 
-        Cache::forget('profile:following:' . $actor->id);
-        Cache::forget('profile:following:' . $target->id);
+        Cache::forget('profile:following:'.$actor->id);
+        Cache::forget('profile:following:'.$target->id);
 
         FollowerService::add($actor->id, $target->id);
 
@@ -72,16 +75,27 @@ class FollowPipeline implements ShouldQueue
         $target->save();
         AccountService::del($target->id);
 
-        try {
-            $notification = new Notification();
-            $notification->profile_id = $target->id;
-            $notification->actor_id = $actor->id;
-            $notification->action = 'follow';
-            $notification->item_id = $target->id;
-            $notification->item_type = "App\Profile";
-            $notification->save();
-        } catch (Exception $e) {
-            Log::error($e);
+        if ($target->user_id && $target->domain === null) {
+            try {
+                $notification = new Notification;
+                $notification->profile_id = $target->id;
+                $notification->actor_id = $actor->id;
+                $notification->action = 'follow';
+                $notification->item_id = $target->id;
+                $notification->item_type = "App\Profile";
+                $notification->save();
+            } catch (Exception $e) {
+                Log::error($e);
+            }
+
+            if (NotificationAppGatewayService::enabled()) {
+                if (PushNotificationService::check('follow', $target->id)) {
+                    $user = User::whereProfileId($target->id)->first();
+                    if ($user && $user->expo_token && $user->notify_enabled) {
+                        FollowPushNotifyPipeline::dispatch($user->expo_token, $actor->username)->onQueue('pushnotify');
+                    }
+                }
+            }
         }
     }
 }
diff --git a/app/Jobs/FollowPipeline/FollowServiceWarmCache.php b/app/Jobs/FollowPipeline/FollowServiceWarmCache.php
index 990236f69..0d3cca7ac 100644
--- a/app/Jobs/FollowPipeline/FollowServiceWarmCache.php
+++ b/app/Jobs/FollowPipeline/FollowServiceWarmCache.php
@@ -73,7 +73,7 @@ class FollowServiceWarmCache implements ShouldQueue
         if(Follower::whereProfileId($id)->orWhere('following_id', $id)->count()) {
             $following = [];
             $followers = [];
-    		foreach(Follower::lazy() as $follow) {
+    		foreach(Follower::where('following_id', $id)->orWhere('profile_id', $id)->lazyById(500) as $follow) {
                 if($follow->following_id != $id && $follow->profile_id != $id) {
                     continue;
                 }
diff --git a/app/Jobs/FollowPipeline/UnfollowPipeline.php b/app/Jobs/FollowPipeline/UnfollowPipeline.php
index c00246e2f..9417e535e 100644
--- a/app/Jobs/FollowPipeline/UnfollowPipeline.php
+++ b/app/Jobs/FollowPipeline/UnfollowPipeline.php
@@ -4,111 +4,115 @@ namespace App\Jobs\FollowPipeline;
 
 use App\Follower;
 use App\FollowRequest;
+use App\Jobs\HomeFeedPipeline\FeedUnfollowPipeline;
 use App\Notification;
 use App\Profile;
+use App\Services\AccountService;
+use App\Services\FollowerService;
+use App\Services\NotificationService;
 use Cache;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use Log;
-use Illuminate\Support\Facades\Redis;
-use App\Services\AccountService;
-use App\Services\FollowerService;
-use App\Services\NotificationService;
 
 class UnfollowPipeline implements ShouldQueue
 {
-	use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-	protected $actor;
-	protected $target;
+    protected $actor;
 
-	/**
-	 * Create a new job instance.
-	 *
-	 * @return void
-	 */
-	public function __construct($actor, $target)
-	{
-		$this->actor = $actor;
-		$this->target = $target;
-	}
+    protected $target;
 
-	/**
-	 * Execute the job.
-	 *
-	 * @return void
-	 */
-	public function handle()
-	{
-		$actor = $this->actor;
-		$target = $this->target;
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct($actor, $target)
+    {
+        $this->actor = $actor;
+        $this->target = $target;
+    }
 
-		$actorProfile = Profile::find($actor);
-		if(!$actorProfile) {
-			return;
-		}
-		$targetProfile = Profile::find($target);
-		if(!$targetProfile) {
-			return;
-		}
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $actor = $this->actor;
+        $target = $this->target;
 
-		FollowerService::remove($actor, $target);
+        $actorProfile = Profile::find($actor);
+        if (! $actorProfile) {
+            return;
+        }
+        $targetProfile = Profile::find($target);
+        if (! $targetProfile) {
+            return;
+        }
 
-		$actorProfileSync = Cache::get(FollowerService::FOLLOWING_SYNC_KEY . $actor);
-		if(!$actorProfileSync) {
-			FollowServiceWarmCache::dispatch($actor)->onQueue('low');
-		} else {
-			if($actorProfile->following_count) {
-				$actorProfile->decrement('following_count');
-			} else {
-				$count = Follower::whereProfileId($actor)->count();
-				$actorProfile->following_count = $count;
-				$actorProfile->save();
-			}
-			Cache::put(FollowerService::FOLLOWING_SYNC_KEY . $actor, 1, 604800);
-			AccountService::del($actor);
-		}
+        FeedUnfollowPipeline::dispatch($actor, $target)->onQueue('follow');
 
-		$targetProfileSync = Cache::get(FollowerService::FOLLOWERS_SYNC_KEY . $target);
-		if(!$targetProfileSync) {
-			FollowServiceWarmCache::dispatch($target)->onQueue('low');
-		} else {
-			if($targetProfile->followers_count) {
-				$targetProfile->decrement('followers_count');
-			} else {
-				$count = Follower::whereFollowingId($target)->count();
-				$targetProfile->followers_count = $count;
-				$targetProfile->save();
-			}
-			Cache::put(FollowerService::FOLLOWERS_SYNC_KEY . $target, 1, 604800);
-			AccountService::del($target);
-		}
+        FollowerService::remove($actor, $target);
 
-		if($targetProfile->domain == null) {
-			Notification::withTrashed()
-				->whereProfileId($target)
-				->whereAction('follow')
-				->whereActorId($actor)
-				->whereItemId($target)
-				->whereItemType('App\Profile')
-				->get()
-				->each(function($n) {
-					NotificationService::del($n->profile_id, $n->id);
-					$n->forceDelete();
-				});
-		}
+        $actorProfileSync = Cache::get(FollowerService::FOLLOWING_SYNC_KEY.$actor);
+        if (! $actorProfileSync) {
+            FollowServiceWarmCache::dispatch($actor)->onQueue('low');
+        } else {
+            if ($actorProfile->following_count) {
+                $actorProfile->decrement('following_count');
+            } else {
+                $count = Follower::whereProfileId($actor)->count();
+                $actorProfile->following_count = $count;
+                $actorProfile->save();
+            }
+            Cache::put(FollowerService::FOLLOWING_SYNC_KEY.$actor, 1, 604800);
+            AccountService::del($actor);
+        }
 
-		if($actorProfile->domain == null && config('instance.timeline.home.cached')) {
-			Cache::forget('pf:timelines:home:' . $actor);
-		}
+        $targetProfileSync = Cache::get(FollowerService::FOLLOWERS_SYNC_KEY.$target);
+        if (! $targetProfileSync) {
+            FollowServiceWarmCache::dispatch($target)->onQueue('low');
+        } else {
+            if ($targetProfile->followers_count) {
+                $targetProfile->decrement('followers_count');
+            } else {
+                $count = Follower::whereFollowingId($target)->count();
+                $targetProfile->followers_count = $count;
+                $targetProfile->save();
+            }
+            Cache::put(FollowerService::FOLLOWERS_SYNC_KEY.$target, 1, 604800);
+            AccountService::del($target);
+        }
 
-		FollowRequest::whereFollowingId($target)
-			->whereFollowerId($actor)
-			->delete();
+        if ($targetProfile->domain == null) {
+            Notification::withTrashed()
+                ->whereProfileId($target)
+                ->whereAction('follow')
+                ->whereActorId($actor)
+                ->whereItemId($target)
+                ->whereItemType('App\Profile')
+                ->get()
+                ->each(function ($n) {
+                    NotificationService::del($n->profile_id, $n->id);
+                    $n->forceDelete();
+                });
+        }
 
-		return;
-	}
+        if ($actorProfile->domain == null && config('instance.timeline.home.cached')) {
+            Cache::forget('pf:timelines:home:'.$actor);
+        }
+
+        FollowRequest::whereFollowingId($target)
+            ->whereFollowerId($actor)
+            ->delete();
+
+        AccountService::del($target);
+        AccountService::del($actor);
+
+    }
 }
diff --git a/app/Jobs/GroupPipeline/GroupCommentPipeline.php b/app/Jobs/GroupPipeline/GroupCommentPipeline.php
new file mode 100644
index 000000000..cdae65d10
--- /dev/null
+++ b/app/Jobs/GroupPipeline/GroupCommentPipeline.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace App\Jobs\GroupPipeline;
+
+use App\Notification;
+use App\Status;
+use App\Models\GroupPost;
+use Cache;
+use DB;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Redis;
+use App\Services\MediaStorageService;
+use App\Services\NotificationService;
+use App\Services\StatusService;
+
+class GroupCommentPipeline implements ShouldQueue
+{
+	use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+	protected $status;
+	protected $comment;
+	protected $groupPost;
+
+	public function __construct(Status $status, Status $comment, $groupPost = null)
+	{
+		$this->status = $status;
+		$this->comment = $comment;
+		$this->groupPost = $groupPost;
+	}
+
+	public function handle()
+	{
+		if($this->status->group_id == null || $this->comment->group_id == null) {
+			return;
+		}
+
+		$this->updateParentReplyCount();
+		$this->generateNotification();
+
+		if($this->groupPost) {
+			$this->updateChildReplyCount();
+		}
+	}
+
+	protected function updateParentReplyCount()
+	{
+		$parent = $this->status;
+		$parent->reply_count = Status::whereInReplyToId($parent->id)->count();
+		$parent->save();
+		StatusService::del($parent->id);
+	}
+
+	protected function updateChildReplyCount()
+	{
+		$gp = $this->groupPost;
+		if($gp->reply_child_id) {
+			$parent = GroupPost::whereStatusId($gp->reply_child_id)->first();
+			if($parent) {
+				$parent->reply_count++;
+				$parent->save();
+			}
+		}
+	}
+
+	protected function generateNotification()
+	{
+		$status = $this->status;
+		$comment = $this->comment;
+
+		$target = $status->profile;
+        $actor = $comment->profile;
+
+        if ($actor->id == $target->id || $status->comments_disabled == true) {
+            return;
+        }
+
+		$notification = DB::transaction(function() use($target, $actor, $comment) {
+			$actorName = $actor->username;
+			$actorUrl = $actor->url();
+			$text = "{$actorName}  commented on your group post.";
+			$html = "<a href='{$actorUrl}' class='profile-link'>{$actorName}</a> commented on your group post.";
+            $notification = new Notification();
+            $notification->profile_id = $target->id;
+            $notification->actor_id = $actor->id;
+            $notification->action = 'group:comment';
+            $notification->item_id = $comment->id;
+            $notification->item_type = "App\Status";
+            $notification->save();
+            return $notification;
+        });
+
+        NotificationService::setNotification($notification);
+        NotificationService::set($notification->profile_id, $notification->id);
+	}
+}
diff --git a/app/Jobs/GroupPipeline/GroupMediaPipeline.php b/app/Jobs/GroupPipeline/GroupMediaPipeline.php
new file mode 100644
index 000000000..1155e5465
--- /dev/null
+++ b/app/Jobs/GroupPipeline/GroupMediaPipeline.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Jobs\GroupPipeline;
+
+use App\Media;
+use Cache;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Redis;
+use App\Services\MediaStorageService;
+
+class GroupMediaPipeline implements ShouldQueue
+{
+	use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+	protected $media;
+
+	public function __construct(Media $media)
+	{
+		$this->media = $media;
+	}
+
+	public function handle()
+	{
+		MediaStorageService::store($this->media);
+	}
+
+	protected function localToCloud($media)
+	{
+		$path = storage_path('app/'.$media->media_path);
+		$thumb = storage_path('app/'.$media->thumbnail_path);
+
+		$p = explode('/', $media->media_path);
+		$name = array_pop($p);
+		$pt = explode('/', $media->thumbnail_path);
+		$thumbname = array_pop($pt);
+		$storagePath = implode('/', $p);
+
+		$disk = Storage::disk(config('filesystems.cloud'));
+		$file = $disk->putFileAs($storagePath, new File($path), $name, 'public');
+		$url = $disk->url($file);
+		$thumbFile = $disk->putFileAs($storagePath, new File($thumb), $thumbname, 'public');
+		$thumbUrl = $disk->url($thumbFile);
+		$media->thumbnail_url = $thumbUrl;
+		$media->cdn_url = $url;
+		$media->optimized_url = $url;
+		$media->replicated_at = now();
+		$media->save();
+		if($media->status_id) {
+			Cache::forget('status:transformer:media:attachments:' . $media->status_id);
+		}
+	}
+
+}
diff --git a/app/Jobs/GroupPipeline/GroupMemberInvite.php b/app/Jobs/GroupPipeline/GroupMemberInvite.php
new file mode 100644
index 000000000..d2c2bf8ef
--- /dev/null
+++ b/app/Jobs/GroupPipeline/GroupMemberInvite.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Jobs\GroupPipeline;
+
+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\Models\GroupInvitation;
+use App\Notification;
+use App\Profile;
+
+class GroupMemberInvite implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $invite;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct(GroupInvitation $invite)
+    {
+        $this->invite = $invite;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $invite = $this->invite;
+        $actor = Profile::find($invite->from_profile_id);
+        $target = Profile::find($invite->to_profile_id);
+
+        if(!$actor || !$target) {
+        	return;
+        }
+
+      	$notification = new Notification;
+      	$notification->profile_id = $target->id;
+      	$notification->actor_id = $actor->id;
+      	$notification->action = 'group:invite';
+      	$notification->item_id = $invite->group_id;
+      	$notification->item_type = 'App\Models\Group';
+      	$notification->save();
+    }
+}
diff --git a/app/Jobs/GroupPipeline/JoinApproved.php b/app/Jobs/GroupPipeline/JoinApproved.php
new file mode 100644
index 000000000..f41c8f698
--- /dev/null
+++ b/app/Jobs/GroupPipeline/JoinApproved.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Jobs\GroupPipeline;
+
+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\Models\GroupMember;
+use App\Notification;
+use App\Services\GroupService;
+
+class JoinApproved implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $member;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct(GroupMember $member)
+    {
+        $this->member = $member;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $member = $this->member;
+        $member->approved_at = now();
+        $member->join_request = false;
+        $member->role = 'member';
+        $member->save();
+
+        $n = new Notification;
+        $n->profile_id = $member->profile_id;
+        $n->actor_id = $member->profile_id;
+        $n->item_id = $member->group_id;
+        $n->item_type = 'App\Models\Group';
+        $n->save();
+
+        GroupService::del($member->group_id);
+        GroupService::delSelf($member->group_id, $member->profile_id);
+    }
+}
diff --git a/app/Jobs/GroupPipeline/JoinRejected.php b/app/Jobs/GroupPipeline/JoinRejected.php
new file mode 100644
index 000000000..71e1e30c8
--- /dev/null
+++ b/app/Jobs/GroupPipeline/JoinRejected.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Jobs\GroupPipeline;
+
+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\Models\GroupMember;
+use App\Notification;
+use App\Services\GroupService;
+
+class JoinRejected implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $member;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct(GroupMember $member)
+    {
+        $this->member = $member;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $member = $this->member;
+        $member->rejected_at = now();
+        $member->save();
+
+        $n = new Notification;
+        $n->profile_id = $member->profile_id;
+        $n->actor_id = $member->profile_id;
+        $n->item_id = $member->group_id;
+        $n->item_type = 'App\Models\Group';
+        $n->action = 'group.join.rejected';
+        $n->save();
+    }
+}
diff --git a/app/Jobs/GroupPipeline/LikePipeline.php b/app/Jobs/GroupPipeline/LikePipeline.php
new file mode 100644
index 000000000..bd3e668f7
--- /dev/null
+++ b/app/Jobs/GroupPipeline/LikePipeline.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace App\Jobs\GroupPipeline;
+
+use Cache, Log;
+use Illuminate\Support\Facades\Redis;
+use App\{Like, Notification};
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use App\Util\ActivityPub\Helpers;
+use League\Fractal;
+use League\Fractal\Serializer\ArraySerializer;
+use App\Transformer\ActivityPub\Verb\Like as LikeTransformer;
+use App\Services\StatusService;
+
+class LikePipeline implements ShouldQueue
+{
+	use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+	protected $like;
+
+	/**
+	 * Delete the job if its models no longer exist.
+	 *
+	 * @var bool
+	 */
+	public $deleteWhenMissingModels = true;
+
+	public $timeout = 5;
+	public $tries = 1;
+
+	/**
+	 * Create a new job instance.
+	 *
+	 * @return void
+	 */
+	public function __construct(Like $like)
+	{
+		$this->like = $like;
+	}
+
+	/**
+	 * Execute the job.
+	 *
+	 * @return void
+	 */
+	public function handle()
+	{
+		$like = $this->like;
+
+		$status = $this->like->status;
+		$actor = $this->like->actor;
+
+		if (!$status) {
+			// Ignore notifications to deleted statuses
+			return;
+		}
+
+		StatusService::refresh($status->id);
+
+		if($status->url && $actor->domain == null) {
+			return $this->remoteLikeDeliver();
+		}
+
+		$exists = Notification::whereProfileId($status->profile_id)
+				  ->whereActorId($actor->id)
+				  ->whereAction('group:like')
+				  ->whereItemId($status->id)
+				  ->whereItemType('App\Status')
+				  ->count();
+
+		if ($actor->id === $status->profile_id || $exists !== 0) {
+			return true;
+		}
+
+		try {
+			$notification = new Notification();
+			$notification->profile_id = $status->profile_id;
+			$notification->actor_id = $actor->id;
+			$notification->action = 'group:like';
+			$notification->item_id = $status->id;
+			$notification->item_type = "App\Status";
+			$notification->save();
+
+		} catch (Exception $e) {
+		}
+	}
+
+	public function remoteLikeDeliver()
+	{
+		$like = $this->like;
+		$status = $this->like->status;
+		$actor = $this->like->actor;
+
+		$fractal = new Fractal\Manager();
+		$fractal->setSerializer(new ArraySerializer());
+		$resource = new Fractal\Resource\Item($like, new LikeTransformer());
+		$activity = $fractal->createData($resource)->toArray();
+
+		$url = $status->profile->sharedInbox ?? $status->profile->inbox_url;
+
+		Helpers::sendSignedObject($actor, $url, $activity);
+	}
+}
diff --git a/app/Jobs/GroupPipeline/NewStatusPipeline.php b/app/Jobs/GroupPipeline/NewStatusPipeline.php
new file mode 100644
index 000000000..d791d81a4
--- /dev/null
+++ b/app/Jobs/GroupPipeline/NewStatusPipeline.php
@@ -0,0 +1,123 @@
+<?php
+
+namespace App\Jobs\GroupPipeline;
+
+use App\Hashtag;
+use App\Mention;
+use App\Models\GroupPost;
+use App\Models\GroupPostHashtag;
+use App\Profile;
+use App\Services\StatusService;
+use App\Status;
+use App\Util\Lexer\Autolink;
+use App\Util\Lexer\Extractor;
+use DB;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class NewStatusPipeline implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $status;
+
+    protected $gp;
+
+    protected $tags;
+
+    protected $mentions;
+
+    public function __construct(Status $status, GroupPost $gp)
+    {
+        $this->status = $status;
+        $this->gp = $gp;
+    }
+
+    public function handle()
+    {
+        $status = $this->status;
+
+        $autolink = Autolink::create()
+            ->setAutolinkActiveUsersOnly(true)
+            ->setBaseHashPath("/groups/{$status->group_id}/topics/")
+            ->setBaseUserPath("/groups/{$status->group_id}/username/")
+            ->autolink($status->caption);
+
+        $entities = Extractor::create()->extract($status->caption);
+        $status->entities = null;
+        $status->save();
+
+        $this->tags = array_unique($entities['hashtags']);
+        $this->mentions = array_unique($entities['mentions']);
+
+        if (count($this->tags)) {
+            $this->storeHashtags();
+        }
+
+        if (count($this->mentions)) {
+            $this->storeMentions($this->mentions);
+        }
+    }
+
+    protected function storeHashtags()
+    {
+        $tags = $this->tags;
+        $status = $this->status;
+        $gp = $this->gp;
+
+        foreach ($tags as $tag) {
+            if (mb_strlen($tag) > 124) {
+                continue;
+            }
+
+            DB::transaction(function () use ($status, $tag, $gp) {
+                $slug = str_slug($tag, '-', false);
+                $hashtag = Hashtag::firstOrCreate(
+                    ['name' => $tag, 'slug' => $slug]
+                );
+                GroupPostHashtag::firstOrCreate(
+                    [
+                        'group_id' => $status->group_id,
+                        'group_post_id' => $gp->id,
+                        'status_id' => $status->id,
+                        'hashtag_id' => $hashtag->id,
+                        'profile_id' => $status->profile_id,
+                    ]
+                );
+
+            });
+        }
+
+        if (count($this->mentions)) {
+            $this->storeMentions();
+        }
+        StatusService::del($status->id);
+    }
+
+    protected function storeMentions()
+    {
+        $mentions = $this->mentions;
+        $status = $this->status;
+
+        foreach ($mentions as $mention) {
+            $mentioned = Profile::whereUsername($mention)->first();
+
+            if (empty($mentioned) || ! isset($mentioned->id)) {
+                continue;
+            }
+
+            DB::transaction(function () use ($status, $mentioned) {
+                $m = new Mention;
+                $m->status_id = $status->id;
+                $m->profile_id = $mentioned->id;
+                $m->save();
+
+                MentionPipeline::dispatch($status, $m);
+            });
+        }
+        StatusService::del($status->id);
+    }
+}
diff --git a/app/Jobs/GroupPipeline/UnlikePipeline.php b/app/Jobs/GroupPipeline/UnlikePipeline.php
new file mode 100644
index 000000000..b322d6853
--- /dev/null
+++ b/app/Jobs/GroupPipeline/UnlikePipeline.php
@@ -0,0 +1,109 @@
+<?php
+
+namespace App\Jobs\GroupPipeline;
+
+use Cache, Log;
+use Illuminate\Support\Facades\Redis;
+use App\{Like, Notification};
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use App\Util\ActivityPub\Helpers;
+use League\Fractal;
+use League\Fractal\Serializer\ArraySerializer;
+use App\Transformer\ActivityPub\Verb\UndoLike as LikeTransformer;
+use App\Services\StatusService;
+
+class UnlikePipeline implements ShouldQueue
+{
+	use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+	protected $like;
+
+	/**
+	 * Delete the job if its models no longer exist.
+	 *
+	 * @var bool
+	 */
+	public $deleteWhenMissingModels = true;
+
+	public $timeout = 5;
+	public $tries = 1;
+
+	/**
+	 * Create a new job instance.
+	 *
+	 * @return void
+	 */
+	public function __construct(Like $like)
+	{
+		$this->like = $like;
+	}
+
+	/**
+	 * Execute the job.
+	 *
+	 * @return void
+	 */
+	public function handle()
+	{
+		$like = $this->like;
+
+		$status = $this->like->status;
+		$actor = $this->like->actor;
+
+		if (!$status) {
+			// Ignore notifications to deleted statuses
+			return;
+		}
+
+		$count = $status->likes_count > 1 ? $status->likes_count : $status->likes()->count();
+		$status->likes_count = $count - 1;
+		$status->save();
+
+		StatusService::del($status->id);
+
+		if($actor->id !== $status->profile_id && $status->url && $actor->domain == null) {
+			$this->remoteLikeDeliver();
+		}
+
+		$exists = Notification::whereProfileId($status->profile_id)
+				  ->whereActorId($actor->id)
+				  ->whereAction('group:like')
+				  ->whereItemId($status->id)
+				  ->whereItemType('App\Status')
+				  ->first();
+
+		if($exists) {
+			$exists->delete();
+		}
+
+		$like = Like::whereProfileId($actor->id)->whereStatusId($status->id)->first();
+
+		if(!$like) {
+			return;
+		}
+
+		$like->forceDelete();
+
+		return;
+	}
+
+	public function remoteLikeDeliver()
+	{
+		$like = $this->like;
+		$status = $this->like->status;
+		$actor = $this->like->actor;
+
+		$fractal = new Fractal\Manager();
+		$fractal->setSerializer(new ArraySerializer());
+		$resource = new Fractal\Resource\Item($like, new LikeTransformer());
+		$activity = $fractal->createData($resource)->toArray();
+
+		$url = $status->profile->sharedInbox ?? $status->profile->inbox_url;
+
+		Helpers::sendSignedObject($actor, $url, $activity);
+	}
+}
diff --git a/app/Jobs/GroupsPipeline/DeleteCommentPipeline.php b/app/Jobs/GroupsPipeline/DeleteCommentPipeline.php
new file mode 100644
index 000000000..e1d94c5de
--- /dev/null
+++ b/app/Jobs/GroupsPipeline/DeleteCommentPipeline.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Jobs\GroupsPipeline;
+
+use App\Util\Media\Image;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use App\Models\Group;
+use App\Models\GroupComment;
+use App\Models\GroupPost;
+use App\Models\GroupHashtag;
+use App\Models\GroupPostHashtag;
+use App\Util\Lexer\Autolink;
+use App\Util\Lexer\Extractor;
+use DB;
+
+class DeleteCommentPipeline implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $parent;
+    protected $status;
+
+    /**
+     * Delete the job if its models no longer exist.
+     *
+     * @var bool
+     */
+    public $deleteWhenMissingModels = true;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct($parent, $status)
+    {
+        $this->parent = $parent;
+        $this->status = $status;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $parent = $this->parent;
+        $parent->reply_count = GroupComment::whereStatusId($parent->id)->count();
+        $parent->save();
+
+        return;
+    }
+}
diff --git a/app/Jobs/GroupsPipeline/ImageResizePipeline.php b/app/Jobs/GroupsPipeline/ImageResizePipeline.php
new file mode 100644
index 000000000..fa649efea
--- /dev/null
+++ b/app/Jobs/GroupsPipeline/ImageResizePipeline.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace App\Jobs\GroupsPipeline;
+
+use App\Models\GroupMedia;
+use App\Util\Media\Image;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Log;
+use Storage;
+use Image as Intervention;
+
+class ImageResizePipeline implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $media;
+
+    /**
+     * Delete the job if its models no longer exist.
+     *
+     * @var bool
+     */
+    public $deleteWhenMissingModels = true;
+    
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct(GroupMedia $media)
+    {
+        $this->media = $media;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $media = $this->media;
+
+        if(!$media) {
+            return;
+        }
+
+        if (!Storage::exists($media->media_path) || $media->skip_optimize) {
+            return;
+        }
+
+        $path = $media->media_path;
+        $file = storage_path('app/' . $path);
+        $quality = config_cache('pixelfed.image_quality');
+
+        $orientations = [
+            'square' => [
+                'width'  => 1080,
+                'height' => 1080,
+            ],
+            'landscape' => [
+                'width'  => 1920,
+                'height' => 1080,
+            ],
+            'portrait' => [
+                'width'  => 1080,
+                'height' => 1350,
+            ],
+        ];
+
+        try {
+            $img = Intervention::make($file);
+            $img->orientate();
+            $width = $img->width();
+            $height = $img->height();
+            $aspect = $width / $height;
+            $orientation = $aspect === 1 ? 'square' : ($aspect > 1 ? 'landscape' : 'portrait');
+            $ratio = $orientations[$orientation];
+            $img->resize($ratio['width'], $ratio['height']);
+            $img->save($file, $quality);
+        } catch (Exception $e) {
+            Log::error($e);
+        }
+    }
+}
diff --git a/app/Jobs/GroupsPipeline/ImageS3DeletePipeline.php b/app/Jobs/GroupsPipeline/ImageS3DeletePipeline.php
new file mode 100644
index 000000000..d59c6d086
--- /dev/null
+++ b/app/Jobs/GroupsPipeline/ImageS3DeletePipeline.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Jobs\GroupsPipeline;
+
+use App\Models\GroupMedia;
+use App\Util\Media\Image;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Storage;
+use Illuminate\Http\File;
+use Exception;
+use GuzzleHttp\Exception\ClientException;
+use Aws\S3\Exception\S3Exception;
+use GuzzleHttp\Exception\ConnectException;
+use League\Flysystem\UnableToWriteFile;
+
+class ImageS3DeletePipeline implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $media;
+    static $attempts = 1;
+
+    /**
+     * Delete the job if its models no longer exist.
+     *
+     * @var bool
+     */
+    public $deleteWhenMissingModels = true;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct(GroupMedia $media)
+    {
+        $this->media = $media;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $media = $this->media;
+
+        if(!$media || (bool) config_cache('pixelfed.cloud_storage') === false) {
+            return;
+        }
+
+        $fs = Storage::disk(config('filesystems.cloud'));
+
+        if(!$fs) {
+            return;
+        }
+
+        if($fs->exists($media->media_path)) {
+            $fs->delete($media->media_path);
+        }
+    }
+}
diff --git a/app/Jobs/GroupsPipeline/ImageS3UploadPipeline.php b/app/Jobs/GroupsPipeline/ImageS3UploadPipeline.php
new file mode 100644
index 000000000..169c11073
--- /dev/null
+++ b/app/Jobs/GroupsPipeline/ImageS3UploadPipeline.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace App\Jobs\GroupsPipeline;
+
+use App\Models\GroupMedia;
+use App\Util\Media\Image;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Storage;
+use Illuminate\Http\File;
+use Exception;
+use GuzzleHttp\Exception\ClientException;
+use Aws\S3\Exception\S3Exception;
+use GuzzleHttp\Exception\ConnectException;
+use League\Flysystem\UnableToWriteFile;
+
+class ImageS3UploadPipeline implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $media;
+    static $attempts = 1;
+
+    /**
+     * Delete the job if its models no longer exist.
+     *
+     * @var bool
+     */
+    public $deleteWhenMissingModels = true;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct(GroupMedia $media)
+    {
+        $this->media = $media;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $media = $this->media;
+
+        if(!$media || (bool) config_cache('pixelfed.cloud_storage') === false) {
+            return;
+        }
+
+        $path = storage_path('app/' . $media->media_path);
+
+        $p = explode('/', $media->media_path);
+        $name = array_pop($p);
+        $storagePath = implode('/', $p);
+
+        $url =  (bool) config_cache('pixelfed.cloud_storage') && (bool) config('media.storage.remote.resilient_mode') ?
+            self::handleResilientStore($storagePath, $path, $name) :
+            self::handleStore($storagePath, $path, $name);
+
+        if($url && strlen($url) && str_starts_with($url, 'https://')) {
+            $media->cdn_url = $url;
+            $media->processed_at = now();
+            $media->version = 11;
+            $media->save();
+            Storage::disk('local')->delete($media->media_path);
+        }
+    }
+
+    protected function handleStore($storagePath, $path, $name)
+    {
+        return retry(3, function() use($storagePath, $path, $name) {
+            $baseDisk = (bool) config_cache('pixelfed.cloud_storage') ? config('filesystems.cloud') : 'local';
+            $disk = Storage::disk($baseDisk);
+            $file = $disk->putFileAs($storagePath, new File($path), $name, 'public');
+            return $disk->url($file);
+        }, random_int(100, 500));
+    }
+
+    protected function handleResilientStore($storagePath, $path, $name)
+    {
+        $attempts = 0;
+        return retry(4, function() use($storagePath, $path, $name, $attempts) {
+            self::$attempts++;
+            usleep(100000);
+            $baseDisk = self::$attempts > 1 ? $this->getAltDriver() : config('filesystems.cloud');
+            try {
+                $disk = Storage::disk($baseDisk);
+                $file = $disk->putFileAs($storagePath, new File($path), $name, 'public');
+            } catch (S3Exception | ClientException | ConnectException | UnableToWriteFile | Exception $e) {}
+            return $disk->url($file);
+        }, function (int $attempt, Exception $exception) {
+            return $attempt * 200;
+        });
+    }
+
+    protected function getAltDriver()
+    {
+        return config('filesystems.cloud');
+    }
+}
diff --git a/app/Jobs/GroupsPipeline/MemberJoinApprovedPipeline.php b/app/Jobs/GroupsPipeline/MemberJoinApprovedPipeline.php
new file mode 100644
index 000000000..a3ec21982
--- /dev/null
+++ b/app/Jobs/GroupsPipeline/MemberJoinApprovedPipeline.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Jobs\GroupsPipeline;
+
+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\Models\GroupMember;
+use App\Notification;
+use App\Services\GroupService;
+
+class MemberJoinApprovedPipeline implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $member;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct(GroupMember $member)
+    {
+        $this->member = $member;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $member = $this->member;
+        $member->approved_at = now();
+        $member->join_request = false;
+        $member->role = 'member';
+        $member->save();
+
+        GroupService::del($member->group_id);
+        GroupService::delSelf($member->group_id, $member->profile_id);
+    }
+}
diff --git a/app/Jobs/GroupsPipeline/MemberJoinRejectedPipeline.php b/app/Jobs/GroupsPipeline/MemberJoinRejectedPipeline.php
new file mode 100644
index 000000000..5e8226de0
--- /dev/null
+++ b/app/Jobs/GroupsPipeline/MemberJoinRejectedPipeline.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Jobs\GroupsPipeline;
+
+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\Models\GroupMember;
+use App\Notification;
+use App\Services\GroupService;
+
+class MemberJoinRejectedPipeline implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $member;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct(GroupMember $member)
+    {
+        $this->member = $member;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $member = $this->member;
+        $member->rejected_at = now();
+        $member->save();
+    }
+}
diff --git a/app/Jobs/GroupsPipeline/NewCommentPipeline.php b/app/Jobs/GroupsPipeline/NewCommentPipeline.php
new file mode 100644
index 000000000..fb618a14d
--- /dev/null
+++ b/app/Jobs/GroupsPipeline/NewCommentPipeline.php
@@ -0,0 +1,115 @@
+<?php
+
+namespace App\Jobs\GroupsPipeline;
+
+use App\Util\Media\Image;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use App\Models\Group;
+use App\Models\GroupComment;
+use App\Models\GroupPost;
+use App\Models\GroupHashtag;
+use App\Models\GroupPostHashtag;
+use App\Util\Lexer\Autolink;
+use App\Util\Lexer\Extractor;
+use DB;
+
+class NewCommentPipeline implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $status;
+    protected $parent;
+    protected $entities;
+    protected $autolink;
+
+    /**
+     * Delete the job if its models no longer exist.
+     *
+     * @var bool
+     */
+    public $deleteWhenMissingModels = true;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct($parent, GroupComment $status)
+    {
+        $this->parent = $parent;
+        $this->status = $status;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $profile = $this->status->profile;
+        $status = $this->status;
+
+        $parent = $this->parent;
+        $parent->reply_count = GroupComment::whereStatusId($parent->id)->count();
+        $parent->save();
+
+        if ($profile->no_autolink == false) {
+            $this->parseEntities();
+        }
+    }
+
+    public function parseEntities()
+    {
+        $this->extractEntities();
+    }
+
+    public function extractEntities()
+    {
+        $this->entities = Extractor::create()->extract($this->status->caption);
+        $this->autolinkStatus();
+    }
+
+    public function autolinkStatus()
+    {
+        $this->autolink = Autolink::create()->autolink($this->status->caption);
+        $this->storeHashtags();
+    }
+
+    public function storeHashtags()
+    {
+        $tags = array_unique($this->entities['hashtags']);
+        $status = $this->status;
+
+        foreach ($tags as $tag) {
+            if (mb_strlen($tag) > 124) {
+                continue;
+            }
+            DB::transaction(function () use ($status, $tag) {
+                $hashtag = GroupHashtag::firstOrCreate([
+                    'name' => $tag,
+                ]);
+
+                GroupPostHashtag::firstOrCreate(
+                    [
+                        'status_id' => $status->id,
+                        'group_id' => $status->group_id,
+                        'hashtag_id' => $hashtag->id,
+                        'profile_id' => $status->profile_id,
+                        'status_visibility' => $status->visibility,
+                    ]
+                );
+            });
+        }
+        $this->storeMentions();
+    }
+
+    public function storeMentions()
+    {
+        // todo
+    }
+}
diff --git a/app/Jobs/GroupsPipeline/NewPostPipeline.php b/app/Jobs/GroupsPipeline/NewPostPipeline.php
new file mode 100644
index 000000000..1302a0233
--- /dev/null
+++ b/app/Jobs/GroupsPipeline/NewPostPipeline.php
@@ -0,0 +1,108 @@
+<?php
+
+namespace App\Jobs\GroupsPipeline;
+
+use App\Util\Media\Image;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use App\Models\Group;
+use App\Models\GroupPost;
+use App\Models\GroupHashtag;
+use App\Models\GroupPostHashtag;
+use App\Util\Lexer\Autolink;
+use App\Util\Lexer\Extractor;
+use DB;
+
+class NewPostPipeline implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $status;
+    protected $entities;
+    protected $autolink;
+
+    /**
+     * Delete the job if its models no longer exist.
+     *
+     * @var bool
+     */
+    public $deleteWhenMissingModels = true;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct(GroupPost $status)
+    {
+        $this->status = $status;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $profile = $this->status->profile;
+        $status = $this->status;
+
+        if ($profile->no_autolink == false) {
+            $this->parseEntities();
+        }
+    }
+
+    public function parseEntities()
+    {
+        $this->extractEntities();
+    }
+
+    public function extractEntities()
+    {
+        $this->entities = Extractor::create()->extract($this->status->caption);
+        $this->autolinkStatus();
+    }
+
+    public function autolinkStatus()
+    {
+        $this->autolink = Autolink::create()->autolink($this->status->caption);
+        $this->storeHashtags();
+    }
+
+    public function storeHashtags()
+    {
+        $tags = array_unique($this->entities['hashtags']);
+        $status = $this->status;
+
+        foreach ($tags as $tag) {
+            if (mb_strlen($tag) > 124) {
+                continue;
+            }
+            DB::transaction(function () use ($status, $tag) {
+                $hashtag = GroupHashtag::firstOrCreate([
+                    'name' => $tag,
+                ]);
+
+                GroupPostHashtag::firstOrCreate(
+                    [
+                        'status_id' => $status->id,
+                        'group_id' => $status->group_id,
+                        'hashtag_id' => $hashtag->id,
+                        'profile_id' => $status->profile_id,
+                        'status_visibility' => $status->visibility,
+                    ]
+                );
+            });
+        }
+        $this->storeMentions();
+    }
+
+    public function storeMentions()
+    {
+        // todo
+    }
+}
diff --git a/app/Jobs/HomeFeedPipeline/FeedFollowPipeline.php b/app/Jobs/HomeFeedPipeline/FeedFollowPipeline.php
new file mode 100644
index 000000000..e386329ca
--- /dev/null
+++ b/app/Jobs/HomeFeedPipeline/FeedFollowPipeline.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace App\Jobs\HomeFeedPipeline;
+
+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 Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing;
+use App\Services\AccountService;
+use App\Services\HomeTimelineService;
+use App\Services\SnowflakeService;
+use App\Status;
+
+class FeedFollowPipeline implements ShouldQueue, ShouldBeUniqueUntilProcessing
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $actorId;
+    protected $followingId;
+
+    public $timeout = 900;
+    public $tries = 3;
+    public $maxExceptions = 1;
+    public $failOnTimeout = true;
+
+    /**
+     * The number of seconds after which the job's unique lock will be released.
+     *
+     * @var int
+     */
+    public $uniqueFor = 3600;
+
+    /**
+     * Get the unique ID for the job.
+     */
+    public function uniqueId(): string
+    {
+        return 'hts:feed:insert:follows:aid:' . $this->actorId . ':fid:' . $this->followingId;
+    }
+
+    /**
+     * Get the middleware the job should pass through.
+     *
+     * @return array<int, object>
+     */
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping("hts:feed:insert:follows:aid:{$this->actorId}:fid:{$this->followingId}"))->shared()->dontRelease()];
+    }
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct($actorId, $followingId)
+    {
+        $this->actorId = $actorId;
+        $this->followingId = $followingId;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        $actorId = $this->actorId;
+        $followingId = $this->followingId;
+
+        $minId = SnowflakeService::byDate(now()->subWeeks(6));
+
+        $ids = Status::where('id', '>', $minId)
+            ->where('profile_id', $followingId)
+            ->whereNull(['in_reply_to_id', 'reblog_of_id'])
+            ->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])
+            ->whereIn('visibility',['public', 'unlisted', 'private'])
+            ->orderByDesc('id')
+            ->limit(HomeTimelineService::FOLLOWER_FEED_POST_LIMIT)
+            ->pluck('id');
+
+        foreach($ids as $id) {
+            HomeTimelineService::add($actorId, $id);
+        }
+    }
+}
diff --git a/app/Jobs/HomeFeedPipeline/FeedInsertPipeline.php b/app/Jobs/HomeFeedPipeline/FeedInsertPipeline.php
new file mode 100644
index 000000000..4237a7b1a
--- /dev/null
+++ b/app/Jobs/HomeFeedPipeline/FeedInsertPipeline.php
@@ -0,0 +1,114 @@
+<?php
+
+namespace App\Jobs\HomeFeedPipeline;
+
+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 Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing;
+use App\UserFilter;
+use App\Models\UserDomainBlock;
+use App\Services\FollowerService;
+use App\Services\HomeTimelineService;
+use App\Services\StatusService;
+
+class FeedInsertPipeline implements ShouldQueue, ShouldBeUniqueUntilProcessing
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $sid;
+    protected $pid;
+
+    public $timeout = 900;
+    public $tries = 3;
+    public $maxExceptions = 1;
+    public $failOnTimeout = true;
+
+    /**
+     * The number of seconds after which the job's unique lock will be released.
+     *
+     * @var int
+     */
+    public $uniqueFor = 3600;
+
+    /**
+     * Get the unique ID for the job.
+     */
+    public function uniqueId(): string
+    {
+        return 'hts:feed:insert:sid:' . $this->sid;
+    }
+
+    /**
+     * Get the middleware the job should pass through.
+     *
+     * @return array<int, object>
+     */
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping("hts:feed:insert:sid:{$this->sid}"))->shared()->dontRelease()];
+    }
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct($sid, $pid)
+    {
+        $this->sid = $sid;
+        $this->pid = $pid;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        $sid = $this->sid;
+        $status = StatusService::get($sid, false);
+
+        if(!$status || !isset($status['account']) || !isset($status['account']['id'], $status['url'])) {
+            return;
+        }
+
+        if(!in_array($status['pf_type'], ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])) {
+            return;
+        }
+
+        HomeTimelineService::add($this->pid, $this->sid);
+
+        $ids = FollowerService::localFollowerIds($this->pid);
+
+        if(!$ids || !count($ids)) {
+            return;
+        }
+
+        $domain = strtolower(parse_url($status['url'], PHP_URL_HOST));
+        $skipIds = [];
+
+        if(strtolower(config('pixelfed.domain.app')) !== $domain) {
+            $skipIds = UserDomainBlock::where('domain', $domain)->pluck('profile_id')->toArray();
+        }
+
+        $filters = UserFilter::whereFilterableType('App\Profile')
+            ->whereFilterableId($status['account']['id'])
+            ->whereIn('filter_type', ['mute', 'block'])
+            ->pluck('user_id')
+            ->toArray();
+
+        if($filters && count($filters)) {
+            $skipIds = array_merge($skipIds, $filters);
+        }
+
+        $skipIds = array_unique(array_values($skipIds));
+
+        foreach($ids as $id) {
+            if(!in_array($id, $skipIds)) {
+                HomeTimelineService::add($id, $this->sid);
+            }
+        }
+    }
+}
diff --git a/app/Jobs/HomeFeedPipeline/FeedInsertRemotePipeline.php b/app/Jobs/HomeFeedPipeline/FeedInsertRemotePipeline.php
new file mode 100644
index 000000000..6c4ce0c35
--- /dev/null
+++ b/app/Jobs/HomeFeedPipeline/FeedInsertRemotePipeline.php
@@ -0,0 +1,112 @@
+<?php
+
+namespace App\Jobs\HomeFeedPipeline;
+
+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 Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing;
+use App\UserFilter;
+use App\Models\UserDomainBlock;
+use App\Services\FollowerService;
+use App\Services\HomeTimelineService;
+use App\Services\StatusService;
+
+class FeedInsertRemotePipeline implements ShouldQueue, ShouldBeUniqueUntilProcessing
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $sid;
+    protected $pid;
+
+    public $timeout = 900;
+    public $tries = 3;
+    public $maxExceptions = 1;
+    public $failOnTimeout = true;
+
+    /**
+     * The number of seconds after which the job's unique lock will be released.
+     *
+     * @var int
+     */
+    public $uniqueFor = 3600;
+
+    /**
+     * Get the unique ID for the job.
+     */
+    public function uniqueId(): string
+    {
+        return 'hts:feed:insert:remote:sid:' . $this->sid;
+    }
+
+    /**
+     * Get the middleware the job should pass through.
+     *
+     * @return array<int, object>
+     */
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping("hts:feed:insert:remote:sid:{$this->sid}"))->shared()->dontRelease()];
+    }
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct($sid, $pid)
+    {
+        $this->sid = $sid;
+        $this->pid = $pid;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        $sid = $this->sid;
+        $status = StatusService::get($sid, false);
+
+        if(!$status || !isset($status['account']) || !isset($status['account']['id'], $status['url'])) {
+            return;
+        }
+
+        if(!in_array($status['pf_type'], ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])) {
+            return;
+        }
+
+        $ids = FollowerService::localFollowerIds($this->pid);
+
+        if(!$ids || !count($ids)) {
+            return;
+        }
+
+        $domain = strtolower(parse_url($status['url'], PHP_URL_HOST));
+        $skipIds = [];
+
+        if(strtolower(config('pixelfed.domain.app')) !== $domain) {
+            $skipIds = UserDomainBlock::where('domain', $domain)->pluck('profile_id')->toArray();
+        }
+
+        $filters = UserFilter::whereFilterableType('App\Profile')
+            ->whereFilterableId($status['account']['id'])
+            ->whereIn('filter_type', ['mute', 'block'])
+            ->pluck('user_id')
+            ->toArray();
+
+        if($filters && count($filters)) {
+            $skipIds = array_merge($skipIds, $filters);
+        }
+
+        $skipIds = array_unique(array_values($skipIds));
+
+        foreach($ids as $id) {
+            if(!in_array($id, $skipIds)) {
+                HomeTimelineService::add($id, $this->sid);
+            }
+        }
+    }
+}
diff --git a/app/Jobs/HomeFeedPipeline/FeedRemoveDomainPipeline.php b/app/Jobs/HomeFeedPipeline/FeedRemoveDomainPipeline.php
new file mode 100644
index 000000000..018ea3794
--- /dev/null
+++ b/app/Jobs/HomeFeedPipeline/FeedRemoveDomainPipeline.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace App\Jobs\HomeFeedPipeline;
+
+use Illuminate\Bus\Batchable;
+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 Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing;
+use App\Services\StatusService;
+use App\Services\HomeTimelineService;
+
+class FeedRemoveDomainPipeline implements ShouldQueue, ShouldBeUniqueUntilProcessing
+{
+    use Batchable, Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $pid;
+    protected $domain;
+
+    public $timeout = 900;
+    public $tries = 3;
+    public $maxExceptions = 1;
+    public $failOnTimeout = true;
+
+    /**
+     * The number of seconds after which the job's unique lock will be released.
+     *
+     * @var int
+     */
+    public $uniqueFor = 3600;
+
+    /**
+     * Get the unique ID for the job.
+     */
+    public function uniqueId(): string
+    {
+        return 'hts:feed:remove:domain:' . $this->pid . ':d-' . $this->domain;
+    }
+
+    /**
+     * Get the middleware the job should pass through.
+     *
+     * @return array<int, object>
+     */
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping("hts:feed:remove:domain:{$this->pid}:d-{$this->domain}"))->shared()->dontRelease()];
+    }
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct($pid, $domain)
+    {
+        $this->pid = $pid;
+        $this->domain = $domain;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        if(!config('exp.cached_home_timeline')) {
+            return;
+        }
+
+        if ($this->batch()->cancelled()) {
+            return;
+        }
+
+        if(!$this->pid || !$this->domain) {
+            return;
+        }
+        $domain = strtolower($this->domain);
+        $pid = $this->pid;
+        $posts = HomeTimelineService::get($pid, '0', '-1');
+
+        foreach($posts as $post) {
+            $status = StatusService::get($post, false);
+            if(!$status || !isset($status['url'])) {
+                HomeTimelineService::rem($pid, $post);
+                continue;
+            }
+            $host = strtolower(parse_url($status['url'], PHP_URL_HOST));
+            if($host === strtolower(config('pixelfed.domain.app')) || !$host) {
+                continue;
+            }
+            if($host === $domain) {
+                HomeTimelineService::rem($pid, $status['id']);
+            }
+        }
+    }
+}
diff --git a/app/Jobs/HomeFeedPipeline/FeedRemovePipeline.php b/app/Jobs/HomeFeedPipeline/FeedRemovePipeline.php
new file mode 100644
index 000000000..5c09d749a
--- /dev/null
+++ b/app/Jobs/HomeFeedPipeline/FeedRemovePipeline.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Jobs\HomeFeedPipeline;
+
+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 Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing;
+use App\Services\FollowerService;
+use App\Services\StatusService;
+use App\Services\HomeTimelineService;
+
+class FeedRemovePipeline implements ShouldQueue, ShouldBeUniqueUntilProcessing
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $sid;
+    protected $pid;
+
+    public $timeout = 900;
+    public $tries = 3;
+    public $maxExceptions = 1;
+    public $failOnTimeout = true;
+
+    /**
+     * The number of seconds after which the job's unique lock will be released.
+     *
+     * @var int
+     */
+    public $uniqueFor = 3600;
+
+    /**
+     * Get the unique ID for the job.
+     */
+    public function uniqueId(): string
+    {
+        return 'hts:feed:remove:sid:' . $this->sid;
+    }
+
+    /**
+     * Get the middleware the job should pass through.
+     *
+     * @return array<int, object>
+     */
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping("hts:feed:remove:sid:{$this->sid}"))->shared()->dontRelease()];
+    }
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct($sid, $pid)
+    {
+        $this->sid = $sid;
+        $this->pid = $pid;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        $ids = FollowerService::localFollowerIds($this->pid);
+
+        HomeTimelineService::rem($this->pid, $this->sid);
+
+        foreach($ids as $id) {
+            HomeTimelineService::rem($id, $this->sid);
+        }
+    }
+}
diff --git a/app/Jobs/HomeFeedPipeline/FeedRemoveRemotePipeline.php b/app/Jobs/HomeFeedPipeline/FeedRemoveRemotePipeline.php
new file mode 100644
index 000000000..d9ee716ba
--- /dev/null
+++ b/app/Jobs/HomeFeedPipeline/FeedRemoveRemotePipeline.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Jobs\HomeFeedPipeline;
+
+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 Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing;
+use App\Services\FollowerService;
+use App\Services\StatusService;
+use App\Services\HomeTimelineService;
+
+class FeedRemoveRemotePipeline implements ShouldQueue, ShouldBeUniqueUntilProcessing
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $sid;
+    protected $pid;
+
+    public $timeout = 900;
+    public $tries = 3;
+    public $maxExceptions = 1;
+    public $failOnTimeout = true;
+
+    /**
+     * The number of seconds after which the job's unique lock will be released.
+     *
+     * @var int
+     */
+    public $uniqueFor = 3600;
+
+    /**
+     * Get the unique ID for the job.
+     */
+    public function uniqueId(): string
+    {
+        return 'hts:feed:remove:remote:sid:' . $this->sid;
+    }
+
+    /**
+     * Get the middleware the job should pass through.
+     *
+     * @return array<int, object>
+     */
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping("hts:feed:remove:remote:sid:{$this->sid}"))->shared()->dontRelease()];
+    }
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct($sid, $pid)
+    {
+        $this->sid = $sid;
+        $this->pid = $pid;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        $ids = FollowerService::localFollowerIds($this->pid);
+
+        foreach($ids as $id) {
+            HomeTimelineService::rem($id, $this->sid);
+        }
+    }
+}
diff --git a/app/Jobs/HomeFeedPipeline/FeedUnfollowPipeline.php b/app/Jobs/HomeFeedPipeline/FeedUnfollowPipeline.php
new file mode 100644
index 000000000..996e74c10
--- /dev/null
+++ b/app/Jobs/HomeFeedPipeline/FeedUnfollowPipeline.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Jobs\HomeFeedPipeline;
+
+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 Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing;
+use App\Services\AccountService;
+use App\Services\StatusService;
+use App\Services\HomeTimelineService;
+
+class FeedUnfollowPipeline implements ShouldQueue, ShouldBeUniqueUntilProcessing
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $actorId;
+    protected $followingId;
+
+    public $timeout = 900;
+    public $tries = 3;
+    public $maxExceptions = 1;
+    public $failOnTimeout = true;
+
+    /**
+     * The number of seconds after which the job's unique lock will be released.
+     *
+     * @var int
+     */
+    public $uniqueFor = 3600;
+
+    /**
+     * Get the unique ID for the job.
+     */
+    public function uniqueId(): string
+    {
+        return 'hts:feed:remove:follows:aid:' . $this->actorId . ':fid:' . $this->followingId;
+    }
+
+    /**
+     * Get the middleware the job should pass through.
+     *
+     * @return array<int, object>
+     */
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping("hts:feed:remove:follows:aid:{$this->actorId}:fid:{$this->followingId}"))->shared()->dontRelease()];
+    }
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct($actorId, $followingId)
+    {
+        $this->actorId = $actorId;
+        $this->followingId = $followingId;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        $actorId = $this->actorId;
+        $followingId = $this->followingId;
+
+        $ids = HomeTimelineService::get($actorId, 0, -1);
+        foreach($ids as $id) {
+            $status = StatusService::get($id, false);
+            if($status && isset($status['account'], $status['account']['id'])) {
+                if($status['account']['id'] == $followingId) {
+                    HomeTimelineService::rem($actorId, $id);
+                }
+            }
+        }
+    }
+}
diff --git a/app/Jobs/HomeFeedPipeline/FeedWarmCachePipeline.php b/app/Jobs/HomeFeedPipeline/FeedWarmCachePipeline.php
new file mode 100644
index 000000000..00cdbda65
--- /dev/null
+++ b/app/Jobs/HomeFeedPipeline/FeedWarmCachePipeline.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Jobs\HomeFeedPipeline;
+
+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\Services\HomeTimelineService;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing;
+
+class FeedWarmCachePipeline implements ShouldQueue, ShouldBeUniqueUntilProcessing
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $pid;
+
+    public $timeout = 900;
+    public $tries = 3;
+    public $maxExceptions = 1;
+    public $failOnTimeout = true;
+
+    /**
+     * The number of seconds after which the job's unique lock will be released.
+     *
+     * @var int
+     */
+    public $uniqueFor = 3600;
+
+    /**
+     * Get the unique ID for the job.
+     */
+    public function uniqueId(): string
+    {
+        return 'hfp:warm-cache:pid:' . $this->pid;
+    }
+
+    /**
+     * Get the middleware the job should pass through.
+     *
+     * @return array<int, object>
+     */
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping("hfp:warm-cache:pid:{$this->pid}"))->shared()->dontRelease()];
+    }
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct($pid)
+    {
+        $this->pid = $pid;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        $pid = $this->pid;
+        HomeTimelineService::warmCache($pid, true, 400, true);
+    }
+}
diff --git a/app/Jobs/HomeFeedPipeline/HashtagInsertFanoutPipeline.php b/app/Jobs/HomeFeedPipeline/HashtagInsertFanoutPipeline.php
new file mode 100644
index 000000000..eca598e49
--- /dev/null
+++ b/app/Jobs/HomeFeedPipeline/HashtagInsertFanoutPipeline.php
@@ -0,0 +1,116 @@
+<?php
+
+namespace App\Jobs\HomeFeedPipeline;
+
+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\Hashtag;
+use App\StatusHashtag;
+use App\UserFilter;
+use App\Models\UserDomainBlock;
+use App\Services\HashtagFollowService;
+use App\Services\HomeTimelineService;
+use App\Services\StatusService;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing;
+
+class HashtagInsertFanoutPipeline implements ShouldQueue, ShouldBeUniqueUntilProcessing
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $hashtag;
+
+    public $timeout = 900;
+    public $tries = 3;
+    public $maxExceptions = 1;
+    public $failOnTimeout = true;
+
+    /**
+     * Delete the job if its models no longer exist.
+     *
+     * @var bool
+     */
+    public $deleteWhenMissingModels = true;
+
+    /**
+     * The number of seconds after which the job's unique lock will be released.
+     *
+     * @var int
+     */
+    public $uniqueFor = 3600;
+
+    /**
+     * Get the unique ID for the job.
+     */
+    public function uniqueId(): string
+    {
+        return 'hfp:hashtag:fanout:insert:' . $this->hashtag->id;
+    }
+
+    /**
+     * Get the middleware the job should pass through.
+     *
+     * @return array<int, object>
+     */
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping("hfp:hashtag:fanout:insert:{$this->hashtag->id}"))->shared()->dontRelease()];
+    }
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct(StatusHashtag $hashtag)
+    {
+        $this->hashtag = $hashtag;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        $hashtag = $this->hashtag;
+        $sid = $hashtag->status_id;
+        $status = StatusService::get($sid, false);
+
+        if(!$status || !isset($status['account']) || !isset($status['account']['id'], $status['url'])) {
+            return;
+        }
+
+        if(!in_array($status['pf_type'], ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])) {
+            return;
+        }
+
+        $domain = strtolower(parse_url($status['url'], PHP_URL_HOST));
+        $skipIds = [];
+
+        if(strtolower(config('pixelfed.domain.app')) !== $domain) {
+            $skipIds = UserDomainBlock::where('domain', $domain)->pluck('profile_id')->toArray();
+        }
+
+        $filters = UserFilter::whereFilterableType('App\Profile')->whereFilterableId($status['account']['id'])->whereIn('filter_type', ['mute', 'block'])->pluck('user_id')->toArray();
+
+        if($filters && count($filters)) {
+            $skipIds = array_merge($skipIds, $filters);
+        }
+
+        $skipIds = array_unique(array_values($skipIds));
+
+        $ids = HashtagFollowService::getPidByHid($hashtag->hashtag_id);
+
+        if(!$ids || !count($ids)) {
+            return;
+        }
+
+        foreach($ids as $id) {
+            if(!in_array($id, $skipIds)) {
+                HomeTimelineService::add($id, $hashtag->status_id);
+            }
+        }
+    }
+}
diff --git a/app/Jobs/HomeFeedPipeline/HashtagRemoveFanoutPipeline.php b/app/Jobs/HomeFeedPipeline/HashtagRemoveFanoutPipeline.php
new file mode 100644
index 000000000..f1968e120
--- /dev/null
+++ b/app/Jobs/HomeFeedPipeline/HashtagRemoveFanoutPipeline.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace App\Jobs\HomeFeedPipeline;
+
+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\Hashtag;
+use App\StatusHashtag;
+use App\Services\HashtagFollowService;
+use App\Services\HomeTimelineService;
+use App\Services\StatusService;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing;
+
+class HashtagRemoveFanoutPipeline implements ShouldQueue, ShouldBeUniqueUntilProcessing
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $sid;
+    protected $hid;
+
+    public $timeout = 900;
+    public $tries = 3;
+    public $maxExceptions = 1;
+    public $failOnTimeout = true;
+
+    /**
+     * The number of seconds after which the job's unique lock will be released.
+     *
+     * @var int
+     */
+    public $uniqueFor = 3600;
+
+    /**
+     * Get the unique ID for the job.
+     */
+    public function uniqueId(): string
+    {
+        return 'hfp:hashtag:fanout:remove:' . $this->hid . ':' . $this->sid;
+    }
+
+    /**
+     * Get the middleware the job should pass through.
+     *
+     * @return array<int, object>
+     */
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping("hfp:hashtag:fanout:remove:{$this->hid}:{$this->sid}"))->shared()->dontRelease()];
+    }
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct($sid, $hid)
+    {
+        $this->sid = $sid;
+        $this->hid = $hid;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        $sid = $this->sid;
+        $hid = $this->hid;
+        $status = StatusService::get($sid, false);
+
+        if(!$status || !isset($status['account']) || !isset($status['account']['id'])) {
+            return;
+        }
+
+        if(!in_array($status['pf_type'], ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])) {
+            return;
+        }
+
+        $ids = HashtagFollowService::getPidByHid($hid);
+
+        if(!$ids || !count($ids)) {
+            return;
+        }
+
+        foreach($ids as $id) {
+            HomeTimelineService::rem($id, $sid);
+        }
+    }
+}
diff --git a/app/Jobs/HomeFeedPipeline/HashtagUnfollowPipeline.php b/app/Jobs/HomeFeedPipeline/HashtagUnfollowPipeline.php
new file mode 100644
index 000000000..232179ec3
--- /dev/null
+++ b/app/Jobs/HomeFeedPipeline/HashtagUnfollowPipeline.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace App\Jobs\HomeFeedPipeline;
+
+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 Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing;
+use Illuminate\Support\Facades\Cache;
+use App\Follower;
+use App\Hashtag;
+use App\StatusHashtag;
+use App\Services\HashtagFollowService;
+use App\Services\StatusService;
+use App\Services\HomeTimelineService;
+
+class HashtagUnfollowPipeline implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $pid;
+    protected $hid;
+    protected $slug;
+
+    public $timeout = 900;
+    public $tries = 3;
+    public $maxExceptions = 1;
+    public $failOnTimeout = true;
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct($hid, $pid, $slug)
+    {
+        $this->hid = $hid;
+        $this->pid = $pid;
+        $this->slug = $slug;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        $hid = $this->hid;
+        $pid = $this->pid;
+        $slug = strtolower($this->slug);
+
+        $statusIds = HomeTimelineService::get($pid, 0, -1);
+
+        $followingIds = Cache::remember('profile:following:'.$pid, 1209600, function() use($pid) {
+            $following = Follower::whereProfileId($pid)->pluck('following_id');
+            return $following->push($pid)->toArray();
+        });
+
+        foreach($statusIds as $id) {
+            $status = StatusService::get($id, false);
+            if(!$status || empty($status['tags'])) {
+                HomeTimelineService::rem($pid, $id);
+                continue;
+            }
+            $following = in_array((int) $status['account']['id'], $followingIds);
+            if($following === true) {
+                continue;
+            }
+
+            $tags = collect($status['tags'])->map(function($tag) {
+                return strtolower($tag['name']);
+            })->filter()->values()->toArray();
+
+            if(in_array($slug, $tags)) {
+                HomeTimelineService::rem($pid, $id);
+            }
+        }
+    }
+}
diff --git a/app/Jobs/ImageOptimizePipeline/ImageOptimize.php b/app/Jobs/ImageOptimizePipeline/ImageOptimize.php
index 0448ade6a..e2d558143 100644
--- a/app/Jobs/ImageOptimizePipeline/ImageOptimize.php
+++ b/app/Jobs/ImageOptimizePipeline/ImageOptimize.php
@@ -45,7 +45,7 @@ class ImageOptimize implements ShouldQueue
             return;
         }
 
-        if(config('pixelfed.optimize_image') == false) {
+        if((bool) config_cache('pixelfed.optimize_image') == false) {
         	ImageThumbnail::dispatch($media)->onQueue('mmo');
     		return;
     	} else {
diff --git a/app/Jobs/ImageOptimizePipeline/ImageResize.php b/app/Jobs/ImageOptimizePipeline/ImageResize.php
index 9bb896a40..2aa51a532 100644
--- a/app/Jobs/ImageOptimizePipeline/ImageResize.php
+++ b/app/Jobs/ImageOptimizePipeline/ImageResize.php
@@ -9,6 +9,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Log;
 
 class ImageResize implements ShouldQueue
 {
@@ -46,10 +47,11 @@ class ImageResize implements ShouldQueue
         }
         $path = storage_path('app/'.$media->media_path);
         if (!is_file($path) || $media->skip_optimize) {
+            Log::info('Tried to optimize media that does not exist or is not readable. ' . $path);
             return;
         }
 
-        if(!config('pixelfed.optimize_image')) {
+        if((bool) config_cache('pixelfed.optimize_image') === false) {
         	ImageThumbnail::dispatch($media)->onQueue('mmo');
         	return;
         }
@@ -57,6 +59,7 @@ class ImageResize implements ShouldQueue
             $img = new Image();
             $img->resizeImage($media);
         } catch (Exception $e) {
+            Log::error($e);
         }
 
         ImageThumbnail::dispatch($media)->onQueue('mmo');
diff --git a/app/Jobs/ImageOptimizePipeline/ImageUpdate.php b/app/Jobs/ImageOptimizePipeline/ImageUpdate.php
index 550448699..9012529f2 100644
--- a/app/Jobs/ImageOptimizePipeline/ImageUpdate.php
+++ b/app/Jobs/ImageOptimizePipeline/ImageUpdate.php
@@ -61,7 +61,7 @@ class ImageUpdate implements ShouldQueue
 			return;
 		}
 
-		if(config('pixelfed.optimize_image')) {
+		if((bool) config_cache('pixelfed.optimize_image')) {
 			if (in_array($media->mime, $this->protectedMimes) == true) {
 				ImageOptimizer::optimize($thumb);
 				if(!$media->skip_optimize) {
diff --git a/app/Jobs/ImportPipeline/ImportMediaToCloudPipeline.php b/app/Jobs/ImportPipeline/ImportMediaToCloudPipeline.php
new file mode 100644
index 000000000..cdf91e376
--- /dev/null
+++ b/app/Jobs/ImportPipeline/ImportMediaToCloudPipeline.php
@@ -0,0 +1,129 @@
+<?php
+
+namespace App\Jobs\ImportPipeline;
+
+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 Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing;
+use App\Models\ImportPost;
+use App\Media;
+use App\Services\MediaStorageService;
+use Illuminate\Support\Facades\Storage;
+use App\Jobs\VideoPipeline\VideoThumbnailToCloudPipeline;
+
+class ImportMediaToCloudPipeline implements ShouldQueue, ShouldBeUniqueUntilProcessing
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $importPost;
+
+    public $timeout = 900;
+    public $tries = 3;
+    public $maxExceptions = 1;
+    public $failOnTimeout = true;
+
+    /**
+     * The number of seconds after which the job's unique lock will be released.
+     *
+     * @var int
+     */
+    public $uniqueFor = 3600;
+
+    /**
+     * Get the unique ID for the job.
+     */
+    public function uniqueId(): string
+    {
+        return 'import-media-to-cloud-pipeline:ip-id:' . $this->importPost->id;
+    }
+
+    /**
+     * Get the middleware the job should pass through.
+     *
+     * @return array<int, object>
+     */
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping("import-media-to-cloud-pipeline:ip-id:{$this->importPost->id}"))->shared()->dontRelease()];
+    }
+
+    /**
+    * Delete the job if its models no longer exist.
+    *
+    * @var bool
+    */
+    public $deleteWhenMissingModels = true;
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct(ImportPost $importPost)
+    {
+        $this->importPost = $importPost;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        $ip = $this->importPost;
+
+        if(
+            $ip->status_id === null ||
+            $ip->uploaded_to_s3 === true ||
+            (bool) config_cache('pixelfed.cloud_storage') === false) {
+            return;
+        }
+
+        $media = Media::whereStatusId($ip->status_id)->get();
+
+        if(!$media || !$media->count()) {
+            $importPost = ImportPost::find($ip->id);
+            $importPost->uploaded_to_s3 = true;
+            $importPost->save();
+            return;
+        }
+
+        foreach($media as $mediaPart) {
+            $this->handleMedia($mediaPart);
+        }
+    }
+
+    protected function handleMedia($media)
+    {
+        $ip = $this->importPost;
+
+        $importPost = ImportPost::find($ip->id);
+
+        if(!$importPost) {
+            return;
+        }
+
+        $res = MediaStorageService::move($media);
+
+        $importPost->uploaded_to_s3 = true;
+        $importPost->save();
+
+        if(!$res) {
+            return;
+        }
+
+        if($res === 'invalid file') {
+            return;
+        }
+
+        if($res === 'success') {
+            if($media->mime === 'video/mp4') {
+                VideoThumbnailToCloudPipeline::dispatch($media)->onQueue('low');
+            } else {
+                Storage::disk('local')->delete($media->media_path);
+            }
+        }
+    }
+}
diff --git a/app/Jobs/InboxPipeline/InboxValidator.php b/app/Jobs/InboxPipeline/InboxValidator.php
index 4017d3acd..8d0f414c5 100644
--- a/app/Jobs/InboxPipeline/InboxValidator.php
+++ b/app/Jobs/InboxPipeline/InboxValidator.php
@@ -193,7 +193,7 @@ class InboxValidator implements ShouldQueue
 		}
 
 		try {
-			$res = Http::timeout(20)->withHeaders([
+			$res = Http::withOptions(['allow_redirects' => false])->timeout(20)->withHeaders([
 			  'Accept'     => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
 			  'User-Agent' => 'PixelfedBot v0.1 - https://pixelfed.org',
 			])->get($actor->remote_url);
diff --git a/app/Jobs/InboxPipeline/InboxWorker.php b/app/Jobs/InboxPipeline/InboxWorker.php
index c8508c0fc..1bc88507d 100644
--- a/app/Jobs/InboxPipeline/InboxWorker.php
+++ b/app/Jobs/InboxPipeline/InboxWorker.php
@@ -173,7 +173,7 @@ class InboxWorker implements ShouldQueue
 		}
 
 		try {
-			$res = Http::timeout(20)->withHeaders([
+			$res = Http::withOptions(['allow_redirects' => false])->timeout(20)->withHeaders([
 			  'Accept'     => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
 			  'User-Agent' => 'PixelfedBot v0.1 - https://pixelfed.org',
 			])->get($actor->remote_url);
diff --git a/app/Jobs/InstancePipeline/FetchNodeinfoPipeline.php b/app/Jobs/InstancePipeline/FetchNodeinfoPipeline.php
index b8c79d67f..38127b2aa 100644
--- a/app/Jobs/InstancePipeline/FetchNodeinfoPipeline.php
+++ b/app/Jobs/InstancePipeline/FetchNodeinfoPipeline.php
@@ -4,6 +4,7 @@ namespace App\Jobs\InstancePipeline;
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeUnique;
+use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
@@ -12,45 +13,73 @@ use Illuminate\Support\Facades\Http;
 use App\Instance;
 use App\Profile;
 use App\Services\NodeinfoService;
+use Illuminate\Contracts\Cache\Repository;
+use Illuminate\Support\Facades\Cache;
 
-class FetchNodeinfoPipeline implements ShouldQueue
+class FetchNodeinfoPipeline implements ShouldQueue, ShouldBeUniqueUntilProcessing
 {
-	use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-	protected $instance;
+    protected $instance;
 
-	/**
-	 * Create a new job instance.
-	 *
-	 * @return void
-	 */
-	public function __construct(Instance $instance)
-	{
-		$this->instance = $instance;
-	}
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct(Instance $instance)
+    {
+        $this->instance = $instance;
+    }
 
-	/**
-	 * Execute the job.
-	 *
-	 * @return void
-	 */
-	public function handle()
-	{
-		$instance = $this->instance;
+    /**
+     * The number of seconds after which the job's unique lock will be released.
+     *
+     * @var int
+     */
+    public $uniqueFor = 14400;
 
-		$ni = NodeinfoService::get($instance->domain);
-		if($ni) {
-			if(isset($ni['software']) && is_array($ni['software']) && isset($ni['software']['name'])) {
-				$software = $ni['software']['name'];
-				$instance->software = strtolower(strip_tags($software));
-				$instance->last_crawled_at = now();
-				$instance->user_count = Profile::whereDomain($instance->domain)->count();
-				$instance->save();
-			}
-		} else {
-			$instance->user_count = Profile::whereDomain($instance->domain)->count();
-			$instance->last_crawled_at = now();
-			$instance->save();
-		}
-	}
+    /**
+     * Get the unique ID for the job.
+     */
+    public function uniqueId(): string
+    {
+        return $this->instance->id;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $instance = $this->instance;
+
+        if( $instance->nodeinfo_last_fetched &&
+            $instance->nodeinfo_last_fetched->gt(now()->subHours(12)) ||
+            $instance->delivery_timeout &&
+            $instance->delivery_next_after->gt(now())
+        ) {
+            return;
+        }
+
+        $ni = NodeinfoService::get($instance->domain);
+        $instance->last_crawled_at = now();
+        if($ni) {
+            if(isset($ni['software']) && is_array($ni['software']) && isset($ni['software']['name'])) {
+                $software = $ni['software']['name'];
+                $instance->software = strtolower(strip_tags($software));
+                $instance->user_count = Profile::whereDomain($instance->domain)->count();
+                $instance->nodeinfo_last_fetched = now();
+                $instance->last_crawled_at = now();
+                $instance->save();
+            }
+        } else {
+            $instance->delivery_timeout = 1;
+            $instance->last_crawled_at = now();
+            $instance->delivery_next_after = now()->addHours(14);
+            $instance->save();
+        }
+    }
 }
diff --git a/app/Jobs/InternalPipeline/NotificationEpochUpdatePipeline.php b/app/Jobs/InternalPipeline/NotificationEpochUpdatePipeline.php
new file mode 100644
index 000000000..79df5aa9a
--- /dev/null
+++ b/app/Jobs/InternalPipeline/NotificationEpochUpdatePipeline.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Jobs\InternalPipeline;
+
+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 Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing;
+use App\Notification;
+use Cache;
+use App\Services\NotificationService;
+
+class NotificationEpochUpdatePipeline implements ShouldQueue, ShouldBeUniqueUntilProcessing
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $timeout = 1500;
+    public $tries = 3;
+    public $maxExceptions = 1;
+    public $failOnTimeout = true;
+
+    /**
+     * The number of seconds after which the job's unique lock will be released.
+     *
+     * @var int
+     */
+    public $uniqueFor = 3600;
+
+    /**
+     * Get the unique ID for the job.
+     */
+    public function uniqueId(): string
+    {
+        return 'ip:notification-epoch-update';
+    }
+
+    /**
+     * Get the middleware the job should pass through.
+     *
+     * @return array<int, object>
+     */
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping('ip:notification-epoch-update'))->shared()->dontRelease()];
+    }
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        $pid = Cache::get(NotificationService::EPOCH_CACHE_KEY . '6');
+        if($pid && $pid > 1) {
+            $rec = Notification::where('id', '>', $pid)->whereDate('created_at', now()->subMonths(6)->format('Y-m-d'))->first();
+        } else {
+            $rec = Notification::whereDate('created_at', now()->subMonths(6)->format('Y-m-d'))->first();
+        }
+        $id = 1;
+        if($rec) {
+            $id = $rec->id;
+        }
+        Cache::put(NotificationService::EPOCH_CACHE_KEY . '6', $id, 1209600);
+    }
+}
diff --git a/app/Jobs/LikePipeline/LikePipeline.php b/app/Jobs/LikePipeline/LikePipeline.php
index b44c90c8b..7dbd71da2 100644
--- a/app/Jobs/LikePipeline/LikePipeline.php
+++ b/app/Jobs/LikePipeline/LikePipeline.php
@@ -2,19 +2,22 @@
 
 namespace App\Jobs\LikePipeline;
 
-use Cache, DB, Log;
-use Illuminate\Support\Facades\Redis;
-use App\{Like, Notification};
+use App\Jobs\PushNotificationPipeline\LikePushNotifyPipeline;
+use App\Like;
+use App\Notification;
+use App\Services\NotificationAppGatewayService;
+use App\Services\PushNotificationService;
+use App\Services\StatusService;
+use App\Transformer\ActivityPub\Verb\Like as LikeTransformer;
+use App\User;
+use App\Util\ActivityPub\Helpers;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use App\Util\ActivityPub\Helpers;
 use League\Fractal;
 use League\Fractal\Serializer\ArraySerializer;
-use App\Transformer\ActivityPub\Verb\Like as LikeTransformer;
-use App\Services\StatusService;
 
 class LikePipeline implements ShouldQueue
 {
@@ -30,6 +33,7 @@ class LikePipeline implements ShouldQueue
     public $deleteWhenMissingModels = true;
 
     public $timeout = 5;
+
     public $tries = 1;
 
     /**
@@ -54,41 +58,49 @@ class LikePipeline implements ShouldQueue
         $status = $this->like->status;
         $actor = $this->like->actor;
 
-        if (!$status) {
+        if (! $status) {
             // Ignore notifications to deleted statuses
             return;
         }
 
-        $status->likes_count = DB::table('likes')->whereStatusId($status->id)->count();
-        $status->save();
-
         StatusService::refresh($status->id);
 
-        if($status->url && $actor->domain == null) {
+        if ($status->url && $actor->domain == null) {
             return $this->remoteLikeDeliver();
         }
 
         $exists = Notification::whereProfileId($status->profile_id)
-                  ->whereActorId($actor->id)
-                  ->whereAction('like')
-                  ->whereItemId($status->id)
-                  ->whereItemType('App\Status')
-                  ->count();
+            ->whereActorId($actor->id)
+            ->whereAction('like')
+            ->whereItemId($status->id)
+            ->whereItemType('App\Status')
+            ->count();
 
-        if ($actor->id === $status->profile_id || $exists !== 0) {
+        if ($actor->id === $status->profile_id || $exists) {
             return true;
         }
 
-        try {
-            $notification = new Notification();
-            $notification->profile_id = $status->profile_id;
-            $notification->actor_id = $actor->id;
-            $notification->action = 'like';
-            $notification->item_id = $status->id;
-            $notification->item_type = "App\Status";
-            $notification->save();
+        if ($status->uri === null && $status->object_url === null && $status->url === null) {
+            try {
+                $notification = new Notification;
+                $notification->profile_id = $status->profile_id;
+                $notification->actor_id = $actor->id;
+                $notification->action = 'like';
+                $notification->item_id = $status->id;
+                $notification->item_type = "App\Status";
+                $notification->save();
 
-        } catch (Exception $e) {
+            } catch (Exception $e) {
+            }
+
+            if (NotificationAppGatewayService::enabled()) {
+                if (PushNotificationService::check('like', $status->profile_id)) {
+                    $user = User::whereProfileId($status->profile_id)->first();
+                    if ($user && $user->expo_token && $user->notify_enabled) {
+                        LikePushNotifyPipeline::dispatchSync($user->expo_token, $actor->username);
+                    }
+                }
+            }
         }
     }
 
@@ -98,9 +110,9 @@ class LikePipeline implements ShouldQueue
         $status = $this->like->status;
         $actor = $this->like->actor;
 
-        $fractal = new Fractal\Manager();
-        $fractal->setSerializer(new ArraySerializer());
-        $resource = new Fractal\Resource\Item($like, new LikeTransformer());
+        $fractal = new Fractal\Manager;
+        $fractal->setSerializer(new ArraySerializer);
+        $resource = new Fractal\Resource\Item($like, new LikeTransformer);
         $activity = $fractal->createData($resource)->toArray();
 
         $url = $status->profile->sharedInbox ?? $status->profile->inbox_url;
diff --git a/app/Jobs/MediaPipeline/MediaDeletePipeline.php b/app/Jobs/MediaPipeline/MediaDeletePipeline.php
index 55df84948..df16a42d5 100644
--- a/app/Jobs/MediaPipeline/MediaDeletePipeline.php
+++ b/app/Jobs/MediaPipeline/MediaDeletePipeline.php
@@ -3,27 +3,30 @@
 namespace App\Jobs\MediaPipeline;
 
 use App\Media;
+use App\Services\Media\MediaHlsService;
 use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Redis;
-use Illuminate\Support\Facades\Storage;
-use App\Services\Media\MediaHlsService;
 use Illuminate\Queue\Middleware\WithoutOverlapping;
-use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Storage;
 
-class MediaDeletePipeline implements ShouldQueue, ShouldBeUniqueUntilProcessing
+class MediaDeletePipeline implements ShouldBeUniqueUntilProcessing, ShouldQueue
 {
-	use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-	protected $media;
+    protected $media;
 
     public $timeout = 300;
+
     public $tries = 3;
+
     public $maxExceptions = 1;
+
     public $failOnTimeout = true;
+
     public $deleteWhenMissingModels = true;
 
     /**
@@ -38,7 +41,7 @@ class MediaDeletePipeline implements ShouldQueue, ShouldBeUniqueUntilProcessing
      */
     public function uniqueId(): string
     {
-        return 'media:purge-job:id-' . $this->media->id;
+        return 'media:purge-job:id-'.$this->media->id;
     }
 
     /**
@@ -51,58 +54,58 @@ class MediaDeletePipeline implements ShouldQueue, ShouldBeUniqueUntilProcessing
         return [(new WithoutOverlapping("media:purge-job:id-{$this->media->id}"))->shared()->dontRelease()];
     }
 
-	public function __construct(Media $media)
-	{
-		$this->media = $media;
-	}
+    public function __construct(Media $media)
+    {
+        $this->media = $media;
+    }
 
-	public function handle()
-	{
-		$media = $this->media;
-		$path = $media->media_path;
-		$thumb = $media->thumbnail_path;
+    public function handle()
+    {
+        $media = $this->media;
+        $path = $media->media_path;
+        $thumb = $media->thumbnail_path;
 
-		if(!$path) {
-			return 1;
-		}
+        if (! $path) {
+            return 1;
+        }
 
-		$e = explode('/', $path);
-		array_pop($e);
-		$i = implode('/', $e);
+        $e = explode('/', $path);
+        array_pop($e);
+        $i = implode('/', $e);
 
-		if(config_cache('pixelfed.cloud_storage') == true) {
-			$disk = Storage::disk(config('filesystems.cloud'));
+        if ((bool) config_cache('pixelfed.cloud_storage') == true) {
+            $disk = Storage::disk(config('filesystems.cloud'));
 
-			if($path && $disk->exists($path)) {
-				$disk->delete($path);
-			}
+            if ($path && $disk->exists($path)) {
+                $disk->delete($path);
+            }
 
-			if($thumb && $disk->exists($thumb)) {
-				$disk->delete($thumb);
-			}
-		}
+            if ($thumb && $disk->exists($thumb)) {
+                $disk->delete($thumb);
+            }
+        }
 
-		$disk = Storage::disk(config('filesystems.local'));
+        $disk = Storage::disk(config('filesystems.local'));
 
-		if($path && $disk->exists($path)) {
-			$disk->delete($path);
-		}
+        if ($path && $disk->exists($path)) {
+            $disk->delete($path);
+        }
 
-		if($thumb && $disk->exists($thumb)) {
-			$disk->delete($thumb);
-		}
+        if ($thumb && $disk->exists($thumb)) {
+            $disk->delete($thumb);
+        }
 
-		if($media->hls_path != null) {
+        if ($media->hls_path != null) {
             $files = MediaHlsService::allFiles($media);
-            if($files && count($files)) {
-                foreach($files as $file) {
+            if ($files && count($files)) {
+                foreach ($files as $file) {
                     $disk->delete($file);
                 }
             }
-		}
+        }
 
-		$media->delete();
+        $media->delete();
 
-		return 1;
-	}
+        return 1;
+    }
 }
diff --git a/app/Jobs/MediaPipeline/MediaFixLocalFilesystemCleanupPipeline.php b/app/Jobs/MediaPipeline/MediaFixLocalFilesystemCleanupPipeline.php
index bbd3851b9..a972f1f86 100644
--- a/app/Jobs/MediaPipeline/MediaFixLocalFilesystemCleanupPipeline.php
+++ b/app/Jobs/MediaPipeline/MediaFixLocalFilesystemCleanupPipeline.php
@@ -8,68 +8,69 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Redis;
 use Illuminate\Support\Facades\Storage;
 
 class MediaFixLocalFilesystemCleanupPipeline implements ShouldQueue
 {
-	use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-	public $timeout = 1800;
-	public $tries = 5;
-	public $maxExceptions = 1;
+    public $timeout = 1800;
 
-	public function handle()
-	{
-		if(config_cache('pixelfed.cloud_storage') == false) {
-			// Only run if cloud storage is enabled
-			return;
-		}
+    public $tries = 5;
 
-		$disk = Storage::disk('local');
-		$cloud = Storage::disk(config('filesystems.cloud'));
+    public $maxExceptions = 1;
 
-		Media::whereNotNull(['status_id', 'cdn_url', 'replicated_at'])
-		->chunk(20, function ($medias) use($disk, $cloud) {
-			foreach($medias as $media) {
-				if(!str_starts_with($media->media_path, 'public')) {
-					continue;
-				}
+    public function handle()
+    {
+        if ((bool) config_cache('pixelfed.cloud_storage') == false) {
+            // Only run if cloud storage is enabled
+            return;
+        }
 
-				if($disk->exists($media->media_path) && $cloud->exists($media->media_path)) {
-					$disk->delete($media->media_path);
-				}
+        $disk = Storage::disk('local');
+        $cloud = Storage::disk(config('filesystems.cloud'));
 
-				if($media->thumbnail_path) {
-					if($disk->exists($media->thumbnail_path)) {
-						$disk->delete($media->thumbnail_path);
-					}
-				}
+        Media::whereNotNull(['status_id', 'cdn_url', 'replicated_at'])
+            ->chunk(20, function ($medias) use ($disk, $cloud) {
+                foreach ($medias as $media) {
+                    if (! str_starts_with($media->media_path, 'public')) {
+                        continue;
+                    }
 
-				$paths = explode('/', $media->media_path);
-				if(count($paths) === 7) {
-					array_pop($paths);
-					$baseDir = implode('/', $paths);
+                    if ($disk->exists($media->media_path) && $cloud->exists($media->media_path)) {
+                        $disk->delete($media->media_path);
+                    }
 
-					if(count($disk->allFiles($baseDir)) === 0) {
-						$disk->deleteDirectory($baseDir);
+                    if ($media->thumbnail_path) {
+                        if ($disk->exists($media->thumbnail_path)) {
+                            $disk->delete($media->thumbnail_path);
+                        }
+                    }
 
-						array_pop($paths);
-						$baseDir = implode('/', $paths);
+                    $paths = explode('/', $media->media_path);
+                    if (count($paths) === 7) {
+                        array_pop($paths);
+                        $baseDir = implode('/', $paths);
 
-						if(count($disk->allFiles($baseDir)) === 0) {
-							$disk->deleteDirectory($baseDir);
+                        if (count($disk->allFiles($baseDir)) === 0) {
+                            $disk->deleteDirectory($baseDir);
 
-							array_pop($paths);
-							$baseDir = implode('/', $paths);
+                            array_pop($paths);
+                            $baseDir = implode('/', $paths);
 
-							if(count($disk->allFiles($baseDir)) === 0) {
-								$disk->deleteDirectory($baseDir);
-							}
-						}
-					}
-				}
-			}
-		});
-	}
+                            if (count($disk->allFiles($baseDir)) === 0) {
+                                $disk->deleteDirectory($baseDir);
+
+                                array_pop($paths);
+                                $baseDir = implode('/', $paths);
+
+                                if (count($disk->allFiles($baseDir)) === 0) {
+                                    $disk->deleteDirectory($baseDir);
+                                }
+                            }
+                        }
+                    }
+                }
+            });
+    }
 }
diff --git a/app/Jobs/MovePipeline/CleanupLegacyAccountMovePipeline.php b/app/Jobs/MovePipeline/CleanupLegacyAccountMovePipeline.php
new file mode 100644
index 000000000..d26ad5624
--- /dev/null
+++ b/app/Jobs/MovePipeline/CleanupLegacyAccountMovePipeline.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace App\Jobs\MovePipeline;
+
+use App\Follower;
+use App\Profile;
+use App\Services\AccountService;
+use App\UserFilter;
+use App\Util\ActivityPub\Helpers;
+use DateTime;
+use Exception;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Queue\Queueable;
+use Illuminate\Queue\Middleware\ThrottlesExceptions;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+
+class CleanupLegacyAccountMovePipeline implements ShouldQueue
+{
+    use Queueable;
+
+    public $target;
+
+    public $activity;
+
+    /**
+     * The number of times the job may be attempted.
+     *
+     * @var int
+     */
+    public $tries = 6;
+
+    /**
+     * The maximum number of unhandled exceptions to allow before failing.
+     *
+     * @var int
+     */
+    public $maxExceptions = 3;
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct($target, $activity)
+    {
+        $this->target = $target;
+        $this->activity = $activity;
+    }
+
+    /**
+     * Get the middleware the job should pass through.
+     *
+     * @return array<int, object>
+     */
+    public function middleware(): array
+    {
+        return [
+            new WithoutOverlapping('process-move-cleanup-legacy-followers:'.$this->target),
+            (new ThrottlesExceptions(2, 5 * 60))->backoff(5),
+        ];
+    }
+
+    /**
+     * Determine the time at which the job should timeout.
+     */
+    public function retryUntil(): DateTime
+    {
+        return now()->addMinutes(5);
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        if (config('app.env') !== 'production' || (bool) config_cache('federation.activitypub.enabled') == false) {
+            throw new Exception('Activitypub not enabled');
+        }
+
+        $target = $this->target;
+        $actor = $this->activity;
+
+        $targetAccount = Helpers::profileFetch($target);
+        $actorAccount = Helpers::profileFetch($actor);
+
+        if (! $targetAccount || ! $actorAccount) {
+            throw new Exception('Invalid move accounts');
+        }
+
+        UserFilter::where('filterable_type', 'App\Profile')
+            ->where('filterable_id', $actorAccount['id'])
+            ->update(['filterable_id' => $targetAccount['id']]);
+
+        Follower::whereFollowingId($actorAccount['id'])->delete();
+
+        $oldProfile = Profile::find($actorAccount['id']);
+
+        if ($oldProfile) {
+            $oldProfile->moved_to_profile_id = $targetAccount['id'];
+            $oldProfile->save();
+            AccountService::del($oldProfile->id);
+            AccountService::del($targetAccount['id']);
+        }
+    }
+}
diff --git a/app/Jobs/MovePipeline/MoveMigrateFollowersPipeline.php b/app/Jobs/MovePipeline/MoveMigrateFollowersPipeline.php
new file mode 100644
index 000000000..1cde3818e
--- /dev/null
+++ b/app/Jobs/MovePipeline/MoveMigrateFollowersPipeline.php
@@ -0,0 +1,131 @@
+<?php
+
+namespace App\Jobs\MovePipeline;
+
+use App\Follower;
+use App\Util\ActivityPub\Helpers;
+use DateTime;
+use DB;
+use Exception;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Queue\Queueable;
+use Illuminate\Queue\Middleware\ThrottlesExceptionsWithRedis;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+
+class MoveMigrateFollowersPipeline implements ShouldQueue
+{
+    use Queueable;
+
+    public $target;
+
+    public $activity;
+
+    /**
+     * The number of times the job may be attempted.
+     *
+     * @var int
+     */
+    public $tries = 15;
+
+    /**
+     * The maximum number of unhandled exceptions to allow before failing.
+     *
+     * @var int
+     */
+    public $maxExceptions = 5;
+
+    /**
+     * The number of seconds the job can run before timing out.
+     *
+     * @var int
+     */
+    public $timeout = 900;
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct($target, $activity)
+    {
+        $this->target = $target;
+        $this->activity = $activity;
+    }
+
+    /**
+     * Get the middleware the job should pass through.
+     *
+     * @return array<int, object>
+     */
+    public function middleware(): array
+    {
+        return [
+            new WithoutOverlapping('process-move-migrate-followers:'.$this->target),
+            (new ThrottlesExceptionsWithRedis(5, 2 * 60))->backoff(1),
+        ];
+    }
+
+    /**
+     * Determine the time at which the job should timeout.
+     */
+    public function retryUntil(): DateTime
+    {
+        return now()->addMinutes(15);
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        if (config('app.env') !== 'production' || (bool) config_cache('federation.activitypub.enabled') == false) {
+            throw new Exception('Activitypub not enabled');
+        }
+
+        $target = $this->target;
+        $actor = $this->activity;
+
+        $targetAccount = Helpers::profileFetch($target);
+        $actorAccount = Helpers::profileFetch($actor);
+
+        if (! $targetAccount || ! $actorAccount) {
+            throw new Exception('Invalid move accounts');
+        }
+
+        $activity = [
+            '@context' => 'https://www.w3.org/ns/activitystreams',
+            'type' => 'Follow',
+            'actor' => null,
+            'object' => $target,
+        ];
+
+        $version = config('pixelfed.version');
+        $appUrl = config('app.url');
+        $userAgent = "(Pixelfed/{$version}; +{$appUrl})";
+        $addlHeaders = [
+            'Content-Type' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
+            'User-Agent' => $userAgent,
+        ];
+        $targetInbox = $targetAccount['sharedInbox'] ?? $targetAccount['inbox_url'];
+        $targetPid = $targetAccount['id'];
+
+        DB::table('followers')
+            ->join('profiles', 'followers.profile_id', '=', 'profiles.id')
+            ->where('followers.following_id', $actorAccount['id'])
+            ->whereNotNull('profiles.user_id')
+            ->whereNull('profiles.deleted_at')
+            ->select('profiles.id', 'profiles.user_id', 'profiles.username', 'profiles.private_key', 'profiles.status')
+            ->chunkById(100, function ($followers) use ($targetInbox, $targetPid, $target) {
+                foreach ($followers as $follower) {
+                    if (! $follower->private_key || ! $follower->username || ! $follower->user_id || $follower->status === 'delete') {
+                        continue;
+                    }
+
+                    Follower::updateOrCreate([
+                        'profile_id' => $follower->id,
+                        'following_id' => $targetPid,
+                    ]);
+
+                    MoveSendFollowPipeline::dispatch($follower, $targetInbox, $targetPid, $target)->onQueue('follow');
+                }
+            }, 'id');
+    }
+}
diff --git a/app/Jobs/MovePipeline/MoveSendFollowPipeline.php b/app/Jobs/MovePipeline/MoveSendFollowPipeline.php
new file mode 100644
index 000000000..6d1cef5e1
--- /dev/null
+++ b/app/Jobs/MovePipeline/MoveSendFollowPipeline.php
@@ -0,0 +1,113 @@
+<?php
+
+namespace App\Jobs\MovePipeline;
+
+use App\Util\ActivityPub\HttpSignature;
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\ClientException;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Queue\Queueable;
+use Illuminate\Queue\Middleware\ThrottlesExceptions;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+
+class MoveSendFollowPipeline implements ShouldQueue
+{
+    use Queueable;
+
+    public $follower;
+
+    public $targetInbox;
+
+    public $targetPid;
+
+    public $target;
+
+    /**
+     * The number of times the job may be attempted.
+     *
+     * @var int
+     */
+    public $tries = 5;
+
+    /**
+     * The maximum number of unhandled exceptions to allow before failing.
+     *
+     * @var int
+     */
+    public $maxExceptions = 3;
+
+    /**
+     * Get the middleware the job should pass through.
+     *
+     * @return array<int, object>
+     */
+    public function middleware(): array
+    {
+        return [
+            new WithoutOverlapping('move-send-follow:'.$this->follower->id.':target:'.$this->target),
+            (new ThrottlesExceptions(2, 5 * 60))->backoff(5),
+        ];
+    }
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct($follower, $targetInbox, $targetPid, $target)
+    {
+        $this->follower = $follower;
+        $this->targetInbox = $targetInbox;
+        $this->targetPid = $targetPid;
+        $this->target = $target;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        $follower = $this->follower;
+        $targetPid = $this->targetPid;
+        $targetInbox = $this->targetInbox;
+        $target = $this->target;
+
+        if (! $follower->username || ! $follower->private_key) {
+            return;
+        }
+
+        $permalink = 'https://'.config('pixelfed.domain.app').'/users/'.$follower->username;
+        $version = config('pixelfed.version');
+        $appUrl = config('app.url');
+        $userAgent = "(Pixelfed/{$version}; +{$appUrl})";
+        $addlHeaders = [
+            'Content-Type' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
+            'User-Agent' => $userAgent,
+        ];
+
+        $activity = [
+            '@context' => 'https://www.w3.org/ns/activitystreams',
+            'type' => 'Follow',
+            'actor' => $permalink,
+            'object' => $target,
+        ];
+
+        $keyId = $permalink.'#main-key';
+        $payload = json_encode($activity);
+        $headers = HttpSignature::signRaw($follower->private_key, $keyId, $targetInbox, $activity, $addlHeaders);
+
+        $client = new Client([
+            'timeout' => config('federation.activitypub.delivery.timeout'),
+        ]);
+
+        try {
+            $client->post($targetInbox, [
+                'curl' => [
+                    CURLOPT_HTTPHEADER => $headers,
+                    CURLOPT_POSTFIELDS => $payload,
+                    CURLOPT_HEADER => true,
+                ],
+            ]);
+        } catch (ClientException $e) {
+
+        }
+    }
+}
diff --git a/app/Jobs/MovePipeline/MoveSendUndoFollowPipeline.php b/app/Jobs/MovePipeline/MoveSendUndoFollowPipeline.php
new file mode 100644
index 000000000..952e8c1fa
--- /dev/null
+++ b/app/Jobs/MovePipeline/MoveSendUndoFollowPipeline.php
@@ -0,0 +1,119 @@
+<?php
+
+namespace App\Jobs\MovePipeline;
+
+use App\Util\ActivityPub\HttpSignature;
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\ClientException;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Queue\Queueable;
+use Illuminate\Queue\Middleware\ThrottlesExceptions;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+
+class MoveSendUndoFollowPipeline implements ShouldQueue
+{
+    use Queueable;
+
+    public $follower;
+
+    public $targetInbox;
+
+    public $targetPid;
+
+    public $actor;
+
+    /**
+     * The number of times the job may be attempted.
+     *
+     * @var int
+     */
+    public $tries = 5;
+
+    /**
+     * The maximum number of unhandled exceptions to allow before failing.
+     *
+     * @var int
+     */
+    public $maxExceptions = 3;
+
+    /**
+     * Get the middleware the job should pass through.
+     *
+     * @return array<int, object>
+     */
+    public function middleware(): array
+    {
+        return [
+            new WithoutOverlapping('move-send-unfollow:'.$this->follower->id.':actor:'.$this->actor),
+            (new ThrottlesExceptions(2, 5 * 60))->backoff(5),
+        ];
+    }
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct($follower, $targetInbox, $targetPid, $actor)
+    {
+        $this->follower = $follower;
+        $this->targetInbox = $targetInbox;
+        $this->targetPid = $targetPid;
+        $this->actor = $actor;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        $follower = $this->follower;
+        $targetPid = $this->targetPid;
+        $targetInbox = $this->targetInbox;
+        $actor = $this->actor;
+
+        if (! $follower->username || ! $follower->private_key) {
+            return;
+        }
+
+        $permalink = 'https://'.config('pixelfed.domain.app').'/users/'.$follower->username;
+        $version = config('pixelfed.version');
+        $appUrl = config('app.url');
+        $userAgent = "(Pixelfed/{$version}; +{$appUrl})";
+        $addlHeaders = [
+            'Content-Type' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
+            'User-Agent' => $userAgent,
+        ];
+
+        $activity = [
+            '@context' => 'https://www.w3.org/ns/activitystreams',
+            'type' => 'Undo',
+            'id' => $permalink.'#follow/'.$targetPid.'/undo',
+            'actor' => $permalink,
+            'object' => [
+                'type' => 'Follow',
+                'id' => $permalink.'#follows/'.$targetPid,
+                'object' => $actor,
+                'actor' => $permalink,
+            ],
+        ];
+
+        $keyId = $permalink.'#main-key';
+        $payload = json_encode($activity);
+        $headers = HttpSignature::signRaw($follower->private_key, $keyId, $targetInbox, $activity, $addlHeaders);
+
+        $client = new Client([
+            'timeout' => config('federation.activitypub.delivery.timeout'),
+        ]);
+
+        try {
+            $client->post($targetInbox, [
+                'curl' => [
+                    CURLOPT_HTTPHEADER => $headers,
+                    CURLOPT_POSTFIELDS => $payload,
+                    CURLOPT_HEADER => true,
+                ],
+            ]);
+        } catch (ClientException $e) {
+
+        }
+    }
+}
diff --git a/app/Jobs/MovePipeline/ProcessMovePipeline.php b/app/Jobs/MovePipeline/ProcessMovePipeline.php
new file mode 100644
index 000000000..1ff95f96c
--- /dev/null
+++ b/app/Jobs/MovePipeline/ProcessMovePipeline.php
@@ -0,0 +1,156 @@
+<?php
+
+namespace App\Jobs\MovePipeline;
+
+use App\Services\ActivityPubFetchService;
+use App\Util\ActivityPub\Helpers;
+use DateTime;
+use Exception;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Queue\Queueable;
+use Illuminate\Queue\Middleware\ThrottlesExceptionsWithRedis;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Support\Arr;
+
+class ProcessMovePipeline implements ShouldQueue
+{
+    use Queueable;
+
+    public $target;
+
+    public $activity;
+
+    /**
+     * The number of times the job may be attempted.
+     *
+     * @var int
+     */
+    public $tries = 15;
+
+    /**
+     * The maximum number of unhandled exceptions to allow before failing.
+     *
+     * @var int
+     */
+    public $maxExceptions = 5;
+
+    /**
+     * The number of seconds the job can run before timing out.
+     *
+     * @var int
+     */
+    public $timeout = 120;
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct($target, $activity)
+    {
+        $this->target = $target;
+        $this->activity = $activity;
+    }
+
+    /**
+     * Get the middleware the job should pass through.
+     *
+     * @return array<int, object>
+     */
+    public function middleware(): array
+    {
+        return [
+            new WithoutOverlapping('process-move:'.$this->target),
+            (new ThrottlesExceptionsWithRedis(5, 2 * 60))->backoff(1),
+        ];
+    }
+
+    /**
+     * Determine the time at which the job should timeout.
+     */
+    public function retryUntil(): DateTime
+    {
+        return now()->addMinutes(10);
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        if (config('app.env') !== 'production' || (bool) config_cache('federation.activitypub.enabled') == false) {
+            throw new Exception('Activitypub not enabled');
+        }
+
+        $validTarget = $this->checkTarget();
+        if (! $validTarget) {
+            throw new Exception('Invalid target');
+        }
+
+        $validActor = $this->checkActor();
+        if (! $validActor) {
+            throw new Exception('Invalid actor');
+        }
+
+    }
+
+    protected function checkTarget()
+    {
+        $fetchTargetUrl = $this->target.'?cb='.time();
+        $res = ActivityPubFetchService::fetchRequest($fetchTargetUrl, true);
+
+        if (! $res || ! isset($res['alsoKnownAs'])) {
+            return false;
+        }
+
+        $targetRes = Helpers::profileFetch($this->target);
+        if (! $targetRes) {
+            return false;
+        }
+
+        if (is_string($res['alsoKnownAs'])) {
+            return $this->lowerTrim($res['alsoKnownAs']) === $this->lowerTrim($this->activity);
+        }
+
+        if (is_array($res['alsoKnownAs'])) {
+            $map = Arr::map($res['alsoKnownAs'], function ($value, $key) {
+                return trim(strtolower($value));
+            });
+
+            $res = in_array($this->activity, $map);
+
+            return $res;
+        }
+
+        return false;
+    }
+
+    protected function checkActor()
+    {
+        $fetchActivityUrl = $this->activity.'?cb='.time();
+        $res = ActivityPubFetchService::fetchRequest($fetchActivityUrl, true);
+
+        if (! $res || ! isset($res['movedTo']) || empty($res['movedTo'])) {
+            return false;
+        }
+
+        $actorRes = Helpers::profileFetch($this->activity);
+        if (! $actorRes) {
+            return false;
+        }
+
+        if (is_string($res['movedTo'])) {
+            $match = $this->lowerTrim($res['movedTo']) === $this->lowerTrim($this->target);
+            if (! $match) {
+                return false;
+            }
+
+            return $match;
+        }
+
+        return false;
+    }
+
+    protected function lowerTrim($str)
+    {
+        return trim(strtolower($str));
+    }
+}
diff --git a/app/Jobs/MovePipeline/UnfollowLegacyAccountMovePipeline.php b/app/Jobs/MovePipeline/UnfollowLegacyAccountMovePipeline.php
new file mode 100644
index 000000000..47ed2aeb6
--- /dev/null
+++ b/app/Jobs/MovePipeline/UnfollowLegacyAccountMovePipeline.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace App\Jobs\MovePipeline;
+
+use App\Util\ActivityPub\Helpers;
+use DateTime;
+use DB;
+use Exception;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Queue\Queueable;
+use Illuminate\Queue\Middleware\ThrottlesExceptions;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+
+class UnfollowLegacyAccountMovePipeline implements ShouldQueue
+{
+    use Queueable;
+
+    public $target;
+
+    public $activity;
+
+    /**
+     * The number of times the job may be attempted.
+     *
+     * @var int
+     */
+    public $tries = 6;
+
+    /**
+     * The maximum number of unhandled exceptions to allow before failing.
+     *
+     * @var int
+     */
+    public $maxExceptions = 3;
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct($target, $activity)
+    {
+        $this->target = $target;
+        $this->activity = $activity;
+    }
+
+    /**
+     * Get the middleware the job should pass through.
+     *
+     * @return array<int, object>
+     */
+    public function middleware(): array
+    {
+        return [
+            new WithoutOverlapping('process-move-undo-legacy-followers:'.$this->target),
+            (new ThrottlesExceptions(2, 5 * 60))->backoff(5),
+        ];
+    }
+
+    /**
+     * Determine the time at which the job should timeout.
+     */
+    public function retryUntil(): DateTime
+    {
+        return now()->addMinutes(5);
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        if (config('app.env') !== 'production' || (bool) config_cache('federation.activitypub.enabled') == false) {
+            throw new Exception('Activitypub not enabled');
+        }
+
+        $target = $this->target;
+        $actor = $this->activity;
+
+        $targetAccount = Helpers::profileFetch($target);
+        $actorAccount = Helpers::profileFetch($actor);
+
+        if (! $targetAccount || ! $actorAccount) {
+            throw new Exception('Invalid move accounts');
+        }
+
+        $version = config('pixelfed.version');
+        $appUrl = config('app.url');
+        $userAgent = "(Pixelfed/{$version}; +{$appUrl})";
+        $addlHeaders = [
+            'Content-Type' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
+            'User-Agent' => $userAgent,
+        ];
+        $targetInbox = $actorAccount['sharedInbox'] ?? $actorAccount['inbox_url'];
+        $targetPid = $actorAccount['id'];
+
+        DB::table('followers')
+            ->join('profiles', 'followers.profile_id', '=', 'profiles.id')
+            ->where('followers.following_id', $actorAccount['id'])
+            ->whereNotNull('profiles.user_id')
+            ->whereNull('profiles.deleted_at')
+            ->select('profiles.id', 'profiles.user_id', 'profiles.username', 'profiles.private_key', 'profiles.status')
+            ->chunkById(100, function ($followers) use ($actor, $targetInbox, $targetPid) {
+                foreach ($followers as $follower) {
+                    if (! $follower->id || ! $follower->private_key || ! $follower->username || ! $follower->user_id || $follower->status === 'delete') {
+                        continue;
+                    }
+
+                    MoveSendUndoFollowPipeline::dispatch($follower, $targetInbox, $targetPid, $actor)->onQueue('move');
+                }
+            }, 'id');
+    }
+}
diff --git a/app/Jobs/ParentalControlsPipeline/DispatchChildInvitePipeline.php b/app/Jobs/ParentalControlsPipeline/DispatchChildInvitePipeline.php
new file mode 100644
index 000000000..a67f4e444
--- /dev/null
+++ b/app/Jobs/ParentalControlsPipeline/DispatchChildInvitePipeline.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Jobs\ParentalControlsPipeline;
+
+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\Models\ParentalControls;
+use App\Mail\ParentChildInvite;
+use Illuminate\Support\Facades\Mail;
+
+class DispatchChildInvitePipeline implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $pc;
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct(ParentalControls $pc)
+    {
+        $this->pc = $pc;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        $pc = $this->pc;
+
+        Mail::to($pc->email)->send(new ParentChildInvite($pc));
+    }
+}
diff --git a/app/Jobs/ProfilePipeline/DecrementPostCount.php b/app/Jobs/ProfilePipeline/DecrementPostCount.php
index b463f1dda..74d0523b5 100644
--- a/app/Jobs/ProfilePipeline/DecrementPostCount.php
+++ b/app/Jobs/ProfilePipeline/DecrementPostCount.php
@@ -35,18 +35,7 @@ class DecrementPostCount implements ShouldQueue
      */
     public function handle()
     {
-        $id = $this->id;
-
-        $profile = Profile::find($id);
-
-        if(!$profile) {
-            return 1;
-        }
-
-        $profile->status_count = $profile->status_count ? $profile->status_count - 1 : 0;
-        $profile->save();
-        AccountService::del($id);
-
-        return 1;
+        // deprecated
+        return;
     }
 }
diff --git a/app/Jobs/ProfilePipeline/IncrementPostCount.php b/app/Jobs/ProfilePipeline/IncrementPostCount.php
index fe8d90648..a1f9ceca7 100644
--- a/app/Jobs/ProfilePipeline/IncrementPostCount.php
+++ b/app/Jobs/ProfilePipeline/IncrementPostCount.php
@@ -8,6 +8,8 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing;
 use App\Profile;
 use App\Status;
 use App\Services\AccountService;
@@ -35,19 +37,7 @@ class IncrementPostCount implements ShouldQueue
 	 */
 	public function handle()
 	{
-		$id = $this->id;
-
-		$profile = Profile::find($id);
-
-		if(!$profile) {
-			return 1;
-		}
-
-		$profile->status_count = $profile->status_count + 1;
-		$profile->last_status_at = now();
-		$profile->save();
-		AccountService::del($id);
-
-		return 1;
+        // deprecated
+        return;
 	}
 }
diff --git a/app/Jobs/ProfilePipeline/ProfileMigrationDeliverMoveActivityPipeline.php b/app/Jobs/ProfilePipeline/ProfileMigrationDeliverMoveActivityPipeline.php
new file mode 100644
index 000000000..7b8e15c03
--- /dev/null
+++ b/app/Jobs/ProfilePipeline/ProfileMigrationDeliverMoveActivityPipeline.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace App\Jobs\ProfilePipeline;
+
+use App\Transformer\ActivityPub\Verb\Move;
+use App\Util\ActivityPub\HttpSignature;
+use GuzzleHttp\Client;
+use GuzzleHttp\Pool;
+use Illuminate\Bus\Batchable;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Queue\SerializesModels;
+use League\Fractal;
+use League\Fractal\Serializer\ArraySerializer;
+
+class ProfileMigrationDeliverMoveActivityPipeline implements ShouldBeUniqueUntilProcessing, ShouldQueue
+{
+    use Batchable, Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $migration;
+
+    public $oldAccount;
+
+    public $newAccount;
+
+    public $timeout = 1400;
+
+    public $tries = 3;
+
+    public $maxExceptions = 1;
+
+    public $failOnTimeout = true;
+
+    /**
+     * The number of seconds after which the job's unique lock will be released.
+     *
+     * @var int
+     */
+    public $uniqueFor = 3600;
+
+    /**
+     * Get the unique ID for the job.
+     */
+    public function uniqueId(): string
+    {
+        return 'profile:migration:deliver-move-followers:id:'.$this->migration->id;
+    }
+
+    /**
+     * Get the middleware the job should pass through.
+     *
+     * @return array<int, object>
+     */
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping('profile:migration:deliver-move-followers:id:'.$this->migration->id))->shared()->dontRelease()];
+    }
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct($migration, $oldAccount, $newAccount)
+    {
+        $this->migration = $migration;
+        $this->oldAccount = $oldAccount;
+        $this->newAccount = $newAccount;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        if ($this->batch()->cancelled()) {
+            return;
+        }
+
+        $migration = $this->migration;
+        $profile = $this->oldAccount;
+        $newAccount = $this->newAccount;
+
+        if ($profile->domain || ! $profile->private_key) {
+            return;
+        }
+
+        $audience = $profile->getAudienceInbox();
+        $activitypubObject = new Move();
+
+        $fractal = new Fractal\Manager();
+        $fractal->setSerializer(new ArraySerializer());
+        $resource = new Fractal\Resource\Item($migration, $activitypubObject);
+        $activity = $fractal->createData($resource)->toArray();
+
+        $payload = json_encode($activity);
+
+        $client = new Client([
+            'timeout' => config('federation.activitypub.delivery.timeout'),
+        ]);
+
+        $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' => config('federation.activitypub.delivery.concurrency'),
+            'fulfilled' => function ($response, $index) {
+            },
+            'rejected' => function ($reason, $index) {
+            },
+        ]);
+
+        $promise = $pool->promise();
+
+        $promise->wait();
+    }
+}
diff --git a/app/Jobs/ProfilePipeline/ProfileMigrationMoveFollowersPipeline.php b/app/Jobs/ProfilePipeline/ProfileMigrationMoveFollowersPipeline.php
new file mode 100644
index 000000000..c3d825ec9
--- /dev/null
+++ b/app/Jobs/ProfilePipeline/ProfileMigrationMoveFollowersPipeline.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace App\Jobs\ProfilePipeline;
+
+use App\Follower;
+use App\Profile;
+use App\Services\AccountService;
+use Illuminate\Bus\Batchable;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Queue\SerializesModels;
+
+class ProfileMigrationMoveFollowersPipeline implements ShouldBeUniqueUntilProcessing, ShouldQueue
+{
+    use Batchable, Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public $oldPid;
+
+    public $newPid;
+
+    public $timeout = 1400;
+
+    public $tries = 3;
+
+    public $maxExceptions = 1;
+
+    public $failOnTimeout = true;
+
+    /**
+     * The number of seconds after which the job's unique lock will be released.
+     *
+     * @var int
+     */
+    public $uniqueFor = 3600;
+
+    /**
+     * Get the unique ID for the job.
+     */
+    public function uniqueId(): string
+    {
+        return 'profile:migration:move-followers:oldpid-'.$this->oldPid.':newpid-'.$this->newPid;
+    }
+
+    /**
+     * Get the middleware the job should pass through.
+     *
+     * @return array<int, object>
+     */
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping('profile:migration:move-followers:oldpid-'.$this->oldPid.':newpid-'.$this->newPid))->shared()->dontRelease()];
+    }
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct($oldPid, $newPid)
+    {
+        $this->oldPid = $oldPid;
+        $this->newPid = $newPid;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        if ($this->batch()->cancelled()) {
+            return;
+        }
+        $og = Profile::find($this->oldPid);
+        $ne = Profile::find($this->newPid);
+        if (! $og || ! $ne || $og == $ne) {
+            return;
+        }
+        $ne->followers_count = $og->followers_count;
+        $ne->save();
+        $og->followers_count = 0;
+        $og->save();
+        foreach (Follower::whereFollowingId($this->oldPid)->lazyById(200, 'id') as $follower) {
+            try {
+                $follower->following_id = $this->newPid;
+                $follower->save();
+            } catch (Exception $e) {
+                $follower->delete();
+            }
+        }
+        AccountService::del($this->oldPid);
+        AccountService::del($this->newPid);
+    }
+}
diff --git a/app/Jobs/ProfilePipeline/ProfilePurgeFollowersByDomain.php b/app/Jobs/ProfilePipeline/ProfilePurgeFollowersByDomain.php
new file mode 100644
index 000000000..24fcdc832
--- /dev/null
+++ b/app/Jobs/ProfilePipeline/ProfilePurgeFollowersByDomain.php
@@ -0,0 +1,119 @@
+<?php
+
+namespace App\Jobs\ProfilePipeline;
+
+use Illuminate\Bus\Batchable;
+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 Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing;
+use App\Follower;
+use App\Profile;
+use App\Notification;
+use DB;
+use App\Services\AccountService;
+use App\Services\FollowerService;
+use App\Services\NotificationService;
+
+class ProfilePurgeFollowersByDomain implements ShouldQueue, ShouldBeUniqueUntilProcessing
+{
+    use Batchable, Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $pid;
+    protected $domain;
+
+    public $timeout = 900;
+    public $tries = 3;
+    public $maxExceptions = 1;
+    public $failOnTimeout = true;
+
+    /**
+     * The number of seconds after which the job's unique lock will be released.
+     *
+     * @var int
+     */
+    public $uniqueFor = 3600;
+
+    /**
+     * Get the unique ID for the job.
+     */
+    public function uniqueId(): string
+    {
+        return 'followers:v1:purge-by-domain:' . $this->pid . ':d-' . $this->domain;
+    }
+
+    /**
+     * Get the middleware the job should pass through.
+     *
+     * @return array<int, object>
+     */
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping("followers:v1:purge-by-domain:{$this->pid}:d-{$this->domain}"))->shared()->dontRelease()];
+    }
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct($pid, $domain)
+    {
+        $this->pid = $pid;
+        $this->domain = $domain;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        if ($this->batch()->cancelled()) {
+            return;
+        }
+
+        $pid = $this->pid;
+        $domain = $this->domain;
+
+        $query = 'SELECT f.*
+            FROM followers f
+            JOIN profiles p ON p.id = f.profile_id OR p.id = f.following_id
+            WHERE (f.profile_id = ? OR f.following_id = ?)
+            AND p.domain = ?;';
+        $params = [$pid, $pid, $domain];
+
+        foreach(DB::cursor($query, $params) as $n) {
+            if(!$n || !$n->id) {
+                continue;
+            }
+            $follower = Follower::find($n->id);
+            if($follower->following_id == $pid && $follower->profile_id) {
+                FollowerService::remove($follower->profile_id, $pid, true);
+                $follower->delete();
+            } else if ($follower->profile_id == $pid && $follower->following_id) {
+                FollowerService::remove($follower->following_id, $pid, true);
+                $follower->delete();
+            }
+        }
+
+        $profile = Profile::find($pid);
+
+        $followerCount = DB::table('profiles')
+            ->join('followers', 'profiles.id', '=', 'followers.following_id')
+            ->where('followers.following_id', $pid)
+            ->count();
+
+        $followingCount = DB::table('profiles')
+            ->join('followers', 'profiles.id', '=', 'followers.following_id')
+            ->where('followers.profile_id', $pid)
+            ->count();
+
+        $profile->followers_count = $followerCount;
+        $profile->following_count = $followingCount;
+        $profile->save();
+
+        AccountService::del($profile->id);
+    }
+}
diff --git a/app/Jobs/ProfilePipeline/ProfilePurgeNotificationsByDomain.php b/app/Jobs/ProfilePipeline/ProfilePurgeNotificationsByDomain.php
new file mode 100644
index 000000000..ea5a45e4a
--- /dev/null
+++ b/app/Jobs/ProfilePipeline/ProfilePurgeNotificationsByDomain.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace App\Jobs\ProfilePipeline;
+
+use Illuminate\Bus\Batchable;
+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 Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing;
+use App\Notification;
+use DB;
+use App\Services\NotificationService;
+
+class ProfilePurgeNotificationsByDomain implements ShouldQueue, ShouldBeUniqueUntilProcessing
+{
+    use Batchable, Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $pid;
+    protected $domain;
+
+    public $timeout = 900;
+    public $tries = 3;
+    public $maxExceptions = 1;
+    public $failOnTimeout = true;
+
+    /**
+     * The number of seconds after which the job's unique lock will be released.
+     *
+     * @var int
+     */
+    public $uniqueFor = 3600;
+
+    /**
+     * Get the unique ID for the job.
+     */
+    public function uniqueId(): string
+    {
+        return 'notify:v1:purge-by-domain:' . $this->pid . ':d-' . $this->domain;
+    }
+
+    /**
+     * Get the middleware the job should pass through.
+     *
+     * @return array<int, object>
+     */
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping("notify:v1:purge-by-domain:{$this->pid}:d-{$this->domain}"))->shared()->dontRelease()];
+    }
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct($pid, $domain)
+    {
+        $this->pid = $pid;
+        $this->domain = $domain;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        if ($this->batch()->cancelled()) {
+            return;
+        }
+
+        $pid = $this->pid;
+        $domain = $this->domain;
+
+        $query = 'SELECT notifications.*
+            FROM profiles
+            JOIN notifications on profiles.id = notifications.actor_id
+            WHERE notifications.profile_id = ?
+            AND profiles.domain = ?';
+        $params = [$pid, $domain];
+
+        foreach(DB::cursor($query, $params) as $n) {
+            if(!$n || !$n->id) {
+                continue;
+            }
+            Notification::where('id', $n->id)->delete();
+            NotificationService::del($pid, $n->id);
+        }
+    }
+}
diff --git a/app/Jobs/PushNotificationPipeline/FollowPushNotifyPipeline.php b/app/Jobs/PushNotificationPipeline/FollowPushNotifyPipeline.php
new file mode 100644
index 000000000..ee286f5f2
--- /dev/null
+++ b/app/Jobs/PushNotificationPipeline/FollowPushNotifyPipeline.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Jobs\PushNotificationPipeline;
+
+use App\Services\NotificationAppGatewayService;
+use Exception;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Queue\Queueable;
+
+class FollowPushNotifyPipeline implements ShouldQueue
+{
+    use Queueable;
+
+    public $pushToken;
+
+    public $actor;
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct($pushToken, $actor)
+    {
+        $this->pushToken = $pushToken;
+        $this->actor = $actor;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        try {
+            NotificationAppGatewayService::send($this->pushToken, 'follow', $this->actor);
+        } catch (Exception $e) {
+            return;
+        }
+    }
+}
diff --git a/app/Jobs/PushNotificationPipeline/LikePushNotifyPipeline.php b/app/Jobs/PushNotificationPipeline/LikePushNotifyPipeline.php
new file mode 100644
index 000000000..892624b5a
--- /dev/null
+++ b/app/Jobs/PushNotificationPipeline/LikePushNotifyPipeline.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Jobs\PushNotificationPipeline;
+
+use App\Services\NotificationAppGatewayService;
+use Exception;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Queue\Queueable;
+
+class LikePushNotifyPipeline implements ShouldQueue
+{
+    use Queueable;
+
+    public $pushToken;
+
+    public $actor;
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct($pushToken, $actor)
+    {
+        $this->pushToken = $pushToken;
+        $this->actor = $actor;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        try {
+            NotificationAppGatewayService::send($this->pushToken, 'like', $this->actor);
+        } catch (Exception $e) {
+            return;
+        }
+    }
+}
diff --git a/app/Jobs/PushNotificationPipeline/MentionPushNotifyPipeline.php b/app/Jobs/PushNotificationPipeline/MentionPushNotifyPipeline.php
new file mode 100644
index 000000000..cad8c6fb5
--- /dev/null
+++ b/app/Jobs/PushNotificationPipeline/MentionPushNotifyPipeline.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Jobs\PushNotificationPipeline;
+
+use App\Services\NotificationAppGatewayService;
+use Exception;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Queue\Queueable;
+
+class MentionPushNotifyPipeline implements ShouldQueue
+{
+    use Queueable;
+
+    public $pushToken;
+
+    public $actor;
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct($pushToken, $actor)
+    {
+        $this->pushToken = $pushToken;
+        $this->actor = $actor;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        try {
+            NotificationAppGatewayService::send($this->pushToken, 'mention', $this->actor);
+        } catch (Exception $e) {
+            return;
+        }
+    }
+}
diff --git a/app/Jobs/RemoteFollowPipeline/RemoteFollowImportRecent.php b/app/Jobs/RemoteFollowPipeline/RemoteFollowImportRecent.php
index 5b413ecc1..394c2cfb8 100644
--- a/app/Jobs/RemoteFollowPipeline/RemoteFollowImportRecent.php
+++ b/app/Jobs/RemoteFollowPipeline/RemoteFollowImportRecent.php
@@ -17,6 +17,7 @@ use Log;
 use Storage;
 use Zttp\Zttp;
 use App\Util\ActivityPub\Helpers;
+use App\Services\MediaPathService;
 
 class RemoteFollowImportRecent implements ShouldQueue
 {
@@ -45,7 +46,6 @@ class RemoteFollowImportRecent implements ShouldQueue
             'image/jpg',
             'image/jpeg',
             'image/png',
-            'image/gif',
         ];
     }
 
@@ -208,9 +208,7 @@ class RemoteFollowImportRecent implements ShouldQueue
     public function importMedia($url, $mime, $status)
     {
         $user = $this->profile;
-        $monthHash = hash('sha1', date('Y').date('m'));
-        $userHash = hash('sha1', $user->id.(string) $user->created_at);
-        $storagePath = "public/m/{$monthHash}/{$userHash}";
+        $storagePath = MediaPathService::get($user, 2);
 
         try {
             $info = pathinfo($url);
diff --git a/app/Jobs/SharePipeline/SharePipeline.php b/app/Jobs/SharePipeline/SharePipeline.php
index ae184957e..734c44231 100644
--- a/app/Jobs/SharePipeline/SharePipeline.php
+++ b/app/Jobs/SharePipeline/SharePipeline.php
@@ -2,9 +2,15 @@
 
 namespace App\Jobs\SharePipeline;
 
-use Cache, Log;
-use Illuminate\Support\Facades\Redis;
-use App\{Status, Notification};
+use App\Jobs\HomeFeedPipeline\FeedInsertPipeline;
+use App\Notification;
+use App\Services\ReblogService;
+use App\Services\StatusService;
+use App\Status;
+use App\Transformer\ActivityPub\Verb\Announce;
+use App\Util\ActivityPub\HttpSignature;
+use GuzzleHttp\Client;
+use GuzzleHttp\Pool;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
@@ -12,138 +18,136 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use League\Fractal;
 use League\Fractal\Serializer\ArraySerializer;
-use App\Transformer\ActivityPub\Verb\Announce;
-use GuzzleHttp\{Pool, Client, Promise};
-use App\Util\ActivityPub\HttpSignature;
-use App\Services\ReblogService;
-use App\Services\StatusService;
 
 class SharePipeline implements ShouldQueue
 {
-	use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-	protected $status;
+    protected $status;
 
-	/**
-	 * Delete the job if its models no longer exist.
-	 *
-	 * @var bool
-	 */
-	public $deleteWhenMissingModels = true;
+    /**
+     * Delete the job if its models no longer exist.
+     *
+     * @var bool
+     */
+    public $deleteWhenMissingModels = true;
 
-	/**
-	 * Create a new job instance.
-	 *
-	 * @return void
-	 */
-	public function __construct(Status $status)
-	{
-		$this->status = $status;
-	}
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct(Status $status)
+    {
+        $this->status = $status;
+    }
 
-	/**
-	 * Execute the job.
-	 *
-	 * @return void
-	 */
-	public function handle()
-	{
-		$status = $this->status;
-		$parent = Status::find($this->status->reblog_of_id);
-        if(!$parent) {
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $status = $this->status;
+        $parent = Status::find($this->status->reblog_of_id);
+        if (! $parent) {
             return;
         }
-		$actor = $status->profile;
-		$target = $parent->profile;
+        $actor = $status->profile;
+        $target = $parent->profile;
 
-		if ($status->uri !== null) {
-			// Ignore notifications to remote statuses
-			return;
-		}
+        if ($status->uri !== null) {
+            // Ignore notifications to remote statuses
+            return;
+        }
 
-		if($target->id === $status->profile_id) {
-			$this->remoteAnnounceDeliver();
-			return true;
-		}
+        if ($target->id === $status->profile_id) {
+            $this->remoteAnnounceDeliver();
 
-		ReblogService::addPostReblog($parent->profile_id, $status->id);
+            return true;
+        }
 
-		$parent->reblogs_count = $parent->reblogs_count + 1;
-		$parent->save();
-		StatusService::del($parent->id);
+        ReblogService::addPostReblog($parent->profile_id, $status->id);
 
-		Notification::firstOrCreate(
-			[
-				'profile_id' => $target->id,
-				'actor_id' => $actor->id,
-				'action' => 'share',
-				'item_type' => 'App\Status',
-				'item_id' => $status->reblog_of_id ?? $status->id,
-			]
-		);
+        $parent->reblogs_count = $parent->reblogs_count + 1;
+        $parent->save();
+        StatusService::del($parent->id);
 
-		return $this->remoteAnnounceDeliver();
-	}
+        Notification::firstOrCreate(
+            [
+                'profile_id' => $target->id,
+                'actor_id' => $actor->id,
+                'action' => 'share',
+                'item_type' => 'App\Status',
+                'item_id' => $status->reblog_of_id ?? $status->id,
+            ]
+        );
 
-	public function remoteAnnounceDeliver()
-	{
-		if(config('app.env') !== 'production' || config_cache('federation.activitypub.enabled') == false) {
-			return true;
-		}
-		$status = $this->status;
-		$profile = $status->profile;
+        FeedInsertPipeline::dispatch($status->id, $status->profile_id)->onQueue('feed');
 
-		$fractal = new Fractal\Manager();
-		$fractal->setSerializer(new ArraySerializer());
-		$resource = new Fractal\Resource\Item($status, new Announce());
-		$activity = $fractal->createData($resource)->toArray();
+        return $this->remoteAnnounceDeliver();
+    }
 
-		$audience = $status->profile->getAudienceInbox();
+    public function remoteAnnounceDeliver()
+    {
+        if (config('app.env') !== 'production' || (bool) config_cache('federation.activitypub.enabled') == false) {
+            return true;
+        }
+        $status = $this->status;
+        $profile = $status->profile;
 
-		if(empty($audience) || $status->scope != 'public') {
-			// Return on profiles with no remote followers
-			return;
-		}
+        $fractal = new Fractal\Manager();
+        $fractal->setSerializer(new ArraySerializer());
+        $resource = new Fractal\Resource\Item($status, new Announce());
+        $activity = $fractal->createData($resource)->toArray();
 
-		$payload = json_encode($activity);
+        $audience = $status->profile->getAudienceInbox();
 
-		$client = new Client([
-			'timeout'  => config('federation.activitypub.delivery.timeout')
-		]);
+        if (empty($audience) || $status->scope != 'public') {
+            // Return on profiles with no remote followers
+            return;
+        }
 
-		$version = config('pixelfed.version');
-		$appUrl = config('app.url');
-		$userAgent = "(Pixelfed/{$version}; +{$appUrl})";
+        $payload = json_encode($activity);
 
-		$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
-						]
-					]);
-				};
-			}
-		};
+        $client = new Client([
+            'timeout' => config('federation.activitypub.delivery.timeout'),
+        ]);
 
-		$pool = new Pool($client, $requests($audience), [
-			'concurrency' => config('federation.activitypub.delivery.concurrency'),
-			'fulfilled' => function ($response, $index) {
-			},
-			'rejected' => function ($reason, $index) {
-			}
-		]);
+        $version = config('pixelfed.version');
+        $appUrl = config('app.url');
+        $userAgent = "(Pixelfed/{$version}; +{$appUrl})";
 
-		$promise = $pool->promise();
+        $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,
+                        ],
+                    ]);
+                };
+            }
+        };
 
-		$promise->wait();
+        $pool = new Pool($client, $requests($audience), [
+            'concurrency' => config('federation.activitypub.delivery.concurrency'),
+            'fulfilled' => function ($response, $index) {
+            },
+            'rejected' => function ($reason, $index) {
+            },
+        ]);
 
-	}
+        $promise = $pool->promise();
+
+        $promise->wait();
+
+    }
 }
diff --git a/app/Jobs/SharePipeline/UndoSharePipeline.php b/app/Jobs/SharePipeline/UndoSharePipeline.php
index 3850a4752..af3239953 100644
--- a/app/Jobs/SharePipeline/UndoSharePipeline.php
+++ b/app/Jobs/SharePipeline/UndoSharePipeline.php
@@ -2,9 +2,15 @@
 
 namespace App\Jobs\SharePipeline;
 
-use Cache, Log;
-use Illuminate\Support\Facades\Redis;
-use App\{Status, Notification};
+use App\Jobs\HomeFeedPipeline\FeedRemovePipeline;
+use App\Notification;
+use App\Services\ReblogService;
+use App\Services\StatusService;
+use App\Status;
+use App\Transformer\ActivityPub\Verb\UndoAnnounce;
+use App\Util\ActivityPub\HttpSignature;
+use GuzzleHttp\Client;
+use GuzzleHttp\Pool;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
@@ -12,125 +18,125 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use League\Fractal;
 use League\Fractal\Serializer\ArraySerializer;
-use App\Transformer\ActivityPub\Verb\UndoAnnounce;
-use GuzzleHttp\{Pool, Client, Promise};
-use App\Util\ActivityPub\HttpSignature;
-use App\Services\ReblogService;
-use App\Services\StatusService;
 
 class UndoSharePipeline implements ShouldQueue
 {
-	use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-	protected $status;
-	public $deleteWhenMissingModels = true;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-	public function __construct(Status $status)
-	{
-		$this->status = $status;
-	}
+    protected $status;
 
-	public function handle()
-	{
-		$status = $this->status;
-		$actor = $status->profile;
-		$parent = Status::find($status->reblog_of_id);
+    public $deleteWhenMissingModels = true;
 
-		if($parent) {
-			$target = $parent->profile_id;
-			ReblogService::removePostReblog($parent->profile_id, $status->id);
+    public function __construct(Status $status)
+    {
+        $this->status = $status;
+    }
 
-			if($parent->reblogs_count > 0) {
-				$parent->reblogs_count = $parent->reblogs_count - 1;
-				$parent->save();
-				StatusService::del($parent->id);
-			}
+    public function handle()
+    {
+        $status = $this->status;
+        $actor = $status->profile;
+        $parent = Status::find($status->reblog_of_id);
 
-			$notification = Notification::whereProfileId($target)
-				->whereActorId($status->profile_id)
-				->whereAction('share')
-				->whereItemId($status->reblog_of_id)
-				->whereItemType('App\Status')
-				->first();
+        FeedRemovePipeline::dispatch($status->id, $status->profile_id)->onQueue('feed');
 
-			if($notification) {
-				$notification->forceDelete();
-			}
-		}
+        if ($parent) {
+            $target = $parent->profile_id;
+            ReblogService::removePostReblog($parent->profile_id, $status->id);
 
-		if ($status->uri != null) {
-			return;
-		}
+            if ($parent->reblogs_count > 0) {
+                $parent->reblogs_count = $parent->reblogs_count - 1;
+                $parent->save();
+                StatusService::del($parent->id);
+            }
 
-		if(config('app.env') !== 'production' || config_cache('federation.activitypub.enabled') == false) {
-			return $status->delete();
-		} else {
-			return $this->remoteAnnounceDeliver();
-		}
-	}
+            $notification = Notification::whereProfileId($target)
+                ->whereActorId($status->profile_id)
+                ->whereAction('share')
+                ->whereItemId($status->reblog_of_id)
+                ->whereItemType('App\Status')
+                ->first();
 
-	public function remoteAnnounceDeliver()
-	{
-		if(config('app.env') !== 'production' || config_cache('federation.activitypub.enabled') == false) {
+            if ($notification) {
+                $notification->forceDelete();
+            }
+        }
+
+        if ($status->uri != null) {
+            return;
+        }
+
+        if (config('app.env') !== 'production' || (bool) config_cache('federation.activitypub.enabled') == false) {
+            return $status->delete();
+        } else {
+            return $this->remoteAnnounceDeliver();
+        }
+    }
+
+    public function remoteAnnounceDeliver()
+    {
+        if (config('app.env') !== 'production' || (bool) config_cache('federation.activitypub.enabled') == false) {
             $status->delete();
-			return 1;
-		}
 
-		$status = $this->status;
-		$profile = $status->profile;
+            return 1;
+        }
 
-		$fractal = new Fractal\Manager();
-		$fractal->setSerializer(new ArraySerializer());
-		$resource = new Fractal\Resource\Item($status, new UndoAnnounce());
-		$activity = $fractal->createData($resource)->toArray();
+        $status = $this->status;
+        $profile = $status->profile;
 
-		$audience = $status->profile->getAudienceInbox();
+        $fractal = new Fractal\Manager();
+        $fractal->setSerializer(new ArraySerializer());
+        $resource = new Fractal\Resource\Item($status, new UndoAnnounce());
+        $activity = $fractal->createData($resource)->toArray();
 
-		if(empty($audience) || $status->scope != 'public') {
-			return 1;
-		}
+        $audience = $status->profile->getAudienceInbox();
 
-		$payload = json_encode($activity);
+        if (empty($audience) || $status->scope != 'public') {
+            return 1;
+        }
 
-		$client = new Client([
-			'timeout'  => config('federation.activitypub.delivery.timeout')
-		]);
+        $payload = json_encode($activity);
 
-		$version = config('pixelfed.version');
-		$appUrl = config('app.url');
-		$userAgent = "(Pixelfed/{$version}; +{$appUrl})";
+        $client = new Client([
+            'timeout' => config('federation.activitypub.delivery.timeout'),
+        ]);
 
-		$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
-						]
-					]);
-				};
-			}
-		};
+        $version = config('pixelfed.version');
+        $appUrl = config('app.url');
+        $userAgent = "(Pixelfed/{$version}; +{$appUrl})";
 
-		$pool = new Pool($client, $requests($audience), [
-			'concurrency' => config('federation.activitypub.delivery.concurrency'),
-			'fulfilled' => function ($response, $index) {
-			},
-			'rejected' => function ($reason, $index) {
-			}
-		]);
+        $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,
+                        ],
+                    ]);
+                };
+            }
+        };
 
-		$promise = $pool->promise();
+        $pool = new Pool($client, $requests($audience), [
+            'concurrency' => config('federation.activitypub.delivery.concurrency'),
+            'fulfilled' => function ($response, $index) {
+            },
+            'rejected' => function ($reason, $index) {
+            },
+        ]);
 
-		$promise->wait();
+        $promise = $pool->promise();
 
-		$status->delete();
+        $promise->wait();
 
-		return 1;
-	}
+        $status->delete();
+
+        return 1;
+    }
 }
diff --git a/app/Jobs/StatusPipeline/RemoteStatusDelete.php b/app/Jobs/StatusPipeline/RemoteStatusDelete.php
index aabb81755..65b72c104 100644
--- a/app/Jobs/StatusPipeline/RemoteStatusDelete.php
+++ b/app/Jobs/StatusPipeline/RemoteStatusDelete.php
@@ -39,7 +39,8 @@ use App\Services\AccountService;
 use App\Services\CollectionService;
 use App\Services\StatusService;
 use App\Jobs\MediaPipeline\MediaDeletePipeline;
-use App\Jobs\ProfilePipeline\DecrementPostCount;
+use App\Services\NotificationService;
+use App\Services\Account\AccountStatService;
 
 class RemoteStatusDelete implements ShouldQueue, ShouldBeUniqueUntilProcessing
 {
@@ -108,9 +109,7 @@ class RemoteStatusDelete implements ShouldQueue, ShouldBeUniqueUntilProcessing
         }
 
         StatusService::del($status->id, true);
-
-        DecrementPostCount::dispatch($status->profile_id)->onQueue('inbox');
-
+        // AccountStatService::decrementPostCount($status->profile_id);
         return $this->unlinkRemoveMedia($status);
     }
 
@@ -137,14 +136,34 @@ class RemoteStatusDelete implements ShouldQueue, ShouldBeUniqueUntilProcessing
                 CollectionService::removeItem($col->collection_id, $col->object_id);
                 $col->delete();
         });
-        DirectMessage::whereStatusId($status->id)->delete();
+        $dms = DirectMessage::whereStatusId($status->id)->get();
+        foreach($dms as $dm) {
+            $not = Notification::whereItemType('App\DirectMessage')
+                ->whereItemId($dm->id)
+                ->first();
+            if($not) {
+                NotificationService::del($not->profile_id, $not->id);
+                $not->forceDeleteQuietly();
+            }
+            $dm->delete();
+        }
         Like::whereStatusId($status->id)->forceDelete();
         Media::whereStatusId($status->id)
         ->get()
         ->each(function($media) {
             MediaDeletePipeline::dispatch($media)->onQueue('mmo');
         });
-        MediaTag::where('status_id', $status->id)->delete();
+        $mediaTags = MediaTag::where('status_id', $status->id)->get();
+        foreach($mediaTags as $mtag) {
+            $not = Notification::whereItemType('App\MediaTag')
+                ->whereItemId($mtag->id)
+                ->first();
+            if($not) {
+                NotificationService::del($not->profile_id, $not->id);
+                $not->forceDeleteQuietly();
+            }
+            $mtag->delete();
+        }
         Mention::whereStatusId($status->id)->forceDelete();
         Notification::whereItemType('App\Status')
             ->whereItemId($status->id)
@@ -157,11 +176,11 @@ class RemoteStatusDelete implements ShouldQueue, ShouldBeUniqueUntilProcessing
         StatusView::whereStatusId($status->id)->delete();
         Status::whereInReplyToId($status->id)->update(['in_reply_to_id' => null]);
 
-        $status->delete();
-
         StatusService::del($status->id, true);
         AccountService::del($status->profile_id);
 
+        $status->forceDelete();
+
         return 1;
     }
 }
diff --git a/app/Jobs/StatusPipeline/StatusDelete.php b/app/Jobs/StatusPipeline/StatusDelete.php
index 19c0ea68d..d85ebdc4a 100644
--- a/app/Jobs/StatusPipeline/StatusDelete.php
+++ b/app/Jobs/StatusPipeline/StatusDelete.php
@@ -2,204 +2,221 @@
 
 namespace App\Jobs\StatusPipeline;
 
-use DB, Cache, Storage;
-use App\{
-	AccountInterstitial,
-    Bookmark,
-	CollectionItem,
-    DirectMessage,
-    Like,
-    Media,
-	MediaTag,
-    Mention,
-	Notification,
-	Report,
-	Status,
-    StatusArchived,
-	StatusHashtag,
-    StatusView
-};
+use App\AccountInterstitial;
+use App\Bookmark;
+use App\CollectionItem;
+use App\DirectMessage;
+use App\Jobs\MediaPipeline\MediaDeletePipeline;
+use App\Like;
+use App\Media;
+use App\MediaTag;
+use App\Mention;
+use App\Notification;
+use App\Report;
+use App\Services\CollectionService;
+use App\Services\NotificationService;
+use App\Services\StatusService;
+use App\Status;
+use App\StatusArchived;
+use App\StatusHashtag;
+use App\StatusView;
+use App\Transformer\ActivityPub\Verb\DeleteNote;
+use App\Util\ActivityPub\HttpSignature;
+use Cache;
+use GuzzleHttp\Client;
+use GuzzleHttp\Pool;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use League\Fractal;
-use Illuminate\Support\Str;
 use League\Fractal\Serializer\ArraySerializer;
-use App\Transformer\ActivityPub\Verb\DeleteNote;
-use App\Util\ActivityPub\Helpers;
-use GuzzleHttp\Pool;
-use GuzzleHttp\Client;
-use GuzzleHttp\Promise;
-use App\Util\ActivityPub\HttpSignature;
-use App\Services\CollectionService;
-use App\Services\StatusService;
-use App\Jobs\MediaPipeline\MediaDeletePipeline;
 
 class StatusDelete implements ShouldQueue
 {
-	use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-	protected $status;
+    protected $status;
 
-	/**
-	 * Delete the job if its models no longer exist.
-	 *
-	 * @var bool
-	 */
-	public $deleteWhenMissingModels = true;
+    /**
+     * Delete the job if its models no longer exist.
+     *
+     * @var bool
+     */
+    public $deleteWhenMissingModels = true;
 
     public $timeout = 900;
+
     public $tries = 2;
 
-	/**
-	 * Create a new job instance.
-	 *
-	 * @return void
-	 */
-	public function __construct(Status $status)
-	{
-		$this->status = $status;
-	}
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct(Status $status)
+    {
+        $this->status = $status;
+    }
 
-	/**
-	 * Execute the job.
-	 *
-	 * @return void
-	 */
-	public function handle()
-	{
-		$status = $this->status;
-		$profile = $this->status->profile;
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $status = $this->status;
+        $profile = $this->status->profile;
 
-		StatusService::del($status->id, true);
-		if($profile) {
-			if(in_array($status->type, ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])) {
-				$profile->status_count = $profile->status_count - 1;
-				$profile->save();
-			}
-		}
+        StatusService::del($status->id, true);
+        if ($profile) {
+            if (in_array($status->type, ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])) {
+                $profile->status_count = $profile->status_count - 1;
+                $profile->save();
+            }
+        }
 
-		Cache::forget('pf:atom:user-feed:by-id:' . $status->profile_id);
+        Cache::forget('pf:atom:user-feed:by-id:'.$status->profile_id);
 
-		if(config_cache('federation.activitypub.enabled') == true) {
-			return $this->fanoutDelete($status);
-		} else {
-			return $this->unlinkRemoveMedia($status);
-		}
-	}
+        if ((bool) config_cache('federation.activitypub.enabled') == true) {
+            return $this->fanoutDelete($status);
+        } else {
+            return $this->unlinkRemoveMedia($status);
+        }
+    }
 
-	public function unlinkRemoveMedia($status)
-	{
+    public function unlinkRemoveMedia($status)
+    {
         Media::whereStatusId($status->id)
-        ->get()
-        ->each(function($media) {
-            MediaDeletePipeline::dispatch($media);
-        });
+            ->get()
+            ->each(function ($media) {
+                MediaDeletePipeline::dispatch($media);
+            });
 
-		if($status->in_reply_to_id) {
-			$parent = Status::findOrFail($status->in_reply_to_id);
-			--$parent->reply_count;
-			$parent->save();
-			StatusService::del($parent->id);
-		}
+        if ($status->in_reply_to_id) {
+            $parent = Status::findOrFail($status->in_reply_to_id);
+            $parent->reply_count--;
+            $parent->save();
+            StatusService::del($parent->id);
+        }
 
         Bookmark::whereStatusId($status->id)->delete();
 
         CollectionItem::whereObjectType('App\Status')
             ->whereObjectId($status->id)
             ->get()
-            ->each(function($col) {
+            ->each(function ($col) {
                 CollectionService::removeItem($col->collection_id, $col->object_id);
                 $col->delete();
-        });
+            });
 
-        DirectMessage::whereStatusId($status->id)->delete();
+        $dms = DirectMessage::whereStatusId($status->id)->get();
+        foreach ($dms as $dm) {
+            $not = Notification::whereItemType('App\DirectMessage')
+                ->whereItemId($dm->id)
+                ->first();
+            if ($not) {
+                NotificationService::del($not->profile_id, $not->id);
+                $not->forceDeleteQuietly();
+            }
+            $dm->delete();
+        }
         Like::whereStatusId($status->id)->delete();
 
-		MediaTag::where('status_id', $status->id)->delete();
+        $mediaTags = MediaTag::where('status_id', $status->id)->get();
+        foreach ($mediaTags as $mtag) {
+            $not = Notification::whereItemType('App\MediaTag')
+                ->whereItemId($mtag->id)
+                ->first();
+            if ($not) {
+                NotificationService::del($not->profile_id, $not->id);
+                $not->forceDeleteQuietly();
+            }
+            $mtag->delete();
+        }
         Mention::whereStatusId($status->id)->forceDelete();
 
-		Notification::whereItemType('App\Status')
-			->whereItemId($status->id)
-			->forceDelete();
+        Notification::whereItemType('App\Status')
+            ->whereItemId($status->id)
+            ->forceDelete();
 
-		Report::whereObjectType('App\Status')
-			->whereObjectId($status->id)
-			->delete();
+        Report::whereObjectType('App\Status')
+            ->whereObjectId($status->id)
+            ->delete();
 
         StatusArchived::whereStatusId($status->id)->delete();
         StatusHashtag::whereStatusId($status->id)->delete();
         StatusView::whereStatusId($status->id)->delete();
-		Status::whereInReplyToId($status->id)->update(['in_reply_to_id' => null]);
+        Status::whereInReplyToId($status->id)->update(['in_reply_to_id' => null]);
 
-		AccountInterstitial::where('item_type', 'App\Status')
-			->where('item_id', $status->id)
-			->delete();
+        AccountInterstitial::where('item_type', 'App\Status')
+            ->where('item_id', $status->id)
+            ->delete();
 
-		$status->delete();
-
-		return 1;
-	}
-
-	public function fanoutDelete($status)
-	{
-		$profile = $status->profile;
-
-		if(!$profile) {
-			return;
-		}
-
-		$audience = $status->profile->getAudienceInbox();
-
-		$fractal = new Fractal\Manager();
-		$fractal->setSerializer(new ArraySerializer());
-		$resource = new Fractal\Resource\Item($status, new DeleteNote());
-		$activity = $fractal->createData($resource)->toArray();
-
-		$this->unlinkRemoveMedia($status);
-
-		$payload = json_encode($activity);
-
-		$client = new Client([
-			'timeout'  => config('federation.activitypub.delivery.timeout')
-		]);
-
-		$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
-						]
-					]);
-				};
-			}
-		};
-
-		$pool = new Pool($client, $requests($audience), [
-			'concurrency' => config('federation.activitypub.delivery.concurrency'),
-			'fulfilled' => function ($response, $index) {
-			},
-			'rejected' => function ($reason, $index) {
-			}
-		]);
-
-		$promise = $pool->promise();
-
-		$promise->wait();
+        $status->delete();
 
         return 1;
-	}
+    }
+
+    public function fanoutDelete($status)
+    {
+        $profile = $status->profile;
+
+        if (! $profile) {
+            return;
+        }
+
+        $audience = $status->profile->getAudienceInbox();
+
+        $fractal = new Fractal\Manager();
+        $fractal->setSerializer(new ArraySerializer());
+        $resource = new Fractal\Resource\Item($status, new DeleteNote());
+        $activity = $fractal->createData($resource)->toArray();
+
+        $this->unlinkRemoveMedia($status);
+
+        $payload = json_encode($activity);
+
+        $client = new Client([
+            'timeout' => config('federation.activitypub.delivery.timeout'),
+        ]);
+
+        $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,
+                        ],
+                    ]);
+                };
+            }
+        };
+
+        $pool = new Pool($client, $requests($audience), [
+            'concurrency' => config('federation.activitypub.delivery.concurrency'),
+            'fulfilled' => function ($response, $index) {
+            },
+            'rejected' => function ($reason, $index) {
+            },
+        ]);
+
+        $promise = $pool->promise();
+
+        $promise->wait();
+
+        return 1;
+    }
 }
diff --git a/app/Jobs/StatusPipeline/StatusEntityLexer.php b/app/Jobs/StatusPipeline/StatusEntityLexer.php
index 2bbc92102..8fe767417 100644
--- a/app/Jobs/StatusPipeline/StatusEntityLexer.php
+++ b/app/Jobs/StatusPipeline/StatusEntityLexer.php
@@ -3,12 +3,16 @@
 namespace App\Jobs\StatusPipeline;
 
 use App\Hashtag;
+use App\Jobs\HomeFeedPipeline\FeedInsertPipeline;
 use App\Jobs\MentionPipeline\MentionPipeline;
 use App\Mention;
 use App\Profile;
+use App\Services\AdminShadowFilterService;
+use App\Services\PublicTimelineService;
+use App\Services\StatusService;
+use App\Services\UserFilterService;
 use App\Status;
 use App\StatusHashtag;
-use App\Services\PublicTimelineService;
 use App\Util\Lexer\Autolink;
 use App\Util\Lexer\Extractor;
 use App\Util\Sentiment\Bouncer;
@@ -19,171 +23,181 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use App\Services\UserFilterService;
-use App\Services\AdminShadowFilterService;
 
 class StatusEntityLexer implements ShouldQueue
 {
-	use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-	protected $status;
-	protected $entities;
-	protected $autolink;
+    protected $status;
 
-	/**
-	 * Delete the job if its models no longer exist.
-	 *
-	 * @var bool
-	 */
-	public $deleteWhenMissingModels = true;
+    protected $entities;
 
-	/**
-	 * Create a new job instance.
-	 *
-	 * @return void
-	 */
-	public function __construct(Status $status)
-	{
-		$this->status = $status;
-	}
+    protected $autolink;
 
-	/**
-	 * Execute the job.
-	 *
-	 * @return void
-	 */
-	public function handle()
-	{
-		$profile = $this->status->profile;
-		$status = $this->status;
+    /**
+     * Delete the job if its models no longer exist.
+     *
+     * @var bool
+     */
+    public $deleteWhenMissingModels = true;
 
-		if(in_array($status->type, ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])) {
-			$profile->status_count = $profile->status_count + 1;
-			$profile->save();
-		}
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct(Status $status)
+    {
+        $this->status = $status;
+    }
 
-		if($profile->no_autolink == false) {
-			$this->parseEntities();
-		}
-	}
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $profile = $this->status->profile;
+        $status = $this->status;
 
-	public function parseEntities()
-	{
-		$this->extractEntities();
-	}
+        if (in_array($status->type, ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])) {
+            $profile->status_count = $profile->status_count + 1;
+            $profile->save();
+        }
 
-	public function extractEntities()
-	{
-		$this->entities = Extractor::create()->extract($this->status->caption);
-		$this->autolinkStatus();
-	}
+        if ($profile->no_autolink == false) {
+            $this->parseEntities();
+        }
+    }
 
-	public function autolinkStatus()
-	{
-		$this->autolink = Autolink::create()->autolink($this->status->caption);
-		$this->storeEntities();
-	}
+    public function parseEntities()
+    {
+        $this->extractEntities();
+    }
 
-	public function storeEntities()
-	{
-		$this->storeHashtags();
-		DB::transaction(function () {
-			$status = $this->status;
-			$status->rendered = nl2br($this->autolink);
-			$status->save();
-		});
-	}
+    public function extractEntities()
+    {
+        $this->entities = Extractor::create()->extract($this->status->caption);
+        $this->autolinkStatus();
+    }
 
-	public function storeHashtags()
-	{
-		$tags = array_unique($this->entities['hashtags']);
-		$status = $this->status;
+    public function autolinkStatus()
+    {
+        $this->autolink = Autolink::create()->autolink($this->status->caption);
+        $this->storeEntities();
+    }
 
-		foreach ($tags as $tag) {
-			if(mb_strlen($tag) > 124) {
-				continue;
-			}
-			DB::transaction(function () use ($status, $tag) {
-				$slug = str_slug($tag, '-', false);
-				$hashtag = Hashtag::where('slug', $slug)->first();
-				if (!$hashtag) {
-					$hashtag = Hashtag::create(
-						['name' => $tag, 'slug' => $slug]
-					);
-				}
+    public function storeEntities()
+    {
+        $this->storeHashtags();
+    }
 
-				StatusHashtag::firstOrCreate(
-					[
-						'status_id' => $status->id,
-						'hashtag_id' => $hashtag->id,
-						'profile_id' => $status->profile_id,
-						'status_visibility' => $status->visibility,
-					]
-				);
-			});
-		}
-		$this->storeMentions();
-	}
+    public function storeHashtags()
+    {
+        $tags = array_unique($this->entities['hashtags']);
+        $status = $this->status;
 
-	public function storeMentions()
-	{
-		$mentions = array_unique($this->entities['mentions']);
-		$status = $this->status;
+        foreach ($tags as $tag) {
+            if (mb_strlen($tag) > 124) {
+                continue;
+            }
+            DB::transaction(function () use ($status, $tag) {
+                $slug = str_slug($tag, '-', false);
 
-		foreach ($mentions as $mention) {
-			$mentioned = Profile::whereUsername($mention)->first();
+                $hashtag = Hashtag::firstOrCreate([
+                    'slug' => $slug,
+                ], [
+                    'name' => $tag,
+                ]);
 
-			if (empty($mentioned) || !isset($mentioned->id)) {
-				continue;
-			}
+                StatusHashtag::firstOrCreate(
+                    [
+                        'status_id' => $status->id,
+                        'hashtag_id' => $hashtag->id,
+                        'profile_id' => $status->profile_id,
+                        'status_visibility' => $status->visibility,
+                    ]
+                );
+            });
+        }
+        $this->storeMentions();
+    }
+
+    public function storeMentions()
+    {
+        $mentions = array_unique($this->entities['mentions']);
+        $status = $this->status;
+
+        foreach ($mentions as $mention) {
+            $mentioned = Profile::whereUsername($mention)->first();
+
+            if (empty($mentioned) || ! isset($mentioned->id)) {
+                continue;
+            }
             $blocks = UserFilterService::blocks($mentioned->id);
-            if($blocks && in_array($status->profile_id, $blocks)) {
+            if ($blocks && in_array($status->profile_id, $blocks)) {
                 continue;
             }
 
-			DB::transaction(function () use ($status, $mentioned) {
-				$m = new Mention();
-				$m->status_id = $status->id;
-				$m->profile_id = $mentioned->id;
-				$m->save();
+            DB::transaction(function () use ($status, $mentioned) {
+                $m = new Mention;
+                $m->status_id = $status->id;
+                $m->profile_id = $mentioned->id;
+                $m->save();
 
-				MentionPipeline::dispatch($status, $m);
-			});
-		}
-		$this->deliver();
-	}
+                MentionPipeline::dispatch($status, $m);
+            });
+        }
+        $this->fanout();
+    }
 
-	public function deliver()
-	{
-		$status = $this->status;
-		$types = [
-			'photo',
-			'photo:album',
-			'video',
-			'video:album',
-			'photo:video:album'
-		];
+    public function fanout()
+    {
+        $status = $this->status;
+        StatusService::refresh($status->id);
 
-		if(config_cache('pixelfed.bouncer.enabled')) {
-			Bouncer::get($status);
-		}
-
-		Cache::forget('pf:atom:user-feed:by-id:' . $status->profile_id);
-		$hideNsfw = config('instance.hide_nsfw_on_public_feeds');
-		if( $status->uri == null &&
-			$status->scope == 'public' &&
-			in_array($status->type, $types) &&
-			$status->in_reply_to_id === null &&
-			$status->reblog_of_id === null &&
-			($hideNsfw ? $status->is_nsfw == false : true)
-		) {
-            if(AdminShadowFilterService::canAddToPublicFeedByProfileId($status->profile_id)) {
-    			PublicTimelineService::add($status->id);
+        if (config('exp.cached_home_timeline')) {
+            if ($status->in_reply_to_id === null &&
+                in_array($status->scope, ['public', 'unlisted', 'private'])
+            ) {
+                FeedInsertPipeline::dispatch($status->id, $status->profile_id)->onQueue('feed');
             }
-		}
+        }
+        $this->deliver();
+    }
 
-		if(config_cache('federation.activitypub.enabled') == true && config('app.env') == 'production') {
-			StatusActivityPubDeliver::dispatch($status);
-		}
-	}
+    public function deliver()
+    {
+        $status = $this->status;
+        $types = [
+            'photo',
+            'photo:album',
+            'video',
+            'video:album',
+            'photo:video:album',
+        ];
+
+        if ((bool) config_cache('pixelfed.bouncer.enabled')) {
+            Bouncer::get($status);
+        }
+
+        Cache::forget('pf:atom:user-feed:by-id:'.$status->profile_id);
+        $hideNsfw = config('instance.hide_nsfw_on_public_feeds');
+        if ($status->uri == null &&
+            $status->scope == 'public' &&
+            in_array($status->type, $types) &&
+            $status->in_reply_to_id === null &&
+            $status->reblog_of_id === null &&
+            ($hideNsfw ? $status->is_nsfw == false : true)
+        ) {
+            if (AdminShadowFilterService::canAddToPublicFeedByProfileId($status->profile_id)) {
+                PublicTimelineService::add($status->id);
+            }
+        }
+
+        if ((bool) config_cache('federation.activitypub.enabled') == true && config('app.env') == 'production') {
+            StatusActivityPubDeliver::dispatch($status);
+        }
+    }
 }
diff --git a/app/Jobs/StatusPipeline/StatusRemoteUpdatePipeline.php b/app/Jobs/StatusPipeline/StatusRemoteUpdatePipeline.php
index 6cb11ddc6..b216c0531 100644
--- a/app/Jobs/StatusPipeline/StatusRemoteUpdatePipeline.php
+++ b/app/Jobs/StatusPipeline/StatusRemoteUpdatePipeline.php
@@ -2,172 +2,170 @@
 
 namespace App\Jobs\StatusPipeline;
 
+use App\Media;
+use App\Models\StatusEdit;
+use App\ModLog;
+use App\Profile;
+use App\Services\StatusService;
+use App\Status;
 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\Media;
-use App\ModLog;
-use App\Profile;
-use App\Status;
-use App\Models\StatusEdit;
-use App\Services\StatusService;
-use Purify;
 use Illuminate\Support\Facades\Http;
+use Purify;
 
 class StatusRemoteUpdatePipeline implements ShouldQueue
 {
-	use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-	public $activity;
+    public $activity;
 
-	/**
-	 * Create a new job instance.
-	 */
-	public function __construct($activity)
-	{
-		$this->activity = $activity;
-	}
+    /**
+     * Create a new job instance.
+     */
+    public function __construct($activity)
+    {
+        $this->activity = $activity;
+    }
 
-	/**
-	 * Execute the job.
-	 */
-	public function handle(): void
-	{
-		$activity = $this->activity;
-		$status = Status::with('media')->whereObjectUrl($activity['id'])->first();
-		if(!$status) {
-			return;
-		}
-		$this->createPreviousEdit($status);
-		$this->updateMedia($status, $activity);
-		$this->updateImmediateAttributes($status, $activity);
-		$this->createEdit($status, $activity);
-	}
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        $activity = $this->activity;
+        $status = Status::with('media')->whereObjectUrl($activity['id'])->first();
+        if (! $status) {
+            return;
+        }
+        $this->createPreviousEdit($status);
+        $this->updateMedia($status, $activity);
+        $this->updateImmediateAttributes($status, $activity);
+        $this->createEdit($status, $activity);
+    }
 
-	protected function createPreviousEdit($status)
-	{
-		if(!$status->edits()->count()) {
-			StatusEdit::create([
-				'status_id' => $status->id,
-				'profile_id' => $status->profile_id,
-				'caption' => $status->caption,
-				'spoiler_text' => $status->cw_summary,
-				'is_nsfw' => $status->is_nsfw,
-				'ordered_media_attachment_ids' => $status->media()->orderBy('order')->pluck('id')->toArray(),
-				'created_at' => $status->created_at
-			]);
-		}
-	}
+    protected function createPreviousEdit($status)
+    {
+        if (! $status->edits()->count()) {
+            StatusEdit::create([
+                'status_id' => $status->id,
+                'profile_id' => $status->profile_id,
+                'caption' => $status->caption,
+                'spoiler_text' => $status->cw_summary,
+                'is_nsfw' => $status->is_nsfw,
+                'ordered_media_attachment_ids' => $status->media()->orderBy('order')->pluck('id')->toArray(),
+                'created_at' => $status->created_at,
+            ]);
+        }
+    }
 
-	protected function updateMedia($status, $activity)
-	{
-		if(!isset($activity['attachment'])) {
-			return;
-		}
-		$ogm = $status->media->count() ? $status->media()->orderBy('order')->get() : collect([]);
-		$nm = collect($activity['attachment'])->filter(function($nm) {
-			return isset(
-				$nm['type'],
-				$nm['mediaType'],
-				$nm['url']
-			) &&
-			in_array($nm['type'], ['Document', 'Image', 'Video']) &&
-			in_array($nm['mediaType'], explode(',', config('pixelfed.media_types')));
-		});
+    protected function updateMedia($status, $activity)
+    {
+        if (! isset($activity['attachment'])) {
+            return;
+        }
+        $ogm = $status->media->count() ? $status->media()->orderBy('order')->get() : collect([]);
+        $nm = collect($activity['attachment'])->filter(function ($nm) {
+            return isset(
+                $nm['type'],
+                $nm['mediaType'],
+                $nm['url']
+            ) &&
+            in_array($nm['type'], ['Document', 'Image', 'Video']) &&
+            in_array($nm['mediaType'], explode(',', config_cache('pixelfed.media_types')));
+        });
 
-		// Skip when no media
-		if(!$ogm->count() && !$nm->count()) {
-			return;
-		}
+        // Skip when no media
+        if (! $ogm->count() && ! $nm->count()) {
+            return;
+        }
 
-		Media::whereProfileId($status->profile_id)
-			->whereStatusId($status->id)
-			->update([
-				'status_id' => null
-			]);
+        Media::whereProfileId($status->profile_id)
+            ->whereStatusId($status->id)
+            ->update([
+                'status_id' => null,
+            ]);
 
-		$nm->each(function($n, $key) use($status) {
-			$res = Http::retry(3, 100, throw: false)->head($n['url']);
+        $nm->each(function ($n, $key) use ($status) {
+            $res = Http::withOptions(['allow_redirects' => false])->retry(3, 100, throw: false)->head($n['url']);
 
-			if(!$res->successful()) {
-				return;
-			}
+            if (! $res->successful()) {
+                return;
+            }
 
-			if(!in_array($res->header('content-type'), explode(',',config('pixelfed.media_types')))) {
-				return;
-			}
+            if (! in_array($res->header('content-type'), explode(',', config_cache('pixelfed.media_types')))) {
+                return;
+            }
 
-			$m = new Media;
-			$m->status_id = $status->id;
-			$m->profile_id = $status->profile_id;
-			$m->remote_media = true;
-			$m->media_path = $n['url'];
+            $m = new Media;
+            $m->status_id = $status->id;
+            $m->profile_id = $status->profile_id;
+            $m->remote_media = true;
+            $m->media_path = $n['url'];
             $m->mime = $res->header('content-type');
             $m->size = $res->hasHeader('content-length') ? $res->header('content-length') : null;
-			$m->caption = isset($n['name']) && !empty($n['name']) ? Purify::clean($n['name']) : null;
-			$m->remote_url = $n['url'];
+            $m->caption = isset($n['name']) && ! empty($n['name']) ? Purify::clean($n['name']) : null;
+            $m->remote_url = $n['url'];
             $m->blurhash = isset($n['blurhash']) && (strlen($n['blurhash']) < 50) ? $n['blurhash'] : null;
-			$m->width = isset($n['width']) && !empty($n['width']) ? $n['width'] : null;
-			$m->height = isset($n['height']) && !empty($n['height']) ? $n['height'] : null;
-			$m->skip_optimize = true;
-			$m->order = $key + 1;
-			$m->save();
-		});
-	}
+            $m->width = isset($n['width']) && ! empty($n['width']) ? $n['width'] : null;
+            $m->height = isset($n['height']) && ! empty($n['height']) ? $n['height'] : null;
+            $m->skip_optimize = true;
+            $m->order = $key + 1;
+            $m->save();
+        });
+    }
 
-	protected function updateImmediateAttributes($status, $activity)
-	{
-		if(isset($activity['content'])) {
-			$status->caption = strip_tags($activity['content']);
-			$status->rendered = Purify::clean($activity['content']);
-		}
+    protected function updateImmediateAttributes($status, $activity)
+    {
+        if (isset($activity['content'])) {
+            $status->caption = strip_tags(Purify::clean($activity['content']));
+        }
 
-		if(isset($activity['sensitive'])) {
-			if((bool) $activity['sensitive'] == false) {
-				$status->is_nsfw = false;
-				$exists = ModLog::whereObjectType('App\Status::class')
-					->whereObjectId($status->id)
-					->whereAction('admin.status.moderate')
-					->exists();
-				if($exists == true) {
-					$status->is_nsfw = true;
-				}
-				$profile = Profile::find($status->profile_id);
-				if(!$profile || $profile->cw == true) {
-					$status->is_nsfw = true;
-				}
-			} else {
-				$status->is_nsfw = true;
-			}
-		}
+        if (isset($activity['sensitive'])) {
+            if ((bool) $activity['sensitive'] == false) {
+                $status->is_nsfw = false;
+                $exists = ModLog::whereObjectType('App\Status::class')
+                    ->whereObjectId($status->id)
+                    ->whereAction('admin.status.moderate')
+                    ->exists();
+                if ($exists == true) {
+                    $status->is_nsfw = true;
+                }
+                $profile = Profile::find($status->profile_id);
+                if (! $profile || $profile->cw == true) {
+                    $status->is_nsfw = true;
+                }
+            } else {
+                $status->is_nsfw = true;
+            }
+        }
 
-		if(isset($activity['summary'])) {
-			$status->cw_summary = Purify::clean($activity['summary']);
-		} else {
-			$status->cw_summary = null;
-		}
+        if (isset($activity['summary'])) {
+            $status->cw_summary = Purify::clean($activity['summary']);
+        } else {
+            $status->cw_summary = null;
+        }
 
-		$status->edited_at = now();
-		$status->save();
-		StatusService::del($status->id);
-	}
+        $status->edited_at = now();
+        $status->save();
+        StatusService::del($status->id);
+    }
 
-	protected function createEdit($status, $activity)
-	{
-		$cleaned = isset($activity['content']) ? Purify::clean($activity['content']) : null;
-		$spoiler_text = isset($activity['summary']) ? Purify::clean($activity['summary']) : null;
-		$sensitive = isset($activity['sensitive']) ? $activity['sensitive'] : null;
-		$mids = $status->media()->count() ? $status->media()->orderBy('order')->pluck('id')->toArray() : null;
-		StatusEdit::create([
-			'status_id' => $status->id,
-			'profile_id' => $status->profile_id,
-			'caption' => $cleaned,
-			'spoiler_text' => $spoiler_text,
-			'is_nsfw' => $sensitive,
-			'ordered_media_attachment_ids' => $mids
-		]);
-	}
+    protected function createEdit($status, $activity)
+    {
+        $cleaned = isset($activity['content']) ? Purify::clean($activity['content']) : null;
+        $spoiler_text = isset($activity['summary']) ? Purify::clean($activity['summary']) : null;
+        $sensitive = isset($activity['sensitive']) ? $activity['sensitive'] : null;
+        $mids = $status->media()->count() ? $status->media()->orderBy('order')->pluck('id')->toArray() : null;
+        StatusEdit::create([
+            'status_id' => $status->id,
+            'profile_id' => $status->profile_id,
+            'caption' => $cleaned,
+            'spoiler_text' => $spoiler_text,
+            'is_nsfw' => $sensitive,
+            'ordered_media_attachment_ids' => $mids,
+        ]);
+    }
 }
diff --git a/app/Jobs/StatusPipeline/StatusReplyPipeline.php b/app/Jobs/StatusPipeline/StatusReplyPipeline.php
index 35238d293..d8af7b96b 100644
--- a/app/Jobs/StatusPipeline/StatusReplyPipeline.php
+++ b/app/Jobs/StatusPipeline/StatusReplyPipeline.php
@@ -87,18 +87,20 @@ class StatusReplyPipeline implements ShouldQueue
         Cache::forget('status:replies:all:' . $reply->id);
         Cache::forget('status:replies:all:' . $status->id);
 
-        DB::transaction(function() use($target, $actor, $status) {
-            $notification = new Notification();
-            $notification->profile_id = $target->id;
-            $notification->actor_id = $actor->id;
-            $notification->action = 'comment';
-            $notification->item_id = $status->id;
-            $notification->item_type = "App\Status";
-            $notification->save();
+        if($target->user_id && $target->domain === null) {
+            DB::transaction(function() use($target, $actor, $status) {
+                $notification = new Notification();
+                $notification->profile_id = $target->id;
+                $notification->actor_id = $actor->id;
+                $notification->action = 'comment';
+                $notification->item_id = $status->id;
+                $notification->item_type = "App\Status";
+                $notification->save();
 
-            NotificationService::setNotification($notification);
-            NotificationService::set($notification->profile_id, $notification->id);
-        });
+                NotificationService::setNotification($notification);
+                NotificationService::set($notification->profile_id, $notification->id);
+            });
+        }
 
         if($exists = Cache::get('status:replies:all:' . $reply->id)) {
         	if($exists && $exists->count() == 3) {
diff --git a/app/Jobs/StatusPipeline/StatusTagsPipeline.php b/app/Jobs/StatusPipeline/StatusTagsPipeline.php
index 893fa6a83..003196e0d 100644
--- a/app/Jobs/StatusPipeline/StatusTagsPipeline.php
+++ b/app/Jobs/StatusPipeline/StatusTagsPipeline.php
@@ -20,117 +20,119 @@ use App\Util\ActivityPub\Helpers;
 
 class StatusTagsPipeline implements ShouldQueue
 {
-	use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-	protected $activity;
-	protected $status;
+    protected $activity;
+    protected $status;
 
-	/**
-	 * Create a new job instance.
-	 *
-	 * @return void
-	 */
-	public function __construct($activity, $status)
-	{
-		$this->activity = $activity;
-		$this->status = $status;
-	}
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct($activity, $status)
+    {
+        $this->activity = $activity;
+        $this->status = $status;
+    }
 
-	/**
-	 * Execute the job.
-	 *
-	 * @return void
-	 */
-	public function handle()
-	{
-		$res = $this->activity;
-		$status = $this->status;
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $res = $this->activity;
+        $status = $this->status;
 
         if(isset($res['tag']['type'], $res['tag']['name'])) {
             $res['tag'] = [$res['tag']];
         }
 
-		$tags = collect($res['tag']);
+        $tags = collect($res['tag']);
 
-		// Emoji
-		$tags->filter(function($tag) {
-			return $tag && isset($tag['id'], $tag['icon'], $tag['name'], $tag['type']) && $tag['type'] == 'Emoji';
-		})
-		->map(function($tag) {
-			CustomEmojiService::import($tag['id'], $this->status->id);
-		});
+        // Emoji
+        $tags->filter(function($tag) {
+            return $tag && isset($tag['id'], $tag['icon'], $tag['name'], $tag['type']) && $tag['type'] == 'Emoji';
+        })
+        ->map(function($tag) {
+            CustomEmojiService::import($tag['id'], $this->status->id);
+        });
 
-		// Hashtags
-		$tags->filter(function($tag) {
-			return $tag && $tag['type'] == 'Hashtag' && isset($tag['href'], $tag['name']);
-		})
-		->map(function($tag) use($status) {
-			$name = substr($tag['name'], 0, 1) == '#' ?
-				substr($tag['name'], 1) : $tag['name'];
+        // Hashtags
+        $tags->filter(function($tag) {
+            return $tag && $tag['type'] == 'Hashtag' && isset($tag['href'], $tag['name']);
+        })
+        ->map(function($tag) use($status) {
+            $name = substr($tag['name'], 0, 1) == '#' ?
+                substr($tag['name'], 1) : $tag['name'];
 
-			$banned = TrendingHashtagService::getBannedHashtagNames();
+            $banned = TrendingHashtagService::getBannedHashtagNames();
 
-			if(count($banned)) {
+            if(count($banned)) {
                 if(in_array(strtolower($name), array_map('strtolower', $banned))) {
-                   	return;
+                    return;
                 }
             }
 
             if(config('database.default') === 'pgsql') {
-            	$hashtag = Hashtag::where('name', 'ilike', $name)
-            		->orWhere('slug', 'ilike', str_slug($name, '-', false))
-            		->first();
+                $hashtag = Hashtag::where('name', 'ilike', $name)
+                    ->orWhere('slug', 'ilike', str_slug($name, '-', false))
+                    ->first();
 
-				if(!$hashtag) {
-					$hashtag = Hashtag::updateOrCreate([
-						'slug' => str_slug($name, '-', false),
-						'name' => $name
-					]);
-				}
+                if(!$hashtag) {
+                    $hashtag = Hashtag::updateOrCreate([
+                        'slug' => str_slug($name, '-', false),
+                        'name' => $name
+                    ]);
+                }
             } else {
-				$hashtag = Hashtag::updateOrCreate([
-					'slug' => str_slug($name, '-', false),
-					'name' => $name
-				]);
+                $hashtag = Hashtag::updateOrCreate([
+                    'slug' => str_slug($name, '-', false),
+                    'name' => $name
+                ]);
             }
 
-			StatusHashtag::firstOrCreate([
-				'status_id' => $status->id,
-				'hashtag_id' => $hashtag->id,
-				'profile_id' => $status->profile_id,
-				'status_visibility' => $status->scope
-			]);
-		});
+            StatusHashtag::firstOrCreate([
+                'status_id' => $status->id,
+                'hashtag_id' => $hashtag->id,
+                'profile_id' => $status->profile_id,
+                'status_visibility' => $status->scope
+            ]);
+        });
 
-		// Mentions
-		$tags->filter(function($tag) {
-			return $tag &&
-				$tag['type'] == 'Mention' &&
-				isset($tag['href']) &&
-				substr($tag['href'], 0, 8) === 'https://';
-		})
-		->map(function($tag) use($status) {
-			if(Helpers::validateLocalUrl($tag['href'])) {
-				$parts = explode('/', $tag['href']);
-				if(!$parts) {
-					return;
-				}
-				$pid = AccountService::usernameToId(end($parts));
-				if(!$pid) {
-					return;
-				}
-			} else {
-				$acct = Helpers::profileFetch($tag['href']);
-				if(!$acct) {
-					return;
-				}
-				$pid = $acct->id;
-			}
-			$mention = new Mention;
-			$mention->status_id = $status->id;
-			$mention->profile_id = $pid;
-			$mention->save();
-			MentionPipeline::dispatch($status, $mention);
-		});
-	}
+        // Mentions
+        $tags->filter(function($tag) {
+            return $tag &&
+                $tag['type'] == 'Mention' &&
+                isset($tag['href']) &&
+                substr($tag['href'], 0, 8) === 'https://';
+        })
+        ->map(function($tag) use($status) {
+            if(Helpers::validateLocalUrl($tag['href'])) {
+                $parts = explode('/', $tag['href']);
+                if(!$parts) {
+                    return;
+                }
+                $pid = AccountService::usernameToId(end($parts));
+                if(!$pid) {
+                    return;
+                }
+            } else {
+                $acct = Helpers::profileFetch($tag['href']);
+                if(!$acct) {
+                    return;
+                }
+                $pid = $acct->id;
+            }
+            $mention = new Mention;
+            $mention->status_id = $status->id;
+            $mention->profile_id = $pid;
+            $mention->save();
+            MentionPipeline::dispatch($status, $mention);
+        });
+
+        StatusService::refresh($status->id);
+    }
 }
diff --git a/app/Jobs/VideoPipeline/VideoThumbnailToCloudPipeline.php b/app/Jobs/VideoPipeline/VideoThumbnailToCloudPipeline.php
new file mode 100644
index 000000000..87931bd7a
--- /dev/null
+++ b/app/Jobs/VideoPipeline/VideoThumbnailToCloudPipeline.php
@@ -0,0 +1,147 @@
+<?php
+
+namespace App\Jobs\VideoPipeline;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
+use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing;
+use Illuminate\Http\File;
+use Cache;
+use FFMpeg;
+use Storage;
+use App\Media;
+use App\Jobs\MediaPipeline\MediaStoragePipeline;
+use App\Util\Media\Blurhash;
+use App\Services\MediaService;
+use App\Services\StatusService;
+use App\Services\ResilientMediaStorageService;
+
+class VideoThumbnailToCloudPipeline implements ShouldQueue, ShouldBeUniqueUntilProcessing
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $media;
+
+    public $timeout = 900;
+    public $tries = 3;
+    public $maxExceptions = 1;
+    public $failOnTimeout = true;
+    public $deleteWhenMissingModels = true;
+
+    /**
+     * The number of seconds after which the job's unique lock will be released.
+     *
+     * @var int
+     */
+    public $uniqueFor = 3600;
+
+    /**
+     * Get the unique ID for the job.
+     */
+    public function uniqueId(): string
+    {
+        return 'media:video-thumb-to-cloud:id-' . $this->media->id;
+    }
+
+    /**
+     * Get the middleware the job should pass through.
+     *
+     * @return array<int, object>
+     */
+    public function middleware(): array
+    {
+        return [(new WithoutOverlapping("media:video-thumb-to-cloud:id-{$this->media->id}"))->shared()->dontRelease()];
+    }
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct(Media $media)
+    {
+        $this->media = $media;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        if((bool) config_cache('pixelfed.cloud_storage') === false) {
+            return;
+        }
+
+        $media = $this->media;
+
+        if($media->mime != 'video/mp4') {
+            return;
+        }
+
+        if($media->profile_id === null || $media->status_id === null) {
+            return;
+        }
+
+        if($media->thumbnail_url) {
+            return;
+        }
+
+        $base = $media->media_path;
+        $path = explode('/', $base);
+        $name = last($path);
+
+        try {
+            $t = explode('.', $name);
+            $t = $t[0].'_thumb.jpeg';
+            $i = count($path) - 1;
+            $path[$i] = $t;
+            $save = implode('/', $path);
+            $video = FFMpeg::open($base)
+            ->getFrameFromSeconds(1)
+            ->export()
+            ->toDisk('local')
+            ->save($save);
+
+            if(!$save) {
+                return;
+            }
+
+            $media->thumbnail_path = $save;
+            $p = explode('/', $media->media_path);
+            array_pop($p);
+            $pt = explode('/', $save);
+            $thumbname = array_pop($pt);
+            $storagePath = implode('/', $p);
+            $thumb = storage_path('app/' . $save);
+            $thumbUrl = ResilientMediaStorageService::store($storagePath, $thumb, $thumbname);
+            $media->thumbnail_url = $thumbUrl;
+            $media->save();
+
+            $blurhash = Blurhash::generate($media);
+            if($blurhash) {
+                $media->blurhash = $blurhash;
+                $media->save();
+            }
+
+            if(str_starts_with($save, 'public/m/_v2/') && str_ends_with($save, '.jpeg')) {
+                Storage::delete($save);
+            }
+
+            if(str_starts_with($media->media_path, 'public/m/_v2/') && str_ends_with($media->media_path, '.mp4')) {
+                Storage::disk('local')->delete($media->media_path);
+            }
+        } catch (Exception $e) {
+        }
+
+        if($media->status_id) {
+            Cache::forget('status:transformer:media:attachments:' . $media->status_id);
+            MediaService::del($media->status_id);
+            Cache::forget('status:thumb:nsfw0' . $media->status_id);
+            Cache::forget('status:thumb:nsfw1' . $media->status_id);
+            Cache::forget('pf:services:sh:id:' . $media->status_id);
+            StatusService::del($media->status_id);
+        }
+    }
+}
diff --git a/app/Like.php b/app/Like.php
index c5b000c66..0c2c7f363 100644
--- a/app/Like.php
+++ b/app/Like.php
@@ -9,7 +9,7 @@ class Like extends Model
 {
     use SoftDeletes;
 
-    const MAX_PER_DAY = 500;
+    const MAX_PER_DAY = 1500;
 
     /**
      * The attributes that should be mutated to dates.
diff --git a/app/Mail/AdminMessageResponse.php b/app/Mail/AdminMessageResponse.php
new file mode 100644
index 000000000..a42dfa14d
--- /dev/null
+++ b/app/Mail/AdminMessageResponse.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Mail;
+
+use App\Contact;
+use Illuminate\Bus\Queueable;
+use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Content;
+use Illuminate\Mail\Mailables\Envelope;
+use Illuminate\Mail\Mailables\Headers;
+use Illuminate\Queue\SerializesModels;
+
+class AdminMessageResponse extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    /**
+     * Create a new message instance.
+     */
+    public function __construct(
+        public Contact $contact,
+    ) {}
+
+    /**
+     * Get the message headers.
+     */
+    public function headers(): Headers
+    {
+        $mid = $this->contact->getMessageId();
+
+        return new Headers(
+            messageId: $mid,
+            text: [
+                'X-Entity-Ref-ID' => $mid,
+            ],
+        );
+    }
+
+    /**
+     * Get the message envelope.
+     */
+    public function envelope(): Envelope
+    {
+        return new Envelope(
+            subject: ucfirst(strtolower(config('pixelfed.domain.app'))).' Contact Form Response [Ticket #'.$this->contact->id.']',
+        );
+    }
+
+    /**
+     * Get the message content definition.
+     */
+    public function content(): Content
+    {
+        return new Content(
+            markdown: 'emails.contact.admin-response',
+            with: [
+                'url' => $this->contact->userResponseUrl(),
+            ],
+        );
+    }
+
+    /**
+     * Get the attachments for the message.
+     *
+     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
+     */
+    public function attachments(): array
+    {
+        return [];
+    }
+}
diff --git a/app/Mail/CuratedRegisterAcceptUser.php b/app/Mail/CuratedRegisterAcceptUser.php
new file mode 100644
index 000000000..a87278ace
--- /dev/null
+++ b/app/Mail/CuratedRegisterAcceptUser.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Content;
+use Illuminate\Mail\Mailables\Envelope;
+use Illuminate\Queue\SerializesModels;
+
+class CuratedRegisterAcceptUser extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    public $verify;
+
+    /**
+     * Create a new message instance.
+     */
+    public function __construct($verify)
+    {
+        $this->verify = $verify;
+    }
+
+    /**
+     * Get the message envelope.
+     */
+    public function envelope(): Envelope
+    {
+        return new Envelope(
+            subject: 'Your ' . config('pixelfed.domain.app') . ' Registration Update',
+        );
+    }
+
+    /**
+     * Get the message content definition.
+     */
+    public function content(): Content
+    {
+        return new Content(
+            markdown: 'emails.curated-register.request-accepted',
+        );
+    }
+
+    /**
+     * Get the attachments for the message.
+     *
+     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
+     */
+    public function attachments(): array
+    {
+        return [];
+    }
+}
diff --git a/app/Mail/CuratedRegisterConfirmEmail.php b/app/Mail/CuratedRegisterConfirmEmail.php
new file mode 100644
index 000000000..bf06c4311
--- /dev/null
+++ b/app/Mail/CuratedRegisterConfirmEmail.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Content;
+use Illuminate\Mail\Mailables\Envelope;
+use Illuminate\Queue\SerializesModels;
+use App\Models\CuratedRegister;
+
+class CuratedRegisterConfirmEmail extends Mailable
+{
+    use Queueable, SerializesModels;
+    public $verify;
+
+    /**
+     * Create a new message instance.
+     */
+    public function __construct(CuratedRegister $verify)
+    {
+        $this->verify = $verify;
+    }
+
+    /**
+     * Get the message envelope.
+     */
+    public function envelope(): Envelope
+    {
+        return new Envelope(
+            subject: 'Welcome to Pixelfed! Please Confirm Your Email',
+        );
+    }
+
+    /**
+     * Get the message content definition.
+     */
+    public function content(): Content
+    {
+        return new Content(
+            markdown: 'emails.curated-register.confirm_email',
+        );
+    }
+
+    /**
+     * Get the attachments for the message.
+     *
+     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
+     */
+    public function attachments(): array
+    {
+        return [];
+    }
+}
diff --git a/app/Mail/CuratedRegisterNotifyAdmin.php b/app/Mail/CuratedRegisterNotifyAdmin.php
new file mode 100644
index 000000000..28bdad971
--- /dev/null
+++ b/app/Mail/CuratedRegisterNotifyAdmin.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Content;
+use Illuminate\Mail\Mailables\Envelope;
+use Illuminate\Queue\SerializesModels;
+use App\Models\CuratedRegister;
+
+class CuratedRegisterNotifyAdmin extends Mailable
+{
+    use Queueable, SerializesModels;
+    public $verify;
+
+    /**
+     * Create a new message instance.
+     */
+    public function __construct(CuratedRegister $verify)
+    {
+        $this->verify = $verify;
+    }
+
+    /**
+     * Get the message envelope.
+     */
+    public function envelope(): Envelope
+    {
+        return new Envelope(
+            subject: '[Requires Action]: New Curated Onboarding Application',
+        );
+    }
+
+    /**
+     * Get the message content definition.
+     */
+    public function content(): Content
+    {
+        return new Content(
+            markdown: 'emails.curated-register.admin_notify',
+        );
+    }
+
+    /**
+     * Get the attachments for the message.
+     *
+     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
+     */
+    public function attachments(): array
+    {
+        return [];
+    }
+}
diff --git a/app/Mail/CuratedRegisterNotifyAdminUserResponse.php b/app/Mail/CuratedRegisterNotifyAdminUserResponse.php
new file mode 100644
index 000000000..bc54d5c3e
--- /dev/null
+++ b/app/Mail/CuratedRegisterNotifyAdminUserResponse.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Content;
+use Illuminate\Mail\Mailables\Envelope;
+use Illuminate\Queue\SerializesModels;
+
+class CuratedRegisterNotifyAdminUserResponse extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    public $activity;
+
+    /**
+     * Create a new message instance.
+     */
+    public function __construct($activity)
+    {
+        $this->activity = $activity;
+    }
+
+    /**
+     * Get the message envelope.
+     */
+    public function envelope(): Envelope
+    {
+        return new Envelope(
+            subject: 'Curated Register Notify Admin User Response',
+        );
+    }
+
+    /**
+     * Get the message content definition.
+     */
+    public function content(): Content
+    {
+        return new Content(
+            markdown: 'emails.curated-register.admin_notify_user_response',
+        );
+    }
+
+    /**
+     * Get the attachments for the message.
+     *
+     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
+     */
+    public function attachments(): array
+    {
+        return [];
+    }
+}
diff --git a/app/Mail/CuratedRegisterRejectUser.php b/app/Mail/CuratedRegisterRejectUser.php
new file mode 100644
index 000000000..448ea8462
--- /dev/null
+++ b/app/Mail/CuratedRegisterRejectUser.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Content;
+use Illuminate\Mail\Mailables\Envelope;
+use Illuminate\Queue\SerializesModels;
+
+class CuratedRegisterRejectUser extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    public $verify;
+
+    /**
+     * Create a new message instance.
+     */
+    public function __construct($verify)
+    {
+        $this->verify = $verify;
+    }
+
+    /**
+     * Get the message envelope.
+     */
+    public function envelope(): Envelope
+    {
+        return new Envelope(
+            subject: 'Your ' . config('pixelfed.domain.app') . ' Registration Update',
+        );
+    }
+
+    /**
+     * Get the message content definition.
+     */
+    public function content(): Content
+    {
+        return new Content(
+            markdown: 'emails.curated-register.request-rejected',
+        );
+    }
+
+    /**
+     * Get the attachments for the message.
+     *
+     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
+     */
+    public function attachments(): array
+    {
+        return [];
+    }
+}
diff --git a/app/Mail/CuratedRegisterRequestDetailsFromUser.php b/app/Mail/CuratedRegisterRequestDetailsFromUser.php
new file mode 100644
index 000000000..b0ff1bb4d
--- /dev/null
+++ b/app/Mail/CuratedRegisterRequestDetailsFromUser.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Content;
+use Illuminate\Mail\Mailables\Envelope;
+use Illuminate\Queue\SerializesModels;
+use App\Models\CuratedRegister;
+use App\Models\CuratedRegisterActivity;
+
+class CuratedRegisterRequestDetailsFromUser extends Mailable
+{
+    use Queueable, SerializesModels;
+    public $verify;
+    public $activity;
+
+    /**
+     * Create a new message instance.
+     */
+    public function __construct(CuratedRegister $verify, CuratedRegisterActivity $activity)
+    {
+        $this->verify = $verify;
+        $this->activity = $activity;
+    }
+
+    /**
+     * Get the message envelope.
+     */
+    public function envelope(): Envelope
+    {
+        return new Envelope(
+            subject: '[Action Needed]: Additional information requested',
+        );
+    }
+
+    /**
+     * Get the message content definition.
+     */
+    public function content(): Content
+    {
+        return new Content(
+            markdown: 'emails.curated-register.request-details-from-user',
+        );
+    }
+
+    /**
+     * Get the attachments for the message.
+     *
+     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
+     */
+    public function attachments(): array
+    {
+        return [];
+    }
+}
diff --git a/app/Mail/CuratedRegisterSendMessage.php b/app/Mail/CuratedRegisterSendMessage.php
new file mode 100644
index 000000000..20ffc2749
--- /dev/null
+++ b/app/Mail/CuratedRegisterSendMessage.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Content;
+use Illuminate\Mail\Mailables\Envelope;
+use Illuminate\Queue\SerializesModels;
+
+class CuratedRegisterSendMessage extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    public $verify;
+
+    /**
+     * Create a new message instance.
+     */
+    public function __construct($verify)
+    {
+        $this->verify = $verify;
+    }
+
+    /**
+     * Get the message envelope.
+     */
+    public function envelope(): Envelope
+    {
+        return new Envelope(
+            subject: 'Your ' . config('pixelfed.domain.app') . ' Registration Update',
+        );
+    }
+
+    /**
+     * Get the message content definition.
+     */
+    public function content(): Content
+    {
+        return new Content(
+            markdown: 'emails.curated-register.message-from-admin',
+        );
+    }
+
+    /**
+     * Get the attachments for the message.
+     *
+     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
+     */
+    public function attachments(): array
+    {
+        return [];
+    }
+}
diff --git a/app/Mail/ParentChildInvite.php b/app/Mail/ParentChildInvite.php
new file mode 100644
index 000000000..843ea472d
--- /dev/null
+++ b/app/Mail/ParentChildInvite.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Content;
+use Illuminate\Mail\Mailables\Envelope;
+use Illuminate\Queue\SerializesModels;
+
+class ParentChildInvite extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    public function __construct(
+        public $verify,
+    ) {}
+
+    /**
+     * Get the message envelope.
+     */
+    public function envelope(): Envelope
+    {
+        return new Envelope(
+            subject: 'You\'ve been invited to join Pixelfed!',
+        );
+    }
+
+    /**
+     * Get the message content definition.
+     */
+    public function content(): Content
+    {
+        return new Content(
+            markdown: 'emails.parental-controls.invite',
+        );
+    }
+
+    /**
+     * Get the attachments for the message.
+     *
+     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
+     */
+    public function attachments(): array
+    {
+        return [];
+    }
+}
diff --git a/app/Mail/UserEmailForgotReminder.php b/app/Mail/UserEmailForgotReminder.php
new file mode 100644
index 000000000..f7e5dbc10
--- /dev/null
+++ b/app/Mail/UserEmailForgotReminder.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Content;
+use Illuminate\Mail\Mailables\Envelope;
+use Illuminate\Queue\SerializesModels;
+
+class UserEmailForgotReminder extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    public $user;
+
+    /**
+     * Create a new message instance.
+     */
+    public function __construct($user)
+    {
+        $this->user = $user;
+    }
+
+    /**
+     * Get the message envelope.
+     */
+    public function envelope(): Envelope
+    {
+        return new Envelope(
+            subject: '[' . config('pixelfed.domain.app') . '] Pixelfed Account Email Reminder',
+        );
+    }
+
+    /**
+     * Get the message content definition.
+     */
+    public function content(): Content
+    {
+        return new Content(
+            markdown: 'emails.forgot-email.message',
+        );
+    }
+
+    /**
+     * Get the attachments for the message.
+     *
+     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
+     */
+    public function attachments(): array
+    {
+        return [];
+    }
+}
diff --git a/app/Media.php b/app/Media.php
index 1c709e7f3..9ecc7b17e 100644
--- a/app/Media.php
+++ b/app/Media.php
@@ -2,11 +2,11 @@
 
 namespace App;
 
+use App\Util\Media\License;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use App\Util\Media\License;
-use Storage;
 use Illuminate\Support\Str;
+use Storage;
 
 class Media extends Model
 {
@@ -37,12 +37,12 @@ class Media extends Model
 
     public function url()
     {
-        if($this->cdn_url) {
+        if ($this->cdn_url) {
             // return Storage::disk(config('filesystems.cloud'))->url($this->media_path);
             return $this->cdn_url;
         }
 
-        if($this->remote_media && $this->remote_url) {
+        if ($this->remote_media && $this->remote_url) {
             return $this->remote_url;
         }
 
@@ -51,19 +51,19 @@ class Media extends Model
 
     public function thumbnailUrl()
     {
-        if($this->thumbnail_url) {
+        if ($this->thumbnail_url) {
             return $this->thumbnail_url;
         }
 
-        if(!$this->remote_media && $this->thumbnail_path) {
+        if (! $this->remote_media && $this->thumbnail_path) {
             return url(Storage::url($this->thumbnail_path));
         }
 
-        if($this->remote_media && !$this->thumbnail_path && $this->cdn_url) {
+        if (! $this->thumbnail_path && $this->cdn_url) {
             return $this->cdn_url;
         }
 
-        if($this->media_path && $this->mime && in_array($this->mime, ['image/jpeg', 'image/png'])) {
+        if ($this->media_path && $this->mime && in_array($this->mime, ['image/jpeg', 'image/png'])) {
             return $this->remote_media || Str::startsWith($this->media_path, 'http') ?
                 $this->media_path :
                 url(Storage::url($this->media_path));
@@ -79,9 +79,10 @@ class Media extends Model
 
     public function mimeType()
     {
-        if(!$this->mime) {
+        if (! $this->mime) {
             return;
         }
+
         return explode('/', $this->mime)[0];
     }
 
@@ -105,6 +106,7 @@ class Media extends Model
                 $verb = 'Document';
                 break;
         }
+
         return $verb;
     }
 
@@ -115,11 +117,11 @@ class Media extends Model
 
     public function getModel()
     {
-        if(empty($this->metadata)) {
+        if (empty($this->metadata)) {
             return false;
         }
         $meta = $this->getMetadata();
-        if($meta && isset($meta['Model'])) {
+        if ($meta && isset($meta['Model'])) {
             return $meta['Model'];
         }
     }
@@ -128,11 +130,11 @@ class Media extends Model
     {
         $license = $this->license;
 
-        if(!$license || strlen($license) > 2 || $license == 1) {
+        if (! $license || strlen($license) > 2 || $license == 1) {
             return null;
         }
 
-        if(!in_array($license, License::keys())) {
+        if (! in_array($license, License::keys())) {
             return null;
         }
 
@@ -141,7 +143,7 @@ class Media extends Model
         return [
             'id' => $res['id'],
             'title' => $res['title'],
-            'url' => $res['url']
+            'url' => $res['url'],
         ];
     }
 }
diff --git a/app/MediaTag.php b/app/MediaTag.php
index 49dd52b16..df253fc6e 100644
--- a/app/MediaTag.php
+++ b/app/MediaTag.php
@@ -8,8 +8,14 @@ class MediaTag extends Model
 {
     protected $guarded = [];
 
+    protected $visible = [
+        'status_id',
+        'profile_id',
+        'tagged_username',
+    ];
+
     public function status()
     {
-    	return $this->belongsTo(Status::class);
+        return $this->belongsTo(Status::class);
     }
 }
diff --git a/app/Models/AdminShadowFilter.php b/app/Models/AdminShadowFilter.php
index f98086f7f..8a163feeb 100644
--- a/app/Models/AdminShadowFilter.php
+++ b/app/Models/AdminShadowFilter.php
@@ -5,6 +5,7 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use App\Services\AccountService;
+use App\Profile;
 
 class AdminShadowFilter extends Model
 {
@@ -24,4 +25,9 @@ class AdminShadowFilter extends Model
 
         return;
     }
+
+    public function profile()
+    {
+        return $this->belongsTo(Profile::class, 'item_id');
+    }
 }
diff --git a/app/Models/CuratedRegister.php b/app/Models/CuratedRegister.php
new file mode 100644
index 000000000..eeeb82784
--- /dev/null
+++ b/app/Models/CuratedRegister.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class CuratedRegister extends Model
+{
+    use HasFactory;
+
+    protected $fillable = [
+        'user_has_responded'
+    ];
+
+    protected $casts = [
+        'autofollow_account_ids' => 'array',
+        'admin_notes' => 'array',
+        'email_verified_at' => 'datetime',
+        'admin_notified_at' => 'datetime',
+        'action_taken_at' => 'datetime',
+        'user_has_responded' => 'boolean',
+        'is_awaiting_more_info' => 'boolean',
+        'is_accepted' => 'boolean',
+        'is_rejected' => 'boolean',
+        'is_closed' => 'boolean',
+    ];
+
+    public function adminStatusLabel()
+    {
+        if($this->user_has_responded) {
+            return '<span class="border border-warning px-3 py-1 rounded text-white font-weight-bold">Awaiting Admin Response</span>';
+        }
+        if(!$this->email_verified_at) {
+            return '<span class="border border-danger px-3 py-1 rounded text-white font-weight-bold">Unverified email</span>';
+        }
+        if($this->is_approved) {
+            return '<span class="badge badge-success bg-success text-dark">Approved</span>';
+        }
+        if($this->is_rejected) {
+            return '<span class="badge badge-danger bg-danger text-white">Rejected</span>';
+        }
+        if($this->is_awaiting_more_info ) {
+            return '<span class="border border-info px-3 py-1 rounded text-white font-weight-bold">Awaiting User Response</span>';
+        }
+        if($this->is_closed ) {
+            return '<span class="border border-muted px-3 py-1 rounded text-white font-weight-bold" style="opacity:0.5">Closed</span>';
+        }
+
+        return '<span class="border border-success px-3 py-1 rounded text-white font-weight-bold">Open</span>';
+    }
+
+    public function emailConfirmUrl()
+    {
+        return url('/auth/sign_up/confirm?sid=' . $this->id . '&code=' . $this->verify_code);
+    }
+
+    public function emailReplyUrl()
+    {
+        return url('/auth/sign_up/concierge?sid=' . $this->id . '&code=' . $this->verify_code . '&sc=' . str_random(8));
+    }
+
+    public function adminReviewUrl()
+    {
+        return url('/i/admin/curated-onboarding/show/' . $this->id);
+    }
+}
diff --git a/app/Models/CuratedRegisterActivity.php b/app/Models/CuratedRegisterActivity.php
new file mode 100644
index 000000000..5b5071e01
--- /dev/null
+++ b/app/Models/CuratedRegisterActivity.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class CuratedRegisterActivity extends Model
+{
+    use HasFactory;
+
+    protected $guarded = [];
+
+    protected $casts = [
+        'metadata' => 'array',
+        'admin_notified_at' => 'datetime',
+        'action_taken_at' => 'datetime',
+    ];
+
+    public function application()
+    {
+        return $this->belongsTo(CuratedRegister::class, 'register_id');
+    }
+
+    public function emailReplyUrl()
+    {
+        return url('/auth/sign_up/concierge?sid='.$this->register_id . '&id=' . $this->id . '&code=' . $this->secret_code);
+    }
+
+    public function adminReviewUrl()
+    {
+        $url = '/i/admin/curated-onboarding/show/' . $this->register_id . '/?ah=' . $this->id;
+        if($this->reply_to_id) {
+            $url .= '&rtid=' . $this->reply_to_id;
+        }
+        return url($url);
+    }
+}
diff --git a/app/Models/CuratedRegisterTemplate.php b/app/Models/CuratedRegisterTemplate.php
new file mode 100644
index 000000000..a5def0cef
--- /dev/null
+++ b/app/Models/CuratedRegisterTemplate.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class CuratedRegisterTemplate extends Model
+{
+    use HasFactory;
+
+    protected $fillable = [
+        'name', 'description', 'content', 'is_active', 'order',
+    ];
+
+    protected $casts = [
+        'is_active' => 'boolean',
+    ];
+}
diff --git a/app/Models/CustomEmoji.php b/app/Models/CustomEmoji.php
index 1ff026a19..47aa0d1a8 100644
--- a/app/Models/CustomEmoji.php
+++ b/app/Models/CustomEmoji.php
@@ -18,7 +18,7 @@ class CustomEmoji extends Model
 
 	public static function scan($text, $activitypub = false)
 	{
-		if(config('federation.custom_emoji.enabled') == false) {
+		if((bool) config_cache('federation.custom_emoji.enabled') == false) {
 			return [];
 		}
 
diff --git a/app/Models/DefaultDomainBlock.php b/app/Models/DefaultDomainBlock.php
new file mode 100644
index 000000000..d90816a32
--- /dev/null
+++ b/app/Models/DefaultDomainBlock.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class DefaultDomainBlock extends Model
+{
+    use HasFactory;
+
+    protected $guarded = [];
+}
diff --git a/app/Models/Group.php b/app/Models/Group.php
new file mode 100644
index 000000000..508ed98c0
--- /dev/null
+++ b/app/Models/Group.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use App\HasSnowflakePrimary;
+use App\Profile;
+use App\Services\GroupService;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class Group extends Model
+{
+    use HasSnowflakePrimary, HasFactory, SoftDeletes;
+
+	/**
+	 * Indicates if the IDs are auto-incrementing.
+	 *
+	 * @var bool
+	 */
+	public $incrementing = false;
+
+	protected $casts = [
+		'metadata' => 'json'
+	];
+
+	public function url()
+	{
+		return url("/groups/{$this->id}");
+	}
+
+	public function permalink($suffix = null)
+	{
+		if(!$this->local) {
+			return $this->remote_url;
+		}
+		return $this->url() . $suffix;
+	}
+
+	public function members()
+	{
+		return $this->hasMany(GroupMember::class);
+	}
+
+	public function admin()
+	{
+		return $this->belongsTo(Profile::class, 'profile_id');
+	}
+
+	public function isMember($id = false)
+	{
+		$id = $id ?? request()->user()->profile_id;
+		// return $this->members()->whereProfileId($id)->whereJoinRequest(false)->exists();
+		return GroupService::isMember($this->id, $id);
+	}
+
+	public function getMembershipType()
+	{
+		return $this->is_private ? 'private' : ($this->is_local ? 'local' : 'all');
+	}
+
+	public function selfRole($id = false)
+	{
+		$id = $id ?? request()->user()->profile_id;
+		return optional($this->members()->whereProfileId($id)->first())->role ?? null;
+	}
+}
diff --git a/app/Models/GroupActivityGraph.php b/app/Models/GroupActivityGraph.php
new file mode 100644
index 000000000..55981d20a
--- /dev/null
+++ b/app/Models/GroupActivityGraph.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class GroupActivityGraph extends Model
+{
+    use HasFactory;
+}
diff --git a/app/Models/GroupBlock.php b/app/Models/GroupBlock.php
new file mode 100644
index 000000000..8dac6dda0
--- /dev/null
+++ b/app/Models/GroupBlock.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class GroupBlock extends Model
+{
+    use HasFactory;
+}
diff --git a/app/Models/GroupCategory.php b/app/Models/GroupCategory.php
new file mode 100644
index 000000000..940b24038
--- /dev/null
+++ b/app/Models/GroupCategory.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class GroupCategory extends Model
+{
+    use HasFactory;
+}
diff --git a/app/Models/GroupComment.php b/app/Models/GroupComment.php
new file mode 100644
index 000000000..702cb9fe8
--- /dev/null
+++ b/app/Models/GroupComment.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use App\Profile;
+
+class GroupComment extends Model
+{
+    use HasFactory;
+
+    public $guarded = [];
+
+    public function profile()
+    {
+        return $this->belongsTo(Profile::class);
+    }
+
+    public function url()
+    {
+        return '/group/' . $this->group_id . '/c/' . $this->id;
+    }
+}
diff --git a/app/Models/GroupEvent.php b/app/Models/GroupEvent.php
new file mode 100644
index 000000000..ddcd074cc
--- /dev/null
+++ b/app/Models/GroupEvent.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class GroupEvent extends Model
+{
+    use HasFactory;
+}
diff --git a/app/Models/GroupHashtag.php b/app/Models/GroupHashtag.php
new file mode 100644
index 000000000..cc4611627
--- /dev/null
+++ b/app/Models/GroupHashtag.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class GroupHashtag extends Model
+{
+    use HasFactory;
+
+    public $fillable = ['name'];
+}
diff --git a/app/Models/GroupInteraction.php b/app/Models/GroupInteraction.php
new file mode 100644
index 000000000..38607b24e
--- /dev/null
+++ b/app/Models/GroupInteraction.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class GroupInteraction extends Model
+{
+    use HasFactory;
+
+    protected $casts = [
+    	'metadata' => 'array'
+    ];
+}
diff --git a/app/Models/GroupInvitation.php b/app/Models/GroupInvitation.php
new file mode 100644
index 000000000..adcd38ea4
--- /dev/null
+++ b/app/Models/GroupInvitation.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class GroupInvitation extends Model
+{
+    use HasFactory;
+}
diff --git a/app/Models/GroupLike.php b/app/Models/GroupLike.php
new file mode 100644
index 000000000..3aff7c739
--- /dev/null
+++ b/app/Models/GroupLike.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class GroupLike extends Model
+{
+    use HasFactory;
+
+    public $fillable = ['group_id', 'status_id', 'profile_id', 'comment_id'];
+}
diff --git a/app/Models/GroupLimit.php b/app/Models/GroupLimit.php
new file mode 100644
index 000000000..3a9b54098
--- /dev/null
+++ b/app/Models/GroupLimit.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class GroupLimit extends Model
+{
+	use HasFactory;
+
+	protected $casts = [
+		'limits' => 'json',
+		'metadata' => 'json'
+	];
+
+	protected $fillable = [
+		'profile_id',
+		'group_id'
+	];
+}
diff --git a/app/Models/GroupMedia.php b/app/Models/GroupMedia.php
new file mode 100644
index 000000000..12f424151
--- /dev/null
+++ b/app/Models/GroupMedia.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Storage;
+
+class GroupMedia extends Model
+{
+    use HasFactory;
+
+    /**
+     * Get the attributes that should be cast.
+     *
+     * @return array<string, string>
+     */
+    protected function casts(): array
+    {
+        return [
+            'metadata' => 'json',
+            'processed_at' => 'datetime',
+            'thumbnail_generated' => 'datetime'
+        ];
+    }
+
+    public function url()
+    {
+        if($this->cdn_url) {
+            return $this->cdn_url;
+        }
+        return Storage::url($this->media_path);
+    }
+
+    public function thumbnailUrl()
+    {
+        return $this->thumbnail_url;
+    }
+}
diff --git a/app/Models/GroupMember.php b/app/Models/GroupMember.php
new file mode 100644
index 000000000..4f15e0d3e
--- /dev/null
+++ b/app/Models/GroupMember.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class GroupMember extends Model
+{
+    use HasFactory;
+
+    public function group()
+    {
+    	return $this->belongsTo(Group::class);
+    }
+}
diff --git a/app/Models/GroupPost.php b/app/Models/GroupPost.php
new file mode 100644
index 000000000..59693ec6b
--- /dev/null
+++ b/app/Models/GroupPost.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use App\HasSnowflakePrimary;
+use App\Services\HashidService;
+use App\Profile;
+use App\Status;
+
+class GroupPost extends Model
+{
+    use HasSnowflakePrimary, HasFactory;
+
+	/**
+	 * Indicates if the IDs are auto-incrementing.
+	 *
+	 * @var bool
+	 */
+	public $incrementing = false;
+
+    protected $fillable = [
+        'remote_url',
+        'group_id',
+        'profile_id',
+        'type',
+        'caption',
+        'visibility',
+        'is_nsfw'
+    ];
+
+	public function mediaPath()
+	{
+		return 'public/g/_v1/' . $this->group_id . '/' . $this->id;
+	}
+
+	public function group()
+	{
+		return $this->belongsTo(Group::class);
+	}
+
+	public function status()
+	{
+		return $this->belongsTo(Status::class);
+	}
+
+    public function profile()
+    {
+        return $this->belongsTo(Profile::class);
+    }
+
+	public function url()
+	{
+        return '/groups/' . $this->group_id . '/p/' . $this->id;
+	}
+}
diff --git a/app/Models/GroupPostHashtag.php b/app/Models/GroupPostHashtag.php
new file mode 100644
index 000000000..46165dd7c
--- /dev/null
+++ b/app/Models/GroupPostHashtag.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class GroupPostHashtag extends Model
+{
+    use HasFactory;
+
+    public $fillable = [
+    	'group_id',
+    	'group_post_id',
+    	'status_id',
+    	'hashtag_id',
+    	'profile_id',
+    	'nsfw'
+    ];
+
+    public $timestamps = false;
+}
diff --git a/app/Models/GroupReport.php b/app/Models/GroupReport.php
new file mode 100644
index 000000000..f816eb030
--- /dev/null
+++ b/app/Models/GroupReport.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class GroupReport extends Model
+{
+    use HasFactory;
+}
diff --git a/app/Models/GroupRole.php b/app/Models/GroupRole.php
new file mode 100644
index 000000000..799c41ce7
--- /dev/null
+++ b/app/Models/GroupRole.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class GroupRole extends Model
+{
+    use HasFactory;
+}
diff --git a/app/Models/GroupStore.php b/app/Models/GroupStore.php
new file mode 100644
index 000000000..f87889ba2
--- /dev/null
+++ b/app/Models/GroupStore.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class GroupStore extends Model
+{
+    use HasFactory;
+}
diff --git a/app/Models/HashtagRelated.php b/app/Models/HashtagRelated.php
new file mode 100644
index 000000000..bbaa1c06c
--- /dev/null
+++ b/app/Models/HashtagRelated.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class HashtagRelated extends Model
+{
+    use HasFactory;
+
+    protected $guarded = [];
+
+    /**
+     * The attributes that should be mutated to dates and other custom formats.
+     *
+     * @var array
+     */
+    protected $casts = [
+        'related_tags' => 'array',
+        'last_calculated_at' => 'datetime',
+        'last_moderated_at' => 'datetime',
+    ];
+}
diff --git a/app/Models/ModeratedProfile.php b/app/Models/ModeratedProfile.php
new file mode 100644
index 000000000..e9bc2fbf1
--- /dev/null
+++ b/app/Models/ModeratedProfile.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class ModeratedProfile extends Model
+{
+    use HasFactory;
+
+    public $guarded = [];
+}
diff --git a/app/Models/ParentalControls.php b/app/Models/ParentalControls.php
new file mode 100644
index 000000000..83d47c18a
--- /dev/null
+++ b/app/Models/ParentalControls.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use App\User;
+use App\Services\AccountService;
+
+class ParentalControls extends Model
+{
+    use HasFactory, SoftDeletes;
+
+    protected $casts = [
+        'permissions' => 'array',
+        'email_sent_at' => 'datetime',
+        'email_verified_at' => 'datetime'
+    ];
+
+    protected $guarded = [];
+
+    public function parent()
+    {
+        return $this->belongsTo(User::class, 'parent_id');
+    }
+
+    public function child()
+    {
+        return $this->belongsTo(User::class, 'child_id');
+    }
+
+    public function childAccount()
+    {
+        if($u = $this->child) {
+            if($u->profile_id) {
+                return AccountService::get($u->profile_id, true);
+            } else {
+                return [];
+            }
+        } else {
+            return [];
+        }
+    }
+
+    public function manageUrl()
+    {
+        return url('/settings/parental-controls/manage/' . $this->id);
+    }
+
+    public function inviteUrl()
+    {
+        return url('/auth/pci/' . $this->id . '/' . $this->verify_code);
+    }
+}
diff --git a/app/Models/ProfileAlias.php b/app/Models/ProfileAlias.php
index b7a3bdc9c..aef91bebc 100644
--- a/app/Models/ProfileAlias.php
+++ b/app/Models/ProfileAlias.php
@@ -10,6 +10,8 @@ class ProfileAlias extends Model
 {
     use HasFactory;
 
+    protected $guarded = [];
+
     public function profile()
     {
         return $this->belongsTo(Profile::class);
diff --git a/app/Models/ProfileMigration.php b/app/Models/ProfileMigration.php
new file mode 100644
index 000000000..1b04aed7b
--- /dev/null
+++ b/app/Models/ProfileMigration.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use App\Profile;
+
+class ProfileMigration extends Model
+{
+    use HasFactory;
+
+    protected $guarded = [];
+
+    public function profile()
+    {
+        return $this->belongsTo(Profile::class, 'profile_id');
+    }
+
+    public function target()
+    {
+        return $this->belongsTo(Profile::class, 'target_profile_id');
+    }
+}
diff --git a/app/Models/UserDomainBlock.php b/app/Models/UserDomainBlock.php
new file mode 100644
index 000000000..900e026f2
--- /dev/null
+++ b/app/Models/UserDomainBlock.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use App\Profile;
+
+class UserDomainBlock extends Model
+{
+    use HasFactory;
+
+    protected $guarded = [];
+
+    public $timestamps = false;
+
+    public function profile()
+    {
+        return $this->belongsTo(Profile::class, 'profile_id');
+    }
+}
diff --git a/app/Models/UserEmailForgot.php b/app/Models/UserEmailForgot.php
new file mode 100644
index 000000000..9e549aff4
--- /dev/null
+++ b/app/Models/UserEmailForgot.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class UserEmailForgot extends Model
+{
+    use HasFactory;
+
+    protected $guarded = [];
+
+    protected $casts = [
+        'email_sent_at' => 'datetime',
+    ];
+}
diff --git a/app/Models/UserRoles.php b/app/Models/UserRoles.php
new file mode 100644
index 000000000..8d289971a
--- /dev/null
+++ b/app/Models/UserRoles.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use App\User;
+
+class UserRoles extends Model
+{
+    use HasFactory;
+
+    protected $guarded = [];
+
+    protected $casts = [
+        'roles' => 'array'
+    ];
+
+    public function user()
+    {
+        return $this->belongsTo(User::class);
+    }
+}
diff --git a/app/Observers/AvatarObserver.php b/app/Observers/AvatarObserver.php
index b7854e66f..557773ce0 100644
--- a/app/Observers/AvatarObserver.php
+++ b/app/Observers/AvatarObserver.php
@@ -3,9 +3,9 @@
 namespace App\Observers;
 
 use App\Avatar;
+use App\Services\AccountService;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
-use App\Services\AccountService;
 
 class AvatarObserver
 {
@@ -19,7 +19,6 @@ class AvatarObserver
     /**
      * Handle the avatar "created" event.
      *
-     * @param  \App\Avatar  $avatar
      * @return void
      */
     public function created(Avatar $avatar)
@@ -30,7 +29,6 @@ class AvatarObserver
     /**
      * Handle the avatar "updated" event.
      *
-     * @param  \App\Avatar  $avatar
      * @return void
      */
     public function updated(Avatar $avatar)
@@ -41,7 +39,6 @@ class AvatarObserver
     /**
      * Handle the avatar "deleted" event.
      *
-     * @param  \App\Avatar  $avatar
      * @return void
      */
     public function deleted(Avatar $avatar)
@@ -52,23 +49,22 @@ class AvatarObserver
     /**
      * Handle the avatar "deleting" event.
      *
-     * @param  \App\Avatar  $avatar
      * @return void
      */
     public function deleting(Avatar $avatar)
     {
         $path = storage_path('app/'.$avatar->media_path);
-        if( is_file($path) && 
+        if (is_file($path) &&
             $avatar->media_path != 'public/avatars/default.png' &&
             $avatar->media_path != 'public/avatars/default.jpg'
         ) {
             @unlink($path);
         }
 
-        if(config_cache('pixelfed.cloud_storage')) {
+        if ((bool) config_cache('pixelfed.cloud_storage')) {
             $disk = Storage::disk(config('filesystems.cloud'));
             $base = Str::startsWith($avatar->media_path, 'cache/avatars/');
-            if($base && $disk->exists($avatar->media_path)) {
+            if ($base && $disk->exists($avatar->media_path)) {
                 $disk->delete($avatar->media_path);
             }
         }
@@ -78,7 +74,6 @@ class AvatarObserver
     /**
      * Handle the avatar "restored" event.
      *
-     * @param  \App\Avatar  $avatar
      * @return void
      */
     public function restored(Avatar $avatar)
@@ -89,7 +84,6 @@ class AvatarObserver
     /**
      * Handle the avatar "force deleted" event.
      *
-     * @param  \App\Avatar  $avatar
      * @return void
      */
     public function forceDeleted(Avatar $avatar)
diff --git a/app/Observers/FollowerObserver.php b/app/Observers/FollowerObserver.php
index f230bb79f..bc85e48a0 100644
--- a/app/Observers/FollowerObserver.php
+++ b/app/Observers/FollowerObserver.php
@@ -5,6 +5,8 @@ namespace App\Observers;
 use App\Follower;
 use App\Services\FollowerService;
 use Cache;
+use App\Jobs\HomeFeedPipeline\FeedFollowPipeline;
+use App\Jobs\HomeFeedPipeline\FeedUnfollowPipeline;
 
 class FollowerObserver
 {
@@ -21,6 +23,7 @@ class FollowerObserver
         }
 
         FollowerService::add($follower->profile_id, $follower->following_id);
+        FeedFollowPipeline::dispatch($follower->profile_id, $follower->following_id)->onQueue('follow');
     }
 
     /**
diff --git a/app/Observers/HashtagFollowObserver.php b/app/Observers/HashtagFollowObserver.php
new file mode 100644
index 000000000..56158c21a
--- /dev/null
+++ b/app/Observers/HashtagFollowObserver.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Observers;
+
+use App\HashtagFollow;
+use App\Services\HashtagFollowService;
+use App\Jobs\HomeFeedPipeline\HashtagUnfollowPipeline;
+use Illuminate\Contracts\Events\ShouldHandleEventsAfterCommit;
+
+class HashtagFollowObserver implements ShouldHandleEventsAfterCommit
+{
+    /**
+     * Handle the HashtagFollow "created" event.
+     */
+    public function created(HashtagFollow $hashtagFollow): void
+    {
+        HashtagFollowService::add($hashtagFollow->hashtag_id, $hashtagFollow->profile_id);
+    }
+
+    /**
+     * Handle the HashtagFollow "updated" event.
+     */
+    public function updated(HashtagFollow $hashtagFollow): void
+    {
+    	//
+    }
+
+    /**
+     * Handle the HashtagFollow "deleting" event.
+     */
+    public function deleting(HashtagFollow $hashtagFollow): void
+    {
+        HashtagFollowService::unfollow($hashtagFollow->hashtag_id, $hashtagFollow->profile_id);
+    }
+
+    /**
+     * Handle the HashtagFollow "restored" event.
+     */
+    public function restored(HashtagFollow $hashtagFollow): void
+    {
+        //
+    }
+
+    /**
+     * Handle the HashtagFollow "force deleted" event.
+     */
+    public function forceDeleted(HashtagFollow $hashtagFollow): void
+    {
+        HashtagFollowService::unfollow($hashtagFollow->hashtag_id, $hashtagFollow->profile_id);
+    }
+}
diff --git a/app/Observers/StatusHashtagObserver.php b/app/Observers/StatusHashtagObserver.php
index fa38ea3c3..cac223d51 100644
--- a/app/Observers/StatusHashtagObserver.php
+++ b/app/Observers/StatusHashtagObserver.php
@@ -5,32 +5,31 @@ namespace App\Observers;
 use DB;
 use App\StatusHashtag;
 use App\Services\StatusHashtagService;
+use App\Jobs\HomeFeedPipeline\HashtagInsertFanoutPipeline;
+use App\Jobs\HomeFeedPipeline\HashtagRemoveFanoutPipeline;
+use Illuminate\Contracts\Events\ShouldHandleEventsAfterCommit;
 
-class StatusHashtagObserver
+class StatusHashtagObserver implements ShouldHandleEventsAfterCommit
 {
-    /**
-     * Handle events after all transactions are committed.
-     *
-     * @var bool
-     */
-    public $afterCommit = true;
-
     /**
      * Handle the notification "created" event.
      *
-     * @param  \App\Notification  $notification
+     * @param  \App\StatusHashtag  $hashtag
      * @return void
      */
     public function created(StatusHashtag $hashtag)
     {
         StatusHashtagService::set($hashtag->hashtag_id, $hashtag->status_id);
         DB::table('hashtags')->where('id', $hashtag->hashtag_id)->increment('cached_count');
+        if($hashtag->status_visibility && $hashtag->status_visibility === 'public') {
+            HashtagInsertFanoutPipeline::dispatch($hashtag)->onQueue('feed');
+        }
     }
 
     /**
      * Handle the notification "updated" event.
      *
-     * @param  \App\Notification  $notification
+     * @param  \App\StatusHashtag  $hashtag
      * @return void
      */
     public function updated(StatusHashtag $hashtag)
@@ -41,19 +40,22 @@ class StatusHashtagObserver
     /**
      * Handle the notification "deleted" event.
      *
-     * @param  \App\Notification  $notification
+     * @param  \App\StatusHashtag  $hashtag
      * @return void
      */
     public function deleted(StatusHashtag $hashtag)
     {
         StatusHashtagService::del($hashtag->hashtag_id, $hashtag->status_id);
         DB::table('hashtags')->where('id', $hashtag->hashtag_id)->decrement('cached_count');
+        if($hashtag->status_visibility && $hashtag->status_visibility === 'public') {
+            HashtagRemoveFanoutPipeline::dispatch($hashtag->status_id, $hashtag->hashtag_id)->onQueue('feed');
+        }
     }
 
     /**
      * Handle the notification "restored" event.
      *
-     * @param  \App\Notification  $notification
+     * @param  \App\StatusHashtag  $hashtag
      * @return void
      */
     public function restored(StatusHashtag $hashtag)
@@ -64,7 +66,7 @@ class StatusHashtagObserver
     /**
      * Handle the notification "force deleted" event.
      *
-     * @param  \App\Notification  $notification
+     * @param  \App\StatusHashtag  $hashtag
      * @return void
      */
     public function forceDeleted(StatusHashtag $hashtag)
diff --git a/app/Observers/StatusObserver.php b/app/Observers/StatusObserver.php
index e58997165..6c2c4c36d 100644
--- a/app/Observers/StatusObserver.php
+++ b/app/Observers/StatusObserver.php
@@ -7,6 +7,8 @@ use App\Services\ProfileStatusService;
 use Cache;
 use App\Models\ImportPost;
 use App\Services\ImportService;
+use App\Jobs\HomeFeedPipeline\FeedRemovePipeline;
+use App\Jobs\HomeFeedPipeline\FeedRemoveRemotePipeline;
 
 class StatusObserver
 {
@@ -36,6 +38,10 @@ class StatusObserver
      */
     public function updated(Status $status)
     {
+        if(!in_array($status->scope, ['public', 'unlisted', 'private'])) {
+            return;
+        }
+
         if(config('instance.timeline.home.cached')) {
             Cache::forget('pf:timelines:home:' . $status->profile_id);
         }
@@ -53,6 +59,10 @@ class StatusObserver
      */
     public function deleted(Status $status)
     {
+        if(!in_array($status->scope, ['public', 'unlisted', 'private'])) {
+            return;
+        }
+
         if(config('instance.timeline.home.cached')) {
             Cache::forget('pf:timelines:home:' . $status->profile_id);
         }
@@ -63,6 +73,14 @@ class StatusObserver
             ImportPost::whereProfileId($status->profile_id)->whereStatusId($status->id)->delete();
             ImportService::clearImportedFiles($status->profile_id);
         }
+
+        if(config('exp.cached_home_timeline')) {
+        	if($status->uri) {
+        		FeedRemoveRemotePipeline::dispatch($status->id, $status->profile_id)->onQueue('feed');
+        	} else {
+        		FeedRemovePipeline::dispatch($status->id, $status->profile_id)->onQueue('feed');
+        	}
+        }
     }
 
     /**
diff --git a/app/Observers/UserFilterObserver.php b/app/Observers/UserFilterObserver.php
index 8e149e7d9..75867e64b 100644
--- a/app/Observers/UserFilterObserver.php
+++ b/app/Observers/UserFilterObserver.php
@@ -4,6 +4,8 @@ namespace App\Observers;
 
 use App\UserFilter;
 use App\Services\UserFilterService;
+use App\Jobs\HomeFeedPipeline\FeedFollowPipeline;
+use App\Jobs\HomeFeedPipeline\FeedUnfollowPipeline;
 
 class UserFilterObserver
 {
@@ -78,10 +80,12 @@ class UserFilterObserver
 		switch ($userFilter->filter_type) {
 			case 'mute':
 				UserFilterService::mute($userFilter->user_id, $userFilter->filterable_id);
+				FeedUnfollowPipeline::dispatch($userFilter->user_id, $userFilter->filterable_id)->onQueue('feed');
 				break;
 				
 			case 'block':
 				UserFilterService::block($userFilter->user_id, $userFilter->filterable_id);
+				FeedUnfollowPipeline::dispatch($userFilter->user_id, $userFilter->filterable_id)->onQueue('feed');
 				break;
 		}
 	}
@@ -96,10 +100,12 @@ class UserFilterObserver
 		switch ($userFilter->filter_type) {
 			case 'mute':
 				UserFilterService::unmute($userFilter->user_id, $userFilter->filterable_id);
+				FeedFollowPipeline::dispatch($userFilter->user_id, $userFilter->filterable_id)->onQueue('feed');
 				break;
 				
 			case 'block':
 				UserFilterService::unblock($userFilter->user_id, $userFilter->filterable_id);
+				FeedFollowPipeline::dispatch($userFilter->user_id, $userFilter->filterable_id)->onQueue('feed');
 				break;
 		}
 	}
diff --git a/app/Observers/UserObserver.php b/app/Observers/UserObserver.php
index ec4ef9f34..2b5d46116 100644
--- a/app/Observers/UserObserver.php
+++ b/app/Observers/UserObserver.php
@@ -7,90 +7,52 @@ use App\Follower;
 use App\Profile;
 use App\User;
 use App\UserSetting;
+use App\Services\UserFilterService;
+use App\Models\DefaultDomainBlock;
+use App\Models\UserDomainBlock;
 use App\Jobs\FollowPipeline\FollowPipeline;
 use DB;
 use App\Services\FollowerService;
 
 class UserObserver
 {
-	/**
-	 * Listen to the User created event.
-	 *
-	 * @param \App\User $user
-	 *
-	 * @return void
-	 */
-	public function saved(User $user)
-	{
-		if($user->status == 'deleted') {
-			return;
-		}
+    /**
+     * Handle the notification "created" event.
+     *
+     * @param  \App\User $user
+     * @return void
+     */
+    public function created(User $user): void
+    {
+        $this->handleUser($user);
+    }
 
-        if(Profile::whereUsername($user->username)->exists()) {
-            return;
+    /**
+     * Listen to the User saved event.
+     *
+     * @param \App\User $user
+     *
+     * @return void
+     */
+    public function saved(User $user)
+    {
+        $this->handleUser($user);
+    }
+
+    /**
+     * Listen to the User updated event.
+     *
+     * @param \App\User $user
+     *
+     * @return void
+     */
+    public function updated(User $user): void
+    {
+        $this->handleUser($user);
+        if($user->profile) {
+            $this->applyDefaultDomainBlocks($user);
         }
-
-		if (empty($user->profile)) {
-			$profile = DB::transaction(function() use($user) {
-				$profile = new Profile();
-				$profile->user_id = $user->id;
-				$profile->username = $user->username;
-				$profile->name = $user->name;
-				$pkiConfig = [
-					'digest_alg'       => 'sha512',
-					'private_key_bits' => 2048,
-					'private_key_type' => OPENSSL_KEYTYPE_RSA,
-				];
-				$pki = openssl_pkey_new($pkiConfig);
-				openssl_pkey_export($pki, $pki_private);
-				$pki_public = openssl_pkey_get_details($pki);
-				$pki_public = $pki_public['key'];
-
-				$profile->private_key = $pki_private;
-				$profile->public_key = $pki_public;
-				$profile->save();
-				return $profile;
-			});
-
-			DB::transaction(function() use($user, $profile) {
-				$user = User::findOrFail($user->id);
-				$user->profile_id = $profile->id;
-				$user->save();
-
-				CreateAvatar::dispatch($profile);
-			});
-
-			if(config_cache('account.autofollow') == true) {
-				$names = config_cache('account.autofollow_usernames');
-				$names = explode(',', $names);
-
-				if(!$names || !last($names)) {
-					return;
-				}
-
-				$profiles = Profile::whereIn('username', $names)->get();
-
-				if($profiles) {
-					foreach($profiles as $p) {
-						$follower = new Follower;
-						$follower->profile_id = $profile->id;
-						$follower->following_id = $p->id;
-						$follower->save();
-
-						FollowPipeline::dispatch($follower);
-					}
-				}
-			}
-		}
-
-		if (empty($user->settings)) {
-			DB::transaction(function() use($user) {
-				UserSetting::firstOrCreate([
-					'user_id' => $user->id
-				]);
-			});
-		}
-	}
+    }
 
     /**
      * Handle the user "deleted" event.
@@ -102,4 +64,97 @@ class UserObserver
     {
         FollowerService::delCache($user->profile_id);
     }
+
+    protected function handleUser($user)
+    {
+        if(in_array($user->status, ['deleted', 'delete'])) {
+            return;
+        }
+
+        if(Profile::whereUsername($user->username)->exists()) {
+            return;
+        }
+
+        if (empty($user->profile)) {
+            $profile = DB::transaction(function() use($user) {
+                $profile = new Profile();
+                $profile->user_id = $user->id;
+                $profile->username = $user->username;
+                $profile->name = $user->name;
+                $pkiConfig = [
+                    'digest_alg'       => 'sha512',
+                    'private_key_bits' => 2048,
+                    'private_key_type' => OPENSSL_KEYTYPE_RSA,
+                ];
+                $pki = openssl_pkey_new($pkiConfig);
+                openssl_pkey_export($pki, $pki_private);
+                $pki_public = openssl_pkey_get_details($pki);
+                $pki_public = $pki_public['key'];
+
+                $profile->private_key = $pki_private;
+                $profile->public_key = $pki_public;
+                $profile->save();
+                $this->applyDefaultDomainBlocks($user);
+                return $profile;
+            });
+
+
+            DB::transaction(function() use($user, $profile) {
+                $user = User::findOrFail($user->id);
+                $user->profile_id = $profile->id;
+                $user->save();
+
+                CreateAvatar::dispatch($profile);
+            });
+
+            if((bool) config_cache('account.autofollow') == true) {
+                $names = config_cache('account.autofollow_usernames');
+                $names = explode(',', $names);
+
+                if(!$names || !last($names)) {
+                    return;
+                }
+
+                $profiles = Profile::whereIn('username', $names)->get();
+
+                if($profiles) {
+                    foreach($profiles as $p) {
+                        $follower = new Follower;
+                        $follower->profile_id = $profile->id;
+                        $follower->following_id = $p->id;
+                        $follower->save();
+
+                        FollowPipeline::dispatch($follower);
+                    }
+                }
+            }
+        }
+
+        if (empty($user->settings)) {
+            DB::transaction(function() use($user) {
+                UserSetting::firstOrCreate([
+                    'user_id' => $user->id
+                ]);
+            });
+        }
+    }
+
+    protected function applyDefaultDomainBlocks($user)
+    {
+        if($user->profile_id == null) {
+            return;
+        }
+        $defaultDomainBlocks = DefaultDomainBlock::pluck('domain')->toArray();
+
+        if(!$defaultDomainBlocks || !count($defaultDomainBlocks)) {
+            return;
+        }
+
+        foreach($defaultDomainBlocks as $domain) {
+            UserDomainBlock::updateOrCreate([
+                'profile_id' => $user->profile_id,
+                'domain' => strtolower(trim($domain))
+            ]);
+        }
+    }
 }
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 774177758..b080b3b2f 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -5,6 +5,7 @@ namespace App\Providers;
 use App\Observers\{
 	AvatarObserver,
 	FollowerObserver,
+	HashtagFollowObserver,
 	LikeObserver,
 	NotificationObserver,
 	ModLogObserver,
@@ -17,6 +18,7 @@ use App\Observers\{
 use App\{
 	Avatar,
 	Follower,
+	HashtagFollow,
 	Like,
 	Notification,
 	ModLog,
@@ -32,6 +34,7 @@ use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Pagination\Paginator;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Database\Eloquent\Model;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -50,6 +53,7 @@ class AppServiceProvider extends ServiceProvider
 		Paginator::useBootstrap();
 		Avatar::observe(AvatarObserver::class);
 		Follower::observe(FollowerObserver::class);
+		HashtagFollow::observe(HashtagFollowObserver::class);
 		Like::observe(LikeObserver::class);
 		Notification::observe(NotificationObserver::class);
 		ModLog::observe(ModLogObserver::class);
@@ -62,6 +66,8 @@ class AppServiceProvider extends ServiceProvider
 			return Auth::check() && $request->user()->is_admin;
 		});
 		Validator::includeUnvalidatedArrayKeys();
+
+		// Model::preventLazyLoading(true);
 	}
 
 	/**
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index 0ec8c1895..8bedbfd53 100644
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -2,9 +2,9 @@
 
 namespace App\Providers;
 
+use Gate;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 use Laravel\Passport\Passport;
-use Gate;
 
 class AuthServiceProvider extends ServiceProvider
 {
@@ -14,7 +14,7 @@ class AuthServiceProvider extends ServiceProvider
      * @var array
      */
     protected $policies = [
-        'App\Model' => 'App\Policies\ModelPolicy',
+        // 'App\Model' => 'App\Policies\ModelPolicy',
     ];
 
     /**
@@ -24,24 +24,30 @@ class AuthServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        if(config('app.env') === 'production' && config('pixelfed.oauth_enabled') == true) {
+        if(config('pixelfed.oauth_enabled') == true) {
+            Passport::ignoreRoutes();
             Passport::tokensExpireIn(now()->addDays(config('instance.oauth.token_expiration', 356)));
             Passport::refreshTokensExpireIn(now()->addDays(config('instance.oauth.refresh_expiration', 400)));
             Passport::enableImplicitGrant();
-            if(config('instance.oauth.pat.enabled')) {
+            if (config('instance.oauth.pat.enabled')) {
                 Passport::personalAccessClientId(config('instance.oauth.pat.id'));
             }
-            Passport::setDefaultScope([
-                'read',
-                'write',
-                'follow',
-            ]);
 
             Passport::tokensCan([
                 'read' => 'Full read access to your account',
                 'write' => 'Full write access to your account',
                 'follow' => 'Ability to follow other profiles',
-                'push'  => ''
+                'admin:read' => 'Read all data on the server',
+                'admin:read:domain_blocks' => 'Read sensitive information of all domain blocks',
+                'admin:write' => 'Modify all data on the server',
+                'admin:write:domain_blocks' => 'Perform moderation actions on domain blocks',
+                'push'  => 'Receive your push notifications'
+            ]);
+
+            Passport::setDefaultScope([
+                'read',
+                'write',
+                'follow',
             ]);
         }
 
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index 37aac4ac3..2452eb2a8 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -23,8 +23,6 @@ class RouteServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        //
-
         parent::boot();
     }
 
@@ -36,10 +34,7 @@ class RouteServiceProvider extends ServiceProvider
     public function map()
     {
         $this->mapApiRoutes();
-
         $this->mapWebRoutes();
-
-        //
     }
 
     /**
@@ -51,6 +46,18 @@ class RouteServiceProvider extends ServiceProvider
      */
     protected function mapWebRoutes()
     {
+        Route::middleware('web')
+             ->namespace($this->namespace)
+             ->group(base_path('routes/web-admin.php'));
+
+        Route::middleware('web')
+             ->namespace($this->namespace)
+             ->group(base_path('routes/web-portfolio.php'));
+
+        Route::middleware('web')
+             ->namespace($this->namespace)
+             ->group(base_path('routes/web-api.php'));
+
         Route::middleware('web')
              ->namespace($this->namespace)
              ->group(base_path('routes/web.php'));
diff --git a/app/Rules/ExpoPushTokenRule.php b/app/Rules/ExpoPushTokenRule.php
new file mode 100644
index 000000000..27fb9670b
--- /dev/null
+++ b/app/Rules/ExpoPushTokenRule.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Rules;
+
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
+
+class ExpoPushTokenRule implements ValidationRule
+{
+    /**
+     * Run the validation rule.
+     *
+     * @param  \Closure(string): \Illuminate\Translation\PotentiallyTranslatedString  $fail
+     */
+    public function validate(string $attribute, mixed $value, Closure $fail): void
+    {
+        if (! $value || empty($value)) {
+            $fail('The :attribute must not be empty.');
+        }
+
+        if (str_starts_with($value, 'ExponentPushToken[') && mb_strlen($value) < 26) {
+            $fail('The :attribute is not a valid push token.');
+        }
+
+        if (! str_starts_with($value, 'ExponentPushToken[') && ! str_starts_with($value, 'ExpoPushToken[')) {
+            $fail('The :attribute is not a valid push token.');
+        }
+
+        if (! str_ends_with($value, ']')) {
+            $fail('The :attribute is not a valid push token.');
+        }
+    }
+}
diff --git a/app/Rules/ValidUrl.php b/app/Rules/ValidUrl.php
new file mode 100644
index 000000000..21c36d564
--- /dev/null
+++ b/app/Rules/ValidUrl.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Rules;
+
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
+
+class ValidUrl implements ValidationRule
+{
+    /**
+     * Run the validation rule.
+     *
+     * @param  \Closure(string): \Illuminate\Translation\PotentiallyTranslatedString  $fail
+     */
+    public function validate(string $attribute, mixed $value, Closure $fail): void
+    {
+        if (!str_starts_with(strtolower($value), 'https://')) {
+            $fail('The :attribute must start with https://.');
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/Services/Account/AccountStatService.php b/app/Services/Account/AccountStatService.php
new file mode 100644
index 000000000..12fd3f94f
--- /dev/null
+++ b/app/Services/Account/AccountStatService.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Services\Account;
+
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Redis;
+
+class AccountStatService
+{
+    const REFRESH_CACHE_KEY = 'pf:services:accountstats:refresh:daily';
+
+    public static function incrementPostCount($pid)
+    {
+        return Redis::zadd(self::REFRESH_CACHE_KEY, $pid, $pid);
+    }
+
+    public static function decrementPostCount($pid)
+    {
+        return Redis::zadd(self::REFRESH_CACHE_KEY, $pid, $pid);
+    }
+
+    public static function removeFromPostCount($pid)
+    {
+        return Redis::zrem(self::REFRESH_CACHE_KEY, $pid);
+    }
+
+    public static function getAllPostCountIncr($limit = -1)
+    {
+        return Redis::zrange(self::REFRESH_CACHE_KEY, 0, $limit);
+    }
+}
diff --git a/app/Services/AccountService.php b/app/Services/AccountService.php
index ea64855ce..3ce04d610 100644
--- a/app/Services/AccountService.php
+++ b/app/Services/AccountService.php
@@ -2,222 +2,341 @@
 
 namespace App\Services;
 
-use Cache;
+use App\Models\UserDomainBlock;
 use App\Profile;
 use App\Status;
+use App\Transformer\Api\AccountTransformer;
 use App\User;
 use App\UserSetting;
-use App\Transformer\Api\AccountTransformer;
-use League\Fractal;
-use League\Fractal\Serializer\ArraySerializer;
+use Cache;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
+use League\Fractal;
+use League\Fractal\Serializer\ArraySerializer;
+use NumberFormatter;
 
 class AccountService
 {
-	const CACHE_KEY = 'pf:services:account:';
+    const CACHE_KEY = 'pf:services:account:';
 
-	public static function get($id, $softFail = false)
-	{
-		$res = Cache::remember(self::CACHE_KEY . $id, 43200, function() use($id) {
-			$fractal = new Fractal\Manager();
-			$fractal->setSerializer(new ArraySerializer());
-			$profile = Profile::find($id);
-			if(!$profile || $profile->status === 'delete') {
-				return null;
-			}
-			$resource = new Fractal\Resource\Item($profile, new AccountTransformer());
-			return $fractal->createData($resource)->toArray();
-		});
+    const CACHE_PF_ACCT_SETTINGS_KEY = 'pf:services:account-settings:';
 
-		if(!$res) {
-			return $softFail ? null : abort(404);
-		}
-		return $res;
-	}
+    public static function get($id, $softFail = false)
+    {
+        $res = Cache::remember(self::CACHE_KEY.$id, 43200, function () use ($id) {
+            $fractal = new Fractal\Manager;
+            $fractal->setSerializer(new ArraySerializer);
+            $profile = Profile::find($id);
+            if (! $profile || $profile->status === 'delete') {
+                return null;
+            }
+            $resource = new Fractal\Resource\Item($profile, new AccountTransformer);
 
-	public static function getMastodon($id, $softFail = false)
-	{
-		$account = self::get($id, $softFail);
-		if(!$account) {
-			return null;
-		}
+            return $fractal->createData($resource)->toArray();
+        });
 
-		if(config('exp.emc') == false) {
-			return $account;
-		}
+        if (! $res) {
+            return $softFail ? null : abort(404);
+        }
 
-		unset(
-			$account['header_bg'],
-			$account['is_admin'],
-			$account['last_fetched_at'],
-			$account['local'],
-			$account['location'],
-			$account['note_text'],
-			$account['pronouns'],
-			$account['website']
-		);
+        return $res;
+    }
 
-		$account['avatar_static'] = $account['avatar'];
-		$account['bot'] = false;
-		$account['emojis'] = [];
-		$account['fields'] = [];
-		$account['header'] = url('/storage/headers/missing.png');
-		$account['header_static'] = url('/storage/headers/missing.png');
-		$account['last_status_at'] = null;
+    public static function getMastodon($id, $softFail = false)
+    {
+        $account = self::get($id, $softFail);
+        if (! $account) {
+            return null;
+        }
 
-		return $account;
-	}
+        if (config('exp.emc') == false) {
+            return $account;
+        }
 
-	public static function del($id)
-	{
-		Cache::forget('pf:activitypub:user-object:by-id:' . $id);
-		return Cache::forget(self::CACHE_KEY . $id);
-	}
+        unset(
+            $account['header_bg'],
+            $account['is_admin'],
+            $account['last_fetched_at'],
+            $account['local'],
+            $account['location'],
+            $account['note_text'],
+            $account['pronouns'],
+            $account['website']
+        );
 
-	public static function settings($id)
-	{
-		return Cache::remember('profile:compose:settings:' . $id, 604800, function() use($id) {
-			$settings = UserSetting::whereUserId($id)->first();
-			if(!$settings) {
-				return self::defaultSettings();
-			}
-			return collect($settings)
-			->filter(function($item, $key) {
-				return in_array($key, array_keys(self::defaultSettings())) == true;
-			})
-			->map(function($item, $key) {
-				if($key == 'compose_settings') {
-					$cs = self::defaultSettings()['compose_settings'];
-					$ms = is_array($item) ? $item : [];
-					return array_merge($cs, $ms);
-				}
+        $account['avatar_static'] = $account['avatar'];
+        $account['bot'] = false;
+        $account['emojis'] = [];
+        $account['fields'] = [];
+        $account['header'] = url('/storage/headers/missing.png');
+        $account['header_static'] = url('/storage/headers/missing.png');
+        $account['last_status_at'] = null;
 
-				if($key == 'other') {
-					$other =  self::defaultSettings()['other'];
-					$mo = is_array($item) ? $item : [];
-					return array_merge($other, $mo);
-				}
-				return $item;
-			});
-		});
-	}
+        return $account;
+    }
 
-	public static function canEmbed($id)
-	{
-		return self::settings($id)['other']['disable_embeds'] == false;
-	}
+    public static function del($id)
+    {
+        Cache::forget('pf:activitypub:user-object:by-id:'.$id);
 
-	public static function defaultSettings()
-	{
-		return [
-			'crawlable' => true,
-			'public_dm' => false,
-			'reduce_motion' => false,
-			'high_contrast_mode' => false,
-			'video_autoplay' => false,
-			'show_profile_follower_count' => true,
-			'show_profile_following_count' => true,
-			'compose_settings' => [
-				'default_scope' => 'public',
-				'default_license' => 1,
-				'media_descriptions' => false
-			],
-			'other' => [
-				'advanced_atom' => false,
-				'disable_embeds' => false,
-				'mutual_mention_notifications' => false,
-				'hide_collections' => false,
-				'hide_like_counts' => false,
-				'hide_groups' => false,
-				'hide_stories' => false,
-				'disable_cw' => false,
-			]
-		];
-	}
+        return Cache::forget(self::CACHE_KEY.$id);
+    }
 
-	public static function syncPostCount($id)
-	{
-		$profile = Profile::find($id);
+    public static function settings($id)
+    {
+        return Cache::remember('profile:compose:settings:'.$id, 604800, function () use ($id) {
+            $settings = UserSetting::whereUserId($id)->first();
+            if (! $settings) {
+                return self::defaultSettings();
+            }
 
-		if(!$profile) {
-			return false;
-		}
+            return collect($settings)
+                ->filter(function ($item, $key) {
+                    return in_array($key, array_keys(self::defaultSettings())) == true;
+                })
+                ->map(function ($item, $key) {
+                    if ($key == 'compose_settings') {
+                        $cs = self::defaultSettings()['compose_settings'];
+                        $ms = is_array($item) ? $item : [];
 
-		$key = self::CACHE_KEY . 'pcs:' . $id;
+                        return array_merge($cs, $ms);
+                    }
 
-		if(Cache::has($key)) {
-			return;
-		}
+                    if ($key == 'other') {
+                        $other = self::defaultSettings()['other'];
+                        $mo = is_array($item) ? $item : [];
 
-		$count = Status::whereProfileId($id)
-			->whereNull('in_reply_to_id')
-			->whereNull('reblog_of_id')
-			->whereIn('scope', ['public', 'unlisted', 'private'])
-			->count();
+                        return array_merge($other, $mo);
+                    }
 
-		$profile->status_count = $count;
-		$profile->save();
+                    return $item;
+                });
+        });
+    }
 
-		Cache::put($key, 1, 900);
-		return true;
-	}
+    public static function getAccountSettings($pid)
+    {
+        $key = self::CACHE_PF_ACCT_SETTINGS_KEY.$pid;
 
-	public static function usernameToId($username)
-	{
-		$key = self::CACHE_KEY . 'u2id:' . hash('sha256', $username);
-		return Cache::remember($key, 900, function() use($username) {
-			$s = Str::of($username);
-			if($s->contains('@') && !$s->startsWith('@')) {
-				$username = "@{$username}";
-			}
-			$profile = DB::table('profiles')
-				->whereUsername($username)
-				->first();
-			if(!$profile) {
-				return null;
-			}
-			return (string) $profile->id;
-		});
-	}
+        return Cache::remember($key, 14400, function () use ($pid) {
+            $user = User::with('profile')->whereProfileId($pid)->whereNull('status')->first();
+            if (! $user) {
+                return [];
+            }
 
-	public static function hiddenFollowers($id)
-	{
-		$account = self::get($id, true);
-		if(!$account || !isset($account['local']) || $account['local'] == false) {
-			return false;
-		}
+            $settings = $user->settings;
+            $other = array_merge(self::defaultSettings()['other'], $settings->other ?? []);
 
-		return Cache::remember('pf:acct:settings:hidden-followers:' . $id, 43200, function() use($id) {
-			$user = User::whereProfileId($id)->first();
-			if(!$user) {
-				return false;
-			}
-			$settings = UserSetting::whereUserId($user->id)->first();
-			if($settings) {
-				return $settings->show_profile_follower_count == false;
-			}
-			return false;
-		});
-	}
+            return [
+                'reduce_motion' => (bool) $settings->reduce_motion,
+                'high_contrast_mode' => (bool) $settings->high_contrast_mode,
+                'video_autoplay' => (bool) $settings->video_autoplay,
+                'media_descriptions' => (bool) $settings->media_descriptions,
+                'crawlable' => (bool) $settings->crawlable,
+                'show_profile_follower_count' => (bool) $settings->show_profile_follower_count,
+                'show_profile_following_count' => (bool) $settings->show_profile_following_count,
+                'public_dm' => (bool) $settings->public_dm,
+                'disable_embeds' => (bool) $other['disable_embeds'],
+                'show_atom' => (bool) $settings->show_atom,
+                'is_suggestable' => (bool) $user->profile->is_suggestable,
+                'indexable' => (bool) $user->profile->indexable,
+            ];
+        });
+    }
 
-	public static function hiddenFollowing($id)
-	{
-		$account = self::get($id, true);
-		if(!$account || !isset($account['local']) || $account['local'] == false) {
-			return false;
-		}
+    public static function forgetAccountSettings($pid)
+    {
+        return Cache::forget(self::CACHE_PF_ACCT_SETTINGS_KEY.$pid);
+    }
 
-		return Cache::remember('pf:acct:settings:hidden-following:' . $id, 43200, function() use($id) {
-			$user = User::whereProfileId($id)->first();
-			if(!$user) {
-				return false;
-			}
-			$settings = UserSetting::whereUserId($user->id)->first();
-			if($settings) {
-				return $settings->show_profile_following_count == false;
-			}
-			return false;
-		});
-	}
+    public static function canEmbed($id)
+    {
+        $res = self::getAccountSettings($id);
+        if (! $res || ! isset($res['disable_embeds'])) {
+            return false;
+        }
+
+        return ! $res['disable_embeds'];
+    }
+
+    public static function defaultSettings()
+    {
+        return [
+            'crawlable' => true,
+            'public_dm' => false,
+            'reduce_motion' => false,
+            'high_contrast_mode' => false,
+            'video_autoplay' => false,
+            'show_profile_follower_count' => true,
+            'show_profile_following_count' => true,
+            'compose_settings' => [
+                'default_scope' => 'public',
+                'default_license' => 1,
+                'media_descriptions' => false,
+            ],
+            'other' => [
+                'advanced_atom' => false,
+                'disable_embeds' => false,
+                'mutual_mention_notifications' => false,
+                'hide_collections' => false,
+                'hide_like_counts' => false,
+                'hide_groups' => false,
+                'hide_stories' => false,
+                'disable_cw' => false,
+            ],
+        ];
+    }
+
+    public static function syncPostCount($id)
+    {
+        $profile = Profile::find($id);
+
+        if (! $profile) {
+            return false;
+        }
+
+        $key = self::CACHE_KEY.'pcs:'.$id;
+
+        if (Cache::has($key)) {
+            return;
+        }
+
+        $count = Status::whereProfileId($id)
+            ->whereNull(['in_reply_to_id', 'reblog_of_id'])
+            ->whereIn('scope', ['public', 'unlisted', 'private'])
+            ->count();
+
+        $profile->status_count = $count;
+        $profile->save();
+
+        Cache::put($key, 1, 259200);
+
+        return true;
+    }
+
+    public static function usernameToId($username)
+    {
+        $key = self::CACHE_KEY.'u2id:'.hash('sha256', $username);
+
+        return Cache::remember($key, 14400, function () use ($username) {
+            $s = Str::of($username);
+            if ($s->contains('@') && ! $s->startsWith('@')) {
+                $username = "@{$username}";
+            }
+            $profile = DB::table('profiles')
+                ->whereUsername($username)
+                ->first();
+            if (! $profile) {
+                return null;
+            }
+
+            return (string) $profile->id;
+        });
+    }
+
+    public static function hiddenFollowers($id)
+    {
+        $account = self::get($id, true);
+        if (! $account || ! isset($account['local']) || $account['local'] == false) {
+            return false;
+        }
+
+        return Cache::remember('pf:acct:settings:hidden-followers:'.$id, 43200, function () use ($id) {
+            $user = User::whereProfileId($id)->first();
+            if (! $user) {
+                return false;
+            }
+            $settings = UserSetting::whereUserId($user->id)->first();
+            if ($settings) {
+                return $settings->show_profile_follower_count == false;
+            }
+
+            return false;
+        });
+    }
+
+    public static function hiddenFollowing($id)
+    {
+        $account = self::get($id, true);
+        if (! $account || ! isset($account['local']) || $account['local'] == false) {
+            return false;
+        }
+
+        return Cache::remember('pf:acct:settings:hidden-following:'.$id, 43200, function () use ($id) {
+            $user = User::whereProfileId($id)->first();
+            if (! $user) {
+                return false;
+            }
+            $settings = UserSetting::whereUserId($user->id)->first();
+            if ($settings) {
+                return $settings->show_profile_following_count == false;
+            }
+
+            return false;
+        });
+    }
+
+    public static function setLastActive($id = false)
+    {
+        if (! $id) {
+            return;
+        }
+        $key = 'user:last_active_at:id:'.$id;
+        if (! Cache::has($key)) {
+            $user = User::find($id);
+            if (! $user) {
+                return;
+            }
+            $user->last_active_at = now();
+            $user->save();
+            Cache::put($key, 1, 14400);
+        }
+    }
+
+    public static function blocksDomain($pid, $domain = false)
+    {
+        if (! $domain) {
+            return;
+        }
+
+        return UserDomainBlock::whereProfileId($pid)->whereDomain($domain)->exists();
+    }
+
+    public static function formatNumber($num)
+    {
+        if (! $num || $num < 1) {
+            return '0';
+        }
+        $num = intval($num);
+        $formatter = new NumberFormatter('en_US', NumberFormatter::DECIMAL);
+        $formatter->setAttribute(NumberFormatter::MAX_FRACTION_DIGITS, 1);
+
+        if ($num >= 1000000000) {
+            return $formatter->format($num / 1000000000).'B';
+        } elseif ($num >= 1000000) {
+            return $formatter->format($num / 1000000).'M';
+        } elseif ($num >= 1000) {
+            return $formatter->format($num / 1000).'K';
+        } else {
+            return $formatter->format($num);
+        }
+    }
+
+    public static function getMetaDescription($id)
+    {
+        $account = self::get($id, true);
+
+        if (! $account) {
+            return '';
+        }
+
+        $posts = self::formatNumber($account['statuses_count']).' Posts, ';
+        $following = self::formatNumber($account['following_count']).' Following, ';
+        $followers = self::formatNumber($account['followers_count']).' Followers';
+        $note = $account['note'] && strlen($account['note']) ?
+            ' · '.\Purify::clean(strip_tags(str_replace("\n", '', str_replace("\r", '', $account['note'])))) :
+            '';
+
+        return $posts.$following.$followers.$note;
+    }
 }
diff --git a/app/Services/ActivityPubFetchService.php b/app/Services/ActivityPubFetchService.php
index 3d1980a11..761be5c77 100644
--- a/app/Services/ActivityPubFetchService.php
+++ b/app/Services/ActivityPubFetchService.php
@@ -2,47 +2,137 @@
 
 namespace App\Services;
 
-use Illuminate\Support\Facades\Http;
-use App\Profile;
-use App\Util\ActivityPub\Helpers;
 use App\Util\ActivityPub\HttpSignature;
+use Cache;
 use Illuminate\Http\Client\ConnectionException;
 use Illuminate\Http\Client\RequestException;
+use Illuminate\Support\Facades\Http;
 
 class ActivityPubFetchService
 {
-	public static function get($url, $validateUrl = true)
-	{
-        if($validateUrl === true) {
-    		if(!Helpers::validateUrl($url)) {
-    			return 0;
-    		}
+    const CACHE_KEY = 'pf:services:apfetchs:';
+
+    public static function get($url, $validateUrl = true)
+    {
+        if (! self::validateUrl($url)) {
+            return false;
+        }
+        $domain = parse_url($url, PHP_URL_HOST);
+        if (! $domain) {
+            return false;
+        }
+        $domainKey = base64_encode($domain);
+        $urlKey = hash('sha256', $url);
+        $key = self::CACHE_KEY.$domainKey.':'.$urlKey;
+
+        return Cache::remember($key, 450, function () use ($url) {
+            return self::fetchRequest($url);
+        });
+    }
+
+    public static function validateUrl($url)
+    {
+        if (is_array($url)) {
+            $url = $url[0];
         }
 
-		$baseHeaders = [
-			'Accept' => 'application/activity+json, application/ld+json',
-		];
+        $localhosts = [
+            '127.0.0.1', 'localhost', '::1',
+        ];
 
-		$headers = HttpSignature::instanceActorSign($url, false, $baseHeaders, 'get');
-		$headers['Accept'] = 'application/activity+json, application/ld+json';
-		$headers['User-Agent'] = 'PixelFedBot/1.0.0 (Pixelfed/'.config('pixelfed.version').'; +'.config('app.url').')';
+        if (strtolower(mb_substr($url, 0, 8)) !== 'https://') {
+            return false;
+        }
 
-		try {
-			$res = Http::withHeaders($headers)
-				->timeout(30)
-				->connectTimeout(5)
-				->retry(3, 500)
-				->get($url);
-		} catch (RequestException $e) {
-			return;
-		} catch (ConnectionException $e) {
-			return;
-		} catch (Exception $e) {
-			return;
-		}
-		if(!$res->ok()) {
-			return;
-		}
-		return $res->body();
-	}
+        if (substr_count($url, '://') !== 1) {
+            return false;
+        }
+
+        if (mb_substr($url, 0, 8) !== 'https://') {
+            $url = 'https://'.substr($url, 8);
+        }
+
+        $valid = filter_var($url, FILTER_VALIDATE_URL);
+
+        if (! $valid) {
+            return false;
+        }
+
+        $host = parse_url($valid, PHP_URL_HOST);
+
+        if (in_array($host, $localhosts)) {
+            return false;
+        }
+
+        if (config('security.url.verify_dns')) {
+            if (DomainService::hasValidDns($host) === false) {
+                return false;
+            }
+        }
+
+        if (app()->environment() === 'production') {
+            $bannedInstances = InstanceService::getBannedDomains();
+            if (in_array($host, $bannedInstances)) {
+                return false;
+            }
+        }
+
+        return $url;
+    }
+
+    public static function fetchRequest($url, $returnJsonFormat = false)
+    {
+        $baseHeaders = [
+            'Accept' => 'application/activity+json',
+        ];
+
+        $headers = HttpSignature::instanceActorSign($url, false, $baseHeaders, 'get');
+        $headers['Accept'] = 'application/activity+json';
+        $headers['User-Agent'] = 'PixelFedBot/1.0.0 (Pixelfed/'.config('pixelfed.version').'; +'.config('app.url').')';
+
+        try {
+            $res = Http::withOptions([
+                'allow_redirects' => [
+                    'max' => 2,
+                    'protocols' => ['https'],
+                ]])
+                ->withHeaders($headers)
+                ->timeout(30)
+                ->connectTimeout(5)
+                ->retry(3, 500)
+                ->get($url);
+        } catch (RequestException $e) {
+            return;
+        } catch (ConnectionException $e) {
+            return;
+        } catch (Exception $e) {
+            return;
+        }
+
+        if (! $res->ok()) {
+            return;
+        }
+
+        if (! $res->hasHeader('Content-Type')) {
+            return;
+        }
+
+        $acceptedTypes = [
+            'application/activity+json; charset=utf-8',
+            'application/activity+json',
+            'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
+        ];
+
+        $contentType = $res->getHeader('Content-Type')[0];
+
+        if (! $contentType) {
+            return;
+        }
+
+        if (! in_array($contentType, $acceptedTypes)) {
+            return;
+        }
+
+        return $returnJsonFormat ? $res->json() : $res->body();
+    }
 }
diff --git a/app/Services/AdminSettingsService.php b/app/Services/AdminSettingsService.php
new file mode 100644
index 000000000..6a261f5a3
--- /dev/null
+++ b/app/Services/AdminSettingsService.php
@@ -0,0 +1,167 @@
+<?php
+
+namespace App\Services;
+
+use App\Services\Internal\BeagleService;
+use App\User;
+use Illuminate\Support\Str;
+
+class AdminSettingsService
+{
+    public static function getAll()
+    {
+        return [
+            'features' => self::getFeatures(),
+            'landing' => self::getLanding(),
+            'branding' => self::getBranding(),
+            'media' => self::getMedia(),
+            'rules' => self::getRules(),
+            'suggested_rules' => self::getSuggestedRules(),
+            'users' => self::getUsers(),
+            'posts' => self::getPosts(),
+            'platform' => self::getPlatform(),
+            'storage' => self::getStorage(),
+        ];
+    }
+
+    public static function getFeatures()
+    {
+        $cloud_storage = (bool) config_cache('pixelfed.cloud_storage');
+        $cloud_disk = config('filesystems.cloud');
+        $cloud_ready = ! empty(config('filesystems.disks.'.$cloud_disk.'.key')) && ! empty(config('filesystems.disks.'.$cloud_disk.'.secret'));
+        $openReg = (bool) config_cache('pixelfed.open_registration');
+        $curOnboarding = (bool) config_cache('instance.curated_registration.enabled');
+        $regState = $openReg ? 'open' : ($curOnboarding ? 'filtered' : 'closed');
+
+        return [
+            'registration_status' => $regState,
+            'cloud_storage' => $cloud_ready && $cloud_storage,
+            'activitypub_enabled' => (bool) config_cache('federation.activitypub.enabled'),
+            'authorized_fetch' => (bool) config_cache('federation.activitypub.authorized_fetch'),
+            'account_migration' => (bool) config_cache('federation.migration'),
+            'mobile_apis' => (bool) config_cache('pixelfed.oauth_enabled'),
+            'stories' => (bool) config_cache('instance.stories.enabled'),
+            'instagram_import' => (bool) config_cache('pixelfed.import.instagram.enabled'),
+            'autospam_enabled' => (bool) config_cache('pixelfed.bouncer.enabled'),
+        ];
+    }
+
+    public static function getLanding()
+    {
+        $availableAdmins = User::whereIsAdmin(true)->get();
+        $currentAdmin = config_cache('instance.admin.pid');
+
+        return [
+            'admins' => $availableAdmins,
+            'current_admin' => $currentAdmin,
+            'show_directory' => (bool) config_cache('instance.landing.show_directory'),
+            'show_explore' => (bool) config_cache('instance.landing.show_explore'),
+        ];
+    }
+
+    public static function getBranding()
+    {
+        return [
+            'name' => config_cache('app.name'),
+            'short_description' => config_cache('app.short_description'),
+            'long_description' => config_cache('app.description'),
+        ];
+    }
+
+    public static function getMedia()
+    {
+        return [
+            'max_photo_size' => config_cache('pixelfed.max_photo_size'),
+            'max_album_length' => config_cache('pixelfed.max_album_length'),
+            'image_quality' => config_cache('pixelfed.image_quality'),
+            'media_types' => config_cache('pixelfed.media_types'),
+            'optimize_image' => (bool) config_cache('pixelfed.optimize_image'),
+            'optimize_video' => (bool) config_cache('pixelfed.optimize_video'),
+        ];
+    }
+
+    public static function getRules()
+    {
+        return config_cache('app.rules') ? json_decode(config_cache('app.rules'), true) : [];
+    }
+
+    public static function getSuggestedRules()
+    {
+        return BeagleService::getDefaultRules();
+    }
+
+    public static function getUsers()
+    {
+        $autoFollow = config_cache('account.autofollow_usernames');
+        if (strlen($autoFollow) >= 2) {
+            $autoFollow = explode(',', $autoFollow);
+        } else {
+            $autoFollow = [];
+        }
+
+        return [
+            'require_email_verification' => (bool) config_cache('pixelfed.enforce_email_verification'),
+            'enforce_account_limit' => (bool) config_cache('pixelfed.enforce_account_limit'),
+            'max_account_size' => config_cache('pixelfed.max_account_size'),
+            'admin_autofollow' => (bool) config_cache('account.autofollow'),
+            'admin_autofollow_accounts' => $autoFollow,
+            'max_user_blocks' => (int) config_cache('instance.user_filters.max_user_blocks'),
+            'max_user_mutes' => (int) config_cache('instance.user_filters.max_user_mutes'),
+            'max_domain_blocks' => (int) config_cache('instance.user_filters.max_domain_blocks'),
+        ];
+    }
+
+    public static function getPosts()
+    {
+        return [
+            'max_caption_length' => config_cache('pixelfed.max_caption_length'),
+            'max_altext_length' => config_cache('pixelfed.max_altext_length'),
+        ];
+    }
+
+    public static function getPlatform()
+    {
+        return [
+            'allow_app_registration' => (bool) config_cache('pixelfed.allow_app_registration'),
+            'app_registration_rate_limit_attempts' => config_cache('pixelfed.app_registration_rate_limit_attempts'),
+            'app_registration_rate_limit_decay' => config_cache('pixelfed.app_registration_rate_limit_decay'),
+            'app_registration_confirm_rate_limit_attempts' => config_cache('pixelfed.app_registration_confirm_rate_limit_attempts'),
+            'app_registration_confirm_rate_limit_decay' => config_cache('pixelfed.app_registration_confirm_rate_limit_decay'),
+            'allow_post_embeds' => (bool) config_cache('instance.embed.post'),
+            'allow_profile_embeds' => (bool) config_cache('instance.embed.profile'),
+            'captcha_enabled' => (bool) config_cache('captcha.enabled'),
+            'captcha_on_login' => (bool) config_cache('captcha.active.login'),
+            'captcha_on_register' => (bool) config_cache('captcha.active.register'),
+            'captcha_secret' => Str::of(config_cache('captcha.secret'))->mask('*', 4, -4),
+            'captcha_sitekey' => Str::of(config_cache('captcha.sitekey'))->mask('*', 4, -4),
+            'custom_emoji_enabled' => (bool) config_cache('federation.custom_emoji.enabled'),
+        ];
+    }
+
+    public static function getStorage()
+    {
+        $cloud_storage = (bool) config_cache('pixelfed.cloud_storage');
+        $cloud_disk = config('filesystems.cloud');
+        $cloud_ready = ! empty(config('filesystems.disks.'.$cloud_disk.'.key')) && ! empty(config('filesystems.disks.'.$cloud_disk.'.secret'));
+        $primaryDisk = (bool) $cloud_ready && $cloud_storage;
+        $pkey = 'filesystems.disks.'.$cloud_disk.'.';
+        $disk = [
+            'driver' => $cloud_disk,
+            'key' => Str::of(config_cache($pkey.'key'))->mask('*', 0, -2),
+            'secret' => Str::of(config_cache($pkey.'secret'))->mask('*', 0, -2),
+            'region' => config_cache($pkey.'region'),
+            'bucket' => config_cache($pkey.'bucket'),
+            'visibility' => config_cache($pkey.'visibility'),
+            'endpoint' => config_cache($pkey.'endpoint'),
+            'url' => config_cache($pkey.'url'),
+            'use_path_style_endpoint' => config_cache($pkey.'use_path_style_endpoint'),
+        ];
+
+        return [
+            'primary_disk' => $primaryDisk ? 'cloud' : 'local',
+            'cloud_ready' => (bool) $cloud_ready,
+            'cloud_disk' => $cloud_disk,
+            'disk_config' => $disk,
+        ];
+    }
+}
diff --git a/app/Services/AdminStatsService.php b/app/Services/AdminStatsService.php
index 9e345355a..9acbb3c6e 100644
--- a/app/Services/AdminStatsService.php
+++ b/app/Services/AdminStatsService.php
@@ -2,47 +2,43 @@
 
 namespace App\Services;
 
-use Cache;
-use DB;
+use App\Avatar;
+use App\Contact;
+use App\FailedJob;
+use App\Instance;
+use App\Media;
+use App\Profile;
+use App\Report;
+use App\Status;
+use App\User;
 use App\Util\Lexer\PrettyNumber;
-use App\{
-	Avatar,
-	Contact,
-	FailedJob,
-	Hashtag,
-	Instance,
-	Media,
-	Like,
-	Profile,
-	Report,
-	Status,
-	User
-};
-use \DateInterval;
-use \DatePeriod;
+use Cache;
+use DateInterval;
+use DatePeriod;
+use DB;
 
 class AdminStatsService
 {
-	public static function get()
-	{
-		return array_merge(
-			self::recentData(),
-			self::additionalData(),
-			self::postsGraph()
-		);
-	}
-
-	public static function summary()
-	{
-		return array_merge(
-			self::recentData(),
-			self::additionalDataSummary(),
-		);
-	}
-
-	public static function storage()
+    public static function get()
     {
-        return Cache::remember('admin:dashboard:storage:stats', 120000, function() {
+        return array_merge(
+            self::recentData(),
+            self::additionalData(),
+            self::postsGraph()
+        );
+    }
+
+    public static function summary()
+    {
+        return array_merge(
+            self::recentData(),
+            self::additionalDataSummary(),
+        );
+    }
+
+    public static function storage()
+    {
+        return Cache::remember('admin:dashboard:storage:stats', 120000, function () {
             $res = [];
 
             $res['last_updated'] = str_replace('+00:00', 'Z', now()->format(DATE_RFC3339_EXTENDED));
@@ -53,7 +49,7 @@ class AdminStatsService
                 'count' => $avatars,
                 'local_count' => $avatarsLocal,
                 'cloud_count' => ($avatars - $avatarsLocal),
-                'total_sum' => Avatar::sum('size')
+                'total_sum' => Avatar::sum('size'),
             ];
 
             $media = Media::count();
@@ -77,97 +73,100 @@ class AdminStatsService
         });
     }
 
-	protected static function recentData()
-	{
-		$day = config('database.default') == 'pgsql' ? 'DATE_PART(\'day\',' : 'day(';
-		$ttl = now()->addMinutes(15);
-		return Cache::remember('admin:dashboard:home:data:v0:15min', $ttl, function() use ($day) {
-			return [
-				'contact' => PrettyNumber::convert(Contact::whereNull('read_at')->count()),
-				'contact_monthly' => PrettyNumber::convert(Contact::whereNull('read_at')->where('created_at', '>', now()->subMonth())->count()),
-				'reports' =>  PrettyNumber::convert(Report::whereNull('admin_seen')->count()),
-				'reports_monthly' =>  PrettyNumber::convert(Report::whereNull('admin_seen')->where('created_at', '>', now()->subMonth())->count()),
-			];
-		});
-	}
+    protected static function recentData()
+    {
+        $day = config('database.default') == 'pgsql' ? 'DATE_PART(\'day\',' : 'day(';
+        $ttl = now()->addMinutes(15);
 
-	protected static function additionalData()
-	{
-		$day = config('database.default') == 'pgsql' ? 'DATE_PART(\'day\',' : 'day(';
-		$ttl = now()->addHours(24);
-		return Cache::remember('admin:dashboard:home:data:v0:24hr', $ttl, function() use ($day) {
-			return [
-				'failedjobs' => PrettyNumber::convert(FailedJob::where('failed_at', '>=', \Carbon\Carbon::now()->subDay())->count()),
-				'statuses' => PrettyNumber::convert(Status::count()),
-				'statuses_monthly' => PrettyNumber::convert(Status::where('created_at', '>', now()->subMonth())->count()),
-				'profiles' => PrettyNumber::convert(Profile::count()),
-				'users' => PrettyNumber::convert(User::count()),
-				'users_monthly' => PrettyNumber::convert(User::where('created_at', '>', now()->subMonth())->count()),
-				'instances' => PrettyNumber::convert(Instance::count()),
-				'media' => PrettyNumber::convert(Media::count()),
-				'storage' => Media::sum('size'),
-			];
-		});
-	}
+        return Cache::remember('admin:dashboard:home:data:v0:15min', $ttl, function () {
+            return [
+                'contact' => PrettyNumber::convert(Contact::whereNull('read_at')->count()),
+                'contact_monthly' => PrettyNumber::convert(Contact::whereNull('read_at')->where('created_at', '>', now()->subMonth())->count()),
+                'reports' => PrettyNumber::convert(Report::whereNull('admin_seen')->count()),
+                'reports_monthly' => PrettyNumber::convert(Report::whereNull('admin_seen')->where('created_at', '>', now()->subMonth())->count()),
+            ];
+        });
+    }
 
-	protected static function additionalDataSummary()
-	{
-		$ttl = now()->addHours(24);
-		return Cache::remember('admin:dashboard:home:data-summary:v0:24hr', $ttl, function() {
-			return [
-				'statuses' => PrettyNumber::convert(Status::count()),
-				'profiles' => PrettyNumber::convert(Profile::count()),
-				'users' => PrettyNumber::convert(User::count()),
-				'instances' => PrettyNumber::convert(Instance::count()),
-			];
-		});
-	}
+    protected static function additionalData()
+    {
+        $day = config('database.default') == 'pgsql' ? 'DATE_PART(\'day\',' : 'day(';
+        $ttl = now()->addHours(24);
 
-	protected static function postsGraph()
-	{
-		$ttl = now()->addHours(12);
-		return Cache::remember('admin:dashboard:home:data-postsGraph:v0.1:24hr', $ttl, function() {
-			$gb = config('database.default') == 'pgsql' ? ['statuses.id', 'created_at'] : DB::raw('Date(created_at)');
-			$s = Status::selectRaw('Date(created_at) as date, count(statuses.id) as count')
-				->where('created_at', '>=', now()->subWeek())
-				->groupBy($gb)
-				->orderBy('created_at', 'DESC')
-				->pluck('count', 'date');
+        return Cache::remember('admin:dashboard:home:data:v0:24hr', $ttl, function () {
+            return [
+                'failedjobs' => PrettyNumber::convert(FailedJob::where('failed_at', '>=', \Carbon\Carbon::now()->subDay())->count()),
+                'statuses' => PrettyNumber::convert(intval(StatusService::totalLocalStatuses())),
+                'statuses_monthly' => PrettyNumber::convert(Status::where('created_at', '>', now()->subMonth())->count()),
+                'profiles' => PrettyNumber::convert(Profile::count()),
+                'users' => PrettyNumber::convert(User::count()),
+                'users_monthly' => PrettyNumber::convert(User::where('created_at', '>', now()->subMonth())->count()),
+                'instances' => PrettyNumber::convert(Instance::count()),
+                'media' => PrettyNumber::convert(Media::count()),
+                'storage' => Media::sum('size'),
+            ];
+        });
+    }
 
-			$begin = now()->subWeek();
-			$end = now();
-			$interval = new DateInterval('P1D');
-			$daterange = new DatePeriod($begin, $interval ,$end);
-			$dates = [];
-			foreach($daterange as $date){
-				$dates[$date->format("Y-m-d")] = 0;
-			}
+    protected static function additionalDataSummary()
+    {
+        $ttl = now()->addHours(24);
 
-			$dates = collect($dates)->merge($s);
+        return Cache::remember('admin:dashboard:home:data-summary:v0:24hr', $ttl, function () {
+            return [
+                'statuses' => PrettyNumber::convert(intval(StatusService::totalLocalStatuses())),
+                'profiles' => PrettyNumber::convert(Profile::count()),
+                'users' => PrettyNumber::convert(User::count()),
+                'instances' => PrettyNumber::convert(Instance::count()),
+            ];
+        });
+    }
 
-			$s = Status::selectRaw('Date(created_at) as date, count(statuses.id) as count')
-				->where('created_at', '>=', now()->subWeeks(2))
-				->where('created_at', '<=', now()->subWeeks(1))
-				->groupBy($gb)
-				->orderBy('created_at', 'DESC')
-				->pluck('count', 'date');
+    protected static function postsGraph()
+    {
+        $ttl = now()->addHours(12);
 
-			$begin = now()->subWeeks(2);
-			$end = now()->subWeeks(1);
-			$interval = new DateInterval('P1D');
-			$daterange = new DatePeriod($begin, $interval ,$end);
-			$lw = [];
-			foreach($daterange as $date){
-				$lw[$date->format("Y-m-d")] = 0;
-			}
+        return Cache::remember('admin:dashboard:home:data-postsGraph:v0.1:24hr', $ttl, function () {
+            $gb = config('database.default') == 'pgsql' ? ['statuses.id', 'created_at'] : DB::raw('Date(created_at)');
+            $s = Status::selectRaw('Date(created_at) as date, count(statuses.id) as count')
+                ->where('created_at', '>=', now()->subWeek())
+                ->groupBy($gb)
+                ->orderBy('created_at', 'DESC')
+                ->pluck('count', 'date');
 
-			$lw = collect($lw)->merge($s);
+            $begin = now()->subWeek();
+            $end = now();
+            $interval = new DateInterval('P1D');
+            $daterange = new DatePeriod($begin, $interval, $end);
+            $dates = [];
+            foreach ($daterange as $date) {
+                $dates[$date->format('Y-m-d')] = 0;
+            }
 
-			return [
-				'posts_this_week' => $dates->values(),
-				'posts_last_week' => $lw->values(),
-			];
-		});
-	}
+            $dates = collect($dates)->merge($s);
 
+            $s = Status::selectRaw('Date(created_at) as date, count(statuses.id) as count')
+                ->where('created_at', '>=', now()->subWeeks(2))
+                ->where('created_at', '<=', now()->subWeeks(1))
+                ->groupBy($gb)
+                ->orderBy('created_at', 'DESC')
+                ->pluck('count', 'date');
+
+            $begin = now()->subWeeks(2);
+            $end = now()->subWeeks(1);
+            $interval = new DateInterval('P1D');
+            $daterange = new DatePeriod($begin, $interval, $end);
+            $lw = [];
+            foreach ($daterange as $date) {
+                $lw[$date->format('Y-m-d')] = 0;
+            }
+
+            $lw = collect($lw)->merge($s);
+
+            return [
+                'posts_this_week' => $dates->values(),
+                'posts_last_week' => $lw->values(),
+            ];
+        });
+    }
 }
diff --git a/app/Services/AutolinkService.php b/app/Services/AutolinkService.php
index f0f3278ff..c494ab151 100644
--- a/app/Services/AutolinkService.php
+++ b/app/Services/AutolinkService.php
@@ -2,53 +2,25 @@
 
 namespace App\Services;
 
-use Cache;
 use App\Profile;
-use Illuminate\Support\Str;
-use Illuminate\Support\Facades\Http;
-use App\Util\Webfinger\WebfingerUrl;
+use Cache;
+use Purify;
 
 class AutolinkService
 {
-	const CACHE_KEY = 'pf:services:autolink:';
+    const CACHE_KEY = 'pf:services:autolink:mue:';
 
-	public static function mentionedUsernameExists($username)
-	{
-		$key = 'pf:services:autolink:userexists:' . hash('sha256', $username);
+    public static function mentionedUsernameExists($username)
+    {
+        if (str_starts_with($username, '@')) {
+            if (substr_count($username, '@') === 1) {
+                $username = substr($username, 1);
+            }
+        }
+        $name = Purify::clean(strtolower($username));
 
-		return Cache::remember($key, 3600, function() use($username) {
-			$remote = Str::of($username)->contains('@');
-			$profile = Profile::whereUsername($username)->first();
-			if($profile) {
-				if($profile->domain != null) {
-					$instance = InstanceService::getByDomain($profile->domain);
-					if($instance && $instance->banned == true) {
-						return false;
-					}
-				}
-				return true;
-			} else {
-				if($remote) {
-					$parts = explode('@', $username);
-					$domain = last($parts);
-					$instance = InstanceService::getByDomain($domain);
-
-					if($instance) {
-						if($instance->banned == true) {
-							return false;
-						} else {
-							$wf = WebfingerUrl::generateWebfingerUrl($username);
-							$res = Http::head($wf);
-							return $res->ok();
-						}
-					} else {
-						$wf = WebfingerUrl::generateWebfingerUrl($username);
-						$res = Http::head($wf);
-						return $res->ok();
-					}
-				}
-			}
-			return false;
-		});
-	}
+        return Cache::remember(self::CACHE_KEY.base64_encode($name), 7200, function () use ($name) {
+            return Profile::where('username', $name)->exists();
+        });
+    }
 }
diff --git a/app/Services/AutospamService.php b/app/Services/AutospamService.php
index 6986e81e4..3164d14d0 100644
--- a/app/Services/AutospamService.php
+++ b/app/Services/AutospamService.php
@@ -2,77 +2,82 @@
 
 namespace App\Services;
 
+use App\Util\Lexer\Classifier;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Storage;
-use App\Util\Lexer\Classifier;
 
 class AutospamService
 {
-	const CHCKD_CACHE_KEY = 'pf:services:autospam:nlp:checked';
-	const MODEL_CACHE_KEY = 'pf:services:autospam:nlp:model-cache';
-	const MODEL_FILE_PATH = 'nlp/active-training-data.json';
-	const MODEL_SPAM_PATH = 'nlp/spam.json';
-	const MODEL_HAM_PATH  = 'nlp/ham.json';
+    const CHCKD_CACHE_KEY = 'pf:services:autospam:nlp:checked';
 
-	public static function check($text)
-	{
-		if(!$text || strlen($text) == 0) {
-			false;
-		}
-		if(!self::active()) {
-			return null;
-		}
-		$model = self::getCachedModel();
-		$classifier = new Classifier;
-		$classifier->import($model['documents'], $model['words']);
-		return $classifier->most($text) === 'spam';
-	}
+    const MODEL_CACHE_KEY = 'pf:services:autospam:nlp:model-cache';
 
-	public static function eligible()
-	{
-		return Cache::remember(self::CHCKD_CACHE_KEY, 86400, function() {
-			if(!config_cache('pixelfed.bouncer.enabled') || !config('autospam.enabled')) {
-				return false;
-			}
+    const MODEL_FILE_PATH = 'nlp/active-training-data.json';
 
-			if(!Storage::exists(self::MODEL_SPAM_PATH)) {
-				return false;
-			}
+    const MODEL_SPAM_PATH = 'nlp/spam.json';
 
-			if(!Storage::exists(self::MODEL_HAM_PATH)) {
-				return false;
-			}
+    const MODEL_HAM_PATH = 'nlp/ham.json';
 
-			if(!Storage::exists(self::MODEL_FILE_PATH)) {
-				return false;
-			} else {
-				if(Storage::size(self::MODEL_FILE_PATH) < 1000) {
-					return false;
-				}
-			}
+    public static function check($text)
+    {
+        if (! $text || strlen($text) == 0) {
 
-			return true;
-		});
-	}
+        }
+        if (! self::active()) {
+            return null;
+        }
+        $model = self::getCachedModel();
+        $classifier = new Classifier;
+        $classifier->import($model['documents'], $model['words']);
 
-	public static function active()
-	{
-		return config_cache('autospam.nlp.enabled') && self::eligible();
-	}
+        return $classifier->most($text) === 'spam';
+    }
 
-	public static function getCachedModel()
-	{
-		if(!self::active()) {
-			return null;
-		}
+    public static function eligible()
+    {
+        return Cache::remember(self::CHCKD_CACHE_KEY, 86400, function () {
+            if (! (bool) config_cache('pixelfed.bouncer.enabled') || ! (bool) config_cache('autospam.enabled')) {
+                return false;
+            }
 
-		return Cache::remember(self::MODEL_CACHE_KEY, 86400, function() {
-			$res = Storage::get(self::MODEL_FILE_PATH);
-			if(!$res || empty($res)) {
-				return null;
-			}
+            if (! Storage::exists(self::MODEL_SPAM_PATH)) {
+                return false;
+            }
 
-			return json_decode($res, true);
-		});
-	}
+            if (! Storage::exists(self::MODEL_HAM_PATH)) {
+                return false;
+            }
+
+            if (! Storage::exists(self::MODEL_FILE_PATH)) {
+                return false;
+            } else {
+                if (Storage::size(self::MODEL_FILE_PATH) < 1000) {
+                    return false;
+                }
+            }
+
+            return true;
+        });
+    }
+
+    public static function active()
+    {
+        return config_cache('autospam.nlp.enabled') && self::eligible();
+    }
+
+    public static function getCachedModel()
+    {
+        if (! self::active()) {
+            return null;
+        }
+
+        return Cache::remember(self::MODEL_CACHE_KEY, 86400, function () {
+            $res = Storage::get(self::MODEL_FILE_PATH);
+            if (! $res || empty($res)) {
+                return null;
+            }
+
+            return json_decode($res, true);
+        });
+    }
 }
diff --git a/app/Services/ConfigCacheService.php b/app/Services/ConfigCacheService.php
index 9da5c8adc..527c86026 100644
--- a/app/Services/ConfigCacheService.php
+++ b/app/Services/ConfigCacheService.php
@@ -2,125 +2,215 @@
 
 namespace App\Services;
 
-use Cache;
-use Config;
 use App\Models\ConfigCache as ConfigCacheModel;
+use Cache;
+use Illuminate\Database\QueryException;
 
 class ConfigCacheService
 {
-	const CACHE_KEY = 'config_cache:_v0-key:';
+    const CACHE_KEY = 'config_cache:_v0-key:';
 
-	public static function get($key)
-	{
-		$cacheKey = self::CACHE_KEY . $key;
-		$ttl = now()->addHours(12);
-		if(!config('instance.enable_cc')) {
-			return config($key);
-		}
+    const PROTECTED_KEYS = [
+        'filesystems.disks.s3.key',
+        'filesystems.disks.s3.secret',
+        'filesystems.disks.spaces.key',
+        'filesystems.disks.spaces.secret',
+        'captcha.secret',
+        'captcha.sitekey',
+    ];
 
-		return Cache::remember($cacheKey, $ttl, function() use($key) {
+    public static function get($key)
+    {
+        $cacheKey = self::CACHE_KEY.$key;
+        $ttl = now()->addHours(12);
+        if (! config('instance.enable_cc')) {
+            return config($key);
+        }
 
-			$allowed = [
-				'app.name',
-				'app.short_description',
-				'app.description',
-				'app.rules',
+        try {
+            return Cache::remember($cacheKey, $ttl, function () use ($key) {
+                $allowed = [
+                    'app.name',
+                    'app.short_description',
+                    'app.description',
+                    'app.rules',
 
-				'pixelfed.max_photo_size',
-				'pixelfed.max_album_length',
-				'pixelfed.image_quality',
-				'pixelfed.media_types',
+                    'pixelfed.max_photo_size',
+                    'pixelfed.max_album_length',
+                    'pixelfed.image_quality',
+                    'pixelfed.media_types',
 
-				'pixelfed.open_registration',
-				'federation.activitypub.enabled',
-				'instance.stories.enabled',
-				'pixelfed.oauth_enabled',
-				'pixelfed.import.instagram.enabled',
-				'pixelfed.bouncer.enabled',
+                    'pixelfed.open_registration',
+                    'federation.activitypub.enabled',
+                    'instance.stories.enabled',
+                    'pixelfed.oauth_enabled',
+                    'pixelfed.import.instagram.enabled',
+                    'pixelfed.bouncer.enabled',
+                    'federation.activitypub.authorized_fetch',
 
-				'pixelfed.enforce_email_verification',
-				'pixelfed.max_account_size',
-				'pixelfed.enforce_account_limit',
+                    'pixelfed.enforce_email_verification',
+                    'pixelfed.max_account_size',
+                    'pixelfed.enforce_account_limit',
 
-				'uikit.custom.css',
-				'uikit.custom.js',
-				'uikit.show_custom.css',
-				'uikit.show_custom.js',
-				'about.title',
+                    'uikit.custom.css',
+                    'uikit.custom.js',
+                    'uikit.show_custom.css',
+                    'uikit.show_custom.js',
+                    'about.title',
 
-				'pixelfed.cloud_storage',
+                    'pixelfed.cloud_storage',
 
-				'account.autofollow',
-				'account.autofollow_usernames',
-				'config.discover.features',
+                    'account.autofollow',
+                    'account.autofollow_usernames',
+                    'config.discover.features',
 
-				'instance.has_legal_notice',
-				'instance.avatar.local_to_cloud',
+                    'instance.has_legal_notice',
+                    'instance.avatar.local_to_cloud',
 
-				'pixelfed.directory',
-				'app.banner_image',
-				'pixelfed.directory.submission-key',
-				'pixelfed.directory.submission-ts',
-				'pixelfed.directory.has_submitted',
-				'pixelfed.directory.latest_response',
-				'pixelfed.directory.is_synced',
-				'pixelfed.directory.testimonials',
+                    'pixelfed.directory',
+                    'app.banner_image',
+                    'pixelfed.directory.submission-key',
+                    'pixelfed.directory.submission-ts',
+                    'pixelfed.directory.has_submitted',
+                    'pixelfed.directory.latest_response',
+                    'pixelfed.directory.is_synced',
+                    'pixelfed.directory.testimonials',
 
-				'instance.landing.show_directory',
-				'instance.landing.show_explore',
-				'instance.admin.pid',
-				'instance.banner.blurhash',
+                    'instance.landing.show_directory',
+                    'instance.landing.show_explore',
+                    'instance.admin.pid',
+                    'instance.banner.blurhash',
 
-				'autospam.nlp.enabled',
-				// 'system.user_mode'
-			];
+                    'autospam.nlp.enabled',
 
-			if(!config('instance.enable_cc')) {
-				return config($key);
-			}
+                    'instance.curated_registration.enabled',
 
-			if(!in_array($key, $allowed)) {
-				return config($key);
-			}
+                    'federation.migration',
 
-			$v = config($key);
-			$c = ConfigCacheModel::where('k', $key)->first();
+                    'pixelfed.max_caption_length',
+                    'pixelfed.max_bio_length',
+                    'pixelfed.max_name_length',
+                    'pixelfed.min_password_length',
+                    'pixelfed.max_avatar_size',
+                    'pixelfed.max_altext_length',
+                    'pixelfed.allow_app_registration',
+                    'pixelfed.app_registration_rate_limit_attempts',
+                    'pixelfed.app_registration_rate_limit_decay',
+                    'pixelfed.app_registration_confirm_rate_limit_attempts',
+                    'pixelfed.app_registration_confirm_rate_limit_decay',
+                    'instance.embed.profile',
+                    'instance.embed.post',
 
-			if($c) {
-				return $c->v ?? config($key);
-			}
+                    'captcha.enabled',
+                    'captcha.secret',
+                    'captcha.sitekey',
+                    'captcha.active.login',
+                    'captcha.active.register',
+                    'captcha.triggers.login.enabled',
+                    'captcha.triggers.login.attempts',
+                    'federation.custom_emoji.enabled',
 
-			if(!$v) {
-				return;
-			}
+                    'pixelfed.optimize_image',
+                    'pixelfed.optimize_video',
+                    'pixelfed.max_collection_length',
+                    'media.delete_local_after_cloud',
+                    'instance.user_filters.max_user_blocks',
+                    'instance.user_filters.max_user_mutes',
+                    'instance.user_filters.max_domain_blocks',
 
-			$cc = new ConfigCacheModel;
-			$cc->k = $key;
-			$cc->v = $v;
-			$cc->save();
+                    'filesystems.disks.s3.key',
+                    'filesystems.disks.s3.secret',
+                    'filesystems.disks.s3.region',
+                    'filesystems.disks.s3.bucket',
+                    'filesystems.disks.s3.visibility',
+                    'filesystems.disks.s3.url',
+                    'filesystems.disks.s3.endpoint',
+                    'filesystems.disks.s3.use_path_style_endpoint',
 
-			return $v;
-		});
-	}
+                    'filesystems.disks.spaces.key',
+                    'filesystems.disks.spaces.secret',
+                    'filesystems.disks.spaces.region',
+                    'filesystems.disks.spaces.bucket',
+                    'filesystems.disks.spaces.visibility',
+                    'filesystems.disks.spaces.url',
+                    'filesystems.disks.spaces.endpoint',
+                    'filesystems.disks.spaces.use_path_style_endpoint',
 
-	public static function put($key, $val)
-	{
-		$exists = ConfigCacheModel::whereK($key)->first();
+                    'instance.stats.total_local_posts',
+                    // 'system.user_mode'
+                ];
 
-		if($exists) {
-			$exists->v = $val;
-			$exists->save();
-			Cache::put(self::CACHE_KEY . $key, $val, now()->addHours(12));
-			return self::get($key);
-		}
+                if (! config('instance.enable_cc')) {
+                    return config($key);
+                }
 
-		$cc = new ConfigCacheModel;
-		$cc->k = $key;
-		$cc->v = $val;
-		$cc->save();
+                if (! in_array($key, $allowed)) {
+                    return config($key);
+                }
 
-		Cache::put(self::CACHE_KEY . $key, $val, now()->addHours(12));
+                $protect = false;
+                $protected = null;
+                if (in_array($key, self::PROTECTED_KEYS)) {
+                    $protect = true;
+                }
 
-		return self::get($key);
-	}
+                $v = config($key);
+                $c = ConfigCacheModel::where('k', $key)->first();
+
+                if ($c) {
+                    if ($protect) {
+                        return decrypt($c->v) ?? config($key);
+                    } else {
+                        return $c->v ?? config($key);
+                    }
+                }
+
+                if (! $v) {
+                    return;
+                }
+
+                if ($protect && $v) {
+                    $protected = encrypt($v);
+                }
+
+                $cc = new ConfigCacheModel;
+                $cc->k = $key;
+                $cc->v = $protect ? $protected : $v;
+                $cc->save();
+
+                return $v;
+            });
+        } catch (Exception|QueryException $e) {
+            return config($key);
+        }
+    }
+
+    public static function put($key, $val)
+    {
+        $exists = ConfigCacheModel::whereK($key)->first();
+
+        $protect = false;
+        $protected = null;
+        if (in_array($key, self::PROTECTED_KEYS)) {
+            $protect = true;
+            $protected = encrypt($val);
+        }
+
+        if ($exists) {
+            $exists->v = $protect ? $protected : $val;
+            $exists->save();
+            Cache::put(self::CACHE_KEY.$key, $val, now()->addHours(12));
+
+            return self::get($key);
+        }
+
+        $cc = new ConfigCacheModel;
+        $cc->k = $key;
+        $cc->v = $protect ? $protected : $val;
+        $cc->save();
+
+        Cache::put(self::CACHE_KEY.$key, $val, now()->addHours(12));
+
+        return self::get($key);
+    }
 }
diff --git a/app/Services/CustomEmojiService.php b/app/Services/CustomEmojiService.php
index a95c93a2a..f9f267174 100644
--- a/app/Services/CustomEmojiService.php
+++ b/app/Services/CustomEmojiService.php
@@ -13,7 +13,7 @@ class CustomEmojiService
 {
 	public static function get($shortcode)
 	{
-		if(config('federation.custom_emoji.enabled') == false) {
+		if((bool) config_cache('federation.custom_emoji.enabled') == false) {
 			return;
 		}
 
@@ -22,7 +22,7 @@ class CustomEmojiService
 
 	public static function import($url, $id = false)
 	{
-		if(config('federation.custom_emoji.enabled') == false) {
+		if((bool) config_cache('federation.custom_emoji.enabled') == false) {
 			return;
 		}
 
@@ -133,6 +133,7 @@ class CustomEmojiService
 			return CustomEmoji::when(!$pgsql, function($q, $pgsql) {
 					return $q->groupBy('shortcode');
 				})
+                ->whereNull('uri')
 				->get()
 				->map(function($emojo) {
 					$url = url('storage/' . $emojo->media_path);
diff --git a/app/Services/DomainService.php b/app/Services/DomainService.php
index 01f050ca0..a55cd1dcc 100644
--- a/app/Services/DomainService.php
+++ b/app/Services/DomainService.php
@@ -3,25 +3,30 @@
 namespace App\Services;
 
 use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Redis;
 
 class DomainService
 {
-	const CACHE_KEY = 'pf:services:domains:';
+    const CACHE_KEY = 'pf:services:domains:';
 
     public static function hasValidDns($domain)
     {
-        if(!$domain || !strlen($domain) || strpos($domain, '.') == -1) {
+        if (! $domain || ! strlen($domain) || strpos($domain, '.') == -1) {
             return false;
         }
 
-        if(config('security.url.trusted_domains')) {
-            if(in_array($domain, explode(',', config('security.url.trusted_domains')))) {
+        if (config('security.url.trusted_domains')) {
+            if (in_array($domain, explode(',', config('security.url.trusted_domains')))) {
                 return true;
             }
         }
 
-        return Cache::remember(self::CACHE_KEY . 'valid-dns:' . $domain, 14400, function() use($domain) {
+        $valid = filter_var($domain, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME);
+
+        if (! $valid) {
+            return false;
+        }
+
+        return Cache::remember(self::CACHE_KEY.'valid-dns:'.$domain, 1800, function () use ($domain) {
             return count(dns_get_record($domain, DNS_A | DNS_AAAA)) > 0;
         });
     }
diff --git a/app/Services/Federation/ActiveSharedInboxService.php b/app/Services/Federation/ActiveSharedInboxService.php
new file mode 100644
index 000000000..4f7020a8f
--- /dev/null
+++ b/app/Services/Federation/ActiveSharedInboxService.php
@@ -0,0 +1,244 @@
+<?php
+
+namespace App\Services\Federation;
+
+use App\Profile;
+use App\Util\ActivityPub\Helpers;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Redis;
+use Illuminate\Support\Facades\Storage;
+
+class ActiveSharedInboxService
+{
+    const CACHE_KEY = 'pf:services:asinbox:list';
+
+    const CACHE_KEY_CHECK = 'pf:services:asinbox:list-check';
+
+    const CACHE_FILE_NAME = 'ap_asis.json';
+
+    const CACHE_FILE_VERSION = 1;
+
+    public static function get()
+    {
+        $res = Redis::smembers(self::CACHE_KEY);
+
+        if ($res) {
+            return $res;
+        }
+
+        if (! $res && self::count() == '0') {
+            return self::warmCheck();
+        }
+    }
+
+    public static function contains($member)
+    {
+        return Redis::sismember(self::CACHE_KEY, strtolower($member));
+    }
+
+    public static function count()
+    {
+        return Redis::scard(self::CACHE_KEY);
+    }
+
+    public static function add($member)
+    {
+        if (empty($member)) {
+            return false;
+        }
+        if (! str_starts_with(strtolower($member), 'https://')) {
+            $member = 'https://'.$member;
+        }
+        $validUrl = Helpers::validateUrl($member, false, true);
+        if (! $validUrl) {
+            return false;
+        }
+
+        return Redis::sadd(self::CACHE_KEY, strtolower($member));
+    }
+
+    public static function remove($member)
+    {
+        if (empty($member)) {
+            return false;
+        }
+        if (! str_starts_with(strtolower($member), 'https://')) {
+            $member = 'https://'.$member;
+        }
+        $validUrl = Helpers::validateUrl($member);
+        if (! $validUrl) {
+            return false;
+        }
+
+        return Redis::srem(self::CACHE_KEY, strtolower($member));
+    }
+
+    public static function warmCheck()
+    {
+        if (! Cache::has(self::CACHE_KEY_CHECK)) {
+            return self::warmCacheFromDatabase();
+        }
+
+        return [];
+    }
+
+    public static function warmCacheFromDatabase()
+    {
+        $res = self::parseCacheFileData() ? self::parseCacheFileData() : self::getFromDatabase();
+        if (Storage::has(self::CACHE_FILE_NAME)) {
+            $res = Storage::get(self::CACHE_FILE_NAME);
+            if (! $res) {
+                $res = self::getFromDatabase();
+            } else {
+                $res = json_decode($res, true);
+                if (isset($res['version'], $res['data'], $res['created'], $res['updated'])) {
+                    if (now()->parse($res['updated'])->lt(now()->subMonths(6))) {
+                        $res = self::getFromDatabase();
+                    } else {
+                        if ($res['version'] === self::CACHE_FILE_VERSION) {
+                            $res = $res['data'];
+                        } else {
+                            $res = self::getFromDatabase();
+                        }
+                    }
+                } else {
+                    $res = self::getFromDatabase();
+                }
+            }
+        } else {
+            $res = self::getFromDatabase();
+        }
+
+        if (! $res) {
+            return [];
+        }
+
+        $filteredList = [];
+
+        foreach ($res as $value) {
+            if (! $value || ! str_starts_with($value, 'https://')) {
+                continue;
+            }
+            $passed = self::add($value);
+            if ($passed) {
+                $filteredList[] = $value;
+            }
+        }
+
+        self::saveCacheToDisk($filteredList);
+        Cache::remember(self::CACHE_KEY_CHECK, 86400, function () {
+            return true;
+        });
+
+        return $res;
+    }
+
+    public static function parseCacheFileData()
+    {
+        if (Storage::has(self::CACHE_FILE_NAME)) {
+            $res = Storage::get(self::CACHE_FILE_NAME);
+            if (! $res) {
+                return false;
+            } else {
+                $res = json_decode($res, true);
+                if (! $res || isset($res['version'], $res['data'], $res['created'], $res['updated'])) {
+                    if (now()->parse($res['updated'])->lt(now()->subMonths(6))) {
+                        return false;
+                    } else {
+                        if ($res['version'] === self::CACHE_FILE_VERSION) {
+                            return $res;
+                        } else {
+                            return false;
+                        }
+                    }
+                } else {
+                    return false;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    public static function transformCacheFileData($res)
+    {
+        return [
+            'id' => 'pixelfed/storage/app/'.self::CACHE_FILE_NAME,
+            'version' => self::CACHE_FILE_VERSION,
+            'created' => now()->format('c'),
+            'updated' => now()->format('c'),
+            'length' => count($res),
+            'data' => $res,
+        ];
+    }
+
+    public static function updateCacheFileData()
+    {
+        $res = self::parseCacheFileData();
+        if (! $res) {
+            return false;
+        }
+
+        $diff = [];
+        $nodes = $res['data'];
+        $latest = self::getFromDatabase();
+        $merge = array_merge($nodes, $latest);
+
+        foreach ($merge as $val) {
+            if (! in_array($val, $nodes)) {
+                if (self::add($val)) {
+                    $nodes[] = $val;
+                } else {
+                    unset($nodes[$val]);
+                }
+            }
+        }
+
+        $data = [
+            'id' => 'pixelfed/storage/app/'.self::CACHE_FILE_NAME,
+            'version' => self::CACHE_FILE_VERSION,
+            'created' => $res['created'],
+            'updated' => now()->format('c'),
+            'length' => count($nodes),
+            'data' => $nodes,
+        ];
+
+        $contents = json_encode($data, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT);
+        Storage::put(self::CACHE_FILE_NAME, $contents);
+
+        return 1;
+    }
+
+    public static function saveCacheToDisk($res = false)
+    {
+        if (! $res) {
+            return;
+        }
+
+        $contents = json_encode(self::transformCacheFileData($res), JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT);
+        Storage::put(self::CACHE_FILE_NAME, $contents);
+    }
+
+    public static function getFromDatabase()
+    {
+        return Profile::whereNotNull('sharedInbox')->groupBy('sharedInbox')->pluck('sharedInbox')->toArray();
+    }
+
+    public static function scanForUpdates()
+    {
+        $res = self::getFromDatabase();
+        $filteredList = [];
+
+        foreach ($res as $value) {
+            if (! $value || ! str_starts_with($value, 'https://')) {
+                continue;
+            }
+            Redis::sadd(self::CACHE_KEY, $value);
+            $filteredList[] = $value;
+        }
+
+        self::saveCacheToDisk($filteredList);
+
+        return 1;
+    }
+}
diff --git a/app/Services/FetchCacheService.php b/app/Services/FetchCacheService.php
new file mode 100644
index 000000000..2e23fb009
--- /dev/null
+++ b/app/Services/FetchCacheService.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace App\Services;
+
+use App\Util\ActivityPub\Helpers;
+use Illuminate\Http\Client\ConnectionException;
+use Illuminate\Http\Client\RequestException;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Http;
+
+class FetchCacheService
+{
+    const CACHE_KEY = 'pf:fetch_cache_service:getjson:';
+
+    public static function getJson($url, $verifyCheck = true, $ttl = 3600, $allowRedirects = true)
+    {
+        $vc = $verifyCheck ? 'vc1:' : 'vc0:';
+        $ar = $allowRedirects ? 'ar1:' : 'ar0';
+        $key = self::CACHE_KEY.sha1($url).':'.$vc.$ar.$ttl;
+        if (Cache::has($key)) {
+            return false;
+        }
+
+        if ($verifyCheck) {
+            if (! Helpers::validateUrl($url)) {
+                Cache::put($key, 1, $ttl);
+
+                return false;
+            }
+        }
+
+        $headers = [
+            'User-Agent' => '(Pixelfed/'.config('pixelfed.version').'; +'.config('app.url').')',
+        ];
+
+        if ($allowRedirects) {
+            $options = [
+                'allow_redirects' => [
+                    'max' => 2,
+                    'strict' => true,
+                ],
+            ];
+        } else {
+            $options = [
+                'allow_redirects' => false,
+            ];
+        }
+        try {
+            $res = Http::withOptions($options)
+                ->retry(3, function (int $attempt, $exception) {
+                    return $attempt * 500;
+                })
+                ->acceptJson()
+                ->withHeaders($headers)
+                ->timeout(40)
+                ->get($url);
+        } catch (RequestException $e) {
+            Cache::put($key, 1, $ttl);
+
+            return false;
+        } catch (ConnectionException $e) {
+            Cache::put($key, 1, $ttl);
+
+            return false;
+        } catch (Exception $e) {
+            Cache::put($key, 1, $ttl);
+
+            return false;
+        }
+
+        if (! $res->ok()) {
+            Cache::put($key, 1, $ttl);
+
+            return false;
+        }
+
+        return $res->json();
+    }
+}
diff --git a/app/Services/FilesystemService.php b/app/Services/FilesystemService.php
new file mode 100644
index 000000000..b52f002f4
--- /dev/null
+++ b/app/Services/FilesystemService.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Services;
+
+use Aws\S3\S3Client;
+use Aws\S3\Exception\S3Exception;
+use GuzzleHttp\Exception\ConnectException;
+use League\Flysystem\AwsS3V3\AwsS3V3Adapter;
+use League\Flysystem\Filesystem;
+use League\Flysystem\UnableToRetrieveMetadata;
+use League\Flysystem\FilesystemException;
+use League\Flysystem\UnableToListContents;
+use League\Flysystem\FileAttributes;
+use League\Flysystem\UnableToWriteFile;
+
+class FilesystemService
+{
+    const VERIFY_FILE_NAME = 'cfstest.txt';
+
+    public static function getVerifyCredentials($key, $secret, $region, $bucket, $endpoint)
+    {
+        $client = new S3Client([
+            'version' => 'latest',
+            'region' => $region,
+            'endpoint' => $endpoint,
+            'credentials' => [
+                'key' => $key,
+                'secret' => $secret,
+            ]
+        ]);
+
+        $adapter = new AwsS3V3Adapter(
+            $client,
+            $bucket,
+        );
+
+        $throw = false;
+        $filesystem = new Filesystem($adapter);
+
+        $writable = false;
+        try {
+            $filesystem->write(self::VERIFY_FILE_NAME, 'ok', []);
+            $writable = true;
+        } catch (FilesystemException | UnableToWriteFile $exception) {
+            $writable = false;
+        }
+
+        if(!$writable) {
+            return false;
+        }
+
+        try {
+            $response = $filesystem->read(self::VERIFY_FILE_NAME);
+            if($response === 'ok') {
+                $writable = true;
+                $res[] = self::VERIFY_FILE_NAME;
+            } else {
+                $writable = false;
+            }
+        } catch (FilesystemException | UnableToReadFile $exception) {
+            $writable = false;
+        }
+
+        if(in_array(self::VERIFY_FILE_NAME, $res)) {
+            try {
+                $filesystem->delete(self::VERIFY_FILE_NAME);
+            } catch (FilesystemException | UnableToDeleteFile $exception) {
+                $writable = false;
+            }
+        }
+
+        if(!$writable) {
+            return false;
+        }
+
+        if(in_array(self::VERIFY_FILE_NAME, $res)) {
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/app/Services/FollowerService.php b/app/Services/FollowerService.php
index 1c00a6f49..ff2a191f2 100644
--- a/app/Services/FollowerService.php
+++ b/app/Services/FollowerService.php
@@ -6,210 +6,263 @@ use Illuminate\Support\Facades\Redis;
 use Cache;
 use DB;
 use App\{
-	Follower,
-	Profile,
-	User
+    Follower,
+    Profile,
+    User
 };
 use App\Jobs\FollowPipeline\FollowServiceWarmCache;
 
 class FollowerService
 {
-	const CACHE_KEY = 'pf:services:followers:';
-	const FOLLOWERS_SYNC_KEY = 'pf:services:followers:sync-followers:';
-	const FOLLOWING_SYNC_KEY = 'pf:services:followers:sync-following:';
-	const FOLLOWING_KEY = 'pf:services:follow:following:id:';
-	const FOLLOWERS_KEY = 'pf:services:follow:followers:id:';
+    const CACHE_KEY = 'pf:services:followers:';
+    const FOLLOWERS_SYNC_KEY = 'pf:services:followers:sync-followers:';
+    const FOLLOWING_SYNC_KEY = 'pf:services:followers:sync-following:';
+    const FOLLOWING_KEY = 'pf:services:follow:following:id:';
+    const FOLLOWERS_KEY = 'pf:services:follow:followers:id:';
+    const FOLLOWERS_LOCAL_KEY = 'pf:services:follow:local-follower-ids:v1:';
+    const FOLLOWERS_INTER_KEY = 'pf:services:follow:followers:inter:id:';
 
-	public static function add($actor, $target, $refresh = true)
-	{
-		$ts = (int) microtime(true);
+    public static function add($actor, $target, $refresh = true)
+    {
+        $ts = (int) microtime(true);
         if($refresh) {
           RelationshipService::refresh($actor, $target);
         } else {
-		  RelationshipService::forget($actor, $target);
+          RelationshipService::forget($actor, $target);
         }
-		Redis::zadd(self::FOLLOWING_KEY . $actor, $ts, $target);
-		Redis::zadd(self::FOLLOWERS_KEY . $target, $ts, $actor);
-		Cache::forget('profile:following:' . $actor);
-	}
+        Redis::zadd(self::FOLLOWING_KEY . $actor, $ts, $target);
+        Redis::zadd(self::FOLLOWERS_KEY . $target, $ts, $actor);
+        Cache::forget('profile:following:' . $actor);
+        Cache::forget(self::FOLLOWERS_LOCAL_KEY . $actor);
+        Cache::forget(self::FOLLOWERS_LOCAL_KEY . $target);
+    }
 
-	public static function remove($actor, $target)
-	{
-		Redis::zrem(self::FOLLOWING_KEY . $actor, $target);
-		Redis::zrem(self::FOLLOWERS_KEY . $target, $actor);
-		Cache::forget('pf:services:follower:audience:' . $actor);
-		Cache::forget('pf:services:follower:audience:' . $target);
-		AccountService::del($actor);
-		AccountService::del($target);
-		RelationshipService::refresh($actor, $target);
-		Cache::forget('profile:following:' . $actor);
-	}
+    public static function remove($actor, $target, $silent = false)
+    {
+        Redis::zrem(self::FOLLOWING_KEY . $actor, $target);
+        Redis::zrem(self::FOLLOWERS_KEY . $target, $actor);
+        Cache::forget(self::FOLLOWERS_LOCAL_KEY . $actor);
+        Cache::forget(self::FOLLOWERS_LOCAL_KEY . $target);
+        if($silent !== true) {
+            AccountService::del($actor);
+            AccountService::del($target);
+            RelationshipService::refresh($actor, $target);
+            Cache::forget('profile:following:' . $actor);
+        } else {
+            RelationshipService::forget($actor, $target);
+        }
+    }
 
-	public static function followers($id, $start = 0, $stop = 10)
-	{
-		self::cacheSyncCheck($id, 'followers');
-		return Redis::zrevrange(self::FOLLOWERS_KEY . $id, $start, $stop);
-	}
+    public static function followers($id, $start = 0, $stop = 10)
+    {
+        self::cacheSyncCheck($id, 'followers');
+        return Redis::zrevrange(self::FOLLOWERS_KEY . $id, $start, $stop);
+    }
 
-	public static function following($id, $start = 0, $stop = 10)
-	{
-		self::cacheSyncCheck($id, 'following');
-		return Redis::zrevrange(self::FOLLOWING_KEY . $id, $start, $stop);
-	}
+    public static function following($id, $start = 0, $stop = 10)
+    {
+        self::cacheSyncCheck($id, 'following');
+        return Redis::zrevrange(self::FOLLOWING_KEY . $id, $start, $stop);
+    }
 
-	public static function followersPaginate($id, $page = 1, $limit = 10)
-	{
-		$start = $page == 1 ? 0 : $page * $limit - $limit;
-		$end = $start + ($limit - 1);
-		return self::followers($id, $start, $end);
-	}
+    public static function followersPaginate($id, $page = 1, $limit = 10)
+    {
+        $start = $page == 1 ? 0 : $page * $limit - $limit;
+        $end = $start + ($limit - 1);
+        return self::followers($id, $start, $end);
+    }
 
-	public static function followingPaginate($id, $page = 1, $limit = 10)
-	{
-		$start = $page == 1 ? 0 : $page * $limit - $limit;
-		$end = $start + ($limit - 1);
-		return self::following($id, $start, $end);
-	}
+    public static function followingPaginate($id, $page = 1, $limit = 10)
+    {
+        $start = $page == 1 ? 0 : $page * $limit - $limit;
+        $end = $start + ($limit - 1);
+        return self::following($id, $start, $end);
+    }
 
-	public static function followerCount($id, $warmCache = true)
-	{
-		if($warmCache) {
-			self::cacheSyncCheck($id, 'followers');
-		}
-		return Redis::zCard(self::FOLLOWERS_KEY . $id);
-	}
+    public static function followerCount($id, $warmCache = true)
+    {
+        if($warmCache) {
+            self::cacheSyncCheck($id, 'followers');
+        }
+        return Redis::zCard(self::FOLLOWERS_KEY . $id);
+    }
 
-	public static function followingCount($id, $warmCache = true)
-	{
-		if($warmCache) {
-			self::cacheSyncCheck($id, 'following');
-		}
-		return Redis::zCard(self::FOLLOWING_KEY . $id);
-	}
+    public static function followingCount($id, $warmCache = true)
+    {
+        if($warmCache) {
+            self::cacheSyncCheck($id, 'following');
+        }
+        return Redis::zCard(self::FOLLOWING_KEY . $id);
+    }
 
-	public static function follows(string $actor, string $target)
-	{
-		if($actor == $target) {
-			return false;
-		}
+    public static function follows(string $actor, string $target, $quickCheck = false)
+    {
+        if($actor == $target) {
+            return false;
+        }
 
-		if(self::followerCount($target, false) && self::followingCount($actor, false)) {
-			self::cacheSyncCheck($target, 'followers');
-			return (bool) Redis::zScore(self::FOLLOWERS_KEY . $target, $actor);
-		} else {
-			self::cacheSyncCheck($target, 'followers');
-			self::cacheSyncCheck($actor, 'following');
-			return Follower::whereProfileId($actor)->whereFollowingId($target)->exists();
-		}
-	}
+        if($quickCheck) {
+            return (bool) Redis::zScore(self::FOLLOWERS_KEY . $target, $actor);
+        }
 
-	public static function cacheSyncCheck($id, $scope = 'followers')
-	{
-		if($scope === 'followers') {
-			if(Cache::get(self::FOLLOWERS_SYNC_KEY . $id) != null) {
-				return;
-			}
-			FollowServiceWarmCache::dispatch($id)->onQueue('low');
-		}
-		if($scope === 'following') {
-			if(Cache::get(self::FOLLOWING_SYNC_KEY . $id) != null) {
-				return;
-			}
-			FollowServiceWarmCache::dispatch($id)->onQueue('low');
-		}
-		return;
-	}
+        if(self::followerCount($target, false) && self::followingCount($actor, false)) {
+            self::cacheSyncCheck($target, 'followers');
+            return (bool) Redis::zScore(self::FOLLOWERS_KEY . $target, $actor);
+        } else {
+            self::cacheSyncCheck($target, 'followers');
+            self::cacheSyncCheck($actor, 'following');
+            return Follower::whereProfileId($actor)->whereFollowingId($target)->exists();
+        }
+    }
 
-	public static function audience($profile, $scope = null)
-	{
-		return (new self)->getAudienceInboxes($profile, $scope);
-	}
+    public static function cacheSyncCheck($id, $scope = 'followers')
+    {
+        if($scope === 'followers') {
+            if(Cache::get(self::FOLLOWERS_SYNC_KEY . $id) != null) {
+                return;
+            }
+            FollowServiceWarmCache::dispatch($id)->onQueue('low');
+        }
+        if($scope === 'following') {
+            if(Cache::get(self::FOLLOWING_SYNC_KEY . $id) != null) {
+                return;
+            }
+            FollowServiceWarmCache::dispatch($id)->onQueue('low');
+        }
+        return;
+    }
 
-	public static function softwareAudience($profile, $software = 'pixelfed')
-	{
-		return collect(self::audience($profile))
-			->filter(function($inbox) use($software) {
-				$domain = parse_url($inbox, PHP_URL_HOST);
-				if(!$domain) {
-					return false;
-				}
-				return InstanceService::software($domain) === strtolower($software);
-			})
-			->unique()
-			->values()
-			->toArray();
-	}
+    public static function audience($profile, $scope = null)
+    {
+        return (new self)->getAudienceInboxes($profile, $scope);
+    }
 
-	protected function getAudienceInboxes($pid, $scope = null)
-	{
-		$key = 'pf:services:follower:audience:' . $pid;
-		$domains = Cache::remember($key, 432000, function() use($pid) {
-			$profile = Profile::whereNull(['status', 'domain'])->find($pid);
-			if(!$profile) {
-				return [];
-			}
-			return $profile
-				->followers()
-				->get()
-				->map(function($follow) {
-					return $follow->sharedInbox ?? $follow->inbox_url;
-				})
-				->filter()
-				->unique()
-				->values();
-		});
+    public static function softwareAudience($profile, $software = 'pixelfed')
+    {
+        return collect(self::audience($profile))
+            ->filter(function($inbox) use($software) {
+                $domain = parse_url($inbox, PHP_URL_HOST);
+                if(!$domain) {
+                    return false;
+                }
+                return InstanceService::software($domain) === strtolower($software);
+            })
+            ->unique()
+            ->values()
+            ->toArray();
+    }
 
-		if(!$domains || !$domains->count()) {
-			return [];
-		}
+    protected function getAudienceInboxes($pid, $scope = null)
+    {
+        $key = 'pf:services:follower:audience:' . $pid;
+        $bannedDomains = InstanceService::getBannedDomains();
+        $domains = Cache::remember($key, 432000, function() use($pid, $bannedDomains) {
+            $profile = Profile::whereNull(['status', 'domain'])->find($pid);
+            if(!$profile) {
+                return [];
+            }
+            return DB::table('followers')
+                ->join('profiles', 'followers.profile_id', '=', 'profiles.id')
+                ->where('followers.following_id', $pid)
+                ->whereNotNull('profiles.inbox_url')
+                ->whereNull('profiles.deleted_at')
+                ->select('followers.profile_id', 'followers.following_id', 'profiles.id', 'profiles.user_id', 'profiles.deleted_at', 'profiles.sharedInbox', 'profiles.inbox_url')
+                ->get()
+                ->map(function($r) {
+                    return $r->sharedInbox ?? $r->inbox_url;
+                })
+                ->filter(function($r) use($bannedDomains) {
+                    $domain = parse_url($r, PHP_URL_HOST);
+                    return $r && !in_array($domain, $bannedDomains);
+                })
+                ->unique()
+                ->values();
+        });
 
-		$banned = InstanceService::getBannedDomains();
+        if(!$domains || !$domains->count()) {
+            return [];
+        }
 
-		if(!$banned || count($banned) === 0) {
-			return $domains->toArray();
-		}
+        $banned = InstanceService::getBannedDomains();
 
-		$res = $domains->filter(function($domain) use($banned) {
-			$parsed = parse_url($domain, PHP_URL_HOST);
-			return !in_array($parsed, $banned);
-		})
-		->values()
-		->toArray();
+        if(!$banned || count($banned) === 0) {
+            return $domains->toArray();
+        }
 
-		return $res;
-	}
+        $res = $domains->filter(function($domain) use($banned) {
+            $parsed = parse_url($domain, PHP_URL_HOST);
+            return !in_array($parsed, $banned);
+        })
+        ->values()
+        ->toArray();
 
-	public static function mutualCount($pid, $mid)
-	{
-		return Cache::remember(self::CACHE_KEY . ':mutualcount:' . $pid . ':' . $mid, 3600, function() use($pid, $mid) {
-			return DB::table('followers as u')
-				->join('followers as s', 'u.following_id', '=', 's.following_id')
-				->where('s.profile_id', $mid)
-				->where('u.profile_id', $pid)
-				->count();
-		});
-	}
+        return $res;
+    }
 
-	public static function mutualIds($pid, $mid, $limit = 3)
-	{
-		$key = self::CACHE_KEY . ':mutualids:' . $pid . ':' . $mid . ':limit_' . $limit;
-		return Cache::remember($key, 3600, function() use($pid, $mid, $limit) {
-			return DB::table('followers as u')
-				->join('followers as s', 'u.following_id', '=', 's.following_id')
-				->where('s.profile_id', $mid)
-				->where('u.profile_id', $pid)
-				->limit($limit)
-				->pluck('s.following_id')
-				->toArray();
-		});
-	}
+    public static function mutualCount($pid, $mid)
+    {
+        return Cache::remember(self::CACHE_KEY . ':mutualcount:' . $pid . ':' . $mid, 3600, function() use($pid, $mid) {
+            return DB::table('followers as u')
+                ->join('followers as s', 'u.following_id', '=', 's.following_id')
+                ->where('s.profile_id', $mid)
+                ->where('u.profile_id', $pid)
+                ->count();
+        });
+    }
 
-	public static function delCache($id)
-	{
-		Redis::del(self::CACHE_KEY . $id);
-		Redis::del(self::FOLLOWING_KEY . $id);
-		Redis::del(self::FOLLOWERS_KEY . $id);
-		Cache::forget(self::FOLLOWERS_SYNC_KEY . $id);
-		Cache::forget(self::FOLLOWING_SYNC_KEY . $id);
-	}
+    public static function mutualIds($pid, $mid, $limit = 3)
+    {
+        $key = self::CACHE_KEY . ':mutualids:' . $pid . ':' . $mid . ':limit_' . $limit;
+        return Cache::remember($key, 3600, function() use($pid, $mid, $limit) {
+            return DB::table('followers as u')
+                ->join('followers as s', 'u.following_id', '=', 's.following_id')
+                ->where('s.profile_id', $mid)
+                ->where('u.profile_id', $pid)
+                ->limit($limit)
+                ->pluck('s.following_id')
+                ->toArray();
+        });
+    }
+
+    public static function mutualAccounts($actorId, $profileId)
+    {
+        if($actorId == $profileId) {
+            return [];
+        }
+        $actorKey = self::FOLLOWING_KEY . $actorId;
+        $profileKey = self::FOLLOWERS_KEY . $profileId;
+        $key = self::FOLLOWERS_INTER_KEY . $actorId . ':' . $profileId;
+        $res = Redis::zinterstore($key, [$actorKey, $profileKey]);
+        if($res) {
+            return Redis::zrange($key, 0, -1);
+        } else {
+            return [];
+        }
+    }
+
+    public static function delCache($id)
+    {
+        Redis::del(self::CACHE_KEY . $id);
+        Redis::del(self::FOLLOWING_KEY . $id);
+        Redis::del(self::FOLLOWERS_KEY . $id);
+        Cache::forget(self::FOLLOWERS_SYNC_KEY . $id);
+        Cache::forget(self::FOLLOWING_SYNC_KEY . $id);
+    }
+
+    public static function localFollowerIds($pid, $limit = 0)
+    {
+        $key = self::FOLLOWERS_LOCAL_KEY . $pid;
+        $res = Cache::remember($key, 7200, function() use($pid) {
+            return DB::table('followers')
+                ->join('profiles', 'followers.profile_id', '=', 'profiles.id')
+                ->where('followers.following_id', $pid)
+                ->whereNotNull('profiles.user_id')
+                ->whereNull('profiles.deleted_at')
+                ->select('followers.profile_id', 'followers.following_id', 'profiles.id', 'profiles.user_id', 'profiles.deleted_at')
+                ->pluck('followers.profile_id');
+        });
+        return $limit ?
+            $res->take($limit)->values()->toArray() :
+            $res->values()->toArray();
+    }
 }
diff --git a/app/Services/GroupFeedService.php b/app/Services/GroupFeedService.php
new file mode 100644
index 000000000..bf28b470e
--- /dev/null
+++ b/app/Services/GroupFeedService.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace App\Services;
+
+use App\Models\GroupPost;
+use Illuminate\Support\Facades\Redis;
+
+class GroupFeedService
+{
+    const CACHE_KEY = 'pf:services:groups:feed:';
+
+    const FEED_LIMIT = 400;
+
+    public static function get($gid, $start = 0, $stop = 10)
+    {
+        if ($stop > 100) {
+            $stop = 100;
+        }
+
+        return Redis::zrevrange(self::CACHE_KEY.$gid, $start, $stop);
+    }
+
+    public static function getRankedMaxId($gid, $start = null, $limit = 10)
+    {
+        if (! $start) {
+            return [];
+        }
+
+        return array_keys(Redis::zrevrangebyscore(self::CACHE_KEY.$gid, $start, '-inf', [
+            'withscores' => true,
+            'limit' => [1, $limit],
+        ]));
+    }
+
+    public static function getRankedMinId($gid, $end = null, $limit = 10)
+    {
+        if (! $end) {
+            return [];
+        }
+
+        return array_keys(Redis::zrevrangebyscore(self::CACHE_KEY.$gid, '+inf', $end, [
+            'withscores' => true,
+            'limit' => [0, $limit],
+        ]));
+    }
+
+    public static function add($gid, $val)
+    {
+        if (self::count($gid) > self::FEED_LIMIT) {
+            if (config('database.redis.client') === 'phpredis') {
+                Redis::zpopmin(self::CACHE_KEY.$gid);
+            }
+        }
+
+        return Redis::zadd(self::CACHE_KEY.$gid, $val, $val);
+    }
+
+    public static function rem($gid, $val)
+    {
+        return Redis::zrem(self::CACHE_KEY.$gid, $val);
+    }
+
+    public static function del($gid, $val)
+    {
+        return self::rem($gid, $val);
+    }
+
+    public static function count($gid)
+    {
+        return Redis::zcard(self::CACHE_KEY.$gid);
+    }
+
+    public static function warmCache($gid, $force = false, $limit = 100)
+    {
+        if (self::count($gid) == 0 || $force == true) {
+            Redis::del(self::CACHE_KEY.$gid);
+            $ids = GroupPost::whereGroupId($gid)
+                ->orderByDesc('id')
+                ->limit($limit)
+                ->pluck('id');
+            foreach ($ids as $id) {
+                self::add($gid, $id);
+            }
+
+            return 1;
+        }
+    }
+}
diff --git a/app/Services/GroupPostService.php b/app/Services/GroupPostService.php
new file mode 100644
index 000000000..7295bda40
--- /dev/null
+++ b/app/Services/GroupPostService.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Services;
+
+use App\Models\GroupPost;
+use App\Transformer\Api\GroupPostTransformer;
+use Cache;
+use League\Fractal;
+use League\Fractal\Serializer\ArraySerializer;
+
+class GroupPostService
+{
+    const CACHE_KEY = 'pf:services:groups:post:';
+
+    public static function key($gid, $pid)
+    {
+        return self::CACHE_KEY.$gid.':'.$pid;
+    }
+
+    public static function get($gid, $pid)
+    {
+        return Cache::remember(self::key($gid, $pid), 604800, function () use ($gid, $pid) {
+            $gp = GroupPost::whereGroupId($gid)->find($pid);
+
+            if (! $gp) {
+                return null;
+            }
+
+            $fractal = new Fractal\Manager();
+            $fractal->setSerializer(new ArraySerializer());
+            $resource = new Fractal\Resource\Item($gp, new GroupPostTransformer());
+            $res = $fractal->createData($resource)->toArray();
+
+            $res['pf_type'] = $gp['type'];
+            $res['url'] = $gp->url();
+
+            // if($gp['type'] == 'poll') {
+            // 	$status['poll'] = PollService::get($status['id']);
+            // }
+            //$status['account']['url'] = url("/groups/{$gp['group_id']}/user/{$status['account']['id']}");
+            return $res;
+        });
+    }
+
+    public static function del($gid, $pid)
+    {
+        return Cache::forget(self::key($gid, $pid));
+    }
+}
diff --git a/app/Services/GroupService.php b/app/Services/GroupService.php
new file mode 100644
index 000000000..ac1a1a1c6
--- /dev/null
+++ b/app/Services/GroupService.php
@@ -0,0 +1,366 @@
+<?php
+
+namespace App\Services;
+
+use App\Profile;
+use App\Models\Group;
+use App\Models\GroupCategory;
+use App\Models\GroupMember;
+use App\Models\GroupPost;
+use App\Models\GroupInteraction;
+use App\Models\GroupLimit;
+use App\Util\ActivityPub\Helpers;
+use Cache;
+use Purify;
+use App\Http\Resources\Groups\GroupResource;
+
+class GroupService
+{
+	const CACHE_KEY = 'pf:services:groups:';
+
+	protected static function key($name)
+	{
+		return self::CACHE_KEY . $name;
+	}
+
+	public static function get($id, $pid = false)
+	{
+		$res = Cache::remember(
+			self::key($id),
+			1209600,
+			function() use($id, $pid) {
+				$group = (new Group)->withoutRelations()->whereNull('status')->find($id);
+
+				if(!$group) {
+					return null;
+				}
+
+				$admin = $group->profile_id ? AccountService::get($group->profile_id) : null;
+
+				return [
+					'id' => (string) $group->id,
+					'name' => $group->name,
+					'description' => $group->description,
+					'short_description' => str_limit(strip_tags($group->description), 120),
+					'category' => self::categoryById($group->category_id),
+					'local' => (bool) $group->local,
+					'url' => $group->url(),
+					'shorturl' => url('/g/'.HashidService::encode($group->id)),
+					'membership' => $group->getMembershipType(),
+					'member_count' => $group->members()->whereJoinRequest(false)->count(),
+					'verified' => false,
+					'self' => null,
+					'admin' => $admin,
+					'config' => [
+						'recommended' => (bool) $group->recommended,
+						'discoverable' => (bool) $group->discoverable,
+						'activitypub' => (bool) $group->activitypub,
+						'is_nsfw' => (bool) $group->is_nsfw,
+						'dms' => (bool) $group->dms
+					],
+					'metadata' => $group->metadata,
+					'created_at' => $group->created_at->toAtomString(),
+				];
+			}
+		);
+
+		if($pid) {
+			$res['self'] = self::getSelf($id, $pid);
+		}
+
+		return $res;
+	}
+
+	public static function del($id)
+	{
+		Cache::forget('ap:groups:object:' . $id);
+		return Cache::forget(self::key($id));
+	}
+
+	public static function getSelf($gid, $pid)
+	{
+		return Cache::remember(
+			self::key('self:gid-' . $gid . ':pid-' . $pid),
+			3600,
+			function() use($gid, $pid) {
+				$group = Group::find($gid);
+
+				if(!$gid || !$pid) {
+					return [
+						'is_member' => false,
+						'role' => null,
+						'is_requested' => null
+					];
+				}
+
+				return [
+					'is_member' => $group->isMember($pid),
+					'role' => $group->selfRole($pid),
+					'is_requested' => optional($group->members()->whereProfileId($pid)->first())->join_request ?? false
+				];
+			}
+		);
+	}
+
+	public static function delSelf($gid, $pid)
+	{
+		Cache::forget(self::key("is_member:{$gid}:{$pid}"));
+		return Cache::forget(self::key('self:gid-' . $gid . ':pid-' . $pid));
+	}
+
+	public static function sidToGid($gid, $pid)
+	{
+		return Cache::remember(self::key('s2gid:' . $gid . ':' . $pid), 3600, function() use($gid, $pid) {
+			return optional(GroupPost::whereGroupId($gid)->whereStatusId($pid)->first())->id;
+		});
+	}
+
+	public static function membershipsByPid($pid)
+	{
+		return Cache::remember(self::key("mbpid:{$pid}"), 3600, function() use($pid) {
+			return GroupMember::whereProfileId($pid)->pluck('group_id');
+		});
+	}
+
+	public static function config()
+	{
+		return [
+			'enabled' => config('exp.gps') ?? false,
+			'limits' => [
+				'group' => [
+					'max' => 999,
+					'federation' => false,
+				],
+
+				'user' => [
+					'create' => [
+						'new' => true,
+						'max' => 10
+					],
+					'join' => [
+						'max' => 10
+					],
+					'invite' => [
+						'max' => 20
+					]
+				]
+			],
+			'guest' => [
+				'public' => false
+			]
+		];
+	}
+
+	public static function fetchRemote($url)
+	{
+		// todo: refactor this demo
+		$res = Helpers::fetchFromUrl($url);
+
+		if(!$res || !isset($res['type']) || $res['type'] != 'Group') {
+			return false;
+		}
+
+		$group = Group::whereRemoteUrl($url)->first();
+
+		if($group) {
+			return $group;
+		}
+
+		$group = new Group;
+		$group->remote_url = $res['url'];
+		$group->name = $res['name'];
+		$group->inbox_url = $res['inbox'];
+		$group->metadata = [
+			'header' => [
+				'url' => $res['icon']['image']['url']
+			]
+		];
+		$group->description = Purify::clean($res['summary']);
+		$group->local = false;
+		$group->save();
+
+		return $group->url();
+	}
+
+	public static function log(
+		string $groupId,
+		string $profileId,
+		string $type = null,
+		array $meta = null,
+		string $itemType = null,
+		string $itemId = null
+	)
+	{
+		// todo: truncate (some) metadata after XX days in cron/queue
+		$log = new GroupInteraction;
+		$log->group_id = $groupId;
+		$log->profile_id = $profileId;
+		$log->type = $type;
+		$log->item_type = $itemType;
+		$log->item_id = $itemId;
+		$log->metadata = $meta;
+		$log->save();
+	}
+
+	public static function getRejoinTimeout($gid, $pid)
+	{
+		$key = self::key('rejoin-timeout:gid-' . $gid . ':pid-' . $pid);
+		return Cache::has($key);
+	}
+
+	public static function setRejoinTimeout($gid, $pid)
+	{
+		// todo: allow group admins to manually remove timeout
+		$key = self::key('rejoin-timeout:gid-' . $gid . ':pid-' . $pid);
+		return Cache::put($key, 1, 86400);
+	}
+
+	public static function getMemberInboxes($id)
+	{
+		// todo: cache this, maybe add join/leave methods to this service to handle cache invalidation
+		$group = (new Group)->withoutRelations()->findOrFail($id);
+		if(!$group->local) {
+			return [];
+		}
+		$members = GroupMember::whereGroupId($id)->whereLocalProfile(false)->pluck('profile_id');
+		return Profile::find($members)->map(function($u) {
+			return $u->sharedInbox ?? $u->inbox_url;
+		})->toArray();
+	}
+
+	public static function getInteractionLimits($gid, $pid)
+	{
+		return Cache::remember(self::key(":il:{$gid}:{$pid}"), 3600, function() use($gid, $pid) {
+			$limit = GroupLimit::whereGroupId($gid)->whereProfileId($pid)->first();
+			if(!$limit) {
+				return [
+					'limits' => [
+						'can_post' => true,
+						'can_comment' => true,
+						'can_like' => true
+					],
+					'updated_at' => null
+				];
+			}
+
+			return [
+				'limits' => $limit->limits,
+				'updated_at' => $limit->updated_at->format('c')
+			];
+		});
+	}
+
+	public static function clearInteractionLimits($gid, $pid)
+	{
+		return Cache::forget(self::key(":il:{$gid}:{$pid}"));
+	}
+
+	public static function canPost($gid, $pid)
+	{
+		$limits = self::getInteractionLimits($gid, $pid);
+		if($limits) {
+			return (bool) $limits['limits']['can_post'];
+		} else {
+			return true;
+		}
+	}
+
+	public static function canComment($gid, $pid)
+	{
+		$limits = self::getInteractionLimits($gid, $pid);
+		if($limits) {
+			return (bool) $limits['limits']['can_comment'];
+		} else {
+			return true;
+		}
+	}
+
+	public static function canLike($gid, $pid)
+	{
+		$limits = self::getInteractionLimits($gid, $pid);
+		if($limits) {
+			return (bool) $limits['limits']['can_like'];
+		} else {
+			return true;
+		}
+	}
+
+	public static function categories($onlyActive = true)
+	{
+		return Cache::remember(self::key(':categories'), 2678400, function() use($onlyActive) {
+			return GroupCategory::when($onlyActive, function($q, $onlyActive) {
+					return $q->whereActive(true);
+				})
+				->orderBy('order')
+				->pluck('name')
+				->toArray();
+		});
+	}
+
+	public static function categoryById($id)
+	{
+		return Cache::remember(self::key(':categorybyid:'.$id), 2678400, function() use($id) {
+			$category = GroupCategory::find($id);
+			if($category) {
+				return [
+					'name' => $category->name,
+					'url' => url("/groups/explore/category/{$category->slug}")
+				];
+			}
+			return false;
+		});
+	}
+
+	public static function isMember($gid = false, $pid = false)
+	{
+		if(!$gid || !$pid) {
+			return false;
+		}
+
+		$key = self::key("is_member:{$gid}:{$pid}");
+		return Cache::remember($key, 3600, function() use($gid, $pid) {
+			return GroupMember::whereGroupId($gid)
+				->whereProfileId($pid)
+				->whereJoinRequest(false)
+				->exists();
+		});
+	}
+
+	public static function mutualGroups($cid = false, $pid = false, $exclude = [])
+	{
+		if(!$cid || !$pid) {
+			return [
+				'count' => 0,
+				'groups' => []
+			];
+		}
+
+		$self = self::membershipsByPid($cid);
+		$user = self::membershipsByPid($pid);
+
+		if(!$self->count() || !$user->count()) {
+			return [
+				'count' => 0,
+				'groups' => []
+			];
+		}
+
+		$intersect = $self->intersect($user);
+		$count = $intersect->count();
+		$groups = $intersect
+			->values()
+			->filter(function($id) use($exclude) {
+				return !in_array($id, $exclude);
+			})
+			->shuffle()
+			->take(1)
+			->map(function($id) {
+				return self::get($id);
+			});
+
+		return [
+			'count' => $count,
+			'groups' => $groups
+		];
+	}
+}
diff --git a/app/Services/Groups/GroupAccountService.php b/app/Services/Groups/GroupAccountService.php
new file mode 100644
index 000000000..2d86e4f43
--- /dev/null
+++ b/app/Services/Groups/GroupAccountService.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Services\Groups;
+
+use App\Models\Group;
+use App\Models\GroupPost;
+use App\Models\GroupMember;
+use Cache;
+use Purify;
+use App\Services\AccountService;
+use App\Services\GroupService;
+
+class GroupAccountService
+{
+    const CACHE_KEY = 'pf:services:groups:accounts-v0:';
+
+    public static function get($gid, $pid)
+    {
+        $group = GroupService::get($gid);
+        if(!$group) {
+            return;
+        }
+
+        $account = AccountService::get($pid, true);
+        if(!$account) {
+            return;
+        }
+
+        $key = self::CACHE_KEY . $gid . ':' . $pid;
+        $account['group'] = Cache::remember($key, 3600, function() use($gid, $pid) {
+            $membership = GroupMember::whereGroupId($gid)->whereProfileId($pid)->first();
+            if(!$membership) {
+                return [];
+            }
+
+            return [
+                'joined' => $membership->created_at->format('c'),
+                'role' => $membership->role,
+                'local_group' => (bool) $membership->local_group,
+                'local_profile' => (bool) $membership->local_profile,
+            ];
+        });
+        return $account;
+    }
+
+    public static function del($gid, $pid)
+    {
+        $key = self::CACHE_KEY . $gid . ':' . $pid;
+        return Cache::forget($key);
+    }
+}
diff --git a/app/Services/Groups/GroupActivityPubService.php b/app/Services/Groups/GroupActivityPubService.php
new file mode 100644
index 000000000..4c48b22c4
--- /dev/null
+++ b/app/Services/Groups/GroupActivityPubService.php
@@ -0,0 +1,311 @@
+<?php
+
+namespace App\Services\Groups;
+
+use App\Models\Group;
+use App\Models\GroupPost;
+use App\Models\GroupComment;
+use Cache;
+use Purify;
+use Illuminate\Support\Facades\Redis;
+use League\Fractal;
+use App\Util\ActivityPub\Helpers;
+use League\Fractal\Serializer\ArraySerializer;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use App\Transformer\Api\GroupPostTransformer;
+use App\Services\ActivityPubFetchService;
+use Illuminate\Support\Facades\Validator;
+use App\Rules\ValidUrl;
+
+class GroupActivityPubService
+{
+    const CACHE_KEY = 'pf:services:groups:ap:';
+
+    public static function fetchGroup($url, $saveOnFetch = true)
+    {
+        $group = Group::where('remote_url', $url)->first();
+        if($group) {
+            return $group;
+        }
+
+        $res = ActivityPubFetchService::get($url);
+        if(!$res) {
+            return $res;
+        }
+        $json = json_decode($res, true);
+        $group = self::validateGroup($json);
+        if(!$group) {
+            return false;
+        }
+        if($saveOnFetch) {
+            return self::storeGroup($group);
+        }
+        return $group;
+    }
+
+    public static function fetchGroupPost($url, $saveOnFetch = true)
+    {
+        $group = GroupPost::where('remote_url', $url)->first();
+
+        if($group) {
+            return $group;
+        }
+
+        $res = ActivityPubFetchService::get($url);
+        if(!$res) {
+            return 'invalid res';
+        }
+        $json = json_decode($res, true);
+        if(!$json) {
+            return 'invalid json';
+        }
+        if(isset($json['inReplyTo'])) {
+            $comment = self::validateGroupComment($json);
+            return self::storeGroupComment($comment);
+        }
+
+        $group = self::validateGroupPost($json);
+        if($saveOnFetch) {
+            return self::storeGroupPost($group);
+        }
+        return $group;
+    }
+
+    public static function validateGroup($obj)
+    {
+        $validator = Validator::make($obj, [
+            '@context' => 'required',
+            'id' => ['required', 'url', new ValidUrl],
+            'type' => 'required|in:Group',
+            'preferredUsername' => 'required',
+            'name' => 'required',
+            'url' => ['sometimes', 'url', new ValidUrl],
+            'inbox' => ['required', 'url', new ValidUrl],
+            'outbox' => ['required', 'url', new ValidUrl],
+            'followers' => ['required', 'url', new ValidUrl],
+            'attributedTo' => 'required',
+            'summary' => 'sometimes',
+            'publicKey' => 'required',
+            'publicKey.id' => 'required',
+            'publicKey.owner' => ['required', 'url', 'same:id', new ValidUrl],
+            'publicKey.publicKeyPem' => 'required',
+        ]);
+
+        if($validator->fails()) {
+            return false;
+        }
+
+        return $validator->validated();
+    }
+
+    public static function validateGroupPost($obj)
+    {
+        $validator = Validator::make($obj, [
+            '@context' => 'required',
+            'id' => ['required', 'url', new ValidUrl],
+            'type' => 'required|in:Page,Note',
+            'to' => 'required|array',
+            'to.*' => ['required', 'url', new ValidUrl],
+            'cc' => 'sometimes|array',
+            'cc.*' => ['sometimes', 'url', new ValidUrl],
+            'url' => ['sometimes', 'url', new ValidUrl],
+            'attributedTo' => 'required',
+            'name' => 'sometimes',
+            'target' => 'sometimes',
+            'audience' => 'sometimes',
+            'inReplyTo' => 'sometimes',
+            'content' => 'sometimes',
+            'mediaType' => 'sometimes',
+            'sensitive' => 'sometimes',
+            'attachment' => 'sometimes',
+            'published' => 'required',
+        ]);
+
+        if($validator->fails()) {
+            return false;
+        }
+
+        return $validator->validated();
+    }
+
+    public static function validateGroupComment($obj)
+    {
+        $validator = Validator::make($obj, [
+            '@context' => 'required',
+            'id' => ['required', 'url', new ValidUrl],
+            'type' => 'required|in:Note',
+            'to' => 'required|array',
+            'to.*' => ['required', 'url', new ValidUrl],
+            'cc' => 'sometimes|array',
+            'cc.*' => ['sometimes', 'url', new ValidUrl],
+            'url' => ['sometimes', 'url', new ValidUrl],
+            'attributedTo' => 'required',
+            'name' => 'sometimes',
+            'target' => 'sometimes',
+            'audience' => 'sometimes',
+            'inReplyTo' => 'sometimes',
+            'content' => 'sometimes',
+            'mediaType' => 'sometimes',
+            'sensitive' => 'sometimes',
+            'published' => 'required',
+        ]);
+
+        if($validator->fails()) {
+            return $validator->errors();
+            return false;
+        }
+
+        return $validator->validated();
+    }
+
+    public static function getGroupFromPostActivity($groupPost)
+    {
+        if(isset($groupPost['audience']) && is_string($groupPost['audience'])) {
+            return $groupPost['audience'];
+        }
+
+        if(
+            isset(
+                $groupPost['target'],
+                $groupPost['target']['type'],
+                $groupPost['target']['attributedTo']
+            ) && $groupPost['target']['type'] == 'Collection'
+        ) {
+            return $groupPost['target']['attributedTo'];
+        }
+
+        return false;
+    }
+
+    public static function getActorFromPostActivity($groupPost)
+    {
+        if(!isset($groupPost['attributedTo'])) {
+            return false;
+        }
+
+        $field = $groupPost['attributedTo'];
+
+        if(is_string($field)) {
+            return $field;
+        }
+
+        if(is_array($field) && count($field) === 1) {
+            if(
+                isset(
+                    $field[0]['id'],
+                    $field[0]['type']
+                ) &&
+                $field[0]['type'] === 'Person' &&
+                is_string($field[0]['id'])
+            ) {
+                return $field[0]['id'];
+            }
+        }
+
+        return false;
+    }
+
+    public static function getCaptionFromPostActivity($groupPost)
+    {
+        if(!isset($groupPost['name']) && isset($groupPost['content'])) {
+            return Purify::clean(strip_tags($groupPost['content']));
+        }
+
+        if(isset($groupPost['name'], $groupPost['content'])) {
+            return Purify::clean(strip_tags($groupPost['name'])) . Purify::clean(strip_tags($groupPost['content']));
+        }
+    }
+
+    public static function getSensitiveFromPostActivity($groupPost)
+    {
+        if(!isset($groupPost['sensitive'])) {
+            return true;
+        }
+
+        if(isset($groupPost['sensitive']) && !is_bool($groupPost['sensitive'])) {
+            return true;
+        }
+
+        return boolval($groupPost['sensitive']);
+    }
+
+    public static function storeGroup($activity)
+    {
+        $group = new Group;
+        $group->profile_id = null;
+        $group->category_id = 1;
+        $group->name = $activity['name'] ?? 'Untitled Group';
+        $group->description = isset($activity['summary']) ? Purify::clean($activity['summary']) : null;
+        $group->is_private = false;
+        $group->local_only = false;
+        $group->metadata = [];
+        $group->local = false;
+        $group->remote_url = $activity['id'];
+        $group->inbox_url = $activity['inbox'];
+        $group->activitypub = true;
+        $group->save();
+
+        return $group;
+    }
+
+    public static function storeGroupPost($groupPost)
+    {
+        $groupUrl = self::getGroupFromPostActivity($groupPost);
+        if(!$groupUrl) {
+            return;
+        }
+        $group = self::fetchGroup($groupUrl, true);
+        if(!$group) {
+            return;
+        }
+        $actorUrl = self::getActorFromPostActivity($groupPost);
+        $actor = Helpers::profileFetch($actorUrl);
+        $caption = self::getCaptionFromPostActivity($groupPost);
+        $sensitive = self::getSensitiveFromPostActivity($groupPost);
+        $model = GroupPost::firstOrCreate(
+            [
+                'remote_url' => $groupPost['id'],
+            ], [
+                'group_id' => $group->id,
+                'profile_id' => $actor->id,
+                'type' => 'text',
+                'caption' => $caption,
+                'visibility' => 'public',
+                'is_nsfw' => $sensitive,
+            ]
+        );
+        return $model;
+    }
+
+    public static function storeGroupComment($groupPost)
+    {
+        $groupUrl = self::getGroupFromPostActivity($groupPost);
+        if(!$groupUrl) {
+            return;
+        }
+        $group = self::fetchGroup($groupUrl, true);
+        if(!$group) {
+            return;
+        }
+        $actorUrl = self::getActorFromPostActivity($groupPost);
+        $actor = Helpers::profileFetch($actorUrl);
+        $caption = self::getCaptionFromPostActivity($groupPost);
+        $sensitive = self::getSensitiveFromPostActivity($groupPost);
+        $parentPost = self::fetchGroupPost($groupPost['inReplyTo']);
+        $model = GroupComment::firstOrCreate(
+            [
+                'remote_url' => $groupPost['id'],
+            ], [
+                'group_id' => $group->id,
+                'profile_id' => $actor->id,
+                'status_id' => $parentPost->id,
+                'type' => 'text',
+                'caption' => $caption,
+                'visibility' => 'public',
+                'is_nsfw' => $sensitive,
+                'local' => $actor->private_key != null
+            ]
+        );
+        return $model;
+    }
+}
diff --git a/app/Services/Groups/GroupCommentService.php b/app/Services/Groups/GroupCommentService.php
new file mode 100644
index 000000000..52eeee533
--- /dev/null
+++ b/app/Services/Groups/GroupCommentService.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Services\Groups;
+
+use App\Models\GroupComment;
+use Cache;
+use Illuminate\Support\Facades\Redis;
+use League\Fractal;
+use League\Fractal\Serializer\ArraySerializer;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use App\Transformer\Api\GroupPostTransformer;
+
+class GroupCommentService
+{
+    const CACHE_KEY = 'pf:services:groups:comment:';
+
+    public static function key($gid, $pid)
+    {
+        return self::CACHE_KEY . $gid . ':' . $pid;
+    }
+
+    public static function get($gid, $pid)
+    {
+        return Cache::remember(self::key($gid, $pid), 604800, function() use($gid, $pid) {
+            $gp = GroupComment::whereGroupId($gid)->find($pid);
+
+            if(!$gp) {
+                return null;
+            }
+
+            $fractal = new Fractal\Manager();
+            $fractal->setSerializer(new ArraySerializer());
+            $resource = new Fractal\Resource\Item($gp, new GroupPostTransformer());
+            $res = $fractal->createData($resource)->toArray();
+
+            $res['pf_type'] = 'group:post:comment';
+            $res['url'] = $gp->url();
+            // if($gp['type'] == 'poll') {
+            //  $status['poll'] = PollService::get($status['id']);
+            // }
+            //$status['account']['url'] = url("/groups/{$gp['group_id']}/user/{$status['account']['id']}");
+            return $res;
+        });
+    }
+
+    public static function del($gid, $pid)
+    {
+        return Cache::forget(self::key($gid, $pid));
+    }
+}
diff --git a/app/Services/Groups/GroupFeedService.php b/app/Services/Groups/GroupFeedService.php
new file mode 100644
index 000000000..a2a87be1d
--- /dev/null
+++ b/app/Services/Groups/GroupFeedService.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace App\Services\Groups;
+
+use App\Profile;
+use App\Models\Group;
+use App\Models\GroupCategory;
+use App\Models\GroupMember;
+use App\Models\GroupPost;
+use App\Models\GroupInteraction;
+use App\Models\GroupLimit;
+use App\Util\ActivityPub\Helpers;
+use Cache;
+use Purify;
+use Illuminate\Support\Facades\Redis;
+
+class GroupFeedService
+{
+    const CACHE_KEY = 'pf:services:groups:feed:';
+    const FEED_LIMIT = 400;
+
+    public static function get($gid, $start = 0, $stop = 10)
+    {
+        if($stop > 100) {
+            $stop = 100;
+        }
+
+        return Redis::zrevrange(self::CACHE_KEY . $gid, $start, $stop);
+    }
+
+    public static function getRankedMaxId($gid, $start = null, $limit = 10)
+    {
+        if(!$start) {
+            return [];
+        }
+
+        return array_keys(Redis::zrevrangebyscore(self::CACHE_KEY . $gid, $start, '-inf', [
+            'withscores' => true,
+            'limit' => [1, $limit]
+        ]));
+    }
+
+    public static function getRankedMinId($gid, $end = null, $limit = 10)
+    {
+        if(!$end) {
+            return [];
+        }
+
+        return array_keys(Redis::zrevrangebyscore(self::CACHE_KEY . $gid, '+inf', $end, [
+            'withscores' => true,
+            'limit' => [0, $limit]
+        ]));
+    }
+
+    public static function add($gid, $val)
+    {
+        if(self::count($gid) > self::FEED_LIMIT) {
+            if(config('database.redis.client') === 'phpredis') {
+                Redis::zpopmin(self::CACHE_KEY . $gid);
+            }
+        }
+
+        return Redis::zadd(self::CACHE_KEY . $gid, $val, $val);
+    }
+
+    public static function rem($gid, $val)
+    {
+        return Redis::zrem(self::CACHE_KEY . $gid, $val);
+    }
+
+    public static function del($gid, $val)
+    {
+        return self::rem($gid, $val);
+    }
+
+    public static function count($gid)
+    {
+        return Redis::zcard(self::CACHE_KEY . $gid);
+    }
+
+    public static function warmCache($gid, $force = false, $limit = 100)
+    {
+        if(self::count($gid) == 0 || $force == true) {
+            Redis::del(self::CACHE_KEY . $gid);
+            $ids = GroupPost::whereGroupId($gid)
+                ->orderByDesc('id')
+                ->limit($limit)
+                ->pluck('id');
+            foreach($ids as $id) {
+                self::add($gid, $id);
+            }
+            return 1;
+        }
+    }
+}
diff --git a/app/Services/Groups/GroupHashtagService.php b/app/Services/Groups/GroupHashtagService.php
new file mode 100644
index 000000000..6553850f0
--- /dev/null
+++ b/app/Services/Groups/GroupHashtagService.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Services\Groups;
+
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Redis;
+use Illuminate\Support\Str;
+use App\Models\GroupHashtag;
+use App\Models\GroupPostHashtag;
+
+class GroupHashtagService
+{
+    const CACHE_KEY = 'pf:services:groups-v1:hashtags:';
+
+    public static function get($id)
+    {
+        return Cache::remember(self::CACHE_KEY . $id, 3600, function() use($id) {
+            $tag = GroupHashtag::find($id);
+            if(!$tag) {
+                return [];
+            }
+            return [
+                'name' => $tag->name,
+                'slug' => Str::slug($tag->name),
+            ];
+        });
+    }
+}
diff --git a/app/Services/Groups/GroupMediaService.php b/app/Services/Groups/GroupMediaService.php
new file mode 100644
index 000000000..0200e3a56
--- /dev/null
+++ b/app/Services/Groups/GroupMediaService.php
@@ -0,0 +1,114 @@
+<?php
+
+namespace App\Services\Groups;
+
+use Cache;
+use Illuminate\Support\Str;
+use Illuminate\Support\Facades\Redis;
+use Illuminate\Support\Facades\Storage;
+use App\Models\GroupMedia;
+use App\Profile;
+use App\Status;
+use League\Fractal;
+use League\Fractal\Serializer\ArraySerializer;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use App\Services\HashidService;
+
+class GroupMediaService
+{
+    const CACHE_KEY = 'groups:media:';
+
+    public static function path($gid, $pid, $sid = false)
+    {
+        if(!$gid || !$pid) {
+            return;
+        }
+        $groupHashid = HashidService::encode($gid);
+        $monthHash = HashidService::encode(date('Y').date('n'));
+        $pid = HashidService::encode($pid);
+        $sid = $sid ? HashidService::encode($sid) : false;
+        $path = $sid ?
+            "public/g1/{$groupHashid}/{$pid}/{$monthHash}/{$sid}" :
+            "public/g1/{$groupHashid}/{$pid}/{$monthHash}";
+        return $path;
+    }
+
+    public static function get($statusId)
+    {
+        return Cache::remember(self::CACHE_KEY.$statusId, 21600, function() use($statusId) {
+            $media = GroupMedia::whereStatusId($statusId)->orderBy('order')->get();
+            if(!$media) {
+                return [];
+            }
+            $medias = $media->map(function($media) {
+                return [
+                    'id'            => (string) $media->id,
+                    'type'          => 'Document',
+                    'url'           => $media->url(),
+                    'preview_url'   => $media->url(),
+                    'remote_url'    => $media->url,
+                    'description'   => $media->cw_summary,
+                    'blurhash'      => $media->blurhash ?? 'U4Rfzst8?bt7ogayj[j[~pfQ9Goe%Mj[WBay'
+                ];
+            });
+            return $medias->toArray();
+        });
+    }
+
+    public static function getMastodon($id)
+    {
+        $media = self::get($id);
+        if(!$media) {
+            return [];
+        }
+        $medias = collect($media)
+        ->map(function($media) {
+            $mime = $media['mime'] ? explode('/', $media['mime']) : false;
+            unset(
+                $media['optimized_url'],
+                $media['license'],
+                $media['is_nsfw'],
+                $media['orientation'],
+                $media['filter_name'],
+                $media['filter_class'],
+                $media['mime'],
+                $media['hls_manifest']
+            );
+
+            $media['type'] = $mime ? strtolower($mime[0]) : 'unknown';
+            return $media;
+        })
+        ->filter(function($m) {
+            return $m && isset($m['url']);
+        })
+        ->values();
+
+        return $medias->toArray();
+    }
+
+    public static function del($statusId)
+    {
+        return Cache::forget(self::CACHE_KEY . $statusId);
+    }
+
+    public static function activitypub($statusId)
+    {
+        $status = self::get($statusId);
+        if(!$status) {
+            return [];
+        }
+
+        return collect($status)->map(function($s) {
+            $license = isset($s['license']) && $s['license']['title'] ? $s['license']['title'] : null;
+            return [
+                'type'      => 'Document',
+                'mediaType' => $s['mime'],
+                'url'       => $s['url'],
+                'name'      => $s['description'],
+                'summary'   => $s['description'],
+                'blurhash'  => $s['blurhash'],
+                'license'   => $license
+            ];
+        });
+    }
+}
diff --git a/app/Services/Groups/GroupPostService.php b/app/Services/Groups/GroupPostService.php
new file mode 100644
index 000000000..a043be134
--- /dev/null
+++ b/app/Services/Groups/GroupPostService.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace App\Services\Groups;
+
+use App\Models\GroupPost;
+use Cache;
+use Illuminate\Support\Facades\Redis;
+use League\Fractal;
+use League\Fractal\Serializer\ArraySerializer;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use App\Transformer\Api\GroupPostTransformer;
+
+class GroupPostService
+{
+    const CACHE_KEY = 'pf:services:groups:post:';
+
+    public static function key($gid, $pid)
+    {
+        return self::CACHE_KEY . $gid . ':' . $pid;
+    }
+
+    public static function get($gid, $pid)
+    {
+        return Cache::remember(self::key($gid, $pid), 604800, function() use($gid, $pid) {
+            $gp = GroupPost::whereGroupId($gid)->find($pid);
+
+            if(!$gp) {
+                return null;
+            }
+
+            $fractal = new Fractal\Manager();
+            $fractal->setSerializer(new ArraySerializer());
+            $resource = new Fractal\Resource\Item($gp, new GroupPostTransformer());
+            $res = $fractal->createData($resource)->toArray();
+
+            $res['pf_type'] = $gp['type'];
+            $res['url'] = $gp->url();
+            // if($gp['type'] == 'poll') {
+            //  $status['poll'] = PollService::get($status['id']);
+            // }
+            //$status['account']['url'] = url("/groups/{$gp['group_id']}/user/{$status['account']['id']}");
+            return $res;
+        });
+    }
+
+    public static function del($gid, $pid)
+    {
+        return Cache::forget(self::key($gid, $pid));
+    }
+
+    public function getStatus(Request $request)
+    {
+        $gid = $request->input('gid');
+        $sid = $request->input('sid');
+        $pid = optional($request->user())->profile_id ?? false;
+
+        $group = Group::findOrFail($gid);
+
+        if($group->is_private) {
+            abort_if(!$group->isMember($pid), 404);
+        }
+
+        $gp = GroupPost::whereGroupId($group->id)->whereId($sid)->firstOrFail();
+
+        $status = GroupPostService::get($gp['group_id'], $gp['id']);
+        if(!$status) {
+            return false;
+        }
+        $status['reply_count'] = $gp['reply_count'];
+        $status['favourited'] = (bool) GroupsLikeService::liked($pid, $gp['id']);
+        $status['favourites_count'] = GroupsLikeService::count($gp['id']);
+        $status['pf_type'] = $gp['type'];
+        $status['visibility'] = 'public';
+        $status['url'] = $gp->url();
+        $status['account']['url'] = url("/groups/{$gp->group_id}/user/{$gp->profile_id}");
+
+        // if($gp['type'] == 'poll') {
+        //     $status['poll'] = PollService::get($status['id']);
+        // }
+
+        return $status;
+    }
+}
diff --git a/app/Services/Groups/GroupsLikeService.php b/app/Services/Groups/GroupsLikeService.php
new file mode 100644
index 000000000..e2daa1e71
--- /dev/null
+++ b/app/Services/Groups/GroupsLikeService.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Services\Groups;
+
+use App\Util\ActivityPub\Helpers;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Redis;
+use App\Models\GroupLike;
+
+class GroupsLikeService
+{
+    const CACHE_KEY = 'pf:services:group-likes:ids:';
+    const CACHE_SET_KEY = 'pf:services:group-likes:set:';
+    const CACHE_POST_KEY = 'pf:services:group-likes:count:';
+
+    public static function add($profileId, $statusId)
+    {
+        $key = self::CACHE_KEY . $profileId . ':' . $statusId;
+        Cache::increment(self::CACHE_POST_KEY . $statusId);
+        //Cache::forget('pf:services:likes:liked_by:'.$statusId);
+        self::setAdd($profileId, $statusId);
+        return Cache::put($key, true, 86400);
+    }
+
+    public static function setAdd($profileId, $statusId)
+    {
+        if(self::setCount($profileId) > 400) {
+            Redis::zpopmin(self::CACHE_SET_KEY . $profileId);
+        }
+
+        return Redis::zadd(self::CACHE_SET_KEY . $profileId, $statusId, $statusId);
+    }
+
+    public static function setCount($id)
+    {
+        return Redis::zcard(self::CACHE_SET_KEY . $id);
+    }
+
+    public static function setRem($profileId, $val)
+    {
+        return Redis::zrem(self::CACHE_SET_KEY . $profileId, $val);
+    }
+
+    public static function get($profileId, $start = 0, $stop = 10)
+    {
+        if($stop > 100) {
+            $stop = 100;
+        }
+
+        return Redis::zrevrange(self::CACHE_SET_KEY . $profileId, $start, $stop);
+    }
+
+    public static function remove($profileId, $statusId)
+    {
+        $key = self::CACHE_KEY . $profileId . ':' . $statusId;
+        Cache::decrement(self::CACHE_POST_KEY . $statusId);
+        //Cache::forget('pf:services:likes:liked_by:'.$statusId);
+        self::setRem($profileId, $statusId);
+        return Cache::put($key, false, 86400);
+    }
+
+    public static function liked($profileId, $statusId)
+    {
+        $key = self::CACHE_KEY . $profileId . ':' . $statusId;
+        return Cache::remember($key, 900, function() use($profileId, $statusId) {
+            return GroupLike::whereProfileId($profileId)->whereStatusId($statusId)->exists();
+        });
+    }
+
+    public static function likedBy($status)
+    {
+        $empty = [
+            'username' => null,
+            'others' => false
+        ];
+
+        return $empty;
+    }
+
+    public static function count($id)
+    {
+        return Cache::get(self::CACHE_POST_KEY . $id, 0);
+    }
+
+}
diff --git a/app/Services/HashidService.php b/app/Services/HashidService.php
index 914d24321..e12c10599 100644
--- a/app/Services/HashidService.php
+++ b/app/Services/HashidService.php
@@ -2,54 +2,38 @@
 
 namespace App\Services;
 
-use Cache;
+class HashidService
+{
+    public const CMAP = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_';
 
-class HashidService {
+    public static function encode($id, $minLimit = true)
+    {
+        if (! is_numeric($id) || $id > PHP_INT_MAX) {
+            return null;
+        }
 
-	public const MIN_LIMIT = 15;
-	public const CMAP = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_';
+        $cmap = self::CMAP;
+        $base = strlen($cmap);
+        $shortcode = '';
+        while ($id) {
+            $id = ($id - ($r = $id % $base)) / $base;
+            $shortcode = $cmap[$r].$shortcode;
+        }
 
-	public static function encode($id, $minLimit = true)
-	{
-		if(!is_numeric($id) || $id > PHP_INT_MAX) {
-			return null;
-		}
+        return $shortcode;
+    }
 
-		if($minLimit && strlen($id) < self::MIN_LIMIT) {
-			return null;
-		}
-
-		$key = "hashids:{$id}";
-		return Cache::remember($key, now()->hours(48), function() use($id) {
-			$cmap = self::CMAP;
-			$base = strlen($cmap);
-			$shortcode = '';
-			while($id) {
-				$id = ($id - ($r = $id % $base)) / $base;
-				$shortcode = $cmap[$r] . $shortcode;
-			}
-			return $shortcode;
-		});
-	}
-
-	public static function decode($short)
-	{
-		$len = strlen($short);
-		if($len < 3 || $len > 11) {
-			return null;
-		}
-		$id = 0;
-		foreach(str_split($short) as $needle) {
-			$pos = strpos(self::CMAP, $needle);
-			// if(!$pos) {
-			// 	return null;
-			// }
-			$id = ($id*64) + $pos;
-		}
-		if(strlen($id) < self::MIN_LIMIT) {
-			return null;
-		}
-		return $id;
-	}
+    public static function decode($short = false)
+    {
+        if (! $short) {
+            return;
+        }
+        $id = 0;
+        foreach (str_split($short) as $needle) {
+            $pos = strpos(self::CMAP, $needle);
+            $id = ($id * 64) + $pos;
+        }
 
+        return $id;
+    }
 }
diff --git a/app/Services/HashtagFollowService.php b/app/Services/HashtagFollowService.php
new file mode 100644
index 000000000..d4f93f404
--- /dev/null
+++ b/app/Services/HashtagFollowService.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace App\Services;
+
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Redis;
+use App\Hashtag;
+use App\StatusHashtag;
+use App\HashtagFollow;
+
+class HashtagFollowService
+{
+	const FOLLOW_KEY = 'pf:services:hashtag-follows:v1:';
+	const CACHE_KEY = 'pf:services:hfs:byHid:';
+	const CACHE_WARMED = 'pf:services:hfs:wc:byHid';
+
+	public static function getPidByHid($hid)
+	{
+		if(!self::isWarm($hid)) {
+			return self::warmCache($hid);
+		}
+		return self::get($hid);
+	}
+
+	public static function unfollow($hid, $pid)
+	{
+		return Redis::zrem(self::CACHE_KEY . $hid, $pid);
+	}
+
+	public static function add($hid, $pid)
+	{
+		return Redis::zadd(self::CACHE_KEY . $hid, $pid, $pid);
+	}
+
+	public static function rem($hid, $pid)
+	{
+		return Redis::zrem(self::CACHE_KEY . $hid, $pid);
+	}
+
+	public static function get($hid)
+	{
+		return Redis::zrange(self::CACHE_KEY . $hid, 0, -1);
+	}
+
+	public static function count($hid)
+	{
+		return Redis::zcard(self::CACHE_KEY . $hid);
+	}
+
+	public static function warmCache($hid)
+	{
+		foreach(HashtagFollow::whereHashtagId($hid)->lazyById(20, 'id') as $h) {
+			if($h) {
+				self::add($h->hashtag_id, $h->profile_id);
+			}
+		}
+
+		self::setWarm($hid);
+
+		return self::get($hid);
+	}
+
+	public static function isWarm($hid)
+	{
+		return Redis::zcount(self::CACHE_KEY . $hid, 0, -1) ?? Redis::zscore(self::CACHE_WARMED, $hid) != null;
+	}
+
+	public static function setWarm($hid)
+	{
+		return Redis::zadd(self::CACHE_WARMED, $hid, $hid);
+	}
+}
diff --git a/app/Services/HashtagRelatedService.php b/app/Services/HashtagRelatedService.php
new file mode 100644
index 000000000..b96483987
--- /dev/null
+++ b/app/Services/HashtagRelatedService.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Services;
+
+use DB;
+use App\StatusHashtag;
+use App\Models\HashtagRelated;
+
+class HashtagRelatedService
+{
+    public static function get($id)
+    {
+        $tag = HashtagRelated::whereHashtagId($id)->first();
+        if(!$tag) {
+            return [];
+        }
+        return $tag->related_tags;
+    }
+
+    public static function fetchRelatedTags($tag)
+    {
+        $res = StatusHashtag::query()
+            ->select('h2.name', DB::raw('COUNT(*) as related_count'))
+            ->join('status_hashtags as hs2', function ($join) {
+                $join->on('status_hashtags.status_id', '=', 'hs2.status_id')
+                     ->whereRaw('status_hashtags.hashtag_id != hs2.hashtag_id');
+            })
+            ->join('hashtags as h1', 'status_hashtags.hashtag_id', '=', 'h1.id')
+            ->join('hashtags as h2', 'hs2.hashtag_id', '=', 'h2.id')
+            ->where('h1.name', '=', $tag)
+            ->groupBy('h2.name')
+            ->orderBy('related_count', 'desc')
+            ->limit(30)
+            ->get();
+
+        return $res;
+    }
+}
diff --git a/app/Services/HashtagService.php b/app/Services/HashtagService.php
index 87f895a65..84fd1986b 100644
--- a/app/Services/HashtagService.php
+++ b/app/Services/HashtagService.php
@@ -8,65 +8,80 @@ use App\Hashtag;
 use App\StatusHashtag;
 use App\HashtagFollow;
 
-class HashtagService {
+class HashtagService
+{
+    const FOLLOW_KEY = 'pf:services:hashtag:following:v1:';
+    const FOLLOW_PIDS_KEY = 'pf:services:hashtag-follows:v1:';
 
-	const FOLLOW_KEY = 'pf:services:hashtag:following:';
+    public static function get($id)
+    {
+        return Cache::remember('services:hashtag:by_id:' . $id, 3600, function() use($id) {
+            $tag = Hashtag::find($id);
+            if(!$tag) {
+                return [];
+            }
+            return [
+                'name' => $tag->name,
+                'slug' => $tag->slug,
+            ];
+        });
+    }
 
-	public static function get($id)
-	{
-		return Cache::remember('services:hashtag:by_id:' . $id, 3600, function() use($id) {
-			$tag = Hashtag::find($id);
-			if(!$tag) {
-				return [];
-			}
-			return [
-				'name' => $tag->name,
-				'slug' => $tag->slug,
-			];
-		});
-	}
+    public static function count($id)
+    {
+        return Cache::remember('services:hashtag:total-count:by_id:' . $id, 300, function() use($id) {
+            $tag = Hashtag::find($id);
+            return $tag ? $tag->cached_count ?? 0 : 0;
+        });
+    }
 
-	public static function count($id)
-	{
-		return Cache::remember('services:hashtag:public-count:by_id:' . $id, 86400, function() use($id) {
-			return StatusHashtag::whereHashtagId($id)->whereStatusVisibility('public')->count();
-		});
-	}
+    public static function isFollowing($pid, $hid)
+    {
+        $res = Redis::zscore(self::FOLLOW_KEY . $hid, $pid);
+        if($res) {
+            return true;
+        }
 
-	public static function isFollowing($pid, $hid)
-	{
-		$res = Redis::zscore(self::FOLLOW_KEY . $pid, $hid);
-		if($res) {
-			return true;
-		}
+        $synced = Cache::get(self::FOLLOW_KEY . 'acct:' . $pid . ':synced');
+        if(!$synced) {
+            $tags = HashtagFollow::whereProfileId($pid)
+                ->get()
+                ->each(function($tag) use($pid) {
+                    self::follow($pid, $tag->hashtag_id);
+                });
+            Cache::set(self::FOLLOW_KEY . 'acct:' . $pid . ':synced', true, 1209600);
 
-		$synced = Cache::get(self::FOLLOW_KEY . $pid . ':synced');
-		if(!$synced) {
-			$tags = HashtagFollow::whereProfileId($pid)
-				->get()
-				->each(function($tag) use($pid) {
-					self::follow($pid, $tag->hashtag_id);
-				});
-			Cache::set(self::FOLLOW_KEY . $pid . ':synced', true, 1209600);
+            return (bool) Redis::zscore(self::FOLLOW_KEY . $hid, $pid) >= 1;
+        }
 
-			return (bool) Redis::zscore(self::FOLLOW_KEY . $pid, $hid) > 1;
-		}
+        return false;
+    }
 
-		return false;
-	}
+    public static function follow($pid, $hid)
+    {
+    	Cache::forget(self::FOLLOW_PIDS_KEY . $hid);
+        return Redis::zadd(self::FOLLOW_KEY . $hid, $pid, $pid);
+    }
 
-	public static function follow($pid, $hid)
-	{
-		return Redis::zadd(self::FOLLOW_KEY . $pid, $hid, $hid);
-	}
+    public static function unfollow($pid, $hid)
+    {
+    	Cache::forget(self::FOLLOW_PIDS_KEY . $hid);
+        return Redis::zrem(self::FOLLOW_KEY . $hid, $pid);
+    }
 
-	public static function unfollow($pid, $hid)
-	{
-		return Redis::zrem(self::FOLLOW_KEY . $pid, $hid);
-	}
+    public static function following($hid, $start = 0, $limit = 10)
+    {
+        $synced = Cache::get(self::FOLLOW_KEY . 'acct-following:' . $hid . ':synced');
+        if(!$synced) {
+            $tags = HashtagFollow::whereHashtagId($hid)
+                ->get()
+                ->each(function($tag) use($hid) {
+                    self::follow($tag->profile_id, $hid);
+                });
+            Cache::set(self::FOLLOW_KEY . 'acct-following:' . $hid . ':synced', true, 1209600);
 
-	public static function following($pid, $start = 0, $limit = 10)
-	{
-		return Redis::zrevrange(self::FOLLOW_KEY . $pid, $start, $limit);
-	}
+            return Redis::zrevrange(self::FOLLOW_KEY . $hid, $start, $limit);
+        }
+        return Redis::zrevrange(self::FOLLOW_KEY . $hid, $start, $limit);
+    }
 }
diff --git a/app/Services/HomeTimelineService.php b/app/Services/HomeTimelineService.php
new file mode 100644
index 000000000..08d990591
--- /dev/null
+++ b/app/Services/HomeTimelineService.php
@@ -0,0 +1,114 @@
+<?php
+
+namespace App\Services;
+
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Redis;
+use App\Follower;
+use App\Status;
+use App\Models\UserDomainBlock;
+
+class HomeTimelineService
+{
+    const CACHE_KEY = 'pf:services:timeline:home:';
+    const FOLLOWER_FEED_POST_LIMIT = 10;
+
+    public static function get($id, $start = 0, $stop = 10)
+    {
+        if($stop > 100) {
+            $stop = 100;
+        }
+
+        return Redis::zrevrange(self::CACHE_KEY . $id, $start, $stop);
+    }
+
+    public static function getRankedMaxId($id, $start = null, $limit = 10)
+    {
+        if(!$start) {
+            return [];
+        }
+
+        return array_keys(Redis::zrevrangebyscore(self::CACHE_KEY . $id, $start, '-inf', [
+            'withscores' => true,
+            'limit' => [1, $limit - 1]
+        ]));
+    }
+
+    public static function getRankedMinId($id, $end = null, $limit = 10)
+    {
+        if(!$end) {
+            return [];
+        }
+
+        return array_keys(Redis::zrevrangebyscore(self::CACHE_KEY . $id, '+inf', $end, [
+            'withscores' => true,
+            'limit' => [0, $limit]
+        ]));
+    }
+
+    public static function add($id, $val)
+    {
+        if(self::count($id) >= 400) {
+            Redis::zpopmin(self::CACHE_KEY . $id);
+        }
+
+        return Redis::zadd(self::CACHE_KEY .$id, $val, $val);
+    }
+
+    public static function rem($id, $val)
+    {
+        return Redis::zrem(self::CACHE_KEY . $id, $val);
+    }
+
+    public static function count($id)
+    {
+        return Redis::zcard(self::CACHE_KEY . $id);
+    }
+
+    public static function warmCache($id, $force = false, $limit = 100, $returnIds = false)
+    {
+        if(self::count($id) == 0 || $force == true) {
+            Redis::del(self::CACHE_KEY . $id);
+            $following = Cache::remember('profile:following:'.$id, 1209600, function() use($id) {
+                $following = Follower::whereProfileId($id)->pluck('following_id');
+                return $following->push($id)->toArray();
+            });
+
+            $minId = SnowflakeService::byDate(now()->subMonths(6));
+
+            $filters = UserFilterService::filters($id);
+
+            if($filters && count($filters)) {
+                $following = array_diff($following, $filters);
+            }
+
+            $domainBlocks = UserDomainBlock::whereProfileId($id)->pluck('domain')->toArray();
+
+            $ids = Status::where('id', '>', $minId)
+                ->whereIn('profile_id', $following)
+                ->whereNull(['in_reply_to_id', 'reblog_of_id'])
+                ->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])
+                ->whereIn('visibility',['public', 'unlisted', 'private'])
+                ->orderByDesc('id')
+                ->limit($limit)
+                ->pluck('id');
+
+            foreach($ids as $pid) {
+                $status = StatusService::get($pid, false);
+                if(!$status || !isset($status['account'], $status['url'])) {
+                    continue;
+                }
+                if($domainBlocks && count($domainBlocks)) {
+                    $domain = strtolower(parse_url($status['url'], PHP_URL_HOST));
+                    if(in_array($domain, $domainBlocks)) {
+                        continue;
+                    }
+                }
+                self::add($id, $pid);
+            }
+
+            return $returnIds ? $ids : 1;
+        }
+        return 0;
+    }
+}
diff --git a/app/Services/InstanceService.php b/app/Services/InstanceService.php
index 2ad991063..0a6255ad2 100644
--- a/app/Services/InstanceService.php
+++ b/app/Services/InstanceService.php
@@ -2,76 +2,86 @@
 
 namespace App\Services;
 
-use Cache;
 use App\Instance;
 use App\Util\Blurhash\Blurhash;
-use App\Services\ConfigCacheService;
+use Cache;
 
 class InstanceService
 {
     const CACHE_KEY_BY_DOMAIN = 'pf:services:instance:by_domain:';
-	const CACHE_KEY_BANNED_DOMAINS = 'instances:banned:domains';
-	const CACHE_KEY_UNLISTED_DOMAINS = 'instances:unlisted:domains';
-	const CACHE_KEY_NSFW_DOMAINS = 'instances:auto_cw:domains';
-	const CACHE_KEY_STATS = 'pf:services:instances:stats';
-	const CACHE_KEY_BANNER_BLURHASH = 'pf:services:instance:header-blurhash:v1';
 
-	public function __construct()
-	{
-		ini_set('memory_limit', config('pixelfed.memory_limit', '1024M'));
-	}
+    const CACHE_KEY_BANNED_DOMAINS = 'instances:banned:domains';
 
-	public static function getByDomain($domain)
-	{
-		return Cache::remember(self::CACHE_KEY_BY_DOMAIN.$domain, 3600, function() use($domain) {
-			return Instance::whereDomain($domain)->first();
-		});
-	}
+    const CACHE_KEY_UNLISTED_DOMAINS = 'instances:unlisted:domains';
 
-	public static function getBannedDomains()
-	{
-		return Cache::remember(self::CACHE_KEY_BANNED_DOMAINS, 1209600, function() {
-			return Instance::whereBanned(true)->pluck('domain')->toArray();
-		});
-	}
+    const CACHE_KEY_NSFW_DOMAINS = 'instances:auto_cw:domains';
 
-	public static function getUnlistedDomains()
-	{
-		return Cache::remember(self::CACHE_KEY_UNLISTED_DOMAINS, 1209600, function() {
-			return Instance::whereUnlisted(true)->pluck('domain')->toArray();
-		});
-	}
+    const CACHE_KEY_STATS = 'pf:services:instances:stats';
 
-	public static function getNsfwDomains()
-	{
-		return Cache::remember(self::CACHE_KEY_NSFW_DOMAINS, 1209600, function() {
-			return Instance::whereAutoCw(true)->pluck('domain')->toArray();
-		});
-	}
+    const CACHE_KEY_TOTAL_POSTS = 'pf:services:instances:self:total-posts';
 
-	public static function software($domain)
-	{
-		$key = 'instances:software:' . strtolower($domain);
-		return Cache::remember($key, 86400, function() use($domain) {
-			$instance = Instance::whereDomain($domain)->first();
-			if(!$instance) {
-				return;
-			}
-			return $instance->software;
-		});
-	}
+    const CACHE_KEY_BANNER_BLURHASH = 'pf:services:instance:header-blurhash:v1';
 
-	public static function stats()
-	{
-		return Cache::remember(self::CACHE_KEY_STATS, 86400, function() {
-			return [
-				'total_count' => Instance::count(),
-				'new_count' => Instance::where('created_at', '>', now()->subDays(14))->count(),
-				'banned_count' => Instance::whereBanned(true)->count(),
-				'nsfw_count' => Instance::whereAutoCw(true)->count()
-			];
-		});
-	}
+    const CACHE_KEY_API_PEERS_LIST = 'pf:services:instance:api:peers:list:v0';
+
+    public function __construct()
+    {
+        ini_set('memory_limit', config('pixelfed.memory_limit', '1024M'));
+    }
+
+    public static function getByDomain($domain)
+    {
+        return Cache::remember(self::CACHE_KEY_BY_DOMAIN.$domain, 3600, function () use ($domain) {
+            return Instance::whereDomain($domain)->first();
+        });
+    }
+
+    public static function getBannedDomains()
+    {
+        return Cache::remember(self::CACHE_KEY_BANNED_DOMAINS, 1209600, function () {
+            return Instance::whereBanned(true)->pluck('domain')->toArray();
+        });
+    }
+
+    public static function getUnlistedDomains()
+    {
+        return Cache::remember(self::CACHE_KEY_UNLISTED_DOMAINS, 1209600, function () {
+            return Instance::whereUnlisted(true)->pluck('domain')->toArray();
+        });
+    }
+
+    public static function getNsfwDomains()
+    {
+        return Cache::remember(self::CACHE_KEY_NSFW_DOMAINS, 1209600, function () {
+            return Instance::whereAutoCw(true)->pluck('domain')->toArray();
+        });
+    }
+
+    public static function software($domain)
+    {
+        $key = 'instances:software:'.strtolower($domain);
+
+        return Cache::remember($key, 86400, function () use ($domain) {
+            $instance = Instance::whereDomain($domain)->first();
+            if (! $instance) {
+                return;
+            }
+
+            return $instance->software;
+        });
+    }
+
+    public static function stats()
+    {
+        return Cache::remember(self::CACHE_KEY_STATS, 86400, function () {
+            return [
+                'total_count' => Instance::count(),
+                'new_count' => Instance::where('created_at', '>', now()->subDays(14))->count(),
+                'banned_count' => Instance::whereBanned(true)->count(),
+                'nsfw_count' => Instance::whereAutoCw(true)->count(),
+            ];
+        });
+    }
 
     public static function refresh()
     {
@@ -79,6 +89,7 @@ class InstanceService
         Cache::forget(self::CACHE_KEY_UNLISTED_DOMAINS);
         Cache::forget(self::CACHE_KEY_NSFW_DOMAINS);
         Cache::forget(self::CACHE_KEY_STATS);
+        Cache::forget(self::CACHE_KEY_API_PEERS_LIST);
 
         self::getBannedDomains();
         self::getUnlistedDomains();
@@ -87,52 +98,57 @@ class InstanceService
         return true;
     }
 
+    public static function totalLocalStatuses()
+    {
+        return config_cache('instance.stats.total_local_posts');
+    }
+
     public static function headerBlurhash()
     {
-    	return Cache::rememberForever(self::CACHE_KEY_BANNER_BLURHASH, function() {
-    		if(str_ends_with(config_cache('app.banner_image'), 'headers/default.jpg')) {
-    			return 'UzJR]l{wHZRjM}R%XRkCH?X9xaWEjZj]kAjt';
-    		}
-    		$cached = config_cache('instance.banner.blurhash');
+        return Cache::rememberForever(self::CACHE_KEY_BANNER_BLURHASH, function () {
+            if (str_ends_with(config_cache('app.banner_image'), 'headers/default.jpg')) {
+                return 'UzJR]l{wHZRjM}R%XRkCH?X9xaWEjZj]kAjt';
+            }
+            $cached = config_cache('instance.banner.blurhash');
 
-    		if($cached) {
-    			return $cached;
-    		}
+            if ($cached) {
+                return $cached;
+            }
 
-			$file = config_cache('app.banner_image') ?? url(Storage::url('public/headers/default.jpg'));
+            $file = config_cache('app.banner_image') ?? url(Storage::url('public/headers/default.jpg'));
 
-			$image = imagecreatefromstring(file_get_contents($file));
-			if(!$image) {
-				return 'UzJR]l{wHZRjM}R%XRkCH?X9xaWEjZj]kAjt';
-			}
-			$width = imagesx($image);
-			$height = imagesy($image);
+            $image = imagecreatefromstring(file_get_contents($file));
+            if (! $image) {
+                return 'UzJR]l{wHZRjM}R%XRkCH?X9xaWEjZj]kAjt';
+            }
+            $width = imagesx($image);
+            $height = imagesy($image);
 
-			$pixels = [];
-			for ($y = 0; $y < $height; ++$y) {
-				$row = [];
-				for ($x = 0; $x < $width; ++$x) {
-					$index = imagecolorat($image, $x, $y);
-					$colors = imagecolorsforindex($image, $index);
+            $pixels = [];
+            for ($y = 0; $y < $height; $y++) {
+                $row = [];
+                for ($x = 0; $x < $width; $x++) {
+                    $index = imagecolorat($image, $x, $y);
+                    $colors = imagecolorsforindex($image, $index);
 
-					$row[] = [$colors['red'], $colors['green'], $colors['blue']];
-				}
-				$pixels[] = $row;
-			}
+                    $row[] = [$colors['red'], $colors['green'], $colors['blue']];
+                }
+                $pixels[] = $row;
+            }
 
-			// Free the allocated GdImage object from memory:
-			imagedestroy($image);
+            // Free the allocated GdImage object from memory:
+            imagedestroy($image);
 
-			$components_x = 4;
-			$components_y = 4;
-			$blurhash = Blurhash::encode($pixels, $components_x, $components_y);
-			if(strlen($blurhash) > 191) {
-				return 'UzJR]l{wHZRjM}R%XRkCH?X9xaWEjZj]kAjt';
-			}
+            $components_x = 4;
+            $components_y = 4;
+            $blurhash = Blurhash::encode($pixels, $components_x, $components_y);
+            if (strlen($blurhash) > 191) {
+                return 'UzJR]l{wHZRjM}R%XRkCH?X9xaWEjZj]kAjt';
+            }
 
-			ConfigCacheService::put('instance.banner.blurhash', $blurhash);
+            ConfigCacheService::put('instance.banner.blurhash', $blurhash);
 
-			return $blurhash;
-    	});
+            return $blurhash;
+        });
     }
 }
diff --git a/app/Services/Internal/BeagleService.php b/app/Services/Internal/BeagleService.php
new file mode 100644
index 000000000..0f284e93c
--- /dev/null
+++ b/app/Services/Internal/BeagleService.php
@@ -0,0 +1,135 @@
+<?php
+
+namespace App\Services\Internal;
+
+use App\Services\InstanceService;
+use App\Services\StatusService;
+use App\Util\ActivityPub\Helpers;
+use Illuminate\Http\Client\ConnectionException;
+use Illuminate\Http\Client\RequestException;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Http;
+
+class BeagleService
+{
+    const DEFAULT_RULES_CACHE_KEY = 'pf:services:beagle:default_rules:v1';
+
+    const DISCOVER_CACHE_KEY = 'pf:services:beagle:discover:v1';
+
+    const DISCOVER_POSTS_CACHE_KEY = 'pf:services:beagle:discover-posts:v1';
+
+    public static function getDefaultRules()
+    {
+        return Cache::remember(self::DEFAULT_RULES_CACHE_KEY, now()->addDays(7), function () {
+            try {
+                $res = Http::withOptions(['allow_redirects' => false])
+                    ->timeout(5)
+                    ->connectTimeout(5)
+                    ->retry(2, 500)
+                    ->get('https://beagle.pixelfed.net/api/v1/common/suggestions/rules');
+            } catch (RequestException $e) {
+                return;
+            } catch (ConnectionException $e) {
+                return;
+            } catch (Exception $e) {
+                return;
+            }
+
+            if (! $res->ok()) {
+                return;
+            }
+
+            $json = $res->json();
+
+            if (! isset($json['rule_suggestions']) || ! count($json['rule_suggestions'])) {
+                return [];
+            }
+
+            return $json['rule_suggestions'];
+        });
+    }
+
+    public static function getDiscover()
+    {
+        if ((bool) config_cache('federation.activitypub.enabled') == false) {
+            return [];
+        }
+
+        if ((bool) config('instance.discover.beagle_api') == false) {
+            return [];
+        }
+
+        return Cache::remember(self::DISCOVER_CACHE_KEY, now()->addHours(6), function () {
+            try {
+                $res = Http::withOptions(['allow_redirects' => false])
+                    ->withHeaders([
+                        'X-Pixelfed-Api' => 1,
+                    ])->timeout(5)
+                    ->connectTimeout(5)
+                    ->retry(2, 500)
+                    ->get('https://beagle.pixelfed.net/api/v1/discover');
+            } catch (RequestException $e) {
+                return;
+            } catch (ConnectionException $e) {
+                return;
+            } catch (Exception $e) {
+                return;
+            }
+
+            if (! $res->ok()) {
+                return;
+            }
+
+            $json = $res->json();
+
+            if (! isset($json['statuses']) || ! count($json['statuses'])) {
+                return [];
+            }
+
+            return $json['statuses'];
+        });
+    }
+
+    public static function getDiscoverPosts()
+    {
+        if ((bool) config_cache('federation.activitypub.enabled') == false) {
+            return [];
+        }
+
+        if ((bool) config('instance.discover.beagle_api') == false) {
+            return [];
+        }
+
+        return Cache::remember(self::DISCOVER_POSTS_CACHE_KEY, now()->addHours(1), function () {
+            $posts = collect(self::getDiscover())
+                ->filter(function ($post) {
+                    $bannedInstances = InstanceService::getBannedDomains();
+                    $domain = parse_url($post['id'], PHP_URL_HOST);
+
+                    return ! in_array($domain, $bannedInstances);
+                })
+                ->map(function ($post) {
+                    $domain = parse_url($post['id'], PHP_URL_HOST);
+                    if ($domain === config_cache('pixelfed.domain.app')) {
+                        $parts = explode('/', $post['id']);
+                        $id = array_last($parts);
+
+                        return StatusService::get($id);
+                    }
+
+                    $post = Helpers::statusFetch($post['id']);
+                    if (! $post) {
+                        return;
+                    }
+                    $id = $post->id;
+
+                    return StatusService::get($id);
+                })
+                ->filter()
+                ->values()
+                ->toArray();
+
+            return $posts;
+        });
+    }
+}
diff --git a/app/Services/Internal/SoftwareUpdateService.php b/app/Services/Internal/SoftwareUpdateService.php
new file mode 100644
index 000000000..492596bf7
--- /dev/null
+++ b/app/Services/Internal/SoftwareUpdateService.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Services\Internal;
+
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Http;
+use Illuminate\Http\Client\ConnectionException;
+use Illuminate\Http\Client\RequestException;
+
+class SoftwareUpdateService
+{
+    const CACHE_KEY = 'pf:services:software-update:';
+
+    public static function cacheKey()
+    {
+        return self::CACHE_KEY . 'latest:v1.0.0';
+    }
+
+    public static function get()
+    {
+        $curVersion = config('pixelfed.version');
+
+        $versions = Cache::remember(self::cacheKey(), 1800, function() {
+            return self::fetchLatest();
+        });
+
+        if(!$versions || !isset($versions['latest'], $versions['latest']['version'])) {
+            $hideWarning = (bool) config('instance.software-update.disable_failed_warning');
+            return [
+                'current' => $curVersion,
+                'latest' => [
+                    'version' => null,
+                    'published_at' => null,
+                    'url' => null,
+                ],
+                'running_latest' => $hideWarning ? true : null
+            ];
+        }
+
+        return [
+            'current' => $curVersion,
+            'latest' => [
+                'version' => $versions['latest']['version'],
+                'published_at' => $versions['latest']['published_at'],
+                'url' => $versions['latest']['url'],
+            ],
+            'running_latest' => strval($versions['latest']['version']) === strval($curVersion)
+        ];
+    }
+
+    public static function fetchLatest()
+    {
+        try {
+            $res = Http::withOptions(['allow_redirects' => false])
+                ->timeout(5)
+                ->connectTimeout(5)
+                ->retry(2, 500)
+                ->get('https://versions.pixelfed.org/versions.json');
+        } catch (RequestException $e) {
+            return;
+        } catch (ConnectionException $e) {
+            return;
+        } catch (Exception $e) {
+            return;
+        }
+
+        if(!$res->ok()) {
+            return;
+        }
+
+        return $res->json();
+    }
+}
diff --git a/app/Services/LandingService.php b/app/Services/LandingService.php
index ba16af5b6..d6180771d 100644
--- a/app/Services/LandingService.php
+++ b/app/Services/LandingService.php
@@ -2,102 +2,101 @@
 
 namespace App\Services;
 
-use App\Util\ActivityPub\Helpers;
-use Illuminate\Support\Str;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Redis;
-use App\Status;
 use App\User;
-use App\Services\AccountService;
 use App\Util\Site\Nodeinfo;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Str;
 
 class LandingService
 {
-	public static function get($json = true)
-	{
-		$activeMonth = Nodeinfo::activeUsersMonthly();
+    public static function get($json = true)
+    {
+        $activeMonth = Nodeinfo::activeUsersMonthly();
 
-		$totalUsers = Cache::remember('api:nodeinfo:users', 43200, function() {
-			return User::count();
-		});
+        $totalUsers = Cache::remember('api:nodeinfo:users', 43200, function () {
+            return User::count();
+        });
 
-		$postCount = Cache::remember('api:nodeinfo:statuses', 21600, function() {
-			return Status::whereLocal(true)->count();
-		});
+        $postCount = InstanceService::totalLocalStatuses();
 
-		$contactAccount = 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;
-		});
+        $contactAccount = 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();
 
-		$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() : [];
-		});
+            return $admin && isset($admin->profile_id) ?
+                AccountService::getMastodon($admin->profile_id, true) :
+                null;
+        });
 
-		$res = [
-			'name' => config_cache('app.name'),
-			'url' => config_cache('app.url'),
-			'domain' => config('pixelfed.domain.app'),
-			'show_directory' => config_cache('instance.landing.show_directory'),
-			'show_explore_feed' => config_cache('instance.landing.show_explore'),
-			'open_registration' => config_cache('pixelfed.open_registration') == 1,
-			'version' => config('pixelfed.version'),
-			'about' => [
-				'banner_image' => config_cache('app.banner_image') ?? url('/storage/headers/default.jpg'),
-				'short_description' => config_cache('app.short_description'),
-				'description' => config_cache('app.description'),
-			],
-			'stats' => [
-				'active_users' => (int) $activeMonth,
-				'posts_count' => (int) $postCount,
-				'total_users' => (int) $totalUsers
-			],
-			'contact' => [
-				'account' => $contactAccount,
-				'email' => config('instance.email')
-			],
-			'rules' => $rules,
-			'uploader' => [
-				'max_photo_size' => (int) (config('pixelfed.max_photo_size') * 1024),
-				'max_caption_length' => (int) config('pixelfed.max_caption_length'),
-				'max_altext_length' => (int) config('pixelfed.max_altext_length', 150),
-				'album_limit' => (int) config_cache('pixelfed.max_album_length'),
-				'image_quality' => (int) config_cache('pixelfed.image_quality'),
-				'max_collection_length' => (int) config('pixelfed.max_collection_length', 18),
-				'optimize_image' => (bool) config('pixelfed.optimize_image'),
-				'optimize_video' => (bool) config('pixelfed.optimize_video'),
-				'media_types' => config_cache('pixelfed.media_types'),
-			],
-			'features' => [
-				'federation' => config_cache('federation.activitypub.enabled'),
-				'timelines' => [
-					'local' => true,
-					'network' => (bool) config('federation.network_timeline'),
-				],
-				'mobile_apis' => (bool) config_cache('pixelfed.oauth_enabled'),
-				'stories' => (bool) config_cache('instance.stories.enabled'),
-				'video'	=> Str::contains(config_cache('pixelfed.media_types'), 'video/mp4'),
-			]
-		];
+        $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;
 
-		if($json) {
-			return json_encode($res);
-		}
+                        return [
+                            'id' => "{$id}",
+                            'text' => $rule,
+                        ];
+                    })
+                    ->toArray() : [];
+        });
 
-		return $res;
-	}
+        $openReg = (bool) config_cache('pixelfed.open_registration');
+
+        $res = [
+            'name' => config_cache('app.name'),
+            'url' => config_cache('app.url'),
+            'domain' => config('pixelfed.domain.app'),
+            'show_directory' => (bool) config_cache('instance.landing.show_directory'),
+            'show_explore_feed' => (bool) config_cache('instance.landing.show_explore'),
+            'open_registration' => (bool) $openReg,
+            'curated_onboarding' => (bool) config_cache('instance.curated_registration.enabled'),
+            'version' => config('pixelfed.version'),
+            'about' => [
+                'banner_image' => config_cache('app.banner_image') ?? url('/storage/headers/default.jpg'),
+                'short_description' => config_cache('app.short_description'),
+                'description' => config_cache('app.description'),
+            ],
+            'stats' => [
+                'active_users' => (int) $activeMonth,
+                'posts_count' => (int) $postCount,
+                'total_users' => (int) $totalUsers,
+            ],
+            'contact' => [
+                'account' => $contactAccount,
+                'email' => config('instance.email'),
+            ],
+            'rules' => $rules,
+            'uploader' => [
+                'max_photo_size' => (int) (config_cache('pixelfed.max_photo_size') * 1024),
+                'max_caption_length' => (int) config_cache('pixelfed.max_caption_length'),
+                'max_altext_length' => (int) config_cache('pixelfed.max_altext_length', 150),
+                'album_limit' => (int) config_cache('pixelfed.max_album_length'),
+                'image_quality' => (int) config_cache('pixelfed.image_quality'),
+                'max_collection_length' => (int) config('pixelfed.max_collection_length', 18),
+                'optimize_image' => (bool) config_cache('pixelfed.optimize_image'),
+                'optimize_video' => (bool) config_cache('pixelfed.optimize_video'),
+                'media_types' => config_cache('pixelfed.media_types'),
+            ],
+            'features' => [
+                'federation' => (bool) config_cache('federation.activitypub.enabled'),
+                'timelines' => [
+                    'local' => true,
+                    'network' => (bool) config_cache('federation.network_timeline'),
+                ],
+                'mobile_apis' => (bool) config_cache('pixelfed.oauth_enabled'),
+                'stories' => (bool) config_cache('instance.stories.enabled'),
+                'video' => Str::contains(config_cache('pixelfed.media_types'), 'video/mp4'),
+            ],
+        ];
+
+        if ($json) {
+            return json_encode($res);
+        }
+
+        return $res;
+    }
 }
diff --git a/app/Services/MarkerService.php b/app/Services/MarkerService.php
index 6b407b567..130f0b017 100644
--- a/app/Services/MarkerService.php
+++ b/app/Services/MarkerService.php
@@ -13,7 +13,7 @@ class MarkerService
 		return Cache::get(self::CACHE_KEY . $timeline . ':' . $profileId);
 	}
 
-	public static function set($profileId, $timeline = 'home', $entityId)
+	public static function set($profileId, $timeline = 'home', $entityId = false)
 	{
 		$existing = self::get($profileId, $timeline);
 		$key = self::CACHE_KEY . $timeline . ':' . $profileId;
diff --git a/app/Services/MediaStorageService.php b/app/Services/MediaStorageService.php
index 128001de2..87bb9a586 100644
--- a/app/Services/MediaStorageService.php
+++ b/app/Services/MediaStorageService.php
@@ -2,277 +2,321 @@
 
 namespace App\Services;
 
+use App\Jobs\AvatarPipeline\AvatarStorageCleanup;
+use App\Jobs\MediaPipeline\MediaDeletePipeline;
+use App\Media;
 use App\Util\ActivityPub\Helpers;
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\RequestException;
 use Illuminate\Http\File;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Redis;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
-use App\Media;
-use App\Profile;
-use App\User;
-use GuzzleHttp\Client;
-use App\Services\AccountService;
-use App\Http\Controllers\AvatarController;
-use GuzzleHttp\Exception\RequestException;
-use App\Jobs\MediaPipeline\MediaDeletePipeline;
-use Illuminate\Support\Arr;
-use App\Jobs\AvatarPipeline\AvatarStorageCleanup;
 
-class MediaStorageService {
+class MediaStorageService
+{
+    public static function store(Media $media)
+    {
+        if ((bool) config_cache('pixelfed.cloud_storage') == true) {
+            (new self())->cloudStore($media);
+        }
 
-	public static function store(Media $media)
-	{
-		if(config_cache('pixelfed.cloud_storage') == true) {
-			(new self())->cloudStore($media);
-		}
+    }
 
-		return;
-	}
+    public static function move(Media $media)
+    {
+        if ($media->remote_media) {
+            return;
+        }
 
-	public static function avatar($avatar, $local = false, $skipRecentCheck = false)
-	{
-		return (new self())->fetchAvatar($avatar, $local, $skipRecentCheck);
-	}
+        if ((bool) config_cache('pixelfed.cloud_storage') == true) {
+            return (new self())->cloudMove($media);
+        }
 
-	public static function head($url)
-	{
-		$c = new Client();
-		try {
-			$r = $c->request('HEAD', $url);
-		} catch (RequestException $e) {
-			return false;
-		}
+    }
 
-        $h = Arr::mapWithKeys($r->getHeaders(), function($item, $key) {
+    public static function avatar($avatar, $local = false, $skipRecentCheck = false)
+    {
+        return (new self())->fetchAvatar($avatar, $local, $skipRecentCheck);
+    }
+
+    public static function head($url)
+    {
+        $c = new Client();
+        try {
+            $r = $c->request('HEAD', $url);
+        } catch (RequestException $e) {
+            return false;
+        }
+
+        $h = Arr::mapWithKeys($r->getHeaders(), function ($item, $key) {
             return [strtolower($key) => last($item)];
         });
 
-        if(!isset($h['content-length'], $h['content-type'])) {
+        if (! isset($h['content-length'], $h['content-type'])) {
             return false;
         }
 
         $len = (int) $h['content-length'];
         $mime = $h['content-type'];
 
-		if($len < 10 || $len > ((config_cache('pixelfed.max_photo_size') * 1000))) {
-			return false;
-		}
+        if ($len < 10 || $len > ((config_cache('pixelfed.max_photo_size') * 1000))) {
+            return false;
+        }
 
-		return [
-			'length' => $len,
-			'mime' => $mime
-		];
-	}
+        return [
+            'length' => $len,
+            'mime' => $mime,
+        ];
+    }
 
-	protected function cloudStore($media)
-	{
-		if($media->remote_media == true) {
-			if(config('media.storage.remote.cloud')) {
-				(new self())->remoteToCloud($media);
-			}
-		} else {
-			(new self())->localToCloud($media);
-		}
-	}
+    protected function cloudStore($media)
+    {
+        if ($media->remote_media == true) {
+            if (config('media.storage.remote.cloud')) {
+                (new self())->remoteToCloud($media);
+            }
+        } else {
+            (new self())->localToCloud($media);
+        }
+    }
 
-	protected function localToCloud($media)
-	{
-		$path = storage_path('app/'.$media->media_path);
-		$thumb = storage_path('app/'.$media->thumbnail_path);
+    protected function localToCloud($media)
+    {
+        $path = storage_path('app/'.$media->media_path);
+        $thumb = storage_path('app/'.$media->thumbnail_path);
 
-		$p = explode('/', $media->media_path);
-		$name = array_pop($p);
-		$pt = explode('/', $media->thumbnail_path);
-		$thumbname = array_pop($pt);
-		$storagePath = implode('/', $p);
+        $p = explode('/', $media->media_path);
+        $name = array_pop($p);
+        $pt = explode('/', $media->thumbnail_path);
+        $thumbname = array_pop($pt);
+        $storagePath = implode('/', $p);
 
-		$url = ResilientMediaStorageService::store($storagePath, $path, $name);
-		if($thumb) {
-			$thumbUrl = ResilientMediaStorageService::store($storagePath, $thumb, $thumbname);
-			$media->thumbnail_url = $thumbUrl;
-		}
-		$media->cdn_url = $url;
-		$media->optimized_url = $url;
-		$media->replicated_at = now();
-		$media->save();
-		if($media->status_id) {
-			Cache::forget('status:transformer:media:attachments:' . $media->status_id);
-			MediaService::del($media->status_id);
-			StatusService::del($media->status_id, false);
-		}
-	}
+        $url = ResilientMediaStorageService::store($storagePath, $path, $name);
+        if ($thumb) {
+            $thumbUrl = ResilientMediaStorageService::store($storagePath, $thumb, $thumbname);
+            $media->thumbnail_url = $thumbUrl;
+        }
+        $media->cdn_url = $url;
+        $media->optimized_url = $url;
+        $media->replicated_at = now();
+        $media->save();
+        if ($media->status_id) {
+            Cache::forget('status:transformer:media:attachments:'.$media->status_id);
+            MediaService::del($media->status_id);
+            StatusService::del($media->status_id, false);
+        }
+    }
 
-	protected function remoteToCloud($media)
-	{
-		$url = $media->remote_url;
+    protected function remoteToCloud($media)
+    {
+        $url = $media->remote_url;
 
-		if(!Helpers::validateUrl($url)) {
-			return;
-		}
+        if (! Helpers::validateUrl($url)) {
+            return;
+        }
 
-		$head = $this->head($media->remote_url);
+        $head = $this->head($media->remote_url);
 
-		if(!$head) {
-			return;
-		}
+        if (! $head) {
+            return;
+        }
 
-		$mimes = [
-			'image/jpeg',
-			'image/png',
-			'video/mp4'
-		];
+        $mimes = [
+            'image/jpeg',
+            'image/png',
+            'video/mp4',
+        ];
 
-		$mime = $head['mime'];
-		$max_size = (int) config_cache('pixelfed.max_photo_size') * 1000;
-		$media->size = $head['length'];
-		$media->remote_media = true;
-		$media->save();
+        $mime = $head['mime'];
+        $max_size = (int) config_cache('pixelfed.max_photo_size') * 1000;
+        $media->size = $head['length'];
+        $media->remote_media = true;
+        $media->save();
 
-		if(!in_array($mime, $mimes)) {
-			return;
-		}
+        if (! in_array($mime, $mimes)) {
+            return;
+        }
 
-		if($head['length'] >= $max_size) {
-			return;
-		}
+        if ($head['length'] >= $max_size) {
+            return;
+        }
 
-		switch ($mime) {
-			case 'image/png':
-				$ext = '.png';
-				break;
+        switch ($mime) {
+            case 'image/png':
+                $ext = '.png';
+                break;
 
-			case 'image/gif':
-				$ext = '.gif';
-				break;
+            case 'image/gif':
+                $ext = '.gif';
+                break;
 
-			case 'image/jpeg':
-				$ext = '.jpg';
-				break;
+            case 'image/jpeg':
+                $ext = '.jpg';
+                break;
 
-			case 'video/mp4':
-				$ext = '.mp4';
-				break;
-		}
+            case 'video/mp4':
+                $ext = '.mp4';
+                break;
+        }
 
-		$base = MediaPathService::get($media->profile);
-		$path = Str::random(40) . $ext;
-		$tmpBase = storage_path('app/remcache/');
-		$tmpPath = $media->profile_id . '-' . $path;
-		$tmpName = $tmpBase . $tmpPath;
-		$data = file_get_contents($url, false, null, 0, $head['length']);
-		file_put_contents($tmpName, $data);
-		$hash = hash_file('sha256', $tmpName);
+        $base = MediaPathService::get($media->profile);
+        $path = Str::random(40).$ext;
+        $tmpBase = storage_path('app/remcache/');
+        $tmpPath = $media->profile_id.'-'.$path;
+        $tmpName = $tmpBase.$tmpPath;
+        $data = file_get_contents($url, false, null, 0, $head['length']);
+        file_put_contents($tmpName, $data);
+        $hash = hash_file('sha256', $tmpName);
 
-		$disk = Storage::disk(config('filesystems.cloud'));
-		$file = $disk->putFileAs($base, new File($tmpName), $path, 'public');
-		$permalink = $disk->url($file);
+        $disk = Storage::disk(config('filesystems.cloud'));
+        $file = $disk->putFileAs($base, new File($tmpName), $path, 'public');
+        $permalink = $disk->url($file);
 
-		$media->media_path = $file;
-		$media->cdn_url = $permalink;
-		$media->original_sha256 = $hash;
-		$media->replicated_at = now();
-		$media->save();
+        $media->media_path = $file;
+        $media->cdn_url = $permalink;
+        $media->original_sha256 = $hash;
+        $media->replicated_at = now();
+        $media->save();
 
-		if($media->status_id) {
-			Cache::forget('status:transformer:media:attachments:' . $media->status_id);
-		}
+        if ($media->status_id) {
+            Cache::forget('status:transformer:media:attachments:'.$media->status_id);
+        }
 
-		unlink($tmpName);
-	}
+        unlink($tmpName);
+    }
 
-	protected function fetchAvatar($avatar, $local = false, $skipRecentCheck = false)
-	{
-		$queue = random_int(1, 15) > 5 ? 'mmo' : 'low';
-		$url = $avatar->remote_url;
-		$driver = $local ? 'local' : config('filesystems.cloud');
+    protected function fetchAvatar($avatar, $local = false, $skipRecentCheck = false)
+    {
+        $queue = random_int(1, 15) > 5 ? 'mmo' : 'low';
+        $url = $avatar->remote_url;
+        $driver = $local ? 'local' : config('filesystems.cloud');
 
-		if(empty($url) || Helpers::validateUrl($url) == false) {
-			return;
-		}
+        if (empty($url) || Helpers::validateUrl($url) == false) {
+            return;
+        }
 
-		$head = $this->head($url);
+        $head = $this->head($url);
 
-		if($head == false) {
-			return;
-		}
+        if ($head == false) {
+            return;
+        }
 
-		$mimes = [
-			'application/octet-stream',
-			'image/jpeg',
-			'image/png',
-		];
+        $mimes = [
+            'application/octet-stream',
+            'image/jpeg',
+            'image/png',
+        ];
 
-		$mime = $head['mime'];
-		$max_size = (int) config('pixelfed.max_avatar_size') * 1000;
+        $mime = $head['mime'];
+        $max_size = (int) config('pixelfed.max_avatar_size') * 1000;
 
-		if(!$skipRecentCheck) {
-			if($avatar->last_fetched_at && $avatar->last_fetched_at->gt(now()->subMonths(3))) {
-				return;
-			}
-		}
+        if (! $skipRecentCheck) {
+            if ($avatar->last_fetched_at && $avatar->last_fetched_at->gt(now()->subMonths(3))) {
+                return;
+            }
+        }
 
-		Cache::forget('avatar:' . $avatar->profile_id);
-		AccountService::del($avatar->profile_id);
+        Cache::forget('avatar:'.$avatar->profile_id);
+        AccountService::del($avatar->profile_id);
 
-		// handle pleroma edge case
-		if(Str::endsWith($mime, '; charset=utf-8')) {
-			$mime = str_replace('; charset=utf-8', '', $mime);
-		}
+        // handle pleroma edge case
+        if (Str::endsWith($mime, '; charset=utf-8')) {
+            $mime = str_replace('; charset=utf-8', '', $mime);
+        }
 
-		if(!in_array($mime, $mimes)) {
-			return;
-		}
+        if (! in_array($mime, $mimes)) {
+            return;
+        }
 
-		if($head['length'] >= $max_size) {
-			return;
-		}
+        if ($head['length'] >= $max_size) {
+            return;
+        }
 
-		$base = ($local ? 'public/cache/' : 'cache/') . 'avatars/' . $avatar->profile_id;
-		$ext = $head['mime'] == 'image/jpeg' ? 'jpg' : 'png';
-		$path = 'avatar_' . strtolower(Str::random(random_int(3,6))) . '.' . $ext;
-		$tmpBase = storage_path('app/remcache/');
-		$tmpPath = 'avatar_' . $avatar->profile_id . '-' . $path;
-		$tmpName = $tmpBase . $tmpPath;
-		$data = @file_get_contents($url, false, null, 0, $head['length']);
-		if(!$data) {
-			return;
-		}
-		file_put_contents($tmpName, $data);
+        $base = ($local ? 'public/cache/' : 'cache/').'avatars/'.$avatar->profile_id;
+        $ext = $head['mime'] == 'image/jpeg' ? 'jpg' : 'png';
+        $path = 'avatar_'.strtolower(Str::random(random_int(3, 6))).'.'.$ext;
+        $tmpBase = storage_path('app/remcache/');
+        $tmpPath = 'avatar_'.$avatar->profile_id.'-'.$path;
+        $tmpName = $tmpBase.$tmpPath;
+        $data = @file_get_contents($url, false, null, 0, $head['length']);
+        if (! $data) {
+            return;
+        }
+        file_put_contents($tmpName, $data);
 
-		$mimeCheck = Storage::mimeType('remcache/' . $tmpPath);
+        $mimeCheck = Storage::mimeType('remcache/'.$tmpPath);
 
-		if(!$mimeCheck || !in_array($mimeCheck, ['image/png', 'image/jpeg'])) {
-			$avatar->last_fetched_at = now();
-			$avatar->save();
-			unlink($tmpName);
-			return;
-		}
+        if (! $mimeCheck || ! in_array($mimeCheck, ['image/png', 'image/jpeg'])) {
+            $avatar->last_fetched_at = now();
+            $avatar->save();
+            unlink($tmpName);
 
-		$disk = Storage::disk($driver);
-		$file = $disk->putFileAs($base, new File($tmpName), $path, 'public');
-		$permalink = $disk->url($file);
+            return;
+        }
 
-		$avatar->media_path = $base . '/' . $path;
-		$avatar->is_remote = true;
-		$avatar->cdn_url = $local ? config('app.url') . $permalink : $permalink;
-		$avatar->size = $head['length'];
-		$avatar->change_count = $avatar->change_count + 1;
-		$avatar->last_fetched_at = now();
-		$avatar->save();
+        $disk = Storage::disk($driver);
+        $file = $disk->putFileAs($base, new File($tmpName), $path, 'public');
+        $permalink = $disk->url($file);
 
-		Cache::forget('avatar:' . $avatar->profile_id);
-		AccountService::del($avatar->profile_id);
-		AvatarStorageCleanup::dispatch($avatar)->onQueue($queue)->delay(now()->addMinutes(random_int(3, 15)));
+        $avatar->media_path = $base.'/'.$path;
+        $avatar->is_remote = true;
+        $avatar->cdn_url = $local ? config('app.url').$permalink : $permalink;
+        $avatar->size = $head['length'];
+        $avatar->change_count = $avatar->change_count + 1;
+        $avatar->last_fetched_at = now();
+        $avatar->save();
 
-		unlink($tmpName);
-	}
+        Cache::forget('avatar:'.$avatar->profile_id);
+        AccountService::del($avatar->profile_id);
+        AvatarStorageCleanup::dispatch($avatar)->onQueue($queue)->delay(now()->addMinutes(random_int(3, 15)));
 
-	public static function delete(Media $media, $confirm = false)
-	{
-		if(!$confirm) {
-			return;
-		}
-		MediaDeletePipeline::dispatch($media)->onQueue('mmo');
-	}
+        unlink($tmpName);
+    }
+
+    public static function delete(Media $media, $confirm = false)
+    {
+        if (! $confirm) {
+            return;
+        }
+        MediaDeletePipeline::dispatch($media)->onQueue('mmo');
+    }
+
+    protected function cloudMove($media)
+    {
+        if (! Storage::exists($media->media_path)) {
+            return 'invalid file';
+        }
+
+        $path = storage_path('app/'.$media->media_path);
+        $thumb = false;
+        if ($media->thumbnail_path) {
+            $thumb = storage_path('app/'.$media->thumbnail_path);
+            $pt = explode('/', $media->thumbnail_path);
+            $thumbname = array_pop($pt);
+        }
+
+        $p = explode('/', $media->media_path);
+        $name = array_pop($p);
+        $storagePath = implode('/', $p);
+
+        $url = ResilientMediaStorageService::store($storagePath, $path, $name);
+        if ($thumb) {
+            $thumbUrl = ResilientMediaStorageService::store($storagePath, $thumb, $thumbname);
+            $media->thumbnail_url = $thumbUrl;
+        }
+        $media->cdn_url = $url;
+        $media->optimized_url = $url;
+        $media->replicated_at = now();
+        $media->save();
+
+        if ($media->status_id) {
+            Cache::forget('status:transformer:media:attachments:'.$media->status_id);
+            MediaService::del($media->status_id);
+            StatusService::del($media->status_id, false);
+        }
+
+        return 'success';
+    }
 }
diff --git a/app/Services/NodeinfoService.php b/app/Services/NodeinfoService.php
index 10575ff9f..d0de127e6 100644
--- a/app/Services/NodeinfoService.php
+++ b/app/Services/NodeinfoService.php
@@ -2,29 +2,31 @@
 
 namespace App\Services;
 
-use Illuminate\Support\Str;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Http\Client\RequestException;
 use Illuminate\Http\Client\ConnectionException;
+use Illuminate\Http\Client\RequestException;
+use Illuminate\Support\Facades\Http;
 
 class NodeinfoService
 {
     public static function get($domain)
     {
-    	$version = config('pixelfed.version');
-		$appUrl = config('app.url');
-		$headers = [
-			'Accept'     => 'application/json',
-			'User-Agent' => "(Pixelfed/{$version}; +{$appUrl})",
-		];
+        $version = config('pixelfed.version');
+        $appUrl = config('app.url');
+        $headers = [
+            'Accept' => 'application/json',
+            'User-Agent' => "(Pixelfed/{$version}; +{$appUrl})",
+        ];
 
-        $url = 'https://' . $domain;
-        $wk = $url . '/.well-known/nodeinfo';
+        $url = 'https://'.$domain;
+        $wk = $url.'/.well-known/nodeinfo';
 
         try {
-            $res = Http::withHeaders($headers)
-            ->timeout(5)
-            ->get($wk);
+            $res = Http::withOptions([
+                'allow_redirects' => false,
+            ])
+                ->withHeaders($headers)
+                ->timeout(5)
+                ->get($wk);
         } catch (RequestException $e) {
             return false;
         } catch (ConnectionException $e) {
@@ -33,18 +35,18 @@ class NodeinfoService
             return false;
         }
 
-        if(!$res) {
+        if (! $res) {
             return false;
         }
 
         $json = $res->json();
 
-        if( !isset($json['links'])) {
+        if (! isset($json['links'])) {
             return false;
         }
 
-        if(is_array($json['links'])) {
-            if(isset($json['links']['href'])) {
+        if (is_array($json['links'])) {
+            if (isset($json['links']['href'])) {
                 $href = $json['links']['href'];
             } else {
                 $href = $json['links'][0]['href'];
@@ -56,14 +58,17 @@ class NodeinfoService
         $domain = parse_url($url, PHP_URL_HOST);
         $hrefDomain = parse_url($href, PHP_URL_HOST);
 
-        if($domain !== $hrefDomain) {
-            return 60;
+        if ($domain !== $hrefDomain) {
+            return false;
         }
 
         try {
-            $res = Http::withHeaders($headers)
-            ->timeout(5)
-            ->get($href);
+            $res = Http::withOptions([
+                'allow_redirects' => false,
+            ])
+                ->withHeaders($headers)
+                ->timeout(5)
+                ->get($href);
         } catch (RequestException $e) {
             return false;
         } catch (ConnectionException $e) {
@@ -71,6 +76,7 @@ class NodeinfoService
         } catch (\Exception $e) {
             return false;
         }
+
         return $res->json();
     }
 }
diff --git a/app/Services/NotificationAppGatewayService.php b/app/Services/NotificationAppGatewayService.php
new file mode 100644
index 000000000..c22d2c2e2
--- /dev/null
+++ b/app/Services/NotificationAppGatewayService.php
@@ -0,0 +1,125 @@
+<?php
+
+namespace App\Services;
+
+use Cache;
+use Exception;
+use Illuminate\Http\Client\RequestException;
+use Illuminate\Support\Facades\Http;
+
+class NotificationAppGatewayService
+{
+    const GATEWAY_SUPPORT_CHECK = 'px:nags:gateway-support-check';
+
+    public static function config()
+    {
+        return config('instance.notifications.nag');
+    }
+
+    public static function enabled()
+    {
+        if ((bool) config('instance.notifications.nag.enabled') === false) {
+            return false;
+        }
+
+        $apiKey = config('instance.notifications.nag.api_key');
+        if (! $apiKey || empty($apiKey) || strlen($apiKey) !== 45) {
+            return false;
+        }
+
+        return Cache::remember(self::GATEWAY_SUPPORT_CHECK, 43200, function () {
+            return self::checkServerSupport();
+        });
+    }
+
+    public static function checkServerSupport()
+    {
+        $endpoint = 'https://'.config('instance.notifications.nag.endpoint').'/api/v1/instance-check?domain='.config('pixelfed.domain.app');
+        try {
+            $res = Http::withHeaders(['X-PIXELFED-API' => 1])
+                ->retry(3, 500)
+                ->throw()
+                ->get($endpoint);
+
+            $data = $res->json();
+        } catch (RequestException $e) {
+            return false;
+        } catch (Exception $e) {
+            return false;
+        }
+
+        if ($res->successful() && isset($data['active']) && $data['active'] === true) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public static function forceSupportRecheck()
+    {
+        Cache::forget(self::GATEWAY_SUPPORT_CHECK);
+
+        return self::enabled();
+    }
+
+    public static function isValidExpoPushToken($token)
+    {
+        if (! $token || empty($token)) {
+            return false;
+        }
+
+        if (str_starts_with($token, 'ExponentPushToken[') && mb_strlen($token) < 26) {
+            return false;
+        }
+
+        if (! str_starts_with($token, 'ExponentPushToken[') && ! str_starts_with($token, 'ExpoPushToken[')) {
+            return false;
+        }
+
+        if (! str_ends_with($token, ']')) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public static function send($userToken, $type, $actor = '')
+    {
+        if (! self::enabled()) {
+            return false;
+        }
+
+        if (! $userToken || empty($userToken) || ! self::isValidExpoPushToken($userToken)) {
+            return false;
+        }
+
+        $types = PushNotificationService::NOTIFY_TYPES;
+
+        if (! $type || empty($type) || ! in_array($type, $types)) {
+            return false;
+        }
+
+        $apiKey = config('instance.notifications.nag.api_key');
+
+        if (! $apiKey || empty($apiKey)) {
+            return false;
+        }
+        $url = 'https://'.config('instance.notifications.nag.endpoint').'/api/v1/relay/deliver';
+
+        try {
+            $response = Http::withToken($apiKey)
+                ->withHeaders(['X-PIXELFED-API' => 1])
+                ->post($url, [
+                    'token' => $userToken,
+                    'type' => $type,
+                    'actor' => $actor,
+                ]);
+
+            $response->throw();
+        } catch (RequestException $e) {
+            return;
+        } catch (Exception $e) {
+            return;
+        }
+    }
+}
diff --git a/app/Services/NotificationService.php b/app/Services/NotificationService.php
index d088c2015..9ee0d77fc 100644
--- a/app/Services/NotificationService.php
+++ b/app/Services/NotificationService.php
@@ -2,297 +2,324 @@
 
 namespace App\Services;
 
+use App\Jobs\InternalPipeline\NotificationEpochUpdatePipeline;
+use App\Notification;
+use App\Transformer\Api\NotificationTransformer;
 use Cache;
 use Illuminate\Support\Facades\Redis;
-use App\{
-	Notification,
-	Profile
-};
-use App\Transformer\Api\NotificationTransformer;
 use League\Fractal;
 use League\Fractal\Serializer\ArraySerializer;
-use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 
-class NotificationService {
+class NotificationService
+{
+    const CACHE_KEY = 'pf:services:notifications:ids:';
 
-	const CACHE_KEY = 'pf:services:notifications:ids:';
-	const EPOCH_CACHE_KEY = 'pf:services:notifications:epoch-id:by-months:';
-	const ITEM_CACHE_TTL = 86400;
-	const MASTODON_TYPES = [
-		'follow',
-		'follow_request',
-		'mention',
-		'reblog',
-		'favourite',
-		'poll',
-		'status'
-	];
+    const EPOCH_CACHE_KEY = 'pf:services:notifications:epoch-id:by-months:';
 
-	public static function get($id, $start = 0, $stop = 400)
-	{
-		$res = collect([]);
-		$key = self::CACHE_KEY . $id;
-		$stop = $stop > 400 ? 400 : $stop;
-		$ids = Redis::zrangebyscore($key, $start, $stop);
-		if(empty($ids)) {
-			$ids = self::coldGet($id, $start, $stop);
-		}
-		foreach($ids as $id) {
-			$n = self::getNotification($id);
-			if($n != null) {
-				$res->push($n);
-			}
-		}
-		return $res;
-	}
+    const ITEM_CACHE_TTL = 86400;
 
-	public static function getEpochId($months = 6)
-	{
-		return Cache::remember(self::EPOCH_CACHE_KEY . $months, 1209600, function() use($months) {
-            if(Notification::count() === 0) {
-                return 0;
+    const MASTODON_TYPES = [
+        'follow',
+        'follow_request',
+        'mention',
+        'reblog',
+        'favourite',
+        'poll',
+        'status',
+    ];
+
+    public static function get($id, $start = 0, $stop = 400)
+    {
+        $res = collect([]);
+        $key = self::CACHE_KEY.$id;
+        $stop = $stop > 400 ? 400 : $stop;
+        $ids = Redis::zrangebyscore($key, $start, $stop);
+        if (empty($ids)) {
+            $ids = self::coldGet($id, $start, $stop);
+        }
+        foreach ($ids as $id) {
+            $n = self::getNotification($id);
+            if ($n != null) {
+                $res->push($n);
             }
-			return Notification::where('created_at', '>', now()->subMonths($months))->first()->id;
-		});
-	}
+        }
 
-	public static function coldGet($id, $start = 0, $stop = 400)
-	{
-		$stop = $stop > 400 ? 400 : $stop;
-		$ids = Notification::where('id', '>', self::getEpochId())
-			->where('profile_id', $id)
-			->orderByDesc('id')
-			->skip($start)
-			->take($stop)
-			->pluck('id');
-		foreach($ids as $key) {
-			self::set($id, $key);
-		}
-		return $ids;
-	}
+        return $res;
+    }
 
-	public static function getMax($id = false, $start = 0, $limit = 10)
-	{
-		$ids = self::getRankedMaxId($id, $start, $limit);
+    public static function getEpochId($months = 6)
+    {
+        $epoch = Cache::get(self::EPOCH_CACHE_KEY.$months);
+        if (! $epoch) {
+            NotificationEpochUpdatePipeline::dispatch();
 
-		if(empty($ids)) {
-			return [];
-		}
+            return 1;
+        }
 
-		$res = collect([]);
-		foreach($ids as $id) {
-			$n = self::getNotification($id);
-			if($n != null) {
-				$res->push($n);
-			}
-		}
-		return $res->toArray();
-	}
+        return $epoch;
+    }
 
-	public static function getMin($id = false, $start = 0, $limit = 10)
-	{
-		$ids = self::getRankedMinId($id, $start, $limit);
+    public static function coldGet($id, $start = 0, $stop = 400)
+    {
+        $stop = $stop > 400 ? 400 : $stop;
+        $ids = Notification::where('id', '>', self::getEpochId())
+            ->where('profile_id', $id)
+            ->orderByDesc('id')
+            ->skip($start)
+            ->take($stop)
+            ->pluck('id');
+        foreach ($ids as $key) {
+            self::set($id, $key);
+        }
 
-		if(empty($ids)) {
-			return [];
-		}
+        return $ids;
+    }
 
-		$res = collect([]);
-		foreach($ids as $id) {
-			$n = self::getNotification($id);
-			if($n != null) {
-				$res->push($n);
-			}
-		}
-		return $res->toArray();
-	}
+    public static function getMax($id = false, $start = 0, $limit = 10)
+    {
+        $ids = self::getRankedMaxId($id, $start, $limit);
 
+        if (empty($ids)) {
+            return [];
+        }
 
-	public static function getMaxMastodon($id = false, $start = 0, $limit = 10)
-	{
-		$ids = self::getRankedMaxId($id, $start, $limit);
+        $res = collect([]);
+        foreach ($ids as $id) {
+            $n = self::getNotification($id);
+            if ($n != null) {
+                $res->push($n);
+            }
+        }
 
-		if(empty($ids)) {
-			return [];
-		}
+        return $res->toArray();
+    }
 
-		$res = collect([]);
-		foreach($ids as $id) {
-			$n = self::rewriteMastodonTypes(self::getNotification($id));
-			if($n != null && in_array($n['type'], self::MASTODON_TYPES)) {
-				if(isset($n['account'])) {
-					$n['account'] = AccountService::getMastodon($n['account']['id']);
-				}
+    public static function getMin($id = false, $start = 0, $limit = 10)
+    {
+        $ids = self::getRankedMinId($id, $start, $limit);
 
-				if(isset($n['relationship'])) {
-					unset($n['relationship']);
-				}
+        if (empty($ids)) {
+            return [];
+        }
 
-				if(isset($n['status'])) {
-					$n['status'] = StatusService::getMastodon($n['status']['id'], false);
-				}
+        $res = collect([]);
+        foreach ($ids as $id) {
+            $n = self::getNotification($id);
+            if ($n != null) {
+                $res->push($n);
+            }
+        }
 
-				$res->push($n);
-			}
-		}
-		return $res->toArray();
-	}
+        return $res->toArray();
+    }
 
-	public static function getMinMastodon($id = false, $start = 0, $limit = 10)
-	{
-		$ids = self::getRankedMinId($id, $start, $limit);
+    public static function getMaxMastodon($id = false, $start = 0, $limit = 10)
+    {
+        $ids = self::getRankedMaxId($id, $start, $limit);
 
-		if(empty($ids)) {
-			return [];
-		}
+        if (empty($ids)) {
+            return [];
+        }
 
-		$res = collect([]);
-		foreach($ids as $id) {
-			$n = self::rewriteMastodonTypes(self::getNotification($id));
-			if($n != null && in_array($n['type'], self::MASTODON_TYPES)) {
-				if(isset($n['account'])) {
-					$n['account'] = AccountService::getMastodon($n['account']['id']);
-				}
+        $res = collect([]);
+        foreach ($ids as $id) {
+            $n = self::rewriteMastodonTypes(self::getNotification($id));
+            if ($n != null && in_array($n['type'], self::MASTODON_TYPES)) {
+                if (isset($n['account'])) {
+                    $n['account'] = AccountService::getMastodon($n['account']['id']);
+                }
 
-				if(isset($n['relationship'])) {
-					unset($n['relationship']);
-				}
+                if (isset($n['relationship'])) {
+                    unset($n['relationship']);
+                }
 
-				if(isset($n['status'])) {
-					$n['status'] = StatusService::getMastodon($n['status']['id'], false);
-				}
+                if ($n['type'] === 'mention' && isset($n['tagged'], $n['tagged']['status_id'])) {
+                    $n['status'] = StatusService::getMastodon($n['tagged']['status_id'], false);
+                    unset($n['tagged']);
+                }
 
-				$res->push($n);
-			}
-		}
-		return $res->toArray();
-	}
+                if (isset($n['status'])) {
+                    $n['status'] = StatusService::getMastodon($n['status']['id'], false);
+                }
 
-	public static function getRankedMaxId($id = false, $start = null, $limit = 10)
-	{
-		if(!$start || !$id) {
-			return [];
-		}
+                $res->push($n);
+            }
+        }
 
-		return array_keys(Redis::zrevrangebyscore(self::CACHE_KEY.$id, $start, '-inf', [
-			'withscores' => true,
-			'limit' => [1, $limit]
-		]));
-	}
+        return $res->toArray();
+    }
 
-	public static function getRankedMinId($id = false, $end = null, $limit = 10)
-	{
-		if(!$end || !$id) {
-			return [];
-		}
+    public static function getMinMastodon($id = false, $start = 0, $limit = 10)
+    {
+        $ids = self::getRankedMinId($id, $start, $limit);
 
-		return array_keys(Redis::zrevrangebyscore(self::CACHE_KEY.$id, '+inf', $end, [
-			'withscores' => true,
-			'limit' => [0, $limit]
-		]));
-	}
+        if (empty($ids)) {
+            return [];
+        }
 
-	public static function rewriteMastodonTypes($notification)
-	{
-		if(!$notification || !isset($notification['type'])) {
-			return $notification;
-		}
+        $res = collect([]);
+        foreach ($ids as $id) {
+            $n = self::rewriteMastodonTypes(self::getNotification($id));
+            if ($n != null && in_array($n['type'], self::MASTODON_TYPES)) {
+                if (isset($n['account'])) {
+                    $n['account'] = AccountService::getMastodon($n['account']['id']);
+                }
 
-		if($notification['type'] === 'comment') {
-			$notification['type'] = 'mention';
-		}
+                if (isset($n['relationship'])) {
+                    unset($n['relationship']);
+                }
 
-		if($notification['type'] === 'share') {
-			$notification['type'] = 'reblog';
-		}
+                if ($n['type'] === 'mention' && isset($n['tagged'], $n['tagged']['status_id'])) {
+                    $n['status'] = StatusService::getMastodon($n['tagged']['status_id'], false);
+                    unset($n['tagged']);
+                }
 
-		return $notification;
-	}
+                if (isset($n['status'])) {
+                    $n['status'] = StatusService::getMastodon($n['status']['id'], false);
+                }
 
-	public static function set($id, $val)
-	{
-		if(self::count($id) > 400) {
-			Redis::zpopmin(self::CACHE_KEY . $id);
-		}
-		return Redis::zadd(self::CACHE_KEY . $id, $val, $val);
-	}
+                $res->push($n);
+            }
+        }
 
-	public static function del($id, $val)
-	{
-		Cache::forget('service:notification:' . $val);
-		return Redis::zrem(self::CACHE_KEY . $id, $val);
-	}
+        return $res->toArray();
+    }
 
-	public static function add($id, $val)
-	{
-		return self::set($id, $val);
-	}
+    public static function getRankedMaxId($id = false, $start = null, $limit = 10)
+    {
+        if (! $start || ! $id) {
+            return [];
+        }
 
-	public static function rem($id, $val)
-	{
-		return self::del($id, $val);
-	}
+        return array_keys(Redis::zrevrangebyscore(self::CACHE_KEY.$id, $start, '-inf', [
+            'withscores' => true,
+            'limit' => [1, $limit],
+        ]));
+    }
 
-	public static function count($id)
-	{
-		return Redis::zcount(self::CACHE_KEY . $id, '-inf', '+inf');
-	}
+    public static function getRankedMinId($id = false, $end = null, $limit = 10)
+    {
+        if (! $end || ! $id) {
+            return [];
+        }
 
-	public static function getNotification($id)
-	{
-		$notification = Cache::remember('service:notification:'.$id, self::ITEM_CACHE_TTL, function() use($id) {
-			$n = Notification::with('item')->find($id);
+        return array_keys(Redis::zrevrangebyscore(self::CACHE_KEY.$id, '+inf', $end, [
+            'withscores' => true,
+            'limit' => [0, $limit],
+        ]));
+    }
 
-			if(!$n) {
-				return null;
-			}
+    public static function rewriteMastodonTypes($notification)
+    {
+        if (! $notification || ! isset($notification['type'])) {
+            return $notification;
+        }
 
-			$account = AccountService::get($n->actor_id, true);
+        if ($notification['type'] === 'comment') {
+            $notification['type'] = 'mention';
+        }
 
-			if(!$account) {
-				return null;
-			}
+        if ($notification['type'] === 'share') {
+            $notification['type'] = 'reblog';
+        }
 
-			$fractal = new Fractal\Manager();
-			$fractal->setSerializer(new ArraySerializer());
-			$resource = new Fractal\Resource\Item($n, new NotificationTransformer());
-			return $fractal->createData($resource)->toArray();
-		});
+        if ($notification['type'] === 'tagged') {
+            $notification['type'] = 'mention';
+        }
 
-		if(!$notification) {
-			return;
-		}
+        return $notification;
+    }
 
-		if(isset($notification['account'])) {
-			$notification['account'] = AccountService::get($notification['account']['id'], true);
-		}
+    public static function set($id, $val)
+    {
+        if (self::count($id) > 400) {
+            Redis::zpopmin(self::CACHE_KEY.$id);
+        }
 
-		return $notification;
-	}
+        return Redis::zadd(self::CACHE_KEY.$id, $val, $val);
+    }
 
-	public static function setNotification(Notification $notification)
-	{
-		return Cache::remember('service:notification:'.$notification->id, self::ITEM_CACHE_TTL, function() use($notification) {
-			$fractal = new Fractal\Manager();
-			$fractal->setSerializer(new ArraySerializer());
-			$resource = new Fractal\Resource\Item($notification, new NotificationTransformer());
-			return $fractal->createData($resource)->toArray();
-		});
-	}
+    public static function del($id, $val)
+    {
+        Cache::forget('service:notification:'.$val);
 
-	public static function warmCache($id, $stop = 400, $force = false)
-	{
-		if(self::count($id) == 0 || $force == true) {
-			$ids = Notification::where('profile_id', $id)
-				->where('id', '>', self::getEpochId())
-				->orderByDesc('id')
-				->limit($stop)
-				->pluck('id');
-			foreach($ids as $key) {
-				self::set($id, $key);
-			}
-			return 1;
-		}
-		return 0;
-	}
+        return Redis::zrem(self::CACHE_KEY.$id, $val);
+    }
+
+    public static function add($id, $val)
+    {
+        return self::set($id, $val);
+    }
+
+    public static function rem($id, $val)
+    {
+        return self::del($id, $val);
+    }
+
+    public static function count($id)
+    {
+        return Redis::zcount(self::CACHE_KEY.$id, '-inf', '+inf');
+    }
+
+    public static function getNotification($id)
+    {
+        $notification = Cache::remember('service:notification:'.$id, self::ITEM_CACHE_TTL, function () use ($id) {
+            $n = Notification::with('item')->find($id);
+
+            if (! $n) {
+                return null;
+            }
+
+            $account = AccountService::get($n->actor_id, true);
+
+            if (! $account) {
+                return null;
+            }
+
+            $fractal = new Fractal\Manager();
+            $fractal->setSerializer(new ArraySerializer());
+            $resource = new Fractal\Resource\Item($n, new NotificationTransformer());
+
+            return $fractal->createData($resource)->toArray();
+        });
+
+        if (! $notification) {
+            return;
+        }
+
+        if (isset($notification['account'])) {
+            $notification['account'] = AccountService::get($notification['account']['id'], true);
+        }
+
+        return $notification;
+    }
+
+    public static function setNotification(Notification $notification)
+    {
+        return Cache::remember('service:notification:'.$notification->id, self::ITEM_CACHE_TTL, function () use ($notification) {
+            $fractal = new Fractal\Manager();
+            $fractal->setSerializer(new ArraySerializer());
+            $resource = new Fractal\Resource\Item($notification, new NotificationTransformer());
+
+            return $fractal->createData($resource)->toArray();
+        });
+    }
+
+    public static function warmCache($id, $stop = 400, $force = false)
+    {
+        if (self::count($id) == 0 || $force == true) {
+            $ids = Notification::where('profile_id', $id)
+                ->where('id', '>', self::getEpochId())
+                ->orderByDesc('id')
+                ->limit($stop)
+                ->pluck('id');
+            foreach ($ids as $key) {
+                self::set($id, $key);
+            }
+
+            return 1;
+        }
+
+        return 0;
+    }
 }
diff --git a/app/Services/PronounService.php b/app/Services/PronounService.php
index dce1d591a..a33ac0296 100644
--- a/app/Services/PronounService.php
+++ b/app/Services/PronounService.php
@@ -70,6 +70,8 @@ class PronounService {
 			'her',
 			'hers',
 			'hir',
+            'it',
+            'its',
 			'mer',
 			'mers',
 			'ne',
diff --git a/app/Services/PushNotificationService.php b/app/Services/PushNotificationService.php
new file mode 100644
index 000000000..8acb07acc
--- /dev/null
+++ b/app/Services/PushNotificationService.php
@@ -0,0 +1,123 @@
+<?php
+
+namespace App\Services;
+
+use App\User;
+use Exception;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Redis;
+use Log;
+
+class PushNotificationService
+{
+    public const ACTIVE_LIST_KEY = 'pf:services:push-notify:active_deliver:';
+
+    public const NOTIFY_TYPES = ['follow', 'like', 'mention', 'comment'];
+
+    public const DEEP_CHECK_KEY = 'pf:services:push-notify:deep-check:';
+
+    public const PUSH_GATEWAY_VERSION = '1.0';
+
+    public const LOTTERY_ODDS = 20;
+
+    public const CACHE_LOCK_SECONDS = 10;
+
+    public static function get($list)
+    {
+        return Redis::smembers(self::ACTIVE_LIST_KEY.$list);
+    }
+
+    public static function set($listId, $memberId)
+    {
+        if (! in_array($listId, self::NOTIFY_TYPES)) {
+            return false;
+        }
+        $user = User::whereProfileId($memberId)->first();
+        if (! $user || $user->status || $user->deleted_at) {
+            return false;
+        }
+
+        return Redis::sadd(self::ACTIVE_LIST_KEY.$listId, $memberId);
+    }
+
+    public static function check($listId, $memberId)
+    {
+        return random_int(1, self::LOTTERY_ODDS) === 1
+            ? self::isMemberDeepCheck($listId, $memberId)
+            : self::isMember($listId, $memberId);
+    }
+
+    public static function isMember($listId, $memberId)
+    {
+        try {
+            return Redis::sismember(self::ACTIVE_LIST_KEY.$listId, $memberId);
+        } catch (Exception $e) {
+            return false;
+        }
+    }
+
+    public static function isMemberDeepCheck($listId, $memberId)
+    {
+        $lock = Cache::lock(self::DEEP_CHECK_KEY.$listId, self::CACHE_LOCK_SECONDS);
+
+        try {
+            $lock->block(5);
+            $actualCount = User::whereNull('status')->where('notify_enabled', true)->where('notify_'.$listId, true)->count();
+            $cachedCount = self::count($listId);
+            if ($actualCount != $cachedCount) {
+                self::warmList($listId);
+                $user = User::where('notify_enabled', true)->where('profile_id', $memberId)->first();
+
+                return $user ? (bool) $user->{"notify_{$listId}"} : false;
+            } else {
+                return self::isMember($listId, $memberId);
+            }
+        } catch (Exception $e) {
+            Log::error('Failed during deep membership check: '.$e->getMessage());
+
+            return false;
+        } finally {
+            optional($lock)->release();
+        }
+    }
+
+    public static function removeMember($listId, $memberId)
+    {
+        return Redis::srem(self::ACTIVE_LIST_KEY.$listId, $memberId);
+    }
+
+    public static function removeMemberFromAll($memberId)
+    {
+        foreach (self::NOTIFY_TYPES as $type) {
+            self::removeMember($type, $memberId);
+        }
+
+        return 1;
+    }
+
+    public static function count($listId)
+    {
+        if (! in_array($listId, self::NOTIFY_TYPES)) {
+            return false;
+        }
+
+        return Redis::scard(self::ACTIVE_LIST_KEY.$listId);
+    }
+
+    public static function warmList($listId)
+    {
+        if (! in_array($listId, self::NOTIFY_TYPES)) {
+            return false;
+        }
+        $key = self::ACTIVE_LIST_KEY.$listId;
+        Redis::del($key);
+        foreach (User::where('notify_'.$listId, true)->cursor() as $acct) {
+            if ($acct->status || $acct->deleted_at || ! $acct->profile_id || ! $acct->notify_enabled) {
+                continue;
+            }
+            Redis::sadd($key, $acct->profile_id);
+        }
+
+        return self::count($listId);
+    }
+}
diff --git a/app/Services/ReblogService.php b/app/Services/ReblogService.php
index c08ad0089..e2c7b9fdd 100644
--- a/app/Services/ReblogService.php
+++ b/app/Services/ReblogService.php
@@ -2,67 +2,157 @@
 
 namespace App\Services;
 
+use App\Status;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Redis;
-use App\Status;
+use Illuminate\Support\Lottery;
 
 class ReblogService
 {
-	const CACHE_KEY = 'pf:services:reblogs:';
-	const REBLOGS_KEY = 'pf:services:reblogs:v1:post:';
-	const COLDBOOT_KEY = 'pf:services:reblogs:v1:post_:';
+    const CACHE_KEY = 'pf:services:reblogs:';
 
-	public static function get($profileId, $statusId)
-	{
-		if (!Redis::zcard(self::CACHE_KEY . $profileId)) {
-			return false;
-		}
+    const REBLOGS_KEY = 'pf:services:reblogs:v1:post:';
 
-		return Redis::zscore(self::CACHE_KEY . $profileId, $statusId) != null;
-	}
+    const COLDBOOT_KEY = 'pf:services:reblogs:v1:post_:';
 
-	public static function add($profileId, $statusId)
-	{
-		return Redis::zadd(self::CACHE_KEY . $profileId, $statusId, $statusId);
-	}
+    const CACHE_SKIP_KEY = 'pf:services:reblogs:skip_empty_check:';
 
-	public static function del($profileId, $statusId)
-	{
-		return Redis::zrem(self::CACHE_KEY . $profileId, $statusId);
-	}
+    public static function get($profileId, $statusId)
+    {
+        return Lottery::odds(1, 20)
+            ->winner(fn () => self::getFromDatabaseCheck($profileId, $statusId))
+            ->loser(fn () => self::getFromRedis($profileId, $statusId))
+            ->choose();
+    }
 
-	public static function getPostReblogs($id, $start = 0, $stop = 10)
-	{
-		if(!Redis::zcard(self::REBLOGS_KEY . $id)) {
-			return Cache::remember(self::COLDBOOT_KEY . $id, 86400, function() use($id) {
-				return Status::whereReblogOfId($id)
-					->pluck('id')
-					->each(function($reblog) use($id) {
-						self::addPostReblog($id, $reblog);
-					})
-					->map(function($reblog) {
-						return (string) $reblog;
-					});
-			});
-		}
-		return Redis::zrange(self::REBLOGS_KEY . $id, $start, $stop);
-	}
+    public static function getFromDatabaseCheck($profileId, $statusId)
+    {
+        if (! Redis::zcard(self::CACHE_KEY.$profileId)) {
+            if (Cache::has(self::CACHE_SKIP_KEY.$profileId)) {
+                return false;
+            } else {
+                self::warmCache($profileId);
+                sleep(1);
 
-	public static function addPostReblog($parentId, $reblogId)
-	{
-		$pid = intval($parentId);
-		$id = intval($reblogId);
-		if($pid && $id) {
-			return Redis::zadd(self::REBLOGS_KEY . $pid, $id, $id);
-		}
-	}
+                return self::getFromRedis($profileId, $statusId);
+            }
+        }
 
-	public static function removePostReblog($parentId, $reblogId)
-	{
-		$pid = intval($parentId);
-		$id = intval($reblogId);
-		if($pid && $id) {
-			return Redis::zrem(self::REBLOGS_KEY . $pid, $id);
-		}
-	}
+        $minId = SnowflakeService::byDate(now()->subMonths(12));
+
+        if ($minId > $statusId) {
+            return Redis::zscore(self::CACHE_KEY.$profileId, $statusId) != null;
+        }
+
+        $cachedRes = (bool) Redis::zscore(self::CACHE_KEY.$profileId, $statusId) != null;
+        $databaseRes = (bool) self::getFromDatabase($profileId, $statusId);
+
+        if ($cachedRes === $databaseRes) {
+            return $cachedRes;
+        }
+
+        self::warmCache($profileId);
+        sleep(1);
+
+        return self::getFromDatabase($profileId, $statusId);
+    }
+
+    public static function getFromRedis($profileId, $statusId)
+    {
+        if (! Redis::zcard(self::CACHE_KEY.$profileId)) {
+            if (Cache::has(self::CACHE_SKIP_KEY.$profileId)) {
+                return false;
+            } else {
+                self::warmCache($profileId);
+                sleep(1);
+
+                return self::getFromDatabase($profileId, $statusId);
+            }
+        }
+
+        return Redis::zscore(self::CACHE_KEY.$profileId, $statusId) != null;
+    }
+
+    public static function getFromDatabase($profileId, $statusId)
+    {
+        return Status::whereProfileId($profileId)
+            ->where('reblog_of_id', $statusId)
+            ->exists();
+    }
+
+    public static function add($profileId, $statusId)
+    {
+        return Redis::zadd(self::CACHE_KEY.$profileId, $statusId, $statusId);
+    }
+
+    public static function count($profileId)
+    {
+        return Redis::zcard(self::CACHE_KEY.$profileId);
+    }
+
+    public static function del($profileId, $statusId)
+    {
+        return Redis::zrem(self::CACHE_KEY.$profileId, $statusId);
+    }
+
+    public static function getWarmCacheCount($profileId)
+    {
+        $minId = SnowflakeService::byDate(now()->subMonths(12));
+
+        return Status::where('id', '>', $minId)
+            ->whereProfileId($profileId)
+            ->whereNotNull('reblog_of_id')
+            ->count();
+    }
+
+    public static function warmCache($profileId)
+    {
+        Redis::del(self::CACHE_KEY.$profileId);
+        $minId = SnowflakeService::byDate(now()->subMonths(12));
+        foreach (
+            Status::where('id', '>', $minId)
+                ->whereProfileId($profileId)
+                ->whereNotNull('reblog_of_id')
+                ->lazy() as $post
+        ) {
+            self::add($profileId, $post->reblog_of_id);
+        }
+        Cache::put(self::CACHE_SKIP_KEY.$profileId, 1, now()->addHours(24));
+    }
+
+    public static function getPostReblogs($id, $start = 0, $stop = 10)
+    {
+        if (! Redis::zcard(self::REBLOGS_KEY.$id)) {
+            return Cache::remember(self::COLDBOOT_KEY.$id, 86400, function () use ($id) {
+                return Status::whereReblogOfId($id)
+                    ->pluck('id')
+                    ->each(function ($reblog) use ($id) {
+                        self::addPostReblog($id, $reblog);
+                    })
+                    ->map(function ($reblog) {
+                        return (string) $reblog;
+                    });
+            });
+        }
+
+        return Redis::zrange(self::REBLOGS_KEY.$id, $start, $stop);
+    }
+
+    public static function addPostReblog($parentId, $reblogId)
+    {
+        $pid = intval($parentId);
+        $id = intval($reblogId);
+        if ($pid && $id) {
+            return Redis::zadd(self::REBLOGS_KEY.$pid, $id, $id);
+        }
+    }
+
+    public static function removePostReblog($parentId, $reblogId)
+    {
+        $pid = intval($parentId);
+        $id = intval($reblogId);
+        if ($pid && $id) {
+            return Redis::zrem(self::REBLOGS_KEY.$pid, $id);
+        }
+    }
 }
diff --git a/app/Services/SearchApiV2Service.php b/app/Services/SearchApiV2Service.php
index 90691f0bd..fc87d2c04 100644
--- a/app/Services/SearchApiV2Service.php
+++ b/app/Services/SearchApiV2Service.php
@@ -2,28 +2,25 @@
 
 namespace App\Services;
 
-use Cache;
-use Illuminate\Support\Facades\Redis;
-use App\{Hashtag, Profile, Status};
+use App\Hashtag;
+use App\Profile;
+use App\Status;
 use App\Transformer\Api\AccountTransformer;
-use App\Transformer\Api\StatusTransformer;
-use League\Fractal;
-use League\Fractal\Serializer\ArraySerializer;
-use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use App\Util\ActivityPub\Helpers;
 use Illuminate\Support\Str;
-use App\Services\AccountService;
-use App\Services\HashtagService;
-use App\Services\StatusService;
+use League\Fractal;
+use League\Fractal\Serializer\ArraySerializer;
 
 class SearchApiV2Service
 {
     private $query;
-    static $mastodonMode = false;
+
+    public static $mastodonMode = false;
 
     public static function query($query, $mastodonMode = false)
     {
         self::$mastodonMode = $mastodonMode;
+
         return (new self)->run($query);
     }
 
@@ -32,51 +29,51 @@ class SearchApiV2Service
         $this->query = $query;
         $q = urldecode($query->input('q'));
 
-        if($query->has('resolve') &&
-            ( Str::startsWith($q, 'https://') ||
+        if ($query->has('resolve') &&
+            (Str::startsWith($q, 'https://') ||
               Str::substrCount($q, '@') >= 1)
         ) {
             return $this->resolveQuery();
         }
 
-        if($query->has('type')) {
+        if ($query->has('type')) {
             switch ($query->input('type')) {
                 case 'accounts':
                     return [
                         'accounts' => $this->accounts(),
                         'hashtags' => [],
-                        'statuses' => []
+                        'statuses' => [],
                     ];
                     break;
                 case 'hashtags':
                     return [
                         'accounts' => [],
                         'hashtags' => $this->hashtags(),
-                        'statuses' => []
+                        'statuses' => [],
                     ];
                     break;
                 case 'statuses':
                     return [
                         'accounts' => [],
                         'hashtags' => [],
-                        'statuses' => $this->statuses()
+                        'statuses' => $this->statuses(),
                     ];
                     break;
             }
         }
 
-        if($query->has('account_id')) {
+        if ($query->has('account_id')) {
             return [
                 'accounts' => [],
                 'hashtags' => [],
-                'statuses' => $this->statusesById()
+                'statuses' => $this->statusesById(),
             ];
         }
 
         return [
             'accounts' => $this->accounts(),
             'hashtags' => $this->hashtags(),
-            'statuses' => $this->statuses()
+            'statuses' => $this->statuses(),
         ];
     }
 
@@ -87,15 +84,23 @@ class SearchApiV2Service
         $limit = $this->query->input('limit') ?? 20;
         $offset = $this->query->input('offset') ?? 0;
         $rawQuery = $initalQuery ? $initalQuery : $this->query->input('q');
-        $query = $rawQuery . '%';
+        $query = $rawQuery.'%';
         $webfingerQuery = $query;
-        if(Str::substrCount($rawQuery, '@') == 1 && substr($rawQuery, 0, 1) !== '@') {
-            $query = '@' . $query;
+        if (Str::substrCount($rawQuery, '@') == 1 && substr($rawQuery, 0, 1) !== '@') {
+            $query = '@'.$query;
         }
-        if(substr($webfingerQuery, 0, 1) !== '@') {
-            $webfingerQuery = '@' . $webfingerQuery;
+        if (substr($webfingerQuery, 0, 1) !== '@') {
+            $webfingerQuery = '@'.$webfingerQuery;
+        }
+        $banned = InstanceService::getBannedDomains() ?? [];
+        $domainBlocks = UserFilterService::domainBlocks($user->profile_id);
+        if ($domainBlocks && count($domainBlocks)) {
+            $banned = array_unique(
+                array_values(
+                    array_merge($banned, $domainBlocks)
+                )
+            );
         }
-        $banned = InstanceService::getBannedDomains();
         $operator = config('database.default') === 'pgsql' ? 'ilike' : 'like';
         $results = Profile::select('username', 'id', 'followers_count', 'domain')
             ->where('username', $operator, $query)
@@ -104,16 +109,16 @@ class SearchApiV2Service
             ->offset($offset)
             ->limit($limit)
             ->get()
-            ->filter(function($profile) use ($banned) {
+            ->filter(function ($profile) use ($banned) {
                 return in_array($profile->domain, $banned) == false;
             })
-            ->map(function($res) use($mastodonMode) {
+            ->map(function ($res) use ($mastodonMode) {
                 return $mastodonMode ?
                 AccountService::getMastodon($res['id']) :
                 AccountService::get($res['id']);
             })
-            ->filter(function($account) {
-                return $account && isset($account['id']);
+            ->filter(function ($account) {
+                return $account && isset($account['id']) && ! isset($account['moved'], $account['moved']['id']);
             })
             ->values();
 
@@ -126,31 +131,31 @@ class SearchApiV2Service
         $q = $this->query->input('q');
         $limit = $this->query->input('limit') ?? 20;
         $offset = $this->query->input('offset') ?? 0;
-        $query = Str::startsWith($q, '#') ? '%' . substr($q, 1) . '%' : '%' . $q . '%';
+        $query = Str::startsWith($q, '#') ? substr($q, 1).'%' : $q;
         $operator = config('database.default') === 'pgsql' ? 'ilike' : 'like';
+
         return Hashtag::where('name', $operator, $query)
-            ->orWhere('slug', $operator, $query)
-            ->where(function($q) {
-                return $q->where('can_search', true)
-                        ->orWhereNull('can_search');
-            })
             ->orderByDesc('cached_count')
             ->offset($offset)
             ->limit($limit)
             ->get()
-            ->map(function($tag) use($mastodonMode) {
+            ->filter(function ($tag) {
+                return $tag->can_search != false;
+            })
+            ->map(function ($tag) use ($mastodonMode) {
                 $res = [
                     'name' => $tag->name,
-                    'url'  => $tag->url()
+                    'url' => $tag->url(),
                 ];
 
-                if(!$mastodonMode) {
+                if (! $mastodonMode) {
                     $res['history'] = [];
-                    $res['count'] = HashtagService::count($tag->id);
+                    $res['count'] = $tag->cached_count ?? 0;
                 }
 
                 return $res;
-            });
+            })
+            ->values();
     }
 
     protected function statuses()
@@ -167,73 +172,98 @@ class SearchApiV2Service
 
     protected function resolveQuery()
     {
-        $default =  [
+        $default = [
             'accounts' => [],
             'hashtags' => [],
             'statuses' => [],
         ];
+        $user = request()->user();
         $mastodonMode = self::$mastodonMode;
         $query = urldecode($this->query->input('q'));
-        if(substr($query, 0, 1) === '@' && !Str::contains($query, '.')) {
+        $banned = InstanceService::getBannedDomains();
+        $domainBlocks = UserFilterService::domainBlocks($user->profile_id);
+        if ($domainBlocks && count($domainBlocks)) {
+            $banned = array_unique(
+                array_values(
+                    array_merge($banned, $domainBlocks)
+                )
+            );
+        }
+        if (substr($query, 0, 1) === '@' && ! Str::contains($query, '.')) {
             $default['accounts'] = $this->accounts(substr($query, 1));
+
             return $default;
         }
-        if(Helpers::validateLocalUrl($query)) {
-            if(Str::contains($query, '/p/') || Str::contains($query, 'i/web/post/')) {
+        if (Helpers::validateLocalUrl($query)) {
+            if (Str::contains($query, '/p/') || Str::contains($query, 'i/web/post/')) {
                 return $this->resolveLocalStatus();
-            }  else if(Str::contains($query, 'i/web/profile/')) {
+            } elseif (Str::contains($query, 'i/web/profile/')) {
                 return $this->resolveLocalProfileId();
             } else {
                 return $this->resolveLocalProfile();
             }
         } else {
-            if(!Helpers::validateUrl($query) && strpos($query, '@') == -1) {
+            if (! Helpers::validateUrl($query) && strpos($query, '@') == -1) {
                 return $default;
             }
 
-            if(!Str::startsWith($query, 'http') && Str::substrCount($query, '@') == 1 && strpos($query, '@') !== 0) {
+            if (! Str::startsWith($query, 'http') && Str::substrCount($query, '@') == 1 && strpos($query, '@') !== 0) {
                 try {
-                    $res = WebfingerService::lookup('@' . $query, $mastodonMode);
+                    $res = WebfingerService::lookup('@'.$query, $mastodonMode);
                 } catch (\Exception $e) {
                     return $default;
                 }
-                if($res && isset($res['id'])) {
+                if ($res && isset($res['id'], $res['url'])) {
+                    $domain = strtolower(parse_url($res['url'], PHP_URL_HOST));
+                    if (in_array($domain, $banned)) {
+                        return $default;
+                    }
                     $default['accounts'][] = $res;
+
                     return $default;
                 } else {
                     return $default;
                 }
             }
 
-            if(Str::substrCount($query, '@') == 2) {
+            if (Str::substrCount($query, '@') == 2) {
                 try {
                     $res = WebfingerService::lookup($query, $mastodonMode);
                 } catch (\Exception $e) {
                     return $default;
                 }
-                if($res && isset($res['id'])) {
+                if ($res && isset($res['id'])) {
+                    $domain = strtolower(parse_url($res['url'], PHP_URL_HOST));
+                    if (in_array($domain, $banned)) {
+                        return $default;
+                    }
                     $default['accounts'][] = $res;
+
                     return $default;
                 } else {
                     return $default;
                 }
             }
 
-            if($sid = Status::whereUri($query)->first()) {
+            if ($sid = Status::whereUri($query)->first()) {
                 $s = StatusService::get($sid->id, false);
-                if(in_array($s['visibility'], ['public', 'unlisted'])) {
+                if (! $s || isset($s['account']['moved'], $s['account']['moved']['id'])) {
+                    return $default;
+                }
+                if (in_array($s['visibility'], ['public', 'unlisted'])) {
                     $default['statuses'][] = $s;
+
                     return $default;
                 }
             }
 
             try {
                 $res = ActivityPubFetchService::get($query);
-                $banned = InstanceService::getBannedDomains();
-                if($res) {
+
+                if ($res) {
                     $json = json_decode($res, true);
 
-                    if(!$json || !isset($json['@context']) || !isset($json['type']) || !in_array($json['type'], ['Note', 'Person'])) {
+                    if (! $json || ! isset($json['@context']) || ! isset($json['type']) || ! in_array($json['type'], ['Note', 'Person'])) {
                         return [
                             'accounts' => [],
                             'hashtags' => [],
@@ -241,38 +271,40 @@ class SearchApiV2Service
                         ];
                     }
 
-                    switch($json['type']) {
+                    switch ($json['type']) {
                         case 'Note':
                             $obj = Helpers::statusFetch($query);
-                            if(!$obj || !isset($obj['id'])) {
+                            if (! $obj || ! isset($obj['id'])) {
                                 return $default;
                             }
                             $note = $mastodonMode ?
                                 StatusService::getMastodon($obj['id'], false) :
                                 StatusService::get($obj['id'], false);
-                            if(!$note) {
+                            if (! $note) {
                                 return $default;
                             }
-                            if(!isset($note['visibility']) || !in_array($note['visibility'], ['public', 'unlisted'])) {
+                            if (! isset($note['visibility']) || ! in_array($note['visibility'], ['public', 'unlisted'])) {
                                 return $default;
                             }
                             $default['statuses'][] = $note;
+
                             return $default;
-                        break;
+                            break;
 
                         case 'Person':
                             $obj = Helpers::profileFetch($query);
-                            if(!$obj) {
+                            if (! $obj) {
                                 return $default;
                             }
-                            if(in_array($obj['domain'], $banned)) {
+                            if (in_array($obj['domain'], $banned)) {
                                 return $default;
                             }
                             $default['accounts'][] = $mastodonMode ?
                                 AccountService::getMastodon($obj['id'], true) :
                                 AccountService::get($obj['id'], true);
+
                             return $default;
-                        break;
+                            break;
 
                         default:
                             return [
@@ -280,7 +312,7 @@ class SearchApiV2Service
                                 'hashtags' => [],
                                 'statuses' => [],
                             ];
-                        break;
+                            break;
                     }
                 }
             } catch (\Exception $e) {
@@ -300,18 +332,18 @@ class SearchApiV2Service
         $query = urldecode($this->query->input('q'));
         $query = last(explode('/', parse_url($query, PHP_URL_PATH)));
         $status = StatusService::getMastodon($query, false);
-        if(!$status || !in_array($status['visibility'], ['public', 'unlisted'])) {
+        if (! $status || ! in_array($status['visibility'], ['public', 'unlisted'])) {
             return [
                 'accounts' => [],
                 'hashtags' => [],
-                'statuses' => []
+                'statuses' => [],
             ];
         }
 
         $res = [
             'accounts' => [],
             'hashtags' => [],
-            'statuses' => [$status]
+            'statuses' => [$status],
         ];
 
         return $res;
@@ -326,21 +358,22 @@ class SearchApiV2Service
             ->whereUsername($query)
             ->first();
 
-        if(!$profile) {
+        if (! $profile || $profile->moved_to_profile_id) {
             return [
                 'accounts' => [],
                 'hashtags' => [],
-                'statuses' => []
+                'statuses' => [],
             ];
         }
 
-        $fractal = new Fractal\Manager();
-        $fractal->setSerializer(new ArraySerializer());
-        $resource = new Fractal\Resource\Item($profile, new AccountTransformer());
+        $fractal = new Fractal\Manager;
+        $fractal->setSerializer(new ArraySerializer);
+        $resource = new Fractal\Resource\Item($profile, new AccountTransformer);
+
         return [
             'accounts' => [$fractal->createData($resource)->toArray()],
             'hashtags' => [],
-            'statuses' => []
+            'statuses' => [],
         ];
     }
 
@@ -351,22 +384,22 @@ class SearchApiV2Service
         $profile = Profile::whereNull('status')
             ->find($query);
 
-        if(!$profile) {
+        if (! $profile) {
             return [
                 'accounts' => [],
                 'hashtags' => [],
-                'statuses' => []
+                'statuses' => [],
             ];
         }
 
-        $fractal = new Fractal\Manager();
-        $fractal->setSerializer(new ArraySerializer());
-        $resource = new Fractal\Resource\Item($profile, new AccountTransformer());
+        $fractal = new Fractal\Manager;
+        $fractal->setSerializer(new ArraySerializer);
+        $resource = new Fractal\Resource\Item($profile, new AccountTransformer);
+
         return [
             'accounts' => [$fractal->createData($resource)->toArray()],
             'hashtags' => [],
-            'statuses' => []
+            'statuses' => [],
         ];
     }
-
 }
diff --git a/app/Services/Status/UpdateStatusService.php b/app/Services/Status/UpdateStatusService.php
index d0a69c451..7ef4d440c 100644
--- a/app/Services/Status/UpdateStatusService.php
+++ b/app/Services/Status/UpdateStatusService.php
@@ -3,135 +3,133 @@
 namespace App\Services\Status;
 
 use App\Media;
-use App\ModLog;
-use App\Status;
 use App\Models\StatusEdit;
-use Purify;
-use App\Util\Lexer\Autolink;
+use App\ModLog;
 use App\Services\MediaService;
 use App\Services\MediaStorageService;
 use App\Services\StatusService;
+use App\Status;
+use Purify;
 
 class UpdateStatusService
 {
-	public static function call(Status $status, $attributes)
-	{
-		self::createPreviousEdit($status);
-		self::updateMediaAttachements($status, $attributes);
-		self::handleImmediateAttributes($status, $attributes);
-		self::createEdit($status, $attributes);
+    public static function call(Status $status, $attributes)
+    {
+        self::createPreviousEdit($status);
+        self::updateMediaAttachements($status, $attributes);
+        self::handleImmediateAttributes($status, $attributes);
+        self::createEdit($status, $attributes);
 
-		return StatusService::get($status->id);
-	}
+        return StatusService::get($status->id);
+    }
 
-	public static function updateMediaAttachements(Status $status, $attributes)
-	{
-		$count = $status->media()->count();
-		if($count === 0 || $count === 1) {
-			return;
-		}
+    public static function updateMediaAttachements(Status $status, $attributes)
+    {
+        $count = $status->media()->count();
+        if ($count === 0 || $count === 1) {
+            return;
+        }
 
-		$oids = $status->media()->orderBy('order')->pluck('id')->map(function($m) { return (string) $m; });
-		$nids = collect($attributes['media_ids']);
+        $oids = $status->media()->orderBy('order')->pluck('id')->map(function ($m) {
+            return (string) $m;
+        });
+        $nids = collect($attributes['media_ids']);
 
-		if($oids->toArray() === $nids->toArray()) {
-			return;
-		}
+        if ($oids->toArray() === $nids->toArray()) {
+            return;
+        }
 
-		foreach($oids->diff($nids)->values()->toArray() as $mid) {
-			$media = Media::find($mid);
-			if(!$media) {
-				continue;
-			}
-			$media->status_id = null;
-			$media->save();
-			MediaStorageService::delete($media, true);
-		}
+        foreach ($oids->diff($nids)->values()->toArray() as $mid) {
+            $media = Media::find($mid);
+            if (! $media) {
+                continue;
+            }
+            $media->status_id = null;
+            $media->save();
+            MediaStorageService::delete($media, true);
+        }
 
-		$nids->each(function($nid, $idx) {
-			$media = Media::find($nid);
-			if(!$media) {
-				return;
-			}
-			$media->order = $idx;
-			$media->save();
-		});
-		MediaService::del($status->id);
-	}
+        $nids->each(function ($nid, $idx) {
+            $media = Media::find($nid);
+            if (! $media) {
+                return;
+            }
+            $media->order = $idx;
+            $media->save();
+        });
+        MediaService::del($status->id);
+    }
 
-	public static function handleImmediateAttributes(Status $status, $attributes)
-	{
-		if(isset($attributes['status'])) {
-			$cleaned = Purify::clean($attributes['status']);
-			$status->caption = $cleaned;
-			$status->rendered = nl2br(Autolink::create()->autolink($cleaned));
-		} else {
-			$status->caption = null;
-			$status->rendered = null;
-		}
-		if(isset($attributes['sensitive'])) {
-			if($status->is_nsfw != (bool) $attributes['sensitive'] &&
-			  (bool) $attributes['sensitive'] == false)
-			{
-				$exists = ModLog::whereObjectType('App\Status::class')
-					->whereObjectId($status->id)
-					->whereAction('admin.status.moderate')
-					->exists();
-				if(!$exists) {
-					$status->is_nsfw = (bool) $attributes['sensitive'];
-				}
-			} else {
-				$status->is_nsfw = (bool) $attributes['sensitive'];
-			}
-		}
-		if(isset($attributes['spoiler_text'])) {
-			$status->cw_summary = Purify::clean($attributes['spoiler_text']);
-		} else {
-			$status->cw_summary = null;
-		}
-		if(isset($attributes['location'])) {
-			if (isset($attributes['location']['id'])) {
-				$status->place_id = $attributes['location']['id'];
-			} else {
-				$status->place_id = null;
-			}
-		}
-		if($status->cw_summary && !$status->is_nsfw) {
-			$status->cw_summary = null;
-		}
-		$status->edited_at = now();
-		$status->save();
-		StatusService::del($status->id);
-	}
+    public static function handleImmediateAttributes(Status $status, $attributes)
+    {
+        if (isset($attributes['status'])) {
+            $cleaned = Purify::clean($attributes['status']);
+            $status->caption = $cleaned;
+        } else {
+            $status->caption = null;
+        }
+        if (isset($attributes['sensitive'])) {
+            if ($status->is_nsfw != (bool) $attributes['sensitive'] &&
+              (bool) $attributes['sensitive'] == false) {
+                $exists = ModLog::whereObjectType('App\Status::class')
+                    ->whereObjectId($status->id)
+                    ->whereAction('admin.status.moderate')
+                    ->exists();
+                if (! $exists) {
+                    $status->is_nsfw = (bool) $attributes['sensitive'];
+                }
+            } else {
+                $status->is_nsfw = (bool) $attributes['sensitive'];
+            }
+        }
+        if (isset($attributes['spoiler_text'])) {
+            $status->cw_summary = Purify::clean($attributes['spoiler_text']);
+        } else {
+            $status->cw_summary = null;
+        }
+        if (isset($attributes['location'])) {
+            if (isset($attributes['location']['id'])) {
+                $status->place_id = $attributes['location']['id'];
+            } else {
+                $status->place_id = null;
+            }
+        }
+        if ($status->cw_summary && ! $status->is_nsfw) {
+            $status->cw_summary = null;
+        }
+        $status->edited_at = now();
+        $status->save();
+        StatusService::del($status->id);
+    }
 
-	public static function createPreviousEdit(Status $status)
-	{
-		if(!$status->edits()->count()) {
-			StatusEdit::create([
-				'status_id' => $status->id,
-				'profile_id' => $status->profile_id,
-				'caption' => $status->caption,
-				'spoiler_text' => $status->cw_summary,
-				'is_nsfw' => $status->is_nsfw,
-				'ordered_media_attachment_ids' => $status->media()->orderBy('order')->pluck('id')->toArray(),
-				'created_at' => $status->created_at
-			]);
-		}
-	}
+    public static function createPreviousEdit(Status $status)
+    {
+        if (! $status->edits()->count()) {
+            StatusEdit::create([
+                'status_id' => $status->id,
+                'profile_id' => $status->profile_id,
+                'caption' => $status->caption,
+                'spoiler_text' => $status->cw_summary,
+                'is_nsfw' => $status->is_nsfw,
+                'ordered_media_attachment_ids' => $status->media()->orderBy('order')->pluck('id')->toArray(),
+                'created_at' => $status->created_at,
+            ]);
+        }
+    }
 
-	public static function createEdit(Status $status, $attributes)
-	{
-		$cleaned = isset($attributes['status']) ? Purify::clean($attributes['status']) : null;
-		$spoiler_text = isset($attributes['spoiler_text']) ? Purify::clean($attributes['spoiler_text']) : null;
-		$sensitive = isset($attributes['sensitive']) ? $attributes['sensitive'] : null;
-		$mids = $status->media()->count() ? $status->media()->orderBy('order')->pluck('id')->toArray() : null;
-		StatusEdit::create([
-			'status_id' => $status->id,
-			'profile_id' => $status->profile_id,
-			'caption' => $cleaned,
-			'spoiler_text' => $spoiler_text,
-			'is_nsfw' => $sensitive,
-			'ordered_media_attachment_ids' => $mids
-		]);
-	}
+    public static function createEdit(Status $status, $attributes)
+    {
+        $cleaned = isset($attributes['status']) ? Purify::clean($attributes['status']) : null;
+        $spoiler_text = isset($attributes['spoiler_text']) ? Purify::clean($attributes['spoiler_text']) : null;
+        $sensitive = isset($attributes['sensitive']) ? $attributes['sensitive'] : null;
+        $mids = $status->media()->count() ? $status->media()->orderBy('order')->pluck('id')->toArray() : null;
+        StatusEdit::create([
+            'status_id' => $status->id,
+            'profile_id' => $status->profile_id,
+            'caption' => $cleaned,
+            'spoiler_text' => $spoiler_text,
+            'is_nsfw' => $sensitive,
+            'ordered_media_attachment_ids' => $mids,
+        ]);
+    }
 }
diff --git a/app/Services/StatusHashtagService.php b/app/Services/StatusHashtagService.php
index ececca633..1f86b2de8 100644
--- a/app/Services/StatusHashtagService.php
+++ b/app/Services/StatusHashtagService.php
@@ -2,100 +2,97 @@
 
 namespace App\Services;
 
-use Cache;
-use Illuminate\Support\Facades\Redis;
-use App\{Status, StatusHashtag};
-use App\Transformer\Api\StatusHashtagTransformer;
+use App\Hashtag;
+use App\Status;
+use App\StatusHashtag;
 use App\Transformer\Api\HashtagTransformer;
 use League\Fractal;
 use League\Fractal\Serializer\ArraySerializer;
-use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 
-class StatusHashtagService {
+class StatusHashtagService
+{
+    const CACHE_KEY = 'pf:services:status-hashtag:collection:';
 
-	const CACHE_KEY = 'pf:services:status-hashtag:collection:';
+    public static function get($id, $page = 1, $stop = 9)
+    {
+        if ($page > 20) {
+            return [];
+        }
 
-	public static function get($id, $page = 1, $stop = 9)
-	{
-		if($page > 20) {
-			return [];
-		}
+        $pid = request()->user() ? request()->user()->profile_id : false;
+        $filtered = $pid ? UserFilterService::filters($pid) : [];
 
-		$pid = request()->user() ? request()->user()->profile_id : false;
-		$filtered = $pid ? UserFilterService::filters($pid) : [];
+        return StatusHashtag::whereHashtagId($id)
+            ->whereStatusVisibility('public')
+            ->skip($stop)
+            ->latest()
+            ->take(9)
+            ->pluck('status_id')
+            ->map(function ($i, $k) use ($id) {
+                return self::getStatus($i, $id);
+            })
+            ->filter(function ($i) use ($filtered) {
+                return isset($i['status']) &&
+                ! empty($i['status']) && ! in_array($i['status']['account']['id'], $filtered) &&
+                isset($i['status']['media_attachments']) &&
+                ! empty($i['status']['media_attachments']);
+            })
+            ->values();
+    }
 
-		return StatusHashtag::whereHashtagId($id)
-			->whereStatusVisibility('public')
-			->skip($stop)
-			->latest()
-			->take(9)
-			->pluck('status_id')
-			->map(function ($i, $k) use ($id) {
-				return self::getStatus($i, $id);
-			})
-			->filter(function ($i) use($filtered) {
-				return isset($i['status']) &&
-				!empty($i['status']) && !in_array($i['status']['account']['id'], $filtered) &&
-				isset($i['status']['media_attachments']) &&
-				!empty($i['status']['media_attachments']);
-			})
-			->values();
-	}
+    public static function coldGet($id, $start = 0, $stop = 2000)
+    {
+        $stop = $stop > 2000 ? 2000 : $stop;
+        $ids = StatusHashtag::whereHashtagId($id)
+            ->whereStatusVisibility('public')
+            ->whereHas('media')
+            ->latest()
+            ->skip($start)
+            ->take($stop)
+            ->pluck('status_id');
+        foreach ($ids as $key) {
+            self::set($id, $key);
+        }
 
-	public static function coldGet($id, $start = 0, $stop = 2000)
-	{
-		$stop = $stop > 2000 ? 2000 : $stop;
-		$ids = StatusHashtag::whereHashtagId($id)
-			->whereStatusVisibility('public')
-			->whereHas('media')
-			->latest()
-			->skip($start)
-			->take($stop)
-			->pluck('status_id');
-		foreach($ids as $key) {
-			self::set($id, $key);
-		}
-		return $ids;
-	}
+        return $ids;
+    }
 
-	public static function set($key, $val)
-	{
-		return 1;
-	}
+    public static function set($key, $val)
+    {
+        return 1;
+    }
 
-	public static function del($key)
-	{
-		return 1;
-	}
+    public static function del($key)
+    {
+        return 1;
+    }
 
-	public static function count($id)
-	{
-		$key = 'pf:services:status-hashtag:count:' . $id;
-		$ttl = now()->addMinutes(5);
-		return Cache::remember($key, $ttl, function() use($id) {
-			return StatusHashtag::whereHashtagId($id)->has('media')->count();
-		});
-	}
+    public static function count($id)
+    {
+        $cc = Hashtag::find($id);
+        if (! $cc) {
+            return 0;
+        }
 
-	public static function getStatus($statusId, $hashtagId)
-	{
-		return ['status' => StatusService::get($statusId)];
-	}
+        return $cc->cached_count ?? 0;
+    }
 
-	public static function statusTags($statusId)
-	{
-		$key = 'pf:services:sh:id:' . $statusId;
+    public static function getStatus($statusId, $hashtagId)
+    {
+        return ['status' => StatusService::get($statusId)];
+    }
 
-		return Cache::remember($key, 604800, function() use($statusId) {
-			$status = Status::find($statusId);
-			if(!$status) {
-				return [];
-			}
+    public static function statusTags($statusId)
+    {
+        $status = Status::with('hashtags')->find($statusId);
+        if (! $status) {
+            return [];
+        }
 
-			$fractal = new Fractal\Manager();
-			$fractal->setSerializer(new ArraySerializer());
-			$resource = new Fractal\Resource\Collection($status->hashtags, new HashtagTransformer());
-			return $fractal->createData($resource)->toArray();
-		});
-	}
+        $fractal = new Fractal\Manager();
+        $fractal->setSerializer(new ArraySerializer());
+        $resource = new Fractal\Resource\Collection($status->hashtags, new HashtagTransformer());
+
+        return $fractal->createData($resource)->toArray();
+    }
 }
diff --git a/app/Services/StatusService.php b/app/Services/StatusService.php
index 4051bede4..de2f4d112 100644
--- a/app/Services/StatusService.php
+++ b/app/Services/StatusService.php
@@ -2,68 +2,67 @@
 
 namespace App\Services;
 
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Redis;
-use DB;
 use App\Status;
 use App\Transformer\Api\StatusStatelessTransformer;
-use App\Transformer\Api\StatusTransformer;
+use Illuminate\Support\Facades\Cache;
 use League\Fractal;
 use League\Fractal\Serializer\ArraySerializer;
-use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 
 class StatusService
 {
-    const CACHE_KEY = 'pf:services:status:';
+    const CACHE_KEY = 'pf:services:status:v1.1:';
 
     public static function key($id, $publicOnly = true)
     {
         $p = $publicOnly ? 'pub:' : 'all:';
-        return self::CACHE_KEY . $p . $id;
+
+        return self::CACHE_KEY.$p.$id;
     }
 
     public static function get($id, $publicOnly = true, $mastodonMode = false)
     {
-        $res = Cache::remember(self::key($id, $publicOnly), 21600, function() use($id, $publicOnly) {
-            if($publicOnly) {
+        $res = Cache::remember(self::key($id, $publicOnly), 21600, function () use ($id, $publicOnly) {
+            if ($publicOnly) {
                 $status = Status::whereScope('public')->find($id);
             } else {
                 $status = Status::whereIn('scope', ['public', 'private', 'unlisted', 'group'])->find($id);
             }
-            if(!$status) {
+            if (! $status) {
                 return null;
             }
-            $fractal = new Fractal\Manager();
-            $fractal->setSerializer(new ArraySerializer());
-            $resource = new Fractal\Resource\Item($status, new StatusStatelessTransformer());
+            $fractal = new Fractal\Manager;
+            $fractal->setSerializer(new ArraySerializer);
+            $resource = new Fractal\Resource\Item($status, new StatusStatelessTransformer);
             $res = $fractal->createData($resource)->toArray();
             $res['_pid'] = isset($res['account']) && isset($res['account']['id']) ? $res['account']['id'] : null;
-            if(isset($res['_pid'])) {
+            if (isset($res['_pid'])) {
                 unset($res['account']);
             }
+
             return $res;
         });
-        if($res && isset($res['_pid'])) {
+        if ($res && isset($res['_pid'])) {
             $res['account'] = $mastodonMode === true ? AccountService::getMastodon($res['_pid'], true) : AccountService::get($res['_pid'], true);
             unset($res['_pid']);
         }
+
         return $res;
     }
 
     public static function getMastodon($id, $publicOnly = true)
     {
         $status = self::get($id, $publicOnly, true);
-        if(!$status) {
+        if (! $status) {
             return null;
         }
 
-        if(!isset($status['account'])) {
+        if (! isset($status['account'])) {
             return null;
         }
 
         $status['replies_count'] = $status['reply_count'];
 
-        if(config('exp.emc') == false) {
+        if (config('exp.emc') == false) {
             return $status;
         }
 
@@ -113,28 +112,29 @@ class StatusService
     {
         $status = self::get($id, false);
 
-        if(!$status) {
+        if (! $status || ! $pid) {
             return [
                 'liked' => false,
                 'shared' => false,
-                'bookmarked' => false
+                'bookmarked' => false,
             ];
         }
 
         return [
             'liked' => LikeService::liked($pid, $id),
             'shared' => self::isShared($id, $pid),
-            'bookmarked' => self::isBookmarked($id, $pid)
+            'bookmarked' => self::isBookmarked($id, $pid),
         ];
     }
 
     public static function getFull($id, $pid, $publicOnly = true)
     {
         $res = self::get($id, $publicOnly);
-        if(!$res || !isset($res['account']) || !isset($res['account']['id'])) {
+        if (! $res || ! isset($res['account']) || ! isset($res['account']['id'])) {
             return $res;
         }
         $res['relationship'] = RelationshipService::get($pid, $res['account']['id']);
+
         return $res;
     }
 
@@ -142,31 +142,33 @@ class StatusService
     {
         $status = Status::whereScope('direct')->find($id);
 
-        if(!$status) {
+        if (! $status) {
             return null;
         }
 
-        $fractal = new Fractal\Manager();
-        $fractal->setSerializer(new ArraySerializer());
-        $resource = new Fractal\Resource\Item($status, new StatusStatelessTransformer());
+        $fractal = new Fractal\Manager;
+        $fractal->setSerializer(new ArraySerializer);
+        $resource = new Fractal\Resource\Item($status, new StatusStatelessTransformer);
+
         return $fractal->createData($resource)->toArray();
     }
 
     public static function del($id, $purge = false)
     {
-        if($purge) {
+        if ($purge) {
             $status = self::get($id);
-            if($status && isset($status['account']) && isset($status['account']['id'])) {
-                Cache::forget('profile:embed:' . $status['account']['id']);
+            if ($status && isset($status['account']) && isset($status['account']['id'])) {
+                Cache::forget('profile:embed:'.$status['account']['id']);
             }
-            Cache::forget('status:transformer:media:attachments:' . $id);
+            Cache::forget('status:transformer:media:attachments:'.$id);
             MediaService::del($id);
-            Cache::forget('pf:services:sh:id:' . $id);
+            Cache::forget('pf:services:sh:id:'.$id);
             PublicTimelineService::rem($id);
             NetworkTimelineService::rem($id);
         }
 
         Cache::forget(self::key($id, false));
+
         return Cache::forget(self::key($id));
     }
 
@@ -191,4 +193,9 @@ class StatusService
             BookmarkService::get($pid, $id) :
             false;
     }
+
+    public static function totalLocalStatuses()
+    {
+        return InstanceService::totalLocalStatuses();
+    }
 }
diff --git a/app/Services/UserFilterService.php b/app/Services/UserFilterService.php
index 1dcdc819a..5673db60c 100644
--- a/app/Services/UserFilterService.php
+++ b/app/Services/UserFilterService.php
@@ -4,145 +4,160 @@ namespace App\Services;
 
 use Cache;
 use App\UserFilter;
+use App\Models\UserDomainBlock;
 use Illuminate\Support\Facades\Redis;
 
 class UserFilterService
 {
-	const USER_MUTES_KEY = 'pf:services:mutes:ids:';
-	const USER_BLOCKS_KEY = 'pf:services:blocks:ids:';
+    const USER_MUTES_KEY = 'pf:services:mutes:ids:';
+    const USER_BLOCKS_KEY = 'pf:services:blocks:ids:';
+    const USER_DOMAIN_KEY = 'pf:services:domain-blocks:ids:';
 
-	public static function mutes(int $profile_id)
-	{
-		$key = self::USER_MUTES_KEY . $profile_id;
-		$warm = Cache::has($key . ':cached-v0');
-		if($warm) {
-			return Redis::zrevrange($key, 0, -1) ?? [];
-		} else {
-			if(Redis::zrevrange($key, 0, -1)) {
-				return Redis::zrevrange($key, 0, -1);
-			}
-			$ids = UserFilter::whereFilterType('mute')
-				->whereUserId($profile_id)
-				->pluck('filterable_id')
-				->map(function($id) {
-					$acct = AccountService::get($id, true);
-					if(!$acct) {
-						return false;
-					}
-					return $acct['id'];
-				})
-				->filter(function($res) {
-					return $res;
-				})
-				->values()
-				->toArray();
-			foreach ($ids as $muted_id) {
-				Redis::zadd($key, (int) $muted_id, (int) $muted_id);
-			}
-			Cache::set($key . ':cached-v0', 1, 7776000);
-			return $ids;
-		}
-	}
+    public static function mutes(int $profile_id)
+    {
+        $key = self::USER_MUTES_KEY . $profile_id;
+        $warm = Cache::has($key . ':cached-v0');
+        if($warm) {
+            return Redis::zrevrange($key, 0, -1) ?? [];
+        } else {
+            if(Redis::zrevrange($key, 0, -1)) {
+                return Redis::zrevrange($key, 0, -1);
+            }
+            $ids = UserFilter::whereFilterType('mute')
+                ->whereUserId($profile_id)
+                ->pluck('filterable_id')
+                ->map(function($id) {
+                    $acct = AccountService::get($id, true);
+                    if(!$acct) {
+                        return false;
+                    }
+                    return $acct['id'];
+                })
+                ->filter(function($res) {
+                    return $res;
+                })
+                ->values()
+                ->toArray();
+            foreach ($ids as $muted_id) {
+                Redis::zadd($key, (int) $muted_id, (int) $muted_id);
+            }
+            Cache::set($key . ':cached-v0', 1, 7776000);
+            return $ids;
+        }
+    }
 
-	public static function blocks(int $profile_id)
-	{
-		$key = self::USER_BLOCKS_KEY . $profile_id;
-		$warm = Cache::has($key . ':cached-v0');
-		if($warm) {
-			return Redis::zrevrange($key, 0, -1) ?? [];
-		} else {
-			if(Redis::zrevrange($key, 0, -1)) {
-				return Redis::zrevrange($key, 0, -1);
-			}
-			$ids = UserFilter::whereFilterType('block')
-				->whereUserId($profile_id)
-				->pluck('filterable_id')
-				->map(function($id) {
-					$acct = AccountService::get($id, true);
-					if(!$acct) {
-						return false;
-					}
-					return $acct['id'];
-				})
-				->filter(function($res) {
-					return $res;
-				})
-				->values()
-				->toArray();
-			foreach ($ids as $blocked_id) {
-				Redis::zadd($key, (int) $blocked_id, (int) $blocked_id);
-			}
-			Cache::set($key . ':cached-v0', 1, 7776000);
-			return $ids;
-		}
-	}
+    public static function blocks(int $profile_id)
+    {
+        $key = self::USER_BLOCKS_KEY . $profile_id;
+        $warm = Cache::has($key . ':cached-v0');
+        if($warm) {
+            return Redis::zrevrange($key, 0, -1) ?? [];
+        } else {
+            if(Redis::zrevrange($key, 0, -1)) {
+                return Redis::zrevrange($key, 0, -1);
+            }
+            $ids = UserFilter::whereFilterType('block')
+                ->whereUserId($profile_id)
+                ->pluck('filterable_id')
+                ->map(function($id) {
+                    $acct = AccountService::get($id, true);
+                    if(!$acct) {
+                        return false;
+                    }
+                    return $acct['id'];
+                })
+                ->filter(function($res) {
+                    return $res;
+                })
+                ->values()
+                ->toArray();
+            foreach ($ids as $blocked_id) {
+                Redis::zadd($key, (int) $blocked_id, (int) $blocked_id);
+            }
+            Cache::set($key . ':cached-v0', 1, 7776000);
+            return $ids;
+        }
+    }
 
-	public static function filters(int $profile_id)
-	{
-		return array_unique(array_merge(self::mutes($profile_id), self::blocks($profile_id)));
-	}
+    public static function filters(int $profile_id)
+    {
+        return array_unique(array_merge(self::mutes($profile_id), self::blocks($profile_id)));
+    }
 
-	public static function mute(int $profile_id, int $muted_id)
-	{
-		if($profile_id == $muted_id) {
-			return false;
-		}
-		$key = self::USER_MUTES_KEY . $profile_id;
-		$mutes = self::mutes($profile_id);
-		$exists = in_array($muted_id, $mutes);
-		if(!$exists) {
-			Redis::zadd($key, $muted_id, $muted_id);
-		}
-		return true;
-	}
+    public static function mute(int $profile_id, int $muted_id)
+    {
+        if($profile_id == $muted_id) {
+            return false;
+        }
+        $key = self::USER_MUTES_KEY . $profile_id;
+        $mutes = self::mutes($profile_id);
+        $exists = in_array($muted_id, $mutes);
+        if(!$exists) {
+            Redis::zadd($key, $muted_id, $muted_id);
+        }
+        return true;
+    }
 
-	public static function unmute(int $profile_id, string $muted_id)
-	{
-		if($profile_id == $muted_id) {
-			return false;
-		}
-		$key = self::USER_MUTES_KEY . $profile_id;
-		$mutes = self::mutes($profile_id);
-		$exists = in_array($muted_id, $mutes);
-		if($exists) {
-			Redis::zrem($key, $muted_id);
-		}
-		return true;
-	}
+    public static function unmute(int $profile_id, string $muted_id)
+    {
+        if($profile_id == $muted_id) {
+            return false;
+        }
+        $key = self::USER_MUTES_KEY . $profile_id;
+        $mutes = self::mutes($profile_id);
+        $exists = in_array($muted_id, $mutes);
+        if($exists) {
+            Redis::zrem($key, $muted_id);
+        }
+        return true;
+    }
 
-	public static function block(int $profile_id, int $blocked_id)
-	{
-		if($profile_id == $blocked_id) {
-			return false;
-		}
-		$key = self::USER_BLOCKS_KEY . $profile_id;
-		$exists = in_array($blocked_id, self::blocks($profile_id));
-		if(!$exists) {
-			Redis::zadd($key, $blocked_id, $blocked_id);
-		}
-		return true;
-	}
+    public static function block(int $profile_id, int $blocked_id)
+    {
+        if($profile_id == $blocked_id) {
+            return false;
+        }
+        $key = self::USER_BLOCKS_KEY . $profile_id;
+        $exists = in_array($blocked_id, self::blocks($profile_id));
+        if(!$exists) {
+            Redis::zadd($key, $blocked_id, $blocked_id);
+        }
+        return true;
+    }
 
-	public static function unblock(int $profile_id, string $blocked_id)
-	{
-		if($profile_id == $blocked_id) {
-			return false;
-		}
-		$key = self::USER_BLOCKS_KEY . $profile_id;
-		$exists = in_array($blocked_id, self::blocks($profile_id));
-		if($exists) {
-			Redis::zrem($key, $blocked_id);
-		}
-		return $exists;
-	}
+    public static function unblock(int $profile_id, string $blocked_id)
+    {
+        if($profile_id == $blocked_id) {
+            return false;
+        }
+        $key = self::USER_BLOCKS_KEY . $profile_id;
+        $exists = in_array($blocked_id, self::blocks($profile_id));
+        if($exists) {
+            Redis::zrem($key, $blocked_id);
+        }
+        return $exists;
+    }
 
-	public static function blockCount(int $profile_id)
-	{
-		return Redis::zcard(self::USER_BLOCKS_KEY . $profile_id);
-	}
+    public static function blockCount(int $profile_id)
+    {
+        return Redis::zcard(self::USER_BLOCKS_KEY . $profile_id);
+    }
 
-	public static function muteCount(int $profile_id)
-	{
-		return Redis::zcard(self::USER_MUTES_KEY . $profile_id);
-	}
+    public static function muteCount(int $profile_id)
+    {
+        return Redis::zcard(self::USER_MUTES_KEY . $profile_id);
+    }
+
+    public static function domainBlocks($pid, $purge = false)
+    {
+        if($purge) {
+            Cache::forget(self::USER_DOMAIN_KEY . $pid);
+        }
+        return Cache::remember(
+            self::USER_DOMAIN_KEY . $pid,
+            21600,
+            function() use($pid) {
+                return UserDomainBlock::whereProfileId($pid)->pluck('domain')->toArray();
+        });
+    }
 }
diff --git a/app/Services/UserRoleService.php b/app/Services/UserRoleService.php
new file mode 100644
index 000000000..ed765a930
--- /dev/null
+++ b/app/Services/UserRoleService.php
@@ -0,0 +1,230 @@
+<?php
+
+namespace App\Services;
+
+use App\Models\UserRoles;
+
+class UserRoleService
+{
+    public static function can($action, $id, $useDefaultFallback = true)
+    {
+        $default = self::defaultRoles();
+        $roles = self::get($id);
+        return
+            in_array($action, array_keys($roles)) ?
+                $roles[$action] :
+                (
+                    $useDefaultFallback ?
+                        $default[$action] :
+                        false
+                );
+        }
+
+    public static function get($id)
+    {
+        if($roles = UserRoles::whereUserId($id)->first()) {
+            return $roles->roles;
+        }
+
+        return self::defaultRoles();
+    }
+
+    public static function roleKeys()
+    {
+        return array_keys(self::defaultRoles());
+    }
+
+    public static function defaultRoles()
+    {
+        return [
+            'account-force-private' => true,
+            'account-ignore-follow-requests' => true,
+
+            'can-view-public-feed' => true,
+            'can-view-network-feed' => true,
+            'can-view-discover' => true,
+            'can-view-hashtag-feed' => false,
+
+            'can-post' => true,
+            'can-comment' => true,
+            'can-like' => true,
+            'can-share' => true,
+
+            'can-follow' => false,
+            'can-make-public' => false,
+
+            'can-direct-message' => false,
+            'can-use-stories' => false,
+            'can-view-sensitive' => false,
+            'can-bookmark' => false,
+            'can-collections' => false,
+            'can-federation' => false,
+        ];
+    }
+
+    public static function getRoles($id)
+    {
+        $myRoles = self::get($id);
+        $roleData = collect(self::roleData())
+            ->map(function($role, $k) use($myRoles) {
+                $role['value'] = $myRoles[$k];
+                return $role;
+            })
+            ->toArray();
+        return $roleData;
+    }
+
+    public static function roleData()
+    {
+        return [
+            'account-force-private' => [
+                'title' => 'Force Private Account',
+                'action' => 'Prevent changing account from private'
+            ],
+            'account-ignore-follow-requests' => [
+                'title' => 'Ignore Follow Requests',
+                'action' => 'Hide follow requests and associated notifications'
+            ],
+            'can-view-public-feed' => [
+                'title' => 'Hide Public Feed',
+                'action' => 'Hide the public feed timeline'
+            ],
+            'can-view-network-feed' => [
+                'title' => 'Hide Network Feed',
+                'action' => 'Hide the network feed timeline'
+            ],
+            'can-view-discover' => [
+                'title' => 'Hide Discover',
+                'action' => 'Hide the discover feature'
+            ],
+            'can-post' => [
+                'title' => 'Can post',
+                'action' => 'Allows new posts to be shared'
+            ],
+            'can-comment' => [
+                'title' => 'Can comment',
+                'action' => 'Allows new comments to be posted'
+            ],
+            'can-like' => [
+                'title' => 'Can Like',
+                'action' => 'Allows the ability to like posts and comments'
+            ],
+            'can-share' => [
+                'title' => 'Can Share',
+                'action' => 'Allows the ability to share posts and comments'
+            ],
+            'can-follow' => [
+                'title' => 'Can Follow',
+                'action' => 'Allows the ability to follow accounts'
+            ],
+            'can-make-public' => [
+                'title' => 'Can make account public',
+                'action' => 'Allows the ability to make account public'
+            ],
+
+            'can-direct-message' => [
+                'title' => '',
+                'action' => ''
+            ],
+            'can-use-stories' => [
+                'title' => '',
+                'action' => ''
+            ],
+            'can-view-sensitive' => [
+                'title' => '',
+                'action' => ''
+            ],
+            'can-bookmark' => [
+                'title' => '',
+                'action' => ''
+            ],
+            'can-collections' => [
+                'title' => '',
+                'action' => ''
+            ],
+            'can-federation' => [
+                'title' => '',
+                'action' => ''
+            ],
+        ];
+    }
+
+    public static function mapInvite($id, $data = [])
+    {
+        $roles = self::get($id);
+
+        $map = [
+            'account-force-private' => 'private',
+            'account-ignore-follow-requests' => 'private',
+
+            'can-view-public-feed' => 'discovery_feeds',
+            'can-view-network-feed' => 'discovery_feeds',
+            'can-view-discover' => 'discovery_feeds',
+            'can-view-hashtag-feed' => 'discovery_feeds',
+
+            'can-post' => 'post',
+            'can-comment' => 'comment',
+            'can-like' => 'like',
+            'can-share' => 'share',
+
+            'can-follow' => 'follow',
+            'can-make-public' => '!private',
+
+            'can-direct-message' => 'dms',
+            'can-use-stories' => 'story',
+            'can-view-sensitive' => '!hide_cw',
+            'can-bookmark' => 'bookmark',
+            'can-collections' => 'collection',
+            'can-federation' => 'federation',
+        ];
+
+        foreach ($map as $key => $value) {
+            if(!isset($data[$value]) && !isset($data[substr($value, 1)])) {
+                $map[$key] = false;
+                continue;
+            }
+            $map[$key] = str_starts_with($value, '!') ? !$data[substr($value, 1)] : $data[$value];
+        }
+
+        return $map;
+    }
+
+    public static function mapActions($id, $data = [])
+    {
+        $res = [];
+        $map = [
+            'account-force-private' => 'private',
+            'account-ignore-follow-requests' => 'private',
+
+            'can-view-public-feed' => 'discovery_feeds',
+            'can-view-network-feed' => 'discovery_feeds',
+            'can-view-discover' => 'discovery_feeds',
+            'can-view-hashtag-feed' => 'discovery_feeds',
+
+            'can-post' => 'post',
+            'can-comment' => 'comment',
+            'can-like' => 'like',
+            'can-share' => 'share',
+
+            'can-follow' => 'follow',
+            'can-make-public' => '!private',
+
+            'can-direct-message' => 'dms',
+            'can-use-stories' => 'story',
+            'can-view-sensitive' => '!hide_cw',
+            'can-bookmark' => 'bookmark',
+            'can-collections' => 'collection',
+            'can-federation' => 'federation',
+        ];
+
+        foreach ($map as $key => $value) {
+            if(!isset($data[$value]) && !isset($data[substr($value, 1)])) {
+                $res[$key] = false;
+                continue;
+            }
+            $res[$key] = str_starts_with($value, '!') ? !$data[substr($value, 1)] : $data[$value];
+        }
+
+        return $res;
+    }
+}
diff --git a/app/Services/UserStorageService.php b/app/Services/UserStorageService.php
new file mode 100644
index 000000000..0fa5c7e0d
--- /dev/null
+++ b/app/Services/UserStorageService.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Services;
+
+use App\Media;
+use App\User;
+
+class UserStorageService
+{
+    const CACHE_KEY = 'pf:services:user-storage:byId:';
+
+    public static function get($id)
+    {
+        $user = User::find($id);
+        if (! $user || $user->status) {
+            return -1;
+        }
+
+        if ($user->storage_used_updated_at) {
+            return (int) $user->storage_used;
+        }
+        $updatedVal = self::calculateStorageUsed($id);
+        $user->storage_used = $updatedVal;
+        $user->storage_used_updated_at = now();
+        $user->save();
+
+        return $user->storage_used;
+    }
+
+    public static function calculateStorageUsed($id)
+    {
+        return (int) floor(Media::whereUserId($id)->sum('size') / 1000);
+    }
+
+    public static function recalculateUpdateStorageUsed($id)
+    {
+        $user = User::find($id);
+        if (! $user || $user->status) {
+            return;
+        }
+        $updatedVal = (int) floor(Media::whereUserId($id)->sum('size') / 1000);
+        $user->storage_used = $updatedVal;
+        $user->storage_used_updated_at = now();
+        $user->save();
+
+        return $updatedVal;
+    }
+}
diff --git a/app/Services/WebfingerService.php b/app/Services/WebfingerService.php
index 385bff023..7340109f5 100644
--- a/app/Services/WebfingerService.php
+++ b/app/Services/WebfingerService.php
@@ -2,69 +2,95 @@
 
 namespace App\Services;
 
-use Cache;
 use App\Profile;
+use App\Util\ActivityPub\Helpers;
 use App\Util\Webfinger\WebfingerUrl;
 use Illuminate\Support\Facades\Http;
-use App\Util\ActivityPub\Helpers;
-use App\Services\AccountService;
 
 class WebfingerService
 {
-	public static function lookup($query, $mastodonMode = false)
-	{
-		return (new self)->run($query, $mastodonMode);
-	}
+    public static function rawGet($url)
+    {
+        $n = WebfingerUrl::get($url);
+        if (! $n) {
+            return false;
+        }
+        $webfinger = FetchCacheService::getJson($n);
+        if (! $webfinger) {
+            return false;
+        }
 
-	protected function run($query, $mastodonMode)
-	{
-		if($profile = Profile::whereUsername($query)->first()) {
-			return $mastodonMode ?
-				AccountService::getMastodon($profile->id, true) :
-				AccountService::get($profile->id);
-		}
-		$url = WebfingerUrl::generateWebfingerUrl($query);
-		if(!Helpers::validateUrl($url)) {
-			return [];
-		}
+        if (! isset($webfinger['links']) || ! is_array($webfinger['links']) || empty($webfinger['links'])) {
+            return false;
+        }
+        $link = collect($webfinger['links'])
+            ->filter(function ($link) {
+                return $link &&
+                    isset($link['rel'], $link['type'], $link['href']) &&
+                    $link['rel'] === 'self' &&
+                    in_array($link['type'], ['application/activity+json', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"']);
+            })
+            ->pluck('href')
+            ->first();
 
-		try {
-			$res = Http::retry(3, 100)
-				->acceptJson()
-				->withHeaders([
-					'User-Agent' => '(Pixelfed/' . config('pixelfed.version') . '; +' . config('app.url') . ')'
-				])
-				->timeout(20)
-				->get($url);
-		} catch (\Illuminate\Http\Client\ConnectionException $e) {
-			return [];
-		}
+        return $link;
+    }
 
-		if(!$res->successful()) {
-			return [];
-		}
+    public static function lookup($query, $mastodonMode = false)
+    {
+        return (new self)->run($query, $mastodonMode);
+    }
 
-		$webfinger = $res->json();
-		if(!isset($webfinger['links']) || !is_array($webfinger['links']) || empty($webfinger['links'])) {
-			return [];
-		}
+    protected function run($query, $mastodonMode)
+    {
+        if ($profile = Profile::whereUsername($query)->first()) {
+            return $mastodonMode ?
+                AccountService::getMastodon($profile->id, true) :
+                AccountService::get($profile->id);
+        }
+        $url = WebfingerUrl::generateWebfingerUrl($query);
+        if (! Helpers::validateUrl($url)) {
+            return [];
+        }
 
-		$link = collect($webfinger['links'])
-			->filter(function($link) {
-				return $link &&
-					isset($link['rel'], $link['type'], $link['href']) &&
-					$link['rel'] === 'self' &&
-					in_array($link['type'], ['application/activity+json','application/ld+json; profile="https://www.w3.org/ns/activitystreams"']);
-			})
-			->pluck('href')
-			->first();
+        try {
+            $res = Http::retry(3, 100)
+                ->acceptJson()
+                ->withHeaders([
+                    'User-Agent' => '(Pixelfed/'.config('pixelfed.version').'; +'.config('app.url').')',
+                ])
+                ->timeout(20)
+                ->get($url);
+        } catch (\Illuminate\Http\Client\ConnectionException $e) {
+            return [];
+        }
 
-		$profile = Helpers::profileFetch($link);
-		if(!$profile) {
-			return;
-		}
-		return $mastodonMode ?
-			AccountService::getMastodon($profile->id, true) :
-			AccountService::get($profile->id);
-	}
+        if (! $res->successful()) {
+            return [];
+        }
+
+        $webfinger = $res->json();
+        if (! isset($webfinger['links']) || ! is_array($webfinger['links']) || empty($webfinger['links'])) {
+            return [];
+        }
+
+        $link = collect($webfinger['links'])
+            ->filter(function ($link) {
+                return $link &&
+                    isset($link['rel'], $link['type'], $link['href']) &&
+                    $link['rel'] === 'self' &&
+                    in_array($link['type'], ['application/activity+json', 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"']);
+            })
+            ->pluck('href')
+            ->first();
+
+        $profile = Helpers::profileFetch($link);
+        if (! $profile) {
+            return;
+        }
+
+        return $mastodonMode ?
+            AccountService::getMastodon($profile->id, true) :
+            AccountService::get($profile->id);
+    }
 }
diff --git a/app/Status.php b/app/Status.php
index d665464ae..8b69c199c 100644
--- a/app/Status.php
+++ b/app/Status.php
@@ -308,46 +308,6 @@ class Status extends Model
 		return $this->comments()->orderBy('created_at', 'desc')->take(3);
 	}
 
-	public function toActivityPubObject()
-	{
-		if($this->local == false) {
-			return;
-		}
-		$profile = $this->profile;
-		$to = $this->scopeToAudience('to');
-		$cc = $this->scopeToAudience('cc');
-		return [
-			'@context' => 'https://www.w3.org/ns/activitystreams',
-			'id'    => $this->permalink(),
-			'type'  => 'Create',
-			'actor' => $profile->permalink(),
-			'published' => str_replace('+00:00', 'Z', $this->created_at->format(DATE_RFC3339_EXTENDED)),
-			'to' => $to,
-			'cc' => $cc,
-			'object' => [
-				'id' => $this->url(),
-				'type' => 'Note',
-				'summary' => null,
-				'inReplyTo' => null,
-				'published' => str_replace('+00:00', 'Z', $this->created_at->format(DATE_RFC3339_EXTENDED)),
-				'url' => $this->url(),
-				'attributedTo' => $this->profile->url(),
-				'to' => $to,
-				'cc' => $cc,
-				'sensitive' => (bool) $this->is_nsfw,
-				'content' => $this->rendered,
-				'attachment' => $this->media->map(function($media) {
-					return [
-						'type' => 'Document',
-						'mediaType' => $media->mime,
-						'url' => $media->url(),
-						'name' => null
-					];
-				})->toArray()
-			]
-		];
-	}
-
 	public function scopeToAudience($audience)
 	{
 		if(!in_array($audience, ['to', 'cc']) || $this->local == false) { 
diff --git a/app/Transformer/ActivityPub/ProfileTransformer.php b/app/Transformer/ActivityPub/ProfileTransformer.php
index cdd4eb82d..96d129bf7 100644
--- a/app/Transformer/ActivityPub/ProfileTransformer.php
+++ b/app/Transformer/ActivityPub/ProfileTransformer.php
@@ -3,66 +3,80 @@
 namespace App\Transformer\ActivityPub;
 
 use App\Profile;
-use League\Fractal;
 use App\Services\AccountService;
+use League\Fractal;
 
 class ProfileTransformer extends Fractal\TransformerAbstract
 {
     public function transform(Profile $profile)
     {
         $res = [
-          '@context' => [
-            'https://w3id.org/security/v1',
-            'https://www.w3.org/ns/activitystreams',
-            [
-              'toot' => 'http://joinmastodon.org/ns#',
-              'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers',
-              'alsoKnownAs' => [
-                    '@id' => 'as:alsoKnownAs',
-                    '@type' => '@id'
-              ],
-              'movedTo' => [
-                    '@id' => 'as:movedTo',
-                    '@type' => '@id'
-              ],
-              'indexable' => 'toot:indexable',
+            '@context' => [
+                'https://w3id.org/security/v1',
+                'https://www.w3.org/ns/activitystreams',
+                [
+                    'toot' => 'http://joinmastodon.org/ns#',
+                    'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers',
+                    'alsoKnownAs' => [
+                        '@id' => 'as:alsoKnownAs',
+                        '@type' => '@id',
+                    ],
+                    'movedTo' => [
+                        '@id' => 'as:movedTo',
+                        '@type' => '@id',
+                    ],
+                    'indexable' => 'toot:indexable',
+                    'suspended' => 'toot:suspended',
+                ],
             ],
-          ],
-          'id'                        => $profile->permalink(),
-          'type'                      => 'Person',
-          'following'                 => $profile->permalink('/following'),
-          'followers'                 => $profile->permalink('/followers'),
-          'inbox'                     => $profile->permalink('/inbox'),
-          'outbox'                    => $profile->permalink('/outbox'),
-          'preferredUsername'         => $profile->username,
-          'name'                      => $profile->name,
-          'summary'                   => $profile->bio,
-          'url'                       => $profile->url(),
-          'manuallyApprovesFollowers' => (bool) $profile->is_private,
-          'indexable'                 => (bool) $profile->indexable,
-          'publicKey' => [
-            'id'           => $profile->permalink().'#main-key',
-            'owner'        => $profile->permalink(),
-            'publicKeyPem' => $profile->public_key,
-          ],
-          'icon' => [
-            'type'      => 'Image',
-            'mediaType' => 'image/jpeg',
-            'url'       => $profile->avatarUrl(),
-          ],
-          'endpoints' => [
-            'sharedInbox' => config('app.url') . '/f/inbox'
-          ]
-      ];
+            'id' => $profile->permalink(),
+            'type' => 'Person',
+            'following' => $profile->permalink('/following'),
+            'followers' => $profile->permalink('/followers'),
+            'inbox' => $profile->permalink('/inbox'),
+            'outbox' => $profile->permalink('/outbox'),
+            'preferredUsername' => $profile->username,
+            'name' => $profile->name,
+            'summary' => $profile->bio,
+            'url' => $profile->url(),
+            'manuallyApprovesFollowers' => (bool) $profile->is_private,
+            'indexable' => (bool) $profile->indexable,
+            'published' => $profile->created_at->format('Y-m-d').'T00:00:00Z',
+            'publicKey' => [
+                'id' => $profile->permalink().'#main-key',
+                'owner' => $profile->permalink(),
+                'publicKeyPem' => $profile->public_key,
+            ],
+            'icon' => [
+                'type' => 'Image',
+                'mediaType' => 'image/jpeg',
+                'url' => $profile->avatarUrl(),
+            ],
+            'endpoints' => [
+                'sharedInbox' => config('app.url').'/f/inbox',
+            ],
+        ];
 
-      if($profile->aliases->count()) {
-        $res['alsoKnownAs'] = $profile->aliases->map(fn($alias) => $alias->uri);
-      }
+        if ($profile->status === 'delete' || $profile->deleted_at != null) {
+            $res['suspended'] = true;
+            $res['name'] = '';
+            unset($res['icon']);
+            $res['summary'] = '';
+            $res['indexable'] = false;
+            $res['manuallyApprovesFollowers'] = false;
+        } else {
+            if ($profile->aliases->count()) {
+                $res['alsoKnownAs'] = $profile->aliases->map(fn ($alias) => $alias->uri);
+            }
 
-      if($profile->moved_to_profile_id) {
-        $res['movedTo'] = AccountService::get($profile->moved_to_profile_id)['url'];
-      }
+            if ($profile->moved_to_profile_id) {
+                $movedTo = AccountService::get($profile->moved_to_profile_id);
+                if ($movedTo && isset($movedTo['url'], $movedTo['id'])) {
+                    $res['movedTo'] = $movedTo['url'];
+                }
+            }
+        }
 
-      return $res;
+        return $res;
     }
 }
diff --git a/app/Transformer/ActivityPub/StatusTransformer.php b/app/Transformer/ActivityPub/StatusTransformer.php
index f5d5ea531..c7f61b88b 100644
--- a/app/Transformer/ActivityPub/StatusTransformer.php
+++ b/app/Transformer/ActivityPub/StatusTransformer.php
@@ -2,59 +2,62 @@
 
 namespace App\Transformer\ActivityPub;
 
-use App\Status;
-use League\Fractal;
 use App\Services\MediaService;
+use App\Status;
+use App\Util\Lexer\Autolink;
+use League\Fractal;
 
 class StatusTransformer extends Fractal\TransformerAbstract
 {
     public function transform(Status $status)
     {
+        $content = $status->caption ? nl2br(Autolink::create()->autolink($status->caption)) : "";
+
         return [
-          '@context' => [
-            'https://www.w3.org/ns/activitystreams',
-            'https://w3id.org/security/v1',
-            [
-              'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers',
-              'featured'                  => [
-                'https://pixelfed.org/ns#featured' => ['@type' => '@id'],
-              ],
+            '@context' => [
+                'https://www.w3.org/ns/activitystreams',
+                'https://w3id.org/security/v1',
+                [
+                    'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers',
+                    'featured' => [
+                        'https://pixelfed.org/ns#featured' => ['@type' => '@id'],
+                    ],
+                ],
             ],
-          ],
-          'id' => $status->url(),
+            'id' => $status->url(),
 
-          // TODO: handle other types
-          'type' => 'Note',
+            // TODO: handle other types
+            'type' => 'Note',
 
-          // XXX: CW Title
-          'summary'   => null,
-          'content'   => $status->rendered ?? $status->caption,
-          'inReplyTo' => null,
+            // XXX: CW Title
+            'summary' => null,
+            'content' => $content,
+            'inReplyTo' => null,
 
-          // TODO: fix date format
-          'published'    => $status->created_at->toAtomString(),
-          'url'          => $status->url(),
-          'attributedTo' => $status->profile->permalink(),
-          'to'           => [
-            // TODO: handle proper scope
-            'https://www.w3.org/ns/activitystreams#Public',
-          ],
-          'cc' => [
-            // TODO: add cc's
-            $status->profile->permalink('/followers'),
-          ],
-          'sensitive'        => (bool) $status->is_nsfw,
-          'atomUri'          => $status->url(),
-          'inReplyToAtomUri' => null,
-          'attachment'       => MediaService::activitypub($status->id),
-          'tag' => [],
-          'location' => $status->place_id ? [
-              'type' => 'Place',
-              'name' => $status->place->name,
-              'longitude' => $status->place->long,
-              'latitude' => $status->place->lat,
-              'country' => $status->place->country
+            // TODO: fix date format
+            'published' => $status->created_at->toAtomString(),
+            'url' => $status->url(),
+            'attributedTo' => $status->profile->permalink(),
+            'to' => [
+                // TODO: handle proper scope
+                'https://www.w3.org/ns/activitystreams#Public',
+            ],
+            'cc' => [
+                // TODO: add cc's
+                $status->profile->permalink('/followers'),
+            ],
+            'sensitive' => (bool) $status->is_nsfw,
+            'atomUri' => $status->url(),
+            'inReplyToAtomUri' => null,
+            'attachment' => MediaService::activitypub($status->id),
+            'tag' => [],
+            'location' => $status->place_id ? [
+                'type' => 'Place',
+                'name' => $status->place->name,
+                'longitude' => $status->place->long,
+                'latitude' => $status->place->lat,
+                'country' => $status->place->country,
             ] : null,
-      ];
+        ];
     }
 }
diff --git a/app/Transformer/ActivityPub/Verb/CreateNote.php b/app/Transformer/ActivityPub/Verb/CreateNote.php
index 55fdfa8f4..cf2f0fb51 100644
--- a/app/Transformer/ActivityPub/Verb/CreateNote.php
+++ b/app/Transformer/ActivityPub/Verb/CreateNote.php
@@ -2,140 +2,144 @@
 
 namespace App\Transformer\ActivityPub\Verb;
 
-use App\Status;
-use League\Fractal;
 use App\Models\CustomEmoji;
+use App\Status;
+use App\Util\Lexer\Autolink;
 use Illuminate\Support\Str;
+use League\Fractal;
 
 class CreateNote extends Fractal\TransformerAbstract
 {
-	public function transform(Status $status)
-	{
-		$mentions = $status->mentions->map(function ($mention) {
-			$webfinger = $mention->emailUrl();
-			$name = Str::startsWith($webfinger, '@') ? 
-				$webfinger :
-				'@' . $webfinger;
-			return [
-				'type' => 'Mention',
-				'href' => $mention->permalink(),
-				'name' => $name
-			];
-		})->toArray();
+    public function transform(Status $status)
+    {
+        $mentions = $status->mentions->map(function ($mention) {
+            $webfinger = $mention->emailUrl();
+            $name = Str::startsWith($webfinger, '@') ?
+                $webfinger :
+                '@'.$webfinger;
 
-		if($status->in_reply_to_id != null) {
-			$parent = $status->parent()->profile;
-			if($parent) {
-				$webfinger = $parent->emailUrl();
-				$name = Str::startsWith($webfinger, '@') ? 
-					$webfinger :
-					'@' . $webfinger;
-				$reply = [
-					'type' => 'Mention',
-					'href' => $parent->permalink(),
-					'name' => $name
-				];
-				$mentions = array_merge($reply, $mentions);
-			}
-		}
+            return [
+                'type' => 'Mention',
+                'href' => $mention->permalink(),
+                'name' => $name,
+            ];
+        })->toArray();
 
-		$hashtags = $status->hashtags->map(function ($hashtag) {
-			return [
-				'type' => 'Hashtag',
-				'href' => $hashtag->url(),
-				'name' => "#{$hashtag->name}",
-			];
-		})->toArray();
+        if ($status->in_reply_to_id != null) {
+            $parent = $status->parent()->profile;
+            if ($parent) {
+                $webfinger = $parent->emailUrl();
+                $name = Str::startsWith($webfinger, '@') ?
+                    $webfinger :
+                    '@'.$webfinger;
+                $reply = [
+                    'type' => 'Mention',
+                    'href' => $parent->permalink(),
+                    'name' => $name,
+                ];
+                $mentions = array_merge($reply, $mentions);
+            }
+        }
 
-		$emojis = CustomEmoji::scan($status->caption, true) ?? [];
-		$emoji = array_merge($emojis, $mentions);
-		$tags = array_merge($emoji, $hashtags);
+        $hashtags = $status->hashtags->map(function ($hashtag) {
+            return [
+                'type' => 'Hashtag',
+                'href' => $hashtag->url(),
+                'name' => "#{$hashtag->name}",
+            ];
+        })->toArray();
 
-		return [
-			'@context' => [
-				'https://w3id.org/security/v1',
-				'https://www.w3.org/ns/activitystreams',
-				[
-					'Hashtag' 			=> 'as:Hashtag',
-					'sensitive' 		=> 'as:sensitive',
-					'schema' 			=> 'http://schema.org/',
-					'pixelfed' 			=> 'http://pixelfed.org/ns#',
-					'commentsEnabled' 	=> [
-						'@id' 			=> 'pixelfed:commentsEnabled',
-						'@type' 		=> 'schema:Boolean'
-					],
-					'capabilities'		=> [
-						'@id' 			=> 'pixelfed:capabilities',
-						'@container'	=> '@set'
-					],
-					'announce'			=> [
-						'@id'			=> 'pixelfed:canAnnounce',
-						'@type'			=> '@id'
-					],
-					'like'				=> [
-						'@id' 			=> 'pixelfed:canLike',
-						'@type' 		=> '@id'
-					],
-					'reply'				=> [
-						'@id' 			=> 'pixelfed:canReply',
-						'@type' 		=> '@id'
-					],
-					'toot' 				=> 'http://joinmastodon.org/ns#',
-					'Emoji'				=> 'toot:Emoji',
-					'blurhash'			=> 'toot:blurhash',
-				]
-			],
-			'id' 					=> $status->permalink(),
-			'type' 					=> 'Create',
-			'actor' 				=> $status->profile->permalink(),
-			'published' 			=> $status->created_at->toAtomString(),
-			'to' 					=> $status->scopeToAudience('to'),
-			'cc' 					=> $status->scopeToAudience('cc'),
-			'object' => [
-				'id' 				=> $status->url(),
-				'type' 				=> 'Note',
-				'summary'   		=> $status->is_nsfw ? $status->cw_summary : null,
-				'content'   		=> $status->rendered ?? $status->caption,
-				'inReplyTo' 		=> $status->in_reply_to_id ? $status->parent()->url() : null,
-				'published'    		=> $status->created_at->toAtomString(),
-				'url'          		=> $status->url(),
-				'attributedTo' 		=> $status->profile->permalink(),
-				'to'           		=> $status->scopeToAudience('to'),
-				'cc' 				=> $status->scopeToAudience('cc'),
-				'sensitive'       	=> (bool) $status->is_nsfw,
-				'attachment'      	=> $status->media()->orderBy('order')->get()->map(function ($media) {
-					$res = [
-						'type'      => $media->activityVerb(),
-						'mediaType' => $media->mime,
-						'url'       => $media->url(),
-						'name'      => $media->caption,
-					];
-					if($media->blurhash) {
-						$res['blurhash'] = $media->blurhash;
-					}
-					if($media->width) {
-						$res['width'] = $media->width;
-					}
-					if($media->height) {
-						$res['height'] = $media->height;
-					}
-					return $res;
-				})->toArray(),
-				'tag' 				=> $tags,
-				'commentsEnabled'  => (bool) !$status->comments_disabled,
-				'capabilities' => [
-					'announce' => 'https://www.w3.org/ns/activitystreams#Public',
-					'like' => 'https://www.w3.org/ns/activitystreams#Public',
-					'reply' => $status->comments_disabled == true ? '[]' : 'https://www.w3.org/ns/activitystreams#Public'
-				],
-				'location' => $status->place_id ? [
-						'type' => 'Place',
-						'name' => $status->place->name,
-						'longitude' => $status->place->long,
-						'latitude' => $status->place->lat,
-						'country' => $status->place->country
-					] : null,
-			]
-		];
-	}
+        $emojis = CustomEmoji::scan($status->caption, true) ?? [];
+        $emoji = array_merge($emojis, $mentions);
+        $tags = array_merge($emoji, $hashtags);
+        $content = $status->caption ? nl2br(Autolink::create()->autolink($status->caption)) : "";
+
+        return [
+            '@context' => [
+                'https://w3id.org/security/v1',
+                'https://www.w3.org/ns/activitystreams',
+                [
+                    'Hashtag' => 'as:Hashtag',
+                    'sensitive' => 'as:sensitive',
+                    'schema' => 'http://schema.org/',
+                    'pixelfed' => 'http://pixelfed.org/ns#',
+                    'commentsEnabled' => [
+                        '@id' => 'pixelfed:commentsEnabled',
+                        '@type' => 'schema:Boolean',
+                    ],
+                    'capabilities' => [
+                        '@id' => 'pixelfed:capabilities',
+                        '@container' => '@set',
+                    ],
+                    'announce' => [
+                        '@id' => 'pixelfed:canAnnounce',
+                        '@type' => '@id',
+                    ],
+                    'like' => [
+                        '@id' => 'pixelfed:canLike',
+                        '@type' => '@id',
+                    ],
+                    'reply' => [
+                        '@id' => 'pixelfed:canReply',
+                        '@type' => '@id',
+                    ],
+                    'toot' => 'http://joinmastodon.org/ns#',
+                    'Emoji' => 'toot:Emoji',
+                    'blurhash' => 'toot:blurhash',
+                ],
+            ],
+            'id' => $status->permalink(),
+            'type' => 'Create',
+            'actor' => $status->profile->permalink(),
+            'published' => $status->created_at->toAtomString(),
+            'to' => $status->scopeToAudience('to'),
+            'cc' => $status->scopeToAudience('cc'),
+            'object' => [
+                'id' => $status->url(),
+                'type' => 'Note',
+                'summary' => $status->is_nsfw ? $status->cw_summary : null,
+                'content' => $content,
+                'inReplyTo' => $status->in_reply_to_id ? $status->parent()->url() : null,
+                'published' => $status->created_at->toAtomString(),
+                'url' => $status->url(),
+                'attributedTo' => $status->profile->permalink(),
+                'to' => $status->scopeToAudience('to'),
+                'cc' => $status->scopeToAudience('cc'),
+                'sensitive' => (bool) $status->is_nsfw,
+                'attachment' => $status->media()->orderBy('order')->get()->map(function ($media) {
+                    $res = [
+                        'type' => $media->activityVerb(),
+                        'mediaType' => $media->mime,
+                        'url' => $media->url(),
+                        'name' => $media->caption,
+                    ];
+                    if ($media->blurhash) {
+                        $res['blurhash'] = $media->blurhash;
+                    }
+                    if ($media->width) {
+                        $res['width'] = $media->width;
+                    }
+                    if ($media->height) {
+                        $res['height'] = $media->height;
+                    }
+
+                    return $res;
+                })->toArray(),
+                'tag' => $tags,
+                'commentsEnabled' => (bool) ! $status->comments_disabled,
+                'capabilities' => [
+                    'announce' => 'https://www.w3.org/ns/activitystreams#Public',
+                    'like' => 'https://www.w3.org/ns/activitystreams#Public',
+                    'reply' => $status->comments_disabled == true ? '[]' : 'https://www.w3.org/ns/activitystreams#Public',
+                ],
+                'location' => $status->place_id ? [
+                    'type' => 'Place',
+                    'name' => $status->place->name,
+                    'longitude' => $status->place->long,
+                    'latitude' => $status->place->lat,
+                    'country' => $status->place->country,
+                ] : null,
+            ],
+        ];
+    }
 }
diff --git a/app/Transformer/ActivityPub/Verb/DeleteActor.php b/app/Transformer/ActivityPub/Verb/DeleteActor.php
new file mode 100644
index 000000000..5d3fdbc07
--- /dev/null
+++ b/app/Transformer/ActivityPub/Verb/DeleteActor.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Transformer\ActivityPub\Verb;
+
+use App\Profile;
+use League\Fractal;
+
+class DeleteActor extends Fractal\TransformerAbstract
+{
+    public function transform(Profile $profile)
+    {
+        return [
+            '@context' => 'https://www.w3.org/ns/activitystreams',
+            'id' => $profile->permalink('#delete'),
+            'type' => 'Delete',
+            'actor' => $profile->permalink(),
+            'to' => [
+                'https://www.w3.org/ns/activitystreams#Public'
+            ],
+            'object' => $profile->permalink()
+        ];
+    }
+
+}
diff --git a/app/Transformer/ActivityPub/Verb/Move.php b/app/Transformer/ActivityPub/Verb/Move.php
new file mode 100644
index 000000000..2460914be
--- /dev/null
+++ b/app/Transformer/ActivityPub/Verb/Move.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Transformer\ActivityPub\Verb;
+
+use App\Models\ProfileMigration;
+use League\Fractal;
+
+class Move extends Fractal\TransformerAbstract
+{
+    public function transform(ProfileMigration $migration)
+    {
+        $objUrl = $migration->target->permalink();
+        $id = $migration->target->permalink('#moves/'.$migration->id);
+        $to = $migration->target->permalink('/followers');
+
+        return [
+            '@context' => 'https://www.w3.org/ns/activitystreams',
+            'id' => $id,
+            'actor' => $objUrl,
+            'type' => 'Move',
+            'object' => $objUrl,
+            'target' => $migration->profile->permalink(),
+            'to' => $to,
+        ];
+    }
+}
diff --git a/app/Transformer/ActivityPub/Verb/Note.php b/app/Transformer/ActivityPub/Verb/Note.php
index 1350641d4..bc34761cd 100644
--- a/app/Transformer/ActivityPub/Verb/Note.php
+++ b/app/Transformer/ActivityPub/Verb/Note.php
@@ -2,133 +2,137 @@
 
 namespace App\Transformer\ActivityPub\Verb;
 
-use App\Status;
-use League\Fractal;
 use App\Models\CustomEmoji;
+use App\Status;
+use App\Util\Lexer\Autolink;
 use Illuminate\Support\Str;
+use League\Fractal;
 
 class Note extends Fractal\TransformerAbstract
 {
-	public function transform(Status $status)
-	{
+    public function transform(Status $status)
+    {
 
-		$mentions = $status->mentions->map(function ($mention) {
-			$webfinger = $mention->emailUrl();
-			$name = Str::startsWith($webfinger, '@') ? 
-				$webfinger :
-				'@' . $webfinger;
-			return [
-				'type' => 'Mention',
-				'href' => $mention->permalink(),
-				'name' => $name
-			];
-		})->toArray();
+        $mentions = $status->mentions->map(function ($mention) {
+            $webfinger = $mention->emailUrl();
+            $name = Str::startsWith($webfinger, '@') ?
+                $webfinger :
+                '@'.$webfinger;
 
-		if($status->in_reply_to_id != null) {
-			$parent = $status->parent()->profile;
-			if($parent) {
-				$webfinger = $parent->emailUrl();
-				$name = Str::startsWith($webfinger, '@') ? 
-					$webfinger :
-					'@' . $webfinger;
-				$reply = [
-					'type' => 'Mention',
-					'href' => $parent->permalink(),
-					'name' => $name
-				];
-				array_push($mentions, $reply);
-			}
-		}
-		
-		$hashtags = $status->hashtags->map(function ($hashtag) {
-			return [
-				'type' => 'Hashtag',
-				'href' => $hashtag->url(),
-				'name' => "#{$hashtag->name}",
-			];
-		})->toArray();
+            return [
+                'type' => 'Mention',
+                'href' => $mention->permalink(),
+                'name' => $name,
+            ];
+        })->toArray();
 
-		$emojis = CustomEmoji::scan($status->caption, true) ?? [];
-		$emoji = array_merge($emojis, $mentions);
-		$tags = array_merge($emoji, $hashtags);
+        if ($status->in_reply_to_id != null) {
+            $parent = $status->parent()->profile;
+            if ($parent) {
+                $webfinger = $parent->emailUrl();
+                $name = Str::startsWith($webfinger, '@') ?
+                    $webfinger :
+                    '@'.$webfinger;
+                $reply = [
+                    'type' => 'Mention',
+                    'href' => $parent->permalink(),
+                    'name' => $name,
+                ];
+                array_push($mentions, $reply);
+            }
+        }
 
-		return [
-			'@context' => [
-				'https://w3id.org/security/v1',
-				'https://www.w3.org/ns/activitystreams',
-				[
-					'Hashtag' 			=> 'as:Hashtag',
-					'sensitive' 		=> 'as:sensitive',
-					'schema' 			=> 'http://schema.org/',
-					'pixelfed' 			=> 'http://pixelfed.org/ns#',
-					'commentsEnabled' 	=> [
-						'@id' 			=> 'pixelfed:commentsEnabled',
-						'@type' 		=> 'schema:Boolean'
-					],
-					'capabilities'		=> [
-						'@id' 			=> 'pixelfed:capabilities',
-						'@container' 	=> '@set'
-					],
-					'announce'			=> [
-						'@id' 			=> 'pixelfed:canAnnounce',
-						'@type' 		=> '@id'
-					],
-					'like'				=> [
-						'@id' 			=> 'pixelfed:canLike',
-						'@type' 		=> '@id'
-					],
-					'reply'				=> [
-						'@id' 			=> 'pixelfed:canReply',
-						'@type' 		=> '@id'
-					],
-					'toot' 				=> 'http://joinmastodon.org/ns#',
-					'Emoji'				=> 'toot:Emoji',
-					'blurhash'			=> 'toot:blurhash',
-				]
-			],
-			'id' 				=> $status->url(),
-			'type' 				=> 'Note',
-			'summary'   		=> $status->is_nsfw ? $status->cw_summary : null,
-			'content'   		=> $status->rendered ?? $status->caption,
-			'inReplyTo' 		=> $status->in_reply_to_id ? $status->parent()->url() : null,
-			'published'    		=> $status->created_at->toAtomString(),
-			'url'          		=> $status->url(),
-			'attributedTo' 		=> $status->profile->permalink(),
-			'to'           		=> $status->scopeToAudience('to'),
-			'cc' 				=> $status->scopeToAudience('cc'),
-			'sensitive'       	=> (bool) $status->is_nsfw,
-			'attachment'      	=> $status->media()->orderBy('order')->get()->map(function ($media) {
-				$res = [
-					'type'      => $media->activityVerb(),
-					'mediaType' => $media->mime,
-					'url'       => $media->url(),
-					'name'      => $media->caption,
-				];
-				if($media->blurhash) {
-					$res['blurhash'] = $media->blurhash;
-				}
-				if($media->width) {
-					$res['width'] = $media->width;
-				}
-				if($media->height) {
-					$res['height'] = $media->height;
-				}
-				return $res;
-			})->toArray(),
-			'tag' 				=> $tags,
-			'commentsEnabled'  => (bool) !$status->comments_disabled,
-			'capabilities' => [
-				'announce' => 'https://www.w3.org/ns/activitystreams#Public',
-				'like' => 'https://www.w3.org/ns/activitystreams#Public',
-				'reply' => $status->comments_disabled == true ? '[]' : 'https://www.w3.org/ns/activitystreams#Public'
-			],
-			'location' => $status->place_id ? [
-					'type' => 'Place',
-					'name' => $status->place->name,
-					'longitude' => $status->place->long,
-					'latitude' => $status->place->lat,
-					'country' => $status->place->country
-				] : null,
-		];
-	}
+        $hashtags = $status->hashtags->map(function ($hashtag) {
+            return [
+                'type' => 'Hashtag',
+                'href' => $hashtag->url(),
+                'name' => "#{$hashtag->name}",
+            ];
+        })->toArray();
+
+        $emojis = CustomEmoji::scan($status->caption, true) ?? [];
+        $emoji = array_merge($emojis, $mentions);
+        $tags = array_merge($emoji, $hashtags);
+        $content = $status->caption ? nl2br(Autolink::create()->autolink($status->caption)) : "";
+
+        return [
+            '@context' => [
+                'https://w3id.org/security/v1',
+                'https://www.w3.org/ns/activitystreams',
+                [
+                    'Hashtag' => 'as:Hashtag',
+                    'sensitive' => 'as:sensitive',
+                    'schema' => 'http://schema.org/',
+                    'pixelfed' => 'http://pixelfed.org/ns#',
+                    'commentsEnabled' => [
+                        '@id' => 'pixelfed:commentsEnabled',
+                        '@type' => 'schema:Boolean',
+                    ],
+                    'capabilities' => [
+                        '@id' => 'pixelfed:capabilities',
+                        '@container' => '@set',
+                    ],
+                    'announce' => [
+                        '@id' => 'pixelfed:canAnnounce',
+                        '@type' => '@id',
+                    ],
+                    'like' => [
+                        '@id' => 'pixelfed:canLike',
+                        '@type' => '@id',
+                    ],
+                    'reply' => [
+                        '@id' => 'pixelfed:canReply',
+                        '@type' => '@id',
+                    ],
+                    'toot' => 'http://joinmastodon.org/ns#',
+                    'Emoji' => 'toot:Emoji',
+                    'blurhash' => 'toot:blurhash',
+                ],
+            ],
+            'id' => $status->url(),
+            'type' => 'Note',
+            'summary' => $status->is_nsfw ? $status->cw_summary : null,
+            'content' => $content,
+            'inReplyTo' => $status->in_reply_to_id ? $status->parent()->url() : null,
+            'published' => $status->created_at->toAtomString(),
+            'url' => $status->url(),
+            'attributedTo' => $status->profile->permalink(),
+            'to' => $status->scopeToAudience('to'),
+            'cc' => $status->scopeToAudience('cc'),
+            'sensitive' => (bool) $status->is_nsfw,
+            'attachment' => $status->media()->orderBy('order')->get()->map(function ($media) {
+                $res = [
+                    'type' => $media->activityVerb(),
+                    'mediaType' => $media->mime,
+                    'url' => $media->url(),
+                    'name' => $media->caption,
+                ];
+                if ($media->blurhash) {
+                    $res['blurhash'] = $media->blurhash;
+                }
+                if ($media->width) {
+                    $res['width'] = $media->width;
+                }
+                if ($media->height) {
+                    $res['height'] = $media->height;
+                }
+
+                return $res;
+            })->toArray(),
+            'tag' => $tags,
+            'commentsEnabled' => (bool) ! $status->comments_disabled,
+            'capabilities' => [
+                'announce' => 'https://www.w3.org/ns/activitystreams#Public',
+                'like' => 'https://www.w3.org/ns/activitystreams#Public',
+                'reply' => $status->comments_disabled == true ? '[]' : 'https://www.w3.org/ns/activitystreams#Public',
+            ],
+            'location' => $status->place_id ? [
+                'type' => 'Place',
+                'name' => $status->place->name,
+                'longitude' => $status->place->long,
+                'latitude' => $status->place->lat,
+                'country' => $status->place->country,
+            ] : null,
+        ];
+    }
 }
diff --git a/app/Transformer/ActivityPub/Verb/Question.php b/app/Transformer/ActivityPub/Verb/Question.php
index fb9313fb1..3d53ebcb5 100644
--- a/app/Transformer/ActivityPub/Verb/Question.php
+++ b/app/Transformer/ActivityPub/Verb/Question.php
@@ -3,104 +3,107 @@
 namespace App\Transformer\ActivityPub\Verb;
 
 use App\Status;
-use League\Fractal;
+use App\Util\Lexer\Autolink;
 use Illuminate\Support\Str;
+use League\Fractal;
 
 class Question extends Fractal\TransformerAbstract
 {
-	public function transform(Status $status)
-	{
-		$mentions = $status->mentions->map(function ($mention) {
-			$webfinger = $mention->emailUrl();
-			$name = Str::startsWith($webfinger, '@') ?
-				$webfinger :
-				'@' . $webfinger;
-			return [
-				'type' => 'Mention',
-				'href' => $mention->permalink(),
-				'name' => $name
-			];
-		})->toArray();
+    public function transform(Status $status)
+    {
+        $mentions = $status->mentions->map(function ($mention) {
+            $webfinger = $mention->emailUrl();
+            $name = Str::startsWith($webfinger, '@') ?
+                $webfinger :
+                '@'.$webfinger;
 
-		$hashtags = $status->hashtags->map(function ($hashtag) {
-			return [
-				'type' => 'Hashtag',
-				'href' => $hashtag->url(),
-				'name' => "#{$hashtag->name}",
-			];
-		})->toArray();
-		$tags = array_merge($mentions, $hashtags);
+            return [
+                'type' => 'Mention',
+                'href' => $mention->permalink(),
+                'name' => $name,
+            ];
+        })->toArray();
 
-		return [
-			'@context' => [
-				'https://w3id.org/security/v1',
-				'https://www.w3.org/ns/activitystreams',
-				[
-					'Hashtag' 			=> 'as:Hashtag',
-					'sensitive' 		=> 'as:sensitive',
-					'schema' 			=> 'http://schema.org/',
-					'pixelfed' 			=> 'http://pixelfed.org/ns#',
-					'commentsEnabled' 	=> [
-						'@id' 			=> 'pixelfed:commentsEnabled',
-						'@type' 		=> 'schema:Boolean'
-					],
-					'capabilities'		=> [
-						'@id' 			=> 'pixelfed:capabilities',
-						'@container' 	=> '@set'
-					],
-					'announce'			=> [
-						'@id' 			=> 'pixelfed:canAnnounce',
-						'@type' 		=> '@id'
-					],
-					'like'				=> [
-						'@id' 			=> 'pixelfed:canLike',
-						'@type' 		=> '@id'
-					],
-					'reply'				=> [
-						'@id' 			=> 'pixelfed:canReply',
-						'@type' 		=> '@id'
-					],
-					'toot' 				=> 'http://joinmastodon.org/ns#',
-					'Emoji'				=> 'toot:Emoji'
-				]
-			],
-			'id' 				=> $status->url(),
-			'type' 				=> 'Question',
-			'summary'   		=> null,
-			'content'   		=> $status->rendered ?? $status->caption,
-			'inReplyTo' 		=> $status->in_reply_to_id ? $status->parent()->url() : null,
-			'published'    		=> $status->created_at->toAtomString(),
-			'url'          		=> $status->url(),
-			'attributedTo' 		=> $status->profile->permalink(),
-			'to'           		=> $status->scopeToAudience('to'),
-			'cc' 				=> $status->scopeToAudience('cc'),
-			'sensitive'       	=> (bool) $status->is_nsfw,
-			'attachment'      	=> [],
-			'tag' 				=> $tags,
-			'commentsEnabled'  => (bool) !$status->comments_disabled,
-			'capabilities' => [
-				'announce' => 'https://www.w3.org/ns/activitystreams#Public',
-				'like' => 'https://www.w3.org/ns/activitystreams#Public',
-				'reply' => $status->comments_disabled == true ? '[]' : 'https://www.w3.org/ns/activitystreams#Public'
-			],
-			'location' => $status->place_id ? [
-					'type' => 'Place',
-					'name' => $status->place->name,
-					'longitude' => $status->place->long,
-					'latitude' => $status->place->lat,
-					'country' => $status->place->country
-				] : null,
-			'endTime' => $status->poll->expires_at->toAtomString(),
-			'oneOf' => collect($status->poll->poll_options)->map(function($option, $index) use($status) {
-				return [
-					'type' => 'Note',
-					'name' => $option,
-					'replies' => [
-						'type' => 'Collection',
-						'totalItems' => $status->poll->cached_tallies[$index]
-					]
-				];
-			})
-		];
-	}
+        $hashtags = $status->hashtags->map(function ($hashtag) {
+            return [
+                'type' => 'Hashtag',
+                'href' => $hashtag->url(),
+                'name' => "#{$hashtag->name}",
+            ];
+        })->toArray();
+        $tags = array_merge($mentions, $hashtags);
+        $content = $status->caption ? Autolink::create()->autolink($status->caption) : null;
+
+        return [
+            '@context' => [
+                'https://w3id.org/security/v1',
+                'https://www.w3.org/ns/activitystreams',
+                [
+                    'Hashtag' => 'as:Hashtag',
+                    'sensitive' => 'as:sensitive',
+                    'schema' => 'http://schema.org/',
+                    'pixelfed' => 'http://pixelfed.org/ns#',
+                    'commentsEnabled' => [
+                        '@id' => 'pixelfed:commentsEnabled',
+                        '@type' => 'schema:Boolean',
+                    ],
+                    'capabilities' => [
+                        '@id' => 'pixelfed:capabilities',
+                        '@container' => '@set',
+                    ],
+                    'announce' => [
+                        '@id' => 'pixelfed:canAnnounce',
+                        '@type' => '@id',
+                    ],
+                    'like' => [
+                        '@id' => 'pixelfed:canLike',
+                        '@type' => '@id',
+                    ],
+                    'reply' => [
+                        '@id' => 'pixelfed:canReply',
+                        '@type' => '@id',
+                    ],
+                    'toot' => 'http://joinmastodon.org/ns#',
+                    'Emoji' => 'toot:Emoji',
+                ],
+            ],
+            'id' => $status->url(),
+            'type' => 'Question',
+            'summary' => null,
+            'content' => $content,
+            'inReplyTo' => $status->in_reply_to_id ? $status->parent()->url() : null,
+            'published' => $status->created_at->toAtomString(),
+            'url' => $status->url(),
+            'attributedTo' => $status->profile->permalink(),
+            'to' => $status->scopeToAudience('to'),
+            'cc' => $status->scopeToAudience('cc'),
+            'sensitive' => (bool) $status->is_nsfw,
+            'attachment' => [],
+            'tag' => $tags,
+            'commentsEnabled' => (bool) ! $status->comments_disabled,
+            'capabilities' => [
+                'announce' => 'https://www.w3.org/ns/activitystreams#Public',
+                'like' => 'https://www.w3.org/ns/activitystreams#Public',
+                'reply' => $status->comments_disabled == true ? '[]' : 'https://www.w3.org/ns/activitystreams#Public',
+            ],
+            'location' => $status->place_id ? [
+                'type' => 'Place',
+                'name' => $status->place->name,
+                'longitude' => $status->place->long,
+                'latitude' => $status->place->lat,
+                'country' => $status->place->country,
+            ] : null,
+            'endTime' => $status->poll->expires_at->toAtomString(),
+            'oneOf' => collect($status->poll->poll_options)->map(function ($option, $index) use ($status) {
+                return [
+                    'type' => 'Note',
+                    'name' => $option,
+                    'replies' => [
+                        'type' => 'Collection',
+                        'totalItems' => $status->poll->cached_tallies[$index],
+                    ],
+                ];
+            }),
+        ];
+    }
 }
diff --git a/app/Transformer/ActivityPub/Verb/UpdateNote.php b/app/Transformer/ActivityPub/Verb/UpdateNote.php
index bdbb20c45..4199f7230 100644
--- a/app/Transformer/ActivityPub/Verb/UpdateNote.php
+++ b/app/Transformer/ActivityPub/Verb/UpdateNote.php
@@ -2,132 +2,135 @@
 
 namespace App\Transformer\ActivityPub\Verb;
 
-use App\Status;
-use League\Fractal;
 use App\Models\CustomEmoji;
+use App\Status;
+use App\Util\Lexer\Autolink;
 use Illuminate\Support\Str;
+use League\Fractal;
 
 class UpdateNote extends Fractal\TransformerAbstract
 {
-	public function transform(Status $status)
-	{
-		$mentions = $status->mentions->map(function ($mention) {
-			$webfinger = $mention->emailUrl();
-			$name = Str::startsWith($webfinger, '@') ?
-				$webfinger :
-				'@' . $webfinger;
-			return [
-				'type' => 'Mention',
-				'href' => $mention->permalink(),
-				'name' => $name
-			];
-		})->toArray();
+    public function transform(Status $status)
+    {
+        $mentions = $status->mentions->map(function ($mention) {
+            $webfinger = $mention->emailUrl();
+            $name = Str::startsWith($webfinger, '@') ?
+                $webfinger :
+                '@'.$webfinger;
 
-		if($status->in_reply_to_id != null) {
-			$parent = $status->parent()->profile;
-			if($parent) {
-				$webfinger = $parent->emailUrl();
-				$name = Str::startsWith($webfinger, '@') ?
-					$webfinger :
-					'@' . $webfinger;
-				$reply = [
-					'type' => 'Mention',
-					'href' => $parent->permalink(),
-					'name' => $name
-				];
-				$mentions = array_merge($reply, $mentions);
-			}
-		}
+            return [
+                'type' => 'Mention',
+                'href' => $mention->permalink(),
+                'name' => $name,
+            ];
+        })->toArray();
 
-		$hashtags = $status->hashtags->map(function ($hashtag) {
-			return [
-				'type' => 'Hashtag',
-				'href' => $hashtag->url(),
-				'name' => "#{$hashtag->name}",
-			];
-		})->toArray();
+        if ($status->in_reply_to_id != null) {
+            $parent = $status->parent()->profile;
+            if ($parent) {
+                $webfinger = $parent->emailUrl();
+                $name = Str::startsWith($webfinger, '@') ?
+                    $webfinger :
+                    '@'.$webfinger;
+                $reply = [
+                    'type' => 'Mention',
+                    'href' => $parent->permalink(),
+                    'name' => $name,
+                ];
+                $mentions = array_merge($reply, $mentions);
+            }
+        }
 
-		$emojis = CustomEmoji::scan($status->caption, true) ?? [];
-		$emoji = array_merge($emojis, $mentions);
-		$tags = array_merge($emoji, $hashtags);
+        $hashtags = $status->hashtags->map(function ($hashtag) {
+            return [
+                'type' => 'Hashtag',
+                'href' => $hashtag->url(),
+                'name' => "#{$hashtag->name}",
+            ];
+        })->toArray();
 
-		$latestEdit = $status->edits()->latest()->first();
+        $emojis = CustomEmoji::scan($status->caption, true) ?? [];
+        $emoji = array_merge($emojis, $mentions);
+        $tags = array_merge($emoji, $hashtags);
 
-		return [
-			'@context' => [
-				'https://w3id.org/security/v1',
-				'https://www.w3.org/ns/activitystreams',
-				[
-					'Hashtag' 			=> 'as:Hashtag',
-					'sensitive' 		=> 'as:sensitive',
-					'schema' 			=> 'http://schema.org/',
-					'pixelfed' 			=> 'http://pixelfed.org/ns#',
-					'commentsEnabled' 	=> [
-						'@id' 			=> 'pixelfed:commentsEnabled',
-						'@type' 		=> 'schema:Boolean'
-					],
-					'capabilities'		=> [
-						'@id' 			=> 'pixelfed:capabilities',
-						'@container'	=> '@set'
-					],
-					'announce'			=> [
-						'@id'			=> 'pixelfed:canAnnounce',
-						'@type'			=> '@id'
-					],
-					'like'				=> [
-						'@id' 			=> 'pixelfed:canLike',
-						'@type' 		=> '@id'
-					],
-					'reply'				=> [
-						'@id' 			=> 'pixelfed:canReply',
-						'@type' 		=> '@id'
-					],
-					'toot' 				=> 'http://joinmastodon.org/ns#',
-					'Emoji'				=> 'toot:Emoji'
-				]
-			],
-			'id' 					=> $status->permalink('#updates/' . $latestEdit->id),
-			'type' 					=> 'Update',
-			'actor' 				=> $status->profile->permalink(),
-			'published' 			=> $latestEdit->created_at->toAtomString(),
-			'to' 					=> $status->scopeToAudience('to'),
-			'cc' 					=> $status->scopeToAudience('cc'),
-			'object' => [
-				'id' 				=> $status->url(),
-				'type' 				=> 'Note',
-				'summary'   		=> $status->is_nsfw ? $status->cw_summary : null,
-				'content'   		=> $status->rendered ?? $status->caption,
-				'inReplyTo' 		=> $status->in_reply_to_id ? $status->parent()->url() : null,
-				'published'    		=> $status->created_at->toAtomString(),
-				'url'          		=> $status->url(),
-				'attributedTo' 		=> $status->profile->permalink(),
-				'to'           		=> $status->scopeToAudience('to'),
-				'cc' 				=> $status->scopeToAudience('cc'),
-				'sensitive'       	=> (bool) $status->is_nsfw,
-				'attachment'      	=> $status->media()->orderBy('order')->get()->map(function ($media) {
-					return [
-						'type'      => $media->activityVerb(),
-						'mediaType' => $media->mime,
-						'url'       => $media->url(),
-						'name'      => $media->caption,
-					];
-				})->toArray(),
-				'tag' 				=> $tags,
-				'commentsEnabled'  => (bool) !$status->comments_disabled,
-				'updated' => $latestEdit->created_at->toAtomString(),
-				'capabilities' => [
-					'announce' => 'https://www.w3.org/ns/activitystreams#Public',
-					'like' => 'https://www.w3.org/ns/activitystreams#Public',
-					'reply' => $status->comments_disabled == true ? '[]' : 'https://www.w3.org/ns/activitystreams#Public'
-				],
-				'location' => $status->place_id ? [
-						'type' => 'Place',
-						'name' => $status->place->name,
-						'longitude' => $status->place->long,
-						'latitude' => $status->place->lat,
-						'country' => $status->place->country
-					] : null,
-			]
-		];
-	}
+        $content = $status->caption ? nl2br(Autolink::create()->autolink($status->caption)) : "";
+        $latestEdit = $status->edits()->latest()->first();
+
+        return [
+            '@context' => [
+                'https://w3id.org/security/v1',
+                'https://www.w3.org/ns/activitystreams',
+                [
+                    'Hashtag' => 'as:Hashtag',
+                    'sensitive' => 'as:sensitive',
+                    'schema' => 'http://schema.org/',
+                    'pixelfed' => 'http://pixelfed.org/ns#',
+                    'commentsEnabled' => [
+                        '@id' => 'pixelfed:commentsEnabled',
+                        '@type' => 'schema:Boolean',
+                    ],
+                    'capabilities' => [
+                        '@id' => 'pixelfed:capabilities',
+                        '@container' => '@set',
+                    ],
+                    'announce' => [
+                        '@id' => 'pixelfed:canAnnounce',
+                        '@type' => '@id',
+                    ],
+                    'like' => [
+                        '@id' => 'pixelfed:canLike',
+                        '@type' => '@id',
+                    ],
+                    'reply' => [
+                        '@id' => 'pixelfed:canReply',
+                        '@type' => '@id',
+                    ],
+                    'toot' => 'http://joinmastodon.org/ns#',
+                    'Emoji' => 'toot:Emoji',
+                ],
+            ],
+            'id' => $status->permalink('#updates/'.$latestEdit->id),
+            'type' => 'Update',
+            'actor' => $status->profile->permalink(),
+            'published' => $latestEdit->created_at->toAtomString(),
+            'to' => $status->scopeToAudience('to'),
+            'cc' => $status->scopeToAudience('cc'),
+            'object' => [
+                'id' => $status->url(),
+                'type' => 'Note',
+                'summary' => $status->is_nsfw ? $status->cw_summary : null,
+                'content' => $content,
+                'inReplyTo' => $status->in_reply_to_id ? $status->parent()->url() : null,
+                'published' => $status->created_at->toAtomString(),
+                'url' => $status->url(),
+                'attributedTo' => $status->profile->permalink(),
+                'to' => $status->scopeToAudience('to'),
+                'cc' => $status->scopeToAudience('cc'),
+                'sensitive' => (bool) $status->is_nsfw,
+                'attachment' => $status->media()->orderBy('order')->get()->map(function ($media) {
+                    return [
+                        'type' => $media->activityVerb(),
+                        'mediaType' => $media->mime,
+                        'url' => $media->url(),
+                        'name' => $media->caption,
+                    ];
+                })->toArray(),
+                'tag' => $tags,
+                'commentsEnabled' => (bool) ! $status->comments_disabled,
+                'updated' => $latestEdit->created_at->toAtomString(),
+                'capabilities' => [
+                    'announce' => 'https://www.w3.org/ns/activitystreams#Public',
+                    'like' => 'https://www.w3.org/ns/activitystreams#Public',
+                    'reply' => $status->comments_disabled == true ? '[]' : 'https://www.w3.org/ns/activitystreams#Public',
+                ],
+                'location' => $status->place_id ? [
+                    'type' => 'Place',
+                    'name' => $status->place->name,
+                    'longitude' => $status->place->long,
+                    'latitude' => $status->place->lat,
+                    'country' => $status->place->country,
+                ] : null,
+            ],
+        ];
+    }
 }
diff --git a/app/Transformer/Api/AccountTransformer.php b/app/Transformer/Api/AccountTransformer.php
index 6c6fa17e4..9411d5a18 100644
--- a/app/Transformer/Api/AccountTransformer.php
+++ b/app/Transformer/Api/AccountTransformer.php
@@ -2,12 +2,13 @@
 
 namespace App\Transformer\Api;
 
-use Auth;
-use Cache;
 use App\Profile;
-use App\User;
-use League\Fractal;
+use App\Services\AccountService;
 use App\Services\PronounService;
+use App\User;
+use App\UserSetting;
+use Cache;
+use League\Fractal;
 
 class AccountTransformer extends Fractal\TransformerAbstract
 {
@@ -15,47 +16,77 @@ class AccountTransformer extends Fractal\TransformerAbstract
         // 'relationship',
     ];
 
-	public function transform(Profile $profile)
-	{
-		if(!$profile) {
-			return [];
-		}
+    public function transform(Profile $profile)
+    {
+        if (! $profile) {
+            return [];
+        }
 
-		$adminIds = Cache::remember('pf:admin-ids', 604800, function() {
-			return User::whereIsAdmin(true)->pluck('profile_id')->toArray();
-		});
+        $adminIds = Cache::remember('pf:admin-ids', 604800, function () {
+            return User::whereIsAdmin(true)->pluck('profile_id')->toArray();
+        });
 
-		$local = $profile->private_key != null;
-		$is_admin = !$local ? false : in_array($profile->id, $adminIds);
-		$acct = $local ? $profile->username : substr($profile->username, 1);
-		$username = $local ? $profile->username : explode('@', $acct)[0];
-		return [
-			'id' => (string) $profile->id,
-			'username' => $username,
-			'acct' => $acct,
-			'display_name' => $profile->name,
-			'discoverable' => true,
-			'locked' => (bool) $profile->is_private,
-			'followers_count' => (int) $profile->followers_count,
-			'following_count' => (int) $profile->following_count,
-			'statuses_count' => (int) $profile->status_count,
-			'note' => $profile->bio ?? '',
-			'note_text' => $profile->bio ? strip_tags($profile->bio) : null,
-			'url' => $profile->url(),
-			'avatar' => $profile->avatarUrl(),
-			'website' => $profile->website,
-			'local' => (bool) $local,
-			'is_admin' => (bool) $is_admin,
-			'created_at' => $profile->created_at->toJSON(),
-			'header_bg' => $profile->header_bg,
-			'last_fetched_at' => optional($profile->last_fetched_at)->toJSON(),
-			'pronouns' => PronounService::get($profile->id),
-			'location' => $profile->location
-		];
-	}
+        $local = $profile->private_key != null;
+        $local = $profile->user_id && $profile->private_key != null;
+        $hideFollowing = false;
+        $hideFollowers = false;
+        if ($local) {
+            $hideFollowing = Cache::remember('pf:acct-trans:hideFollowing:'.$profile->id, 2592000, function () use ($profile) {
+                $settings = UserSetting::whereUserId($profile->user_id)->first();
+                if (! $settings) {
+                    return false;
+                }
 
-	protected function includeRelationship(Profile $profile)
-	{
-		return $this->item($profile, new RelationshipTransformer());
-	}
+                return $settings->show_profile_following_count == false;
+            });
+            $hideFollowers = Cache::remember('pf:acct-trans:hideFollowers:'.$profile->id, 2592000, function () use ($profile) {
+                $settings = UserSetting::whereUserId($profile->user_id)->first();
+                if (! $settings) {
+                    return false;
+                }
+
+                return $settings->show_profile_follower_count == false;
+            });
+        }
+        $is_admin = ! $local ? false : in_array($profile->id, $adminIds);
+        $acct = $local ? $profile->username : substr($profile->username, 1);
+        $username = $local ? $profile->username : explode('@', $acct)[0];
+        $res = [
+            'id' => (string) $profile->id,
+            'username' => $username,
+            'acct' => $acct,
+            'display_name' => $profile->name,
+            'discoverable' => true,
+            'locked' => (bool) $profile->is_private,
+            'followers_count' => $hideFollowers ? 0 : (int) $profile->followers_count,
+            'following_count' => $hideFollowing ? 0 : (int) $profile->following_count,
+            'statuses_count' => (int) $profile->status_count,
+            'note' => $profile->bio ?? '',
+            'note_text' => $profile->bio ? strip_tags($profile->bio) : null,
+            'url' => $profile->url(),
+            'avatar' => $profile->avatarUrl(),
+            'website' => $profile->website,
+            'local' => (bool) $local,
+            'is_admin' => (bool) $is_admin,
+            'created_at' => $profile->created_at->toJSON(),
+            'header_bg' => $profile->header_bg,
+            'last_fetched_at' => optional($profile->last_fetched_at)->toJSON(),
+            'pronouns' => PronounService::get($profile->id),
+            'location' => $profile->location,
+        ];
+
+        if ($profile->moved_to_profile_id) {
+            $mt = AccountService::getMastodon($profile->moved_to_profile_id, true);
+            if ($mt) {
+                $res['moved'] = $mt;
+            }
+        }
+
+        return $res;
+    }
+
+    protected function includeRelationship(Profile $profile)
+    {
+        return $this->item($profile, new RelationshipTransformer());
+    }
 }
diff --git a/app/Transformer/Api/GroupPostTransformer.php b/app/Transformer/Api/GroupPostTransformer.php
new file mode 100644
index 000000000..0999b3fa4
--- /dev/null
+++ b/app/Transformer/Api/GroupPostTransformer.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Transformer\Api;
+
+use App\Status;
+use League\Fractal;
+use Cache;
+use App\Services\AccountService;
+use App\Services\HashidService;
+use App\Services\LikeService;
+use App\Services\Groups\GroupMediaService;
+use App\Services\MediaTagService;
+use App\Services\StatusService;
+use App\Services\StatusHashtagService;
+use App\Services\StatusLabelService;
+use App\Services\StatusMentionService;
+use App\Services\PollService;
+use App\Models\CustomEmoji;
+use App\Util\Lexer\Autolink;
+use Purify;
+
+class GroupPostTransformer extends Fractal\TransformerAbstract
+{
+    public function transform($status)
+    {
+        return [
+            'id'                        => (string) $status->id,
+            'gid'                       => $status->group_id ? (string) $status->group_id : null,
+            'url'                       => '/groups/' . $status->group_id . '/p/' . $status->id,
+            'content'                   => $status->caption,
+            'content_text'              => $status->caption,
+            'created_at'                => str_replace('+00:00', 'Z', $status->created_at->format(DATE_RFC3339_EXTENDED)),
+            'reblogs_count'             => $status->reblogs_count ?? 0,
+            'favourites_count'          => $status->likes_count ?? 0,
+            'reblogged'                 => null,
+            'favourited'                => null,
+            'muted'                     => null,
+            'sensitive'                 => (bool) $status->is_nsfw,
+            'spoiler_text'              => $status->cw_summary ?? '',
+            'visibility'                => $status->visibility,
+            'application'               => [
+                'name'      => 'web',
+                'website'   => null
+             ],
+            'language'                  => null,
+            'pf_type'                   => $status->type,
+            'reply_count'               => (int) $status->reply_count ?? 0,
+            'comments_disabled'         => (bool) $status->comments_disabled,
+            'thread'                    => false,
+            'media_attachments'         => GroupMediaService::get($status->id),
+            'replies'                   => [],
+            'parent'                    => [],
+            'place'                     => null,
+            'local'                     => (bool) !$status->remote_url,
+            'account'                   => AccountService::get($status->profile_id, true),
+            'poll'                      => [],
+        ];
+    }
+}
diff --git a/app/Transformer/Api/Mastodon/v1/StatusTransformer.php b/app/Transformer/Api/Mastodon/v1/StatusTransformer.php
index bfbc3d58b..16ff4cc30 100644
--- a/app/Transformer/Api/Mastodon/v1/StatusTransformer.php
+++ b/app/Transformer/Api/Mastodon/v1/StatusTransformer.php
@@ -2,48 +2,50 @@
 
 namespace App\Transformer\Api\Mastodon\v1;
 
-use App\Status;
-use League\Fractal;
-use Cache;
 use App\Services\MediaService;
 use App\Services\ProfileService;
 use App\Services\StatusHashtagService;
+use App\Status;
+use App\Util\Lexer\Autolink;
+use League\Fractal;
 
 class StatusTransformer extends Fractal\TransformerAbstract
 {
-	public function transform(Status $status)
-	{
-		return [
-			'id'                        => (string) $status->id,
-			'created_at'                => $status->created_at->toJSON(),
-			'in_reply_to_id'            => $status->in_reply_to_id ? (string) $status->in_reply_to_id : null,
-			'in_reply_to_account_id'    => $status->in_reply_to_profile_id ? (string) $status->in_reply_to_profile_id : null,
-			'sensitive'                 => (bool) $status->is_nsfw,
-			'spoiler_text'              => $status->cw_summary ?? '',
-			'visibility'                => $status->visibility ?? $status->scope,
-			'language'                  => 'en',
-			'uri'                       => $status->permalink(''),
-			'url'                       => $status->url(),
-			'replies_count'             => $status->reply_count ?? 0,
-			'reblogs_count'             => $status->reblogs_count ?? 0,
-			'favourites_count'          => $status->likes_count ?? 0,
-			'reblogged'                 => $status->shared(),
-			'favourited'                => $status->liked(),
-			'muted'                     => false,
-			'bookmarked'                => false,
-			'content'                   => $status->rendered ?? $status->caption ?? '',
-			'reblog'                    => null,
-			'application'               => [
-				'name'      => 'web',
-				'website'   => null
-			 ],
-			'mentions'                  => [],
-			'emojis'                    => [],
-			'card'                      => null,
-			'poll'                      => null,
-			'media_attachments'         => MediaService::get($status->id),
-			'account'                   => ProfileService::get($status->profile_id, true),
-			'tags'                      => StatusHashtagService::statusTags($status->id),
-		];
-	}
+    public function transform(Status $status)
+    {
+        $content = $status->caption ? nl2br(Autolink::create()->autolink($status->caption)) : "";
+
+        return [
+            'id' => (string) $status->id,
+            'created_at' => $status->created_at->toJSON(),
+            'in_reply_to_id' => $status->in_reply_to_id ? (string) $status->in_reply_to_id : null,
+            'in_reply_to_account_id' => $status->in_reply_to_profile_id ? (string) $status->in_reply_to_profile_id : null,
+            'sensitive' => (bool) $status->is_nsfw,
+            'spoiler_text' => $status->cw_summary ?? '',
+            'visibility' => $status->visibility ?? $status->scope,
+            'language' => 'en',
+            'uri' => $status->permalink(''),
+            'url' => $status->url(),
+            'replies_count' => $status->reply_count ?? 0,
+            'reblogs_count' => $status->reblogs_count ?? 0,
+            'favourites_count' => $status->likes_count ?? 0,
+            'reblogged' => $status->shared(),
+            'favourited' => $status->liked(),
+            'muted' => false,
+            'bookmarked' => false,
+            'content' => $content,
+            'reblog' => null,
+            'application' => [
+                'name' => 'web',
+                'website' => null,
+            ],
+            'mentions' => [],
+            'emojis' => [],
+            'card' => null,
+            'poll' => null,
+            'media_attachments' => MediaService::get($status->id),
+            'account' => ProfileService::get($status->profile_id, true),
+            'tags' => StatusHashtagService::statusTags($status->id),
+        ];
+    }
 }
diff --git a/app/Transformer/Api/NotificationTransformer.php b/app/Transformer/Api/NotificationTransformer.php
index 837c027af..cad5732b5 100644
--- a/app/Transformer/Api/NotificationTransformer.php
+++ b/app/Transformer/Api/NotificationTransformer.php
@@ -4,78 +4,81 @@ namespace App\Transformer\Api;
 
 use App\Notification;
 use App\Services\AccountService;
-use App\Services\HashidService;
 use App\Services\RelationshipService;
 use App\Services\StatusService;
 use League\Fractal;
 
 class NotificationTransformer extends Fractal\TransformerAbstract
 {
-	public function transform(Notification $notification)
-	{
-		$res = [
-			'id'       		=> (string) $notification->id,
-			'type'       	=> $this->replaceTypeVerb($notification->action),
-			'created_at' 	=> (string) str_replace('+00:00', 'Z', $notification->created_at->format(DATE_RFC3339_EXTENDED)),
-		];
+    public function transform(Notification $notification)
+    {
+        $res = [
+            'id' => (string) $notification->id,
+            'type' => $this->replaceTypeVerb($notification->action),
+            'created_at' => (string) str_replace('+00:00', 'Z', $notification->created_at->format(DATE_RFC3339_EXTENDED)),
+        ];
 
-		$n = $notification;
+        $n = $notification;
 
-		if($n->actor_id) {
-			$res['account'] = AccountService::get($n->actor_id);
-			if($n->profile_id != $n->actor_id) {
-				$res['relationship'] = RelationshipService::get($n->actor_id, $n->profile_id);
-			}
-		}
+        if ($n->actor_id) {
+            $res['account'] = AccountService::get($n->actor_id);
+            if ($n->profile_id != $n->actor_id) {
+                $res['relationship'] = RelationshipService::get($n->actor_id, $n->profile_id);
+            }
+        }
 
-		if($n->item_id && $n->item_type == 'App\Status') {
-			$res['status'] = StatusService::get($n->item_id, false);
-		}
+        if ($n->item_id && $n->item_type == 'App\Status') {
+            $res['status'] = StatusService::get($n->item_id, false);
+        }
 
-		if($n->item_id && $n->item_type == 'App\ModLog') {
-			$ml = $n->item;
-			if($ml && $ml->object_uid) {
-				$res['modlog'] = [
-					'id' => $ml->object_uid,
-					'url' => url('/i/admin/users/modlogs/' . $ml->object_uid)
-				];
-			}
-		}
+        if ($n->item_id && $n->item_type == 'App\ModLog') {
+            $ml = $n->item;
+            if ($ml && $ml->object_uid) {
+                $res['modlog'] = [
+                    'id' => $ml->object_uid,
+                    'url' => url('/i/admin/users/modlogs/'.$ml->object_uid),
+                ];
+            }
+        }
 
-		if($n->item_id && $n->item_type == 'App\MediaTag') {
-			$ml = $n->item;
-			if($ml && $ml->tagged_username) {
-				$res['tagged'] = [
-					'username' => $ml->tagged_username,
-					'post_url' => '/p/'.HashidService::encode($ml->status_id)
-				];
-			}
-		}
+        if ($n->item_id && $n->item_type == 'App\MediaTag') {
+            $ml = $n->item;
+            if ($ml && $ml->tagged_username) {
+                $np = StatusService::get($ml->status_id, false);
+                if ($np && isset($np['id'])) {
+                    $res['tagged'] = [
+                        'username' => $ml->tagged_username,
+                        'post_url' => $np['url'],
+                        'status_id' => $ml->status_id,
+                        'profile_id' => $ml->profile_id,
+                    ];
+                }
+            }
+        }
 
-		return $res;
-	}
+        return $res;
+    }
 
-	public function replaceTypeVerb($verb)
-	{
-		$verbs = [
-			'dm'	=> 'direct',
-			'follow' => 'follow',
-			'mention' => 'mention',
-			'reblog' => 'share',
-			'share' => 'share',
-			'like' => 'favourite',
-			'group:like' => 'favourite',
-			'comment' => 'comment',
-			'admin.user.modlog.comment' => 'modlog',
-			'tagged' => 'tagged',
-			'story:react' => 'story:react',
-			'story:comment' => 'story:comment',
-		];
+    public function replaceTypeVerb($verb)
+    {
+        $verbs = [
+            'dm' => 'direct',
+            'follow' => 'follow',
+            'mention' => 'mention',
+            'reblog' => 'share',
+            'share' => 'share',
+            'like' => 'favourite',
+            'comment' => 'comment',
+            'admin.user.modlog.comment' => 'modlog',
+            'tagged' => 'tagged',
+            'story:react' => 'story:react',
+            'story:comment' => 'story:comment',
+        ];
 
-		if(!isset($verbs[$verb])) {
-			return $verb;
-		}
+        if (! isset($verbs[$verb])) {
+            return $verb;
+        }
 
-		return $verbs[$verb];
-	}
+        return $verbs[$verb];
+    }
 }
diff --git a/app/Transformer/Api/StatusStatelessTransformer.php b/app/Transformer/Api/StatusStatelessTransformer.php
index 3c2c02d60..9f52ab50a 100644
--- a/app/Transformer/Api/StatusStatelessTransformer.php
+++ b/app/Transformer/Api/StatusStatelessTransformer.php
@@ -2,76 +2,73 @@
 
 namespace App\Transformer\Api;
 
-use App\Status;
-use League\Fractal;
-use Cache;
+use App\Models\CustomEmoji;
 use App\Services\AccountService;
 use App\Services\HashidService;
 use App\Services\LikeService;
 use App\Services\MediaService;
 use App\Services\MediaTagService;
-use App\Services\StatusService;
+use App\Services\PollService;
 use App\Services\StatusHashtagService;
 use App\Services\StatusLabelService;
 use App\Services\StatusMentionService;
-use App\Services\PollService;
-use App\Models\CustomEmoji;
+use App\Services\StatusService;
+use App\Status;
 use App\Util\Lexer\Autolink;
+use League\Fractal;
 
 class StatusStatelessTransformer extends Fractal\TransformerAbstract
 {
-	public function transform(Status $status)
-	{
-		$taggedPeople = MediaTagService::get($status->id);
-		$poll = $status->type === 'poll' ? PollService::get($status->id) : null;
-        $rendered = config('exp.autolink') ?
-            ( $status->caption ? Autolink::create()->autolink($status->caption) : '' ) :
-            ( $status->rendered ?? $status->caption );
+    public function transform(Status $status)
+    {
+        $taggedPeople = MediaTagService::get($status->id);
+        $poll = $status->type === 'poll' ? PollService::get($status->id) : null;
+        $rendered = $status->caption ? nl2br(Autolink::create()->autolink($status->caption)) : "";
 
-		return [
-			'_v'                        => 1,
-			'id'                        => (string) $status->id,
-			//'gid'						=> $status->group_id ? (string) $status->group_id : null,
-			'shortcode'                 => HashidService::encode($status->id),
-			'uri'                       => $status->url(),
-			'url'                       => $status->url(),
-			'in_reply_to_id'            => $status->in_reply_to_id ? (string) $status->in_reply_to_id : null,
-			'in_reply_to_account_id'    => $status->in_reply_to_profile_id ? (string) $status->in_reply_to_profile_id : null,
-			'reblog'                    => $status->reblog_of_id ? StatusService::get($status->reblog_of_id, false) : null,
-			'content'                   => $rendered,
-			'content_text'              => $status->caption,
-			'created_at'                => str_replace('+00:00', 'Z', $status->created_at->format(DATE_RFC3339_EXTENDED)),
-			'emojis'                    => CustomEmoji::scan($status->caption),
-			'reblogs_count'             => $status->reblogs_count ?? 0,
-			'favourites_count'          => $status->likes_count ?? 0,
-			'reblogged'                 => null,
-			'favourited'                => null,
-			'muted'                     => null,
-			'sensitive'                 => (bool) $status->is_nsfw,
-			'spoiler_text'              => $status->cw_summary ?? '',
-			'visibility'                => $status->scope ?? $status->visibility,
-			'application'               => [
-				'name'      => 'web',
-				'website'   => null
-			 ],
-			'language'                  => null,
-			'mentions'                  => StatusMentionService::get($status->id),
-			'pf_type'                   => $status->type ?? $status->setType(),
-			'reply_count'               => (int) $status->reply_count,
-			'comments_disabled'         => (bool) $status->comments_disabled,
-			'thread'                    => false,
-			'replies'                   => [],
-			'parent'                    => [],
-			'place'                     => $status->place,
-			'local'                     => (bool) $status->local,
-			'taggedPeople'              => $taggedPeople,
-			'label'                     => StatusLabelService::get($status),
-			'liked_by'                  => LikeService::likedBy($status),
-			'media_attachments'			=> MediaService::get($status->id),
-			'account'					=> AccountService::get($status->profile_id, true),
-			'tags'						=> StatusHashtagService::statusTags($status->id),
-			'poll'						=> $poll,
-			'edited_at'					=> $status->edited_at ? str_replace('+00:00', 'Z', $status->edited_at->format(DATE_RFC3339_EXTENDED)) : null,
-		];
-	}
+        return [
+            '_v' => 1,
+            'id' => (string) $status->id,
+            //'gid'						=> $status->group_id ? (string) $status->group_id : null,
+            'shortcode' => HashidService::encode($status->id),
+            'uri' => $status->url(),
+            'url' => $status->url(),
+            'in_reply_to_id' => $status->in_reply_to_id ? (string) $status->in_reply_to_id : null,
+            'in_reply_to_account_id' => $status->in_reply_to_profile_id ? (string) $status->in_reply_to_profile_id : null,
+            'reblog' => $status->reblog_of_id ? StatusService::get($status->reblog_of_id, false) : null,
+            'content' => $rendered,
+            'content_text' => $status->caption,
+            'created_at' => str_replace('+00:00', 'Z', $status->created_at->format(DATE_RFC3339_EXTENDED)),
+            'emojis' => CustomEmoji::scan($status->caption),
+            'reblogs_count' => $status->reblogs_count ?? 0,
+            'favourites_count' => $status->likes_count ?? 0,
+            'reblogged' => null,
+            'favourited' => null,
+            'muted' => null,
+            'sensitive' => (bool) $status->is_nsfw,
+            'spoiler_text' => $status->cw_summary ?? '',
+            'visibility' => $status->scope ?? $status->visibility,
+            'application' => [
+                'name' => 'web',
+                'website' => null,
+            ],
+            'language' => null,
+            'mentions' => StatusMentionService::get($status->id),
+            'pf_type' => $status->type ?? $status->setType(),
+            'reply_count' => (int) $status->reply_count,
+            'comments_disabled' => (bool) $status->comments_disabled,
+            'thread' => false,
+            'replies' => [],
+            'parent' => [],
+            'place' => $status->place,
+            'local' => (bool) $status->local,
+            'taggedPeople' => $taggedPeople,
+            'label' => StatusLabelService::get($status),
+            'liked_by' => LikeService::likedBy($status),
+            'media_attachments' => MediaService::get($status->id),
+            'account' => AccountService::get($status->profile_id, true),
+            'tags' => StatusHashtagService::statusTags($status->id),
+            'poll' => $poll,
+            'edited_at' => $status->edited_at ? str_replace('+00:00', 'Z', $status->edited_at->format(DATE_RFC3339_EXTENDED)) : null,
+        ];
+    }
 }
diff --git a/app/Transformer/Api/StatusTransformer.php b/app/Transformer/Api/StatusTransformer.php
index 22a840ce0..4dc08b618 100644
--- a/app/Transformer/Api/StatusTransformer.php
+++ b/app/Transformer/Api/StatusTransformer.php
@@ -2,80 +2,75 @@
 
 namespace App\Transformer\Api;
 
-use App\Like;
-use App\Status;
-use League\Fractal;
-use Cache;
+use App\Models\CustomEmoji;
+use App\Services\BookmarkService;
 use App\Services\HashidService;
 use App\Services\LikeService;
 use App\Services\MediaService;
 use App\Services\MediaTagService;
-use App\Services\StatusService;
+use App\Services\PollService;
+use App\Services\ProfileService;
 use App\Services\StatusHashtagService;
 use App\Services\StatusLabelService;
 use App\Services\StatusMentionService;
-use App\Services\ProfileService;
-use Illuminate\Support\Str;
-use App\Services\PollService;
-use App\Models\CustomEmoji;
-use App\Services\BookmarkService;
+use App\Services\StatusService;
+use App\Status;
 use App\Util\Lexer\Autolink;
+use League\Fractal;
 
 class StatusTransformer extends Fractal\TransformerAbstract
 {
-	public function transform(Status $status)
-	{
-		$pid = request()->user()->profile_id;
-		$taggedPeople = MediaTagService::get($status->id);
-		$poll = $status->type === 'poll' ? PollService::get($status->id, $pid) : null;
-        $rendered = config('exp.autolink') ?
-            ( $status->caption ? Autolink::create()->autolink($status->caption) : '' ) :
-            ( $status->rendered ?? $status->caption );
+    public function transform(Status $status)
+    {
+        $pid = request()->user()->profile_id;
+        $taggedPeople = MediaTagService::get($status->id);
+        $poll = $status->type === 'poll' ? PollService::get($status->id, $pid) : null;
+        $content = $status->caption ? nl2br(Autolink::create()->autolink($status->caption)) : "";
 
-		return [
-			'_v'                        => 1,
-			'id'                        => (string) $status->id,
-			'shortcode'                 => HashidService::encode($status->id),
-			'uri'                       => $status->url(),
-			'url'                       => $status->url(),
-			'in_reply_to_id'            => (string) $status->in_reply_to_id,
-			'in_reply_to_account_id'    => (string) $status->in_reply_to_profile_id,
-			'reblog'                    => $status->reblog_of_id ? StatusService::get($status->reblog_of_id) : null,
-			'content'                   => $rendered,
-			'content_text'              => $status->caption,
-			'created_at'                => str_replace('+00:00', 'Z', $status->created_at->format(DATE_RFC3339_EXTENDED)),
-			'emojis'                    => CustomEmoji::scan($status->caption),
-			'reblogs_count'             => 0,
-			'favourites_count'          => $status->likes_count ?? 0,
-			'reblogged'                 => $status->shared(),
-			'favourited'                => $status->liked(),
-			'muted'                     => null,
-			'sensitive'                 => (bool) $status->is_nsfw,
-			'spoiler_text'              => $status->cw_summary ?? '',
-			'visibility'                => $status->scope ?? $status->visibility,
-			'application'               => [
-				'name'      => 'web',
-				'website'   => null
-			 ],
-			'language'                  => null,
-			'mentions'                  => StatusMentionService::get($status->id),
-			'pf_type'                   => $status->type ?? $status->setType(),
-			'reply_count'               => (int) $status->reply_count,
-			'comments_disabled'         => (bool) $status->comments_disabled,
-			'thread'                    => false,
-			'replies'                   => [],
-			'parent'                    => [],
-			'place'                     => $status->place,
-			'local'                     => (bool) $status->local,
-			'taggedPeople'              => $taggedPeople,
-			'label'                     => StatusLabelService::get($status),
-			'liked_by'                  => LikeService::likedBy($status),
-			'media_attachments'			=> MediaService::get($status->id),
-			'account'					=> ProfileService::get($status->profile_id, true),
-			'tags'						=> StatusHashtagService::statusTags($status->id),
-			'poll'						=> $poll,
-			'bookmarked'				=> BookmarkService::get($pid, $status->id),
-			'edited_at'					=> $status->edited_at ? str_replace('+00:00', 'Z', $status->edited_at->format(DATE_RFC3339_EXTENDED)) : null,
-		];
-	}
+        return [
+            '_v' => 1,
+            'id' => (string) $status->id,
+            'shortcode' => HashidService::encode($status->id),
+            'uri' => $status->url(),
+            'url' => $status->url(),
+            'in_reply_to_id' => (string) $status->in_reply_to_id,
+            'in_reply_to_account_id' => (string) $status->in_reply_to_profile_id,
+            'reblog' => $status->reblog_of_id ? StatusService::get($status->reblog_of_id) : null,
+            'content' => $content,
+            'content_text' => $status->caption,
+            'created_at' => str_replace('+00:00', 'Z', $status->created_at->format(DATE_RFC3339_EXTENDED)),
+            'emojis' => CustomEmoji::scan($status->caption),
+            'reblogs_count' => 0,
+            'favourites_count' => $status->likes_count ?? 0,
+            'reblogged' => $status->shared(),
+            'favourited' => $status->liked(),
+            'muted' => null,
+            'sensitive' => (bool) $status->is_nsfw,
+            'spoiler_text' => $status->cw_summary ?? '',
+            'visibility' => $status->scope ?? $status->visibility,
+            'application' => [
+                'name' => 'web',
+                'website' => null,
+            ],
+            'language' => null,
+            'mentions' => StatusMentionService::get($status->id),
+            'pf_type' => $status->type ?? $status->setType(),
+            'reply_count' => (int) $status->reply_count,
+            'comments_disabled' => (bool) $status->comments_disabled,
+            'thread' => false,
+            'replies' => [],
+            'parent' => [],
+            'place' => $status->place,
+            'local' => (bool) $status->local,
+            'taggedPeople' => $taggedPeople,
+            'label' => StatusLabelService::get($status),
+            'liked_by' => LikeService::likedBy($status),
+            'media_attachments' => MediaService::get($status->id),
+            'account' => ProfileService::get($status->profile_id, true),
+            'tags' => StatusHashtagService::statusTags($status->id),
+            'poll' => $poll,
+            'bookmarked' => BookmarkService::get($pid, $status->id),
+            'edited_at' => $status->edited_at ? str_replace('+00:00', 'Z', $status->edited_at->format(DATE_RFC3339_EXTENDED)) : null,
+        ];
+    }
 }
diff --git a/app/User.php b/app/User.php
index a39f650be..086e4b0d8 100644
--- a/app/User.php
+++ b/app/User.php
@@ -2,28 +2,33 @@
 
 namespace App;
 
-use Laravel\Passport\HasApiTokens;
-use Illuminate\Notifications\Notifiable;
+use App\Services\AvatarService;
+use App\Util\RateLimit\User as UserRateLimit;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Foundation\Auth\User as Authenticatable;
-use App\Util\RateLimit\User as UserRateLimit;
-use App\Services\AvatarService;
+use Illuminate\Notifications\Notifiable;
+use Laravel\Passport\HasApiTokens;
+use NotificationChannels\WebPush\HasPushSubscriptions;
 
 class User extends Authenticatable
 {
-    use Notifiable, SoftDeletes, HasApiTokens, UserRateLimit;
+    use HasApiTokens, HasFactory, HasPushSubscriptions, Notifiable, SoftDeletes, UserRateLimit;
 
     /**
      * The attributes that should be mutated to dates.
      *
      * @var array
      */
-    protected $casts = [
-        'deleted_at' => 'datetime',
-        'email_verified_at' => 'datetime',
-        '2fa_setup_at' => 'datetime',
-        'last_active_at' => 'datetime',
-    ];
+    protected function casts(): array
+    {
+        return [
+            'deleted_at' => 'datetime',
+            'email_verified_at' => 'datetime',
+            '2fa_setup_at' => 'datetime',
+            'last_active_at' => 'datetime',
+        ];
+    }
 
     /**
      * The attributes that are mass assignable.
@@ -38,7 +43,13 @@ class User extends Authenticatable
         'app_register_ip',
         'email_verified_at',
         'last_active_at',
-        'register_source'
+        'register_source',
+        'expo_token',
+        'notify_enabled',
+        'notify_like',
+        'notify_follow',
+        'notify_mention',
+        'notify_comment',
     ];
 
     /**
@@ -50,7 +61,7 @@ class User extends Authenticatable
         'email', 'password', 'is_admin', 'remember_token',
         'email_verified_at', '2fa_enabled', '2fa_secret',
         '2fa_backup_codes', '2fa_setup_at', 'deleted_at',
-        'updated_at'
+        'updated_at',
     ];
 
     public function profile()
@@ -93,7 +104,7 @@ class User extends Authenticatable
 
     public function storageUsedKey()
     {
-        return 'profile:storage:used:' . $this->id;
+        return 'profile:storage:used:'.$this->id;
     }
 
     public function accountLog()
@@ -108,11 +119,15 @@ class User extends Authenticatable
 
     public function avatarUrl()
     {
-        if(!$this->profile_id || $this->status) {
-            return config('app.url') . '/storage/avatars/default.jpg';
+        if (! $this->profile_id || $this->status) {
+            return config('app.url').'/storage/avatars/default.jpg';
         }
 
         return AvatarService::get($this->profile_id);
     }
 
+    public function routeNotificationForExpo()
+    {
+        return $this->expo_token;
+    }
 }
diff --git a/app/UserFilter.php b/app/UserFilter.php
index b0af2d777..dfa0d4662 100644
--- a/app/UserFilter.php
+++ b/app/UserFilter.php
@@ -33,4 +33,9 @@ class UserFilter extends Model
     {
         return $this->belongsTo(Instance::class, 'filterable_id');
     }
+
+    public function user()
+    {
+        return $this->belongsTo(Profile::class, 'user_id');
+    }
 }
diff --git a/app/Util/ActivityPub/DiscoverActor.php b/app/Util/ActivityPub/DiscoverActor.php
index 61023900e..6680d944d 100644
--- a/app/Util/ActivityPub/DiscoverActor.php
+++ b/app/Util/ActivityPub/DiscoverActor.php
@@ -7,6 +7,7 @@ use Zttp\Zttp;
 class DiscoverActor
 {
     protected $url;
+
     protected $response;
 
     public function __construct($url)
@@ -17,9 +18,9 @@ class DiscoverActor
     public function fetch()
     {
         $res = Zttp::withHeaders([
-      'Accept'     => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
-      'User-Agent' => 'PixelfedBot - https://pixelfed.org',
-    ])->get($this->url);
+            'Accept' => 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
+            'User-Agent' => 'PixelfedBot - https://pixelfed.org',
+        ])->get($this->url);
         $this->response = $res->body();
 
         return $this;
@@ -40,7 +41,7 @@ class DiscoverActor
         $this->fetch();
         $res = $this->getResponse();
 
-        if (empty($res) || !in_array('type', $res) || $res['type'] !== 'Person') {
+        if (empty($res) || ! in_array('type', $res) || $res['type'] !== 'Person') {
             throw new \Exception('Invalid Actor Object');
         }
 
diff --git a/app/Util/ActivityPub/Helpers.php b/app/Util/ActivityPub/Helpers.php
index 1304f0811..bda1f4043 100644
--- a/app/Util/ActivityPub/Helpers.php
+++ b/app/Util/ActivityPub/Helpers.php
@@ -2,49 +2,37 @@
 
 namespace App\Util\ActivityPub;
 
-use DB, Cache, Purify, Storage, Request, Validator;
-use App\{
-    Activity,
-    Follower,
-    Instance,
-    Like,
-    Media,
-    Notification,
-    Profile,
-    Status
-};
-use Zttp\Zttp;
-use Carbon\Carbon;
-use GuzzleHttp\Client;
-use Illuminate\Http\File;
-use Illuminate\Validation\Rule;
-use App\Jobs\AvatarPipeline\CreateAvatar;
-use App\Jobs\RemoteFollowPipeline\RemoteFollowImportRecent;
-use App\Jobs\ImageOptimizePipeline\{ImageOptimize,ImageThumbnail};
-use App\Jobs\StatusPipeline\NewStatusPipeline;
+use App\Instance;
+use App\Jobs\AvatarPipeline\RemoteAvatarFetch;
+use App\Jobs\HomeFeedPipeline\FeedInsertRemotePipeline;
+use App\Jobs\MediaPipeline\MediaStoragePipeline;
 use App\Jobs\StatusPipeline\StatusReplyPipeline;
 use App\Jobs\StatusPipeline\StatusTagsPipeline;
-use App\Util\ActivityPub\HttpSignature;
-use Illuminate\Support\Str;
-use App\Services\ActivityPubFetchService;
+use App\Media;
+use App\Models\ModeratedProfile;
+use App\Models\Poll;
+use App\Profile;
+use App\Services\Account\AccountStatService;
 use App\Services\ActivityPubDeliveryService;
-use App\Services\CustomEmojiService;
+use App\Services\ActivityPubFetchService;
+use App\Services\DomainService;
 use App\Services\InstanceService;
 use App\Services\MediaPathService;
-use App\Services\MediaStorageService;
 use App\Services\NetworkTimelineService;
-use App\Jobs\MediaPipeline\MediaStoragePipeline;
-use App\Jobs\AvatarPipeline\RemoteAvatarFetch;
-use App\Util\Media\License;
-use App\Models\Poll;
-use Illuminate\Contracts\Cache\LockTimeoutException;
-use App\Jobs\ProfilePipeline\IncrementPostCount;
-use App\Jobs\ProfilePipeline\DecrementPostCount;
-use App\Services\DomainService;
 use App\Services\UserFilterService;
+use App\Status;
+use App\Util\Media\License;
+use Cache;
+use Carbon\Carbon;
+use Illuminate\Support\Str;
+use Illuminate\Validation\Rule;
+use League\Uri\Exceptions\UriException;
+use League\Uri\Uri;
+use Purify;
+use Validator;
 
-class Helpers {
-
+class Helpers
+{
     public static function validateObject($data)
     {
         $verbs = ['Create', 'Announce', 'Like', 'Follow', 'Delete', 'Accept', 'Reject', 'Undo', 'Tombstone'];
@@ -53,14 +41,14 @@ class Helpers {
             'type' => [
                 'required',
                 'string',
-                Rule::in($verbs)
+                Rule::in($verbs),
             ],
             'id' => 'required|string',
             'actor' => 'required|string|url',
             'object' => 'required',
             'object.type' => 'required_if:type,Create',
             'object.attributedTo' => 'required_if:type,Create|url',
-            'published' => 'required_if:type,Create|date'
+            'published' => 'required_if:type,Create|date',
         ])->passes();
 
         return $valid;
@@ -68,8 +56,8 @@ class Helpers {
 
     public static function verifyAttachments($data)
     {
-        if(!isset($data['object']) || empty($data['object'])) {
-            $data = ['object'=>$data];
+        if (! isset($data['object']) || empty($data['object'])) {
+            $data = ['object' => $data];
         }
 
         $activity = $data['object'];
@@ -80,7 +68,7 @@ class Helpers {
         // Peertube
         // $mediaTypes = in_array('video/mp4', $mimeTypes) ? ['Document', 'Image', 'Video', 'Link'] : ['Document', 'Image'];
 
-        if(!isset($activity['attachment']) || empty($activity['attachment'])) {
+        if (! isset($activity['attachment']) || empty($activity['attachment'])) {
             return false;
         }
 
@@ -100,13 +88,13 @@ class Helpers {
             '*.type' => [
                 'required',
                 'string',
-                Rule::in($mediaTypes)
+                Rule::in($mediaTypes),
             ],
             '*.url' => 'required|url',
-            '*.mediaType'  => [
+            '*.mediaType' => [
                 'required',
                 'string',
-                Rule::in($mimeTypes)
+                Rule::in($mimeTypes),
             ],
             '*.name' => 'sometimes|nullable|string',
             '*.blurhash' => 'sometimes|nullable|string|min:6|max:164',
@@ -119,7 +107,7 @@ class Helpers {
 
     public static function normalizeAudience($data, $localOnly = true)
     {
-        if(!isset($data['to'])) {
+        if (! isset($data['to'])) {
             return;
         }
 
@@ -128,32 +116,35 @@ class Helpers {
         $audience['cc'] = [];
         $scope = 'private';
 
-        if(is_array($data['to']) && !empty($data['to'])) {
+        if (is_array($data['to']) && ! empty($data['to'])) {
             foreach ($data['to'] as $to) {
-                if($to == 'https://www.w3.org/ns/activitystreams#Public') {
+                if ($to == 'https://www.w3.org/ns/activitystreams#Public') {
                     $scope = 'public';
+
                     continue;
                 }
                 $url = $localOnly ? self::validateLocalUrl($to) : self::validateUrl($to);
-                if($url != false) {
+                if ($url != false) {
                     array_push($audience['to'], $url);
                 }
             }
         }
 
-        if(is_array($data['cc']) && !empty($data['cc'])) {
+        if (is_array($data['cc']) && ! empty($data['cc'])) {
             foreach ($data['cc'] as $cc) {
-                if($cc == 'https://www.w3.org/ns/activitystreams#Public') {
+                if ($cc == 'https://www.w3.org/ns/activitystreams#Public') {
                     $scope = 'unlisted';
+
                     continue;
                 }
                 $url = $localOnly ? self::validateLocalUrl($cc) : self::validateUrl($cc);
-                if($url != false) {
+                if ($url != false) {
                     array_push($audience['cc'], $url);
                 }
             }
         }
         $audience['scope'] = $scope;
+
         return $audience;
     }
 
@@ -161,75 +152,96 @@ class Helpers {
     {
         $audience = self::normalizeAudience($data);
         $url = $profile->permalink();
+
         return in_array($url, $audience['to']) || in_array($url, $audience['cc']);
     }
 
-    public static function validateUrl($url)
+    public static function validateUrl($url = null, $disableDNSCheck = false, $forceBanCheck = false)
     {
-        if(is_array($url)) {
+        if (is_array($url) && ! empty($url)) {
             $url = $url[0];
         }
+        if (! $url || strlen($url) === 0) {
+            return false;
+        }
+        try {
+            $uri = Uri::new($url);
 
-        $hash = hash('sha256', $url);
-        $key = "helpers:url:valid:sha256-{$hash}";
+            if (! $uri) {
+                return false;
+            }
+
+            if ($uri->getScheme() !== 'https') {
+                return false;
+            }
+
+            $host = $uri->getHost();
+
+            if (! $host || $host === '') {
+                return false;
+            }
+
+            if (! filter_var($host, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME)) {
+                return false;
+            }
+
+            if (! str_contains($host, '.')) {
+                return false;
+            }
 
-        $valid = Cache::remember($key, 900, function() use($url) {
             $localhosts = [
-                '127.0.0.1', 'localhost', '::1'
+                'localhost',
+                '127.0.0.1',
+                '::1',
+                'broadcasthost',
+                'ip6-localhost',
+                'ip6-loopback',
             ];
 
-            if(strtolower(mb_substr($url, 0, 8)) !== 'https://') {
+            if (in_array($host, $localhosts)) {
                 return false;
             }
 
-            if(substr_count($url, '://') !== 1) {
-                return false;
-            }
-
-            if(mb_substr($url, 0, 8) !== 'https://') {
-                $url = 'https://' . substr($url, 8);
-            }
-
-            $valid = filter_var($url, FILTER_VALIDATE_URL);
-
-            if(!$valid) {
-                return false;
-            }
-
-            $host = parse_url($valid, PHP_URL_HOST);
-
-            if(in_array($host, $localhosts)) {
-                return false;
-            }
-
-            if(config('security.url.verify_dns')) {
-                if(DomainService::hasValidDns($host) === false) {
+            if ($disableDNSCheck !== true && app()->environment() === 'production' && (bool) config('security.url.verify_dns')) {
+                $hash = hash('sha256', $host);
+                $key = "helpers:url:valid-dns:sha256-{$hash}";
+                $domainValidDns = Cache::remember($key, 14440, function () use ($host) {
+                    return DomainService::hasValidDns($host);
+                });
+                if (! $domainValidDns) {
                     return false;
                 }
             }
 
-            if(app()->environment() === 'production') {
+            if ($forceBanCheck || $disableDNSCheck !== true && app()->environment() === 'production') {
                 $bannedInstances = InstanceService::getBannedDomains();
-                if(in_array($host, $bannedInstances)) {
+                if (in_array($host, $bannedInstances)) {
                     return false;
                 }
             }
 
-            return $url;
-        });
-
-        return $valid;
+            return $uri->toString();
+        } catch (UriException $e) {
+            return false;
+        }
     }
 
     public static function validateLocalUrl($url)
     {
         $url = self::validateUrl($url);
-        if($url == true) {
+        if ($url == true) {
             $domain = config('pixelfed.domain.app');
-            $host = parse_url($url, PHP_URL_HOST);
+
+            $uri = Uri::new($url);
+            $host = $uri->getHost();
+            if (! $host || empty($host)) {
+                return false;
+            }
             $url = strtolower($domain) === strtolower($host) ? $url : false;
+
             return $url;
         }
+
         return false;
     }
 
@@ -237,15 +249,16 @@ class Helpers {
     {
         $version = config('pixelfed.version');
         $url = config('app.url');
+
         return [
-            'Accept'     => 'application/activity+json',
+            'Accept' => 'application/activity+json',
             'User-Agent' => "(Pixelfed/{$version}; +{$url})",
         ];
     }
 
     public static function fetchFromUrl($url = false)
     {
-        if(self::validateUrl($url) == false) {
+        if (self::validateUrl($url) == false) {
             return;
         }
 
@@ -253,13 +266,13 @@ class Helpers {
         $key = "helpers:url:fetcher:sha256-{$hash}";
         $ttl = now()->addMinutes(15);
 
-        return Cache::remember($key, $ttl, function() use($url) {
+        return Cache::remember($key, $ttl, function () use ($url) {
             $res = ActivityPubFetchService::get($url);
-            if(!$res || empty($res)) {
+            if (! $res || empty($res)) {
                 return false;
             }
             $res = json_decode($res, true, 8);
-            if(json_last_error() == JSON_ERROR_NONE) {
+            if (json_last_error() == JSON_ERROR_NONE) {
                 return $res;
             } else {
                 return false;
@@ -274,48 +287,86 @@ class Helpers {
 
     public static function pluckval($val)
     {
-        if(is_string($val)) {
+        if (is_string($val)) {
             return $val;
         }
 
-        if(is_array($val)) {
-            return !empty($val) ? head($val) : null;
+        if (is_array($val)) {
+            return ! empty($val) ? head($val) : null;
         }
 
         return null;
     }
 
+    public static function validateTimestamp($timestamp)
+    {
+        try {
+            $date = Carbon::parse($timestamp);
+            $now = Carbon::now();
+            $tenYearsAgo = $now->copy()->subYears(10);
+            $isMoreThanTenYearsOld = $date->lt($tenYearsAgo);
+            $tomorrow = $now->copy()->addDay();
+            $isMoreThanOneDayFuture = $date->gt($tomorrow);
+
+            return ! ($isMoreThanTenYearsOld || $isMoreThanOneDayFuture);
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
     public static function statusFirstOrFetch($url, $replyTo = false)
     {
         $url = self::validateUrl($url);
-        if($url == false) {
+        if ($url == false) {
             return;
         }
 
         $host = parse_url($url, PHP_URL_HOST);
         $local = config('pixelfed.domain.app') == $host ? true : false;
 
-        if($local) {
+        if ($local) {
             $id = (int) last(explode('/', $url));
-            return Status::whereNotIn('scope', ['draft','archived'])->findOrFail($id);
+
+            return Status::whereNotIn('scope', ['draft', 'archived'])->findOrFail($id);
         }
 
-        $cached = Status::whereNotIn('scope', ['draft','archived'])
+        $cached = Status::whereNotIn('scope', ['draft', 'archived'])
             ->whereUri($url)
             ->orWhere('object_url', $url)
             ->first();
 
-        if($cached) {
+        if ($cached) {
             return $cached;
         }
 
         $res = self::fetchFromUrl($url);
 
-        if(!$res || empty($res) || isset($res['error']) || !isset($res['@context']) || !isset($res['published']) ) {
+        if (! $res || empty($res) || isset($res['error']) || ! isset($res['@context']) || ! isset($res['published'])) {
             return;
         }
 
-        if(isset($res['object'])) {
+        if (! self::validateTimestamp($res['published'])) {
+            return;
+        }
+
+        if (config('autospam.live_filters.enabled')) {
+            $filters = config('autospam.live_filters.filters');
+            if (! empty($filters) && isset($res['content']) && ! empty($res['content']) && strlen($filters) > 3) {
+                $filters = array_map('trim', explode(',', $filters));
+                $content = $res['content'];
+                foreach ($filters as $filter) {
+                    $filter = trim(strtolower($filter));
+                    if (! $filter || ! strlen($filter)) {
+                        continue;
+                    }
+                    if (str_contains(strtolower($content), $filter)) {
+                        return;
+                    }
+                }
+            }
+        }
+
+        if (isset($res['object'])) {
             $activity = $res;
         } else {
             $activity = ['object' => $res];
@@ -325,37 +376,37 @@ class Helpers {
 
         $cw = isset($res['sensitive']) ? (bool) $res['sensitive'] : false;
 
-        if(isset($res['to']) == true) {
-            if(is_array($res['to']) && in_array('https://www.w3.org/ns/activitystreams#Public', $res['to'])) {
+        if (isset($res['to']) == true) {
+            if (is_array($res['to']) && in_array('https://www.w3.org/ns/activitystreams#Public', $res['to'])) {
                 $scope = 'public';
             }
-            if(is_string($res['to']) && 'https://www.w3.org/ns/activitystreams#Public' == $res['to']) {
+            if (is_string($res['to']) && $res['to'] == 'https://www.w3.org/ns/activitystreams#Public') {
                 $scope = 'public';
             }
         }
 
-        if(isset($res['cc']) == true) {
-            if(is_array($res['cc']) && in_array('https://www.w3.org/ns/activitystreams#Public', $res['cc'])) {
+        if (isset($res['cc']) == true) {
+            if (is_array($res['cc']) && in_array('https://www.w3.org/ns/activitystreams#Public', $res['cc'])) {
                 $scope = 'unlisted';
             }
-            if(is_string($res['cc']) && 'https://www.w3.org/ns/activitystreams#Public' == $res['cc']) {
+            if (is_string($res['cc']) && $res['cc'] == 'https://www.w3.org/ns/activitystreams#Public') {
                 $scope = 'unlisted';
             }
         }
 
-        if(config('costar.enabled') == true) {
+        if (config('costar.enabled') == true) {
             $blockedKeywords = config('costar.keyword.block');
-            if($blockedKeywords !== null) {
+            if ($blockedKeywords !== null) {
                 $keywords = config('costar.keyword.block');
-                foreach($keywords as $kw) {
-                    if(Str::contains($res['content'], $kw) == true) {
+                foreach ($keywords as $kw) {
+                    if (Str::contains($res['content'], $kw) == true) {
                         return;
                     }
                 }
             }
 
             $unlisted = config('costar.domain.unlisted');
-            if(in_array(parse_url($url, PHP_URL_HOST), $unlisted) == true) {
+            if (in_array(parse_url($url, PHP_URL_HOST), $unlisted) == true) {
                 $unlisted = true;
                 $scope = 'unlisted';
             } else {
@@ -363,7 +414,7 @@ class Helpers {
             }
 
             $cwDomains = config('costar.domain.cw');
-            if(in_array(parse_url($url, PHP_URL_HOST), $cwDomains) == true) {
+            if (in_array(parse_url($url, PHP_URL_HOST), $cwDomains) == true) {
                 $cw = true;
             }
         }
@@ -372,11 +423,15 @@ class Helpers {
         $idDomain = parse_url($id, PHP_URL_HOST);
         $urlDomain = parse_url($url, PHP_URL_HOST);
 
-        if(!self::validateUrl($id)) {
+        if ($idDomain && $urlDomain && strtolower($idDomain) !== strtolower($urlDomain)) {
             return;
         }
 
-        if(!isset($activity['object']['attributedTo'])) {
+        if (! self::validateUrl($id)) {
+            return;
+        }
+
+        if (! isset($activity['object']['attributedTo'])) {
             return;
         }
 
@@ -384,39 +439,38 @@ class Helpers {
             $activity['object']['attributedTo'] :
             (is_array($activity['object']['attributedTo']) ?
                 collect($activity['object']['attributedTo'])
-                    ->filter(function($o) {
+                    ->filter(function ($o) {
                         return $o && isset($o['type']) && $o['type'] == 'Person';
                     })
                     ->pluck('id')
                     ->first() : null
             );
 
-        if($attributedTo) {
+        if ($attributedTo) {
             $actorDomain = parse_url($attributedTo, PHP_URL_HOST);
-            if(!self::validateUrl($attributedTo) ||
+            if (! self::validateUrl($attributedTo) ||
                 $idDomain !== $actorDomain ||
                 $actorDomain !== $urlDomain
-            )
-            {
+            ) {
                 return;
             }
         }
 
-        if($idDomain !== $urlDomain) {
+        if ($idDomain !== $urlDomain) {
             return;
         }
 
         $profile = self::profileFirstOrNew($attributedTo);
 
-        if(!$profile) {
+        if (! $profile) {
             return;
         }
 
-        if(isset($activity['object']['inReplyTo']) && !empty($activity['object']['inReplyTo']) || $replyTo == true) {
+        if (isset($activity['object']['inReplyTo']) && ! empty($activity['object']['inReplyTo']) || $replyTo == true) {
             $reply_to = self::statusFirstOrFetch(self::pluckval($activity['object']['inReplyTo']), false);
-            if($reply_to) {
+            if ($reply_to) {
                 $blocks = UserFilterService::blocks($reply_to->profile_id);
-                if(in_array($profile->id, $blocks)) {
+                if (in_array($profile->id, $blocks)) {
                     return;
                 }
             }
@@ -426,15 +480,15 @@ class Helpers {
         }
         $ts = self::pluckval($res['published']);
 
-        if($scope == 'public' && in_array($urlDomain, InstanceService::getUnlistedDomains())) {
+        if ($scope == 'public' && in_array($urlDomain, InstanceService::getUnlistedDomains())) {
             $scope = 'unlisted';
         }
 
-        if(in_array($urlDomain, InstanceService::getNsfwDomains())) {
+        if (in_array($urlDomain, InstanceService::getNsfwDomains())) {
             $cw = true;
         }
 
-        if($res['type'] === 'Question') {
+        if ($res['type'] === 'Question') {
             $status = self::storePoll(
                 $profile,
                 $res,
@@ -445,6 +499,7 @@ class Helpers {
                 $scope,
                 $id
             );
+
             return $status;
         } else {
             $status = self::storeStatus($url, $profile, $res);
@@ -455,11 +510,18 @@ class Helpers {
 
     public static function storeStatus($url, $profile, $activity)
     {
+        $originalUrl = $url;
         $id = isset($activity['id']) ? self::pluckval($activity['id']) : self::pluckval($activity['url']);
         $url = isset($activity['url']) && is_string($activity['url']) ? self::pluckval($activity['url']) : self::pluckval($id);
         $idDomain = parse_url($id, PHP_URL_HOST);
         $urlDomain = parse_url($url, PHP_URL_HOST);
-        if(!self::validateUrl($id) || !self::validateUrl($url)) {
+        $originalUrlDomain = parse_url($originalUrl, PHP_URL_HOST);
+        if (! self::validateUrl($id) || ! self::validateUrl($url)) {
+            return;
+        }
+
+        if (strtolower($originalUrlDomain) !== strtolower($idDomain) ||
+            strtolower($originalUrlDomain) !== strtolower($urlDomain)) {
             return;
         }
 
@@ -470,27 +532,27 @@ class Helpers {
         $cw = self::getSensitive($activity, $url);
         $pid = is_object($profile) ? $profile->id : (is_array($profile) ? $profile['id'] : null);
         $isUnlisted = is_object($profile) ? $profile->unlisted : (is_array($profile) ? $profile['unlisted'] : false);
-        $commentsDisabled = isset($activity['commentsEnabled']) ? !boolval($activity['commentsEnabled']) : false;
+        $commentsDisabled = isset($activity['commentsEnabled']) ? ! boolval($activity['commentsEnabled']) : false;
 
-        if(!$pid) {
+        if (! $pid) {
             return;
         }
 
-        if($scope == 'public') {
-            if($isUnlisted == true) {
+        if ($scope == 'public') {
+            if ($isUnlisted == true) {
                 $scope = 'unlisted';
             }
         }
-
+        $defaultCaption = config_cache('database.default') === 'mysql' ? null : "";
         $status = Status::updateOrCreate(
             [
-                'uri' => $url
+                'uri' => $url,
             ], [
                 'profile_id' => $pid,
                 'url' => $url,
                 'object_url' => $id,
-                'caption' => isset($activity['content']) ? Purify::clean(strip_tags($activity['content'])) : null,
-                'rendered' => isset($activity['content']) ? Purify::clean($activity['content']) : null,
+                'caption' => isset($activity['content']) ? Purify::clean(strip_tags($activity['content'])) : $defaultCaption,
+                'rendered' => $defaultCaption,
                 'created_at' => Carbon::parse($ts)->tz('UTC'),
                 'in_reply_to_id' => $reply_to,
                 'local' => false,
@@ -499,24 +561,24 @@ class Helpers {
                 'visibility' => $scope,
                 'cw_summary' => ($cw == true && isset($activity['summary']) ?
                     Purify::clean(strip_tags($activity['summary'])) : null),
-                'comments_disabled' => $commentsDisabled
+                'comments_disabled' => $commentsDisabled,
             ]
         );
 
-        if($reply_to == null) {
+        if ($reply_to == null) {
             self::importNoteAttachment($activity, $status);
         } else {
-            if(isset($activity['attachment']) && !empty($activity['attachment'])) {
+            if (isset($activity['attachment']) && ! empty($activity['attachment'])) {
                 self::importNoteAttachment($activity, $status);
             }
             StatusReplyPipeline::dispatch($status);
         }
 
-        if(isset($activity['tag']) && is_array($activity['tag']) && !empty($activity['tag'])) {
+        if (isset($activity['tag']) && is_array($activity['tag']) && ! empty($activity['tag'])) {
             StatusTagsPipeline::dispatch($activity, $status);
         }
 
-        if( config('instance.timeline.network.cached') &&
+        if (config('instance.timeline.network.cached') &&
             $status->in_reply_to_id === null &&
             $status->reblog_of_id === null &&
             in_array($status->type, ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album']) &&
@@ -528,27 +590,34 @@ class Helpers {
                 ->unique()
                 ->values()
                 ->toArray();
-            if(!in_array($urlDomain, $filteredDomains)) {
-                if(!$isUnlisted) {
+            if (! in_array($urlDomain, $filteredDomains)) {
+                if (! $isUnlisted) {
                     NetworkTimelineService::add($status->id);
                 }
             }
         }
 
-        IncrementPostCount::dispatch($pid)->onQueue('low');
+        AccountStatService::incrementPostCount($pid);
+
+        if ($status->in_reply_to_id === null &&
+            in_array($status->type, ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])
+        ) {
+            FeedInsertRemotePipeline::dispatch($status->id, $pid)->onQueue('feed');
+        }
 
         return $status;
     }
 
     public static function getSensitive($activity, $url)
     {
-        $id = isset($activity['id']) ? self::pluckval($activity['id']) : self::pluckval($url);
-        $url = isset($activity['url']) ? self::pluckval($activity['url']) : $id;
-        $urlDomain = parse_url($url, PHP_URL_HOST);
+        if (! $url || ! strlen($url)) {
+            return true;
+        }
 
+        $urlDomain = parse_url($url, PHP_URL_HOST);
         $cw = isset($activity['sensitive']) ? (bool) $activity['sensitive'] : false;
 
-        if(in_array($urlDomain, InstanceService::getNsfwDomains())) {
+        if (in_array($urlDomain, InstanceService::getNsfwDomains())) {
             $cw = true;
         }
 
@@ -558,13 +627,13 @@ class Helpers {
     public static function getReplyTo($activity)
     {
         $reply_to = null;
-        $inReplyTo = isset($activity['inReplyTo']) && !empty($activity['inReplyTo']) ?
+        $inReplyTo = isset($activity['inReplyTo']) && ! empty($activity['inReplyTo']) ?
             self::pluckval($activity['inReplyTo']) :
             false;
 
-        if($inReplyTo) {
+        if ($inReplyTo) {
             $reply_to = self::statusFirstOrFetch($inReplyTo);
-            if($reply_to) {
+            if ($reply_to) {
                 $reply_to = optional($reply_to)->id;
             }
         } else {
@@ -581,25 +650,25 @@ class Helpers {
         $urlDomain = parse_url(self::pluckval($url), PHP_URL_HOST);
         $scope = 'private';
 
-        if(isset($activity['to']) == true) {
-            if(is_array($activity['to']) && in_array('https://www.w3.org/ns/activitystreams#Public', $activity['to'])) {
+        if (isset($activity['to']) == true) {
+            if (is_array($activity['to']) && in_array('https://www.w3.org/ns/activitystreams#Public', $activity['to'])) {
                 $scope = 'public';
             }
-            if(is_string($activity['to']) && 'https://www.w3.org/ns/activitystreams#Public' == $activity['to']) {
+            if (is_string($activity['to']) && $activity['to'] == 'https://www.w3.org/ns/activitystreams#Public') {
                 $scope = 'public';
             }
         }
 
-        if(isset($activity['cc']) == true) {
-            if(is_array($activity['cc']) && in_array('https://www.w3.org/ns/activitystreams#Public', $activity['cc'])) {
+        if (isset($activity['cc']) == true) {
+            if (is_array($activity['cc']) && in_array('https://www.w3.org/ns/activitystreams#Public', $activity['cc'])) {
                 $scope = 'unlisted';
             }
-            if(is_string($activity['cc']) && 'https://www.w3.org/ns/activitystreams#Public' == $activity['cc']) {
+            if (is_string($activity['cc']) && $activity['cc'] == 'https://www.w3.org/ns/activitystreams#Public') {
                 $scope = 'unlisted';
             }
         }
 
-        if($scope == 'public' && in_array($urlDomain, InstanceService::getUnlistedDomains())) {
+        if ($scope == 'public' && in_array($urlDomain, InstanceService::getUnlistedDomains())) {
             $scope = 'unlisted';
         }
 
@@ -608,25 +677,26 @@ class Helpers {
 
     private static function storePoll($profile, $res, $url, $ts, $reply_to, $cw, $scope, $id)
     {
-        if(!isset($res['endTime']) || !isset($res['oneOf']) || !is_array($res['oneOf']) || count($res['oneOf']) > 4) {
+        if (! isset($res['endTime']) || ! isset($res['oneOf']) || ! is_array($res['oneOf']) || count($res['oneOf']) > 4) {
             return;
         }
 
-        $options = collect($res['oneOf'])->map(function($option) {
+        $options = collect($res['oneOf'])->map(function ($option) {
             return $option['name'];
         })->toArray();
 
-        $cachedTallies = collect($res['oneOf'])->map(function($option) {
+        $cachedTallies = collect($res['oneOf'])->map(function ($option) {
             return $option['replies']['totalItems'] ?? 0;
         })->toArray();
 
+        $defaultCaption = config_cache('database.default') === 'mysql' ? null : "";
         $status = new Status;
         $status->profile_id = $profile->id;
         $status->url = isset($res['url']) ? $res['url'] : $url;
         $status->uri = isset($res['url']) ? $res['url'] : $url;
         $status->object_url = $id;
-        $status->caption = strip_tags($res['content']);
-        $status->rendered = Purify::clean($res['content']);
+        $status->caption = strip_tags(Purify::clean($res['content'])) ?? $defaultCaption;
+        $status->rendered = $defaultCaption;
         $status->created_at = Carbon::parse($ts)->tz('UTC');
         $status->in_reply_to_id = null;
         $status->local = false;
@@ -662,9 +732,10 @@ class Helpers {
 
     public static function importNoteAttachment($data, Status $status)
     {
-        if(self::verifyAttachments($data) == false) {
+        if (self::verifyAttachments($data) == false) {
             // \Log::info('importNoteAttachment::failedVerification.', [$data['id']]);
             $status->viewType();
+
             return;
         }
         $attachments = isset($data['object']) ? $data['object']['attachment'] : $data['attachment'];
@@ -677,11 +748,11 @@ class Helpers {
         $storagePath = MediaPathService::get($user, 2);
         $allowed = explode(',', config_cache('pixelfed.media_types'));
 
-        foreach($attachments as $key => $media) {
+        foreach ($attachments as $key => $media) {
             $type = $media['mediaType'];
             $url = $media['url'];
             $valid = self::validateUrl($url);
-            if(in_array($type, $allowed) == false || $valid == false) {
+            if (in_array($type, $allowed) == false || $valid == false) {
                 continue;
             }
             $blurhash = isset($media['blurhash']) ? $media['blurhash'] : null;
@@ -690,7 +761,7 @@ class Helpers {
             $width = isset($media['width']) ? $media['width'] : false;
             $height = isset($media['height']) ? $media['height'] : false;
 
-            $media = new Media();
+            $media = new Media;
             $media->blurhash = $blurhash;
             $media->remote_media = true;
             $media->status_id = $status->id;
@@ -700,85 +771,110 @@ class Helpers {
             $media->remote_url = $url;
             $media->caption = $caption;
             $media->order = $key + 1;
-            if($width) {
+            if ($width) {
                 $media->width = $width;
             }
-            if($height) {
+            if ($height) {
                 $media->height = $height;
             }
-            if($license) {
+            if ($license) {
                 $media->license = $license;
             }
             $media->mime = $type;
             $media->version = 3;
             $media->save();
 
-            if(config_cache('pixelfed.cloud_storage') == true) {
+            if ((bool) config_cache('pixelfed.cloud_storage') == true) {
                 MediaStoragePipeline::dispatch($media);
             }
         }
 
         $status->viewType();
-        return;
+
     }
 
     public static function profileFirstOrNew($url)
     {
         $url = self::validateUrl($url);
-        if($url == false) {
+        if ($url == false) {
             return;
         }
 
         $host = parse_url($url, PHP_URL_HOST);
         $local = config('pixelfed.domain.app') == $host ? true : false;
 
-        if($local == true) {
+        if ($local == true) {
             $id = last(explode('/', $url));
+
             return Profile::whereNull('status')
                 ->whereNull('domain')
                 ->whereUsername($id)
                 ->firstOrFail();
         }
 
-        if($profile = Profile::whereRemoteUrl($url)->first()) {
-            if($profile->last_fetched_at && $profile->last_fetched_at->lt(now()->subHours(24))) {
+        if ($profile = Profile::whereRemoteUrl($url)->first()) {
+            if ($profile->last_fetched_at && $profile->last_fetched_at->lt(now()->subHours(24))) {
                 return self::profileUpdateOrCreate($url);
             }
+
             return $profile;
         }
 
         return self::profileUpdateOrCreate($url);
     }
 
-    public static function profileUpdateOrCreate($url)
+    public static function profileUpdateOrCreate($url, $movedToCheck = false)
     {
+        $movedToPid = null;
         $res = self::fetchProfileFromUrl($url);
-        if(!$res || isset($res['id']) == false) {
+        if (! $res || isset($res['id']) == false) {
             return;
         }
-        $domain = parse_url($res['id'], PHP_URL_HOST);
-        if(!isset($res['preferredUsername']) && !isset($res['nickname'])) {
+        if (! self::validateUrl($res['inbox'])) {
             return;
         }
+        if (! self::validateUrl($res['id'])) {
+            return;
+        }
+
+        if (ModeratedProfile::whereProfileUrl($res['id'])->whereIsBanned(true)->exists()) {
+            return;
+        }
+
+        $urlDomain = parse_url($url, PHP_URL_HOST);
+        $domain = parse_url($res['id'], PHP_URL_HOST);
+        if (strtolower($urlDomain) !== strtolower($domain)) {
+            return;
+        }
+        if (! isset($res['preferredUsername']) && ! isset($res['nickname'])) {
+            return;
+        }
+        // skip invalid usernames
+        if (! ctype_alnum($res['preferredUsername'])) {
+            $tmpUsername = str_replace(['_', '.', '-'], '', $res['preferredUsername']);
+            if (! ctype_alnum($tmpUsername)) {
+                return;
+            }
+        }
         $username = (string) Purify::clean($res['preferredUsername'] ?? $res['nickname']);
-        if(empty($username)) {
+        if (empty($username)) {
             return;
         }
         $remoteUsername = $username;
         $webfinger = "@{$username}@{$domain}";
 
-        if(!self::validateUrl($res['inbox'])) {
-            return;
-        }
-        if(!self::validateUrl($res['id'])) {
-            return;
+        $instance = Instance::updateOrCreate([
+            'domain' => $domain,
+        ]);
+        if ($instance->wasRecentlyCreated == true) {
+            \App\Jobs\InstancePipeline\FetchNodeinfoPipeline::dispatch($instance)->onQueue('low');
         }
 
-        $instance = Instance::updateOrCreate([
-            'domain' => $domain
-        ]);
-        if($instance->wasRecentlyCreated == true) {
-            \App\Jobs\InstancePipeline\FetchNodeinfoPipeline::dispatch($instance)->onQueue('low');
+        if (! $movedToCheck && isset($res['movedTo']) && Helpers::validateUrl($res['movedTo'])) {
+            $movedTo = self::profileUpdateOrCreate($res['movedTo'], true);
+            if ($movedTo) {
+                $movedToPid = $movedTo->id;
+            }
         }
 
         $profile = Profile::updateOrCreate(
@@ -797,16 +893,18 @@ class Helpers {
                 'outbox_url' => isset($res['outbox']) ? $res['outbox'] : null,
                 'public_key' => $res['publicKey']['publicKeyPem'],
                 'indexable' => isset($res['indexable']) && is_bool($res['indexable']) ? $res['indexable'] : false,
+                'moved_to_profile_id' => $movedToPid,
             ]
         );
 
-        if( $profile->last_fetched_at == null ||
+        if ($profile->last_fetched_at == null ||
             $profile->last_fetched_at->lt(now()->subMonths(3))
         ) {
             RemoteAvatarFetch::dispatch($profile);
         }
         $profile->last_fetched_at = now();
         $profile->save();
+
         return $profile;
     }
 
@@ -815,8 +913,16 @@ class Helpers {
         return self::profileFirstOrNew($url);
     }
 
+    public static function getSignedFetch($url)
+    {
+        return ActivityPubFetchService::get($url);
+    }
+
     public static function sendSignedObject($profile, $url, $body)
     {
+        if (app()->environment() !== 'production') {
+            return;
+        }
         ActivityPubDeliveryService::queue()
             ->from($profile)
             ->to($url)
diff --git a/app/Util/ActivityPub/HttpSignature.php b/app/Util/ActivityPub/HttpSignature.php
index 5bfdcac09..20071932b 100644
--- a/app/Util/ActivityPub/HttpSignature.php
+++ b/app/Util/ActivityPub/HttpSignature.php
@@ -2,146 +2,198 @@
 
 namespace App\Util\ActivityPub;
 
-use Cache, Log;
 use App\Models\InstanceActor;
 use App\Profile;
-use \DateTime;
+use Cache;
+use DateTime;
 
-class HttpSignature {
+class HttpSignature
+{
+    /*
+     * source: https://github.com/aaronpk/Nautilus/blob/master/app/ActivityPub/HTTPSignature.php
+     * thanks aaronpk!
+     */
 
-  /*
-   * source: https://github.com/aaronpk/Nautilus/blob/master/app/ActivityPub/HTTPSignature.php
-   * thanks aaronpk!
-   */
+    public static function sign(Profile $profile, $url, $body = false, $addlHeaders = [])
+    {
+        if ($body) {
+            $digest = self::_digest($body);
+        }
+        $user = $profile;
+        $headers = self::_headersToSign($url, $body ? $digest : false);
+        $headers = array_merge($headers, $addlHeaders);
+        $stringToSign = self::_headersToSigningString($headers);
+        $signedHeaders = implode(' ', array_map('strtolower', array_keys($headers)));
+        $key = openssl_pkey_get_private($user->private_key);
+        if (empty($key)) {
+            return [];
+        }
+        openssl_sign($stringToSign, $signature, $key, OPENSSL_ALGO_SHA256);
+        if (empty($signature)) {
+            return [];
+        }
+        $signature = base64_encode($signature);
+        $signatureHeader = 'keyId="'.$user->keyId().'",headers="'.$signedHeaders.'",algorithm="rsa-sha256",signature="'.$signature.'"';
+        unset($headers['(request-target)']);
+        $headers['Signature'] = $signatureHeader;
 
-  public static function sign(Profile $profile, $url, $body = false, $addlHeaders = []) {
-    if($body) {
-      $digest = self::_digest($body);
-    }
-    $user = $profile;
-    $headers = self::_headersToSign($url, $body ? $digest : false);
-    $headers = array_merge($headers, $addlHeaders);
-    $stringToSign = self::_headersToSigningString($headers);
-    $signedHeaders = implode(' ', array_map('strtolower', array_keys($headers)));
-    $key = openssl_pkey_get_private($user->private_key);
-    openssl_sign($stringToSign, $signature, $key, OPENSSL_ALGO_SHA256);
-    $signature = base64_encode($signature);
-    $signatureHeader = 'keyId="'.$user->keyId().'",headers="'.$signedHeaders.'",algorithm="rsa-sha256",signature="'.$signature.'"';
-    unset($headers['(request-target)']);
-    $headers['Signature'] = $signatureHeader;
-
-    return self::_headersToCurlArray($headers);
-  }
-
-  public static function instanceActorSign($url, $body = false, $addlHeaders = [], $method = 'post')
-  {
-    $keyId = config('app.url') . '/i/actor#main-key';
-    $privateKey = Cache::rememberForever(InstanceActor::PKI_PRIVATE, function() {
-      return InstanceActor::first()->private_key;
-    });
-    if($body) {
-      $digest = self::_digest($body);
-    }
-    $headers = self::_headersToSign($url, $body ? $digest : false, $method);
-    $headers = array_merge($headers, $addlHeaders);
-    $stringToSign = self::_headersToSigningString($headers);
-    $signedHeaders = implode(' ', array_map('strtolower', array_keys($headers)));
-    $key = openssl_pkey_get_private($privateKey);
-    openssl_sign($stringToSign, $signature, $key, OPENSSL_ALGO_SHA256);
-    $signature = base64_encode($signature);
-    $signatureHeader = 'keyId="'.$keyId.'",headers="'.$signedHeaders.'",algorithm="rsa-sha256",signature="'.$signature.'"';
-    unset($headers['(request-target)']);
-    $headers['Signature'] = $signatureHeader;
-
-    return $headers;
-  }
-
-  public static function parseSignatureHeader($signature) {
-    $parts = explode(',', $signature);
-    $signatureData = [];
-
-    foreach($parts as $part) {
-      if(preg_match('/(.+)="(.+)"/', $part, $match)) {
-        $signatureData[$match[1]] = $match[2];
-      }
+        return self::_headersToCurlArray($headers);
     }
 
-    if(!isset($signatureData['keyId'])) {
-      return [
-        'error' => 'No keyId was found in the signature header. Found: '.implode(', ', array_keys($signatureData))
-      ];
+    public static function signRaw($privateKey, $keyId, $url, $body = false, $addlHeaders = [])
+    {
+        if (empty($privateKey) || empty($keyId)) {
+            return [];
+        }
+        if ($body) {
+            $digest = self::_digest($body);
+        }
+        $headers = self::_headersToSign($url, $body ? $digest : false);
+        $headers = array_merge($headers, $addlHeaders);
+        $stringToSign = self::_headersToSigningString($headers);
+        $signedHeaders = implode(' ', array_map('strtolower', array_keys($headers)));
+        $key = openssl_pkey_get_private($privateKey);
+        if (empty($key)) {
+            return [];
+        }
+        openssl_sign($stringToSign, $signature, $key, OPENSSL_ALGO_SHA256);
+        if (empty($signature)) {
+            return [];
+        }
+        $signature = base64_encode($signature);
+        $signatureHeader = 'keyId="'.$keyId.'",headers="'.$signedHeaders.'",algorithm="rsa-sha256",signature="'.$signature.'"';
+        unset($headers['(request-target)']);
+        $headers['Signature'] = $signatureHeader;
+
+        return self::_headersToCurlArray($headers);
     }
 
-    if(!filter_var($signatureData['keyId'], FILTER_VALIDATE_URL)) {
-      return [
-        'error' => 'keyId is not a URL: '.$signatureData['keyId']
-      ];
+    public static function instanceActorSign($url, $body = false, $addlHeaders = [], $method = 'post')
+    {
+        $keyId = config('app.url').'/i/actor#main-key';
+        if(config_cache('database.default') === 'mysql') {
+            $privateKey = Cache::rememberForever(InstanceActor::PKI_PRIVATE, function () {
+                return InstanceActor::first()->private_key;
+            });
+        } else {
+            $privateKey = InstanceActor::first()?->private_key;
+        }
+        abort_if(!$privateKey || empty($privateKey), 400, 'Missing instance actor key, please run php artisan instance:actor');
+        if ($body) {
+            $digest = self::_digest($body);
+        }
+        $headers = self::_headersToSign($url, $body ? $digest : false, $method);
+        $headers = array_merge($headers, $addlHeaders);
+        $stringToSign = self::_headersToSigningString($headers);
+        $signedHeaders = implode(' ', array_map('strtolower', array_keys($headers)));
+        $key = openssl_pkey_get_private($privateKey);
+        openssl_sign($stringToSign, $signature, $key, OPENSSL_ALGO_SHA256);
+        $signature = base64_encode($signature);
+        $signatureHeader = 'keyId="'.$keyId.'",headers="'.$signedHeaders.'",algorithm="rsa-sha256",signature="'.$signature.'"';
+        unset($headers['(request-target)']);
+        $headers['Signature'] = $signatureHeader;
+
+        return $headers;
     }
 
-    if(!isset($signatureData['headers']) || !isset($signatureData['signature'])) {
-      return [
-        'error' => 'Signature is missing headers or signature parts'
-      ];
+    public static function parseSignatureHeader($signature)
+    {
+        $parts = explode(',', $signature);
+        $signatureData = [];
+
+        foreach ($parts as $part) {
+            if (preg_match('/(.+)="(.+)"/', $part, $match)) {
+                $signatureData[$match[1]] = $match[2];
+            }
+        }
+
+        if (! isset($signatureData['keyId'])) {
+            return [
+                'error' => 'No keyId was found in the signature header. Found: '.implode(', ', array_keys($signatureData)),
+            ];
+        }
+
+        if (! filter_var($signatureData['keyId'], FILTER_VALIDATE_URL)) {
+            return [
+                'error' => 'keyId is not a URL: '.$signatureData['keyId'],
+            ];
+        }
+
+        if (! Helpers::validateUrl($signatureData['keyId'])) {
+            return [
+                'error' => 'keyId is not a URL: '.$signatureData['keyId'],
+            ];
+        }
+
+        if (! isset($signatureData['headers']) || ! isset($signatureData['signature'])) {
+            return [
+                'error' => 'Signature is missing headers or signature parts',
+            ];
+        }
+
+        return $signatureData;
     }
 
-    return $signatureData;
-  }
+    public static function verify($publicKey, $signatureData, $inputHeaders, $path, $body)
+    {
+        $digest = 'SHA-256='.base64_encode(hash('sha256', $body, true));
+        $headersToSign = [];
+        foreach (explode(' ', $signatureData['headers']) as $h) {
+            if ($h == '(request-target)') {
+                $headersToSign[$h] = 'post '.$path;
+            } elseif ($h == 'digest') {
+                $headersToSign[$h] = $digest;
+            } elseif (isset($inputHeaders[$h][0])) {
+                $headersToSign[$h] = $inputHeaders[$h][0];
+            }
+        }
+        $signingString = self::_headersToSigningString($headersToSign);
 
-  public static function verify($publicKey, $signatureData, $inputHeaders, $path, $body) {
-    $digest = 'SHA-256='.base64_encode(hash('sha256', $body, true));
-    $headersToSign = [];
-    foreach(explode(' ',$signatureData['headers']) as $h) {
-      if($h == '(request-target)') {
-        $headersToSign[$h] = 'post '.$path;
-      } elseif($h == 'digest') {
-        $headersToSign[$h] = $digest;
-      } elseif(isset($inputHeaders[$h][0])) {
-        $headersToSign[$h] = $inputHeaders[$h][0];
-      }
-    }
-    $signingString = self::_headersToSigningString($headersToSign);
+        $verified = openssl_verify($signingString, base64_decode($signatureData['signature']), $publicKey, OPENSSL_ALGO_SHA256);
 
-    $verified = openssl_verify($signingString, base64_decode($signatureData['signature']), $publicKey, OPENSSL_ALGO_SHA256);
-
-    return [$verified, $signingString];
-  }
-
-  private static function _headersToSigningString($headers) {
-    return implode("\n", array_map(function($k, $v){
-             return strtolower($k).': '.$v;
-           }, array_keys($headers), $headers));
-  }
-
-  private static function _headersToCurlArray($headers) {
-    return array_map(function($k, $v){
-             return "$k: $v";
-           }, array_keys($headers), $headers);
-  }
-
-  private static function _digest($body) {
-    if(is_array($body)) {
-      $body = json_encode($body);
-    }
-    return base64_encode(hash('sha256', $body, true));
-  }
-
-  protected static function _headersToSign($url, $digest = false, $method = 'post') {
-    $date = new DateTime('UTC');
-
-    if(!in_array($method, ['post', 'get'])) {
-        throw new \Exception('Invalid method used to sign headers in HttpSignature');
-    }
-    $headers = [
-      '(request-target)' => $method . ' '.parse_url($url, PHP_URL_PATH),
-      'Host' => parse_url($url, PHP_URL_HOST),
-      'Date' => $date->format('D, d M Y H:i:s \G\M\T'),
-    ];
-
-    if($digest) {
-      $headers['Digest'] = 'SHA-256='.$digest;
+        return [$verified, $signingString];
     }
 
-    return $headers;
-  }
+    private static function _headersToSigningString($headers)
+    {
+        return implode("\n", array_map(function ($k, $v) {
+            return strtolower($k).': '.$v;
+        }, array_keys($headers), $headers));
+    }
 
+    private static function _headersToCurlArray($headers)
+    {
+        return array_map(function ($k, $v) {
+            return "$k: $v";
+        }, array_keys($headers), $headers);
+    }
+
+    private static function _digest($body)
+    {
+        if (is_array($body)) {
+            $body = json_encode($body);
+        }
+
+        return base64_encode(hash('sha256', $body, true));
+    }
+
+    protected static function _headersToSign($url, $digest = false, $method = 'post')
+    {
+        $date = new DateTime('UTC');
+
+        if (! in_array($method, ['post', 'get'])) {
+            throw new \Exception('Invalid method used to sign headers in HttpSignature');
+        }
+        $headers = [
+            '(request-target)' => $method.' '.parse_url($url, PHP_URL_PATH),
+            'Host' => parse_url($url, PHP_URL_HOST),
+            'Date' => $date->format('D, d M Y H:i:s \G\M\T'),
+        ];
+
+        if ($digest) {
+            $headers['Digest'] = 'SHA-256='.$digest;
+        }
+
+        return $headers;
+    }
 }
diff --git a/app/Util/ActivityPub/Inbox.php b/app/Util/ActivityPub/Inbox.php
index 4441becfb..e98b48c49 100644
--- a/app/Util/ActivityPub/Inbox.php
+++ b/app/Util/ActivityPub/Inbox.php
@@ -2,1236 +2,1396 @@
 
 namespace App\Util\ActivityPub;
 
-use Cache, DB, Log, Purify, Redis, Storage, Validator;
-use App\{
-	Activity,
-	DirectMessage,
-	Follower,
-	FollowRequest,
-	Instance,
-	Like,
-	Notification,
-	Media,
-	Profile,
-	Status,
-	StatusHashtag,
-	Story,
-	StoryView,
-	UserFilter
-};
-use Carbon\Carbon;
-use App\Util\ActivityPub\Helpers;
-use Illuminate\Support\Str;
-use App\Jobs\LikePipeline\LikePipeline;
-use App\Jobs\FollowPipeline\FollowPipeline;
+use App\DirectMessage;
+use App\Follower;
+use App\FollowRequest;
+use App\Instance;
 use App\Jobs\DeletePipeline\DeleteRemoteProfilePipeline;
+use App\Jobs\FollowPipeline\FollowPipeline;
+use App\Jobs\HomeFeedPipeline\FeedRemoveRemotePipeline;
+use App\Jobs\LikePipeline\LikePipeline;
+use App\Jobs\MovePipeline\CleanupLegacyAccountMovePipeline;
+use App\Jobs\MovePipeline\MoveMigrateFollowersPipeline;
+use App\Jobs\MovePipeline\ProcessMovePipeline;
+use App\Jobs\MovePipeline\UnfollowLegacyAccountMovePipeline;
+use App\Jobs\ProfilePipeline\HandleUpdateActivity;
+use App\Jobs\PushNotificationPipeline\MentionPushNotifyPipeline;
 use App\Jobs\StatusPipeline\RemoteStatusDelete;
+use App\Jobs\StatusPipeline\StatusRemoteUpdatePipeline;
 use App\Jobs\StoryPipeline\StoryExpire;
 use App\Jobs\StoryPipeline\StoryFetch;
-use App\Jobs\StatusPipeline\StatusRemoteUpdatePipeline;
-use App\Jobs\ProfilePipeline\HandleUpdateActivity;
-
+use App\Like;
+use App\Media;
+use App\Models\Conversation;
+use App\Models\RemoteReport;
+use App\Notification;
+use App\Profile;
+use App\Services\AccountService;
+use App\Services\FollowerService;
+use App\Services\NotificationAppGatewayService;
+use App\Services\PollService;
+use App\Services\PushNotificationService;
+use App\Services\ReblogService;
+use App\Services\UserFilterService;
+use App\Status;
+use App\Story;
+use App\StoryView;
+use App\UserFilter;
 use App\Util\ActivityPub\Validator\Accept as AcceptValidator;
-use App\Util\ActivityPub\Validator\Add as AddValidator;
 use App\Util\ActivityPub\Validator\Announce as AnnounceValidator;
 use App\Util\ActivityPub\Validator\Follow as FollowValidator;
 use App\Util\ActivityPub\Validator\Like as LikeValidator;
-use App\Util\ActivityPub\Validator\UndoFollow as UndoFollowValidator;
+use App\Util\ActivityPub\Validator\MoveValidator;
 use App\Util\ActivityPub\Validator\UpdatePersonValidator;
-
-use App\Services\PollService;
-use App\Services\FollowerService;
-use App\Services\ReblogService;
-use App\Services\StatusService;
-use App\Services\UserFilterService;
-use App\Services\NetworkTimelineService;
-use App\Models\Conversation;
-use App\Models\RemoteReport;
-use App\Jobs\ProfilePipeline\IncrementPostCount;
-use App\Jobs\ProfilePipeline\DecrementPostCount;
+use Cache;
+use Illuminate\Support\Facades\Bus;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Str;
+use Purify;
+use Storage;
+use Throwable;
 
 class Inbox
 {
-	protected $headers;
-	protected $profile;
-	protected $payload;
-	protected $logger;
-
-	public function __construct($headers, $profile, $payload)
-	{
-		$this->headers = $headers;
-		$this->profile = $profile;
-		$this->payload = $payload;
-	}
-
-	public function handle()
-	{
-		$this->handleVerb();
-		return;
-	}
-
-	public function handleVerb()
-	{
-		$verb = (string) $this->payload['type'];
-		switch ($verb) {
-
-			case 'Add':
-				$this->handleAddActivity();
-				break;
-
-			case 'Create':
-				$this->handleCreateActivity();
-				break;
-
-			case 'Follow':
-				if(FollowValidator::validate($this->payload) == false) { return; }
-				$this->handleFollowActivity();
-				break;
-
-			case 'Announce':
-				if(AnnounceValidator::validate($this->payload) == false) { return; }
-				$this->handleAnnounceActivity();
-				break;
-
-			case 'Accept':
-				if(AcceptValidator::validate($this->payload) == false) { return; }
-				$this->handleAcceptActivity();
-				break;
-
-			case 'Delete':
-				$this->handleDeleteActivity();
-				break;
-
-			case 'Like':
-				if(LikeValidator::validate($this->payload) == false) { return; }
-				$this->handleLikeActivity();
-				break;
-
-			case 'Reject':
-				$this->handleRejectActivity();
-				break;
-
-			case 'Undo':
-				$this->handleUndoActivity();
-				break;
-
-			case 'View':
-				$this->handleViewActivity();
-				break;
-
-			case 'Story:Reaction':
-				$this->handleStoryReactionActivity();
-				break;
-
-			case 'Story:Reply':
-				$this->handleStoryReplyActivity();
-				break;
-
-			case 'Flag':
-				$this->handleFlagActivity();
-				break;
-
-			case 'Update':
-				$this->handleUpdateActivity();
-				break;
-
-			default:
-				// TODO: decide how to handle invalid verbs.
-				break;
-		}
-	}
-
-	public function verifyNoteAttachment()
-	{
-		$activity = $this->payload['object'];
-
-		if(isset($activity['inReplyTo']) &&
-			!empty($activity['inReplyTo']) &&
-			Helpers::validateUrl($activity['inReplyTo'])
-		) {
-			// reply detected, skip attachment check
-			return true;
-		}
-
-		$valid = Helpers::verifyAttachments($activity);
-
-		return $valid;
-	}
-
-	public function actorFirstOrCreate($actorUrl)
-	{
-		return Helpers::profileFetch($actorUrl);
-	}
-
-	public function handleAddActivity()
-	{
-		// stories ;)
-
-		if(!isset(
-			$this->payload['actor'],
-			$this->payload['object']
-		)) {
-			return;
-		}
-
-		$actor = $this->payload['actor'];
-		$obj = $this->payload['object'];
-
-		if(!Helpers::validateUrl($actor)) {
-			return;
-		}
-
-		if(!isset($obj['type'])) {
-			return;
-		}
-
-		switch($obj['type']) {
-			case 'Story':
-				StoryFetch::dispatch($this->payload);
-			break;
-		}
-
-		return;
-	}
-
-	public function handleCreateActivity()
-	{
-		$activity = $this->payload['object'];
-		$actor = $this->actorFirstOrCreate($this->payload['actor']);
-		if(!$actor || $actor->domain == null) {
-			return;
-		}
-
-		if(!isset($activity['to'])) {
-			return;
-		}
-		$to = isset($activity['to']) ? $activity['to'] : [];
-		$cc = isset($activity['cc']) ? $activity['cc'] : [];
-
-		if($activity['type'] == 'Question') {
-			$this->handlePollCreate();
-			return;
-		}
-
-		if( is_array($to) &&
-			is_array($cc) &&
-			count($to) == 1 &&
-			count($cc) == 0 &&
-			parse_url($to[0], PHP_URL_HOST) == config('pixelfed.domain.app')
-		) {
-			$this->handleDirectMessage();
-			return;
-		}
-
-		if($activity['type'] == 'Note' && !empty($activity['inReplyTo'])) {
-			$this->handleNoteReply();
-
-		} elseif ($activity['type'] == 'Note' && !empty($activity['attachment'])) {
-			if(!$this->verifyNoteAttachment()) {
-				return;
-			}
-			$this->handleNoteCreate();
-		}
-		return;
-	}
-
-	public function handleNoteReply()
-	{
-		$activity = $this->payload['object'];
-		$actor = $this->actorFirstOrCreate($this->payload['actor']);
-		if(!$actor || $actor->domain == null) {
-			return;
-		}
-
-		$inReplyTo = $activity['inReplyTo'];
-		$url = isset($activity['url']) ? $activity['url'] : $activity['id'];
-
-		Helpers::statusFirstOrFetch($url, true);
-		return;
-	}
-
-	public function handlePollCreate()
-	{
-		$activity = $this->payload['object'];
-		$actor = $this->actorFirstOrCreate($this->payload['actor']);
-		if(!$actor || $actor->domain == null) {
-			return;
-		}
-		$url = isset($activity['url']) ? $activity['url'] : $activity['id'];
-		Helpers::statusFirstOrFetch($url);
-		return;
-	}
-
-	public function handleNoteCreate()
-	{
-		$activity = $this->payload['object'];
-		$actor = $this->actorFirstOrCreate($this->payload['actor']);
-		if(!$actor || $actor->domain == null) {
-			return;
-		}
-
-		if( isset($activity['inReplyTo']) &&
-			isset($activity['name']) &&
-			!isset($activity['content']) &&
-			!isset($activity['attachment']) &&
-			Helpers::validateLocalUrl($activity['inReplyTo'])
-		) {
-			$this->handlePollVote();
-			return;
-		}
-
-		if($actor->followers_count == 0) {
-            if(config('federation.activitypub.ingest.store_notes_without_followers')) {
-            } else if(FollowerService::followerCount($actor->id, true) == 0) {
-				return;
-			}
-		}
-
-		$hasUrl = isset($activity['url']);
-		$url = isset($activity['url']) ? $activity['url'] : $activity['id'];
-
-		if($hasUrl) {
-			if(Status::whereUri($url)->exists()) {
-				return;
-			}
-		} else {
-			if(Status::whereObjectUrl($url)->exists()) {
-				return;
-			}
-		}
-
-		Helpers::storeStatus(
-			$url,
-			$actor,
-			$activity
-		);
-		return;
-	}
-
-	public function handlePollVote()
-	{
-		$activity = $this->payload['object'];
-		$actor = $this->actorFirstOrCreate($this->payload['actor']);
-
-		if(!$actor) {
-			return;
-		}
-
-		$status = Helpers::statusFetch($activity['inReplyTo']);
-
-		if(!$status) {
-			return;
-		}
-
-		$poll = $status->poll;
-
-		if(!$poll) {
-			return;
-		}
-
-		if(now()->gt($poll->expires_at)) {
-			return;
-		}
-
-		$choices = $poll->poll_options;
-		$choice = array_search($activity['name'], $choices);
-
-		if($choice === false) {
-			return;
-		}
-
-		if(PollVote::whereStatusId($status->id)->whereProfileId($actor->id)->exists()) {
-			return;
-		}
-
-		$vote = new PollVote;
-		$vote->status_id = $status->id;
-		$vote->profile_id = $actor->id;
-		$vote->poll_id = $poll->id;
-		$vote->choice = $choice;
-		$vote->uri = isset($activity['id']) ? $activity['id'] : null;
-		$vote->save();
-
-		$tallies = $poll->cached_tallies;
-		$tallies[$choice] = $tallies[$choice] + 1;
-		$poll->cached_tallies = $tallies;
-		$poll->votes_count = array_sum($tallies);
-		$poll->save();
-
-		PollService::del($status->id);
-
-		return;
-	}
-
-	public function handleDirectMessage()
-	{
-		$activity = $this->payload['object'];
-		$actor = $this->actorFirstOrCreate($this->payload['actor']);
-		$profile = Profile::whereNull('domain')
-			->whereUsername(array_last(explode('/', $activity['to'][0])))
-			->firstOrFail();
-
-		if(in_array($actor->id, $profile->blockedIds()->toArray())) {
-			return;
-		}
-
-		$msg = $activity['content'];
-		$msgText = strip_tags($activity['content']);
-
-		if(Str::startsWith($msgText, '@' . $profile->username)) {
-			$len = strlen('@' . $profile->username);
-			$msgText = substr($msgText, $len + 1);
-		}
-
-		if($profile->user->settings->public_dm == false || $profile->is_private) {
-			if($profile->follows($actor) == true) {
-				$hidden = false;
-			} else {
-				$hidden = true;
-			}
-		} else {
-			$hidden = false;
-		}
-
-		$status = new Status;
-		$status->profile_id = $actor->id;
-		$status->caption = $msgText;
-		$status->rendered = $msg;
-		$status->visibility = 'direct';
-		$status->scope = 'direct';
-		$status->url = $activity['id'];
-		$status->in_reply_to_profile_id = $profile->id;
-		$status->save();
-
-		$dm = new DirectMessage;
-		$dm->to_id = $profile->id;
-		$dm->from_id = $actor->id;
-		$dm->status_id = $status->id;
-		$dm->is_hidden = $hidden;
-		$dm->type = 'text';
-		$dm->save();
-
-		Conversation::updateOrInsert(
-			[
-				'to_id' => $profile->id,
-				'from_id' => $actor->id
-			],
-			[
-				'type' => 'text',
-				'status_id' => $status->id,
-				'dm_id' => $dm->id,
-				'is_hidden' => $hidden
-			]
-		);
-
-		if(count($activity['attachment'])) {
-			$photos = 0;
-			$videos = 0;
-			$allowed = explode(',', config_cache('pixelfed.media_types'));
-			$activity['attachment'] = array_slice($activity['attachment'], 0, config_cache('pixelfed.max_album_length'));
-			foreach($activity['attachment'] as $a) {
-				$type = $a['mediaType'];
-				$url = $a['url'];
-				$valid = Helpers::validateUrl($url);
-				if(in_array($type, $allowed) == false || $valid == false) {
-					continue;
-				}
-
-				$media = new Media();
-				$media->remote_media = true;
-				$media->status_id = $status->id;
-				$media->profile_id = $status->profile_id;
-				$media->user_id = null;
-				$media->media_path = $url;
-				$media->remote_url = $url;
-				$media->mime = $type;
-				$media->save();
-				if(explode('/', $type)[0] == 'image') {
-					$photos = $photos + 1;
-				}
-				if(explode('/', $type)[0] == 'video') {
-					$videos = $videos + 1;
-				}
-			}
-
-			if($photos && $videos == 0) {
-				$dm->type = $photos == 1 ? 'photo' : 'photos';
-				$dm->save();
-			}
-			if($videos && $photos == 0) {
-				$dm->type = $videos == 1 ? 'video' : 'videos';
-				$dm->save();
-			}
-		}
-
-		if(filter_var($msgText, FILTER_VALIDATE_URL)) {
-			if(Helpers::validateUrl($msgText)) {
-				$dm->type = 'link';
-				$dm->meta = [
-					'domain' => parse_url($msgText, PHP_URL_HOST),
-					'local' => parse_url($msgText, PHP_URL_HOST) ==
-						parse_url(config('app.url'), PHP_URL_HOST)
-				];
-				$dm->save();
-			}
-		}
-
-		$nf = UserFilter::whereUserId($profile->id)
-			->whereFilterableId($actor->id)
-			->whereFilterableType('App\Profile')
-			->whereFilterType('dm.mute')
-			->exists();
-
-		if($profile->domain == null && $hidden == false && !$nf) {
-			$notification = new Notification();
-			$notification->profile_id = $profile->id;
-			$notification->actor_id = $actor->id;
-			$notification->action = 'dm';
-			$notification->item_id = $dm->id;
-			$notification->item_type = "App\DirectMessage";
-			$notification->save();
-		}
-
-		return;
-	}
-
-	public function handleFollowActivity()
-	{
-		$actor = $this->actorFirstOrCreate($this->payload['actor']);
-		$target = $this->actorFirstOrCreate($this->payload['object']);
-		if(!$actor || !$target) {
-			return;
-		}
-
-		if($actor->domain == null || $target->domain !== null) {
-			return;
-		}
-
-		if(
-			Follower::whereProfileId($actor->id)
-				->whereFollowingId($target->id)
-				->exists() ||
-			FollowRequest::whereFollowerId($actor->id)
-				->whereFollowingId($target->id)
-				->exists()
-		) {
-			return;
-		}
-
-		$blocks = UserFilterService::blocks($target->id);
-		if($blocks && in_array($actor->id, $blocks)) {
-			return;
-		}
-
-		if($target->is_private == true) {
-			FollowRequest::updateOrCreate([
-				'follower_id' => $actor->id,
-				'following_id' => $target->id,
-			],[
-				'activity' => collect($this->payload)->only(['id','actor','object','type'])->toArray()
-			]);
-		} else {
-			$follower = new Follower;
-			$follower->profile_id = $actor->id;
-			$follower->following_id = $target->id;
-			$follower->local_profile = empty($actor->domain);
-			$follower->save();
-
-			FollowPipeline::dispatch($follower);
-			FollowerService::add($actor->id, $target->id);
-
-			// send Accept to remote profile
-			$accept = [
-				'@context' => 'https://www.w3.org/ns/activitystreams',
-				'id'       => $target->permalink().'#accepts/follows/' . $follower->id,
-				'type'     => 'Accept',
-				'actor'    => $target->permalink(),
-				'object'   => [
-					'id'        => $this->payload['id'],
-					'actor'     => $actor->permalink(),
-					'type'      => 'Follow',
-					'object'    => $target->permalink()
-				]
-			];
-			Helpers::sendSignedObject($target, $actor->inbox_url, $accept);
-			Cache::forget('profile:follower_count:'.$target->id);
-			Cache::forget('profile:follower_count:'.$actor->id);
-			Cache::forget('profile:following_count:'.$target->id);
-			Cache::forget('profile:following_count:'.$actor->id);
-		}
-
-		return;
-	}
-
-	public function handleAnnounceActivity()
-	{
-		$actor = $this->actorFirstOrCreate($this->payload['actor']);
-		$activity = $this->payload['object'];
-
-		if(!$actor || $actor->domain == null) {
-			return;
-		}
-
-		$parent = Helpers::statusFetch($activity);
-
-		if(!$parent || empty($parent)) {
-			return;
-		}
-
-		$blocks = UserFilterService::blocks($parent->profile_id);
-		if($blocks && in_array($actor->id, $blocks)) {
-			return;
-		}
-
-		$status = Status::firstOrCreate([
-			'profile_id' => $actor->id,
-			'reblog_of_id' => $parent->id,
-			'type' => 'share'
-		]);
-
-		Notification::firstOrCreate(
-			[
-				'profile_id' => $parent->profile_id,
-				'actor_id' => $actor->id,
-				'action' => 'share',
-				'item_id' => $parent->id,
-				'item_type' => 'App\Status',
-			]
-		);
-
-		$parent->reblogs_count = $parent->reblogs_count + 1;
-		$parent->save();
-
-		ReblogService::addPostReblog($parent->profile_id, $status->id);
-
-		return;
-	}
-
-	public function handleAcceptActivity()
-	{
-		$actor = $this->payload['object']['actor'];
-		$obj = $this->payload['object']['object'];
-		$type = $this->payload['object']['type'];
-
-		if($type !== 'Follow') {
-			return;
-		}
-
-		$actor = Helpers::validateLocalUrl($actor);
-		$target = Helpers::validateUrl($obj);
-
-		if(!$actor || !$target) {
-			return;
-		}
-
-		$actor = Helpers::profileFetch($actor);
-		$target = Helpers::profileFetch($target);
-
-		if(!$actor || !$target) {
-			return;
-		}
-
-		$request = FollowRequest::whereFollowerId($actor->id)
-			->whereFollowingId($target->id)
-			->whereIsRejected(false)
-			->first();
-
-		if(!$request) {
-			return;
-		}
-
-		$follower = Follower::firstOrCreate([
-			'profile_id' => $actor->id,
-			'following_id' => $target->id,
-		]);
-		FollowPipeline::dispatch($follower);
-
-		$request->delete();
-
-		return;
-	}
-
-	public function handleDeleteActivity()
-	{
-		if(!isset(
-			$this->payload['actor'],
-			$this->payload['object']
-		)) {
-			return;
-		}
-		$actor = $this->payload['actor'];
-		$obj = $this->payload['object'];
-		if(is_string($obj) == true && $actor == $obj && Helpers::validateUrl($obj)) {
-			$profile = Profile::whereRemoteUrl($obj)->first();
-			if(!$profile || $profile->private_key != null) {
-				return;
-			}
-			DeleteRemoteProfilePipeline::dispatch($profile)->onQueue('inbox');
-			return;
-		} else {
-			if(!isset(
-				$obj['id'],
-				$this->payload['object'],
-				$this->payload['object']['id'],
-				$this->payload['object']['type']
-			)) {
-				return;
-			}
-			$type = $this->payload['object']['type'];
-			$typeCheck = in_array($type, ['Person', 'Tombstone', 'Story']);
-			if(!Helpers::validateUrl($actor) || !Helpers::validateUrl($obj['id']) || !$typeCheck) {
-				return;
-			}
-			if(parse_url($obj['id'], PHP_URL_HOST) !== parse_url($actor, PHP_URL_HOST)) {
-				return;
-			}
-			$id = $this->payload['object']['id'];
-			switch ($type) {
-				case 'Person':
-						$profile = Profile::whereRemoteUrl($actor)->first();
-						if(!$profile || $profile->private_key != null) {
-							return;
-						}
-						DeleteRemoteProfilePipeline::dispatch($profile)->onQueue('inbox');
-						return;
-					break;
-
-				case 'Tombstone':
-						$profile = Profile::whereRemoteUrl($actor)->first();
-						if(!$profile || $profile->private_key != null) {
-							return;
-						}
-						$status = Status::whereProfileId($profile->id)
-							->whereObjectUrl($id)
-							->first();
-						if(!$status) {
-							return;
-						}
-						RemoteStatusDelete::dispatch($status)->onQueue('high');
-						return;
-					break;
-
-				case 'Story':
-					$story = Story::whereObjectId($id)
-						->first();
-					if($story) {
-						StoryExpire::dispatch($story)->onQueue('story');
-					}
-					return;
-					break;
-
-				default:
-					return;
-					break;
-			}
-		}
-		return;
-	}
-
-	public function handleLikeActivity()
-	{
-		$actor = $this->payload['actor'];
-
-		if(!Helpers::validateUrl($actor)) {
-			return;
-		}
-
-		$profile = self::actorFirstOrCreate($actor);
-		$obj = $this->payload['object'];
-		if(!Helpers::validateUrl($obj)) {
-			return;
-		}
-		$status = Helpers::statusFirstOrFetch($obj);
-		if(!$status || !$profile) {
-			return;
-		}
-
-		$blocks = UserFilterService::blocks($status->profile_id);
-		if($blocks && in_array($profile->id, $blocks)) {
-			return;
-		}
-
-		$like = Like::firstOrCreate([
-			'profile_id' => $profile->id,
-			'status_id' => $status->id
-		]);
-
-		if($like->wasRecentlyCreated == true) {
-			$status->likes_count = $status->likes_count + 1;
-			$status->save();
-			LikePipeline::dispatch($like);
-		}
-
-		return;
-	}
-
-	public function handleRejectActivity()
-	{
-	}
-
-	public function handleUndoActivity()
-	{
-		$actor = $this->payload['actor'];
-		$profile = self::actorFirstOrCreate($actor);
-		$obj = $this->payload['object'];
-
-		if(!$profile) {
-			return;
-		}
-		// TODO: Some implementations do not inline the object, skip for now
-		if(!$obj || !is_array($obj) || !isset($obj['type'])) {
-			return;
-		}
-
-		switch ($obj['type']) {
-			case 'Accept':
-				break;
-
-			case 'Announce':
-				if(is_array($obj) && isset($obj['object'])) {
-					$obj = $obj['object'];
-				}
-				if(!is_string($obj)) {
-					return;
-				}
-				if(Helpers::validateLocalUrl($obj)) {
-					$parsedId = last(explode('/', $obj));
-					$status = Status::find($parsedId);
-				} else {
-					$status = Status::whereUri($obj)->first();
-				}
-				if(!$status) {
-					return;
-				}
-				Status::whereProfileId($profile->id)
-					->whereReblogOfId($status->id)
-					->delete();
-				ReblogService::removePostReblog($profile->id, $status->id);
-				Notification::whereProfileId($status->profile_id)
-					->whereActorId($profile->id)
-					->whereAction('share')
-					->whereItemId($status->reblog_of_id)
-					->whereItemType('App\Status')
-					->forceDelete();
-				break;
-
-			case 'Block':
-				break;
-
-			case 'Follow':
-				$following = self::actorFirstOrCreate($obj['object']);
-				if(!$following) {
-					return;
-				}
-				Follower::whereProfileId($profile->id)
-					->whereFollowingId($following->id)
-					->delete();
-				Notification::whereProfileId($following->id)
-					->whereActorId($profile->id)
-					->whereAction('follow')
-					->whereItemId($following->id)
-					->whereItemType('App\Profile')
-					->forceDelete();
-				FollowerService::remove($profile->id, $following->id);
-				break;
-
-			case 'Like':
-				$objectUri = $obj['object'];
-				if(!is_string($objectUri)) {
-					if(is_array($objectUri) && isset($objectUri['id']) && is_string($objectUri['id'])) {
-						$objectUri = $objectUri['id'];
-					} else {
-						return;
-					}
-				}
-				$status = Helpers::statusFirstOrFetch($objectUri);
-				if(!$status) {
-					return;
-				}
-				Like::whereProfileId($profile->id)
-					->whereStatusId($status->id)
-					->forceDelete();
-				Notification::whereProfileId($status->profile_id)
-					->whereActorId($profile->id)
-					->whereAction('like')
-					->whereItemId($status->id)
-					->whereItemType('App\Status')
-					->forceDelete();
-				break;
-		}
-		return;
-	}
-
-	public function handleViewActivity()
-	{
-		if(!isset(
-			$this->payload['actor'],
-			$this->payload['object']
-		)) {
-			return;
-		}
-
-		$actor = $this->payload['actor'];
-		$obj = $this->payload['object'];
-
-		if(!Helpers::validateUrl($actor)) {
-			return;
-		}
-
-		if(!$obj || !is_array($obj)) {
-			return;
-		}
-
-		if(!isset($obj['type']) || !isset($obj['object']) || $obj['type'] != 'Story') {
-			return;
-		}
-
-		if(!Helpers::validateLocalUrl($obj['object'])) {
-			return;
-		}
-
-		$profile = Helpers::profileFetch($actor);
-		$storyId = Str::of($obj['object'])->explode('/')->last();
-
-		$story = Story::whereActive(true)
-			->whereLocal(true)
-			->find($storyId);
-
-		if(!$story) {
-			return;
-		}
-
-		if(!FollowerService::follows($profile->id, $story->profile_id)) {
-			return;
-		}
-
-		$view = StoryView::firstOrCreate([
-			'story_id' => $story->id,
-			'profile_id' => $profile->id
-		]);
-
-		if($view->wasRecentlyCreated == true) {
-			$story->view_count++;
-			$story->save();
-		}
-
-		return;
-	}
-
-	public function handleStoryReactionActivity()
-	{
-		if(!isset(
-			$this->payload['actor'],
-			$this->payload['id'],
-			$this->payload['inReplyTo'],
-			$this->payload['content']
-		)) {
-			return;
-		}
-
-		$id = $this->payload['id'];
-		$actor = $this->payload['actor'];
-		$storyUrl = $this->payload['inReplyTo'];
-		$to = $this->payload['to'];
-		$text = Purify::clean($this->payload['content']);
-
-		if(parse_url($id, PHP_URL_HOST) !== parse_url($actor, PHP_URL_HOST)) {
-			return;
-		}
-
-		if(!Helpers::validateUrl($id) || !Helpers::validateUrl($actor)) {
-			return;
-		}
-
-		if(!Helpers::validateLocalUrl($storyUrl)) {
-			return;
-		}
-
-		if(!Helpers::validateLocalUrl($to)) {
-			return;
-		}
-
-		if(Status::whereObjectUrl($id)->exists()) {
-			return;
-		}
-
-		$storyId = Str::of($storyUrl)->explode('/')->last();
-		$targetProfile = Helpers::profileFetch($to);
-
-		$story = Story::whereProfileId($targetProfile->id)
-			->find($storyId);
-
-		if(!$story) {
-			return;
-		}
-
-		if($story->can_react == false) {
-			return;
-		}
-
-		$actorProfile = Helpers::profileFetch($actor);
-
-		if(!FollowerService::follows($actorProfile->id, $targetProfile->id)) {
-			return;
-		}
-
-		$status = new Status;
-		$status->profile_id = $actorProfile->id;
-		$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();
-
-		$dm = new DirectMessage;
-		$dm->to_id = $story->profile_id;
-		$dm->from_id = $actorProfile->id;
-		$dm->type = 'story:react';
-		$dm->status_id = $status->id;
-		$dm->meta = json_encode([
-			'story_username' => $targetProfile->username,
-			'story_actor_username' => $actorProfile->username,
-			'story_id' => $story->id,
-			'story_media_url' => url(Storage::url($story->path)),
-			'reaction' => $text
-		]);
-		$dm->save();
-
-		Conversation::updateOrInsert(
-			[
-				'to_id' => $story->profile_id,
-				'from_id' => $actorProfile->id
-			],
-			[
-				'type' => 'story:react',
-				'status_id' => $status->id,
-				'dm_id' => $dm->id,
-				'is_hidden' => false
-			]
-		);
-
-		$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();
-
-		return;
-	}
-
-	public function handleStoryReplyActivity()
-	{
-		if(!isset(
-			$this->payload['actor'],
-			$this->payload['id'],
-			$this->payload['inReplyTo'],
-			$this->payload['content']
-		)) {
-			return;
-		}
-
-		$id = $this->payload['id'];
-		$actor = $this->payload['actor'];
-		$storyUrl = $this->payload['inReplyTo'];
-		$to = $this->payload['to'];
-		$text = Purify::clean($this->payload['content']);
-
-		if(parse_url($id, PHP_URL_HOST) !== parse_url($actor, PHP_URL_HOST)) {
-			return;
-		}
-
-		if(!Helpers::validateUrl($id) || !Helpers::validateUrl($actor)) {
-			return;
-		}
-
-		if(!Helpers::validateLocalUrl($storyUrl)) {
-			return;
-		}
-
-		if(!Helpers::validateLocalUrl($to)) {
-			return;
-		}
-
-		if(Status::whereObjectUrl($id)->exists()) {
-			return;
-		}
-
-		$storyId = Str::of($storyUrl)->explode('/')->last();
-		$targetProfile = Helpers::profileFetch($to);
-
-		$story = Story::whereProfileId($targetProfile->id)
-			->find($storyId);
-
-		if(!$story) {
-			return;
-		}
-
-		if($story->can_react == false) {
-			return;
-		}
-
-		$actorProfile = Helpers::profileFetch($actor);
-
-		if(!FollowerService::follows($actorProfile->id, $targetProfile->id)) {
-			return;
-		}
-
-		$status = new Status;
-		$status->profile_id = $actorProfile->id;
-		$status->type = 'story:reply';
-		$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,
-			'caption' => $text
-		]);
-		$status->save();
-
-		$dm = new DirectMessage;
-		$dm->to_id = $story->profile_id;
-		$dm->from_id = $actorProfile->id;
-		$dm->type = 'story:comment';
-		$dm->status_id = $status->id;
-		$dm->meta = json_encode([
-			'story_username' => $targetProfile->username,
-			'story_actor_username' => $actorProfile->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' => $actorProfile->id
-			],
-			[
-				'type' => 'story:comment',
-				'status_id' => $status->id,
-				'dm_id' => $dm->id,
-				'is_hidden' => false
-			]
-		);
-
-		$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();
-
-		return;
-	}
-
-	public function handleFlagActivity()
-	{
-		if(!isset(
-			$this->payload['id'],
-			$this->payload['type'],
-			$this->payload['actor'],
-			$this->payload['object']
-		)) {
-			return;
-		}
-
-		$id = $this->payload['id'];
-		$actor = $this->payload['actor'];
-
-		if(Helpers::validateLocalUrl($id) || parse_url($id, PHP_URL_HOST) !== parse_url($actor, PHP_URL_HOST)) {
-			return;
-		}
-
-		$content = isset($this->payload['content']) ? Purify::clean($this->payload['content']) : null;
-		$object = $this->payload['object'];
-
-		if(empty($object) || (!is_array($object) && !is_string($object))) {
-			return;
-		}
-
-		if(is_array($object) && count($object) > 100) {
-			return;
-		}
-
-		$objects = collect([]);
-		$accountId = null;
-
-		foreach($object as $objectUrl) {
-			if(!Helpers::validateLocalUrl($objectUrl)) {
-				continue;
-			}
-
-			if(str_contains($objectUrl, '/users/')) {
-				$username = last(explode('/', $objectUrl));
-				$profileId = Profile::whereUsername($username)->first();
-				if($profileId) {
-					$accountId = $profileId->id;
-				}
-			} else if(str_contains($objectUrl, '/p/')) {
-				$postId = last(explode('/', $objectUrl));
-				$objects->push($postId);
-			} else {
-				continue;
-			}
-		}
-
-		if(!$accountId || !$objects->count()) {
-			return;
-		}
-
-		$instanceHost = parse_url($id, PHP_URL_HOST);
-
-		$instance = Instance::updateOrCreate([
-			'domain' => $instanceHost
-		]);
-
-		$report = new RemoteReport;
-		$report->status_ids = $objects->toArray();
-		$report->comment = $content;
-		$report->account_id = $accountId;
-		$report->uri = $id;
-		$report->instance_id = $instance->id;
-		$report->report_meta = [
-			'actor' => $actor,
-			'object' => $object
-		];
-		$report->save();
-
-		return;
-	}
-
-	public function handleUpdateActivity()
-	{
-		$activity = $this->payload['object'];
-
-		if(!isset($activity['type'], $activity['id'])) {
-			return;
-		}
-
-		if(!Helpers::validateUrl($activity['id'])) {
-			return;
-		}
-
-		if($activity['type'] === 'Note') {
-			if(Status::whereObjectUrl($activity['id'])->exists()) {
-				StatusRemoteUpdatePipeline::dispatch($activity);
-			}
-		} else if ($activity['type'] === 'Person') {
-			if(UpdatePersonValidator::validate($this->payload)) {
-				HandleUpdateActivity::dispatch($this->payload)->onQueue('low');
-			}
-		}
-	}
+    protected $headers;
+
+    protected $profile;
+
+    protected $payload;
+
+    protected $logger;
+
+    public function __construct($headers, $profile, $payload)
+    {
+        $this->headers = $headers;
+        $this->profile = $profile;
+        $this->payload = $payload;
+    }
+
+    public function handle()
+    {
+        $this->handleVerb();
+
+    }
+
+    public function handleVerb()
+    {
+        $verb = (string) $this->payload['type'];
+        switch ($verb) {
+
+            case 'Add':
+                $this->handleAddActivity();
+                break;
+
+            case 'Create':
+                $this->handleCreateActivity();
+                break;
+
+            case 'Follow':
+                if (FollowValidator::validate($this->payload) == false) {
+                    return;
+                }
+                $this->handleFollowActivity();
+                break;
+
+            case 'Announce':
+                if (AnnounceValidator::validate($this->payload) == false) {
+                    return;
+                }
+                $this->handleAnnounceActivity();
+                break;
+
+            case 'Accept':
+                if (AcceptValidator::validate($this->payload) == false) {
+                    return;
+                }
+                $this->handleAcceptActivity();
+                break;
+
+            case 'Delete':
+                $this->handleDeleteActivity();
+                break;
+
+            case 'Like':
+                if (LikeValidator::validate($this->payload) == false) {
+                    return;
+                }
+                $this->handleLikeActivity();
+                break;
+
+            case 'Reject':
+                $this->handleRejectActivity();
+                break;
+
+            case 'Undo':
+                $this->handleUndoActivity();
+                break;
+
+            case 'View':
+                $this->handleViewActivity();
+                break;
+
+            case 'Story:Reaction':
+                $this->handleStoryReactionActivity();
+                break;
+
+            case 'Story:Reply':
+                $this->handleStoryReplyActivity();
+                break;
+
+            case 'Flag':
+                $this->handleFlagActivity();
+                break;
+
+            case 'Update':
+                $this->handleUpdateActivity();
+                break;
+
+            case 'Move':
+                if (MoveValidator::validate($this->payload) == false) {
+                    Log::info('[AP][INBOX][MOVE] VALIDATE_FAILURE '.json_encode($this->payload));
+
+                    return;
+                }
+                $this->handleMoveActivity();
+                break;
+
+            default:
+                // TODO: decide how to handle invalid verbs.
+                break;
+        }
+    }
+
+    public function verifyNoteAttachment()
+    {
+        $activity = $this->payload['object'];
+
+        if (isset($activity['inReplyTo']) &&
+            ! empty($activity['inReplyTo']) &&
+            Helpers::validateUrl($activity['inReplyTo'])
+        ) {
+            // reply detected, skip attachment check
+            return true;
+        }
+
+        $valid = Helpers::verifyAttachments($activity);
+
+        return $valid;
+    }
+
+    public function actorFirstOrCreate($actorUrl)
+    {
+        return Helpers::profileFetch($actorUrl);
+    }
+
+    public function handleAddActivity()
+    {
+        // stories ;)
+
+        if (! isset(
+            $this->payload['actor'],
+            $this->payload['object']
+        )) {
+            return;
+        }
+
+        $actor = $this->payload['actor'];
+        $obj = $this->payload['object'];
+
+        if (! Helpers::validateUrl($actor)) {
+            return;
+        }
+
+        if (! isset($obj['type'])) {
+            return;
+        }
+
+        switch ($obj['type']) {
+            case 'Story':
+                StoryFetch::dispatch($this->payload);
+                break;
+        }
+
+    }
+
+    public function handleCreateActivity()
+    {
+        $activity = $this->payload['object'];
+        if (config('autospam.live_filters.enabled')) {
+            $filters = config('autospam.live_filters.filters');
+            if (! empty($filters) && isset($activity['content']) && ! empty($activity['content']) && strlen($filters) > 3) {
+                $filters = array_map('trim', explode(',', $filters));
+                $content = $activity['content'];
+                foreach ($filters as $filter) {
+                    $filter = trim(strtolower($filter));
+                    if (! $filter || ! strlen($filter)) {
+                        continue;
+                    }
+                    if (str_contains(strtolower($content), $filter)) {
+                        return;
+                    }
+                }
+            }
+        }
+        $actor = $this->actorFirstOrCreate($this->payload['actor']);
+        if (! $actor || $actor->domain == null) {
+            return;
+        }
+
+        if (! isset($activity['to'])) {
+            return;
+        }
+        $to = isset($activity['to']) ? $activity['to'] : [];
+        $cc = isset($activity['cc']) ? $activity['cc'] : [];
+
+        if ($activity['type'] == 'Question') {
+            //$this->handlePollCreate();
+
+            return;
+        }
+
+        if (is_array($to) &&
+            is_array($cc) &&
+            count($to) == 1 &&
+            count($cc) == 0 &&
+            parse_url($to[0], PHP_URL_HOST) == config('pixelfed.domain.app')
+        ) {
+            $this->handleDirectMessage();
+
+            return;
+        }
+
+        if ($activity['type'] == 'Note' && ! empty($activity['inReplyTo'])) {
+            $this->handleNoteReply();
+
+        } elseif ($activity['type'] == 'Note' && ! empty($activity['attachment'])) {
+            if (! $this->verifyNoteAttachment()) {
+                return;
+            }
+            $this->handleNoteCreate();
+        }
+
+    }
+
+    public function handleNoteReply()
+    {
+        $activity = $this->payload['object'];
+        $actor = $this->actorFirstOrCreate($this->payload['actor']);
+        if (! $actor || $actor->domain == null) {
+            return;
+        }
+
+        $inReplyTo = $activity['inReplyTo'];
+        $url = isset($activity['url']) ? $activity['url'] : $activity['id'];
+
+        Helpers::statusFirstOrFetch($url, true);
+
+    }
+
+    public function handlePollCreate()
+    {
+        $activity = $this->payload['object'];
+        $actor = $this->actorFirstOrCreate($this->payload['actor']);
+        if (! $actor || $actor->domain == null) {
+            return;
+        }
+        $url = isset($activity['url']) ? $activity['url'] : $activity['id'];
+        Helpers::statusFirstOrFetch($url);
+
+    }
+
+    public function handleNoteCreate()
+    {
+        $activity = $this->payload['object'];
+        $actor = $this->actorFirstOrCreate($this->payload['actor']);
+        if (! $actor || $actor->domain == null) {
+            return;
+        }
+
+        if (isset($activity['inReplyTo']) &&
+            isset($activity['name']) &&
+            ! isset($activity['content']) &&
+            ! isset($activity['attachment']) &&
+            Helpers::validateLocalUrl($activity['inReplyTo'])
+        ) {
+            $this->handlePollVote();
+
+            return;
+        }
+
+        if ($actor->followers_count == 0) {
+            if (config('federation.activitypub.ingest.store_notes_without_followers')) {
+            } elseif (FollowerService::followerCount($actor->id, true) == 0) {
+                return;
+            }
+        }
+
+        $hasUrl = isset($activity['url']);
+        $url = isset($activity['url']) ? $activity['url'] : $activity['id'];
+
+        if ($hasUrl) {
+            if (Status::whereUri($url)->exists()) {
+                return;
+            }
+        } else {
+            if (Status::whereObjectUrl($url)->exists()) {
+                return;
+            }
+        }
+
+        Helpers::storeStatus(
+            $url,
+            $actor,
+            $activity
+        );
+
+    }
+
+    public function handlePollVote()
+    {
+        $activity = $this->payload['object'];
+        $actor = $this->actorFirstOrCreate($this->payload['actor']);
+
+        if (! $actor) {
+            return;
+        }
+
+        $status = Helpers::statusFetch($activity['inReplyTo']);
+
+        if (! $status) {
+            return;
+        }
+
+        $poll = $status->poll;
+
+        if (! $poll) {
+            return;
+        }
+
+        if (now()->gt($poll->expires_at)) {
+            return;
+        }
+
+        $choices = $poll->poll_options;
+        $choice = array_search($activity['name'], $choices);
+
+        if ($choice === false) {
+            return;
+        }
+
+        if (PollVote::whereStatusId($status->id)->whereProfileId($actor->id)->exists()) {
+            return;
+        }
+
+        $vote = new PollVote;
+        $vote->status_id = $status->id;
+        $vote->profile_id = $actor->id;
+        $vote->poll_id = $poll->id;
+        $vote->choice = $choice;
+        $vote->uri = isset($activity['id']) ? $activity['id'] : null;
+        $vote->save();
+
+        $tallies = $poll->cached_tallies;
+        $tallies[$choice] = $tallies[$choice] + 1;
+        $poll->cached_tallies = $tallies;
+        $poll->votes_count = array_sum($tallies);
+        $poll->save();
+
+        PollService::del($status->id);
+
+    }
+
+    public function handleDirectMessage()
+    {
+        $activity = $this->payload['object'];
+        $actor = $this->actorFirstOrCreate($this->payload['actor']);
+        $profile = Profile::whereNull('domain')
+            ->whereUsername(array_last(explode('/', $activity['to'][0])))
+            ->firstOrFail();
+
+        if (! $actor || in_array($actor->id, $profile->blockedIds()->toArray())) {
+            return;
+        }
+
+        if (AccountService::blocksDomain($profile->id, $actor->domain) == true) {
+            return;
+        }
+
+        $msg = Purify::clean($activity['content']);
+        $msgText = strip_tags($msg);
+
+        if (Str::startsWith($msgText, '@'.$profile->username)) {
+            $len = strlen('@'.$profile->username);
+            $msgText = substr($msgText, $len + 1);
+        }
+
+        if ($profile->user->settings->public_dm == false || $profile->is_private) {
+            if ($profile->follows($actor) == true) {
+                $hidden = false;
+            } else {
+                $hidden = true;
+            }
+        } else {
+            $hidden = false;
+        }
+
+        $status = new Status;
+        $status->profile_id = $actor->id;
+        $status->caption = $msgText;
+        $status->visibility = 'direct';
+        $status->scope = 'direct';
+        $status->url = $activity['id'];
+        $status->uri = $activity['id'];
+        $status->object_url = $activity['id'];
+        $status->in_reply_to_profile_id = $profile->id;
+        $status->save();
+
+        $dm = new DirectMessage;
+        $dm->to_id = $profile->id;
+        $dm->from_id = $actor->id;
+        $dm->status_id = $status->id;
+        $dm->is_hidden = $hidden;
+        $dm->type = 'text';
+        $dm->save();
+
+        Conversation::updateOrInsert(
+            [
+                'to_id' => $profile->id,
+                'from_id' => $actor->id,
+            ],
+            [
+                'type' => 'text',
+                'status_id' => $status->id,
+                'dm_id' => $dm->id,
+                'is_hidden' => $hidden,
+            ]
+        );
+
+        if (count($activity['attachment'])) {
+            $photos = 0;
+            $videos = 0;
+            $allowed = explode(',', config_cache('pixelfed.media_types'));
+            $activity['attachment'] = array_slice($activity['attachment'], 0, config_cache('pixelfed.max_album_length'));
+            foreach ($activity['attachment'] as $a) {
+                $type = $a['mediaType'];
+                $url = $a['url'];
+                $valid = Helpers::validateUrl($url);
+                if (in_array($type, $allowed) == false || $valid == false) {
+                    continue;
+                }
+
+                $media = new Media;
+                $media->remote_media = true;
+                $media->status_id = $status->id;
+                $media->profile_id = $status->profile_id;
+                $media->user_id = null;
+                $media->media_path = $url;
+                $media->remote_url = $url;
+                $media->mime = $type;
+                $media->save();
+                if (explode('/', $type)[0] == 'image') {
+                    $photos = $photos + 1;
+                }
+                if (explode('/', $type)[0] == 'video') {
+                    $videos = $videos + 1;
+                }
+            }
+
+            if ($photos && $videos == 0) {
+                $dm->type = $photos == 1 ? 'photo' : 'photos';
+                $dm->save();
+            }
+            if ($videos && $photos == 0) {
+                $dm->type = $videos == 1 ? 'video' : 'videos';
+                $dm->save();
+            }
+        }
+
+        if (filter_var($msgText, FILTER_VALIDATE_URL)) {
+            if (Helpers::validateUrl($msgText)) {
+                $dm->type = 'link';
+                $dm->meta = [
+                    'domain' => parse_url($msgText, PHP_URL_HOST),
+                    'local' => parse_url($msgText, PHP_URL_HOST) ==
+                        parse_url(config('app.url'), PHP_URL_HOST),
+                ];
+                $dm->save();
+            }
+        }
+
+        $nf = UserFilter::whereUserId($profile->id)
+            ->whereFilterableId($actor->id)
+            ->whereFilterableType('App\Profile')
+            ->whereFilterType('dm.mute')
+            ->exists();
+
+        if ($profile->domain == null && $hidden == false && ! $nf) {
+            $notification = new Notification;
+            $notification->profile_id = $profile->id;
+            $notification->actor_id = $actor->id;
+            $notification->action = 'dm';
+            $notification->item_id = $dm->id;
+            $notification->item_type = "App\DirectMessage";
+            $notification->save();
+
+            if (NotificationAppGatewayService::enabled()) {
+                if (PushNotificationService::check('mention', $profile->id)) {
+                    $user = User::whereProfileId($profile->id)->first();
+                    if ($user && $user->expo_token && $user->notify_enabled) {
+                        MentionPushNotifyPipeline::dispatch($user->expo_token, $actor->username)->onQueue('pushnotify');
+                    }
+                }
+            }
+        }
+
+    }
+
+    public function handleFollowActivity()
+    {
+        $actor = $this->actorFirstOrCreate($this->payload['actor']);
+        $target = $this->actorFirstOrCreate($this->payload['object']);
+        if (! $actor || ! $target) {
+            return;
+        }
+
+        if ($actor->domain == null || $target->domain !== null) {
+            return;
+        }
+
+        if (AccountService::blocksDomain($target->id, $actor->domain) == true) {
+            return;
+        }
+
+        if (
+            Follower::whereProfileId($actor->id)
+                ->whereFollowingId($target->id)
+                ->exists() ||
+            FollowRequest::whereFollowerId($actor->id)
+                ->whereFollowingId($target->id)
+                ->exists()
+        ) {
+            return;
+        }
+
+        $blocks = UserFilterService::blocks($target->id);
+        if ($blocks && in_array($actor->id, $blocks)) {
+            return;
+        }
+
+        if ($target->is_private == true) {
+            FollowRequest::updateOrCreate([
+                'follower_id' => $actor->id,
+                'following_id' => $target->id,
+            ], [
+                'activity' => collect($this->payload)->only(['id', 'actor', 'object', 'type'])->toArray(),
+            ]);
+        } else {
+            $follower = new Follower;
+            $follower->profile_id = $actor->id;
+            $follower->following_id = $target->id;
+            $follower->local_profile = empty($actor->domain);
+            $follower->save();
+
+            FollowPipeline::dispatch($follower);
+            FollowerService::add($actor->id, $target->id);
+
+            // send Accept to remote profile
+            $accept = [
+                '@context' => 'https://www.w3.org/ns/activitystreams',
+                'id' => $target->permalink().'#accepts/follows/'.$follower->id,
+                'type' => 'Accept',
+                'actor' => $target->permalink(),
+                'object' => [
+                    'id' => $this->payload['id'],
+                    'actor' => $actor->permalink(),
+                    'type' => 'Follow',
+                    'object' => $target->permalink(),
+                ],
+            ];
+            Helpers::sendSignedObject($target, $actor->inbox_url, $accept);
+            Cache::forget('profile:follower_count:'.$target->id);
+            Cache::forget('profile:follower_count:'.$actor->id);
+            Cache::forget('profile:following_count:'.$target->id);
+            Cache::forget('profile:following_count:'.$actor->id);
+        }
+
+    }
+
+    public function handleAnnounceActivity()
+    {
+        $actor = $this->actorFirstOrCreate($this->payload['actor']);
+        $activity = $this->payload['object'];
+
+        if (! $actor || $actor->domain == null) {
+            return;
+        }
+
+        $parent = Helpers::statusFetch($activity);
+
+        if (! $parent || empty($parent)) {
+            return;
+        }
+
+        if (AccountService::blocksDomain($parent->profile_id, $actor->domain) == true) {
+            return;
+        }
+
+        $blocks = UserFilterService::blocks($parent->profile_id);
+        if ($blocks && in_array($actor->id, $blocks)) {
+            return;
+        }
+
+        $status = Status::firstOrCreate([
+            'profile_id' => $actor->id,
+            'reblog_of_id' => $parent->id,
+            'type' => 'share',
+        ]);
+
+        Notification::firstOrCreate(
+            [
+                'profile_id' => $parent->profile_id,
+                'actor_id' => $actor->id,
+                'action' => 'share',
+                'item_id' => $parent->id,
+                'item_type' => 'App\Status',
+            ]
+        );
+
+        $parent->reblogs_count = $parent->reblogs_count + 1;
+        $parent->save();
+
+        ReblogService::addPostReblog($parent->profile_id, $status->id);
+
+    }
+
+    public function handleAcceptActivity()
+    {
+        $actor = $this->payload['object']['actor'];
+        $obj = $this->payload['object']['object'];
+        $type = $this->payload['object']['type'];
+
+        if ($type !== 'Follow') {
+            return;
+        }
+
+        $actor = Helpers::validateLocalUrl($actor);
+        $target = Helpers::validateUrl($obj);
+
+        if (! $actor || ! $target) {
+            return;
+        }
+
+        $actor = Helpers::profileFetch($actor);
+        $target = Helpers::profileFetch($target);
+
+        if (! $actor || ! $target) {
+            return;
+        }
+
+        if (AccountService::blocksDomain($target->id, $actor->domain) == true) {
+            return;
+        }
+
+        $request = FollowRequest::whereFollowerId($actor->id)
+            ->whereFollowingId($target->id)
+            ->whereIsRejected(false)
+            ->first();
+
+        if (! $request) {
+            return;
+        }
+
+        $follower = Follower::firstOrCreate([
+            'profile_id' => $actor->id,
+            'following_id' => $target->id,
+        ]);
+        FollowPipeline::dispatch($follower);
+
+        $request->delete();
+
+    }
+
+    public function handleDeleteActivity()
+    {
+        if (! isset(
+            $this->payload['actor'],
+            $this->payload['object']
+        )) {
+            return;
+        }
+        $actor = $this->payload['actor'];
+        $obj = $this->payload['object'];
+        if (is_string($obj) == true && $actor == $obj && Helpers::validateUrl($obj)) {
+            $profile = Profile::whereRemoteUrl($obj)->first();
+            if (! $profile || $profile->private_key != null) {
+                return;
+            }
+            DeleteRemoteProfilePipeline::dispatch($profile)->onQueue('inbox');
+
+            return;
+        } else {
+            if (! isset(
+                $obj['id'],
+                $this->payload['object'],
+                $this->payload['object']['id'],
+                $this->payload['object']['type']
+            )) {
+                return;
+            }
+            $type = $this->payload['object']['type'];
+            $typeCheck = in_array($type, ['Person', 'Tombstone', 'Story']);
+            if (! Helpers::validateUrl($actor) || ! Helpers::validateUrl($obj['id']) || ! $typeCheck) {
+                return;
+            }
+            if (parse_url($obj['id'], PHP_URL_HOST) !== parse_url($actor, PHP_URL_HOST)) {
+                return;
+            }
+            $id = $this->payload['object']['id'];
+            switch ($type) {
+                case 'Person':
+                    $profile = Profile::whereRemoteUrl($actor)->first();
+                    if (! $profile || $profile->private_key != null) {
+                        return;
+                    }
+                    DeleteRemoteProfilePipeline::dispatch($profile)->onQueue('inbox');
+
+                    return;
+                    break;
+
+                case 'Tombstone':
+                    $profile = Profile::whereRemoteUrl($actor)->first();
+                    if (! $profile || $profile->private_key != null) {
+                        return;
+                    }
+
+                    $status = Status::where('object_url', $id)->first();
+                    if (! $status) {
+                        $status = Status::where('url', $id)->first();
+                        if (! $status) {
+                            return;
+                        }
+                    }
+                    if ($status->profile_id != $profile->id) {
+                        return;
+                    }
+                    if ($status->scope && in_array($status->scope, ['public', 'unlisted', 'private'])) {
+                        if ($status->type && ! in_array($status->type, ['story:reaction', 'story:reply', 'reply'])) {
+                            FeedRemoveRemotePipeline::dispatch($status->id, $status->profile_id)->onQueue('feed');
+                        }
+                    }
+                    RemoteStatusDelete::dispatch($status)->onQueue('high');
+
+                    return;
+                    break;
+
+                case 'Story':
+                    $story = Story::whereObjectId($id)
+                        ->first();
+                    if ($story) {
+                        StoryExpire::dispatch($story)->onQueue('story');
+                    }
+
+                    return;
+                    break;
+
+                default:
+                    return;
+                    break;
+            }
+        }
+
+    }
+
+    public function handleLikeActivity()
+    {
+        $actor = $this->payload['actor'];
+
+        if (! Helpers::validateUrl($actor)) {
+            return;
+        }
+
+        $profile = self::actorFirstOrCreate($actor);
+        $obj = $this->payload['object'];
+        if (! Helpers::validateUrl($obj)) {
+            return;
+        }
+        $status = Helpers::statusFirstOrFetch($obj);
+        if (! $status || ! $profile) {
+            return;
+        }
+
+        if (AccountService::blocksDomain($status->profile_id, $profile->domain) == true) {
+            return;
+        }
+
+        $blocks = UserFilterService::blocks($status->profile_id);
+        if ($blocks && in_array($profile->id, $blocks)) {
+            return;
+        }
+
+        $like = Like::firstOrCreate([
+            'profile_id' => $profile->id,
+            'status_id' => $status->id,
+        ]);
+
+        if ($like->wasRecentlyCreated == true) {
+            $status->likes_count = $status->likes_count + 1;
+            $status->save();
+            LikePipeline::dispatch($like);
+        }
+
+    }
+
+    public function handleRejectActivity() {}
+
+    public function handleUndoActivity()
+    {
+        $actor = $this->payload['actor'];
+        $profile = self::actorFirstOrCreate($actor);
+        $obj = $this->payload['object'];
+
+        if (! $profile) {
+            return;
+        }
+        // TODO: Some implementations do not inline the object, skip for now
+        if (! $obj || ! is_array($obj) || ! isset($obj['type'])) {
+            return;
+        }
+
+        switch ($obj['type']) {
+            case 'Accept':
+                break;
+
+            case 'Announce':
+                if (is_array($obj) && isset($obj['object'])) {
+                    $obj = $obj['object'];
+                }
+                if (! is_string($obj)) {
+                    return;
+                }
+                if (Helpers::validateLocalUrl($obj)) {
+                    $parsedId = last(explode('/', $obj));
+                    $status = Status::find($parsedId);
+                } else {
+                    $status = Status::whereUri($obj)->first();
+                }
+                if (! $status) {
+                    return;
+                }
+                if (AccountService::blocksDomain($status->profile_id, $profile->domain) == true) {
+                    return;
+                }
+                FeedRemoveRemotePipeline::dispatch($status->id, $status->profile_id)->onQueue('feed');
+                Status::whereProfileId($profile->id)
+                    ->whereReblogOfId($status->id)
+                    ->delete();
+                ReblogService::removePostReblog($profile->id, $status->id);
+                Notification::whereProfileId($status->profile_id)
+                    ->whereActorId($profile->id)
+                    ->whereAction('share')
+                    ->whereItemId($status->reblog_of_id)
+                    ->whereItemType('App\Status')
+                    ->forceDelete();
+                break;
+
+            case 'Block':
+                break;
+
+            case 'Follow':
+                $following = self::actorFirstOrCreate($obj['object']);
+                if (! $following) {
+                    return;
+                }
+                if (AccountService::blocksDomain($following->id, $profile->domain) == true) {
+                    return;
+                }
+                Follower::whereProfileId($profile->id)
+                    ->whereFollowingId($following->id)
+                    ->delete();
+                Notification::whereProfileId($following->id)
+                    ->whereActorId($profile->id)
+                    ->whereAction('follow')
+                    ->whereItemId($following->id)
+                    ->whereItemType('App\Profile')
+                    ->forceDelete();
+                FollowerService::remove($profile->id, $following->id);
+                break;
+
+            case 'Like':
+                $objectUri = $obj['object'];
+                if (! is_string($objectUri)) {
+                    if (is_array($objectUri) && isset($objectUri['id']) && is_string($objectUri['id'])) {
+                        $objectUri = $objectUri['id'];
+                    } else {
+                        return;
+                    }
+                }
+                $status = Helpers::statusFirstOrFetch($objectUri);
+                if (! $status) {
+                    return;
+                }
+                if (AccountService::blocksDomain($status->profile_id, $profile->domain) == true) {
+                    return;
+                }
+                Like::whereProfileId($profile->id)
+                    ->whereStatusId($status->id)
+                    ->forceDelete();
+                Notification::whereProfileId($status->profile_id)
+                    ->whereActorId($profile->id)
+                    ->whereAction('like')
+                    ->whereItemId($status->id)
+                    ->whereItemType('App\Status')
+                    ->forceDelete();
+                break;
+        }
+
+    }
+
+    public function handleViewActivity()
+    {
+        if (! isset(
+            $this->payload['actor'],
+            $this->payload['object']
+        )) {
+            return;
+        }
+
+        $actor = $this->payload['actor'];
+        $obj = $this->payload['object'];
+
+        if (! Helpers::validateUrl($actor)) {
+            return;
+        }
+
+        if (! $obj || ! is_array($obj)) {
+            return;
+        }
+
+        if (! isset($obj['type']) || ! isset($obj['object']) || $obj['type'] != 'Story') {
+            return;
+        }
+
+        if (! Helpers::validateLocalUrl($obj['object'])) {
+            return;
+        }
+
+        $profile = Helpers::profileFetch($actor);
+        $storyId = Str::of($obj['object'])->explode('/')->last();
+
+        $story = Story::whereActive(true)
+            ->whereLocal(true)
+            ->find($storyId);
+
+        if (! $story) {
+            return;
+        }
+
+        if (AccountService::blocksDomain($story->profile_id, $profile->domain) == true) {
+            return;
+        }
+
+        if (! FollowerService::follows($profile->id, $story->profile_id)) {
+            return;
+        }
+
+        $view = StoryView::firstOrCreate([
+            'story_id' => $story->id,
+            'profile_id' => $profile->id,
+        ]);
+
+        if ($view->wasRecentlyCreated == true) {
+            $story->view_count++;
+            $story->save();
+        }
+
+    }
+
+    public function handleStoryReactionActivity()
+    {
+        if (! isset(
+            $this->payload['actor'],
+            $this->payload['id'],
+            $this->payload['inReplyTo'],
+            $this->payload['content']
+        )) {
+            return;
+        }
+
+        $id = $this->payload['id'];
+        $actor = $this->payload['actor'];
+        $storyUrl = $this->payload['inReplyTo'];
+        $to = $this->payload['to'];
+        $text = Purify::clean($this->payload['content']);
+
+        if (parse_url($id, PHP_URL_HOST) !== parse_url($actor, PHP_URL_HOST)) {
+            return;
+        }
+
+        if (! Helpers::validateUrl($id) || ! Helpers::validateUrl($actor)) {
+            return;
+        }
+
+        if (! Helpers::validateLocalUrl($storyUrl)) {
+            return;
+        }
+
+        if (! Helpers::validateLocalUrl($to)) {
+            return;
+        }
+
+        if (Status::whereObjectUrl($id)->exists()) {
+            return;
+        }
+
+        $storyId = Str::of($storyUrl)->explode('/')->last();
+        $targetProfile = Helpers::profileFetch($to);
+
+        $story = Story::whereProfileId($targetProfile->id)
+            ->find($storyId);
+
+        if (! $story) {
+            return;
+        }
+
+        if ($story->can_react == false) {
+            return;
+        }
+
+        $actorProfile = Helpers::profileFetch($actor);
+
+        if (AccountService::blocksDomain($targetProfile->id, $actorProfile->domain) == true) {
+            return;
+        }
+
+        if (! FollowerService::follows($actorProfile->id, $targetProfile->id)) {
+            return;
+        }
+
+        $url = $id;
+
+        if (str_ends_with($url, '/activity')) {
+            $url = substr($url, 0, -9);
+        }
+
+        $status = new Status;
+        $status->profile_id = $actorProfile->id;
+        $status->type = 'story:reaction';
+        $status->url = $url;
+        $status->uri = $url;
+        $status->object_url = $url;
+        $status->caption = $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();
+
+        $dm = new DirectMessage;
+        $dm->to_id = $story->profile_id;
+        $dm->from_id = $actorProfile->id;
+        $dm->type = 'story:react';
+        $dm->status_id = $status->id;
+        $dm->meta = json_encode([
+            'story_username' => $targetProfile->username,
+            'story_actor_username' => $actorProfile->username,
+            'story_id' => $story->id,
+            'story_media_url' => url(Storage::url($story->path)),
+            'reaction' => $text,
+        ]);
+        $dm->save();
+
+        Conversation::updateOrInsert(
+            [
+                'to_id' => $story->profile_id,
+                'from_id' => $actorProfile->id,
+            ],
+            [
+                'type' => 'story:react',
+                'status_id' => $status->id,
+                'dm_id' => $dm->id,
+                'is_hidden' => false,
+            ]
+        );
+
+        $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();
+
+    }
+
+    public function handleStoryReplyActivity()
+    {
+        if (! isset(
+            $this->payload['actor'],
+            $this->payload['id'],
+            $this->payload['inReplyTo'],
+            $this->payload['content']
+        )) {
+            return;
+        }
+
+        $id = $this->payload['id'];
+        $actor = $this->payload['actor'];
+        $storyUrl = $this->payload['inReplyTo'];
+        $to = $this->payload['to'];
+        $text = Purify::clean($this->payload['content']);
+
+        if (parse_url($id, PHP_URL_HOST) !== parse_url($actor, PHP_URL_HOST)) {
+            return;
+        }
+
+        if (! Helpers::validateUrl($id) || ! Helpers::validateUrl($actor)) {
+            return;
+        }
+
+        if (! Helpers::validateLocalUrl($storyUrl)) {
+            return;
+        }
+
+        if (! Helpers::validateLocalUrl($to)) {
+            return;
+        }
+
+        if (Status::whereObjectUrl($id)->exists()) {
+            return;
+        }
+
+        $storyId = Str::of($storyUrl)->explode('/')->last();
+        $targetProfile = Helpers::profileFetch($to);
+
+        $story = Story::whereProfileId($targetProfile->id)
+            ->find($storyId);
+
+        if (! $story) {
+            return;
+        }
+
+        if ($story->can_react == false) {
+            return;
+        }
+
+        $actorProfile = Helpers::profileFetch($actor);
+
+        if (AccountService::blocksDomain($targetProfile->id, $actorProfile->domain) == true) {
+            return;
+        }
+
+        if (! FollowerService::follows($actorProfile->id, $targetProfile->id)) {
+            return;
+        }
+
+        $url = $id;
+
+        if (str_ends_with($url, '/activity')) {
+            $url = substr($url, 0, -9);
+        }
+
+        $status = new Status;
+        $status->profile_id = $actorProfile->id;
+        $status->type = 'story:reply';
+        $status->caption = $text;
+        $status->url = $url;
+        $status->uri = $url;
+        $status->object_url = $url;
+        $status->scope = 'direct';
+        $status->visibility = 'direct';
+        $status->in_reply_to_profile_id = $story->profile_id;
+        $status->entities = json_encode([
+            'story_id' => $story->id,
+            'caption' => $text,
+        ]);
+        $status->save();
+
+        $dm = new DirectMessage;
+        $dm->to_id = $story->profile_id;
+        $dm->from_id = $actorProfile->id;
+        $dm->type = 'story:comment';
+        $dm->status_id = $status->id;
+        $dm->meta = json_encode([
+            'story_username' => $targetProfile->username,
+            'story_actor_username' => $actorProfile->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' => $actorProfile->id,
+            ],
+            [
+                'type' => 'story:comment',
+                'status_id' => $status->id,
+                'dm_id' => $dm->id,
+                'is_hidden' => false,
+            ]
+        );
+
+        $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();
+
+    }
+
+    public function handleFlagActivity()
+    {
+        if (! isset(
+            $this->payload['id'],
+            $this->payload['type'],
+            $this->payload['actor'],
+            $this->payload['object']
+        )) {
+            return;
+        }
+
+        $id = $this->payload['id'];
+        $actor = $this->payload['actor'];
+
+        if (Helpers::validateLocalUrl($id) || parse_url($id, PHP_URL_HOST) !== parse_url($actor, PHP_URL_HOST)) {
+            return;
+        }
+
+        $content = null;
+        if (isset($this->payload['content'])) {
+            if (strlen($this->payload['content']) > 5000) {
+                $content = Purify::clean(substr($this->payload['content'], 0, 5000).' ... (truncated message due to exceeding max length)');
+            } else {
+                $content = Purify::clean($this->payload['content']);
+            }
+        }
+        $object = $this->payload['object'];
+
+        if (empty($object) || (! is_array($object) && ! is_string($object))) {
+            return;
+        }
+
+        if (is_array($object) && count($object) > 100) {
+            return;
+        }
+
+        $objects = collect([]);
+        $accountId = null;
+
+        foreach ($object as $objectUrl) {
+            if (! Helpers::validateLocalUrl($objectUrl)) {
+                return;
+            }
+
+            if (str_contains($objectUrl, '/users/')) {
+                $username = last(explode('/', $objectUrl));
+                $profileId = Profile::whereUsername($username)->first();
+                if ($profileId) {
+                    $accountId = $profileId->id;
+                }
+            } elseif (str_contains($objectUrl, '/p/')) {
+                $postId = last(explode('/', $objectUrl));
+                $objects->push($postId);
+            } else {
+                continue;
+            }
+        }
+
+        if (! $accountId && ! $objects->count()) {
+            return;
+        }
+
+        if ($objects->count()) {
+            $obc = $objects->count();
+            if ($obc > 25) {
+                if ($obc > 30) {
+                    return;
+                } else {
+                    $objLimit = $objects->take(20);
+                    $objects = collect($objLimit->all());
+                    $obc = $objects->count();
+                }
+            }
+            $count = Status::whereProfileId($accountId)->find($objects)->count();
+            if ($obc !== $count) {
+                return;
+            }
+        }
+
+        $instanceHost = parse_url($id, PHP_URL_HOST);
+
+        $instance = Instance::updateOrCreate([
+            'domain' => $instanceHost,
+        ]);
+
+        $report = new RemoteReport;
+        $report->status_ids = $objects->toArray();
+        $report->comment = $content;
+        $report->account_id = $accountId;
+        $report->uri = $id;
+        $report->instance_id = $instance->id;
+        $report->report_meta = [
+            'actor' => $actor,
+            'object' => $object,
+        ];
+        $report->save();
+
+    }
+
+    public function handleUpdateActivity()
+    {
+        $activity = $this->payload['object'];
+
+        if (! isset($activity['type'], $activity['id'])) {
+            return;
+        }
+
+        if (! Helpers::validateUrl($activity['id'])) {
+            return;
+        }
+
+        if ($activity['type'] === 'Note') {
+            if (Status::whereObjectUrl($activity['id'])->exists()) {
+                StatusRemoteUpdatePipeline::dispatch($activity);
+            }
+        } elseif ($activity['type'] === 'Person') {
+            if (UpdatePersonValidator::validate($this->payload)) {
+                HandleUpdateActivity::dispatch($this->payload)->onQueue('low');
+            }
+        }
+    }
+
+    public function handleMoveActivity()
+    {
+        $actor = $this->payload['actor'];
+        $activity = $this->payload['object'];
+        $target = $this->payload['target'];
+        if (
+            ! Helpers::validateUrl($actor) ||
+            ! Helpers::validateUrl($activity) ||
+            ! Helpers::validateUrl($target)
+        ) {
+            return;
+        }
+
+        Bus::chain([
+            new ProcessMovePipeline($target, $activity),
+            new MoveMigrateFollowersPipeline($target, $activity),
+            new UnfollowLegacyAccountMovePipeline($target, $activity),
+            new CleanupLegacyAccountMovePipeline($target, $activity),
+        ])
+            ->catch(function (Throwable $e) {
+                Log::error($e);
+            })
+            ->onQueue('move')
+            ->delay(now()->addMinutes(random_int(1, 3)))
+            ->dispatch();
+    }
 }
diff --git a/app/Util/ActivityPub/Outbox.php b/app/Util/ActivityPub/Outbox.php
index 43adb36e3..aba34955e 100644
--- a/app/Util/ActivityPub/Outbox.php
+++ b/app/Util/ActivityPub/Outbox.php
@@ -2,34 +2,32 @@
 
 namespace App\Util\ActivityPub;
 
-use App\Profile;
-use App\Status;
-use League\Fractal;
 use App\Http\Controllers\ProfileController;
-use App\Transformer\ActivityPub\ProfileOutbox;
+use App\Status;
 use App\Transformer\ActivityPub\Verb\CreateNote;
+use League\Fractal;
 
-class Outbox {
+class Outbox
+{
+    public static function get($profile)
+    {
+        abort_if(! (bool) config_cache('federation.activitypub.enabled'), 404);
+        abort_if(! config('federation.activitypub.outbox'), 404);
 
-	public static function get($profile)
-	{
-        abort_if(!config_cache('federation.activitypub.enabled'), 404);
-        abort_if(!config('federation.activitypub.outbox'), 404);
-
-        if($profile->status != null) {
+        if ($profile->status != null) {
             return ProfileController::accountCheck($profile);
         }
 
-        if($profile->is_private) {
-            return ['error'=>'403', 'msg' => 'private profile'];
+        if ($profile->is_private) {
+            return ['error' => '403', 'msg' => 'private profile'];
         }
 
         $timeline = $profile
-                    ->statuses()
-                    ->whereScope('public')
-                    ->orderBy('created_at', 'desc')
-                    ->take(10)
-                    ->get();
+            ->statuses()
+            ->whereScope('public')
+            ->orderBy('created_at', 'desc')
+            ->take(10)
+            ->get();
 
         $count = Status::whereProfileId($profile->id)->count();
 
@@ -38,14 +36,14 @@ class Outbox {
         $res = $fractal->createData($resource)->toArray();
 
         $outbox = [
-            '@context'     => 'https://www.w3.org/ns/activitystreams',
-            '_debug'       => 'Outbox only supports latest 10 objects, pagination is not supported',
-            'id'           => $profile->permalink('/outbox'),
-            'type'         => 'OrderedCollection',
-            'totalItems'   => $count,
-            'orderedItems' => $res['data']
+            '@context' => 'https://www.w3.org/ns/activitystreams',
+            '_debug' => 'Outbox only supports latest 10 objects, pagination is not supported',
+            'id' => $profile->permalink('/outbox'),
+            'type' => 'OrderedCollection',
+            'totalItems' => $count,
+            'orderedItems' => $res['data'],
         ];
-        return $outbox;
-	}
 
+        return $outbox;
+    }
 }
diff --git a/app/Util/ActivityPub/Validator/MoveValidator.php b/app/Util/ActivityPub/Validator/MoveValidator.php
new file mode 100644
index 000000000..a7ca43297
--- /dev/null
+++ b/app/Util/ActivityPub/Validator/MoveValidator.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Util\ActivityPub\Validator;
+
+use Illuminate\Validation\Rule;
+use Validator;
+
+class MoveValidator
+{
+    public static function validate($payload)
+    {
+        return Validator::make($payload, [
+            '@context' => 'required',
+            'type' => [
+                'required',
+                Rule::in(['Move']),
+            ],
+            'actor' => 'required|url',
+            'object' => 'required|url',
+            'target' => 'required|url',
+        ])->passes();
+    }
+}
diff --git a/app/Util/Lexer/RestrictedNames.php b/app/Util/Lexer/RestrictedNames.php
index 4224ae96c..0974f2a9c 100644
--- a/app/Util/Lexer/RestrictedNames.php
+++ b/app/Util/Lexer/RestrictedNames.php
@@ -4,376 +4,381 @@ namespace App\Util\Lexer;
 
 class RestrictedNames
 {
-	public static $additional = [
-		'autoconfig',
-		'blog',
-		'broadcasthost',
-		'copyright',
-		'download',
-		'domainadmin',
-		'domainadministrator',
-		'errors',
-		'events',
-		'example',
-		'faq',
-		'faqs',
-		'features',
-		'ftp',
-		'guest',
-		'guests',
-		'hostmaster',
-		'hostmaster',
-		'imap',
-		'info',
-		'information',
-		'is',
-		'isatap',
-		'it',
-		'localdomain',
-		'localhost',
-		'mail',
-		'mailer-daemon',
-		'mailerdaemon',
-		'marketing',
-		'me',
-		'mis',
-		'mx',
-		'no-reply',
-		'nobody',
-		'noc',
-		'noreply',
-		'ns0',
-		'ns1',
-		'ns2',
-		'ns3',
-		'ns4',
-		'ns5',
-		'ns6',
-		'ns7',
-		'ns8',
-		'ns9',
-		'owner',
-		'pop',
-		'pop3',
-		'postmaster',
-		'pricing',
-		'root',
-		'sales',
-		'security',
-		'signin',
-		'signout',
-		'smtp',
-		'src',
-		'ssladmin',
-		'ssladministrator',
-		'sslwebmaster',
-		'sys',
-		'sysadmin',
-		'system',
-		'tutorial',
-		'tutorials',
-		'usenet',
-		'uucp',
-		'webmaster',
-		'wpad',
-	];
+    public static $additional = [
+        'autoconfig',
+        'blog',
+        'broadcasthost',
+        'copyright',
+        'download',
+        'domainadmin',
+        'domainadministrator',
+        'errors',
+        'events',
+        'example',
+        'faq',
+        'faqs',
+        'features',
+        'ftp',
+        'guest',
+        'guests',
+        'hostmaster',
+        'hostmaster',
+        'imap',
+        'info',
+        'information',
+        'is',
+        'isatap',
+        'it',
+        'localdomain',
+        'localhost',
+        'mail',
+        'mailer-daemon',
+        'mailerdaemon',
+        'marketing',
+        'me',
+        'mis',
+        'mx',
+        'no-reply',
+        'nobody',
+        'noc',
+        'noreply',
+        'ns0',
+        'ns1',
+        'ns2',
+        'ns3',
+        'ns4',
+        'ns5',
+        'ns6',
+        'ns7',
+        'ns8',
+        'ns9',
+        'owner',
+        'pop',
+        'pop3',
+        'postmaster',
+        'pricing',
+        'root',
+        'sales',
+        'security',
+        'signin',
+        'signout',
+        'smtp',
+        'src',
+        'ssladmin',
+        'ssladministrator',
+        'sslwebmaster',
+        'sys',
+        'sysadmin',
+        'system',
+        'tutorial',
+        'tutorials',
+        'usenet',
+        'uucp',
+        'webmaster',
+        'wpad',
+    ];
 
-	public static $reserved = [
-		// Reserved for instance admin
-		'admin',
-		'administrator',
+    public static $reserved = [
+        // Reserved for instance admin
+        'admin',
+        'administrator',
 
-		// Static Assets
-		'assets',
-		'public',
-		'storage',
-		'htaccess',
-		'.htaccess',
-		'favicon.ico',
-		'embed.js',
-		'index.php',
-		'manifest.json',
-		'mix-manifest.json',
-		'robots.txt',
+        // Federation
+        'authorize_interaction',
 
-		// Laravel Horizon
-		'horizon',
+        // Static Assets
+        'assets',
+        'public',
+        'storage',
+        'htaccess',
+        '.htaccess',
+        'favicon.ico',
+        'embed.js',
+        'index.php',
+        'manifest.json',
+        'mix-manifest.json',
+        'robots.txt',
 
-		// Reserved routes
-		'a',
-		'app',
-		'about',
-		'aboutus',
-		'about-us',
-		'abuse',
-		'actor',
-		'actors',
-		'account',
-		'admins',
-		'api',
-		'audio',
-		'auth',
-		'avatar',
-		'avatars',
-		'b',
-		'bartender',
-		'broadcast',
-		'broadcaster',
-		'booth',
-		'bouncer',
-		'browse',
-		'c',
-		'cdn',
-		'circle',
-		'circles',
-		'checkpoint',
-		'collection',
-		'collections',
-		'community',
-		'communities',
-		'contact',
-		'contact-us',
-		'contact_us',
-		'costar',
-		'costars',
-		'css',
-		'd',
-		'dashboard',
-		'delete',
-		'deleted',
-		'deleting',
-		'dmca',
-		'db',
-		'deck',
-		'dev',
-		'developer',
-		'developers',
-		'discover',
-		'discovers',
-		'dj',
-		'doc',
-		'docs',
-		'docs',
-		'drive',
-		'drives',
-		'driver',
-		'e',
-		'embed',
-		'email',
-		'emails',
-		'emoji',
-		'emojis',
-		'error',
-		'explore',
-		'export',
-		'exports',
-		'external',
-		'f',
-		'fedi',
-		'fediverse',
-		'feed',
-		'featured',
-		'font',
-		'fonts',
-		'follow',
-		'follows',
-		'followme',
-		'follow-me',
-		'follow_me',
-		'g',
-		'go',
-		'gdpr',
-		'graph',
-		'ghost',
-		'ghosts',
-		'global',
-		'group',
-		'groups',
-		'h',
-		'header',
-		'headers',
-		'home',
-		'help',
-		'helpcenter',
-		'help-center',
-		'help_center',
-		'help_center_',
-		'help-center-',
-		'help-center_',
-		'help_center-',
-		'i',
-		'instance',
-		'inbox',
-		'img',
-		'imgs',
-		'image',
-		'images',
-		'invite',
-		'invites',
-		'import',
-		'imports',
-		'j',
-		'join',
-		'js',
-		'k',
-		'key',
-		'l',
-		'lang',
-		'language',
-		'_lang',
-		'_language',
-		'lab',
-		'labs',
-		'legal',
-		'link',
-		'live',
-		'look',
-		'look-back',
-		'loop',
-		'loops',
-		'location',
-		'locations',
-		'login',
-		'logout',
-		'm',
-		'media',
-		'mini',
-		'micro',
-		'menu',
-		'music',
-		'my2020',
-		'my2021',
-		'my2022',
-		'my2023',
-		'my2024',
-		'my2025',
-		'my2026',
-		'my2027',
-		'my2028',
-		'my2029',
-		'my2030',
-		'my',
-		'n',
-		'news',
-		'new',
-		'news',
-		'news',
-		'newsfeed',
-		'newsroom',
-		'newsrooms',
-		'news-room',
-		'news-rooms',
-		'network',
-		'networks',
-		'o',
-		'oauth',
-		'official',
-		'p',
-		'page',
-		'pages',
-		'pin',
-		'pins',
-		'photo',
-		'photos',
-		'password',
-		'portfolio',
-		'portfolios',
-		'pre',
-		'post',
-		'privacy',
-		'private',
-		'q',
-		'quote',
-		'query',
-		'r',
-		'redirect',
-		'redirects',
-		'register',
-		'registers',
-		'review',
-		'reviews',
-		'reset',
-		'report',
-		'results',
-		'reports',
-		'robot',
-		'robots',
-		's',
-		'sc',
-		'search',
-		'sell',
-		'send',
-		'settings',
-		'short',
-		'shortcode',
-		'status',
-		'statuses',
-		'site',
-		'sites',
-		'stage',
-		'static',
-		'story',
-		'stories',
-		'support',
-		'svg',
-		'svgs',
-		't',
-		'terms',
-		'telescope',
-		'timeline',
-		'timelines',
-		'tour',
-		'tv',
-		'u',
-		'user',
-		'users',
-		'username',
-		'usernames',
-		'v',
-		'valet',
-		'video',
-		'videos',
-		'vendor',
-		'w',
-		'waiter',
-		'wall',
-		'whats-new',
-		'whatsnew',
-		'whatnew',
-		'whats-news',
-		'web',
-		'ws',
-		'wss',
-		'www',
-		'x',
-		'y',
-		'year',
-		'year-in-review',
-		'z',
-		'400',
-		'401',
-		'403',
-		'404',
-		'500',
-		'503',
-		'504',
-	];
+        // Laravel Horizon
+        'horizon',
 
-	public static function get()
-	{
-		$banned = [];
+        // Reserved routes
+        'a',
+        'app',
+        'about',
+        'aboutus',
+        'about-us',
+        'abuse',
+        'actor',
+        'actors',
+        'account',
+        'admins',
+        'api',
+        'audio',
+        'auth',
+        'avatar',
+        'avatars',
+        'b',
+        'bartender',
+        'broadcast',
+        'broadcaster',
+        'booth',
+        'bouncer',
+        'browse',
+        'c',
+        'cdn',
+        'circle',
+        'circles',
+        'checkpoint',
+        'collection',
+        'collections',
+        'community',
+        'communities',
+        'contact',
+        'contact-us',
+        'contact_us',
+        'costar',
+        'costars',
+        'css',
+        'd',
+        'dashboard',
+        'delete',
+        'deleted',
+        'deleting',
+        'dmca',
+        'db',
+        'deck',
+        'dev',
+        'developer',
+        'developers',
+        'discover',
+        'discovers',
+        'dj',
+        'doc',
+        'docs',
+        'docs',
+        'drive',
+        'drives',
+        'driver',
+        'e',
+        'embed',
+        'email',
+        'emails',
+        'emoji',
+        'emojis',
+        'error',
+        'explore',
+        'export',
+        'exports',
+        'external',
+        'f',
+        'fedi',
+        'fediverse',
+        'feed',
+        'featured',
+        'font',
+        'fonts',
+        'follow',
+        'follows',
+        'followme',
+        'follow-me',
+        'follow_me',
+        'g',
+        'go',
+        'gdpr',
+        'graph',
+        'ghost',
+        'ghosts',
+        'global',
+        'group',
+        'groups',
+        'h',
+        'header',
+        'headers',
+        'home',
+        'help',
+        'help.center',
+        'helpcenter',
+        'help-center',
+        'help_center',
+        'help_center_',
+        'help-center-',
+        'help-center_',
+        'help_center-',
+        'i',
+        'instance',
+        'inbox',
+        'img',
+        'imgs',
+        'image',
+        'images',
+        'invite',
+        'invites',
+        'import',
+        'imports',
+        'intent',
+        'j',
+        'join',
+        'js',
+        'k',
+        'key',
+        'l',
+        'lang',
+        'language',
+        '_lang',
+        '_language',
+        'lab',
+        'labs',
+        'legal',
+        'link',
+        'live',
+        'look',
+        'look-back',
+        'loop',
+        'loops',
+        'location',
+        'locations',
+        'login',
+        'logout',
+        'm',
+        'media',
+        'mini',
+        'micro',
+        'menu',
+        'music',
+        'my2020',
+        'my2021',
+        'my2022',
+        'my2023',
+        'my2024',
+        'my2025',
+        'my2026',
+        'my2027',
+        'my2028',
+        'my2029',
+        'my2030',
+        'my',
+        'n',
+        'news',
+        'new',
+        'news',
+        'news',
+        'newsfeed',
+        'newsroom',
+        'newsrooms',
+        'news-room',
+        'news-rooms',
+        'network',
+        'networks',
+        'o',
+        'oauth',
+        'official',
+        'p',
+        'page',
+        'pages',
+        'pin',
+        'pins',
+        'photo',
+        'photos',
+        'password',
+        'portfolio',
+        'portfolios',
+        'pre',
+        'post',
+        'privacy',
+        'private',
+        'q',
+        'quote',
+        'query',
+        'r',
+        'redirect',
+        'redirects',
+        'register',
+        'registers',
+        'review',
+        'reviews',
+        'reset',
+        'report',
+        'results',
+        'reports',
+        'robot',
+        'robots',
+        's',
+        'sc',
+        'search',
+        'sell',
+        'send',
+        'settings',
+        'short',
+        'shortcode',
+        'status',
+        'statuses',
+        'site',
+        'sites',
+        'stage',
+        'static',
+        'story',
+        'stories',
+        'support',
+        'svg',
+        'svgs',
+        't',
+        'terms',
+        'telescope',
+        'timeline',
+        'timelines',
+        'tour',
+        'tv',
+        'u',
+        'user',
+        'users',
+        'username',
+        'usernames',
+        'v',
+        'valet',
+        'video',
+        'videos',
+        'vendor',
+        'w',
+        'waiter',
+        'wall',
+        'whats-new',
+        'whatsnew',
+        'whatnew',
+        'whats-news',
+        'web',
+        'ws',
+        'wss',
+        'www',
+        'x',
+        'y',
+        'year',
+        'year-in-review',
+        'z',
+        '400',
+        '401',
+        '403',
+        '404',
+        '500',
+        '503',
+        '504',
+    ];
 
-		if(config('instance.username.banned')) {
-			$banned = array_map('trim', explode(',', config('instance.username.banned')));
-		}
+    public static function get()
+    {
+        $banned = [];
 
-		$additional = self::$additional;
-		$reserved = self::$reserved;
+        if (config('instance.username.banned')) {
+            $banned = array_map('trim', explode(',', config('instance.username.banned')));
+        }
 
-		$res = array_merge($additional, $reserved, $banned);
-		$res = array_unique($res);
-		sort($res);
-		
-		return $res;
-	}
+        $additional = self::$additional;
+        $reserved = self::$reserved;
+
+        $res = array_merge($additional, $reserved, $banned);
+        $res = array_unique($res);
+        sort($res);
+
+        return $res;
+    }
 }
diff --git a/app/Util/Site/Config.php b/app/Util/Site/Config.php
index e0916591d..530dc7108 100644
--- a/app/Util/Site/Config.php
+++ b/app/Util/Site/Config.php
@@ -5,48 +5,50 @@ namespace App\Util\Site;
 use Cache;
 use Illuminate\Support\Str;
 
-class Config {
+class Config
+{
+    const CACHE_KEY = 'api:site:configuration:_v0.9';
 
-    const CACHE_KEY = 'api:site:configuration:_v0.8';
-
-    public static function get() {
-        return Cache::remember(self::CACHE_KEY, 900, function() {
+    public static function get()
+    {
+        return Cache::remember(self::CACHE_KEY, 900, function () {
             $hls = [
                 'enabled' => config('media.hls.enabled'),
             ];
-            if(config('media.hls.enabled')) {
+            if (config('media.hls.enabled')) {
                 $hls = [
                     'enabled' => true,
                     'debug' => (bool) config('media.hls.debug'),
                     'p2p' => (bool) config('media.hls.p2p'),
                     'p2p_debug' => (bool) config('media.hls.p2p_debug'),
                     'tracker' => config('media.hls.tracker'),
-                    'ice' => config('media.hls.ice')
+                    'ice' => config('media.hls.ice'),
                 ];
             }
+
             return [
                 'version' => config('pixelfed.version'),
                 'open_registration' => (bool) config_cache('pixelfed.open_registration'),
                 'uploader' => [
-                    'max_photo_size' => (int) config('pixelfed.max_photo_size'),
-                    'max_caption_length' => (int) config('pixelfed.max_caption_length'),
-                    'max_altext_length' => (int) config('pixelfed.max_altext_length', 150),
+                    'max_photo_size' => (int) config_cache('pixelfed.max_photo_size'),
+                    'max_caption_length' => (int) config_cache('pixelfed.max_caption_length'),
+                    'max_altext_length' => (int) config_cache('pixelfed.max_altext_length', 150),
                     'album_limit' => (int) config_cache('pixelfed.max_album_length'),
                     'image_quality' => (int) config_cache('pixelfed.image_quality'),
 
-                    'max_collection_length' => (int) config('pixelfed.max_collection_length', 18),
+                    'max_collection_length' => (int) config_cache('pixelfed.max_collection_length', 18),
 
-                    'optimize_image' => (bool) config('pixelfed.optimize_image'),
-                    'optimize_video' => (bool) config('pixelfed.optimize_video'),
+                    'optimize_image' => (bool) config_cache('pixelfed.optimize_image'),
+                    'optimize_video' => (bool) config_cache('pixelfed.optimize_video'),
 
                     'media_types' => config_cache('pixelfed.media_types'),
                     'mime_types' => config_cache('pixelfed.media_types') ? explode(',', config_cache('pixelfed.media_types')) : [],
-                    'enforce_account_limit' => (bool) config_cache('pixelfed.enforce_account_limit')
+                    'enforce_account_limit' => (bool) config_cache('pixelfed.enforce_account_limit'),
                 ],
 
                 'activitypub' => [
                     'enabled' => (bool) config_cache('federation.activitypub.enabled'),
-                    'remote_follow' => config('federation.activitypub.remoteFollow')
+                    'remote_follow' => config('federation.activitypub.remoteFollow'),
                 ],
 
                 'ab' => config('exp'),
@@ -54,8 +56,8 @@ class Config {
                 'site' => [
                     'name' => config_cache('app.name'),
                     'domain' => config('pixelfed.domain.app'),
-                    'url'    => config('app.url'),
-                    'description' => config_cache('app.short_description')
+                    'url' => config('app.url'),
+                    'description' => config_cache('app.short_description'),
                 ],
 
                 'account' => [
@@ -63,15 +65,15 @@ class Config {
                     'max_bio_length' => config('pixelfed.max_bio_length'),
                     'max_name_length' => config('pixelfed.max_name_length'),
                     'min_password_length' => config('pixelfed.min_password_length'),
-                    'max_account_size' => config('pixelfed.max_account_size')
+                    'max_account_size' => config('pixelfed.max_account_size'),
                 ],
 
                 'username' => [
                     'remote' => [
                         'formats' => config('instance.username.remote.formats'),
                         'format' => config('instance.username.remote.format'),
-                        'custom' => config('instance.username.remote.custom')
-                    ]
+                        'custom' => config('instance.username.remote.custom'),
+                    ],
                 ],
 
                 'features' => [
@@ -85,22 +87,30 @@ class Config {
                     'import' => [
                         'instagram' => (bool) config_cache('pixelfed.import.instagram.enabled'),
                         'mastodon' => false,
-                        'pixelfed' => false
+                        'pixelfed' => false,
                     ],
                     'label' => [
                         'covid' => [
                             'enabled' => (bool) config('instance.label.covid.enabled'),
                             'org' => config('instance.label.covid.org'),
                             'url' => config('instance.label.covid.url'),
-                        ]
+                        ],
                     ],
-                    'hls' => $hls
-                ]
+                    'hls' => $hls,
+                    'groups' => (bool) config('groups.enabled'),
+                ],
             ];
         });
     }
 
-    public static function json() {
+    public static function refresh()
+    {
+        Cache::forget(self::CACHE_KEY);
+        return self::get();
+    }
+
+    public static function json()
+    {
         return json_encode(self::get(), JSON_FORCE_OBJECT);
     }
 }
diff --git a/app/Util/Site/Nodeinfo.php b/app/Util/Site/Nodeinfo.php
index 0458299c5..9c0031ef4 100644
--- a/app/Util/Site/Nodeinfo.php
+++ b/app/Util/Site/Nodeinfo.php
@@ -2,12 +2,9 @@
 
 namespace App\Util\Site;
 
-use Illuminate\Support\Facades\Cache;
-use App\Like;
-use App\Profile;
-use App\Status;
+use App\Services\InstanceService;
 use App\User;
-use Illuminate\Support\Str;
+use Illuminate\Support\Facades\Cache;
 
 class Nodeinfo
 {
@@ -17,49 +14,48 @@ class Nodeinfo
             $activeHalfYear = self::activeUsersHalfYear();
             $activeMonth = self::activeUsersMonthly();
 
-            $users = Cache::remember('api:nodeinfo:users', 43200, function() {
+            $users = Cache::remember('api:nodeinfo:users', 43200, function () {
                 return User::count();
             });
 
-            $statuses = Cache::remember('api:nodeinfo:statuses', 21600, function() {
-                return Status::whereLocal(true)->count();
-            });
+            $statuses = InstanceService::totalLocalStatuses();
 
-            $features = [ 'features' => \App\Util\Site\Config::get()['features'] ];
+            $features = ['features' => \App\Util\Site\Config::get()['features']];
 
             return [
                 'metadata' => [
                     'nodeName' => config_cache('app.name'),
                     'software' => [
-                        'homepage'  => 'https://pixelfed.org',
-                        'repo'      => 'https://github.com/pixelfed/pixelfed',
+                        'homepage' => 'https://pixelfed.org',
+                        'repo' => 'https://github.com/pixelfed/pixelfed',
                     ],
-                    'config' => $features
+                    'config' => $features,
                 ],
-                'protocols'         => [
+                'protocols' => [
                     'activitypub',
                 ],
                 'services' => [
-                    'inbound'  => [],
+                    'inbound' => [],
                     'outbound' => [],
                 ],
                 'software' => [
-                    'name'          => 'pixelfed',
-                    'version'       => config('pixelfed.version'),
+                    'name' => 'pixelfed',
+                    'version' => config('pixelfed.version'),
                 ],
                 'usage' => [
-                    'localPosts'    => (int) $statuses,
+                    'localPosts' => (int) $statuses,
                     'localComments' => 0,
-                    'users'         => [
-                        'total'          => (int) $users,
+                    'users' => [
+                        'total' => (int) $users,
                         'activeHalfyear' => (int) $activeHalfYear,
-                        'activeMonth'    => (int) $activeMonth,
+                        'activeMonth' => (int) $activeMonth,
                     ],
                 ],
                 'version' => '2.0',
             ];
         });
         $res['openRegistrations'] = (bool) config_cache('pixelfed.open_registration');
+
         return $res;
     }
 
@@ -69,7 +65,7 @@ class Nodeinfo
             'links' => [
                 [
                     'href' => config('pixelfed.nodeinfo.url'),
-                    'rel'  => 'http://nodeinfo.diaspora.software/ns/schema/2.0',
+                    'rel' => 'http://nodeinfo.diaspora.software/ns/schema/2.0',
                 ],
             ],
         ];
@@ -77,18 +73,18 @@ class Nodeinfo
 
     public static function activeUsersMonthly()
     {
-        return Cache::remember('api:nodeinfo:active-users-monthly', 43200, function() {
+        return Cache::remember('api:nodeinfo:active-users-monthly', 43200, function () {
             return User::withTrashed()
-                    ->select('last_active_at, updated_at')
-                    ->where('updated_at', '>', now()->subWeeks(5))
-                    ->orWhere('last_active_at', '>', now()->subWeeks(5))
-                    ->count();
+                ->select('last_active_at, updated_at')
+                ->where('updated_at', '>', now()->subWeeks(5))
+                ->orWhere('last_active_at', '>', now()->subWeeks(5))
+                ->count();
         });
     }
 
     public static function activeUsersHalfYear()
     {
-        return Cache::remember('api:nodeinfo:active-users-half-year', 43200, function() {
+        return Cache::remember('api:nodeinfo:active-users-half-year', 43200, function () {
             return User::withTrashed()
                 ->select('last_active_at, updated_at')
                 ->where('last_active_at', '>', now()->subMonths(6))
diff --git a/app/Util/Webfinger/Webfinger.php b/app/Util/Webfinger/Webfinger.php
index 879103332..3897fc162 100644
--- a/app/Util/Webfinger/Webfinger.php
+++ b/app/Util/Webfinger/Webfinger.php
@@ -4,43 +4,67 @@ namespace App\Util\Webfinger;
 
 class Webfinger
 {
-	protected $user;
-	protected $subject;
-	protected $aliases;
-	protected $links;
+    protected $user;
 
-	public function __construct($user)
-	{
-		$this->subject = 'acct:'.$user->username.'@'.parse_url(config('app.url'), PHP_URL_HOST);
-		$this->aliases = [
-			$user->url(),
-			$user->permalink(),
-		];
-		$this->links = [
-			[
-				'rel'  => 'http://webfinger.net/rel/profile-page',
-				'type' => 'text/html',
-				'href' => $user->url(),
-			],
-			[
-				'rel'  => 'http://schemas.google.com/g/2010#updates-from',
-				'type' => 'application/atom+xml',
-				'href' => $user->permalink('.atom'),
-			],
-			[
-				'rel'  => 'self',
-				'type' => 'application/activity+json',
-				'href' => $user->permalink(),
-			],
-		];
-	}
+    protected $subject;
 
-	public function generate()
-	{
-		return [
-			'subject' => $this->subject,
-			'aliases' => $this->aliases,
-			'links'   => $this->links,
-		];
-	}
+    protected $aliases;
+
+    protected $links;
+
+    public function __construct($user)
+    {
+        $avatar = $user ? $user->avatarUrl() : url('/storage/avatars/default.jpg');
+        $avatarPath = parse_url($avatar, PHP_URL_PATH);
+        $extension = pathinfo($avatarPath, PATHINFO_EXTENSION);
+        $mimeTypes = [
+            'jpg' => 'image/jpeg',
+            'jpeg' => 'image/jpeg',
+            'png' => 'image/png',
+            'gif' => 'image/gif',
+            'svg' => 'image/svg',
+        ];
+        $avatarType = $mimeTypes[$extension] ?? 'application/octet-stream';
+
+        $this->subject = 'acct:'.$user->username.'@'.parse_url(config('app.url'), PHP_URL_HOST);
+        $this->aliases = [
+            $user->url(),
+            $user->permalink(),
+        ];
+        $this->links = [
+            [
+                'rel' => 'http://webfinger.net/rel/profile-page',
+                'type' => 'text/html',
+                'href' => $user->url(),
+            ],
+            [
+                'rel' => 'http://schemas.google.com/g/2010#updates-from',
+                'type' => 'application/atom+xml',
+                'href' => $user->permalink('.atom'),
+            ],
+            [
+                'rel' => 'self',
+                'type' => 'application/activity+json',
+                'href' => $user->permalink(),
+            ],
+            [
+                'rel' => 'http://webfinger.net/rel/avatar',
+                'type' => $avatarType,
+                'href' => $avatar,
+            ],
+            [
+                'rel' => 'http://ostatus.org/schema/1.0/subscribe',
+                'template' => 'https://'.config_cache('pixelfed.domain.app').'/authorize_interaction?uri={uri}',
+            ],
+        ];
+    }
+
+    public function generate()
+    {
+        return [
+            'subject' => $this->subject,
+            'aliases' => $this->aliases,
+            'links' => $this->links,
+        ];
+    }
 }
diff --git a/app/Util/Webfinger/WebfingerUrl.php b/app/Util/Webfinger/WebfingerUrl.php
index 091d7ce14..b51d536d9 100644
--- a/app/Util/Webfinger/WebfingerUrl.php
+++ b/app/Util/Webfinger/WebfingerUrl.php
@@ -3,16 +3,28 @@
 namespace App\Util\Webfinger;
 
 use App\Util\Lexer\Nickname;
+use App\Services\InstanceService;
 
 class WebfingerUrl
 {
+    public static function get($url)
+    {
+        $n = Nickname::normalizeProfileUrl($url);
+        if(!$n || !isset($n['domain'], $n['username'])) {
+            return false;
+        }
+        if(in_array($n['domain'], InstanceService::getBannedDomains())) {
+            return false;
+        }
+        return 'https://' . $n['domain'] . '/.well-known/webfinger?resource=acct:' . $n['username'] . '@' . $n['domain'];
+    }
+
     public static function generateWebfingerUrl($url)
     {
         $url = Nickname::normalizeProfileUrl($url);
         $domain = $url['domain'];
         $username = $url['username'];
         $path = "https://{$domain}/.well-known/webfinger?resource=acct:{$username}@{$domain}";
-
         return $path;
     }
 }
diff --git a/composer.json b/composer.json
index 54328a674..26b975f41 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
 	"license": "AGPL-3.0-only",
 	"type": "project",
 	"require": {
-		"php": "^8.1|^8.2",
+		"php": "^8.2|^8.3",
 		"ext-bcmath": "*",
 		"ext-ctype": "*",
 		"ext-curl": "*",
@@ -14,41 +14,43 @@
 		"ext-mbstring": "*",
 		"ext-openssl": "*",
 		"bacon/bacon-qr-code": "^2.0.3",
-		"beyondcode/laravel-websockets": "^1.13",
 		"brick/math": "^0.9.3",
-		"buzz/laravel-h-captcha": "1.0.4",
+		"buzz/laravel-h-captcha": "^1.0.4",
 		"doctrine/dbal": "^3.0",
 		"intervention/image": "^2.4",
 		"jenssegers/agent": "^2.6",
-		"laravel/framework": "^10.0",
+		"laravel-notification-channels/expo": "~1.3.0|~2.0.0",
+		"laravel-notification-channels/webpush": "^8.0",
+		"laravel/framework": "^11.0",
 		"laravel/helpers": "^1.1",
 		"laravel/horizon": "^5.0",
-		"laravel/passport": "^11.0",
-		"laravel/tinker": "^2.0",
+		"laravel/passport": "^12.0",
+		"laravel/tinker": "^2.9",
 		"laravel/ui": "^4.2",
 		"league/flysystem-aws-s3-v3": "^3.0",
 		"league/iso3166": "^2.1|^4.0",
+		"league/uri": "^7.4",
 		"pbmedia/laravel-ffmpeg": "^8.0",
 		"phpseclib/phpseclib": "~2.0",
 		"pixelfed/fractal": "^0.18.0",
 		"pixelfed/laravel-snowflake": "^2.0",
-		"pixelfed/zttp": "^0.5",
 		"pragmarx/google2fa": "^8.0",
 		"predis/predis": "^2.0",
+		"pusher/pusher-php-server": "^7.2",
+		"resend/resend-php": "^0.13.0",
 		"spatie/laravel-backup": "^8.0.0",
-		"spatie/laravel-image-optimizer": "^1.7",
-		"stevebauman/purify": "6.0.*",
+		"spatie/laravel-image-optimizer": "^1.8.0",
+		"stevebauman/purify": "^6.2.0",
 		"symfony/http-client": "^6.1",
-		"symfony/http-kernel": "^6.0.0",
 		"symfony/mailgun-mailer": "^6.1"
 	},
 	"require-dev": {
-		"brianium/paratest": "^6.1",
-		"fakerphp/faker": "^1.20",
-		"laravel/telescope": "^4.14",
-		"mockery/mockery": "^1.0",
-		"nunomaduro/collision": "^6.1",
-		"phpunit/phpunit": "^9.0"
+		"fakerphp/faker": "^1.23",
+		"laravel/pint": "^1.13",
+		"laravel/telescope": "^5.0",
+		"mockery/mockery": "^1.6",
+		"nunomaduro/collision": "^8.1",
+		"phpunit/phpunit": "^11.0.1"
 	},
 	"autoload": {
 		"classmap": [
@@ -84,6 +86,9 @@
 		"post-create-project-cmd": [
 			"@php artisan key:generate --ansi"
 		],
+        "post-update-cmd": [
+            "@php artisan vendor:publish --tag=laravel-assets --ansi --force"
+        ],
 		"post-autoload-dump": [
 			"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
 			"@php artisan package:discover --ansi"
diff --git a/composer.lock b/composer.lock
index 74c453c67..2e8c215d2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,20 +4,20 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "427b8abad9495b7a7bd2a489625a3881",
+    "content-hash": "0035325cb0240e92fc378e49f76447bd",
     "packages": [
         {
             "name": "aws/aws-crt-php",
-            "version": "v1.2.1",
+            "version": "v1.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/awslabs/aws-crt-php.git",
-                "reference": "1926277fc71d253dfa820271ac5987bdb193ccf5"
+                "reference": "d71d9906c7bb63a28295447ba12e74723bd3730e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/1926277fc71d253dfa820271ac5987bdb193ccf5",
-                "reference": "1926277fc71d253dfa820271ac5987bdb193ccf5",
+                "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/d71d9906c7bb63a28295447ba12e74723bd3730e",
+                "reference": "d71d9906c7bb63a28295447ba12e74723bd3730e",
                 "shasum": ""
             },
             "require": {
@@ -56,35 +56,35 @@
             ],
             "support": {
                 "issues": "https://github.com/awslabs/aws-crt-php/issues",
-                "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.1"
+                "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.7"
             },
-            "time": "2023-03-24T20:22:19+00:00"
+            "time": "2024-10-18T22:15:13+00:00"
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.275.7",
+            "version": "3.336.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "54dcef3349c81b46c0f5f6e54b5f9bfb5db19903"
+                "reference": "954bfdfc048840ca34afe2a2e1cbcff6681989c4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/54dcef3349c81b46c0f5f6e54b5f9bfb5db19903",
-                "reference": "54dcef3349c81b46c0f5f6e54b5f9bfb5db19903",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/954bfdfc048840ca34afe2a2e1cbcff6681989c4",
+                "reference": "954bfdfc048840ca34afe2a2e1cbcff6681989c4",
                 "shasum": ""
             },
             "require": {
-                "aws/aws-crt-php": "^1.0.4",
+                "aws/aws-crt-php": "^1.2.3",
                 "ext-json": "*",
                 "ext-pcre": "*",
                 "ext-simplexml": "*",
                 "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5",
-                "guzzlehttp/promises": "^1.4.0",
+                "guzzlehttp/promises": "^1.4.0 || ^2.0",
                 "guzzlehttp/psr7": "^1.9.1 || ^2.4.5",
                 "mtdowling/jmespath.php": "^2.6",
-                "php": ">=5.5",
-                "psr/http-message": "^1.0"
+                "php": ">=7.2.5",
+                "psr/http-message": "^1.0 || ^2.0"
             },
             "require-dev": {
                 "andrewsville/php-token-reflection": "^1.4",
@@ -99,9 +99,9 @@
                 "ext-sockets": "*",
                 "nette/neon": "^2.3",
                 "paragonie/random_compat": ">= 2",
-                "phpunit/phpunit": "^4.8.35 || ^5.6.3 || ^9.5",
-                "psr/cache": "^1.0",
-                "psr/simple-cache": "^1.0",
+                "phpunit/phpunit": "^5.6.3 || ^8.5 || ^9.5",
+                "psr/cache": "^1.0 || ^2.0 || ^3.0",
+                "psr/simple-cache": "^1.0 || ^2.0 || ^3.0",
                 "sebastian/comparator": "^1.2.3 || ^4.0",
                 "yoast/phpunit-polyfills": "^1.0"
             },
@@ -124,7 +124,10 @@
                 ],
                 "psr-4": {
                     "Aws\\": "src/"
-                }
+                },
+                "exclude-from-classmap": [
+                    "src/data/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -151,9 +154,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.275.7"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.336.2"
             },
-            "time": "2023-07-13T18:21:04+00:00"
+            "time": "2024-12-20T19:05:10+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -209,88 +212,6 @@
             },
             "time": "2022-12-07T17:46:57+00:00"
         },
-        {
-            "name": "beyondcode/laravel-websockets",
-            "version": "1.14.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/beyondcode/laravel-websockets.git",
-                "reference": "9ab87be1d96340979e67b462ea5fd6a8b06e6a02"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/beyondcode/laravel-websockets/zipball/9ab87be1d96340979e67b462ea5fd6a8b06e6a02",
-                "reference": "9ab87be1d96340979e67b462ea5fd6a8b06e6a02",
-                "shasum": ""
-            },
-            "require": {
-                "cboden/ratchet": "^0.4.1",
-                "ext-json": "*",
-                "facade/ignition-contracts": "^1.0",
-                "guzzlehttp/psr7": "^1.7|^2.0",
-                "illuminate/broadcasting": "^6.0|^7.0|^8.0|^9.0|^10.0",
-                "illuminate/console": "^6.0|^7.0|^8.0|^9.0|^10.0",
-                "illuminate/http": "^6.0|^7.0|^8.0|^9.0|^10.0",
-                "illuminate/routing": "^6.0|^7.0|^8.0|^9.0|^10.0",
-                "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0",
-                "php": "^7.2|^8.0",
-                "pusher/pusher-php-server": "^3.0|^4.0|^5.0|^6.0|^7.0",
-                "react/dns": "^1.1",
-                "react/http": "^1.1",
-                "symfony/http-kernel": "^4.0|^5.0|^6.0",
-                "symfony/psr-http-message-bridge": "^1.1|^2.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "^1.3.3",
-                "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0|^8.0",
-                "phpunit/phpunit": "^8.0|^9.0|^10.0"
-            },
-            "type": "library",
-            "extra": {
-                "laravel": {
-                    "providers": [
-                        "BeyondCode\\LaravelWebSockets\\WebSocketsServiceProvider"
-                    ],
-                    "aliases": {
-                        "WebSocketRouter": "BeyondCode\\LaravelWebSockets\\Facades\\WebSocketRouter"
-                    }
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "BeyondCode\\LaravelWebSockets\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marcel Pociot",
-                    "email": "marcel@beyondco.de",
-                    "homepage": "https://beyondcode.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Freek Van der Herten",
-                    "email": "freek@spatie.be",
-                    "homepage": "https://spatie.be",
-                    "role": "Developer"
-                }
-            ],
-            "description": "An easy to use WebSocket server",
-            "homepage": "https://github.com/beyondcode/laravel-websockets",
-            "keywords": [
-                "beyondcode",
-                "laravel-websockets"
-            ],
-            "support": {
-                "issues": "https://github.com/beyondcode/laravel-websockets/issues",
-                "source": "https://github.com/beyondcode/laravel-websockets/tree/1.14.0"
-            },
-            "time": "2023-02-15T10:40:49+00:00"
-        },
         {
             "name": "brick/math",
             "version": "0.9.3",
@@ -353,32 +274,32 @@
         },
         {
             "name": "buzz/laravel-h-captcha",
-            "version": "v1.0.4",
+            "version": "v1.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thinhbuzz/laravel-h-captcha.git",
-                "reference": "f2db3734203876ef1f69ba4dc0f4d9d71462f534"
+                "reference": "53435b15cf2094306d65584e68d4ed63dee1b9b9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thinhbuzz/laravel-h-captcha/zipball/f2db3734203876ef1f69ba4dc0f4d9d71462f534",
-                "reference": "f2db3734203876ef1f69ba4dc0f4d9d71462f534",
+                "url": "https://api.github.com/repos/thinhbuzz/laravel-h-captcha/zipball/53435b15cf2094306d65584e68d4ed63dee1b9b9",
+                "reference": "53435b15cf2094306d65584e68d4ed63dee1b9b9",
                 "shasum": ""
             },
             "require": {
                 "guzzlehttp/guzzle": "6.*|7.*",
-                "illuminate/support": "5.*|6.*|7.*|8.*|9.*|10.*",
+                "illuminate/support": "5.*|6.*|7.*|8.*|9.*|10.*|11.*",
                 "php": ">=5.4.0"
             },
             "type": "library",
             "extra": {
                 "laravel": {
-                    "providers": [
-                        "Buzz\\LaravelHCaptcha\\CaptchaServiceProvider"
-                    ],
                     "aliases": {
                         "Captcha": "Buzz\\LaravelHCaptcha\\CaptchaFacade"
-                    }
+                    },
+                    "providers": [
+                        "Buzz\\LaravelHCaptcha\\CaptchaServiceProvider"
+                    ]
                 }
             },
             "autoload": {
@@ -401,59 +322,52 @@
             "homepage": "https://github.com/thinhbuzz/laravel-h-captcha",
             "keywords": [
                 "captcha",
-                "h captcha",
                 "h-captcha",
                 "hcaptcha",
                 "laravel",
                 "laravel 10",
+                "laravel 11",
                 "laravel 5",
                 "laravel 6",
                 "laravel 7",
                 "laravel 8",
-                "laravel 9",
-                "laravel10",
-                "laravel5",
-                "laravel6",
-                "laravel7",
-                "laravel8",
-                "laravel9"
+                "laravel 9"
             ],
             "support": {
                 "issues": "https://github.com/thinhbuzz/laravel-h-captcha/issues",
-                "source": "https://github.com/thinhbuzz/laravel-h-captcha/tree/v1.0.4"
+                "source": "https://github.com/thinhbuzz/laravel-h-captcha/tree/v1.0.5"
             },
-            "time": "2023-03-10T05:38:55+00:00"
+            "time": "2024-03-04T11:23:51+00:00"
         },
         {
-            "name": "cboden/ratchet",
-            "version": "v0.4.4",
+            "name": "carbonphp/carbon-doctrine-types",
+            "version": "2.1.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/ratchetphp/Ratchet.git",
-                "reference": "5012dc954541b40c5599d286fd40653f5716a38f"
+                "url": "https://github.com/CarbonPHP/carbon-doctrine-types.git",
+                "reference": "99f76ffa36cce3b70a4a6abce41dba15ca2e84cb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ratchetphp/Ratchet/zipball/5012dc954541b40c5599d286fd40653f5716a38f",
-                "reference": "5012dc954541b40c5599d286fd40653f5716a38f",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/99f76ffa36cce3b70a4a6abce41dba15ca2e84cb",
+                "reference": "99f76ffa36cce3b70a4a6abce41dba15ca2e84cb",
                 "shasum": ""
             },
             "require": {
-                "guzzlehttp/psr7": "^1.7|^2.0",
-                "php": ">=5.4.2",
-                "ratchet/rfc6455": "^0.3.1",
-                "react/event-loop": ">=0.4",
-                "react/socket": "^1.0 || ^0.8 || ^0.7 || ^0.6 || ^0.5",
-                "symfony/http-foundation": "^2.6|^3.0|^4.0|^5.0|^6.0",
-                "symfony/routing": "^2.6|^3.0|^4.0|^5.0|^6.0"
+                "php": "^7.4 || ^8.0"
+            },
+            "conflict": {
+                "doctrine/dbal": "<3.7.0 || >=4.0.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.8"
+                "doctrine/dbal": "^3.7.0",
+                "nesbot/carbon": "^2.71.0 || ^3.0.0",
+                "phpunit/phpunit": "^10.3"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Ratchet\\": "src/Ratchet"
+                    "Carbon\\Doctrine\\": "src/Carbon/Doctrine/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -462,50 +376,57 @@
             ],
             "authors": [
                 {
-                    "name": "Chris Boden",
-                    "email": "cboden@gmail.com",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Matt Bonneau",
-                    "role": "Developer"
+                    "name": "KyleKatarn",
+                    "email": "kylekatarnls@gmail.com"
                 }
             ],
-            "description": "PHP WebSocket library",
-            "homepage": "http://socketo.me",
+            "description": "Types to use Carbon in Doctrine",
             "keywords": [
-                "Ratchet",
-                "WebSockets",
-                "server",
-                "sockets",
-                "websocket"
+                "carbon",
+                "date",
+                "datetime",
+                "doctrine",
+                "time"
             ],
             "support": {
-                "chat": "https://gitter.im/reactphp/reactphp",
-                "issues": "https://github.com/ratchetphp/Ratchet/issues",
-                "source": "https://github.com/ratchetphp/Ratchet/tree/v0.4.4"
+                "issues": "https://github.com/CarbonPHP/carbon-doctrine-types/issues",
+                "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/2.1.0"
             },
-            "time": "2021-12-14T00:20:41+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/kylekatarnls",
+                    "type": "github"
+                },
+                {
+                    "url": "https://opencollective.com/Carbon",
+                    "type": "open_collective"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-12-11T17:09:12+00:00"
         },
         {
             "name": "dasprid/enum",
-            "version": "1.0.4",
+            "version": "1.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/DASPRiD/Enum.git",
-                "reference": "8e6b6ea76eabbf19ea2bf5b67b98e1860474012f"
+                "reference": "8dfd07c6d2cf31c8da90c53b83c026c7696dda90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/8e6b6ea76eabbf19ea2bf5b67b98e1860474012f",
-                "reference": "8e6b6ea76eabbf19ea2bf5b67b98e1860474012f",
+                "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/8dfd07c6d2cf31c8da90c53b83c026c7696dda90",
+                "reference": "8dfd07c6d2cf31c8da90c53b83c026c7696dda90",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1 <9.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7 | ^8 | ^9",
+                "phpunit/phpunit": "^7 || ^8 || ^9 || ^10 || ^11",
                 "squizlabs/php_codesniffer": "*"
             },
             "type": "library",
@@ -533,9 +454,9 @@
             ],
             "support": {
                 "issues": "https://github.com/DASPRiD/Enum/issues",
-                "source": "https://github.com/DASPRiD/Enum/tree/1.0.4"
+                "source": "https://github.com/DASPRiD/Enum/tree/1.0.6"
             },
-            "time": "2023-03-01T18:44:03+00:00"
+            "time": "2024-08-09T14:30:48+00:00"
         },
         {
             "name": "defuse/php-encryption",
@@ -606,16 +527,16 @@
         },
         {
             "name": "dflydev/dot-access-data",
-            "version": "v3.0.2",
+            "version": "v3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dflydev/dflydev-dot-access-data.git",
-                "reference": "f41715465d65213d644d3141a6a93081be5d3549"
+                "reference": "a23a2bf4f31d3518f3ecb38660c95715dfead60f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/f41715465d65213d644d3141a6a93081be5d3549",
-                "reference": "f41715465d65213d644d3141a6a93081be5d3549",
+                "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/a23a2bf4f31d3518f3ecb38660c95715dfead60f",
+                "reference": "a23a2bf4f31d3518f3ecb38660c95715dfead60f",
                 "shasum": ""
             },
             "require": {
@@ -675,9 +596,9 @@
             ],
             "support": {
                 "issues": "https://github.com/dflydev/dflydev-dot-access-data/issues",
-                "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/v3.0.2"
+                "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/v3.0.3"
             },
-            "time": "2022-10-27T11:44:00+00:00"
+            "time": "2024-07-08T12:26:09+00:00"
         },
         {
             "name": "doctrine/cache",
@@ -774,16 +695,16 @@
         },
         {
             "name": "doctrine/dbal",
-            "version": "3.6.4",
+            "version": "3.9.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "19f0dec95edd6a3c3c5ff1d188ea94c6b7fc903f"
+                "reference": "61446f07fcb522414d6cfd8b1c3e5f9e18c579ba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/19f0dec95edd6a3c3c5ff1d188ea94c6b7fc903f",
-                "reference": "19f0dec95edd6a3c3c5ff1d188ea94c6b7fc903f",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/61446f07fcb522414d6cfd8b1c3e5f9e18c579ba",
+                "reference": "61446f07fcb522414d6cfd8b1c3e5f9e18c579ba",
                 "shasum": ""
             },
             "require": {
@@ -798,14 +719,15 @@
             "require-dev": {
                 "doctrine/coding-standard": "12.0.0",
                 "fig/log-test": "^1",
-                "jetbrains/phpstorm-stubs": "2022.3",
-                "phpstan/phpstan": "1.10.14",
-                "phpstan/phpstan-strict-rules": "^1.5",
-                "phpunit/phpunit": "9.6.7",
+                "jetbrains/phpstorm-stubs": "2023.1",
+                "phpstan/phpstan": "1.12.6",
+                "phpstan/phpstan-strict-rules": "^1.6",
+                "phpunit/phpunit": "9.6.20",
                 "psalm/plugin-phpunit": "0.18.4",
-                "squizlabs/php_codesniffer": "3.7.2",
-                "symfony/cache": "^5.4|^6.0",
-                "symfony/console": "^4.4|^5.4|^6.0",
+                "slevomat/coding-standard": "8.13.1",
+                "squizlabs/php_codesniffer": "3.10.2",
+                "symfony/cache": "^5.4|^6.0|^7.0",
+                "symfony/console": "^4.4|^5.4|^6.0|^7.0",
                 "vimeo/psalm": "4.30.0"
             },
             "suggest": {
@@ -866,7 +788,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/3.6.4"
+                "source": "https://github.com/doctrine/dbal/tree/3.9.3"
             },
             "funding": [
                 {
@@ -882,33 +804,31 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-06-15T07:40:12+00:00"
+            "time": "2024-10-10T17:56:43+00:00"
         },
         {
             "name": "doctrine/deprecations",
-            "version": "v1.1.1",
+            "version": "1.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/deprecations.git",
-                "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3"
+                "reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/612a3ee5ab0d5dd97b7cf3874a6efe24325efac3",
-                "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3",
+                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/31610dbb31faa98e6b5447b62340826f54fbc4e9",
+                "reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^9",
-                "phpstan/phpstan": "1.4.10 || 1.10.15",
-                "phpstan/phpstan-phpunit": "^1.0",
+                "doctrine/coding-standard": "^9 || ^12",
+                "phpstan/phpstan": "1.4.10 || 2.0.3",
+                "phpstan/phpstan-phpunit": "^1.0 || ^2",
                 "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "psalm/plugin-phpunit": "0.18.4",
-                "psr/log": "^1 || ^2 || ^3",
-                "vimeo/psalm": "4.30.0 || 5.12.0"
+                "psr/log": "^1 || ^2 || ^3"
             },
             "suggest": {
                 "psr/log": "Allows logging deprecations via PSR-3 logger implementation"
@@ -916,7 +836,7 @@
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations"
+                    "Doctrine\\Deprecations\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -927,22 +847,22 @@
             "homepage": "https://www.doctrine-project.org/",
             "support": {
                 "issues": "https://github.com/doctrine/deprecations/issues",
-                "source": "https://github.com/doctrine/deprecations/tree/v1.1.1"
+                "source": "https://github.com/doctrine/deprecations/tree/1.1.4"
             },
-            "time": "2023-06-03T09:27:29+00:00"
+            "time": "2024-12-07T21:18:45+00:00"
         },
         {
             "name": "doctrine/event-manager",
-            "version": "2.0.0",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/event-manager.git",
-                "reference": "750671534e0241a7c50ea5b43f67e23eb5c96f32"
+                "reference": "b680156fa328f1dfd874fd48c7026c41570b9c6e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/event-manager/zipball/750671534e0241a7c50ea5b43f67e23eb5c96f32",
-                "reference": "750671534e0241a7c50ea5b43f67e23eb5c96f32",
+                "url": "https://api.github.com/repos/doctrine/event-manager/zipball/b680156fa328f1dfd874fd48c7026c41570b9c6e",
+                "reference": "b680156fa328f1dfd874fd48c7026c41570b9c6e",
                 "shasum": ""
             },
             "require": {
@@ -952,10 +872,10 @@
                 "doctrine/common": "<2.9"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^10",
+                "doctrine/coding-standard": "^12",
                 "phpstan/phpstan": "^1.8.8",
-                "phpunit/phpunit": "^9.5",
-                "vimeo/psalm": "^4.28"
+                "phpunit/phpunit": "^10.5",
+                "vimeo/psalm": "^5.24"
             },
             "type": "library",
             "autoload": {
@@ -1004,7 +924,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/event-manager/issues",
-                "source": "https://github.com/doctrine/event-manager/tree/2.0.0"
+                "source": "https://github.com/doctrine/event-manager/tree/2.0.1"
             },
             "funding": [
                 {
@@ -1020,20 +940,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-10-12T20:59:15+00:00"
+            "time": "2024-05-22T20:47:39+00:00"
         },
         {
             "name": "doctrine/inflector",
-            "version": "2.0.8",
+            "version": "2.0.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/inflector.git",
-                "reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff"
+                "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/f9301a5b2fb1216b2b08f02ba04dc45423db6bff",
-                "reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/5817d0659c5b50c9b950feb9af7b9668e2c436bc",
+                "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc",
                 "shasum": ""
             },
             "require": {
@@ -1095,7 +1015,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/inflector/issues",
-                "source": "https://github.com/doctrine/inflector/tree/2.0.8"
+                "source": "https://github.com/doctrine/inflector/tree/2.0.10"
             },
             "funding": [
                 {
@@ -1111,31 +1031,31 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-06-16T13:40:37+00:00"
+            "time": "2024-02-18T20:23:39+00:00"
         },
         {
             "name": "doctrine/lexer",
-            "version": "3.0.0",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/lexer.git",
-                "reference": "84a527db05647743d50373e0ec53a152f2cde568"
+                "reference": "31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/84a527db05647743d50373e0ec53a152f2cde568",
-                "reference": "84a527db05647743d50373e0ec53a152f2cde568",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd",
+                "reference": "31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd",
                 "shasum": ""
             },
             "require": {
                 "php": "^8.1"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^10",
-                "phpstan/phpstan": "^1.9",
-                "phpunit/phpunit": "^9.5",
+                "doctrine/coding-standard": "^12",
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^10.5",
                 "psalm/plugin-phpunit": "^0.18.3",
-                "vimeo/psalm": "^5.0"
+                "vimeo/psalm": "^5.21"
             },
             "type": "library",
             "autoload": {
@@ -1172,7 +1092,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/lexer/issues",
-                "source": "https://github.com/doctrine/lexer/tree/3.0.0"
+                "source": "https://github.com/doctrine/lexer/tree/3.0.1"
             },
             "funding": [
                 {
@@ -1188,20 +1108,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-12-15T16:57:16+00:00"
+            "time": "2024-02-05T11:56:58+00:00"
         },
         {
             "name": "dragonmantank/cron-expression",
-            "version": "v3.3.2",
+            "version": "v3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dragonmantank/cron-expression.git",
-                "reference": "782ca5968ab8b954773518e9e49a6f892a34b2a8"
+                "reference": "8c784d071debd117328803d86b2097615b457500"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/782ca5968ab8b954773518e9e49a6f892a34b2a8",
-                "reference": "782ca5968ab8b954773518e9e49a6f892a34b2a8",
+                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/8c784d071debd117328803d86b2097615b457500",
+                "reference": "8c784d071debd117328803d86b2097615b457500",
                 "shasum": ""
             },
             "require": {
@@ -1214,10 +1134,14 @@
             "require-dev": {
                 "phpstan/extension-installer": "^1.0",
                 "phpstan/phpstan": "^1.0",
-                "phpstan/phpstan-webmozart-assert": "^1.0",
                 "phpunit/phpunit": "^7.0|^8.0|^9.0"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Cron\\": "src/Cron/"
@@ -1241,7 +1165,7 @@
             ],
             "support": {
                 "issues": "https://github.com/dragonmantank/cron-expression/issues",
-                "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.2"
+                "source": "https://github.com/dragonmantank/cron-expression/tree/v3.4.0"
             },
             "funding": [
                 {
@@ -1249,20 +1173,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-09-10T18:51:20+00:00"
+            "time": "2024-10-09T13:47:03+00:00"
         },
         {
             "name": "egulias/email-validator",
-            "version": "4.0.1",
+            "version": "4.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/egulias/EmailValidator.git",
-                "reference": "3a85486b709bc384dae8eb78fb2eec649bdb64ff"
+                "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/3a85486b709bc384dae8eb78fb2eec649bdb64ff",
-                "reference": "3a85486b709bc384dae8eb78fb2eec649bdb64ff",
+                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ebaaf5be6c0286928352e054f2d5125608e5405e",
+                "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e",
                 "shasum": ""
             },
             "require": {
@@ -1271,8 +1195,8 @@
                 "symfony/polyfill-intl-idn": "^1.26"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.5.27",
-                "vimeo/psalm": "^4.30"
+                "phpunit/phpunit": "^10.2",
+                "vimeo/psalm": "^5.12"
             },
             "suggest": {
                 "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
@@ -1308,7 +1232,7 @@
             ],
             "support": {
                 "issues": "https://github.com/egulias/EmailValidator/issues",
-                "source": "https://github.com/egulias/EmailValidator/tree/4.0.1"
+                "source": "https://github.com/egulias/EmailValidator/tree/4.0.2"
             },
             "funding": [
                 {
@@ -1316,32 +1240,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-01-14T14:17:03+00:00"
+            "time": "2023-10-06T06:47:41+00:00"
         },
         {
             "name": "evenement/evenement",
-            "version": "v3.0.1",
+            "version": "v3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/igorw/evenement.git",
-                "reference": "531bfb9d15f8aa57454f5f0285b18bec903b8fb7"
+                "reference": "0a16b0d71ab13284339abb99d9d2bd813640efbc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/igorw/evenement/zipball/531bfb9d15f8aa57454f5f0285b18bec903b8fb7",
-                "reference": "531bfb9d15f8aa57454f5f0285b18bec903b8fb7",
+                "url": "https://api.github.com/repos/igorw/evenement/zipball/0a16b0d71ab13284339abb99d9d2bd813640efbc",
+                "reference": "0a16b0d71ab13284339abb99d9d2bd813640efbc",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0"
+                "phpunit/phpunit": "^9 || ^6"
             },
             "type": "library",
             "autoload": {
-                "psr-0": {
-                    "Evenement": "src"
+                "psr-4": {
+                    "Evenement\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1361,26 +1285,26 @@
             ],
             "support": {
                 "issues": "https://github.com/igorw/evenement/issues",
-                "source": "https://github.com/igorw/evenement/tree/master"
+                "source": "https://github.com/igorw/evenement/tree/v3.0.2"
             },
-            "time": "2017-07-23T21:35:13+00:00"
+            "time": "2023-08-08T05:53:35+00:00"
         },
         {
             "name": "ezyang/htmlpurifier",
-            "version": "v4.16.0",
+            "version": "v4.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ezyang/htmlpurifier.git",
-                "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8"
+                "reference": "cb56001e54359df7ae76dc522d08845dc741621b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/523407fb06eb9e5f3d59889b3978d5bfe94299c8",
-                "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/cb56001e54359df7ae76dc522d08845dc741621b",
+                "reference": "cb56001e54359df7ae76dc522d08845dc741621b",
                 "shasum": ""
             },
             "require": {
-                "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0"
+                "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0"
             },
             "require-dev": {
                 "cerdic/css-tidy": "^1.7 || ^2.0",
@@ -1422,92 +1346,46 @@
             ],
             "support": {
                 "issues": "https://github.com/ezyang/htmlpurifier/issues",
-                "source": "https://github.com/ezyang/htmlpurifier/tree/v4.16.0"
+                "source": "https://github.com/ezyang/htmlpurifier/tree/v4.18.0"
             },
-            "time": "2022-09-18T07:06:19+00:00"
+            "time": "2024-11-01T03:51:45+00:00"
         },
         {
-            "name": "facade/ignition-contracts",
-            "version": "1.0.2",
+            "name": "fgrosse/phpasn1",
+            "version": "v2.5.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/facade/ignition-contracts.git",
-                "reference": "3c921a1cdba35b68a7f0ccffc6dffc1995b18267"
+                "url": "https://github.com/fgrosse/PHPASN1.git",
+                "reference": "42060ed45344789fb9f21f9f1864fc47b9e3507b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/facade/ignition-contracts/zipball/3c921a1cdba35b68a7f0ccffc6dffc1995b18267",
-                "reference": "3c921a1cdba35b68a7f0ccffc6dffc1995b18267",
+                "url": "https://api.github.com/repos/fgrosse/PHPASN1/zipball/42060ed45344789fb9f21f9f1864fc47b9e3507b",
+                "reference": "42060ed45344789fb9f21f9f1864fc47b9e3507b",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3|^8.0"
+                "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "^v2.15.8",
-                "phpunit/phpunit": "^9.3.11",
-                "vimeo/psalm": "^3.17.1"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Facade\\IgnitionContracts\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Freek Van der Herten",
-                    "email": "freek@spatie.be",
-                    "homepage": "https://flareapp.io",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Solution contracts for Ignition",
-            "homepage": "https://github.com/facade/ignition-contracts",
-            "keywords": [
-                "contracts",
-                "flare",
-                "ignition"
-            ],
-            "support": {
-                "issues": "https://github.com/facade/ignition-contracts/issues",
-                "source": "https://github.com/facade/ignition-contracts/tree/1.0.2"
-            },
-            "time": "2020-10-16T08:27:54+00:00"
-        },
-        {
-            "name": "fig/http-message-util",
-            "version": "1.1.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/http-message-util.git",
-                "reference": "9d94dc0154230ac39e5bf89398b324a86f63f765"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message-util/zipball/9d94dc0154230ac39e5bf89398b324a86f63f765",
-                "reference": "9d94dc0154230ac39e5bf89398b324a86f63f765",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3 || ^7.0 || ^8.0"
+                "php-coveralls/php-coveralls": "~2.0",
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
             },
             "suggest": {
-                "psr/http-message": "The package containing the PSR-7 interfaces"
+                "ext-bcmath": "BCmath is the fallback extension for big integer calculations",
+                "ext-curl": "For loading OID information from the web if they have not bee defined statically",
+                "ext-gmp": "GMP is the preferred extension for big integer calculations",
+                "phpseclib/bcmath_compat": "BCmath polyfill for servers where neither GMP nor BCmath is available"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Fig\\Http\\Message\\": "src/"
+                    "FG\\": "lib/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1516,47 +1394,60 @@
             ],
             "authors": [
                 {
-                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
+                    "name": "Friedrich Große",
+                    "email": "friedrich.grosse@gmail.com",
+                    "homepage": "https://github.com/FGrosse",
+                    "role": "Author"
+                },
+                {
+                    "name": "All contributors",
+                    "homepage": "https://github.com/FGrosse/PHPASN1/contributors"
                 }
             ],
-            "description": "Utility classes and constants for use with PSR-7 (psr/http-message)",
+            "description": "A PHP Framework that allows you to encode and decode arbitrary ASN.1 structures using the ITU-T X.690 Encoding Rules.",
+            "homepage": "https://github.com/FGrosse/PHPASN1",
             "keywords": [
-                "http",
-                "http-message",
-                "psr",
-                "psr-7",
-                "request",
-                "response"
+                "DER",
+                "asn.1",
+                "asn1",
+                "ber",
+                "binary",
+                "decoding",
+                "encoding",
+                "x.509",
+                "x.690",
+                "x509",
+                "x690"
             ],
             "support": {
-                "issues": "https://github.com/php-fig/http-message-util/issues",
-                "source": "https://github.com/php-fig/http-message-util/tree/1.1.5"
+                "issues": "https://github.com/fgrosse/PHPASN1/issues",
+                "source": "https://github.com/fgrosse/PHPASN1/tree/v2.5.0"
             },
-            "time": "2020-11-24T22:02:12+00:00"
+            "abandoned": true,
+            "time": "2022-12-19T11:08:26+00:00"
         },
         {
             "name": "firebase/php-jwt",
-            "version": "v6.8.0",
+            "version": "v6.10.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/firebase/php-jwt.git",
-                "reference": "48b0210c51718d682e53210c24d25c5a10a2299b"
+                "reference": "30c19ed0f3264cb660ea496895cfb6ef7ee3653b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/48b0210c51718d682e53210c24d25c5a10a2299b",
-                "reference": "48b0210c51718d682e53210c24d25c5a10a2299b",
+                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/30c19ed0f3264cb660ea496895cfb6ef7ee3653b",
+                "reference": "30c19ed0f3264cb660ea496895cfb6ef7ee3653b",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.4||^8.0"
+                "php": "^8.0"
             },
             "require-dev": {
-                "guzzlehttp/guzzle": "^6.5||^7.4",
+                "guzzlehttp/guzzle": "^7.4",
                 "phpspec/prophecy-phpunit": "^2.0",
                 "phpunit/phpunit": "^9.5",
-                "psr/cache": "^1.0||^2.0",
+                "psr/cache": "^2.0||^3.0",
                 "psr/http-client": "^1.0",
                 "psr/http-factory": "^1.0"
             },
@@ -1594,27 +1485,27 @@
             ],
             "support": {
                 "issues": "https://github.com/firebase/php-jwt/issues",
-                "source": "https://github.com/firebase/php-jwt/tree/v6.8.0"
+                "source": "https://github.com/firebase/php-jwt/tree/v6.10.2"
             },
-            "time": "2023-06-20T16:45:35+00:00"
+            "time": "2024-11-24T11:22:49+00:00"
         },
         {
             "name": "fruitcake/php-cors",
-            "version": "v1.2.0",
+            "version": "v1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/fruitcake/php-cors.git",
-                "reference": "58571acbaa5f9f462c9c77e911700ac66f446d4e"
+                "reference": "3d158f36e7875e2f040f37bc0573956240a5a38b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fruitcake/php-cors/zipball/58571acbaa5f9f462c9c77e911700ac66f446d4e",
-                "reference": "58571acbaa5f9f462c9c77e911700ac66f446d4e",
+                "url": "https://api.github.com/repos/fruitcake/php-cors/zipball/3d158f36e7875e2f040f37bc0573956240a5a38b",
+                "reference": "3d158f36e7875e2f040f37bc0573956240a5a38b",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.4|^8.0",
-                "symfony/http-foundation": "^4.4|^5.4|^6"
+                "symfony/http-foundation": "^4.4|^5.4|^6|^7"
             },
             "require-dev": {
                 "phpstan/phpstan": "^1.4",
@@ -1624,7 +1515,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.1-dev"
+                    "dev-master": "1.2-dev"
                 }
             },
             "autoload": {
@@ -1655,7 +1546,7 @@
             ],
             "support": {
                 "issues": "https://github.com/fruitcake/php-cors/issues",
-                "source": "https://github.com/fruitcake/php-cors/tree/v1.2.0"
+                "source": "https://github.com/fruitcake/php-cors/tree/v1.3.0"
             },
             "funding": [
                 {
@@ -1667,28 +1558,28 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-02-20T15:07:15+00:00"
+            "time": "2023-10-12T05:21:21+00:00"
         },
         {
             "name": "graham-campbell/result-type",
-            "version": "v1.1.1",
+            "version": "v1.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/GrahamCampbell/Result-Type.git",
-                "reference": "672eff8cf1d6fe1ef09ca0f89c4b287d6a3eb831"
+                "reference": "3ba905c11371512af9d9bdd27d99b782216b6945"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/672eff8cf1d6fe1ef09ca0f89c4b287d6a3eb831",
-                "reference": "672eff8cf1d6fe1ef09ca0f89c4b287d6a3eb831",
+                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/3ba905c11371512af9d9bdd27d99b782216b6945",
+                "reference": "3ba905c11371512af9d9bdd27d99b782216b6945",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2.5 || ^8.0",
-                "phpoption/phpoption": "^1.9.1"
+                "phpoption/phpoption": "^1.9.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5.32 || ^9.6.3 || ^10.0.12"
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28"
             },
             "type": "library",
             "autoload": {
@@ -1717,7 +1608,7 @@
             ],
             "support": {
                 "issues": "https://github.com/GrahamCampbell/Result-Type/issues",
-                "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.1"
+                "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.3"
             },
             "funding": [
                 {
@@ -1729,26 +1620,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-25T20:23:15+00:00"
+            "time": "2024-07-20T21:45:45+00:00"
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "7.7.0",
+            "version": "7.9.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "fb7566caccf22d74d1ab270de3551f72a58399f5"
+                "reference": "d281ed313b989f213357e3be1a179f02196ac99b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/fb7566caccf22d74d1ab270de3551f72a58399f5",
-                "reference": "fb7566caccf22d74d1ab270de3551f72a58399f5",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/d281ed313b989f213357e3be1a179f02196ac99b",
+                "reference": "d281ed313b989f213357e3be1a179f02196ac99b",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "guzzlehttp/promises": "^1.5.3 || ^2.0",
-                "guzzlehttp/psr7": "^1.9.1 || ^2.4.5",
+                "guzzlehttp/promises": "^1.5.3 || ^2.0.3",
+                "guzzlehttp/psr7": "^2.7.0",
                 "php": "^7.2.5 || ^8.0",
                 "psr/http-client": "^1.0",
                 "symfony/deprecation-contracts": "^2.2 || ^3.0"
@@ -1757,11 +1648,11 @@
                 "psr/http-client-implementation": "1.0"
             },
             "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.8.1",
+                "bamarni/composer-bin-plugin": "^1.8.2",
                 "ext-curl": "*",
-                "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999",
+                "guzzle/client-integration-tests": "3.0.2",
                 "php-http/message-factory": "^1.1",
-                "phpunit/phpunit": "^8.5.29 || ^9.5.23",
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20",
                 "psr/log": "^1.1 || ^2.0 || ^3.0"
             },
             "suggest": {
@@ -1839,7 +1730,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.7.0"
+                "source": "https://github.com/guzzle/guzzle/tree/7.9.2"
             },
             "funding": [
                 {
@@ -1855,33 +1746,37 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-21T14:04:53+00:00"
+            "time": "2024-07-24T11:22:20+00:00"
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "1.5.3",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e"
+                "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e",
-                "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/f9c436286ab2892c7db7be8c8da4ef61ccf7b455",
+                "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5"
+                "php": "^7.2.5 || ^8.0"
             },
             "require-dev": {
-                "symfony/phpunit-bridge": "^4.4 || ^5.1"
+                "bamarni/composer-bin-plugin": "^1.8.2",
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20"
             },
             "type": "library",
+            "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
+                }
+            },
             "autoload": {
-                "files": [
-                    "src/functions_include.php"
-                ],
                 "psr-4": {
                     "GuzzleHttp\\Promise\\": "src/"
                 }
@@ -1918,7 +1813,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/1.5.3"
+                "source": "https://github.com/guzzle/promises/tree/2.0.4"
             },
             "funding": [
                 {
@@ -1934,20 +1829,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-21T12:31:43+00:00"
+            "time": "2024-10-17T10:06:22+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.5.0",
+            "version": "2.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "b635f279edd83fc275f822a1188157ffea568ff6"
+                "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/b635f279edd83fc275f822a1188157ffea568ff6",
-                "reference": "b635f279edd83fc275f822a1188157ffea568ff6",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/a70f5c95fb43bc83f07c9c948baa0dc1829bf201",
+                "reference": "a70f5c95fb43bc83f07c9c948baa0dc1829bf201",
                 "shasum": ""
             },
             "require": {
@@ -1961,9 +1856,9 @@
                 "psr/http-message-implementation": "1.0"
             },
             "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.8.1",
-                "http-interop/http-factory-tests": "^0.9",
-                "phpunit/phpunit": "^8.5.29 || ^9.5.23"
+                "bamarni/composer-bin-plugin": "^1.8.2",
+                "http-interop/http-factory-tests": "0.9.0",
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20"
             },
             "suggest": {
                 "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
@@ -2034,7 +1929,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.5.0"
+                "source": "https://github.com/guzzle/psr7/tree/2.7.0"
             },
             "funding": [
                 {
@@ -2050,34 +1945,36 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-04-17T16:11:26+00:00"
+            "time": "2024-07-18T11:15:46+00:00"
         },
         {
             "name": "guzzlehttp/uri-template",
-            "version": "v1.0.1",
+            "version": "v1.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/uri-template.git",
-                "reference": "b945d74a55a25a949158444f09ec0d3c120d69e2"
+                "reference": "ecea8feef63bd4fef1f037ecb288386999ecc11c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/uri-template/zipball/b945d74a55a25a949158444f09ec0d3c120d69e2",
-                "reference": "b945d74a55a25a949158444f09ec0d3c120d69e2",
+                "url": "https://api.github.com/repos/guzzle/uri-template/zipball/ecea8feef63bd4fef1f037ecb288386999ecc11c",
+                "reference": "ecea8feef63bd4fef1f037ecb288386999ecc11c",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2.5 || ^8.0",
-                "symfony/polyfill-php80": "^1.17"
+                "symfony/polyfill-php80": "^1.24"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5.19 || ^9.5.8",
+                "bamarni/composer-bin-plugin": "^1.8.2",
+                "phpunit/phpunit": "^8.5.36 || ^9.6.15",
                 "uri-template/tests": "1.0.0"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
                 }
             },
             "autoload": {
@@ -2118,7 +2015,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/uri-template/issues",
-                "source": "https://github.com/guzzle/uri-template/tree/v1.0.1"
+                "source": "https://github.com/guzzle/uri-template/tree/v1.0.3"
             },
             "funding": [
                 {
@@ -2134,7 +2031,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-07T12:57:01+00:00"
+            "time": "2023-12-03T19:50:20+00:00"
         },
         {
             "name": "intervention/image",
@@ -2166,16 +2063,16 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "2.4-dev"
-                },
                 "laravel": {
-                    "providers": [
-                        "Intervention\\Image\\ImageServiceProvider"
-                    ],
                     "aliases": {
                         "Image": "Intervention\\Image\\Facades\\Image"
-                    }
+                    },
+                    "providers": [
+                        "Intervention\\Image\\ImageServiceProvider"
+                    ]
+                },
+                "branch-alias": {
+                    "dev-master": "2.4-dev"
                 }
             },
             "autoload": {
@@ -2222,20 +2119,20 @@
         },
         {
             "name": "jaybizzle/crawler-detect",
-            "version": "v1.2.115",
+            "version": "v1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/JayBizzle/Crawler-Detect.git",
-                "reference": "4531e4a70d55d10cbe7d41ac1ff0d75a5fe2ef1e"
+                "reference": "be155e11613fa618aa18aee438955588d1092a47"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/4531e4a70d55d10cbe7d41ac1ff0d75a5fe2ef1e",
-                "reference": "4531e4a70d55d10cbe7d41ac1ff0d75a5fe2ef1e",
+                "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/be155e11613fa618aa18aee438955588d1092a47",
+                "reference": "be155e11613fa618aa18aee438955588d1092a47",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.0"
+                "php": ">=7.1.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^4.8|^5.5|^6.5|^9.4"
@@ -2268,9 +2165,9 @@
             ],
             "support": {
                 "issues": "https://github.com/JayBizzle/Crawler-Detect/issues",
-                "source": "https://github.com/JayBizzle/Crawler-Detect/tree/v1.2.115"
+                "source": "https://github.com/JayBizzle/Crawler-Detect/tree/v1.3.0"
             },
-            "time": "2023-06-05T21:32:18+00:00"
+            "time": "2024-11-25T19:38:36+00:00"
         },
         {
             "name": "jenssegers/agent",
@@ -2356,24 +2253,146 @@
             "time": "2020-06-13T08:05:20+00:00"
         },
         {
-            "name": "laravel/framework",
-            "version": "v10.15.0",
+            "name": "laravel-notification-channels/expo",
+            "version": "v2.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/laravel/framework.git",
-                "reference": "c7599dc92e04532824bafbd226c2936ce6a905b8"
+                "url": "https://github.com/laravel-notification-channels/expo.git",
+                "reference": "29d038b6409077ac4c671cc5587a4dc7986260b0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/c7599dc92e04532824bafbd226c2936ce6a905b8",
-                "reference": "c7599dc92e04532824bafbd226c2936ce6a905b8",
+                "url": "https://api.github.com/repos/laravel-notification-channels/expo/zipball/29d038b6409077ac4c671cc5587a4dc7986260b0",
+                "reference": "29d038b6409077ac4c671cc5587a4dc7986260b0",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.9.3|^0.10.2|^0.11",
+                "ext-json": "*",
+                "guzzlehttp/guzzle": "^7.1",
+                "illuminate/contracts": "^11.0",
+                "illuminate/notifications": "^11.0",
+                "illuminate/support": "^11.0",
+                "php": "~8.3"
+            },
+            "require-dev": {
+                "larastan/larastan": "^2.0",
+                "laravel/pint": "^1.0",
+                "orchestra/testbench": "^9.0",
+                "phpunit/phpunit": "^11.0"
+            },
+            "suggest": {
+                "ext-zlib": "Required for compressing payloads exceeding 1 KiB in size."
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "NotificationChannels\\Expo\\ExpoServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "NotificationChannels\\Expo\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Muhammed Sari",
+                    "email": "muhammed@dive.be",
+                    "homepage": "https://dive.be",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Expo Notifications Channel for Laravel",
+            "homepage": "https://github.com/laravel-notification-channels/expo",
+            "support": {
+                "issues": "https://github.com/laravel-notification-channels/expo/issues",
+                "source": "https://github.com/laravel-notification-channels/expo/tree/v2.0.0"
+            },
+            "time": "2024-03-18T07:49:28+00:00"
+        },
+        {
+            "name": "laravel-notification-channels/webpush",
+            "version": "8.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravel-notification-channels/webpush.git",
+                "reference": "6e7a60558721f674172664283467a69ab93f3d5e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravel-notification-channels/webpush/zipball/6e7a60558721f674172664283467a69ab93f3d5e",
+                "reference": "6e7a60558721f674172664283467a69ab93f3d5e",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/notifications": "^9.0|^10.0|^11.0",
+                "illuminate/support": "^9.0|^10.0|^11.0",
+                "minishlink/web-push": "^8.0",
+                "php": "^8.1"
+            },
+            "require-dev": {
+                "mockery/mockery": "~1.0",
+                "orchestra/testbench": "^7.0|^8.0|^9.0",
+                "phpunit/phpunit": "^9.5|^10.5"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "NotificationChannels\\WebPush\\WebPushServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "NotificationChannels\\WebPush\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Cretu Eusebiu",
+                    "email": "me@cretueusebiu.com",
+                    "homepage": "http://cretueusebiu.com",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Web Push Notifications driver for Laravel.",
+            "homepage": "https://github.com/laravel-notification-channels/webpush",
+            "support": {
+                "issues": "https://github.com/laravel-notification-channels/webpush/issues",
+                "source": "https://github.com/laravel-notification-channels/webpush/tree/8.0.0"
+            },
+            "time": "2024-03-16T05:36:52+00:00"
+        },
+        {
+            "name": "laravel/framework",
+            "version": "v11.36.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravel/framework.git",
+                "reference": "df06f5163f4550641fdf349ebc04916a61135a64"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/df06f5163f4550641fdf349ebc04916a61135a64",
+                "reference": "df06f5163f4550641fdf349ebc04916a61135a64",
+                "shasum": ""
+            },
+            "require": {
+                "brick/math": "^0.9.3|^0.10.2|^0.11|^0.12",
                 "composer-runtime-api": "^2.2",
                 "doctrine/inflector": "^2.0.5",
-                "dragonmantank/cron-expression": "^3.3.2",
+                "dragonmantank/cron-expression": "^3.4",
                 "egulias/email-validator": "^3.2.1|^4.0",
                 "ext-ctype": "*",
                 "ext-filter": "*",
@@ -2382,39 +2401,46 @@
                 "ext-openssl": "*",
                 "ext-session": "*",
                 "ext-tokenizer": "*",
-                "fruitcake/php-cors": "^1.2",
+                "fruitcake/php-cors": "^1.3",
+                "guzzlehttp/guzzle": "^7.8.2",
                 "guzzlehttp/uri-template": "^1.0",
-                "laravel/serializable-closure": "^1.3",
-                "league/commonmark": "^2.2.1",
-                "league/flysystem": "^3.8.0",
+                "laravel/prompts": "^0.1.18|^0.2.0|^0.3.0",
+                "laravel/serializable-closure": "^1.3|^2.0",
+                "league/commonmark": "^2.6",
+                "league/flysystem": "^3.25.1",
+                "league/flysystem-local": "^3.25.1",
+                "league/uri": "^7.5.1",
                 "monolog/monolog": "^3.0",
-                "nesbot/carbon": "^2.62.1",
-                "nunomaduro/termwind": "^1.13",
-                "php": "^8.1",
+                "nesbot/carbon": "^2.72.2|^3.4",
+                "nunomaduro/termwind": "^2.0",
+                "php": "^8.2",
                 "psr/container": "^1.1.1|^2.0.1",
                 "psr/log": "^1.0|^2.0|^3.0",
                 "psr/simple-cache": "^1.0|^2.0|^3.0",
                 "ramsey/uuid": "^4.7",
-                "symfony/console": "^6.2",
-                "symfony/error-handler": "^6.2",
-                "symfony/finder": "^6.2",
-                "symfony/http-foundation": "^6.2",
-                "symfony/http-kernel": "^6.2",
-                "symfony/mailer": "^6.2",
-                "symfony/mime": "^6.2",
-                "symfony/process": "^6.2",
-                "symfony/routing": "^6.2",
-                "symfony/uid": "^6.2",
-                "symfony/var-dumper": "^6.2",
+                "symfony/console": "^7.0.3",
+                "symfony/error-handler": "^7.0.3",
+                "symfony/finder": "^7.0.3",
+                "symfony/http-foundation": "^7.2.0",
+                "symfony/http-kernel": "^7.0.3",
+                "symfony/mailer": "^7.0.3",
+                "symfony/mime": "^7.0.3",
+                "symfony/polyfill-php83": "^1.31",
+                "symfony/process": "^7.0.3",
+                "symfony/routing": "^7.0.3",
+                "symfony/uid": "^7.0.3",
+                "symfony/var-dumper": "^7.0.3",
                 "tijsverkoyen/css-to-inline-styles": "^2.2.5",
-                "vlucas/phpdotenv": "^5.4.1",
-                "voku/portable-ascii": "^2.0"
+                "vlucas/phpdotenv": "^5.6.1",
+                "voku/portable-ascii": "^2.0.2"
             },
             "conflict": {
+                "mockery/mockery": "1.6.8",
                 "tightenco/collect": "<5.5.33"
             },
             "provide": {
                 "psr/container-implementation": "1.1|2.0",
+                "psr/log-implementation": "1.0|2.0|3.0",
                 "psr/simple-cache-implementation": "1.0|2.0|3.0"
             },
             "replace": {
@@ -2423,6 +2449,7 @@
                 "illuminate/bus": "self.version",
                 "illuminate/cache": "self.version",
                 "illuminate/collections": "self.version",
+                "illuminate/concurrency": "self.version",
                 "illuminate/conditionable": "self.version",
                 "illuminate/config": "self.version",
                 "illuminate/console": "self.version",
@@ -2450,35 +2477,38 @@
                 "illuminate/testing": "self.version",
                 "illuminate/translation": "self.version",
                 "illuminate/validation": "self.version",
-                "illuminate/view": "self.version"
+                "illuminate/view": "self.version",
+                "spatie/once": "*"
             },
             "require-dev": {
                 "ably/ably-php": "^1.0",
-                "aws/aws-sdk-php": "^3.235.5",
-                "doctrine/dbal": "^3.5.1",
+                "aws/aws-sdk-php": "^3.322.9",
                 "ext-gmp": "*",
-                "fakerphp/faker": "^1.21",
-                "guzzlehttp/guzzle": "^7.5",
-                "league/flysystem-aws-s3-v3": "^3.0",
-                "league/flysystem-ftp": "^3.0",
-                "league/flysystem-path-prefixing": "^3.3",
-                "league/flysystem-read-only": "^3.3",
-                "league/flysystem-sftp-v3": "^3.0",
-                "mockery/mockery": "^1.5.1",
-                "orchestra/testbench-core": "^8.4",
-                "pda/pheanstalk": "^4.0",
-                "phpstan/phpdoc-parser": "^1.15",
-                "phpstan/phpstan": "^1.4.7",
-                "phpunit/phpunit": "^10.0.7",
-                "predis/predis": "^2.0.2",
-                "symfony/cache": "^6.2",
-                "symfony/http-client": "^6.2.4"
+                "fakerphp/faker": "^1.24",
+                "guzzlehttp/promises": "^2.0.3",
+                "guzzlehttp/psr7": "^2.4",
+                "league/flysystem-aws-s3-v3": "^3.25.1",
+                "league/flysystem-ftp": "^3.25.1",
+                "league/flysystem-path-prefixing": "^3.25.1",
+                "league/flysystem-read-only": "^3.25.1",
+                "league/flysystem-sftp-v3": "^3.25.1",
+                "mockery/mockery": "^1.6.10",
+                "orchestra/testbench-core": "^9.6",
+                "pda/pheanstalk": "^5.0.6",
+                "php-http/discovery": "^1.15",
+                "phpstan/phpstan": "^1.11.5",
+                "phpunit/phpunit": "^10.5.35|^11.3.6",
+                "predis/predis": "^2.3",
+                "resend/resend-php": "^0.10.0",
+                "symfony/cache": "^7.0.3",
+                "symfony/http-client": "^7.0.3",
+                "symfony/psr-http-message-bridge": "^7.0.3",
+                "symfony/translation": "^7.0.3"
             },
             "suggest": {
                 "ably/ably-php": "Required to use the Ably broadcast driver (^1.0).",
-                "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.235.5).",
-                "brianium/paratest": "Required to run tests in parallel (^6.0).",
-                "doctrine/dbal": "Required to rename columns and drop SQLite columns (^3.5.1).",
+                "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.322.9).",
+                "brianium/paratest": "Required to run tests in parallel (^7.0|^8.0).",
                 "ext-apcu": "Required to use the APC cache driver.",
                 "ext-fileinfo": "Required to use the Filesystem class.",
                 "ext-ftp": "Required to use the Flysystem FTP driver.",
@@ -2487,41 +2517,45 @@
                 "ext-pcntl": "Required to use all features of the queue worker and console signal trapping.",
                 "ext-pdo": "Required to use all database features.",
                 "ext-posix": "Required to use all features of the queue worker.",
-                "ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0).",
+                "ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0|^6.0).",
                 "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
                 "filp/whoops": "Required for friendly error pages in development (^2.14.3).",
-                "guzzlehttp/guzzle": "Required to use the HTTP Client and the ping methods on schedules (^7.5).",
                 "laravel/tinker": "Required to use the tinker console command (^2.0).",
-                "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.0).",
-                "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.0).",
-                "league/flysystem-path-prefixing": "Required to use the scoped driver (^3.3).",
-                "league/flysystem-read-only": "Required to use read-only disks (^3.3)",
-                "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.0).",
-                "mockery/mockery": "Required to use mocking (^1.5.1).",
-                "nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).",
-                "pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).",
-                "phpunit/phpunit": "Required to use assertions and run tests (^9.5.8|^10.0.7).",
-                "predis/predis": "Required to use the predis connector (^2.0.2).",
+                "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.25.1).",
+                "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.25.1).",
+                "league/flysystem-path-prefixing": "Required to use the scoped driver (^3.25.1).",
+                "league/flysystem-read-only": "Required to use read-only disks (^3.25.1)",
+                "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.25.1).",
+                "mockery/mockery": "Required to use mocking (^1.6).",
+                "pda/pheanstalk": "Required to use the beanstalk queue driver (^5.0).",
+                "php-http/discovery": "Required to use PSR-7 bridging features (^1.15).",
+                "phpunit/phpunit": "Required to use assertions and run tests (^10.5|^11.0).",
+                "predis/predis": "Required to use the predis connector (^2.3).",
                 "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
                 "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0|^7.0).",
-                "symfony/cache": "Required to PSR-6 cache bridge (^6.2).",
-                "symfony/filesystem": "Required to enable support for relative symbolic links (^6.2).",
-                "symfony/http-client": "Required to enable support for the Symfony API mail transports (^6.2).",
-                "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^6.2).",
-                "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^6.2).",
-                "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0)."
+                "resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0).",
+                "symfony/cache": "Required to PSR-6 cache bridge (^7.0).",
+                "symfony/filesystem": "Required to enable support for relative symbolic links (^7.0).",
+                "symfony/http-client": "Required to enable support for the Symfony API mail transports (^7.0).",
+                "symfony/mailgun-mailer": "Required to enable support for the Mailgun mail transport (^7.0).",
+                "symfony/postmark-mailer": "Required to enable support for the Postmark mail transport (^7.0).",
+                "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^7.0)."
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "10.x-dev"
+                    "dev-master": "11.x-dev"
                 }
             },
             "autoload": {
                 "files": [
+                    "src/Illuminate/Collections/functions.php",
                     "src/Illuminate/Collections/helpers.php",
                     "src/Illuminate/Events/functions.php",
+                    "src/Illuminate/Filesystem/functions.php",
                     "src/Illuminate/Foundation/helpers.php",
+                    "src/Illuminate/Log/functions.php",
+                    "src/Illuminate/Support/functions.php",
                     "src/Illuminate/Support/helpers.php"
                 ],
                 "psr-4": {
@@ -2553,28 +2587,29 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2023-07-11T13:43:52+00:00"
+            "time": "2024-12-17T22:32:08+00:00"
         },
         {
             "name": "laravel/helpers",
-            "version": "v1.6.0",
+            "version": "v1.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/helpers.git",
-                "reference": "4dd0f9436d3911611622a6ced8329a1710576f60"
+                "reference": "f28907033d7edf8a0525cfb781ab30ce6d531c35"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/helpers/zipball/4dd0f9436d3911611622a6ced8329a1710576f60",
-                "reference": "4dd0f9436d3911611622a6ced8329a1710576f60",
+                "url": "https://api.github.com/repos/laravel/helpers/zipball/f28907033d7edf8a0525cfb781ab30ce6d531c35",
+                "reference": "f28907033d7edf8a0525cfb781ab30ce6d531c35",
                 "shasum": ""
             },
             "require": {
-                "illuminate/support": "~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0",
-                "php": "^7.1.3|^8.0"
+                "illuminate/support": "~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+                "php": "^7.2.0|^8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.0|^8.0|^9.0"
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^7.0|^8.0|^9.0|^10.0"
             },
             "type": "library",
             "extra": {
@@ -2607,42 +2642,44 @@
                 "laravel"
             ],
             "support": {
-                "source": "https://github.com/laravel/helpers/tree/v1.6.0"
+                "source": "https://github.com/laravel/helpers/tree/v1.7.1"
             },
-            "time": "2023-01-09T14:48:11+00:00"
+            "time": "2024-11-26T14:56:25+00:00"
         },
         {
             "name": "laravel/horizon",
-            "version": "v5.18.0",
+            "version": "v5.30.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/horizon.git",
-                "reference": "b14498a09af826035e46ae8d6b013d0ec849bdb7"
+                "reference": "77177646679ef2f2acf71d4d4b16036d18002040"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/horizon/zipball/b14498a09af826035e46ae8d6b013d0ec849bdb7",
-                "reference": "b14498a09af826035e46ae8d6b013d0ec849bdb7",
+                "url": "https://api.github.com/repos/laravel/horizon/zipball/77177646679ef2f2acf71d4d4b16036d18002040",
+                "reference": "77177646679ef2f2acf71d4d4b16036d18002040",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "ext-pcntl": "*",
                 "ext-posix": "*",
-                "illuminate/contracts": "^8.17|^9.0|^10.0",
-                "illuminate/queue": "^8.17|^9.0|^10.0",
-                "illuminate/support": "^8.17|^9.0|^10.0",
-                "nesbot/carbon": "^2.17",
-                "php": "^7.3|^8.0",
+                "illuminate/contracts": "^9.21|^10.0|^11.0",
+                "illuminate/queue": "^9.21|^10.0|^11.0",
+                "illuminate/support": "^9.21|^10.0|^11.0",
+                "nesbot/carbon": "^2.17|^3.0",
+                "php": "^8.0",
                 "ramsey/uuid": "^4.0",
-                "symfony/error-handler": "^5.0|^6.0",
-                "symfony/process": "^5.0|^6.0"
+                "symfony/console": "^6.0|^7.0",
+                "symfony/error-handler": "^6.0|^7.0",
+                "symfony/polyfill-php83": "^1.28",
+                "symfony/process": "^6.0|^7.0"
             },
             "require-dev": {
                 "mockery/mockery": "^1.0",
-                "orchestra/testbench": "^6.0|^7.0|^8.0",
+                "orchestra/testbench": "^7.0|^8.0|^9.0",
                 "phpstan/phpstan": "^1.10",
-                "phpunit/phpunit": "^9.0",
+                "phpunit/phpunit": "^9.0|^10.4",
                 "predis/predis": "^1.1|^2.0"
             },
             "suggest": {
@@ -2651,16 +2688,16 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "5.x-dev"
-                },
                 "laravel": {
-                    "providers": [
-                        "Laravel\\Horizon\\HorizonServiceProvider"
-                    ],
                     "aliases": {
                         "Horizon": "Laravel\\Horizon\\Horizon"
-                    }
+                    },
+                    "providers": [
+                        "Laravel\\Horizon\\HorizonServiceProvider"
+                    ]
+                },
+                "branch-alias": {
+                    "dev-master": "5.x-dev"
                 }
             },
             "autoload": {
@@ -2685,54 +2722,52 @@
             ],
             "support": {
                 "issues": "https://github.com/laravel/horizon/issues",
-                "source": "https://github.com/laravel/horizon/tree/v5.18.0"
+                "source": "https://github.com/laravel/horizon/tree/v5.30.1"
             },
-            "time": "2023-06-30T15:11:51+00:00"
+            "time": "2024-12-13T14:08:51+00:00"
         },
         {
             "name": "laravel/passport",
-            "version": "v11.8.8",
+            "version": "v12.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/passport.git",
-                "reference": "401836130d46c94138a637ada29f9e5b2bf053b6"
+                "reference": "0d95ca9cc9c80bdf64d04dcf04542720e3d5d55c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/passport/zipball/401836130d46c94138a637ada29f9e5b2bf053b6",
-                "reference": "401836130d46c94138a637ada29f9e5b2bf053b6",
+                "url": "https://api.github.com/repos/laravel/passport/zipball/0d95ca9cc9c80bdf64d04dcf04542720e3d5d55c",
+                "reference": "0d95ca9cc9c80bdf64d04dcf04542720e3d5d55c",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "firebase/php-jwt": "^6.4",
-                "illuminate/auth": "^9.0|^10.0",
-                "illuminate/console": "^9.0|^10.0",
-                "illuminate/container": "^9.0|^10.0",
-                "illuminate/contracts": "^9.0|^10.0",
-                "illuminate/cookie": "^9.0|^10.0",
-                "illuminate/database": "^9.0|^10.0",
-                "illuminate/encryption": "^9.0|^10.0",
-                "illuminate/http": "^9.0|^10.0",
-                "illuminate/support": "^9.0|^10.0",
+                "illuminate/auth": "^9.21|^10.0|^11.0",
+                "illuminate/console": "^9.21|^10.0|^11.0",
+                "illuminate/container": "^9.21|^10.0|^11.0",
+                "illuminate/contracts": "^9.21|^10.0|^11.0",
+                "illuminate/cookie": "^9.21|^10.0|^11.0",
+                "illuminate/database": "^9.21|^10.0|^11.0",
+                "illuminate/encryption": "^9.21|^10.0|^11.0",
+                "illuminate/http": "^9.21|^10.0|^11.0",
+                "illuminate/support": "^9.21|^10.0|^11.0",
                 "lcobucci/jwt": "^4.3|^5.0",
                 "league/oauth2-server": "^8.5.3",
                 "nyholm/psr7": "^1.5",
                 "php": "^8.0",
                 "phpseclib/phpseclib": "^2.0|^3.0",
-                "symfony/psr-http-message-bridge": "^2.1"
+                "symfony/console": "^6.0|^7.0",
+                "symfony/psr-http-message-bridge": "^2.1|^6.0|^7.0"
             },
             "require-dev": {
                 "mockery/mockery": "^1.0",
-                "orchestra/testbench": "^7.0|^8.0",
+                "orchestra/testbench": "^7.35|^8.14|^9.0",
                 "phpstan/phpstan": "^1.10",
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^9.3|^10.5"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "11.x-dev"
-                },
                 "laravel": {
                     "providers": [
                         "Laravel\\Passport\\PassportServiceProvider"
@@ -2765,35 +2800,95 @@
                 "issues": "https://github.com/laravel/passport/issues",
                 "source": "https://github.com/laravel/passport"
             },
-            "time": "2023-07-07T06:37:11+00:00"
+            "time": "2024-11-11T20:15:28+00:00"
         },
         {
-            "name": "laravel/serializable-closure",
-            "version": "v1.3.0",
+            "name": "laravel/prompts",
+            "version": "v0.3.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/laravel/serializable-closure.git",
-                "reference": "f23fe9d4e95255dacee1bf3525e0810d1a1b0f37"
+                "url": "https://github.com/laravel/prompts.git",
+                "reference": "0e0535747c6b8d6d10adca8b68293cf4517abb0f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/f23fe9d4e95255dacee1bf3525e0810d1a1b0f37",
-                "reference": "f23fe9d4e95255dacee1bf3525e0810d1a1b0f37",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/0e0535747c6b8d6d10adca8b68293cf4517abb0f",
+                "reference": "0e0535747c6b8d6d10adca8b68293cf4517abb0f",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3|^8.0"
+                "composer-runtime-api": "^2.2",
+                "ext-mbstring": "*",
+                "php": "^8.1",
+                "symfony/console": "^6.2|^7.0"
+            },
+            "conflict": {
+                "illuminate/console": ">=10.17.0 <10.25.0",
+                "laravel/framework": ">=10.17.0 <10.25.0"
             },
             "require-dev": {
-                "nesbot/carbon": "^2.61",
-                "pestphp/pest": "^1.21.3",
-                "phpstan/phpstan": "^1.8.2",
-                "symfony/var-dumper": "^5.4.11"
+                "illuminate/collections": "^10.0|^11.0",
+                "mockery/mockery": "^1.5",
+                "pestphp/pest": "^2.3|^3.4",
+                "phpstan/phpstan": "^1.11",
+                "phpstan/phpstan-mockery": "^1.1"
+            },
+            "suggest": {
+                "ext-pcntl": "Required for the spinner to be animated."
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.x-dev"
+                    "dev-main": "0.3.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/helpers.php"
+                ],
+                "psr-4": {
+                    "Laravel\\Prompts\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Add beautiful and user-friendly forms to your command-line applications.",
+            "support": {
+                "issues": "https://github.com/laravel/prompts/issues",
+                "source": "https://github.com/laravel/prompts/tree/v0.3.2"
+            },
+            "time": "2024-11-12T14:59:47+00:00"
+        },
+        {
+            "name": "laravel/serializable-closure",
+            "version": "v2.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravel/serializable-closure.git",
+                "reference": "613b2d4998f85564d40497e05e89cb6d9bd1cbe8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/613b2d4998f85564d40497e05e89cb6d9bd1cbe8",
+                "reference": "613b2d4998f85564d40497e05e89cb6d9bd1cbe8",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.1"
+            },
+            "require-dev": {
+                "illuminate/support": "^10.0|^11.0",
+                "nesbot/carbon": "^2.67|^3.0",
+                "pestphp/pest": "^2.36",
+                "phpstan/phpstan": "^2.0",
+                "symfony/var-dumper": "^6.2.0|^7.0.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.x-dev"
                 }
             },
             "autoload": {
@@ -2825,42 +2920,40 @@
                 "issues": "https://github.com/laravel/serializable-closure/issues",
                 "source": "https://github.com/laravel/serializable-closure"
             },
-            "time": "2023-01-30T18:31:20+00:00"
+            "time": "2024-12-16T15:26:28+00:00"
         },
         {
             "name": "laravel/tinker",
-            "version": "v2.8.1",
+            "version": "v2.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/tinker.git",
-                "reference": "04a2d3bd0d650c0764f70bf49d1ee39393e4eb10"
+                "reference": "ba4d51eb56de7711b3a37d63aa0643e99a339ae5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/tinker/zipball/04a2d3bd0d650c0764f70bf49d1ee39393e4eb10",
-                "reference": "04a2d3bd0d650c0764f70bf49d1ee39393e4eb10",
+                "url": "https://api.github.com/repos/laravel/tinker/zipball/ba4d51eb56de7711b3a37d63aa0643e99a339ae5",
+                "reference": "ba4d51eb56de7711b3a37d63aa0643e99a339ae5",
                 "shasum": ""
             },
             "require": {
-                "illuminate/console": "^6.0|^7.0|^8.0|^9.0|^10.0",
-                "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0",
-                "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0",
+                "illuminate/console": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+                "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+                "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
                 "php": "^7.2.5|^8.0",
-                "psy/psysh": "^0.10.4|^0.11.1",
-                "symfony/var-dumper": "^4.3.4|^5.0|^6.0"
+                "psy/psysh": "^0.11.1|^0.12.0",
+                "symfony/var-dumper": "^4.3.4|^5.0|^6.0|^7.0"
             },
             "require-dev": {
                 "mockery/mockery": "~1.3.3|^1.4.2",
+                "phpstan/phpstan": "^1.10",
                 "phpunit/phpunit": "^8.5.8|^9.3.3"
             },
             "suggest": {
-                "illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0|^9.0|^10.0)."
+                "illuminate/database": "The Illuminate Database package (^6.0|^7.0|^8.0|^9.0|^10.0|^11.0)."
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "2.x-dev"
-                },
                 "laravel": {
                     "providers": [
                         "Laravel\\Tinker\\TinkerServiceProvider"
@@ -2891,34 +2984,35 @@
             ],
             "support": {
                 "issues": "https://github.com/laravel/tinker/issues",
-                "source": "https://github.com/laravel/tinker/tree/v2.8.1"
+                "source": "https://github.com/laravel/tinker/tree/v2.10.0"
             },
-            "time": "2023-02-15T16:40:09+00:00"
+            "time": "2024-09-23T13:32:56+00:00"
         },
         {
             "name": "laravel/ui",
-            "version": "v4.2.2",
+            "version": "v4.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/ui.git",
-                "reference": "a58ec468db4a340b33f3426c778784717a2c144b"
+                "reference": "a34609b15ae0c0512a0cf47a21695a2729cb7f93"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/ui/zipball/a58ec468db4a340b33f3426c778784717a2c144b",
-                "reference": "a58ec468db4a340b33f3426c778784717a2c144b",
+                "url": "https://api.github.com/repos/laravel/ui/zipball/a34609b15ae0c0512a0cf47a21695a2729cb7f93",
+                "reference": "a34609b15ae0c0512a0cf47a21695a2729cb7f93",
                 "shasum": ""
             },
             "require": {
-                "illuminate/console": "^9.21|^10.0",
-                "illuminate/filesystem": "^9.21|^10.0",
-                "illuminate/support": "^9.21|^10.0",
-                "illuminate/validation": "^9.21|^10.0",
-                "php": "^8.0"
+                "illuminate/console": "^9.21|^10.0|^11.0",
+                "illuminate/filesystem": "^9.21|^10.0|^11.0",
+                "illuminate/support": "^9.21|^10.0|^11.0",
+                "illuminate/validation": "^9.21|^10.0|^11.0",
+                "php": "^8.0",
+                "symfony/console": "^6.0|^7.0"
             },
             "require-dev": {
-                "orchestra/testbench": "^7.0|^8.0",
-                "phpunit/phpunit": "^9.3"
+                "orchestra/testbench": "^7.35|^8.15|^9.0",
+                "phpunit/phpunit": "^9.3|^10.4|^11.0"
             },
             "type": "library",
             "extra": {
@@ -2953,40 +3047,40 @@
                 "ui"
             ],
             "support": {
-                "source": "https://github.com/laravel/ui/tree/v4.2.2"
+                "source": "https://github.com/laravel/ui/tree/v4.6.0"
             },
-            "time": "2023-05-09T19:47:28+00:00"
+            "time": "2024-11-21T15:06:41+00:00"
         },
         {
             "name": "lcobucci/clock",
-            "version": "3.0.0",
+            "version": "3.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/lcobucci/clock.git",
-                "reference": "039ef98c6b57b101d10bd11d8fdfda12cbd996dc"
+                "reference": "db3713a61addfffd615b79bf0bc22f0ccc61b86b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lcobucci/clock/zipball/039ef98c6b57b101d10bd11d8fdfda12cbd996dc",
-                "reference": "039ef98c6b57b101d10bd11d8fdfda12cbd996dc",
+                "url": "https://api.github.com/repos/lcobucci/clock/zipball/db3713a61addfffd615b79bf0bc22f0ccc61b86b",
+                "reference": "db3713a61addfffd615b79bf0bc22f0ccc61b86b",
                 "shasum": ""
             },
             "require": {
-                "php": "~8.1.0 || ~8.2.0",
+                "php": "~8.2.0 || ~8.3.0 || ~8.4.0",
                 "psr/clock": "^1.0"
             },
             "provide": {
                 "psr/clock-implementation": "1.0"
             },
             "require-dev": {
-                "infection/infection": "^0.26",
-                "lcobucci/coding-standard": "^9.0",
-                "phpstan/extension-installer": "^1.2",
-                "phpstan/phpstan": "^1.9.4",
-                "phpstan/phpstan-deprecation-rules": "^1.1.1",
-                "phpstan/phpstan-phpunit": "^1.3.2",
-                "phpstan/phpstan-strict-rules": "^1.4.4",
-                "phpunit/phpunit": "^9.5.27"
+                "infection/infection": "^0.29",
+                "lcobucci/coding-standard": "^11.1.0",
+                "phpstan/extension-installer": "^1.3.1",
+                "phpstan/phpstan": "^1.10.25",
+                "phpstan/phpstan-deprecation-rules": "^1.1.3",
+                "phpstan/phpstan-phpunit": "^1.3.13",
+                "phpstan/phpstan-strict-rules": "^1.5.1",
+                "phpunit/phpunit": "^11.3.6"
             },
             "type": "library",
             "autoload": {
@@ -3007,7 +3101,7 @@
             "description": "Yet another clock abstraction",
             "support": {
                 "issues": "https://github.com/lcobucci/clock/issues",
-                "source": "https://github.com/lcobucci/clock/tree/3.0.0"
+                "source": "https://github.com/lcobucci/clock/tree/3.3.1"
             },
             "funding": [
                 {
@@ -3019,44 +3113,42 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2022-12-19T15:00:24+00:00"
+            "time": "2024-09-24T20:45:14+00:00"
         },
         {
             "name": "lcobucci/jwt",
-            "version": "5.0.0",
+            "version": "5.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/lcobucci/jwt.git",
-                "reference": "47bdb0e0b5d00c2f89ebe33e7e384c77e84e7c34"
+                "reference": "ea1ce71cbf9741e445a5914e2f67cdbb484ff712"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lcobucci/jwt/zipball/47bdb0e0b5d00c2f89ebe33e7e384c77e84e7c34",
-                "reference": "47bdb0e0b5d00c2f89ebe33e7e384c77e84e7c34",
+                "url": "https://api.github.com/repos/lcobucci/jwt/zipball/ea1ce71cbf9741e445a5914e2f67cdbb484ff712",
+                "reference": "ea1ce71cbf9741e445a5914e2f67cdbb484ff712",
                 "shasum": ""
             },
             "require": {
-                "ext-hash": "*",
-                "ext-json": "*",
                 "ext-openssl": "*",
                 "ext-sodium": "*",
-                "php": "~8.1.0 || ~8.2.0",
+                "php": "~8.2.0 || ~8.3.0 || ~8.4.0",
                 "psr/clock": "^1.0"
             },
             "require-dev": {
-                "infection/infection": "^0.26.19",
-                "lcobucci/clock": "^3.0",
-                "lcobucci/coding-standard": "^9.0",
-                "phpbench/phpbench": "^1.2.8",
+                "infection/infection": "^0.29",
+                "lcobucci/clock": "^3.2",
+                "lcobucci/coding-standard": "^11.0",
+                "phpbench/phpbench": "^1.2",
                 "phpstan/extension-installer": "^1.2",
-                "phpstan/phpstan": "^1.10.3",
-                "phpstan/phpstan-deprecation-rules": "^1.1.2",
-                "phpstan/phpstan-phpunit": "^1.3.8",
+                "phpstan/phpstan": "^1.10.7",
+                "phpstan/phpstan-deprecation-rules": "^1.1.3",
+                "phpstan/phpstan-phpunit": "^1.3.10",
                 "phpstan/phpstan-strict-rules": "^1.5.0",
-                "phpunit/phpunit": "^10.0.12"
+                "phpunit/phpunit": "^11.1"
             },
             "suggest": {
-                "lcobucci/clock": ">= 3.0"
+                "lcobucci/clock": ">= 3.2"
             },
             "type": "library",
             "autoload": {
@@ -3082,7 +3174,7 @@
             ],
             "support": {
                 "issues": "https://github.com/lcobucci/jwt/issues",
-                "source": "https://github.com/lcobucci/jwt/tree/5.0.0"
+                "source": "https://github.com/lcobucci/jwt/tree/5.4.2"
             },
             "funding": [
                 {
@@ -3094,20 +3186,20 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2023-02-25T21:35:16+00:00"
+            "time": "2024-11-07T12:54:35+00:00"
         },
         {
             "name": "league/commonmark",
-            "version": "2.4.0",
+            "version": "2.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "d44a24690f16b8c1808bf13b1bd54ae4c63ea048"
+                "reference": "d150f911e0079e90ae3c106734c93137c184f932"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/d44a24690f16b8c1808bf13b1bd54ae4c63ea048",
-                "reference": "d44a24690f16b8c1808bf13b1bd54ae4c63ea048",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/d150f911e0079e90ae3c106734c93137c184f932",
+                "reference": "d150f911e0079e90ae3c106734c93137c184f932",
                 "shasum": ""
             },
             "require": {
@@ -3120,8 +3212,8 @@
             },
             "require-dev": {
                 "cebe/markdown": "^1.0",
-                "commonmark/cmark": "0.30.0",
-                "commonmark/commonmark.js": "0.30.0",
+                "commonmark/cmark": "0.31.1",
+                "commonmark/commonmark.js": "0.31.1",
                 "composer/package-versions-deprecated": "^1.8",
                 "embed/embed": "^4.4",
                 "erusev/parsedown": "^1.0",
@@ -3130,10 +3222,11 @@
                 "michelf/php-markdown": "^1.4 || ^2.0",
                 "nyholm/psr7": "^1.5",
                 "phpstan/phpstan": "^1.8.2",
-                "phpunit/phpunit": "^9.5.21",
+                "phpunit/phpunit": "^9.5.21 || ^10.5.9 || ^11.0.0",
                 "scrutinizer/ocular": "^1.8.1",
-                "symfony/finder": "^5.3 | ^6.0",
-                "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0",
+                "symfony/finder": "^5.3 | ^6.0 | ^7.0",
+                "symfony/process": "^5.4 | ^6.0 | ^7.0",
+                "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 | ^7.0",
                 "unleashedtech/php-coding-standard": "^3.1.1",
                 "vimeo/psalm": "^4.24.0 || ^5.0.0"
             },
@@ -3143,7 +3236,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.5-dev"
+                    "dev-main": "2.7-dev"
                 }
             },
             "autoload": {
@@ -3200,7 +3293,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-24T15:16:10+00:00"
+            "time": "2024-12-07T15:34:16+00:00"
         },
         {
             "name": "league/config",
@@ -3340,16 +3433,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "3.15.1",
+            "version": "3.29.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "a141d430414fcb8bf797a18716b09f759a385bed"
+                "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a141d430414fcb8bf797a18716b09f759a385bed",
-                "reference": "a141d430414fcb8bf797a18716b09f759a385bed",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/edc1bb7c86fab0776c3287dbd19b5fa278347319",
+                "reference": "edc1bb7c86fab0776c3287dbd19b5fa278347319",
                 "shasum": ""
             },
             "require": {
@@ -3358,6 +3451,8 @@
                 "php": "^8.0.2"
             },
             "conflict": {
+                "async-aws/core": "<1.19.0",
+                "async-aws/s3": "<1.14.0",
                 "aws/aws-sdk-php": "3.209.31 || 3.210.0",
                 "guzzlehttp/guzzle": "<7.0",
                 "guzzlehttp/ringphp": "<1.1.1",
@@ -3365,20 +3460,23 @@
                 "symfony/http-client": "<5.2"
             },
             "require-dev": {
-                "async-aws/s3": "^1.5",
-                "async-aws/simple-s3": "^1.1",
-                "aws/aws-sdk-php": "^3.220.0",
+                "async-aws/s3": "^1.5 || ^2.0",
+                "async-aws/simple-s3": "^1.1 || ^2.0",
+                "aws/aws-sdk-php": "^3.295.10",
                 "composer/semver": "^3.0",
                 "ext-fileinfo": "*",
                 "ext-ftp": "*",
+                "ext-mongodb": "^1.3",
                 "ext-zip": "*",
                 "friendsofphp/php-cs-fixer": "^3.5",
                 "google/cloud-storage": "^1.23",
+                "guzzlehttp/psr7": "^2.6",
                 "microsoft/azure-storage-blob": "^1.1",
-                "phpseclib/phpseclib": "^3.0.14",
-                "phpstan/phpstan": "^0.12.26",
-                "phpunit/phpunit": "^9.5.11",
-                "sabre/dav": "^4.3.1"
+                "mongodb/mongodb": "^1.2",
+                "phpseclib/phpseclib": "^3.0.36",
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^9.5.11|^10.0",
+                "sabre/dav": "^4.6.0"
             },
             "type": "library",
             "autoload": {
@@ -3412,36 +3510,26 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.15.1"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.29.1"
             },
-            "funding": [
-                {
-                    "url": "https://ecologi.com/frankdejonge",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/frankdejonge",
-                    "type": "github"
-                }
-            ],
-            "time": "2023-05-04T09:04:26+00:00"
+            "time": "2024-10-08T08:58:34+00:00"
         },
         {
             "name": "league/flysystem-aws-s3-v3",
-            "version": "3.15.0",
+            "version": "3.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git",
-                "reference": "d8de61ee10b6a607e7996cff388c5a3a663e8c8a"
+                "reference": "c6ff6d4606e48249b63f269eba7fabdb584e76a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/d8de61ee10b6a607e7996cff388c5a3a663e8c8a",
-                "reference": "d8de61ee10b6a607e7996cff388c5a3a663e8c8a",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/c6ff6d4606e48249b63f269eba7fabdb584e76a9",
+                "reference": "c6ff6d4606e48249b63f269eba7fabdb584e76a9",
                 "shasum": ""
             },
             "require": {
-                "aws/aws-sdk-php": "^3.220.0",
+                "aws/aws-sdk-php": "^3.295.10",
                 "league/flysystem": "^3.10.0",
                 "league/mime-type-detection": "^1.0.0",
                 "php": "^8.0.2"
@@ -3477,33 +3565,22 @@
                 "storage"
             ],
             "support": {
-                "issues": "https://github.com/thephpleague/flysystem-aws-s3-v3/issues",
-                "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.15.0"
+                "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.29.0"
             },
-            "funding": [
-                {
-                    "url": "https://ecologi.com/frankdejonge",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/frankdejonge",
-                    "type": "github"
-                }
-            ],
-            "time": "2023-05-02T20:02:14+00:00"
+            "time": "2024-08-17T13:10:48+00:00"
         },
         {
             "name": "league/flysystem-local",
-            "version": "3.15.0",
+            "version": "3.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem-local.git",
-                "reference": "543f64c397fefdf9cfeac443ffb6beff602796b3"
+                "reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/543f64c397fefdf9cfeac443ffb6beff602796b3",
-                "reference": "543f64c397fefdf9cfeac443ffb6beff602796b3",
+                "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/e0e8d52ce4b2ed154148453d321e97c8e931bd27",
+                "reference": "e0e8d52ce4b2ed154148453d321e97c8e931bd27",
                 "shasum": ""
             },
             "require": {
@@ -3537,46 +3614,38 @@
                 "local"
             ],
             "support": {
-                "issues": "https://github.com/thephpleague/flysystem-local/issues",
-                "source": "https://github.com/thephpleague/flysystem-local/tree/3.15.0"
+                "source": "https://github.com/thephpleague/flysystem-local/tree/3.29.0"
             },
-            "funding": [
-                {
-                    "url": "https://ecologi.com/frankdejonge",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/frankdejonge",
-                    "type": "github"
-                }
-            ],
-            "time": "2023-05-02T20:02:14+00:00"
+            "time": "2024-08-09T21:24:39+00:00"
         },
         {
             "name": "league/iso3166",
-            "version": "4.3.0",
+            "version": "4.3.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/thephpleague/iso3166.git",
-                "reference": "628f1b4992169917f3f59c14020ea4513c63f6db"
+                "url": "https://github.com/alcohol/iso3166.git",
+                "reference": "5133fed7d54728222f4058702487dccedda20472"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/iso3166/zipball/628f1b4992169917f3f59c14020ea4513c63f6db",
-                "reference": "628f1b4992169917f3f59c14020ea4513c63f6db",
+                "url": "https://api.github.com/repos/alcohol/iso3166/zipball/5133fed7d54728222f4058702487dccedda20472",
+                "reference": "5133fed7d54728222f4058702487dccedda20472",
                 "shasum": ""
             },
             "require": {
                 "ext-mbstring": "*",
-                "php": "^7.3|^8.0"
+                "php": "^7.4 || ^8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.5"
+                "phpstan/phpstan": "^1.12.6",
+                "phpstan/phpstan-deprecation-rules": "^1.2.1",
+                "phpstan/phpstan-strict-rules": "^1.6.1",
+                "phpunit/phpunit": "^9.6.21"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.x-dev"
+                    "dev-master": "4.x-dev"
                 }
             },
             "autoload": {
@@ -3595,7 +3664,7 @@
                 }
             ],
             "description": "ISO 3166-1 PHP Library",
-            "homepage": "https://github.com/thephpleague/iso3166",
+            "homepage": "https://github.com/alcohol/iso3166",
             "keywords": [
                 "3166",
                 "3166-1",
@@ -3605,33 +3674,39 @@
                 "library"
             ],
             "support": {
-                "issues": "https://github.com/thephpleague/iso3166/issues",
-                "source": "https://github.com/thephpleague/iso3166"
+                "issues": "https://github.com/alcohol/iso3166/issues",
+                "source": "https://github.com/alcohol/iso3166"
             },
-            "time": "2023-06-05T15:02:58+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/alcohol",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-10-10T07:39:24+00:00"
         },
         {
             "name": "league/mime-type-detection",
-            "version": "1.11.0",
+            "version": "1.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/mime-type-detection.git",
-                "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd"
+                "reference": "2d6702ff215bf922936ccc1ad31007edc76451b9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ff6248ea87a9f116e78edd6002e39e5128a0d4dd",
-                "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd",
+                "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/2d6702ff215bf922936ccc1ad31007edc76451b9",
+                "reference": "2d6702ff215bf922936ccc1ad31007edc76451b9",
                 "shasum": ""
             },
             "require": {
                 "ext-fileinfo": "*",
-                "php": "^7.2 || ^8.0"
+                "php": "^7.4 || ^8.0"
             },
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "^3.2",
                 "phpstan/phpstan": "^0.12.68",
-                "phpunit/phpunit": "^8.5.8 || ^9.3"
+                "phpunit/phpunit": "^8.5.8 || ^9.3 || ^10.0"
             },
             "type": "library",
             "autoload": {
@@ -3652,7 +3727,7 @@
             "description": "Mime-type detection for Flysystem",
             "support": {
                 "issues": "https://github.com/thephpleague/mime-type-detection/issues",
-                "source": "https://github.com/thephpleague/mime-type-detection/tree/1.11.0"
+                "source": "https://github.com/thephpleague/mime-type-detection/tree/1.16.0"
             },
             "funding": [
                 {
@@ -3664,20 +3739,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-17T13:12:02+00:00"
+            "time": "2024-09-21T08:32:55+00:00"
         },
         {
             "name": "league/oauth2-server",
-            "version": "8.5.3",
+            "version": "8.5.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/oauth2-server.git",
-                "reference": "eb91b4190e7f6169053ebf8ffa352d47e756b2ce"
+                "reference": "cc8778350f905667e796b3c2364a9d3bd7a73518"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/eb91b4190e7f6169053ebf8ffa352d47e756b2ce",
-                "reference": "eb91b4190e7f6169053ebf8ffa352d47e756b2ce",
+                "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/cc8778350f905667e796b3c2364a9d3bd7a73518",
+                "reference": "cc8778350f905667e796b3c2364a9d3bd7a73518",
                 "shasum": ""
             },
             "require": {
@@ -3686,7 +3761,7 @@
                 "lcobucci/clock": "^2.2 || ^3.0",
                 "lcobucci/jwt": "^4.3 || ^5.0",
                 "league/event": "^2.2",
-                "league/uri": "^6.7",
+                "league/uri": "^6.7 || ^7.0",
                 "php": "^8.0",
                 "psr/http-message": "^1.0.1 || ^2.0"
             },
@@ -3744,7 +3819,7 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/oauth2-server/issues",
-                "source": "https://github.com/thephpleague/oauth2-server/tree/8.5.3"
+                "source": "https://github.com/thephpleague/oauth2-server/tree/8.5.5"
             },
             "funding": [
                 {
@@ -3752,58 +3827,48 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-07-05T23:01:32+00:00"
+            "time": "2024-12-20T23:06:10+00:00"
         },
         {
             "name": "league/uri",
-            "version": "6.8.0",
+            "version": "7.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/uri.git",
-                "reference": "a700b4656e4c54371b799ac61e300ab25a2d1d39"
+                "reference": "81fb5145d2644324614cc532b28efd0215bda430"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/uri/zipball/a700b4656e4c54371b799ac61e300ab25a2d1d39",
-                "reference": "a700b4656e4c54371b799ac61e300ab25a2d1d39",
+                "url": "https://api.github.com/repos/thephpleague/uri/zipball/81fb5145d2644324614cc532b28efd0215bda430",
+                "reference": "81fb5145d2644324614cc532b28efd0215bda430",
                 "shasum": ""
             },
             "require": {
-                "ext-json": "*",
-                "league/uri-interfaces": "^2.3",
-                "php": "^8.1",
-                "psr/http-message": "^1.0.1"
+                "league/uri-interfaces": "^7.5",
+                "php": "^8.1"
             },
             "conflict": {
                 "league/uri-schemes": "^1.0"
             },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "^v3.9.5",
-                "nyholm/psr7": "^1.5.1",
-                "php-http/psr7-integration-tests": "^1.1.1",
-                "phpbench/phpbench": "^1.2.6",
-                "phpstan/phpstan": "^1.8.5",
-                "phpstan/phpstan-deprecation-rules": "^1.0",
-                "phpstan/phpstan-phpunit": "^1.1.1",
-                "phpstan/phpstan-strict-rules": "^1.4.3",
-                "phpunit/phpunit": "^9.5.24",
-                "psr/http-factory": "^1.0.1"
-            },
             "suggest": {
-                "ext-fileinfo": "Needed to create Data URI from a filepath",
-                "ext-intl": "Needed to improve host validation",
-                "league/uri-components": "Needed to easily manipulate URI objects",
-                "psr/http-factory": "Needed to use the URI factory"
+                "ext-bcmath": "to improve IPV4 host parsing",
+                "ext-fileinfo": "to create Data URI from file contennts",
+                "ext-gmp": "to improve IPV4 host parsing",
+                "ext-intl": "to handle IDN host with the best performance",
+                "jeremykendall/php-domain-parser": "to resolve Public Suffix and Top Level Domain",
+                "league/uri-components": "Needed to easily manipulate URI objects components",
+                "php-64bit": "to improve IPV4 host parsing",
+                "symfony/polyfill-intl-idn": "to handle IDN host via the Symfony polyfill if ext-intl is not present"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "6.x-dev"
+                    "dev-master": "7.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "League\\Uri\\": "src"
+                    "League\\Uri\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -3843,8 +3908,8 @@
             "support": {
                 "docs": "https://uri.thephpleague.com",
                 "forum": "https://thephpleague.slack.com",
-                "issues": "https://github.com/thephpleague/uri/issues",
-                "source": "https://github.com/thephpleague/uri/tree/6.8.0"
+                "issues": "https://github.com/thephpleague/uri-src/issues",
+                "source": "https://github.com/thephpleague/uri/tree/7.5.1"
             },
             "funding": [
                 {
@@ -3852,46 +3917,44 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-09-13T19:58:47+00:00"
+            "time": "2024-12-08T08:40:02+00:00"
         },
         {
             "name": "league/uri-interfaces",
-            "version": "2.3.0",
+            "version": "7.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/uri-interfaces.git",
-                "reference": "00e7e2943f76d8cb50c7dfdc2f6dee356e15e383"
+                "reference": "08cfc6c4f3d811584fb09c37e2849e6a7f9b0742"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/00e7e2943f76d8cb50c7dfdc2f6dee356e15e383",
-                "reference": "00e7e2943f76d8cb50c7dfdc2f6dee356e15e383",
+                "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/08cfc6c4f3d811584fb09c37e2849e6a7f9b0742",
+                "reference": "08cfc6c4f3d811584fb09c37e2849e6a7f9b0742",
                 "shasum": ""
             },
             "require": {
-                "ext-json": "*",
-                "php": "^7.2 || ^8.0"
-            },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.19",
-                "phpstan/phpstan": "^0.12.90",
-                "phpstan/phpstan-phpunit": "^0.12.19",
-                "phpstan/phpstan-strict-rules": "^0.12.9",
-                "phpunit/phpunit": "^8.5.15 || ^9.5"
+                "ext-filter": "*",
+                "php": "^8.1",
+                "psr/http-factory": "^1",
+                "psr/http-message": "^1.1 || ^2.0"
             },
             "suggest": {
-                "ext-intl": "to use the IDNA feature",
-                "symfony/intl": "to use the IDNA feature via Symfony Polyfill"
+                "ext-bcmath": "to improve IPV4 host parsing",
+                "ext-gmp": "to improve IPV4 host parsing",
+                "ext-intl": "to handle IDN host with the best performance",
+                "php-64bit": "to improve IPV4 host parsing",
+                "symfony/polyfill-intl-idn": "to handle IDN host via the Symfony polyfill if ext-intl is not present"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.x-dev"
+                    "dev-master": "7.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "League\\Uri\\": "src/"
+                    "League\\Uri\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -3905,17 +3968,32 @@
                     "homepage": "https://nyamsprod.com"
                 }
             ],
-            "description": "Common interface for URI representation",
-            "homepage": "http://github.com/thephpleague/uri-interfaces",
+            "description": "Common interfaces and classes for URI representation and interaction",
+            "homepage": "https://uri.thephpleague.com",
             "keywords": [
+                "data-uri",
+                "file-uri",
+                "ftp",
+                "hostname",
+                "http",
+                "https",
+                "parse_str",
+                "parse_url",
+                "psr-7",
+                "query-string",
+                "querystring",
                 "rfc3986",
                 "rfc3987",
+                "rfc6570",
                 "uri",
-                "url"
+                "url",
+                "ws"
             ],
             "support": {
-                "issues": "https://github.com/thephpleague/uri-interfaces/issues",
-                "source": "https://github.com/thephpleague/uri-interfaces/tree/2.3.0"
+                "docs": "https://uri.thephpleague.com",
+                "forum": "https://thephpleague.slack.com",
+                "issues": "https://github.com/thephpleague/uri-src/issues",
+                "source": "https://github.com/thephpleague/uri-interfaces/tree/7.5.0"
             },
             "funding": [
                 {
@@ -3923,27 +4001,94 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-06-28T04:27:21+00:00"
+            "time": "2024-12-08T08:18:47+00:00"
         },
         {
-            "name": "mobiledetect/mobiledetectlib",
-            "version": "2.8.41",
+            "name": "minishlink/web-push",
+            "version": "v8.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/serbanghita/Mobile-Detect.git",
-                "reference": "fc9cccd4d3706d5a7537b562b59cc18f9e4c0cb1"
+                "url": "https://github.com/web-push-libs/web-push-php.git",
+                "reference": "ec034f1e287cd1e74235e349bd017d71a61e9d8d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/fc9cccd4d3706d5a7537b562b59cc18f9e4c0cb1",
-                "reference": "fc9cccd4d3706d5a7537b562b59cc18f9e4c0cb1",
+                "url": "https://api.github.com/repos/web-push-libs/web-push-php/zipball/ec034f1e287cd1e74235e349bd017d71a61e9d8d",
+                "reference": "ec034f1e287cd1e74235e349bd017d71a61e9d8d",
+                "shasum": ""
+            },
+            "require": {
+                "ext-curl": "*",
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "ext-openssl": "*",
+                "guzzlehttp/guzzle": "^7.0.1|^6.2",
+                "php": ">=8.0",
+                "spomky-labs/base64url": "^2.0",
+                "web-token/jwt-key-mgmt": "^2.0|^3.0.2",
+                "web-token/jwt-signature": "^2.0|^3.0.2",
+                "web-token/jwt-signature-algorithm-ecdsa": "^2.0|^3.0.2",
+                "web-token/jwt-util-ecc": "^2.0|^3.0.2"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^v3.13.2",
+                "phpstan/phpstan": "^1.9.8",
+                "phpunit/phpunit": "^9.5.27"
+            },
+            "suggest": {
+                "ext-gmp": "Optional for performance."
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Minishlink\\WebPush\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Louis Lagrange",
+                    "email": "lagrange.louis@gmail.com",
+                    "homepage": "https://github.com/Minishlink"
+                }
+            ],
+            "description": "Web Push library for PHP",
+            "homepage": "https://github.com/web-push-libs/web-push-php",
+            "keywords": [
+                "Push API",
+                "WebPush",
+                "notifications",
+                "push",
+                "web"
+            ],
+            "support": {
+                "issues": "https://github.com/web-push-libs/web-push-php/issues",
+                "source": "https://github.com/web-push-libs/web-push-php/tree/v8.0.0"
+            },
+            "time": "2023-01-10T17:14:44+00:00"
+        },
+        {
+            "name": "mobiledetect/mobiledetectlib",
+            "version": "2.8.45",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/serbanghita/Mobile-Detect.git",
+                "reference": "96aaebcf4f50d3d2692ab81d2c5132e425bca266"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/96aaebcf4f50d3d2692ab81d2c5132e425bca266",
+                "reference": "96aaebcf4f50d3d2692ab81d2c5132e425bca266",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.0.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.8.35||~5.7"
+                "phpunit/phpunit": "~4.8.36"
             },
             "type": "library",
             "autoload": {
@@ -3977,22 +4122,28 @@
             ],
             "support": {
                 "issues": "https://github.com/serbanghita/Mobile-Detect/issues",
-                "source": "https://github.com/serbanghita/Mobile-Detect/tree/2.8.41"
+                "source": "https://github.com/serbanghita/Mobile-Detect/tree/2.8.45"
             },
-            "time": "2022-11-08T18:31:26+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/serbanghita",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-11-07T21:57:25+00:00"
         },
         {
             "name": "monolog/monolog",
-            "version": "3.4.0",
+            "version": "3.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "e2392369686d420ca32df3803de28b5d6f76867d"
+                "reference": "aef6ee73a77a66e404dd6540934a9ef1b3c855b4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/e2392369686d420ca32df3803de28b5d6f76867d",
-                "reference": "e2392369686d420ca32df3803de28b5d6f76867d",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/aef6ee73a77a66e404dd6540934a9ef1b3c855b4",
+                "reference": "aef6ee73a77a66e404dd6540934a9ef1b3c855b4",
                 "shasum": ""
             },
             "require": {
@@ -4012,12 +4163,14 @@
                 "guzzlehttp/psr7": "^2.2",
                 "mongodb/mongodb": "^1.8",
                 "php-amqplib/php-amqplib": "~2.4 || ^3",
-                "phpstan/phpstan": "^1.9",
-                "phpstan/phpstan-deprecation-rules": "^1.0",
-                "phpstan/phpstan-strict-rules": "^1.4",
-                "phpunit/phpunit": "^10.1",
+                "php-console/php-console": "^3.1.8",
+                "phpstan/phpstan": "^2",
+                "phpstan/phpstan-deprecation-rules": "^2",
+                "phpstan/phpstan-strict-rules": "^2",
+                "phpunit/phpunit": "^10.5.17 || ^11.0.7",
                 "predis/predis": "^1.1 || ^2",
-                "ruflin/elastica": "^7",
+                "rollbar/rollbar": "^4.0",
+                "ruflin/elastica": "^7 || ^8",
                 "symfony/mailer": "^5.4 || ^6",
                 "symfony/mime": "^5.4 || ^6"
             },
@@ -4068,7 +4221,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/3.4.0"
+                "source": "https://github.com/Seldaek/monolog/tree/3.8.1"
             },
             "funding": [
                 {
@@ -4080,29 +4233,29 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-06-21T08:46:11+00:00"
+            "time": "2024-12-05T17:15:07+00:00"
         },
         {
             "name": "mtdowling/jmespath.php",
-            "version": "2.6.1",
+            "version": "2.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/jmespath/jmespath.php.git",
-                "reference": "9b87907a81b87bc76d19a7fb2d61e61486ee9edb"
+                "reference": "a2a865e05d5f420b50cc2f85bb78d565db12a6bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/9b87907a81b87bc76d19a7fb2d61e61486ee9edb",
-                "reference": "9b87907a81b87bc76d19a7fb2d61e61486ee9edb",
+                "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/a2a865e05d5f420b50cc2f85bb78d565db12a6bc",
+                "reference": "a2a865e05d5f420b50cc2f85bb78d565db12a6bc",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.4 || ^7.0 || ^8.0",
+                "php": "^7.2.5 || ^8.0",
                 "symfony/polyfill-mbstring": "^1.17"
             },
             "require-dev": {
-                "composer/xdebug-handler": "^1.4 || ^2.0",
-                "phpunit/phpunit": "^4.8.36 || ^7.5.15"
+                "composer/xdebug-handler": "^3.0.3",
+                "phpunit/phpunit": "^8.5.33"
             },
             "bin": [
                 "bin/jp.php"
@@ -4110,7 +4263,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6-dev"
+                    "dev-master": "2.8-dev"
                 }
             },
             "autoload": {
@@ -4126,6 +4279,11 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                },
                 {
                     "name": "Michael Dowling",
                     "email": "mtdowling@gmail.com",
@@ -4139,53 +4297,53 @@
             ],
             "support": {
                 "issues": "https://github.com/jmespath/jmespath.php/issues",
-                "source": "https://github.com/jmespath/jmespath.php/tree/2.6.1"
+                "source": "https://github.com/jmespath/jmespath.php/tree/2.8.0"
             },
-            "time": "2021-06-14T00:11:39+00:00"
+            "time": "2024-09-04T18:46:31+00:00"
         },
         {
             "name": "nesbot/carbon",
-            "version": "2.68.1",
+            "version": "3.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "4f991ed2a403c85efbc4f23eb4030063fdbe01da"
+                "reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4f991ed2a403c85efbc4f23eb4030063fdbe01da",
-                "reference": "4f991ed2a403c85efbc4f23eb4030063fdbe01da",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/e1268cdbc486d97ce23fef2c666dc3c6b6de9947",
+                "reference": "e1268cdbc486d97ce23fef2c666dc3c6b6de9947",
                 "shasum": ""
             },
             "require": {
+                "carbonphp/carbon-doctrine-types": "<100.0",
                 "ext-json": "*",
-                "php": "^7.1.8 || ^8.0",
+                "php": "^8.1",
+                "psr/clock": "^1.0",
+                "symfony/clock": "^6.3 || ^7.0",
                 "symfony/polyfill-mbstring": "^1.0",
-                "symfony/polyfill-php80": "^1.16",
-                "symfony/translation": "^3.4 || ^4.0 || ^5.0 || ^6.0"
+                "symfony/translation": "^4.4.18 || ^5.2.1|| ^6.0 || ^7.0"
+            },
+            "provide": {
+                "psr/clock-implementation": "1.0"
             },
             "require-dev": {
-                "doctrine/dbal": "^2.0 || ^3.1.4",
-                "doctrine/orm": "^2.7",
-                "friendsofphp/php-cs-fixer": "^3.0",
-                "kylekatarnls/multi-tester": "^2.0",
-                "ondrejmirtes/better-reflection": "*",
-                "phpmd/phpmd": "^2.9",
-                "phpstan/extension-installer": "^1.0",
-                "phpstan/phpstan": "^0.12.99 || ^1.7.14",
-                "phpunit/php-file-iterator": "^2.0.5 || ^3.0.6",
-                "phpunit/phpunit": "^7.5.20 || ^8.5.26 || ^9.5.20",
-                "squizlabs/php_codesniffer": "^3.4"
+                "doctrine/dbal": "^3.6.3 || ^4.0",
+                "doctrine/orm": "^2.15.2 || ^3.0",
+                "friendsofphp/php-cs-fixer": "^3.57.2",
+                "kylekatarnls/multi-tester": "^2.5.3",
+                "ondrejmirtes/better-reflection": "^6.25.0.4",
+                "phpmd/phpmd": "^2.15.0",
+                "phpstan/extension-installer": "^1.3.1",
+                "phpstan/phpstan": "^1.11.2",
+                "phpunit/phpunit": "^10.5.20",
+                "squizlabs/php_codesniffer": "^3.9.0"
             },
             "bin": [
                 "bin/carbon"
             ],
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-3.x": "3.x-dev",
-                    "dev-master": "2.x-dev"
-                },
                 "laravel": {
                     "providers": [
                         "Carbon\\Laravel\\ServiceProvider"
@@ -4195,6 +4353,10 @@
                     "includes": [
                         "extension.neon"
                     ]
+                },
+                "branch-alias": {
+                    "dev-2.x": "2.x-dev",
+                    "dev-master": "3.x-dev"
                 }
             },
             "autoload": {
@@ -4243,35 +4405,35 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-06-20T18:29:04+00:00"
+            "time": "2024-11-07T17:46:48+00:00"
         },
         {
             "name": "nette/schema",
-            "version": "v1.2.3",
+            "version": "v1.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/schema.git",
-                "reference": "abbdbb70e0245d5f3bf77874cea1dfb0c930d06f"
+                "reference": "da801d52f0354f70a638673c4a0f04e16529431d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/schema/zipball/abbdbb70e0245d5f3bf77874cea1dfb0c930d06f",
-                "reference": "abbdbb70e0245d5f3bf77874cea1dfb0c930d06f",
+                "url": "https://api.github.com/repos/nette/schema/zipball/da801d52f0354f70a638673c4a0f04e16529431d",
+                "reference": "da801d52f0354f70a638673c4a0f04e16529431d",
                 "shasum": ""
             },
             "require": {
-                "nette/utils": "^2.5.7 || ^3.1.5 ||  ^4.0",
-                "php": ">=7.1 <8.3"
+                "nette/utils": "^4.0",
+                "php": "8.1 - 8.4"
             },
             "require-dev": {
-                "nette/tester": "^2.3 || ^2.4",
+                "nette/tester": "^2.5.2",
                 "phpstan/phpstan-nette": "^1.0",
-                "tracy/tracy": "^2.7"
+                "tracy/tracy": "^2.8"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.2-dev"
+                    "dev-master": "1.3-dev"
                 }
             },
             "autoload": {
@@ -4303,26 +4465,26 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/schema/issues",
-                "source": "https://github.com/nette/schema/tree/v1.2.3"
+                "source": "https://github.com/nette/schema/tree/v1.3.2"
             },
-            "time": "2022-10-13T01:24:26+00:00"
+            "time": "2024-10-06T23:10:23+00:00"
         },
         {
             "name": "nette/utils",
-            "version": "v4.0.0",
+            "version": "v4.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/utils.git",
-                "reference": "cacdbf5a91a657ede665c541eda28941d4b09c1e"
+                "reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/utils/zipball/cacdbf5a91a657ede665c541eda28941d4b09c1e",
-                "reference": "cacdbf5a91a657ede665c541eda28941d4b09c1e",
+                "url": "https://api.github.com/repos/nette/utils/zipball/736c567e257dbe0fcf6ce81b4d6dbe05c6899f96",
+                "reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.0 <8.3"
+                "php": "8.0 - 8.4"
             },
             "conflict": {
                 "nette/finder": "<3",
@@ -4330,7 +4492,7 @@
             },
             "require-dev": {
                 "jetbrains/phpstorm-attributes": "dev-master",
-                "nette/tester": "^2.4",
+                "nette/tester": "^2.5",
                 "phpstan/phpstan": "^1.0",
                 "tracy/tracy": "^2.9"
             },
@@ -4340,8 +4502,7 @@
                 "ext-intl": "to use Strings::webalize(), toAscii(), normalize() and compare()",
                 "ext-json": "to use Nette\\Utils\\Json",
                 "ext-mbstring": "to use Strings::lower() etc...",
-                "ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()",
-                "ext-xml": "to use Strings::length() etc. when mbstring is not available"
+                "ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()"
             },
             "type": "library",
             "extra": {
@@ -4390,31 +4551,33 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/utils/issues",
-                "source": "https://github.com/nette/utils/tree/v4.0.0"
+                "source": "https://github.com/nette/utils/tree/v4.0.5"
             },
-            "time": "2023-02-02T10:41:53+00:00"
+            "time": "2024-08-07T15:39:19+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.16.0",
+            "version": "v5.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "19526a33fb561ef417e822e85f08a00db4059c17"
+                "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17",
-                "reference": "19526a33fb561ef417e822e85f08a00db4059c17",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
+                "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
                 "shasum": ""
             },
             "require": {
+                "ext-ctype": "*",
+                "ext-json": "*",
                 "ext-tokenizer": "*",
-                "php": ">=7.0"
+                "php": ">=7.4"
             },
             "require-dev": {
                 "ircmaxell/php-yacc": "^0.0.7",
-                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
+                "phpunit/phpunit": "^9.0"
             },
             "bin": [
                 "bin/php-parse"
@@ -4422,7 +4585,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.9-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -4446,39 +4609,37 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.16.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
             },
-            "time": "2023-06-25T14:52:30+00:00"
+            "time": "2024-10-08T18:51:32+00:00"
         },
         {
             "name": "nunomaduro/termwind",
-            "version": "v1.15.1",
+            "version": "v2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/termwind.git",
-                "reference": "8ab0b32c8caa4a2e09700ea32925441385e4a5dc"
+                "reference": "52915afe6a1044e8b9cee1bcff836fb63acf9cda"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/8ab0b32c8caa4a2e09700ea32925441385e4a5dc",
-                "reference": "8ab0b32c8caa4a2e09700ea32925441385e4a5dc",
+                "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/52915afe6a1044e8b9cee1bcff836fb63acf9cda",
+                "reference": "52915afe6a1044e8b9cee1bcff836fb63acf9cda",
                 "shasum": ""
             },
             "require": {
                 "ext-mbstring": "*",
-                "php": "^8.0",
-                "symfony/console": "^5.3.0|^6.0.0"
+                "php": "^8.2",
+                "symfony/console": "^7.1.8"
             },
             "require-dev": {
-                "ergebnis/phpstan-rules": "^1.0.",
-                "illuminate/console": "^8.0|^9.0",
-                "illuminate/support": "^8.0|^9.0",
-                "laravel/pint": "^1.0.0",
-                "pestphp/pest": "^1.21.0",
-                "pestphp/pest-plugin-mock": "^1.0",
-                "phpstan/phpstan": "^1.4.6",
-                "phpstan/phpstan-strict-rules": "^1.1.0",
-                "symfony/var-dumper": "^5.2.7|^6.0.0",
+                "illuminate/console": "^11.33.2",
+                "laravel/pint": "^1.18.2",
+                "mockery/mockery": "^1.6.12",
+                "pestphp/pest": "^2.36.0",
+                "phpstan/phpstan": "^1.12.11",
+                "phpstan/phpstan-strict-rules": "^1.6.1",
+                "symfony/var-dumper": "^7.1.8",
                 "thecodingmachine/phpstan-strict-rules": "^1.0.0"
             },
             "type": "library",
@@ -4487,6 +4648,9 @@
                     "providers": [
                         "Termwind\\Laravel\\TermwindServiceProvider"
                     ]
+                },
+                "branch-alias": {
+                    "dev-2.x": "2.x-dev"
                 }
             },
             "autoload": {
@@ -4518,7 +4682,7 @@
             ],
             "support": {
                 "issues": "https://github.com/nunomaduro/termwind/issues",
-                "source": "https://github.com/nunomaduro/termwind/tree/v1.15.1"
+                "source": "https://github.com/nunomaduro/termwind/tree/v2.3.0"
             },
             "funding": [
                 {
@@ -4534,20 +4698,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-08T01:06:31+00:00"
+            "time": "2024-11-21T10:39:51+00:00"
         },
         {
             "name": "nyholm/psr7",
-            "version": "1.8.0",
+            "version": "1.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Nyholm/psr7.git",
-                "reference": "3cb4d163b58589e47b35103e8e5e6a6a475b47be"
+                "reference": "a71f2b11690f4b24d099d6b16690a90ae14fc6f3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Nyholm/psr7/zipball/3cb4d163b58589e47b35103e8e5e6a6a475b47be",
-                "reference": "3cb4d163b58589e47b35103e8e5e6a6a475b47be",
+                "url": "https://api.github.com/repos/Nyholm/psr7/zipball/a71f2b11690f4b24d099d6b16690a90ae14fc6f3",
+                "reference": "a71f2b11690f4b24d099d6b16690a90ae14fc6f3",
                 "shasum": ""
             },
             "require": {
@@ -4600,7 +4764,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Nyholm/psr7/issues",
-                "source": "https://github.com/Nyholm/psr7/tree/1.8.0"
+                "source": "https://github.com/Nyholm/psr7/tree/1.8.2"
             },
             "funding": [
                 {
@@ -4612,20 +4776,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-05-02T11:26:24+00:00"
+            "time": "2024-09-09T07:06:30+00:00"
         },
         {
             "name": "paragonie/constant_time_encoding",
-            "version": "v2.6.3",
+            "version": "v2.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/constant_time_encoding.git",
-                "reference": "58c3f47f650c94ec05a151692652a868995d2938"
+                "reference": "52a0d99e69f56b9ec27ace92ba56897fe6993105"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/58c3f47f650c94ec05a151692652a868995d2938",
-                "reference": "58c3f47f650c94ec05a151692652a868995d2938",
+                "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/52a0d99e69f56b9ec27ace92ba56897fe6993105",
+                "reference": "52a0d99e69f56b9ec27ace92ba56897fe6993105",
                 "shasum": ""
             },
             "require": {
@@ -4679,7 +4843,7 @@
                 "issues": "https://github.com/paragonie/constant_time_encoding/issues",
                 "source": "https://github.com/paragonie/constant_time_encoding"
             },
-            "time": "2022-06-14T06:56:20+00:00"
+            "time": "2024-05-08T12:18:48+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -4733,30 +4897,35 @@
         },
         {
             "name": "paragonie/sodium_compat",
-            "version": "v1.20.0",
+            "version": "v2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/sodium_compat.git",
-                "reference": "e592a3e06d1fa0d43988c7c7d9948ca836f644b6"
+                "reference": "a673d5f310477027cead2e2f2b6db5d8368157cb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/e592a3e06d1fa0d43988c7c7d9948ca836f644b6",
-                "reference": "e592a3e06d1fa0d43988c7c7d9948ca836f644b6",
+                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/a673d5f310477027cead2e2f2b6db5d8368157cb",
+                "reference": "a673d5f310477027cead2e2f2b6db5d8368157cb",
                 "shasum": ""
             },
             "require": {
-                "paragonie/random_compat": ">=1",
-                "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7|^8"
+                "php": "^8.1",
+                "php-64bit": "*"
             },
             "require-dev": {
-                "phpunit/phpunit": "^3|^4|^5|^6|^7|^8|^9"
+                "phpunit/phpunit": "^7|^8|^9",
+                "vimeo/psalm": "^4|^5"
             },
             "suggest": {
-                "ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.",
-                "ext-sodium": "PHP >= 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
+                "ext-sodium": "Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
             "autoload": {
                 "files": [
                     "autoload.php"
@@ -4813,48 +4982,48 @@
             ],
             "support": {
                 "issues": "https://github.com/paragonie/sodium_compat/issues",
-                "source": "https://github.com/paragonie/sodium_compat/tree/v1.20.0"
+                "source": "https://github.com/paragonie/sodium_compat/tree/v2.1.0"
             },
-            "time": "2023-04-30T00:54:53+00:00"
+            "time": "2024-09-04T12:51:01+00:00"
         },
         {
             "name": "pbmedia/laravel-ffmpeg",
-            "version": "8.3.0",
+            "version": "8.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/protonemedia/laravel-ffmpeg.git",
-                "reference": "820e7f1290918233a59d85f25bc78796dc3f57bb"
+                "reference": "f14efc53e8a52b53a237a9910b32e795dafcf8bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/protonemedia/laravel-ffmpeg/zipball/820e7f1290918233a59d85f25bc78796dc3f57bb",
-                "reference": "820e7f1290918233a59d85f25bc78796dc3f57bb",
+                "url": "https://api.github.com/repos/protonemedia/laravel-ffmpeg/zipball/f14efc53e8a52b53a237a9910b32e795dafcf8bc",
+                "reference": "f14efc53e8a52b53a237a9910b32e795dafcf8bc",
                 "shasum": ""
             },
             "require": {
-                "illuminate/contracts": "^9.0|^10.0",
-                "php": "^8.1|^8.2",
-                "php-ffmpeg/php-ffmpeg": "^1.1",
-                "ramsey/collection": "^1.0|^2.0"
+                "illuminate/contracts": "^10.0|^11.0",
+                "php": "^8.1|^8.2|^8.3|^8.4",
+                "php-ffmpeg/php-ffmpeg": "^1.2",
+                "ramsey/collection": "^2.0"
             },
             "require-dev": {
                 "league/flysystem-memory": "^3.10",
                 "mockery/mockery": "^1.4.4",
-                "nesbot/carbon": "^2.66",
-                "orchestra/testbench": "^7.0|^8.0",
-                "phpunit/phpunit": "^9.5.10",
-                "spatie/image": "^2.2",
-                "spatie/phpunit-snapshot-assertions": "^4.2"
+                "nesbot/carbon": "^2.66|^3.0",
+                "orchestra/testbench": "^8.0|^9.0",
+                "phpunit/phpunit": "^10.4",
+                "spatie/image": "^2.2|^3.3",
+                "spatie/phpunit-snapshot-assertions": "^5.0"
             },
             "type": "library",
             "extra": {
                 "laravel": {
-                    "providers": [
-                        "ProtoneMedia\\LaravelFFMpeg\\Support\\ServiceProvider"
-                    ],
                     "aliases": {
                         "FFMpeg": "ProtoneMedia\\LaravelFFMpeg\\Support\\FFMpeg"
-                    }
+                    },
+                    "providers": [
+                        "ProtoneMedia\\LaravelFFMpeg\\Support\\ServiceProvider"
+                    ]
                 }
             },
             "autoload": {
@@ -4885,7 +5054,7 @@
             ],
             "support": {
                 "issues": "https://github.com/protonemedia/laravel-ffmpeg/issues",
-                "source": "https://github.com/protonemedia/laravel-ffmpeg/tree/8.3.0"
+                "source": "https://github.com/protonemedia/laravel-ffmpeg/tree/8.6.0"
             },
             "funding": [
                 {
@@ -4893,33 +5062,33 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-15T10:10:46+00:00"
+            "time": "2024-11-12T16:12:23+00:00"
         },
         {
             "name": "php-ffmpeg/php-ffmpeg",
-            "version": "v1.1.0",
+            "version": "v1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-FFMpeg/PHP-FFMpeg.git",
-                "reference": "eace6f174ff6d206ba648483ebe59760f7f6a0e1"
+                "reference": "5e7b15710a8607e8a3a2d9fbe2c150a99b924fa5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-FFMpeg/PHP-FFMpeg/zipball/eace6f174ff6d206ba648483ebe59760f7f6a0e1",
-                "reference": "eace6f174ff6d206ba648483ebe59760f7f6a0e1",
+                "url": "https://api.github.com/repos/PHP-FFMpeg/PHP-FFMpeg/zipball/5e7b15710a8607e8a3a2d9fbe2c150a99b924fa5",
+                "reference": "5e7b15710a8607e8a3a2d9fbe2c150a99b924fa5",
                 "shasum": ""
             },
             "require": {
                 "evenement/evenement": "^3.0",
-                "php": "^8.0 || ^8.1 || ^8.2",
+                "php": "^8.0 || ^8.1 || ^8.2 || ^8.3 || ^8.4",
                 "psr/log": "^1.0 || ^2.0 || ^3.0",
                 "spatie/temporary-directory": "^2.0",
-                "symfony/cache": "^5.4 || ^6.0",
-                "symfony/process": "^5.4 || ^6.0"
+                "symfony/cache": "^5.4 || ^6.0 || ^7.0",
+                "symfony/process": "^5.4 || ^6.0 || ^7.0"
             },
             "require-dev": {
                 "mockery/mockery": "^1.5",
-                "phpunit/phpunit": "^9.5.10"
+                "phpunit/phpunit": "^9.5.10 || ^10.0"
             },
             "suggest": {
                 "php-ffmpeg/extras": "A compilation of common audio & video drivers for PHP-FFMpeg"
@@ -4980,22 +5149,22 @@
             ],
             "support": {
                 "issues": "https://github.com/PHP-FFMpeg/PHP-FFMpeg/issues",
-                "source": "https://github.com/PHP-FFMpeg/PHP-FFMpeg/tree/v1.1.0"
+                "source": "https://github.com/PHP-FFMpeg/PHP-FFMpeg/tree/v1.3.0"
             },
-            "time": "2022-12-09T13:57:05+00:00"
+            "time": "2024-11-12T15:39:52+00:00"
         },
         {
             "name": "phpoption/phpoption",
-            "version": "1.9.1",
+            "version": "1.9.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/php-option.git",
-                "reference": "dd3a383e599f49777d8b628dadbb90cae435b87e"
+                "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/dd3a383e599f49777d8b628dadbb90cae435b87e",
-                "reference": "dd3a383e599f49777d8b628dadbb90cae435b87e",
+                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/e3fac8b24f56113f7cb96af14958c0dd16330f54",
+                "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54",
                 "shasum": ""
             },
             "require": {
@@ -5003,13 +5172,13 @@
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "phpunit/phpunit": "^8.5.32 || ^9.6.3 || ^10.0.12"
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28"
             },
             "type": "library",
             "extra": {
                 "bamarni-bin": {
                     "bin-links": true,
-                    "forward-command": true
+                    "forward-command": false
                 },
                 "branch-alias": {
                     "dev-master": "1.9-dev"
@@ -5045,7 +5214,7 @@
             ],
             "support": {
                 "issues": "https://github.com/schmittjoh/php-option/issues",
-                "source": "https://github.com/schmittjoh/php-option/tree/1.9.1"
+                "source": "https://github.com/schmittjoh/php-option/tree/1.9.3"
             },
             "funding": [
                 {
@@ -5057,20 +5226,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-25T19:38:58+00:00"
+            "time": "2024-07-20T21:41:07+00:00"
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "2.0.44",
+            "version": "2.0.48",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "149f608243f8133c61926aae26ce67d2b22b37e5"
+                "reference": "eaa7be704b8b93a6913b69eb7f645a59d7731b61"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/149f608243f8133c61926aae26ce67d2b22b37e5",
-                "reference": "149f608243f8133c61926aae26ce67d2b22b37e5",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/eaa7be704b8b93a6913b69eb7f645a59d7731b61",
+                "reference": "eaa7be704b8b93a6913b69eb7f645a59d7731b61",
                 "shasum": ""
             },
             "require": {
@@ -5151,7 +5320,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/2.0.44"
+                "source": "https://github.com/phpseclib/phpseclib/tree/2.0.48"
             },
             "funding": [
                 {
@@ -5167,7 +5336,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-06-13T08:41:47+00:00"
+            "time": "2024-12-14T21:03:54+00:00"
         },
         {
             "name": "pixelfed/fractal",
@@ -5295,75 +5464,26 @@
             },
             "time": "2019-03-12T05:13:49+00:00"
         },
-        {
-            "name": "pixelfed/zttp",
-            "version": "v0.5.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/pixelfed/zttp.git",
-                "reference": "e78af39d75171f360ab4c32eed1c7a71b67b5e3b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/pixelfed/zttp/zipball/e78af39d75171f360ab4c32eed1c7a71b67b5e3b",
-                "reference": "e78af39d75171f360ab4c32eed1c7a71b67b5e3b",
-                "shasum": ""
-            },
-            "require": {
-                "guzzlehttp/guzzle": "^6.0|^7.0",
-                "php": ">=7.0",
-                "tightenco/collect": "^5.4"
-            },
-            "require-dev": {
-                "laravel/lumen-framework": "5.5.*",
-                "phpunit/phpunit": "^6.0"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "src/Zttp.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Adam Wathan",
-                    "email": "adam.wathan@gmail.com"
-                }
-            ],
-            "description": "A developer-experience focused HTTP client, optimized for most common use cases.",
-            "keywords": [
-                "Guzzle",
-                "http"
-            ],
-            "support": {
-                "source": "https://github.com/pixelfed/zttp/tree/v0.5.0"
-            },
-            "time": "2022-08-06T04:58:13+00:00"
-        },
         {
             "name": "pragmarx/google2fa",
-            "version": "v8.0.1",
+            "version": "v8.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/antonioribeiro/google2fa.git",
-                "reference": "80c3d801b31fe165f8fe99ea085e0a37834e1be3"
+                "reference": "6f8d87ebd5afbf7790bde1ffc7579c7c705e0fad"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/80c3d801b31fe165f8fe99ea085e0a37834e1be3",
-                "reference": "80c3d801b31fe165f8fe99ea085e0a37834e1be3",
+                "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/6f8d87ebd5afbf7790bde1ffc7579c7c705e0fad",
+                "reference": "6f8d87ebd5afbf7790bde1ffc7579c7c705e0fad",
                 "shasum": ""
             },
             "require": {
-                "paragonie/constant_time_encoding": "^1.0|^2.0",
+                "paragonie/constant_time_encoding": "^1.0|^2.0|^3.0",
                 "php": "^7.1|^8.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "^0.12.18",
+                "phpstan/phpstan": "^1.9",
                 "phpunit/phpunit": "^7.5.15|^8.5|^9.0"
             },
             "type": "library",
@@ -5392,22 +5512,22 @@
             ],
             "support": {
                 "issues": "https://github.com/antonioribeiro/google2fa/issues",
-                "source": "https://github.com/antonioribeiro/google2fa/tree/v8.0.1"
+                "source": "https://github.com/antonioribeiro/google2fa/tree/v8.0.3"
             },
-            "time": "2022-06-13T21:57:56+00:00"
+            "time": "2024-09-05T11:56:40+00:00"
         },
         {
             "name": "predis/predis",
-            "version": "v2.2.0",
+            "version": "v2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/predis/predis.git",
-                "reference": "33b70b971a32b0d28b4f748b0547593dce316e0d"
+                "reference": "bac46bfdb78cd6e9c7926c697012aae740cb9ec9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/predis/predis/zipball/33b70b971a32b0d28b4f748b0547593dce316e0d",
-                "reference": "33b70b971a32b0d28b4f748b0547593dce316e0d",
+                "url": "https://api.github.com/repos/predis/predis/zipball/bac46bfdb78cd6e9c7926c697012aae740cb9ec9",
+                "reference": "bac46bfdb78cd6e9c7926c697012aae740cb9ec9",
                 "shasum": ""
             },
             "require": {
@@ -5416,7 +5536,7 @@
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "^3.3",
                 "phpstan/phpstan": "^1.9",
-                "phpunit/phpunit": "^8.0 || ~9.4.4"
+                "phpunit/phpunit": "^8.0 || ^9.4"
             },
             "suggest": {
                 "ext-relay": "Faster connection with in-memory caching (>=0.6.2)"
@@ -5447,7 +5567,7 @@
             ],
             "support": {
                 "issues": "https://github.com/predis/predis/issues",
-                "source": "https://github.com/predis/predis/tree/v2.2.0"
+                "source": "https://github.com/predis/predis/tree/v2.3.0"
             },
             "funding": [
                 {
@@ -5455,7 +5575,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-06-14T10:37:31+00:00"
+            "time": "2024-11-21T20:00:02+00:00"
         },
         {
             "name": "psr/cache",
@@ -5659,16 +5779,16 @@
         },
         {
             "name": "psr/http-client",
-            "version": "1.0.2",
+            "version": "1.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-client.git",
-                "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31"
+                "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31",
-                "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31",
+                "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90",
+                "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90",
                 "shasum": ""
             },
             "require": {
@@ -5705,26 +5825,26 @@
                 "psr-18"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-client/tree/1.0.2"
+                "source": "https://github.com/php-fig/http-client"
             },
-            "time": "2023-04-10T20:12:12+00:00"
+            "time": "2023-09-23T14:17:50+00:00"
         },
         {
             "name": "psr/http-factory",
-            "version": "1.0.2",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-factory.git",
-                "reference": "e616d01114759c4c489f93b099585439f795fe35"
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35",
-                "reference": "e616d01114759c4c489f93b099585439f795fe35",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0.0",
+                "php": ">=7.1",
                 "psr/http-message": "^1.0 || ^2.0"
             },
             "type": "library",
@@ -5748,7 +5868,7 @@
                     "homepage": "https://www.php-fig.org/"
                 }
             ],
-            "description": "Common interfaces for PSR-7 HTTP message factories",
+            "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories",
             "keywords": [
                 "factory",
                 "http",
@@ -5760,22 +5880,22 @@
                 "response"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-factory/tree/1.0.2"
+                "source": "https://github.com/php-fig/http-factory"
             },
-            "time": "2023-04-10T20:10:41+00:00"
+            "time": "2024-04-15T12:06:14+00:00"
         },
         {
             "name": "psr/http-message",
-            "version": "1.1",
+            "version": "2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-message.git",
-                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba"
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
-                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
                 "shasum": ""
             },
             "require": {
@@ -5784,7 +5904,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
@@ -5799,7 +5919,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for HTTP messages",
@@ -5813,22 +5933,22 @@
                 "response"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-message/tree/1.1"
+                "source": "https://github.com/php-fig/http-message/tree/2.0"
             },
-            "time": "2023-04-04T09:50:52+00:00"
+            "time": "2023-04-04T09:54:51+00:00"
         },
         {
             "name": "psr/log",
-            "version": "3.0.0",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001"
+                "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001",
-                "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
+                "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3",
                 "shasum": ""
             },
             "require": {
@@ -5863,9 +5983,9 @@
                 "psr-3"
             ],
             "support": {
-                "source": "https://github.com/php-fig/log/tree/3.0.0"
+                "source": "https://github.com/php-fig/log/tree/3.0.2"
             },
-            "time": "2021-07-14T16:46:02+00:00"
+            "time": "2024-09-11T13:17:53+00:00"
         },
         {
             "name": "psr/simple-cache",
@@ -5920,25 +6040,25 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.11.18",
+            "version": "v0.12.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "4f00ee9e236fa6a48f4560d1300b9c961a70a7ec"
+                "reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/4f00ee9e236fa6a48f4560d1300b9c961a70a7ec",
-                "reference": "4f00ee9e236fa6a48f4560d1300b9c961a70a7ec",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/d73fa3c74918ef4522bb8a3bf9cab39161c4b57c",
+                "reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "ext-tokenizer": "*",
-                "nikic/php-parser": "^4.0 || ^3.1",
-                "php": "^8.0 || ^7.0.8",
-                "symfony/console": "^6.0 || ^5.0 || ^4.0 || ^3.4",
-                "symfony/var-dumper": "^6.0 || ^5.0 || ^4.0 || ^3.4"
+                "nikic/php-parser": "^5.0 || ^4.0",
+                "php": "^8.0 || ^7.4",
+                "symfony/console": "^7.0 || ^6.0 || ^5.0 || ^4.0 || ^3.4",
+                "symfony/var-dumper": "^7.0 || ^6.0 || ^5.0 || ^4.0 || ^3.4"
             },
             "conflict": {
                 "symfony/console": "4.4.37 || 5.3.14 || 5.3.15 || 5.4.3 || 5.4.4 || 6.0.3 || 6.0.4"
@@ -5949,16 +6069,19 @@
             "suggest": {
                 "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)",
                 "ext-pdo-sqlite": "The doc command requires SQLite to work.",
-                "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well.",
-                "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history."
+                "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well."
             },
             "bin": [
                 "bin/psysh"
             ],
             "type": "library",
             "extra": {
+                "bamarni-bin": {
+                    "bin-links": false,
+                    "forward-command": false
+                },
                 "branch-alias": {
-                    "dev-main": "0.11.x-dev"
+                    "dev-main": "0.12.x-dev"
                 }
             },
             "autoload": {
@@ -5990,29 +6113,29 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/psysh/issues",
-                "source": "https://github.com/bobthecow/psysh/tree/v0.11.18"
+                "source": "https://github.com/bobthecow/psysh/tree/v0.12.7"
             },
-            "time": "2023-05-23T02:31:11+00:00"
+            "time": "2024-12-10T01:58:33+00:00"
         },
         {
             "name": "pusher/pusher-php-server",
-            "version": "7.2.3",
+            "version": "7.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pusher/pusher-http-php.git",
-                "reference": "416e68dd5f640175ad5982131c42a7a666d1d8e9"
+                "reference": "d89e9997191d18fb0fe03a956fa3ccfe0af524ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pusher/pusher-http-php/zipball/416e68dd5f640175ad5982131c42a7a666d1d8e9",
-                "reference": "416e68dd5f640175ad5982131c42a7a666d1d8e9",
+                "url": "https://api.github.com/repos/pusher/pusher-http-php/zipball/d89e9997191d18fb0fe03a956fa3ccfe0af524ea",
+                "reference": "d89e9997191d18fb0fe03a956fa3ccfe0af524ea",
                 "shasum": ""
             },
             "require": {
                 "ext-curl": "*",
                 "ext-json": "*",
                 "guzzlehttp/guzzle": "^7.2",
-                "paragonie/sodium_compat": "^1.6",
+                "paragonie/sodium_compat": "^1.6|^2.0",
                 "php": "^7.3|^8.0",
                 "psr/log": "^1.0|^2.0|^3.0"
             },
@@ -6051,9 +6174,9 @@
             ],
             "support": {
                 "issues": "https://github.com/pusher/pusher-http-php/issues",
-                "source": "https://github.com/pusher/pusher-http-php/tree/7.2.3"
+                "source": "https://github.com/pusher/pusher-http-php/tree/7.2.6"
             },
-            "time": "2023-05-17T16:00:06+00:00"
+            "time": "2024-10-18T12:04:31+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
@@ -6190,20 +6313,20 @@
         },
         {
             "name": "ramsey/uuid",
-            "version": "4.7.4",
+            "version": "4.7.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/uuid.git",
-                "reference": "60a4c63ab724854332900504274f6150ff26d286"
+                "reference": "91039bc1faa45ba123c4328958e620d382ec7088"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/60a4c63ab724854332900504274f6150ff26d286",
-                "reference": "60a4c63ab724854332900504274f6150ff26d286",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/91039bc1faa45ba123c4328958e620d382ec7088",
+                "reference": "91039bc1faa45ba123c4328958e620d382ec7088",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11",
+                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12",
                 "ext-json": "*",
                 "php": "^8.0",
                 "ramsey/collection": "^1.2 || ^2.0"
@@ -6266,7 +6389,7 @@
             ],
             "support": {
                 "issues": "https://github.com/ramsey/uuid/issues",
-                "source": "https://github.com/ramsey/uuid/tree/4.7.4"
+                "source": "https://github.com/ramsey/uuid/tree/4.7.6"
             },
             "funding": [
                 {
@@ -6278,34 +6401,38 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-04-15T23:01:58+00:00"
+            "time": "2024-04-27T21:32:50+00:00"
         },
         {
-            "name": "ratchet/rfc6455",
-            "version": "v0.3.1",
+            "name": "resend/resend-php",
+            "version": "v0.13.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/ratchetphp/RFC6455.git",
-                "reference": "7c964514e93456a52a99a20fcfa0de242a43ccdb"
+                "url": "https://github.com/resend/resend-php.git",
+                "reference": "c74926e34472fe3e3e21f150f3e3ce56fcbf8298"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ratchetphp/RFC6455/zipball/7c964514e93456a52a99a20fcfa0de242a43ccdb",
-                "reference": "7c964514e93456a52a99a20fcfa0de242a43ccdb",
+                "url": "https://api.github.com/repos/resend/resend-php/zipball/c74926e34472fe3e3e21f150f3e3ce56fcbf8298",
+                "reference": "c74926e34472fe3e3e21f150f3e3ce56fcbf8298",
                 "shasum": ""
             },
             "require": {
-                "guzzlehttp/psr7": "^2 || ^1.7",
-                "php": ">=5.4.2"
+                "guzzlehttp/guzzle": "^7.5",
+                "php": "^8.1.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7",
-                "react/socket": "^1.3"
+                "friendsofphp/php-cs-fixer": "^3.13",
+                "mockery/mockery": "^1.6",
+                "pestphp/pest": "^2.0"
             },
             "type": "library",
             "autoload": {
+                "files": [
+                    "src/Resend.php"
+                ],
                 "psr-4": {
-                    "Ratchet\\RFC6455\\": "src"
+                    "Resend\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -6314,650 +6441,42 @@
             ],
             "authors": [
                 {
-                    "name": "Chris Boden",
-                    "email": "cboden@gmail.com",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Matt Bonneau",
-                    "role": "Developer"
+                    "name": "Resend and contributors",
+                    "homepage": "https://github.com/resend/resend-php/contributors"
                 }
             ],
-            "description": "RFC6455 WebSocket protocol handler",
-            "homepage": "http://socketo.me",
+            "description": "Resend PHP library.",
+            "homepage": "https://resend.com/",
             "keywords": [
-                "WebSockets",
-                "rfc6455",
-                "websocket"
-            ],
-            "support": {
-                "chat": "https://gitter.im/reactphp/reactphp",
-                "issues": "https://github.com/ratchetphp/RFC6455/issues",
-                "source": "https://github.com/ratchetphp/RFC6455/tree/v0.3.1"
-            },
-            "time": "2021-12-09T23:20:49+00:00"
-        },
-        {
-            "name": "react/cache",
-            "version": "v1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/reactphp/cache.git",
-                "reference": "d47c472b64aa5608225f47965a484b75c7817d5b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/cache/zipball/d47c472b64aa5608225f47965a484b75c7817d5b",
-                "reference": "d47c472b64aa5608225f47965a484b75c7817d5b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0",
-                "react/promise": "^3.0 || ^2.0 || ^1.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "React\\Cache\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Christian Lück",
-                    "email": "christian@clue.engineering",
-                    "homepage": "https://clue.engineering/"
-                },
-                {
-                    "name": "Cees-Jan Kiewiet",
-                    "email": "reactphp@ceesjankiewiet.nl",
-                    "homepage": "https://wyrihaximus.net/"
-                },
-                {
-                    "name": "Jan Sorgalla",
-                    "email": "jsorgalla@gmail.com",
-                    "homepage": "https://sorgalla.com/"
-                },
-                {
-                    "name": "Chris Boden",
-                    "email": "cboden@gmail.com",
-                    "homepage": "https://cboden.dev/"
-                }
-            ],
-            "description": "Async, Promise-based cache interface for ReactPHP",
-            "keywords": [
-                "cache",
-                "caching",
-                "promise",
-                "reactphp"
-            ],
-            "support": {
-                "issues": "https://github.com/reactphp/cache/issues",
-                "source": "https://github.com/reactphp/cache/tree/v1.2.0"
-            },
-            "funding": [
-                {
-                    "url": "https://opencollective.com/reactphp",
-                    "type": "open_collective"
-                }
-            ],
-            "time": "2022-11-30T15:59:55+00:00"
-        },
-        {
-            "name": "react/dns",
-            "version": "v1.11.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/reactphp/dns.git",
-                "reference": "3be0fc8f1eb37d6875cd6f0c6c7d0be81435de9f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/dns/zipball/3be0fc8f1eb37d6875cd6f0c6c7d0be81435de9f",
-                "reference": "3be0fc8f1eb37d6875cd6f0c6c7d0be81435de9f",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0",
-                "react/cache": "^1.0 || ^0.6 || ^0.5",
-                "react/event-loop": "^1.2",
-                "react/promise": "^3.0 || ^2.7 || ^1.2.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.5 || ^4.8.35",
-                "react/async": "^4 || ^3 || ^2",
-                "react/promise-timer": "^1.9"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "React\\Dns\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Christian Lück",
-                    "email": "christian@clue.engineering",
-                    "homepage": "https://clue.engineering/"
-                },
-                {
-                    "name": "Cees-Jan Kiewiet",
-                    "email": "reactphp@ceesjankiewiet.nl",
-                    "homepage": "https://wyrihaximus.net/"
-                },
-                {
-                    "name": "Jan Sorgalla",
-                    "email": "jsorgalla@gmail.com",
-                    "homepage": "https://sorgalla.com/"
-                },
-                {
-                    "name": "Chris Boden",
-                    "email": "cboden@gmail.com",
-                    "homepage": "https://cboden.dev/"
-                }
-            ],
-            "description": "Async DNS resolver for ReactPHP",
-            "keywords": [
-                "async",
-                "dns",
-                "dns-resolver",
-                "reactphp"
-            ],
-            "support": {
-                "issues": "https://github.com/reactphp/dns/issues",
-                "source": "https://github.com/reactphp/dns/tree/v1.11.0"
-            },
-            "funding": [
-                {
-                    "url": "https://opencollective.com/reactphp",
-                    "type": "open_collective"
-                }
-            ],
-            "time": "2023-06-02T12:45:26+00:00"
-        },
-        {
-            "name": "react/event-loop",
-            "version": "v1.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/reactphp/event-loop.git",
-                "reference": "6e7e587714fff7a83dcc7025aee42ab3b265ae05"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/event-loop/zipball/6e7e587714fff7a83dcc7025aee42ab3b265ae05",
-                "reference": "6e7e587714fff7a83dcc7025aee42ab3b265ae05",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
-            },
-            "suggest": {
-                "ext-pcntl": "For signal handling support when using the StreamSelectLoop"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "React\\EventLoop\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Christian Lück",
-                    "email": "christian@clue.engineering",
-                    "homepage": "https://clue.engineering/"
-                },
-                {
-                    "name": "Cees-Jan Kiewiet",
-                    "email": "reactphp@ceesjankiewiet.nl",
-                    "homepage": "https://wyrihaximus.net/"
-                },
-                {
-                    "name": "Jan Sorgalla",
-                    "email": "jsorgalla@gmail.com",
-                    "homepage": "https://sorgalla.com/"
-                },
-                {
-                    "name": "Chris Boden",
-                    "email": "cboden@gmail.com",
-                    "homepage": "https://cboden.dev/"
-                }
-            ],
-            "description": "ReactPHP's core reactor event loop that libraries can use for evented I/O.",
-            "keywords": [
-                "asynchronous",
-                "event-loop"
-            ],
-            "support": {
-                "issues": "https://github.com/reactphp/event-loop/issues",
-                "source": "https://github.com/reactphp/event-loop/tree/v1.4.0"
-            },
-            "funding": [
-                {
-                    "url": "https://opencollective.com/reactphp",
-                    "type": "open_collective"
-                }
-            ],
-            "time": "2023-05-05T10:11:24+00:00"
-        },
-        {
-            "name": "react/http",
-            "version": "v1.9.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/reactphp/http.git",
-                "reference": "bb3154dbaf2dfe3f0467f956a05f614a69d5f1d0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/http/zipball/bb3154dbaf2dfe3f0467f956a05f614a69d5f1d0",
-                "reference": "bb3154dbaf2dfe3f0467f956a05f614a69d5f1d0",
-                "shasum": ""
-            },
-            "require": {
-                "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
-                "fig/http-message-util": "^1.1",
-                "php": ">=5.3.0",
-                "psr/http-message": "^1.0",
-                "react/event-loop": "^1.2",
-                "react/promise": "^3 || ^2.3 || ^1.2.1",
-                "react/socket": "^1.12",
-                "react/stream": "^1.2",
-                "ringcentral/psr7": "^1.2"
-            },
-            "require-dev": {
-                "clue/http-proxy-react": "^1.8",
-                "clue/reactphp-ssh-proxy": "^1.4",
-                "clue/socks-react": "^1.4",
-                "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35",
-                "react/async": "^4 || ^3 || ^2",
-                "react/promise-stream": "^1.4",
-                "react/promise-timer": "^1.9"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "React\\Http\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Christian Lück",
-                    "email": "christian@clue.engineering",
-                    "homepage": "https://clue.engineering/"
-                },
-                {
-                    "name": "Cees-Jan Kiewiet",
-                    "email": "reactphp@ceesjankiewiet.nl",
-                    "homepage": "https://wyrihaximus.net/"
-                },
-                {
-                    "name": "Jan Sorgalla",
-                    "email": "jsorgalla@gmail.com",
-                    "homepage": "https://sorgalla.com/"
-                },
-                {
-                    "name": "Chris Boden",
-                    "email": "cboden@gmail.com",
-                    "homepage": "https://cboden.dev/"
-                }
-            ],
-            "description": "Event-driven, streaming HTTP client and server implementation for ReactPHP",
-            "keywords": [
-                "async",
+                "api",
                 "client",
-                "event-driven",
-                "http",
-                "http client",
-                "http server",
-                "https",
-                "psr-7",
-                "reactphp",
-                "server",
-                "streaming"
+                "php",
+                "resend",
+                "sdk"
             ],
             "support": {
-                "issues": "https://github.com/reactphp/http/issues",
-                "source": "https://github.com/reactphp/http/tree/v1.9.0"
+                "issues": "https://github.com/resend/resend-php/issues",
+                "source": "https://github.com/resend/resend-php/tree/v0.13.0"
             },
-            "funding": [
-                {
-                    "url": "https://opencollective.com/reactphp",
-                    "type": "open_collective"
-                }
-            ],
-            "time": "2023-04-26T10:29:24+00:00"
-        },
-        {
-            "name": "react/promise",
-            "version": "v3.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/reactphp/promise.git",
-                "reference": "c86753c76fd3be465d93b308f18d189f01a22be4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/promise/zipball/c86753c76fd3be465d93b308f18d189f01a22be4",
-                "reference": "c86753c76fd3be465d93b308f18d189f01a22be4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1.0"
-            },
-            "require-dev": {
-                "phpstan/phpstan": "1.10.20 || 1.4.10",
-                "phpunit/phpunit": "^9.5 || ^7.5"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "src/functions_include.php"
-                ],
-                "psr-4": {
-                    "React\\Promise\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jan Sorgalla",
-                    "email": "jsorgalla@gmail.com",
-                    "homepage": "https://sorgalla.com/"
-                },
-                {
-                    "name": "Christian Lück",
-                    "email": "christian@clue.engineering",
-                    "homepage": "https://clue.engineering/"
-                },
-                {
-                    "name": "Cees-Jan Kiewiet",
-                    "email": "reactphp@ceesjankiewiet.nl",
-                    "homepage": "https://wyrihaximus.net/"
-                },
-                {
-                    "name": "Chris Boden",
-                    "email": "cboden@gmail.com",
-                    "homepage": "https://cboden.dev/"
-                }
-            ],
-            "description": "A lightweight implementation of CommonJS Promises/A for PHP",
-            "keywords": [
-                "promise",
-                "promises"
-            ],
-            "support": {
-                "issues": "https://github.com/reactphp/promise/issues",
-                "source": "https://github.com/reactphp/promise/tree/v3.0.0"
-            },
-            "funding": [
-                {
-                    "url": "https://opencollective.com/reactphp",
-                    "type": "open_collective"
-                }
-            ],
-            "time": "2023-07-11T16:12:49+00:00"
-        },
-        {
-            "name": "react/socket",
-            "version": "v1.13.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/reactphp/socket.git",
-                "reference": "cff482bbad5848ecbe8b57da57e4e213b03619aa"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/socket/zipball/cff482bbad5848ecbe8b57da57e4e213b03619aa",
-                "reference": "cff482bbad5848ecbe8b57da57e4e213b03619aa",
-                "shasum": ""
-            },
-            "require": {
-                "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
-                "php": ">=5.3.0",
-                "react/dns": "^1.11",
-                "react/event-loop": "^1.2",
-                "react/promise": "^3 || ^2.6 || ^1.2.1",
-                "react/stream": "^1.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35",
-                "react/async": "^4 || ^3 || ^2",
-                "react/promise-stream": "^1.4",
-                "react/promise-timer": "^1.9"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "React\\Socket\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Christian Lück",
-                    "email": "christian@clue.engineering",
-                    "homepage": "https://clue.engineering/"
-                },
-                {
-                    "name": "Cees-Jan Kiewiet",
-                    "email": "reactphp@ceesjankiewiet.nl",
-                    "homepage": "https://wyrihaximus.net/"
-                },
-                {
-                    "name": "Jan Sorgalla",
-                    "email": "jsorgalla@gmail.com",
-                    "homepage": "https://sorgalla.com/"
-                },
-                {
-                    "name": "Chris Boden",
-                    "email": "cboden@gmail.com",
-                    "homepage": "https://cboden.dev/"
-                }
-            ],
-            "description": "Async, streaming plaintext TCP/IP and secure TLS socket server and client connections for ReactPHP",
-            "keywords": [
-                "Connection",
-                "Socket",
-                "async",
-                "reactphp",
-                "stream"
-            ],
-            "support": {
-                "issues": "https://github.com/reactphp/socket/issues",
-                "source": "https://github.com/reactphp/socket/tree/v1.13.0"
-            },
-            "funding": [
-                {
-                    "url": "https://opencollective.com/reactphp",
-                    "type": "open_collective"
-                }
-            ],
-            "time": "2023-06-07T10:28:34+00:00"
-        },
-        {
-            "name": "react/stream",
-            "version": "v1.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/reactphp/stream.git",
-                "reference": "6fbc9672905c7d5a885f2da2fc696f65840f4a66"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/stream/zipball/6fbc9672905c7d5a885f2da2fc696f65840f4a66",
-                "reference": "6fbc9672905c7d5a885f2da2fc696f65840f4a66",
-                "shasum": ""
-            },
-            "require": {
-                "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
-                "php": ">=5.3.8",
-                "react/event-loop": "^1.2"
-            },
-            "require-dev": {
-                "clue/stream-filter": "~1.2",
-                "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "React\\Stream\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Christian Lück",
-                    "email": "christian@clue.engineering",
-                    "homepage": "https://clue.engineering/"
-                },
-                {
-                    "name": "Cees-Jan Kiewiet",
-                    "email": "reactphp@ceesjankiewiet.nl",
-                    "homepage": "https://wyrihaximus.net/"
-                },
-                {
-                    "name": "Jan Sorgalla",
-                    "email": "jsorgalla@gmail.com",
-                    "homepage": "https://sorgalla.com/"
-                },
-                {
-                    "name": "Chris Boden",
-                    "email": "cboden@gmail.com",
-                    "homepage": "https://cboden.dev/"
-                }
-            ],
-            "description": "Event-driven readable and writable streams for non-blocking I/O in ReactPHP",
-            "keywords": [
-                "event-driven",
-                "io",
-                "non-blocking",
-                "pipe",
-                "reactphp",
-                "readable",
-                "stream",
-                "writable"
-            ],
-            "support": {
-                "issues": "https://github.com/reactphp/stream/issues",
-                "source": "https://github.com/reactphp/stream/tree/v1.3.0"
-            },
-            "funding": [
-                {
-                    "url": "https://opencollective.com/reactphp",
-                    "type": "open_collective"
-                }
-            ],
-            "time": "2023-06-16T10:52:11+00:00"
-        },
-        {
-            "name": "ringcentral/psr7",
-            "version": "1.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/ringcentral/psr7.git",
-                "reference": "360faaec4b563958b673fb52bbe94e37f14bc686"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/ringcentral/psr7/zipball/360faaec4b563958b673fb52bbe94e37f14bc686",
-                "reference": "360faaec4b563958b673fb52bbe94e37f14bc686",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3",
-                "psr/http-message": "~1.0"
-            },
-            "provide": {
-                "psr/http-message-implementation": "1.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "src/functions_include.php"
-                ],
-                "psr-4": {
-                    "RingCentral\\Psr7\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                }
-            ],
-            "description": "PSR-7 message implementation",
-            "keywords": [
-                "http",
-                "message",
-                "stream",
-                "uri"
-            ],
-            "support": {
-                "source": "https://github.com/ringcentral/psr7/tree/master"
-            },
-            "time": "2018-05-29T20:21:04+00:00"
+            "time": "2024-08-15T03:27:29+00:00"
         },
         {
             "name": "spatie/db-dumper",
-            "version": "3.4.0",
+            "version": "3.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/db-dumper.git",
-                "reference": "bbd5ae0f331d47e6534eb307e256c11a65c8e24a"
+                "reference": "55d4d6710e1ab18c1e7ce2b22b8ad4bea2a30016"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/db-dumper/zipball/bbd5ae0f331d47e6534eb307e256c11a65c8e24a",
-                "reference": "bbd5ae0f331d47e6534eb307e256c11a65c8e24a",
+                "url": "https://api.github.com/repos/spatie/db-dumper/zipball/55d4d6710e1ab18c1e7ce2b22b8ad4bea2a30016",
+                "reference": "55d4d6710e1ab18c1e7ce2b22b8ad4bea2a30016",
                 "shasum": ""
             },
             "require": {
                 "php": "^8.0",
-                "symfony/process": "^5.0|^6.0"
+                "symfony/process": "^5.0|^6.0|^7.0"
             },
             "require-dev": {
                 "pestphp/pest": "^1.22"
@@ -6990,7 +6509,7 @@
                 "spatie"
             ],
             "support": {
-                "source": "https://github.com/spatie/db-dumper/tree/3.4.0"
+                "source": "https://github.com/spatie/db-dumper/tree/3.7.1"
             },
             "funding": [
                 {
@@ -7002,32 +6521,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-06-27T08:34:52+00:00"
+            "time": "2024-11-18T14:54:31+00:00"
         },
         {
             "name": "spatie/image-optimizer",
-            "version": "1.6.4",
+            "version": "1.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/image-optimizer.git",
-                "reference": "d997e01ba980b2769ddca2f00badd3b80c2a2512"
+                "reference": "4fd22035e81d98fffced65a8c20d9ec4daa9671c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/image-optimizer/zipball/d997e01ba980b2769ddca2f00badd3b80c2a2512",
-                "reference": "d997e01ba980b2769ddca2f00badd3b80c2a2512",
+                "url": "https://api.github.com/repos/spatie/image-optimizer/zipball/4fd22035e81d98fffced65a8c20d9ec4daa9671c",
+                "reference": "4fd22035e81d98fffced65a8c20d9ec4daa9671c",
                 "shasum": ""
             },
             "require": {
                 "ext-fileinfo": "*",
                 "php": "^7.3|^8.0",
                 "psr/log": "^1.0 | ^2.0 | ^3.0",
-                "symfony/process": "^4.2|^5.0|^6.0"
+                "symfony/process": "^4.2|^5.0|^6.0|^7.0"
             },
             "require-dev": {
                 "pestphp/pest": "^1.21",
                 "phpunit/phpunit": "^8.5.21|^9.4.4",
-                "symfony/var-dumper": "^4.2|^5.0|^6.0"
+                "symfony/var-dumper": "^4.2|^5.0|^6.0|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -7055,50 +6574,50 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/image-optimizer/issues",
-                "source": "https://github.com/spatie/image-optimizer/tree/1.6.4"
+                "source": "https://github.com/spatie/image-optimizer/tree/1.8.0"
             },
-            "time": "2023-03-10T08:43:19+00:00"
+            "time": "2024-11-04T08:24:54+00:00"
         },
         {
             "name": "spatie/laravel-backup",
-            "version": "8.1.11",
+            "version": "8.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-backup.git",
-                "reference": "e4f5c3f6783d40a219a02bc99dc4171ecdd6d20c"
+                "reference": "5b672713283703a74c629ccd67b1d77eb57e24b9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/e4f5c3f6783d40a219a02bc99dc4171ecdd6d20c",
-                "reference": "e4f5c3f6783d40a219a02bc99dc4171ecdd6d20c",
+                "url": "https://api.github.com/repos/spatie/laravel-backup/zipball/5b672713283703a74c629ccd67b1d77eb57e24b9",
+                "reference": "5b672713283703a74c629ccd67b1d77eb57e24b9",
                 "shasum": ""
             },
             "require": {
                 "ext-zip": "^1.14.0",
-                "illuminate/console": "^9.0|^10.0",
-                "illuminate/contracts": "^9.0|^10.0",
-                "illuminate/events": "^9.0|^10.0",
-                "illuminate/filesystem": "^9.0|^10.0",
-                "illuminate/notifications": "^9.0|^10.0",
-                "illuminate/support": "^9.0|^10.0",
+                "illuminate/console": "^10.10.0|^11.0",
+                "illuminate/contracts": "^10.10.0|^11.0",
+                "illuminate/events": "^10.10.0|^11.0",
+                "illuminate/filesystem": "^10.10.0|^11.0",
+                "illuminate/notifications": "^10.10.0|^11.0",
+                "illuminate/support": "^10.10.0|^11.0",
                 "league/flysystem": "^3.0",
-                "php": "^8.0",
+                "php": "^8.1",
                 "spatie/db-dumper": "^3.0",
                 "spatie/laravel-package-tools": "^1.6.2",
-                "spatie/laravel-signal-aware-command": "^1.2",
+                "spatie/laravel-signal-aware-command": "^1.2|^2.0",
                 "spatie/temporary-directory": "^2.0",
-                "symfony/console": "^6.0",
-                "symfony/finder": "^6.0"
+                "symfony/console": "^6.0|^7.0",
+                "symfony/finder": "^6.0|^7.0"
             },
             "require-dev": {
                 "composer-runtime-api": "^2.0",
                 "ext-pcntl": "*",
-                "laravel/slack-notification-channel": "^2.5",
+                "larastan/larastan": "^2.7.0",
+                "laravel/slack-notification-channel": "^2.5|^3.0",
                 "league/flysystem-aws-s3-v3": "^2.0|^3.0",
                 "mockery/mockery": "^1.4",
-                "nunomaduro/larastan": "^2.1",
-                "orchestra/testbench": "^7.0|^8.0",
-                "pestphp/pest": "^1.20",
+                "orchestra/testbench": "^8.0|^9.0",
+                "pestphp/pest": "^1.20|^2.0",
                 "phpstan/extension-installer": "^1.1",
                 "phpstan/phpstan-deprecation-rules": "^1.0",
                 "phpstan/phpstan-phpunit": "^1.1"
@@ -7144,7 +6663,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/laravel-backup/issues",
-                "source": "https://github.com/spatie/laravel-backup/tree/8.1.11"
+                "source": "https://github.com/spatie/laravel-backup/tree/8.8.2"
             },
             "funding": [
                 {
@@ -7156,30 +6675,30 @@
                     "type": "other"
                 }
             ],
-            "time": "2023-06-02T08:56:10+00:00"
+            "time": "2024-08-07T11:07:52+00:00"
         },
         {
             "name": "spatie/laravel-image-optimizer",
-            "version": "1.7.1",
+            "version": "1.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-image-optimizer.git",
-                "reference": "cd8945e47b9fd01bc7b770eecd57c56f46c47422"
+                "reference": "024752cba691fee3cd1800000b6aa3da3b8b2474"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-image-optimizer/zipball/cd8945e47b9fd01bc7b770eecd57c56f46c47422",
-                "reference": "cd8945e47b9fd01bc7b770eecd57c56f46c47422",
+                "url": "https://api.github.com/repos/spatie/laravel-image-optimizer/zipball/024752cba691fee3cd1800000b6aa3da3b8b2474",
+                "reference": "024752cba691fee3cd1800000b6aa3da3b8b2474",
                 "shasum": ""
             },
             "require": {
-                "laravel/framework": "^8.0|^9.0|^10.0",
+                "laravel/framework": "^8.0|^9.0|^10.0|^11.0",
                 "php": "^8.0",
                 "spatie/image-optimizer": "^1.2.0"
             },
             "require-dev": {
-                "orchestra/testbench": "^6.23|^7.0|^8.0",
-                "phpunit/phpunit": "^9.4"
+                "orchestra/testbench": "^6.23|^7.0|^8.0|^9.0",
+                "phpunit/phpunit": "^9.4|^10.5"
             },
             "type": "library",
             "extra": {
@@ -7216,7 +6735,7 @@
                 "spatie"
             ],
             "support": {
-                "source": "https://github.com/spatie/laravel-image-optimizer/tree/1.7.1"
+                "source": "https://github.com/spatie/laravel-image-optimizer/tree/1.8.0"
             },
             "funding": [
                 {
@@ -7224,32 +6743,32 @@
                     "type": "custom"
                 }
             ],
-            "time": "2023-01-24T23:44:33+00:00"
+            "time": "2024-02-29T10:55:08+00:00"
         },
         {
             "name": "spatie/laravel-package-tools",
-            "version": "1.15.0",
+            "version": "1.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-package-tools.git",
-                "reference": "efab1844b8826443135201c4443690f032c3d533"
+                "reference": "9ab30fd24f677e5aa370ea4cf6b41c517d16cf85"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/efab1844b8826443135201c4443690f032c3d533",
-                "reference": "efab1844b8826443135201c4443690f032c3d533",
+                "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/9ab30fd24f677e5aa370ea4cf6b41c517d16cf85",
+                "reference": "9ab30fd24f677e5aa370ea4cf6b41c517d16cf85",
                 "shasum": ""
             },
             "require": {
-                "illuminate/contracts": "^9.28|^10.0",
+                "illuminate/contracts": "^9.28|^10.0|^11.0",
                 "php": "^8.0"
             },
             "require-dev": {
                 "mockery/mockery": "^1.5",
-                "orchestra/testbench": "^7.7|^8.0",
-                "pestphp/pest": "^1.22",
-                "phpunit/phpunit": "^9.5.24",
-                "spatie/pest-plugin-test-time": "^1.1"
+                "orchestra/testbench": "^7.7|^8.0|^9.0",
+                "pestphp/pest": "^1.22|^2",
+                "phpunit/phpunit": "^9.5.24|^10.5",
+                "spatie/pest-plugin-test-time": "^1.1|^2.2"
             },
             "type": "library",
             "autoload": {
@@ -7276,7 +6795,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/laravel-package-tools/issues",
-                "source": "https://github.com/spatie/laravel-package-tools/tree/1.15.0"
+                "source": "https://github.com/spatie/laravel-package-tools/tree/1.17.0"
             },
             "funding": [
                 {
@@ -7284,45 +6803,46 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-04-27T08:09:01+00:00"
+            "time": "2024-12-09T16:29:14+00:00"
         },
         {
             "name": "spatie/laravel-signal-aware-command",
-            "version": "1.3.0",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-signal-aware-command.git",
-                "reference": "46cda09a85aef3fd47fb73ddc7081f963e255571"
+                "reference": "49a5e671c3a3fd992187a777d01385fc6a84759d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-signal-aware-command/zipball/46cda09a85aef3fd47fb73ddc7081f963e255571",
-                "reference": "46cda09a85aef3fd47fb73ddc7081f963e255571",
+                "url": "https://api.github.com/repos/spatie/laravel-signal-aware-command/zipball/49a5e671c3a3fd992187a777d01385fc6a84759d",
+                "reference": "49a5e671c3a3fd992187a777d01385fc6a84759d",
                 "shasum": ""
             },
             "require": {
-                "illuminate/contracts": "^8.35|^9.0|^10.0",
-                "php": "^8.0",
-                "spatie/laravel-package-tools": "^1.4.3"
+                "illuminate/contracts": "^11.0",
+                "php": "^8.2",
+                "spatie/laravel-package-tools": "^1.4.3",
+                "symfony/console": "^7.0"
             },
             "require-dev": {
-                "brianium/paratest": "^6.2",
+                "brianium/paratest": "^6.2|^7.0",
                 "ext-pcntl": "*",
-                "nunomaduro/collision": "^5.3|^6.0",
-                "orchestra/testbench": "^6.16|^7.0|^8.0",
-                "pestphp/pest-plugin-laravel": "^1.3",
-                "phpunit/phpunit": "^9.5",
+                "nunomaduro/collision": "^5.3|^6.0|^7.0|^8.0",
+                "orchestra/testbench": "^9.0",
+                "pestphp/pest-plugin-laravel": "^1.3|^2.0",
+                "phpunit/phpunit": "^9.5|^10|^11",
                 "spatie/laravel-ray": "^1.17"
             },
             "type": "library",
             "extra": {
                 "laravel": {
-                    "providers": [
-                        "Spatie\\SignalAwareCommand\\SignalAwareCommandServiceProvider"
-                    ],
                     "aliases": {
                         "Signal": "Spatie\\SignalAwareCommand\\Facades\\Signal"
-                    }
+                    },
+                    "providers": [
+                        "Spatie\\SignalAwareCommand\\SignalAwareCommandServiceProvider"
+                    ]
                 }
             },
             "autoload": {
@@ -7350,7 +6870,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/laravel-signal-aware-command/issues",
-                "source": "https://github.com/spatie/laravel-signal-aware-command/tree/1.3.0"
+                "source": "https://github.com/spatie/laravel-signal-aware-command/tree/2.0.0"
             },
             "funding": [
                 {
@@ -7358,20 +6878,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-01-14T21:10:59+00:00"
+            "time": "2024-02-05T13:37:25+00:00"
         },
         {
             "name": "spatie/temporary-directory",
-            "version": "2.1.2",
+            "version": "2.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/temporary-directory.git",
-                "reference": "0c804873f6b4042aa8836839dca683c7d0f71831"
+                "reference": "76949fa18f8e1a7f663fd2eaa1d00e0bcea0752a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/temporary-directory/zipball/0c804873f6b4042aa8836839dca683c7d0f71831",
-                "reference": "0c804873f6b4042aa8836839dca683c7d0f71831",
+                "url": "https://api.github.com/repos/spatie/temporary-directory/zipball/76949fa18f8e1a7f663fd2eaa1d00e0bcea0752a",
+                "reference": "76949fa18f8e1a7f663fd2eaa1d00e0bcea0752a",
                 "shasum": ""
             },
             "require": {
@@ -7407,7 +6927,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/temporary-directory/issues",
-                "source": "https://github.com/spatie/temporary-directory/tree/2.1.2"
+                "source": "https://github.com/spatie/temporary-directory/tree/2.2.1"
             },
             "funding": [
                 {
@@ -7419,31 +6939,96 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-04-28T07:47:42+00:00"
+            "time": "2023-12-25T11:46:58+00:00"
         },
         {
-            "name": "stevebauman/purify",
-            "version": "v6.0.1",
+            "name": "spomky-labs/base64url",
+            "version": "v2.0.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/stevebauman/purify.git",
-                "reference": "7b63762b05db9eadc36d7e8b74cf58fa64bfa527"
+                "url": "https://github.com/Spomky-Labs/base64url.git",
+                "reference": "7752ce931ec285da4ed1f4c5aa27e45e097be61d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/stevebauman/purify/zipball/7b63762b05db9eadc36d7e8b74cf58fa64bfa527",
-                "reference": "7b63762b05db9eadc36d7e8b74cf58fa64bfa527",
+                "url": "https://api.github.com/repos/Spomky-Labs/base64url/zipball/7752ce931ec285da4ed1f4c5aa27e45e097be61d",
+                "reference": "7752ce931ec285da4ed1f4c5aa27e45e097be61d",
                 "shasum": ""
             },
             "require": {
-                "ezyang/htmlpurifier": "^4.9.0",
-                "illuminate/contracts": "~7.0|~8.0|~9.0|~10.0",
-                "illuminate/support": "~7.0|~8.0|~9.0|~10.0",
+                "php": ">=7.1"
+            },
+            "require-dev": {
+                "phpstan/extension-installer": "^1.0",
+                "phpstan/phpstan": "^0.11|^0.12",
+                "phpstan/phpstan-beberlei-assert": "^0.11|^0.12",
+                "phpstan/phpstan-deprecation-rules": "^0.11|^0.12",
+                "phpstan/phpstan-phpunit": "^0.11|^0.12",
+                "phpstan/phpstan-strict-rules": "^0.11|^0.12"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Base64Url\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Florent Morselli",
+                    "homepage": "https://github.com/Spomky-Labs/base64url/contributors"
+                }
+            ],
+            "description": "Base 64 URL Safe Encoding/Decoding PHP Library",
+            "homepage": "https://github.com/Spomky-Labs/base64url",
+            "keywords": [
+                "base64",
+                "rfc4648",
+                "safe",
+                "url"
+            ],
+            "support": {
+                "issues": "https://github.com/Spomky-Labs/base64url/issues",
+                "source": "https://github.com/Spomky-Labs/base64url/tree/v2.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/Spomky",
+                    "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/FlorentMorselli",
+                    "type": "patreon"
+                }
+            ],
+            "time": "2020-11-03T09:10:25+00:00"
+        },
+        {
+            "name": "stevebauman/purify",
+            "version": "v6.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/stevebauman/purify.git",
+                "reference": "a449299a3d5f5f8ef177e626721b3f69143890a4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/stevebauman/purify/zipball/a449299a3d5f5f8ef177e626721b3f69143890a4",
+                "reference": "a449299a3d5f5f8ef177e626721b3f69143890a4",
+                "shasum": ""
+            },
+            "require": {
+                "ezyang/htmlpurifier": "^4.17",
+                "illuminate/contracts": "^7.0|^8.0|^9.0|^10.0|^11.0",
+                "illuminate/support": "^7.0|^8.0|^9.0|^10.0|^11.0",
                 "php": ">=7.4"
             },
             "require-dev": {
-                "orchestra/testbench": "~5.0|~6.0|~7.0",
-                "phpunit/phpunit": "~8.0|~9.0"
+                "orchestra/testbench": "^5.0|^6.0|^7.0|^8.0|^9.0",
+                "phpunit/phpunit": "^8.0|^9.0|^10.0"
             },
             "type": "library",
             "extra": {
@@ -7483,37 +7068,38 @@
             ],
             "support": {
                 "issues": "https://github.com/stevebauman/purify/issues",
-                "source": "https://github.com/stevebauman/purify/tree/v6.0.1"
+                "source": "https://github.com/stevebauman/purify/tree/v6.2.2"
             },
-            "time": "2023-04-06T21:16:20+00:00"
+            "time": "2024-09-24T12:27:10+00:00"
         },
         {
             "name": "symfony/cache",
-            "version": "v6.3.1",
+            "version": "v7.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache.git",
-                "reference": "52cff7608ef6e38376ac11bd1fbb0a220107f066"
+                "reference": "e7e983596b744c4539f31e79b0350a6cf5878a20"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache/zipball/52cff7608ef6e38376ac11bd1fbb0a220107f066",
-                "reference": "52cff7608ef6e38376ac11bd1fbb0a220107f066",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/e7e983596b744c4539f31e79b0350a6cf5878a20",
+                "reference": "e7e983596b744c4539f31e79b0350a6cf5878a20",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "psr/cache": "^2.0|^3.0",
                 "psr/log": "^1.1|^2|^3",
                 "symfony/cache-contracts": "^2.5|^3",
+                "symfony/deprecation-contracts": "^2.5|^3.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/var-exporter": "^6.2.10"
+                "symfony/var-exporter": "^6.4|^7.0"
             },
             "conflict": {
-                "doctrine/dbal": "<2.13.1",
-                "symfony/dependency-injection": "<5.4",
-                "symfony/http-kernel": "<5.4",
-                "symfony/var-dumper": "<5.4"
+                "doctrine/dbal": "<3.6",
+                "symfony/dependency-injection": "<6.4",
+                "symfony/http-kernel": "<6.4",
+                "symfony/var-dumper": "<6.4"
             },
             "provide": {
                 "psr/cache-implementation": "2.0|3.0",
@@ -7522,15 +7108,16 @@
             },
             "require-dev": {
                 "cache/integration-tests": "dev-master",
-                "doctrine/dbal": "^2.13.1|^3.0",
+                "doctrine/dbal": "^3.6|^4",
                 "predis/predis": "^1.1|^2.0",
                 "psr/simple-cache": "^1.0|^2.0|^3.0",
-                "symfony/config": "^5.4|^6.0",
-                "symfony/dependency-injection": "^5.4|^6.0",
-                "symfony/filesystem": "^5.4|^6.0",
-                "symfony/http-kernel": "^5.4|^6.0",
-                "symfony/messenger": "^5.4|^6.0",
-                "symfony/var-dumper": "^5.4|^6.0"
+                "symfony/clock": "^6.4|^7.0",
+                "symfony/config": "^6.4|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/filesystem": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/messenger": "^6.4|^7.0",
+                "symfony/var-dumper": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -7565,7 +7152,7 @@
                 "psr6"
             ],
             "support": {
-                "source": "https://github.com/symfony/cache/tree/v6.3.1"
+                "source": "https://github.com/symfony/cache/tree/v7.2.1"
             },
             "funding": [
                 {
@@ -7581,20 +7168,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-06-24T11:51:27+00:00"
+            "time": "2024-12-07T08:08:50+00:00"
         },
         {
             "name": "symfony/cache-contracts",
-            "version": "v3.3.0",
+            "version": "v3.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache-contracts.git",
-                "reference": "ad945640ccc0ae6e208bcea7d7de4b39b569896b"
+                "reference": "15a4f8e5cd3bce9aeafc882b1acab39ec8de2c1b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/ad945640ccc0ae6e208bcea7d7de4b39b569896b",
-                "reference": "ad945640ccc0ae6e208bcea7d7de4b39b569896b",
+                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/15a4f8e5cd3bce9aeafc882b1acab39ec8de2c1b",
+                "reference": "15a4f8e5cd3bce9aeafc882b1acab39ec8de2c1b",
                 "shasum": ""
             },
             "require": {
@@ -7604,7 +7191,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.4-dev"
+                    "dev-main": "3.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -7641,7 +7228,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/cache-contracts/tree/v3.3.0"
+                "source": "https://github.com/symfony/cache-contracts/tree/v3.5.1"
             },
             "funding": [
                 {
@@ -7657,47 +7244,124 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-23T14:45:45+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
-            "name": "symfony/console",
-            "version": "v6.3.0",
+            "name": "symfony/clock",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/console.git",
-                "reference": "8788808b07cf0bdd6e4b7fdd23d8ddb1470c83b7"
+                "url": "https://github.com/symfony/clock.git",
+                "reference": "b81435fbd6648ea425d1ee96a2d8e68f4ceacd24"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/8788808b07cf0bdd6e4b7fdd23d8ddb1470c83b7",
-                "reference": "8788808b07cf0bdd6e4b7fdd23d8ddb1470c83b7",
+                "url": "https://api.github.com/repos/symfony/clock/zipball/b81435fbd6648ea425d1ee96a2d8e68f4ceacd24",
+                "reference": "b81435fbd6648ea425d1ee96a2d8e68f4ceacd24",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.5|^3",
+                "php": ">=8.2",
+                "psr/clock": "^1.0",
+                "symfony/polyfill-php83": "^1.28"
+            },
+            "provide": {
+                "psr/clock-implementation": "1.0"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "Resources/now.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Component\\Clock\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Decouples applications from the system clock",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "clock",
+                "psr20",
+                "time"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/clock/tree/v7.2.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-25T14:21:43+00:00"
+        },
+        {
+            "name": "symfony/console",
+            "version": "v7.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/console.git",
+                "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
+                "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/string": "^5.4|^6.0"
+                "symfony/string": "^6.4|^7.0"
             },
             "conflict": {
-                "symfony/dependency-injection": "<5.4",
-                "symfony/dotenv": "<5.4",
-                "symfony/event-dispatcher": "<5.4",
-                "symfony/lock": "<5.4",
-                "symfony/process": "<5.4"
+                "symfony/dependency-injection": "<6.4",
+                "symfony/dotenv": "<6.4",
+                "symfony/event-dispatcher": "<6.4",
+                "symfony/lock": "<6.4",
+                "symfony/process": "<6.4"
             },
             "provide": {
                 "psr/log-implementation": "1.0|2.0|3.0"
             },
             "require-dev": {
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0",
-                "symfony/dependency-injection": "^5.4|^6.0",
-                "symfony/event-dispatcher": "^5.4|^6.0",
-                "symfony/lock": "^5.4|^6.0",
-                "symfony/process": "^5.4|^6.0",
-                "symfony/var-dumper": "^5.4|^6.0"
+                "symfony/config": "^6.4|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/event-dispatcher": "^6.4|^7.0",
+                "symfony/http-foundation": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/lock": "^6.4|^7.0",
+                "symfony/messenger": "^6.4|^7.0",
+                "symfony/process": "^6.4|^7.0",
+                "symfony/stopwatch": "^6.4|^7.0",
+                "symfony/var-dumper": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -7731,7 +7395,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.3.0"
+                "source": "https://github.com/symfony/console/tree/v7.2.1"
             },
             "funding": [
                 {
@@ -7747,24 +7411,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-29T12:49:39+00:00"
+            "time": "2024-12-11T03:49:26+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v6.3.0",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "88453e64cd86c5b60e8d2fb2c6f953bbc353ffbf"
+                "reference": "601a5ce9aaad7bf10797e3663faefce9e26c24e2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/88453e64cd86c5b60e8d2fb2c6f953bbc353ffbf",
-                "reference": "88453e64cd86c5b60e8d2fb2c6f953bbc353ffbf",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/601a5ce9aaad7bf10797e3663faefce9e26c24e2",
+                "reference": "601a5ce9aaad7bf10797e3663faefce9e26c24e2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "type": "library",
             "autoload": {
@@ -7796,7 +7460,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v6.3.0"
+                "source": "https://github.com/symfony/css-selector/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -7812,20 +7476,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-20T16:43:42+00:00"
+            "time": "2024-09-25T14:21:43+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.3.0",
+            "version": "v3.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf"
+                "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf",
-                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
+                "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6",
                 "shasum": ""
             },
             "require": {
@@ -7834,7 +7498,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.4-dev"
+                    "dev-main": "3.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -7863,7 +7527,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.1"
             },
             "funding": [
                 {
@@ -7879,34 +7543,35 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-23T14:45:45+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/error-handler",
-            "version": "v6.3.0",
+            "version": "v7.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "99d2d814a6351461af350ead4d963bd67451236f"
+                "reference": "6150b89186573046167796fa5f3f76601d5145f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/99d2d814a6351461af350ead4d963bd67451236f",
-                "reference": "99d2d814a6351461af350ead4d963bd67451236f",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/6150b89186573046167796fa5f3f76601d5145f8",
+                "reference": "6150b89186573046167796fa5f3f76601d5145f8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "psr/log": "^1|^2|^3",
-                "symfony/var-dumper": "^5.4|^6.0"
+                "symfony/var-dumper": "^6.4|^7.0"
             },
             "conflict": {
-                "symfony/deprecation-contracts": "<2.5"
+                "symfony/deprecation-contracts": "<2.5",
+                "symfony/http-kernel": "<6.4"
             },
             "require-dev": {
                 "symfony/deprecation-contracts": "^2.5|^3",
-                "symfony/http-kernel": "^5.4|^6.0",
-                "symfony/serializer": "^5.4|^6.0"
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/serializer": "^6.4|^7.0"
             },
             "bin": [
                 "Resources/bin/patch-type-declarations"
@@ -7937,7 +7602,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v6.3.0"
+                "source": "https://github.com/symfony/error-handler/tree/v7.2.1"
             },
             "funding": [
                 {
@@ -7953,28 +7618,28 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-10T12:03:13+00:00"
+            "time": "2024-12-07T08:50:44+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v6.3.0",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "3af8ac1a3f98f6dbc55e10ae59c9e44bfc38dfaa"
+                "reference": "910c5db85a5356d0fea57680defec4e99eb9c8c1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/3af8ac1a3f98f6dbc55e10ae59c9e44bfc38dfaa",
-                "reference": "3af8ac1a3f98f6dbc55e10ae59c9e44bfc38dfaa",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/910c5db85a5356d0fea57680defec4e99eb9c8c1",
+                "reference": "910c5db85a5356d0fea57680defec4e99eb9c8c1",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/event-dispatcher-contracts": "^2.5|^3"
             },
             "conflict": {
-                "symfony/dependency-injection": "<5.4",
+                "symfony/dependency-injection": "<6.4",
                 "symfony/service-contracts": "<2.5"
             },
             "provide": {
@@ -7983,13 +7648,13 @@
             },
             "require-dev": {
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0",
-                "symfony/dependency-injection": "^5.4|^6.0",
-                "symfony/error-handler": "^5.4|^6.0",
-                "symfony/expression-language": "^5.4|^6.0",
-                "symfony/http-foundation": "^5.4|^6.0",
+                "symfony/config": "^6.4|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/error-handler": "^6.4|^7.0",
+                "symfony/expression-language": "^6.4|^7.0",
+                "symfony/http-foundation": "^6.4|^7.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/stopwatch": "^5.4|^6.0"
+                "symfony/stopwatch": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -8017,7 +7682,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v6.3.0"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -8033,20 +7698,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-04-21T14:41:17+00:00"
+            "time": "2024-09-25T14:21:43+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.3.0",
+            "version": "v3.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df"
+                "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/a76aed96a42d2b521153fb382d418e30d18b59df",
-                "reference": "a76aed96a42d2b521153fb382d418e30d18b59df",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7642f5e970b672283b7823222ae8ef8bbc160b9f",
+                "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f",
                 "shasum": ""
             },
             "require": {
@@ -8056,7 +7721,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.4-dev"
+                    "dev-main": "3.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -8093,7 +7758,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.3.0"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.1"
             },
             "funding": [
                 {
@@ -8109,27 +7774,27 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-23T14:45:45+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v6.3.0",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "d9b01ba073c44cef617c7907ce2419f8d00d75e2"
+                "reference": "6de263e5868b9a137602dd1e33e4d48bfae99c49"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/d9b01ba073c44cef617c7907ce2419f8d00d75e2",
-                "reference": "d9b01ba073c44cef617c7907ce2419f8d00d75e2",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/6de263e5868b9a137602dd1e33e4d48bfae99c49",
+                "reference": "6de263e5868b9a137602dd1e33e4d48bfae99c49",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "symfony/filesystem": "^6.0"
+                "symfony/filesystem": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -8157,7 +7822,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v6.3.0"
+                "source": "https://github.com/symfony/finder/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -8173,27 +7838,27 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-04-02T01:25:41+00:00"
+            "time": "2024-10-23T06:56:12+00:00"
         },
         {
             "name": "symfony/http-client",
-            "version": "v6.3.1",
+            "version": "v6.4.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client.git",
-                "reference": "1c828a06aef2f5eeba42026dfc532d4fc5406123"
+                "reference": "60a113666fa67e598abace38e5f46a0954d8833d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client/zipball/1c828a06aef2f5eeba42026dfc532d4fc5406123",
-                "reference": "1c828a06aef2f5eeba42026dfc532d4fc5406123",
+                "url": "https://api.github.com/repos/symfony/http-client/zipball/60a113666fa67e598abace38e5f46a0954d8833d",
+                "reference": "60a113666fa67e598abace38e5f46a0954d8833d",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
                 "psr/log": "^1|^2|^3",
                 "symfony/deprecation-contracts": "^2.5|^3",
-                "symfony/http-client-contracts": "^3",
+                "symfony/http-client-contracts": "~3.4.3|^3.5.1",
                 "symfony/service-contracts": "^2.5|^3"
             },
             "conflict": {
@@ -8211,14 +7876,15 @@
                 "amphp/http-client": "^4.2.1",
                 "amphp/http-tunnel": "^1.0",
                 "amphp/socket": "^1.1",
-                "guzzlehttp/promises": "^1.4",
+                "guzzlehttp/promises": "^1.4|^2.0",
                 "nyholm/psr7": "^1.0",
                 "php-http/httplug": "^1.0|^2.0",
                 "psr/http-client": "^1.0",
-                "symfony/dependency-injection": "^5.4|^6.0",
-                "symfony/http-kernel": "^5.4|^6.0",
-                "symfony/process": "^5.4|^6.0",
-                "symfony/stopwatch": "^5.4|^6.0"
+                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/http-kernel": "^5.4|^6.0|^7.0",
+                "symfony/messenger": "^5.4|^6.0|^7.0",
+                "symfony/process": "^5.4|^6.0|^7.0",
+                "symfony/stopwatch": "^5.4|^6.0|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -8249,7 +7915,7 @@
                 "http"
             ],
             "support": {
-                "source": "https://github.com/symfony/http-client/tree/v6.3.1"
+                "source": "https://github.com/symfony/http-client/tree/v6.4.16"
             },
             "funding": [
                 {
@@ -8265,20 +7931,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-06-24T11:51:27+00:00"
+            "time": "2024-11-27T11:52:33+00:00"
         },
         {
             "name": "symfony/http-client-contracts",
-            "version": "v3.3.0",
+            "version": "v3.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client-contracts.git",
-                "reference": "3b66325d0176b4ec826bffab57c9037d759c31fb"
+                "reference": "ee8d807ab20fcb51267fdace50fbe3494c31e645"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/3b66325d0176b4ec826bffab57c9037d759c31fb",
-                "reference": "3b66325d0176b4ec826bffab57c9037d759c31fb",
+                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/ee8d807ab20fcb51267fdace50fbe3494c31e645",
+                "reference": "ee8d807ab20fcb51267fdace50fbe3494c31e645",
                 "shasum": ""
             },
             "require": {
@@ -8286,12 +7952,12 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "3.4-dev"
-                },
                 "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
+                "branch-alias": {
+                    "dev-main": "3.5-dev"
                 }
             },
             "autoload": {
@@ -8327,7 +7993,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/http-client-contracts/tree/v3.3.0"
+                "source": "https://github.com/symfony/http-client-contracts/tree/v3.5.2"
             },
             "funding": [
                 {
@@ -8343,40 +8009,41 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-23T14:45:45+00:00"
+            "time": "2024-12-07T08:49:48+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v6.3.1",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "e0ad0d153e1c20069250986cd9e9dd1ccebb0d66"
+                "reference": "e88a66c3997859532bc2ddd6dd8f35aba2711744"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e0ad0d153e1c20069250986cd9e9dd1ccebb0d66",
-                "reference": "e0ad0d153e1c20069250986cd9e9dd1ccebb0d66",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e88a66c3997859532bc2ddd6dd8f35aba2711744",
+                "reference": "e88a66c3997859532bc2ddd6dd8f35aba2711744",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.5|^3",
+                "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3.0",
                 "symfony/polyfill-mbstring": "~1.1",
                 "symfony/polyfill-php83": "^1.27"
             },
             "conflict": {
-                "symfony/cache": "<6.2"
+                "doctrine/dbal": "<3.6",
+                "symfony/cache": "<6.4.12|>=7.0,<7.1.5"
             },
             "require-dev": {
-                "doctrine/dbal": "^2.13.1|^3.0",
+                "doctrine/dbal": "^3.6|^4",
                 "predis/predis": "^1.1|^2.0",
-                "symfony/cache": "^5.4|^6.0",
-                "symfony/dependency-injection": "^5.4|^6.0",
-                "symfony/expression-language": "^5.4|^6.0",
-                "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4",
-                "symfony/mime": "^5.4|^6.0",
-                "symfony/rate-limiter": "^5.2|^6.0"
+                "symfony/cache": "^6.4.12|^7.1.5",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/expression-language": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/mime": "^6.4|^7.0",
+                "symfony/rate-limiter": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -8404,7 +8071,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v6.3.1"
+                "source": "https://github.com/symfony/http-foundation/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -8420,76 +8087,77 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-06-24T11:51:27+00:00"
+            "time": "2024-11-13T18:58:46+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v6.3.1",
+            "version": "v7.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "161e16fd2e35fb4881a43bc8b383dfd5be4ac374"
+                "reference": "d8ae58eecae44c8e66833e76cc50a4ad3c002d97"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/161e16fd2e35fb4881a43bc8b383dfd5be4ac374",
-                "reference": "161e16fd2e35fb4881a43bc8b383dfd5be4ac374",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/d8ae58eecae44c8e66833e76cc50a4ad3c002d97",
+                "reference": "d8ae58eecae44c8e66833e76cc50a4ad3c002d97",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "psr/log": "^1|^2|^3",
                 "symfony/deprecation-contracts": "^2.5|^3",
-                "symfony/error-handler": "^6.3",
-                "symfony/event-dispatcher": "^5.4|^6.0",
-                "symfony/http-foundation": "^6.2.7",
+                "symfony/error-handler": "^6.4|^7.0",
+                "symfony/event-dispatcher": "^6.4|^7.0",
+                "symfony/http-foundation": "^6.4|^7.0",
                 "symfony/polyfill-ctype": "^1.8"
             },
             "conflict": {
-                "symfony/browser-kit": "<5.4",
-                "symfony/cache": "<5.4",
-                "symfony/config": "<6.1",
-                "symfony/console": "<5.4",
-                "symfony/dependency-injection": "<6.3",
-                "symfony/doctrine-bridge": "<5.4",
-                "symfony/form": "<5.4",
-                "symfony/http-client": "<5.4",
+                "symfony/browser-kit": "<6.4",
+                "symfony/cache": "<6.4",
+                "symfony/config": "<6.4",
+                "symfony/console": "<6.4",
+                "symfony/dependency-injection": "<6.4",
+                "symfony/doctrine-bridge": "<6.4",
+                "symfony/form": "<6.4",
+                "symfony/http-client": "<6.4",
                 "symfony/http-client-contracts": "<2.5",
-                "symfony/mailer": "<5.4",
-                "symfony/messenger": "<5.4",
-                "symfony/translation": "<5.4",
+                "symfony/mailer": "<6.4",
+                "symfony/messenger": "<6.4",
+                "symfony/translation": "<6.4",
                 "symfony/translation-contracts": "<2.5",
-                "symfony/twig-bridge": "<5.4",
-                "symfony/validator": "<5.4",
-                "symfony/var-dumper": "<6.3",
-                "twig/twig": "<2.13"
+                "symfony/twig-bridge": "<6.4",
+                "symfony/validator": "<6.4",
+                "symfony/var-dumper": "<6.4",
+                "twig/twig": "<3.12"
             },
             "provide": {
                 "psr/log-implementation": "1.0|2.0|3.0"
             },
             "require-dev": {
                 "psr/cache": "^1.0|^2.0|^3.0",
-                "symfony/browser-kit": "^5.4|^6.0",
-                "symfony/clock": "^6.2",
-                "symfony/config": "^6.1",
-                "symfony/console": "^5.4|^6.0",
-                "symfony/css-selector": "^5.4|^6.0",
-                "symfony/dependency-injection": "^6.3",
-                "symfony/dom-crawler": "^5.4|^6.0",
-                "symfony/expression-language": "^5.4|^6.0",
-                "symfony/finder": "^5.4|^6.0",
+                "symfony/browser-kit": "^6.4|^7.0",
+                "symfony/clock": "^6.4|^7.0",
+                "symfony/config": "^6.4|^7.0",
+                "symfony/console": "^6.4|^7.0",
+                "symfony/css-selector": "^6.4|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/dom-crawler": "^6.4|^7.0",
+                "symfony/expression-language": "^6.4|^7.0",
+                "symfony/finder": "^6.4|^7.0",
                 "symfony/http-client-contracts": "^2.5|^3",
-                "symfony/process": "^5.4|^6.0",
-                "symfony/property-access": "^5.4.5|^6.0.5",
-                "symfony/routing": "^5.4|^6.0",
-                "symfony/serializer": "^6.3",
-                "symfony/stopwatch": "^5.4|^6.0",
-                "symfony/translation": "^5.4|^6.0",
+                "symfony/process": "^6.4|^7.0",
+                "symfony/property-access": "^7.1",
+                "symfony/routing": "^6.4|^7.0",
+                "symfony/serializer": "^7.1",
+                "symfony/stopwatch": "^6.4|^7.0",
+                "symfony/translation": "^6.4|^7.0",
                 "symfony/translation-contracts": "^2.5|^3",
-                "symfony/uid": "^5.4|^6.0",
-                "symfony/validator": "^6.3",
-                "symfony/var-exporter": "^6.2",
-                "twig/twig": "^2.13|^3.0.4"
+                "symfony/uid": "^6.4|^7.0",
+                "symfony/validator": "^6.4|^7.0",
+                "symfony/var-dumper": "^6.4|^7.0",
+                "symfony/var-exporter": "^6.4|^7.0",
+                "twig/twig": "^3.12"
             },
             "type": "library",
             "autoload": {
@@ -8517,7 +8185,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v6.3.1"
+                "source": "https://github.com/symfony/http-kernel/tree/v7.2.1"
             },
             "funding": [
                 {
@@ -8533,43 +8201,43 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-06-26T06:07:32+00:00"
+            "time": "2024-12-11T12:09:10+00:00"
         },
         {
             "name": "symfony/mailer",
-            "version": "v6.3.0",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mailer.git",
-                "reference": "7b03d9be1dea29bfec0a6c7b603f5072a4c97435"
+                "reference": "e4d358702fb66e4c8a2af08e90e7271a62de39cc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailer/zipball/7b03d9be1dea29bfec0a6c7b603f5072a4c97435",
-                "reference": "7b03d9be1dea29bfec0a6c7b603f5072a4c97435",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/e4d358702fb66e4c8a2af08e90e7271a62de39cc",
+                "reference": "e4d358702fb66e4c8a2af08e90e7271a62de39cc",
                 "shasum": ""
             },
             "require": {
                 "egulias/email-validator": "^2.1.10|^3|^4",
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "psr/event-dispatcher": "^1",
                 "psr/log": "^1|^2|^3",
-                "symfony/event-dispatcher": "^5.4|^6.0",
-                "symfony/mime": "^6.2",
+                "symfony/event-dispatcher": "^6.4|^7.0",
+                "symfony/mime": "^7.2",
                 "symfony/service-contracts": "^2.5|^3"
             },
             "conflict": {
                 "symfony/http-client-contracts": "<2.5",
-                "symfony/http-kernel": "<5.4",
-                "symfony/messenger": "<6.2",
-                "symfony/mime": "<6.2",
-                "symfony/twig-bridge": "<6.2.1"
+                "symfony/http-kernel": "<6.4",
+                "symfony/messenger": "<6.4",
+                "symfony/mime": "<6.4",
+                "symfony/twig-bridge": "<6.4"
             },
             "require-dev": {
-                "symfony/console": "^5.4|^6.0",
-                "symfony/http-client": "^5.4|^6.0",
-                "symfony/messenger": "^6.2",
-                "symfony/twig-bridge": "^6.2"
+                "symfony/console": "^6.4|^7.0",
+                "symfony/http-client": "^6.4|^7.0",
+                "symfony/messenger": "^6.4|^7.0",
+                "symfony/twig-bridge": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -8597,7 +8265,7 @@
             "description": "Helps sending emails",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/mailer/tree/v6.3.0"
+                "source": "https://github.com/symfony/mailer/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -8613,32 +8281,32 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-29T12:49:39+00:00"
+            "time": "2024-11-25T15:21:05+00:00"
         },
         {
             "name": "symfony/mailgun-mailer",
-            "version": "v6.3.0",
+            "version": "v6.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mailgun-mailer.git",
-                "reference": "2fafefe8683a93155aceb6cca622c7cee2e27174"
+                "reference": "ad4e79798a5eb80af99004a4871b4fe5effe33a3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailgun-mailer/zipball/2fafefe8683a93155aceb6cca622c7cee2e27174",
-                "reference": "2fafefe8683a93155aceb6cca622c7cee2e27174",
+                "url": "https://api.github.com/repos/symfony/mailgun-mailer/zipball/ad4e79798a5eb80af99004a4871b4fe5effe33a3",
+                "reference": "ad4e79798a5eb80af99004a4871b4fe5effe33a3",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
-                "symfony/mailer": "^5.4.21|^6.2.7"
+                "symfony/mailer": "^5.4.21|^6.2.7|^7.0"
             },
             "conflict": {
                 "symfony/http-foundation": "<6.2"
             },
             "require-dev": {
-                "symfony/http-client": "^5.4|^6.0",
-                "symfony/webhook": "^6.3"
+                "symfony/http-client": "^6.3|^7.0",
+                "symfony/webhook": "^6.3|^7.0"
             },
             "type": "symfony-mailer-bridge",
             "autoload": {
@@ -8666,7 +8334,7 @@
             "description": "Symfony Mailgun Mailer Bridge",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/mailgun-mailer/tree/v6.3.0"
+                "source": "https://github.com/symfony/mailgun-mailer/tree/v6.4.13"
             },
             "funding": [
                 {
@@ -8682,24 +8350,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-02T16:15:19+00:00"
+            "time": "2024-09-25T14:18:03+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v6.3.0",
+            "version": "v7.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "7b5d2121858cd6efbed778abce9cfdd7ab1f62ad"
+                "reference": "7f9617fcf15cb61be30f8b252695ed5e2bfac283"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/7b5d2121858cd6efbed778abce9cfdd7ab1f62ad",
-                "reference": "7b5d2121858cd6efbed778abce9cfdd7ab1f62ad",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/7f9617fcf15cb61be30f8b252695ed5e2bfac283",
+                "reference": "7f9617fcf15cb61be30f8b252695ed5e2bfac283",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/polyfill-intl-idn": "^1.10",
                 "symfony/polyfill-mbstring": "^1.0"
             },
@@ -8707,17 +8375,18 @@
                 "egulias/email-validator": "~3.0.0",
                 "phpdocumentor/reflection-docblock": "<3.2.2",
                 "phpdocumentor/type-resolver": "<1.4.0",
-                "symfony/mailer": "<5.4",
-                "symfony/serializer": "<6.2"
+                "symfony/mailer": "<6.4",
+                "symfony/serializer": "<6.4.3|>7.0,<7.0.3"
             },
             "require-dev": {
                 "egulias/email-validator": "^2.1.10|^3.1|^4",
                 "league/html-to-markdown": "^5.0",
                 "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
-                "symfony/dependency-injection": "^5.4|^6.0",
-                "symfony/property-access": "^5.4|^6.0",
-                "symfony/property-info": "^5.4|^6.0",
-                "symfony/serializer": "^6.2"
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/process": "^6.4|^7.0",
+                "symfony/property-access": "^6.4|^7.0",
+                "symfony/property-info": "^6.4|^7.0",
+                "symfony/serializer": "^6.4.3|^7.0.3"
             },
             "type": "library",
             "autoload": {
@@ -8749,7 +8418,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v6.3.0"
+                "source": "https://github.com/symfony/mime/tree/v7.2.1"
             },
             "funding": [
                 {
@@ -8765,24 +8434,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-04-28T15:57:00+00:00"
+            "time": "2024-12-07T08:50:44+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.27.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a"
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a",
-                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-ctype": "*"
@@ -8792,12 +8461,9 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -8831,7 +8497,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -8847,36 +8513,33 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.27.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "511a08c03c1960e08a883f4cffcacd219b758354"
+                "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354",
-                "reference": "511a08c03c1960e08a883f4cffcacd219b758354",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
+                "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "suggest": {
                 "ext-intl": "For best performance"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -8912,7 +8575,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -8928,38 +8591,34 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.27.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "639084e360537a19f9ee352433b84ce831f3d2da"
+                "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/639084e360537a19f9ee352433b84ce831f3d2da",
-                "reference": "639084e360537a19f9ee352433b84ce831f3d2da",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/c36586dcf89a12315939e00ec9b4474adcb1d773",
+                "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1",
-                "symfony/polyfill-intl-normalizer": "^1.10",
-                "symfony/polyfill-php72": "^1.10"
+                "php": ">=7.2",
+                "symfony/polyfill-intl-normalizer": "^1.10"
             },
             "suggest": {
                 "ext-intl": "For best performance"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -8999,7 +8658,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -9015,36 +8674,33 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.27.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6"
+                "reference": "3833d7255cc303546435cb650316bff708a1c75c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6",
-                "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c",
+                "reference": "3833d7255cc303546435cb650316bff708a1c75c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "suggest": {
                 "ext-intl": "For best performance"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -9083,7 +8739,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -9099,24 +8755,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.27.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534"
+                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
-                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341",
+                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-mbstring": "*"
@@ -9126,12 +8782,9 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -9166,7 +8819,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -9182,109 +8835,30 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-03T14:55:06+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php72",
-            "version": "v1.27.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "869329b1e9894268a8a61dabb69153029b7a8c97"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97",
-                "reference": "869329b1e9894268a8a61dabb69153029b7a8c97",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php72\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.27.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.27.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936"
+                "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
-                "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
+                "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -9325,7 +8899,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -9341,34 +8915,30 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-php83",
-            "version": "v1.27.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php83.git",
-                "reference": "508c652ba3ccf69f8c97f251534f229791b52a57"
+                "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/508c652ba3ccf69f8c97f251534f229791b52a57",
-                "reference": "508c652ba3ccf69f8c97f251534f229791b52a57",
+                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/2fb86d65e2d424369ad2905e83b236a8805ba491",
+                "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1",
-                "symfony/polyfill-php80": "^1.14"
+                "php": ">=7.2"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -9377,7 +8947,10 @@
                 ],
                 "psr-4": {
                     "Symfony\\Polyfill\\Php83\\": ""
-                }
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -9402,7 +8975,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php83/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-php83/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -9418,24 +8991,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/polyfill-uuid",
-            "version": "v1.27.0",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-uuid.git",
-                "reference": "f3cf1a645c2734236ed1e2e671e273eeb3586166"
+                "reference": "21533be36c24be3f4b1669c4725c7d1d2bab4ae2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/f3cf1a645c2734236ed1e2e671e273eeb3586166",
-                "reference": "f3cf1a645c2734236ed1e2e671e273eeb3586166",
+                "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/21533be36c24be3f4b1669c4725c7d1d2bab4ae2",
+                "reference": "21533be36c24be3f4b1669c4725c7d1d2bab4ae2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=7.2"
             },
             "provide": {
                 "ext-uuid": "*"
@@ -9445,12 +9018,9 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.27-dev"
-                },
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -9484,7 +9054,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.27.0"
+                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.31.0"
             },
             "funding": [
                 {
@@ -9500,24 +9070,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-11-03T14:55:06+00:00"
+            "time": "2024-09-09T11:45:10+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v6.3.0",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "8741e3ed7fe2e91ec099e02446fb86667a0f1628"
+                "reference": "d34b22ba9390ec19d2dd966c40aa9e8462f27a7e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/8741e3ed7fe2e91ec099e02446fb86667a0f1628",
-                "reference": "8741e3ed7fe2e91ec099e02446fb86667a0f1628",
+                "url": "https://api.github.com/repos/symfony/process/zipball/d34b22ba9390ec19d2dd966c40aa9e8462f27a7e",
+                "reference": "d34b22ba9390ec19d2dd966c40aa9e8462f27a7e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "type": "library",
             "autoload": {
@@ -9545,7 +9115,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v6.3.0"
+                "source": "https://github.com/symfony/process/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -9561,46 +9131,42 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-19T08:06:44+00:00"
+            "time": "2024-11-06T14:24:19+00:00"
         },
         {
             "name": "symfony/psr-http-message-bridge",
-            "version": "v2.2.0",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/psr-http-message-bridge.git",
-                "reference": "28a732c05bbad801304ad5a5c674cf2970508993"
+                "reference": "03f2f72319e7acaf2a9f6fcbe30ef17eec51594f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/28a732c05bbad801304ad5a5c674cf2970508993",
-                "reference": "28a732c05bbad801304ad5a5c674cf2970508993",
+                "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/03f2f72319e7acaf2a9f6fcbe30ef17eec51594f",
+                "reference": "03f2f72319e7acaf2a9f6fcbe30ef17eec51594f",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "psr/http-message": "^1.0 || ^2.0",
-                "symfony/http-foundation": "^5.4 || ^6.0"
+                "php": ">=8.2",
+                "psr/http-message": "^1.0|^2.0",
+                "symfony/http-foundation": "^6.4|^7.0"
+            },
+            "conflict": {
+                "php-http/discovery": "<1.15",
+                "symfony/http-kernel": "<6.4"
             },
             "require-dev": {
                 "nyholm/psr7": "^1.1",
-                "psr/log": "^1.1 || ^2 || ^3",
-                "symfony/browser-kit": "^5.4 || ^6.0",
-                "symfony/config": "^5.4 || ^6.0",
-                "symfony/event-dispatcher": "^5.4 || ^6.0",
-                "symfony/framework-bundle": "^5.4 || ^6.0",
-                "symfony/http-kernel": "^5.4 || ^6.0",
-                "symfony/phpunit-bridge": "^6.2"
-            },
-            "suggest": {
-                "nyholm/psr7": "For a super lightweight PSR-7/17 implementation"
+                "php-http/discovery": "^1.15",
+                "psr/log": "^1.1.4|^2|^3",
+                "symfony/browser-kit": "^6.4|^7.0",
+                "symfony/config": "^6.4|^7.0",
+                "symfony/event-dispatcher": "^6.4|^7.0",
+                "symfony/framework-bundle": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0"
             },
             "type": "symfony-bridge",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "2.2-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Bridge\\PsrHttpMessage\\": ""
@@ -9620,11 +9186,11 @@
                 },
                 {
                     "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "PSR HTTP message bridge",
-            "homepage": "http://symfony.com",
+            "homepage": "https://symfony.com",
             "keywords": [
                 "http",
                 "http-message",
@@ -9632,8 +9198,7 @@
                 "psr-7"
             ],
             "support": {
-                "issues": "https://github.com/symfony/psr-http-message-bridge/issues",
-                "source": "https://github.com/symfony/psr-http-message-bridge/tree/v2.2.0"
+                "source": "https://github.com/symfony/psr-http-message-bridge/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -9649,39 +9214,38 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-04-21T08:40:19+00:00"
+            "time": "2024-09-26T08:57:56+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v6.3.1",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "d37ad1779c38b8eb71996d17dc13030dcb7f9cf5"
+                "reference": "e10a2450fa957af6c448b9b93c9010a4e4c0725e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/d37ad1779c38b8eb71996d17dc13030dcb7f9cf5",
-                "reference": "d37ad1779c38b8eb71996d17dc13030dcb7f9cf5",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/e10a2450fa957af6c448b9b93c9010a4e4c0725e",
+                "reference": "e10a2450fa957af6c448b9b93c9010a4e4c0725e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3"
             },
             "conflict": {
-                "doctrine/annotations": "<1.12",
-                "symfony/config": "<6.2",
-                "symfony/dependency-injection": "<5.4",
-                "symfony/yaml": "<5.4"
+                "symfony/config": "<6.4",
+                "symfony/dependency-injection": "<6.4",
+                "symfony/yaml": "<6.4"
             },
             "require-dev": {
-                "doctrine/annotations": "^1.12|^2",
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^6.2",
-                "symfony/dependency-injection": "^5.4|^6.0",
-                "symfony/expression-language": "^5.4|^6.0",
-                "symfony/http-foundation": "^5.4|^6.0",
-                "symfony/yaml": "^5.4|^6.0"
+                "symfony/config": "^6.4|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/expression-language": "^6.4|^7.0",
+                "symfony/http-foundation": "^6.4|^7.0",
+                "symfony/yaml": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -9715,7 +9279,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v6.3.1"
+                "source": "https://github.com/symfony/routing/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -9731,25 +9295,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-06-05T15:30:22+00:00"
+            "time": "2024-11-25T11:08:51+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.3.0",
+            "version": "v3.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4"
+                "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/40da9cc13ec349d9e4966ce18b5fbcd724ab10a4",
-                "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/e53260aabf78fb3d63f8d79d69ece59f80d5eda0",
+                "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
-                "psr/container": "^2.0"
+                "psr/container": "^1.1|^2.0",
+                "symfony/deprecation-contracts": "^2.5|^3"
             },
             "conflict": {
                 "ext-psr": "<1.1|>=2"
@@ -9757,7 +9322,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.4-dev"
+                    "dev-main": "3.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -9797,7 +9362,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.3.0"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.5.1"
             },
             "funding": [
                 {
@@ -9813,24 +9378,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-23T14:45:45+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v6.3.0",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "f2e190ee75ff0f5eced645ec0be5c66fac81f51f"
+                "reference": "446e0d146f991dde3e73f45f2c97a9faad773c82"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/f2e190ee75ff0f5eced645ec0be5c66fac81f51f",
-                "reference": "f2e190ee75ff0f5eced645ec0be5c66fac81f51f",
+                "url": "https://api.github.com/repos/symfony/string/zipball/446e0d146f991dde3e73f45f2c97a9faad773c82",
+                "reference": "446e0d146f991dde3e73f45f2c97a9faad773c82",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-intl-grapheme": "~1.0",
                 "symfony/polyfill-intl-normalizer": "~1.0",
@@ -9840,11 +9405,12 @@
                 "symfony/translation-contracts": "<2.5"
             },
             "require-dev": {
-                "symfony/error-handler": "^5.4|^6.0",
-                "symfony/http-client": "^5.4|^6.0",
-                "symfony/intl": "^6.2",
+                "symfony/emoji": "^7.1",
+                "symfony/error-handler": "^6.4|^7.0",
+                "symfony/http-client": "^6.4|^7.0",
+                "symfony/intl": "^6.4|^7.0",
                 "symfony/translation-contracts": "^2.5|^3.0",
-                "symfony/var-exporter": "^5.4|^6.0"
+                "symfony/var-exporter": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -9883,7 +9449,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.3.0"
+                "source": "https://github.com/symfony/string/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -9899,54 +9465,55 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-21T21:06:29+00:00"
+            "time": "2024-11-13T13:31:26+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v6.3.0",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "f72b2cba8f79dd9d536f534f76874b58ad37876f"
+                "reference": "dc89e16b44048ceecc879054e5b7f38326ab6cc5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/f72b2cba8f79dd9d536f534f76874b58ad37876f",
-                "reference": "f72b2cba8f79dd9d536f534f76874b58ad37876f",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/dc89e16b44048ceecc879054e5b7f38326ab6cc5",
+                "reference": "dc89e16b44048ceecc879054e5b7f38326ab6cc5",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/translation-contracts": "^2.5|^3.0"
             },
             "conflict": {
-                "symfony/config": "<5.4",
-                "symfony/console": "<5.4",
-                "symfony/dependency-injection": "<5.4",
+                "symfony/config": "<6.4",
+                "symfony/console": "<6.4",
+                "symfony/dependency-injection": "<6.4",
                 "symfony/http-client-contracts": "<2.5",
-                "symfony/http-kernel": "<5.4",
+                "symfony/http-kernel": "<6.4",
                 "symfony/service-contracts": "<2.5",
-                "symfony/twig-bundle": "<5.4",
-                "symfony/yaml": "<5.4"
+                "symfony/twig-bundle": "<6.4",
+                "symfony/yaml": "<6.4"
             },
             "provide": {
                 "symfony/translation-implementation": "2.3|3.0"
             },
             "require-dev": {
-                "nikic/php-parser": "^4.13",
+                "nikic/php-parser": "^4.18|^5.0",
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0",
-                "symfony/console": "^5.4|^6.0",
-                "symfony/dependency-injection": "^5.4|^6.0",
-                "symfony/finder": "^5.4|^6.0",
+                "symfony/config": "^6.4|^7.0",
+                "symfony/console": "^6.4|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/finder": "^6.4|^7.0",
                 "symfony/http-client-contracts": "^2.5|^3.0",
-                "symfony/http-kernel": "^5.4|^6.0",
-                "symfony/intl": "^5.4|^6.0",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/intl": "^6.4|^7.0",
                 "symfony/polyfill-intl-icu": "^1.21",
-                "symfony/routing": "^5.4|^6.0",
+                "symfony/routing": "^6.4|^7.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/yaml": "^5.4|^6.0"
+                "symfony/yaml": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -9977,7 +9544,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v6.3.0"
+                "source": "https://github.com/symfony/translation/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -9993,20 +9560,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-19T12:46:45+00:00"
+            "time": "2024-11-12T20:47:56+00:00"
         },
         {
             "name": "symfony/translation-contracts",
-            "version": "v3.3.0",
+            "version": "v3.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "02c24deb352fb0d79db5486c0c79905a85e37e86"
+                "reference": "4667ff3bd513750603a09c8dedbea942487fb07c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/02c24deb352fb0d79db5486c0c79905a85e37e86",
-                "reference": "02c24deb352fb0d79db5486c0c79905a85e37e86",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/4667ff3bd513750603a09c8dedbea942487fb07c",
+                "reference": "4667ff3bd513750603a09c8dedbea942487fb07c",
                 "shasum": ""
             },
             "require": {
@@ -10015,7 +9582,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "3.4-dev"
+                    "dev-main": "3.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -10055,7 +9622,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v3.3.0"
+                "source": "https://github.com/symfony/translation-contracts/tree/v3.5.1"
             },
             "funding": [
                 {
@@ -10071,28 +9638,28 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-30T17:17:10+00:00"
+            "time": "2024-09-25T14:20:29+00:00"
         },
         {
             "name": "symfony/uid",
-            "version": "v6.3.0",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/uid.git",
-                "reference": "01b0f20b1351d997711c56f1638f7a8c3061e384"
+                "reference": "2d294d0c48df244c71c105a169d0190bfb080426"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/uid/zipball/01b0f20b1351d997711c56f1638f7a8c3061e384",
-                "reference": "01b0f20b1351d997711c56f1638f7a8c3061e384",
+                "url": "https://api.github.com/repos/symfony/uid/zipball/2d294d0c48df244c71c105a169d0190bfb080426",
+                "reference": "2d294d0c48df244c71c105a169d0190bfb080426",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/polyfill-uuid": "^1.15"
             },
             "require-dev": {
-                "symfony/console": "^5.4|^6.0"
+                "symfony/console": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -10129,7 +9696,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/uid/tree/v6.3.0"
+                "source": "https://github.com/symfony/uid/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -10145,35 +9712,36 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-04-08T07:25:02+00:00"
+            "time": "2024-09-25T14:21:43+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v6.3.1",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "c81268d6960ddb47af17391a27d222bd58cf0515"
+                "reference": "c6a22929407dec8765d6e2b6ff85b800b245879c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c81268d6960ddb47af17391a27d222bd58cf0515",
-                "reference": "c81268d6960ddb47af17391a27d222bd58cf0515",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c6a22929407dec8765d6e2b6ff85b800b245879c",
+                "reference": "c6a22929407dec8765d6e2b6ff85b800b245879c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "symfony/console": "<5.4"
+                "symfony/console": "<6.4"
             },
             "require-dev": {
                 "ext-iconv": "*",
-                "symfony/console": "^5.4|^6.0",
-                "symfony/process": "^5.4|^6.0",
-                "symfony/uid": "^5.4|^6.0",
-                "twig/twig": "^2.13|^3.0.4"
+                "symfony/console": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/process": "^6.4|^7.0",
+                "symfony/uid": "^6.4|^7.0",
+                "twig/twig": "^3.12"
             },
             "bin": [
                 "Resources/bin/var-dump-server"
@@ -10211,7 +9779,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v6.3.1"
+                "source": "https://github.com/symfony/var-dumper/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -10227,27 +9795,29 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-06-21T12:08:28+00:00"
+            "time": "2024-11-08T15:48:14+00:00"
         },
         {
             "name": "symfony/var-exporter",
-            "version": "v6.3.0",
+            "version": "v7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-exporter.git",
-                "reference": "db5416d04269f2827d8c54331ba4cfa42620d350"
+                "reference": "1a6a89f95a46af0f142874c9d650a6358d13070d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/db5416d04269f2827d8c54331ba4cfa42620d350",
-                "reference": "db5416d04269f2827d8c54331ba4cfa42620d350",
+                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/1a6a89f95a46af0f142874c9d650a6358d13070d",
+                "reference": "1a6a89f95a46af0f142874c9d650a6358d13070d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "symfony/var-dumper": "^5.4|^6.0"
+                "symfony/property-access": "^6.4|^7.0",
+                "symfony/serializer": "^6.4|^7.0",
+                "symfony/var-dumper": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -10285,7 +9855,7 @@
                 "serialize"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-exporter/tree/v6.3.0"
+                "source": "https://github.com/symfony/var-exporter/tree/v7.2.0"
             },
             "funding": [
                 {
@@ -10301,81 +9871,27 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-04-21T08:48:44+00:00"
-        },
-        {
-            "name": "tightenco/collect",
-            "version": "v5.6.33",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/tighten/collect.git",
-                "reference": "d7381736dca44ac17d0805a25191b094e5a22446"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/tighten/collect/zipball/d7381736dca44ac17d0805a25191b094e5a22446",
-                "reference": "d7381736dca44ac17d0805a25191b094e5a22446",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1.3",
-                "symfony/var-dumper": ">=3.1.10"
-            },
-            "require-dev": {
-                "mockery/mockery": "~1.0",
-                "nesbot/carbon": "~1.20",
-                "phpunit/phpunit": "~7.0"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "src/Collect/Support/helpers.php",
-                    "src/Collect/Support/alias.php"
-                ],
-                "psr-4": {
-                    "Tightenco\\Collect\\": "src/Collect"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Taylor Otwell",
-                    "email": "taylorotwell@gmail.com"
-                }
-            ],
-            "description": "Collect - Illuminate Collections as a separate package.",
-            "keywords": [
-                "collection",
-                "laravel"
-            ],
-            "support": {
-                "issues": "https://github.com/tighten/collect/issues",
-                "source": "https://github.com/tighten/collect/tree/v5.6.33"
-            },
-            "time": "2018-08-09T16:56:26+00:00"
+            "time": "2024-10-18T07:58:17+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
-            "version": "2.2.6",
+            "version": "v2.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git",
-                "reference": "c42125b83a4fa63b187fdf29f9c93cb7733da30c"
+                "reference": "83ee6f38df0a63106a9e4536e3060458b74ccedb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/c42125b83a4fa63b187fdf29f9c93cb7733da30c",
-                "reference": "c42125b83a4fa63b187fdf29f9c93cb7733da30c",
+                "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/83ee6f38df0a63106a9e4536e3060458b74ccedb",
+                "reference": "83ee6f38df0a63106a9e4536e3060458b74ccedb",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "php": "^5.5 || ^7.0 || ^8.0",
-                "symfony/css-selector": "^2.7 || ^3.0 || ^4.0 || ^5.0 || ^6.0"
+                "symfony/css-selector": "^2.7 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^7.5 || ^8.5.21 || ^9.5.10"
@@ -10406,37 +9922,37 @@
             "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
             "support": {
                 "issues": "https://github.com/tijsverkoyen/CssToInlineStyles/issues",
-                "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/2.2.6"
+                "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/v2.2.7"
             },
-            "time": "2023-01-03T09:29:04+00:00"
+            "time": "2023-12-08T13:03:43+00:00"
         },
         {
             "name": "vlucas/phpdotenv",
-            "version": "v5.5.0",
+            "version": "v5.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7"
+                "reference": "a59a13791077fe3d44f90e7133eb68e7d22eaff2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7",
-                "reference": "1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/a59a13791077fe3d44f90e7133eb68e7d22eaff2",
+                "reference": "a59a13791077fe3d44f90e7133eb68e7d22eaff2",
                 "shasum": ""
             },
             "require": {
                 "ext-pcre": "*",
-                "graham-campbell/result-type": "^1.0.2",
-                "php": "^7.1.3 || ^8.0",
-                "phpoption/phpoption": "^1.8",
-                "symfony/polyfill-ctype": "^1.23",
-                "symfony/polyfill-mbstring": "^1.23.1",
-                "symfony/polyfill-php80": "^1.23.1"
+                "graham-campbell/result-type": "^1.1.3",
+                "php": "^7.2.5 || ^8.0",
+                "phpoption/phpoption": "^1.9.3",
+                "symfony/polyfill-ctype": "^1.24",
+                "symfony/polyfill-mbstring": "^1.24",
+                "symfony/polyfill-php80": "^1.24"
             },
             "require-dev": {
-                "bamarni/composer-bin-plugin": "^1.4.1",
+                "bamarni/composer-bin-plugin": "^1.8.2",
                 "ext-filter": "*",
-                "phpunit/phpunit": "^7.5.20 || ^8.5.30 || ^9.5.25"
+                "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2"
             },
             "suggest": {
                 "ext-filter": "Required to use the boolean validator."
@@ -10445,10 +9961,10 @@
             "extra": {
                 "bamarni-bin": {
                     "bin-links": true,
-                    "forward-command": true
+                    "forward-command": false
                 },
                 "branch-alias": {
-                    "dev-master": "5.5-dev"
+                    "dev-master": "5.6-dev"
                 }
             },
             "autoload": {
@@ -10480,7 +9996,7 @@
             ],
             "support": {
                 "issues": "https://github.com/vlucas/phpdotenv/issues",
-                "source": "https://github.com/vlucas/phpdotenv/tree/v5.5.0"
+                "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.1"
             },
             "funding": [
                 {
@@ -10492,20 +10008,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-10-16T01:01:54+00:00"
+            "time": "2024-07-20T21:52:34+00:00"
         },
         {
             "name": "voku/portable-ascii",
-            "version": "2.0.1",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/voku/portable-ascii.git",
-                "reference": "b56450eed252f6801410d810c8e1727224ae0743"
+                "reference": "b1d923f88091c6bf09699efcd7c8a1b1bfd7351d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/voku/portable-ascii/zipball/b56450eed252f6801410d810c8e1727224ae0743",
-                "reference": "b56450eed252f6801410d810c8e1727224ae0743",
+                "url": "https://api.github.com/repos/voku/portable-ascii/zipball/b1d923f88091c6bf09699efcd7c8a1b1bfd7351d",
+                "reference": "b1d923f88091c6bf09699efcd7c8a1b1bfd7351d",
                 "shasum": ""
             },
             "require": {
@@ -10530,7 +10046,7 @@
             "authors": [
                 {
                     "name": "Lars Moelleken",
-                    "homepage": "http://www.moelleken.org/"
+                    "homepage": "https://www.moelleken.org/"
                 }
             ],
             "description": "Portable ASCII library - performance optimized (ascii) string functions for php.",
@@ -10542,7 +10058,7 @@
             ],
             "support": {
                 "issues": "https://github.com/voku/portable-ascii/issues",
-                "source": "https://github.com/voku/portable-ascii/tree/2.0.1"
+                "source": "https://github.com/voku/portable-ascii/tree/2.0.3"
             },
             "funding": [
                 {
@@ -10566,7 +10082,386 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-08T17:03:00+00:00"
+            "time": "2024-11-21T01:49:47+00:00"
+        },
+        {
+            "name": "web-token/jwt-core",
+            "version": "3.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/web-token/jwt-core.git",
+                "reference": "4d956e786a4e35d54c74787ebff840a0311c5e83"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/web-token/jwt-core/zipball/4d956e786a4e35d54c74787ebff840a0311c5e83",
+                "reference": "4d956e786a4e35d54c74787ebff840a0311c5e83",
+                "shasum": ""
+            },
+            "require": {
+                "brick/math": "^0.9|^0.10",
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "fgrosse/phpasn1": "^2.0",
+                "paragonie/constant_time_encoding": "^2.4",
+                "php": ">=8.1"
+            },
+            "conflict": {
+                "spomky-labs/jose": "*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Jose\\Component\\Core\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Florent Morselli",
+                    "homepage": "https://github.com/Spomky"
+                },
+                {
+                    "name": "All contributors",
+                    "homepage": "https://github.com/web-token/jwt-framework/contributors"
+                }
+            ],
+            "description": "Core component of the JWT Framework.",
+            "homepage": "https://github.com/web-token",
+            "keywords": [
+                "JOSE",
+                "JWE",
+                "JWK",
+                "JWKSet",
+                "JWS",
+                "Jot",
+                "RFC7515",
+                "RFC7516",
+                "RFC7517",
+                "RFC7518",
+                "RFC7519",
+                "RFC7520",
+                "bundle",
+                "jwa",
+                "jwt",
+                "symfony"
+            ],
+            "support": {
+                "source": "https://github.com/web-token/jwt-core/tree/3.1.2"
+            },
+            "funding": [
+                {
+                    "url": "https://www.patreon.com/FlorentMorselli",
+                    "type": "patreon"
+                }
+            ],
+            "abandoned": "web-token/jwt-library",
+            "time": "2022-08-04T21:04:09+00:00"
+        },
+        {
+            "name": "web-token/jwt-key-mgmt",
+            "version": "3.1.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/web-token/jwt-key-mgmt.git",
+                "reference": "bf6dec304f2a718d70f7316e498c612317c59e08"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/web-token/jwt-key-mgmt/zipball/bf6dec304f2a718d70f7316e498c612317c59e08",
+                "reference": "bf6dec304f2a718d70f7316e498c612317c59e08",
+                "shasum": ""
+            },
+            "require": {
+                "ext-openssl": "*",
+                "php": ">=8.1",
+                "psr/http-client": "^1.0",
+                "psr/http-factory": "^1.0",
+                "web-token/jwt-core": "^3.0"
+            },
+            "suggest": {
+                "ext-sodium": "Sodium is required for OKP key creation, EdDSA signature algorithm and ECDH-ES key encryption with OKP keys",
+                "php-http/httplug": "To enable JKU/X5U support.",
+                "php-http/message-factory": "To enable JKU/X5U support.",
+                "web-token/jwt-util-ecc": "To use EC key analyzers."
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Jose\\Component\\KeyManagement\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Florent Morselli",
+                    "homepage": "https://github.com/Spomky"
+                },
+                {
+                    "name": "All contributors",
+                    "homepage": "https://github.com/web-token/jwt-key-mgmt/contributors"
+                }
+            ],
+            "description": "Key Management component of the JWT Framework.",
+            "homepage": "https://github.com/web-token",
+            "keywords": [
+                "JOSE",
+                "JWE",
+                "JWK",
+                "JWKSet",
+                "JWS",
+                "Jot",
+                "RFC7515",
+                "RFC7516",
+                "RFC7517",
+                "RFC7518",
+                "RFC7519",
+                "RFC7520",
+                "bundle",
+                "jwa",
+                "jwt",
+                "symfony"
+            ],
+            "support": {
+                "source": "https://github.com/web-token/jwt-key-mgmt/tree/3.1.7"
+            },
+            "funding": [
+                {
+                    "url": "https://www.patreon.com/FlorentMorselli",
+                    "type": "patreon"
+                }
+            ],
+            "abandoned": "web-token/jwt-library",
+            "time": "2023-02-02T17:25:26+00:00"
+        },
+        {
+            "name": "web-token/jwt-signature",
+            "version": "3.1.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/web-token/jwt-signature.git",
+                "reference": "14b71230d9632564e356b785366ad36880964190"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/web-token/jwt-signature/zipball/14b71230d9632564e356b785366ad36880964190",
+                "reference": "14b71230d9632564e356b785366ad36880964190",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "web-token/jwt-core": "^3.0"
+            },
+            "suggest": {
+                "web-token/jwt-signature-algorithm-ecdsa": "ECDSA Based Signature Algorithms",
+                "web-token/jwt-signature-algorithm-eddsa": "EdDSA Based Signature Algorithms",
+                "web-token/jwt-signature-algorithm-experimental": "Experimental Signature Algorithms",
+                "web-token/jwt-signature-algorithm-hmac": "HMAC Based Signature Algorithms",
+                "web-token/jwt-signature-algorithm-none": "None Signature Algorithm",
+                "web-token/jwt-signature-algorithm-rsa": "RSA Based Signature Algorithms"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Jose\\Component\\Signature\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Florent Morselli",
+                    "homepage": "https://github.com/Spomky"
+                },
+                {
+                    "name": "All contributors",
+                    "homepage": "https://github.com/web-token/jwt-signature/contributors"
+                }
+            ],
+            "description": "Signature component of the JWT Framework.",
+            "homepage": "https://github.com/web-token",
+            "keywords": [
+                "JOSE",
+                "JWE",
+                "JWK",
+                "JWKSet",
+                "JWS",
+                "Jot",
+                "RFC7515",
+                "RFC7516",
+                "RFC7517",
+                "RFC7518",
+                "RFC7519",
+                "RFC7520",
+                "bundle",
+                "jwa",
+                "jwt",
+                "symfony"
+            ],
+            "support": {
+                "source": "https://github.com/web-token/jwt-signature/tree/3.1.7"
+            },
+            "funding": [
+                {
+                    "url": "https://www.patreon.com/FlorentMorselli",
+                    "type": "patreon"
+                }
+            ],
+            "abandoned": "web-token/jwt-library",
+            "time": "2023-02-02T17:25:26+00:00"
+        },
+        {
+            "name": "web-token/jwt-signature-algorithm-ecdsa",
+            "version": "3.1.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/web-token/jwt-signature-algorithm-ecdsa.git",
+                "reference": "e09159600f19832cf4a68921e7299e564bc0eaf9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/web-token/jwt-signature-algorithm-ecdsa/zipball/e09159600f19832cf4a68921e7299e564bc0eaf9",
+                "reference": "e09159600f19832cf4a68921e7299e564bc0eaf9",
+                "shasum": ""
+            },
+            "require": {
+                "ext-openssl": "*",
+                "php": ">=8.1",
+                "web-token/jwt-signature": "^3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Jose\\Component\\Signature\\Algorithm\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Florent Morselli",
+                    "homepage": "https://github.com/Spomky"
+                },
+                {
+                    "name": "All contributors",
+                    "homepage": "https://github.com/web-token/jwt-framework/contributors"
+                }
+            ],
+            "description": "ECDSA Based Signature Algorithms the JWT Framework.",
+            "homepage": "https://github.com/web-token",
+            "keywords": [
+                "JOSE",
+                "JWE",
+                "JWK",
+                "JWKSet",
+                "JWS",
+                "Jot",
+                "RFC7515",
+                "RFC7516",
+                "RFC7517",
+                "RFC7518",
+                "RFC7519",
+                "RFC7520",
+                "bundle",
+                "jwa",
+                "jwt",
+                "symfony"
+            ],
+            "support": {
+                "source": "https://github.com/web-token/jwt-signature-algorithm-ecdsa/tree/3.1.7"
+            },
+            "funding": [
+                {
+                    "url": "https://www.patreon.com/FlorentMorselli",
+                    "type": "patreon"
+                }
+            ],
+            "abandoned": "web-token/jwt-library",
+            "time": "2022-08-04T21:04:09+00:00"
+        },
+        {
+            "name": "web-token/jwt-util-ecc",
+            "version": "3.2.10",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/web-token/jwt-util-ecc.git",
+                "reference": "9edf9b76bccf2e1db58fcc49db1d916d929335c0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/web-token/jwt-util-ecc/zipball/9edf9b76bccf2e1db58fcc49db1d916d929335c0",
+                "reference": "9edf9b76bccf2e1db58fcc49db1d916d929335c0",
+                "shasum": ""
+            },
+            "require": {
+                "brick/math": "^0.9|^0.10|^0.11|^0.12",
+                "php": ">=8.1"
+            },
+            "suggest": {
+                "ext-bcmath": "GMP or BCMath is highly recommended to improve the library performance",
+                "ext-gmp": "GMP or BCMath is highly recommended to improve the library performance"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Jose\\Component\\Core\\Util\\Ecc\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Florent Morselli",
+                    "homepage": "https://github.com/Spomky"
+                },
+                {
+                    "name": "All contributors",
+                    "homepage": "https://github.com/web-token/jwt-framework/contributors"
+                }
+            ],
+            "description": "ECC Tools for the JWT Framework.",
+            "homepage": "https://github.com/web-token",
+            "keywords": [
+                "JOSE",
+                "JWE",
+                "JWK",
+                "JWKSet",
+                "JWS",
+                "Jot",
+                "RFC7515",
+                "RFC7516",
+                "RFC7517",
+                "RFC7518",
+                "RFC7519",
+                "RFC7520",
+                "bundle",
+                "jwa",
+                "jwt",
+                "symfony"
+            ],
+            "support": {
+                "source": "https://github.com/web-token/jwt-util-ecc/tree/3.2.10"
+            },
+            "funding": [
+                {
+                    "url": "https://www.patreon.com/FlorentMorselli",
+                    "type": "patreon"
+                }
+            ],
+            "abandoned": "web-token/jwt-library",
+            "time": "2024-01-02T17:55:33+00:00"
         },
         {
             "name": "webmozart/assert",
@@ -10628,180 +10523,18 @@
         }
     ],
     "packages-dev": [
-        {
-            "name": "brianium/paratest",
-            "version": "v6.10.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/paratestphp/paratest.git",
-                "reference": "c2243b20bcd99c3f651018d1447144372f39b4fa"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/paratestphp/paratest/zipball/c2243b20bcd99c3f651018d1447144372f39b4fa",
-                "reference": "c2243b20bcd99c3f651018d1447144372f39b4fa",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-pcre": "*",
-                "ext-reflection": "*",
-                "ext-simplexml": "*",
-                "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1",
-                "jean85/pretty-package-versions": "^2.0.5",
-                "php": "^7.3 || ^8.0",
-                "phpunit/php-code-coverage": "^9.2.25",
-                "phpunit/php-file-iterator": "^3.0.6",
-                "phpunit/php-timer": "^5.0.3",
-                "phpunit/phpunit": "^9.6.4",
-                "sebastian/environment": "^5.1.5",
-                "symfony/console": "^5.4.21 || ^6.2.7",
-                "symfony/process": "^5.4.21 || ^6.2.7"
-            },
-            "require-dev": {
-                "doctrine/coding-standard": "^10.0.0",
-                "ext-pcov": "*",
-                "ext-posix": "*",
-                "infection/infection": "^0.26.19",
-                "squizlabs/php_codesniffer": "^3.7.2",
-                "symfony/filesystem": "^5.4.21 || ^6.2.7",
-                "vimeo/psalm": "^5.7.7"
-            },
-            "bin": [
-                "bin/paratest",
-                "bin/paratest.bat",
-                "bin/paratest_for_phpstorm"
-            ],
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "ParaTest\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Brian Scaturro",
-                    "email": "scaturrob@gmail.com",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Filippo Tessarotto",
-                    "email": "zoeslam@gmail.com",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Parallel testing for PHP",
-            "homepage": "https://github.com/paratestphp/paratest",
-            "keywords": [
-                "concurrent",
-                "parallel",
-                "phpunit",
-                "testing"
-            ],
-            "support": {
-                "issues": "https://github.com/paratestphp/paratest/issues",
-                "source": "https://github.com/paratestphp/paratest/tree/v6.10.0"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sponsors/Slamdunk",
-                    "type": "github"
-                },
-                {
-                    "url": "https://paypal.me/filippotessarotto",
-                    "type": "paypal"
-                }
-            ],
-            "time": "2023-05-25T13:47:58+00:00"
-        },
-        {
-            "name": "doctrine/instantiator",
-            "version": "2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
-                "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^8.1"
-            },
-            "require-dev": {
-                "doctrine/coding-standard": "^11",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpbench/phpbench": "^1.2",
-                "phpstan/phpstan": "^1.9.4",
-                "phpstan/phpstan-phpunit": "^1.3",
-                "phpunit/phpunit": "^9.5.27",
-                "vimeo/psalm": "^5.4"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "https://ocramius.github.io/"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
-            "support": {
-                "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/2.0.0"
-            },
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-12-30T00:23:10+00:00"
-        },
         {
             "name": "fakerphp/faker",
-            "version": "v1.23.0",
+            "version": "v1.24.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FakerPHP/Faker.git",
-                "reference": "e3daa170d00fde61ea7719ef47bb09bb8f1d9b01"
+                "reference": "e0ee18eb1e6dc3cda3ce9fd97e5a0689a88a64b5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/e3daa170d00fde61ea7719ef47bb09bb8f1d9b01",
-                "reference": "e3daa170d00fde61ea7719ef47bb09bb8f1d9b01",
+                "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/e0ee18eb1e6dc3cda3ce9fd97e5a0689a88a64b5",
+                "reference": "e0ee18eb1e6dc3cda3ce9fd97e5a0689a88a64b5",
                 "shasum": ""
             },
             "require": {
@@ -10827,11 +10560,6 @@
                 "ext-mbstring": "Required for multibyte Unicode string functionality."
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "v1.21-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Faker\\": "src/Faker/"
@@ -10854,93 +10582,32 @@
             ],
             "support": {
                 "issues": "https://github.com/FakerPHP/Faker/issues",
-                "source": "https://github.com/FakerPHP/Faker/tree/v1.23.0"
+                "source": "https://github.com/FakerPHP/Faker/tree/v1.24.1"
             },
-            "time": "2023-06-12T08:44:38+00:00"
-        },
-        {
-            "name": "fidry/cpu-core-counter",
-            "version": "0.5.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/theofidry/cpu-core-counter.git",
-                "reference": "b58e5a3933e541dc286cc91fc4f3898bbc6f1623"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/b58e5a3933e541dc286cc91fc4f3898bbc6f1623",
-                "reference": "b58e5a3933e541dc286cc91fc4f3898bbc6f1623",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0"
-            },
-            "require-dev": {
-                "fidry/makefile": "^0.2.0",
-                "phpstan/extension-installer": "^1.2.0",
-                "phpstan/phpstan": "^1.9.2",
-                "phpstan/phpstan-deprecation-rules": "^1.0.0",
-                "phpstan/phpstan-phpunit": "^1.2.2",
-                "phpstan/phpstan-strict-rules": "^1.4.4",
-                "phpunit/phpunit": "^9.5.26 || ^8.5.31",
-                "theofidry/php-cs-fixer-config": "^1.0",
-                "webmozarts/strict-phpunit": "^7.5"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Fidry\\CpuCoreCounter\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Théo FIDRY",
-                    "email": "theo.fidry@gmail.com"
-                }
-            ],
-            "description": "Tiny utility to get the number of CPU cores.",
-            "keywords": [
-                "CPU",
-                "core"
-            ],
-            "support": {
-                "issues": "https://github.com/theofidry/cpu-core-counter/issues",
-                "source": "https://github.com/theofidry/cpu-core-counter/tree/0.5.1"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/theofidry",
-                    "type": "github"
-                }
-            ],
-            "time": "2022-12-24T12:35:10+00:00"
+            "time": "2024-11-21T13:46:39+00:00"
         },
         {
             "name": "filp/whoops",
-            "version": "2.15.3",
+            "version": "2.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filp/whoops.git",
-                "reference": "c83e88a30524f9360b11f585f71e6b17313b7187"
+                "reference": "befcdc0e5dce67252aa6322d82424be928214fa2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/c83e88a30524f9360b11f585f71e6b17313b7187",
-                "reference": "c83e88a30524f9360b11f585f71e6b17313b7187",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/befcdc0e5dce67252aa6322d82424be928214fa2",
+                "reference": "befcdc0e5dce67252aa6322d82424be928214fa2",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9 || ^7.0 || ^8.0",
+                "php": "^7.1 || ^8.0",
                 "psr/log": "^1.0.1 || ^2.0 || ^3.0"
             },
             "require-dev": {
-                "mockery/mockery": "^0.9 || ^1.0",
-                "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.3",
-                "symfony/var-dumper": "^2.6 || ^3.0 || ^4.0 || ^5.0"
+                "mockery/mockery": "^1.0",
+                "phpunit/phpunit": "^7.5.20 || ^8.5.8 || ^9.3.3",
+                "symfony/var-dumper": "^4.0 || ^5.0"
             },
             "suggest": {
                 "symfony/var-dumper": "Pretty print complex values better with var-dumper available",
@@ -10980,7 +10647,7 @@
             ],
             "support": {
                 "issues": "https://github.com/filp/whoops/issues",
-                "source": "https://github.com/filp/whoops/tree/2.15.3"
+                "source": "https://github.com/filp/whoops/tree/2.16.0"
             },
             "funding": [
                 {
@@ -10988,7 +10655,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-07-13T12:00:00+00:00"
+            "time": "2024-09-25T12:00:00+00:00"
         },
         {
             "name": "hamcrest/hamcrest-php",
@@ -11042,39 +10709,44 @@
             "time": "2020-07-09T08:09:16+00:00"
         },
         {
-            "name": "jean85/pretty-package-versions",
-            "version": "2.0.5",
+            "name": "laravel/pint",
+            "version": "v1.18.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/Jean85/pretty-package-versions.git",
-                "reference": "ae547e455a3d8babd07b96966b17d7fd21d9c6af"
+                "url": "https://github.com/laravel/pint.git",
+                "reference": "cef51821608239040ab841ad6e1c6ae502ae3026"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/ae547e455a3d8babd07b96966b17d7fd21d9c6af",
-                "reference": "ae547e455a3d8babd07b96966b17d7fd21d9c6af",
+                "url": "https://api.github.com/repos/laravel/pint/zipball/cef51821608239040ab841ad6e1c6ae502ae3026",
+                "reference": "cef51821608239040ab841ad6e1c6ae502ae3026",
                 "shasum": ""
             },
             "require": {
-                "composer-runtime-api": "^2.0.0",
-                "php": "^7.1|^8.0"
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "ext-tokenizer": "*",
+                "ext-xml": "*",
+                "php": "^8.1.0"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.17",
-                "jean85/composer-provided-replaced-stub-package": "^1.0",
-                "phpstan/phpstan": "^0.12.66",
-                "phpunit/phpunit": "^7.5|^8.5|^9.4",
-                "vimeo/psalm": "^4.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
+                "friendsofphp/php-cs-fixer": "^3.65.0",
+                "illuminate/view": "^10.48.24",
+                "larastan/larastan": "^2.9.11",
+                "laravel-zero/framework": "^10.4.0",
+                "mockery/mockery": "^1.6.12",
+                "nunomaduro/termwind": "^1.17.0",
+                "pestphp/pest": "^2.36.0"
             },
+            "bin": [
+                "builds/pint"
+            ],
+            "type": "project",
             "autoload": {
                 "psr-4": {
-                    "Jean85\\": "src/"
+                    "App\\": "app/",
+                    "Database\\Seeders\\": "database/seeders/",
+                    "Database\\Factories\\": "database/factories/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -11083,56 +10755,56 @@
             ],
             "authors": [
                 {
-                    "name": "Alessandro Lai",
-                    "email": "alessandro.lai85@gmail.com"
+                    "name": "Nuno Maduro",
+                    "email": "enunomaduro@gmail.com"
                 }
             ],
-            "description": "A library to get pretty versions strings of installed dependencies",
+            "description": "An opinionated code formatter for PHP.",
+            "homepage": "https://laravel.com",
             "keywords": [
-                "composer",
-                "package",
-                "release",
-                "versions"
+                "format",
+                "formatter",
+                "lint",
+                "linter",
+                "php"
             ],
             "support": {
-                "issues": "https://github.com/Jean85/pretty-package-versions/issues",
-                "source": "https://github.com/Jean85/pretty-package-versions/tree/2.0.5"
+                "issues": "https://github.com/laravel/pint/issues",
+                "source": "https://github.com/laravel/pint"
             },
-            "time": "2021-10-08T21:21:46+00:00"
+            "time": "2024-11-26T15:34:00+00:00"
         },
         {
             "name": "laravel/telescope",
-            "version": "v4.15.2",
+            "version": "v5.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/telescope.git",
-                "reference": "5d74ae4c9f269b756d7877ad1527770c59846e14"
+                "reference": "7ee46fbea8e3b01108575c8edf7377abddfe8bb9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/telescope/zipball/5d74ae4c9f269b756d7877ad1527770c59846e14",
-                "reference": "5d74ae4c9f269b756d7877ad1527770c59846e14",
+                "url": "https://api.github.com/repos/laravel/telescope/zipball/7ee46fbea8e3b01108575c8edf7377abddfe8bb9",
+                "reference": "7ee46fbea8e3b01108575c8edf7377abddfe8bb9",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "laravel/framework": "^8.37|^9.0|^10.0",
+                "laravel/framework": "^8.37|^9.0|^10.0|^11.0",
                 "php": "^8.0",
-                "symfony/var-dumper": "^5.0|^6.0"
+                "symfony/console": "^5.3|^6.0|^7.0",
+                "symfony/var-dumper": "^5.0|^6.0|^7.0"
             },
             "require-dev": {
                 "ext-gd": "*",
                 "guzzlehttp/guzzle": "^6.0|^7.0",
-                "laravel/octane": "^1.4",
-                "orchestra/testbench": "^6.0|^7.0|^8.0",
+                "laravel/octane": "^1.4|^2.0|dev-develop",
+                "orchestra/testbench": "^6.40|^7.37|^8.17|^9.0",
                 "phpstan/phpstan": "^1.10",
-                "phpunit/phpunit": "^9.0"
+                "phpunit/phpunit": "^9.0|^10.5"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "4.x-dev"
-                },
                 "laravel": {
                     "providers": [
                         "Laravel\\Telescope\\TelescopeServiceProvider"
@@ -11167,43 +10839,37 @@
             ],
             "support": {
                 "issues": "https://github.com/laravel/telescope/issues",
-                "source": "https://github.com/laravel/telescope/tree/v4.15.2"
+                "source": "https://github.com/laravel/telescope/tree/v5.2.6"
             },
-            "time": "2023-07-13T20:06:27+00:00"
+            "time": "2024-11-25T20:34:58+00:00"
         },
         {
             "name": "mockery/mockery",
-            "version": "1.6.2",
+            "version": "1.6.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mockery/mockery.git",
-                "reference": "13a7fa2642c76c58fa2806ef7f565344c817a191"
+                "reference": "1f4efdd7d3beafe9807b08156dfcb176d18f1699"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mockery/mockery/zipball/13a7fa2642c76c58fa2806ef7f565344c817a191",
-                "reference": "13a7fa2642c76c58fa2806ef7f565344c817a191",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/1f4efdd7d3beafe9807b08156dfcb176d18f1699",
+                "reference": "1f4efdd7d3beafe9807b08156dfcb176d18f1699",
                 "shasum": ""
             },
             "require": {
                 "hamcrest/hamcrest-php": "^2.0.1",
                 "lib-pcre": ">=7.0",
-                "php": "^7.4 || ^8.0"
+                "php": ">=7.3"
             },
             "conflict": {
                 "phpunit/phpunit": "<8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5 || ^9.3",
-                "psalm/plugin-phpunit": "^0.18",
-                "vimeo/psalm": "^5.9"
+                "phpunit/phpunit": "^8.5 || ^9.6.17",
+                "symplify/easy-coding-standard": "^12.1.14"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.6.x-dev"
-                }
-            },
             "autoload": {
                 "files": [
                     "library/helpers.php",
@@ -11221,12 +10887,20 @@
                 {
                     "name": "Pádraic Brady",
                     "email": "padraic.brady@gmail.com",
-                    "homepage": "http://blog.astrumfutura.com"
+                    "homepage": "https://github.com/padraic",
+                    "role": "Author"
                 },
                 {
                     "name": "Dave Marshall",
                     "email": "dave.marshall@atstsolutions.co.uk",
-                    "homepage": "http://davedevelopment.co.uk"
+                    "homepage": "https://davedevelopment.co.uk",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Nathanael Esayeas",
+                    "email": "nathanael.esayeas@protonmail.com",
+                    "homepage": "https://github.com/ghostwriter",
+                    "role": "Lead Developer"
                 }
             ],
             "description": "Mockery is a simple yet flexible PHP mock object framework",
@@ -11244,23 +10918,26 @@
                 "testing"
             ],
             "support": {
+                "docs": "https://docs.mockery.io/",
                 "issues": "https://github.com/mockery/mockery/issues",
-                "source": "https://github.com/mockery/mockery/tree/1.6.2"
+                "rss": "https://github.com/mockery/mockery/releases.atom",
+                "security": "https://github.com/mockery/mockery/security/advisories",
+                "source": "https://github.com/mockery/mockery"
             },
-            "time": "2023-06-07T09:07:52+00:00"
+            "time": "2024-05-16T03:13:13+00:00"
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.11.1",
+            "version": "1.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
+                "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
-                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845",
+                "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845",
                 "shasum": ""
             },
             "require": {
@@ -11268,11 +10945,12 @@
             },
             "conflict": {
                 "doctrine/collections": "<1.6.8",
-                "doctrine/common": "<2.13.3 || >=3,<3.2.2"
+                "doctrine/common": "<2.13.3 || >=3 <3.2.2"
             },
             "require-dev": {
                 "doctrine/collections": "^1.6.8",
                 "doctrine/common": "^2.13.3 || ^3.2.2",
+                "phpspec/prophecy": "^1.10",
                 "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
             },
             "type": "library",
@@ -11298,7 +10976,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.12.1"
             },
             "funding": [
                 {
@@ -11306,49 +10984,58 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-08T13:26:56+00:00"
+            "time": "2024-11-08T17:47:46+00:00"
         },
         {
             "name": "nunomaduro/collision",
-            "version": "v6.4.0",
+            "version": "v8.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/collision.git",
-                "reference": "f05978827b9343cba381ca05b8c7deee346b6015"
+                "reference": "f5c101b929c958e849a633283adff296ed5f38f5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/f05978827b9343cba381ca05b8c7deee346b6015",
-                "reference": "f05978827b9343cba381ca05b8c7deee346b6015",
+                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/f5c101b929c958e849a633283adff296ed5f38f5",
+                "reference": "f5c101b929c958e849a633283adff296ed5f38f5",
                 "shasum": ""
             },
             "require": {
-                "filp/whoops": "^2.14.5",
-                "php": "^8.0.0",
-                "symfony/console": "^6.0.2"
+                "filp/whoops": "^2.16.0",
+                "nunomaduro/termwind": "^2.1.0",
+                "php": "^8.2.0",
+                "symfony/console": "^7.1.5"
+            },
+            "conflict": {
+                "laravel/framework": "<11.0.0 || >=12.0.0",
+                "phpunit/phpunit": "<10.5.1 || >=12.0.0"
             },
             "require-dev": {
-                "brianium/paratest": "^6.4.1",
-                "laravel/framework": "^9.26.1",
-                "laravel/pint": "^1.1.1",
-                "nunomaduro/larastan": "^1.0.3",
-                "nunomaduro/mock-final-classes": "^1.1.0",
-                "orchestra/testbench": "^7.7",
-                "phpunit/phpunit": "^9.5.23",
-                "spatie/ignition": "^1.4.1"
+                "larastan/larastan": "^2.9.8",
+                "laravel/framework": "^11.28.0",
+                "laravel/pint": "^1.18.1",
+                "laravel/sail": "^1.36.0",
+                "laravel/sanctum": "^4.0.3",
+                "laravel/tinker": "^2.10.0",
+                "orchestra/testbench-core": "^9.5.3",
+                "pestphp/pest": "^2.36.0 || ^3.4.0",
+                "sebastian/environment": "^6.1.0 || ^7.2.0"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-develop": "6.x-dev"
-                },
                 "laravel": {
                     "providers": [
                         "NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider"
                     ]
+                },
+                "branch-alias": {
+                    "dev-8.x": "8.x-dev"
                 }
             },
             "autoload": {
+                "files": [
+                    "./src/Adapters/Phpunit/Autoload.php"
+                ],
                 "psr-4": {
                     "NunoMaduro\\Collision\\": "src/"
                 }
@@ -11394,24 +11081,25 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2023-01-03T12:54:54+00:00"
+            "time": "2024-10-15T16:06:32+00:00"
         },
         {
             "name": "phar-io/manifest",
-            "version": "2.0.3",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/manifest.git",
-                "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
+                "reference": "54750ef60c58e43759730615a392c31c80e23176"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
-                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176",
+                "reference": "54750ef60c58e43759730615a392c31c80e23176",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
+                "ext-libxml": "*",
                 "ext-phar": "*",
                 "ext-xmlwriter": "*",
                 "phar-io/version": "^3.0.1",
@@ -11452,9 +11140,15 @@
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
             "support": {
                 "issues": "https://github.com/phar-io/manifest/issues",
-                "source": "https://github.com/phar-io/manifest/tree/2.0.3"
+                "source": "https://github.com/phar-io/manifest/tree/2.0.4"
             },
-            "time": "2021-07-20T11:28:43+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/theseer",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-03T12:33:53+00:00"
         },
         {
             "name": "phar-io/version",
@@ -11509,35 +11203,35 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.26",
+            "version": "11.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1"
+                "reference": "418c59fd080954f8c4aa5631d9502ecda2387118"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/443bc6912c9bd5b409254a40f4b0f4ced7c80ea1",
-                "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/418c59fd080954f8c4aa5631d9502ecda2387118",
+                "reference": "418c59fd080954f8c4aa5631d9502ecda2387118",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.15",
-                "php": ">=7.3",
-                "phpunit/php-file-iterator": "^3.0.3",
-                "phpunit/php-text-template": "^2.0.2",
-                "sebastian/code-unit-reverse-lookup": "^2.0.2",
-                "sebastian/complexity": "^2.0",
-                "sebastian/environment": "^5.1.2",
-                "sebastian/lines-of-code": "^1.0.3",
-                "sebastian/version": "^3.0.1",
-                "theseer/tokenizer": "^1.2.0"
+                "nikic/php-parser": "^5.3.1",
+                "php": ">=8.2",
+                "phpunit/php-file-iterator": "^5.1.0",
+                "phpunit/php-text-template": "^4.0.1",
+                "sebastian/code-unit-reverse-lookup": "^4.0.1",
+                "sebastian/complexity": "^4.0.1",
+                "sebastian/environment": "^7.2.0",
+                "sebastian/lines-of-code": "^3.0.1",
+                "sebastian/version": "^5.0.2",
+                "theseer/tokenizer": "^1.2.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^11.5.0"
             },
             "suggest": {
                 "ext-pcov": "PHP extension that provides line coverage",
@@ -11546,7 +11240,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "9.2-dev"
+                    "dev-main": "11.0.x-dev"
                 }
             },
             "autoload": {
@@ -11574,7 +11268,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.26"
+                "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.8"
             },
             "funding": [
                 {
@@ -11582,32 +11277,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-03-06T12:58:08+00:00"
+            "time": "2024-12-11T12:34:27+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "3.0.6",
+            "version": "5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf"
+                "reference": "118cfaaa8bc5aef3287bf315b6060b1174754af6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
-                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/118cfaaa8bc5aef3287bf315b6060b1174754af6",
+                "reference": "118cfaaa8bc5aef3287bf315b6060b1174754af6",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^11.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-main": "5.0-dev"
                 }
             },
             "autoload": {
@@ -11634,7 +11329,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6"
+                "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/5.1.0"
             },
             "funding": [
                 {
@@ -11642,28 +11338,28 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-12-02T12:48:52+00:00"
+            "time": "2024-08-27T05:02:59+00:00"
         },
         {
             "name": "phpunit/php-invoker",
-            "version": "3.1.1",
+            "version": "5.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-invoker.git",
-                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67"
+                "reference": "c1ca3814734c07492b3d4c5f794f4b0995333da2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
-                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/c1ca3814734c07492b3d4c5f794f4b0995333da2",
+                "reference": "c1ca3814734c07492b3d4c5f794f4b0995333da2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.2"
             },
             "require-dev": {
                 "ext-pcntl": "*",
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^11.0"
             },
             "suggest": {
                 "ext-pcntl": "*"
@@ -11671,7 +11367,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.1-dev"
+                    "dev-main": "5.0-dev"
                 }
             },
             "autoload": {
@@ -11697,7 +11393,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
-                "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1"
+                "security": "https://github.com/sebastianbergmann/php-invoker/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-invoker/tree/5.0.1"
             },
             "funding": [
                 {
@@ -11705,32 +11402,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:58:55+00:00"
+            "time": "2024-07-03T05:07:44+00:00"
         },
         {
             "name": "phpunit/php-text-template",
-            "version": "2.0.4",
+            "version": "4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28"
+                "reference": "3e0404dc6b300e6bf56415467ebcb3fe4f33e964"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
-                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/3e0404dc6b300e6bf56415467ebcb3fe4f33e964",
+                "reference": "3e0404dc6b300e6bf56415467ebcb3fe4f33e964",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^11.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -11756,7 +11453,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
-                "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4"
+                "security": "https://github.com/sebastianbergmann/php-text-template/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/4.0.1"
             },
             "funding": [
                 {
@@ -11764,32 +11462,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T05:33:50+00:00"
+            "time": "2024-07-03T05:08:43+00:00"
         },
         {
             "name": "phpunit/php-timer",
-            "version": "5.0.3",
+            "version": "7.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2"
+                "reference": "3b415def83fbcb41f991d9ebf16ae4ad8b7837b3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
-                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3b415def83fbcb41f991d9ebf16ae4ad8b7837b3",
+                "reference": "3b415def83fbcb41f991d9ebf16ae4ad8b7837b3",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^11.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-main": "7.0-dev"
                 }
             },
             "autoload": {
@@ -11815,7 +11513,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-timer/issues",
-                "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3"
+                "security": "https://github.com/sebastianbergmann/php-timer/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/7.0.1"
             },
             "funding": [
                 {
@@ -11823,54 +11522,52 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:16:10+00:00"
+            "time": "2024-07-03T05:09:35+00:00"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.6.10",
+            "version": "11.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "a6d351645c3fe5a30f5e86be6577d946af65a328"
+                "reference": "2b94d4f2450b9869fa64a46fd8a6a41997aef56a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a6d351645c3fe5a30f5e86be6577d946af65a328",
-                "reference": "a6d351645c3fe5a30f5e86be6577d946af65a328",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2b94d4f2450b9869fa64a46fd8a6a41997aef56a",
+                "reference": "2b94d4f2450b9869fa64a46fd8a6a41997aef56a",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.3.1 || ^2",
                 "ext-dom": "*",
                 "ext-json": "*",
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.10.1",
-                "phar-io/manifest": "^2.0.3",
-                "phar-io/version": "^3.0.2",
-                "php": ">=7.3",
-                "phpunit/php-code-coverage": "^9.2.13",
-                "phpunit/php-file-iterator": "^3.0.5",
-                "phpunit/php-invoker": "^3.1.1",
-                "phpunit/php-text-template": "^2.0.3",
-                "phpunit/php-timer": "^5.0.2",
-                "sebastian/cli-parser": "^1.0.1",
-                "sebastian/code-unit": "^1.0.6",
-                "sebastian/comparator": "^4.0.8",
-                "sebastian/diff": "^4.0.3",
-                "sebastian/environment": "^5.1.3",
-                "sebastian/exporter": "^4.0.5",
-                "sebastian/global-state": "^5.0.1",
-                "sebastian/object-enumerator": "^4.0.3",
-                "sebastian/resource-operations": "^3.0.3",
-                "sebastian/type": "^3.2",
-                "sebastian/version": "^3.0.2"
+                "myclabs/deep-copy": "^1.12.1",
+                "phar-io/manifest": "^2.0.4",
+                "phar-io/version": "^3.2.1",
+                "php": ">=8.2",
+                "phpunit/php-code-coverage": "^11.0.7",
+                "phpunit/php-file-iterator": "^5.1.0",
+                "phpunit/php-invoker": "^5.0.1",
+                "phpunit/php-text-template": "^4.0.1",
+                "phpunit/php-timer": "^7.0.1",
+                "sebastian/cli-parser": "^3.0.2",
+                "sebastian/code-unit": "^3.0.1",
+                "sebastian/comparator": "^6.2.1",
+                "sebastian/diff": "^6.0.2",
+                "sebastian/environment": "^7.2.0",
+                "sebastian/exporter": "^6.3.0",
+                "sebastian/global-state": "^7.0.2",
+                "sebastian/object-enumerator": "^6.0.1",
+                "sebastian/type": "^5.1.0",
+                "sebastian/version": "^5.0.2",
+                "staabm/side-effects-detector": "^1.0.5"
             },
             "suggest": {
-                "ext-soap": "To be able to generate mocks based on WSDL files",
-                "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
+                "ext-soap": "To be able to generate mocks based on WSDL files"
             },
             "bin": [
                 "phpunit"
@@ -11878,7 +11575,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "9.6-dev"
+                    "dev-main": "11.5-dev"
                 }
             },
             "autoload": {
@@ -11910,7 +11607,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.10"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.1"
             },
             "funding": [
                 {
@@ -11926,32 +11623,32 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-07-10T04:04:23+00:00"
+            "time": "2024-12-11T10:52:48+00:00"
         },
         {
             "name": "sebastian/cli-parser",
-            "version": "1.0.1",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/cli-parser.git",
-                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2"
+                "reference": "15c5dd40dc4f38794d383bb95465193f5e0ae180"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2",
-                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/15c5dd40dc4f38794d383bb95465193f5e0ae180",
+                "reference": "15c5dd40dc4f38794d383bb95465193f5e0ae180",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^11.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-main": "3.0-dev"
                 }
             },
             "autoload": {
@@ -11974,7 +11671,8 @@
             "homepage": "https://github.com/sebastianbergmann/cli-parser",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
-                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1"
+                "security": "https://github.com/sebastianbergmann/cli-parser/security/policy",
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/3.0.2"
             },
             "funding": [
                 {
@@ -11982,32 +11680,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T06:08:49+00:00"
+            "time": "2024-07-03T04:41:36+00:00"
         },
         {
             "name": "sebastian/code-unit",
-            "version": "1.0.8",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit.git",
-                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120"
+                "reference": "ee88b0cdbe74cf8dd3b54940ff17643c0d6543ca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120",
-                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/ee88b0cdbe74cf8dd3b54940ff17643c0d6543ca",
+                "reference": "ee88b0cdbe74cf8dd3b54940ff17643c0d6543ca",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^11.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-main": "3.0-dev"
                 }
             },
             "autoload": {
@@ -12030,7 +11728,8 @@
             "homepage": "https://github.com/sebastianbergmann/code-unit",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/code-unit/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8"
+                "security": "https://github.com/sebastianbergmann/code-unit/security/policy",
+                "source": "https://github.com/sebastianbergmann/code-unit/tree/3.0.2"
             },
             "funding": [
                 {
@@ -12038,32 +11737,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:08:54+00:00"
+            "time": "2024-12-12T09:59:06+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
-            "version": "2.0.3",
+            "version": "4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5"
+                "reference": "183a9b2632194febd219bb9246eee421dad8d45e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
-                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/183a9b2632194febd219bb9246eee421dad8d45e",
+                "reference": "183a9b2632194febd219bb9246eee421dad8d45e",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^11.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -12085,7 +11784,8 @@
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3"
+                "security": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/security/policy",
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/4.0.1"
             },
             "funding": [
                 {
@@ -12093,34 +11793,36 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:30:19+00:00"
+            "time": "2024-07-03T04:45:54+00:00"
         },
         {
             "name": "sebastian/comparator",
-            "version": "4.0.8",
+            "version": "6.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "fa0f136dd2334583309d32b62544682ee972b51a"
+                "reference": "43d129d6a0f81c78bee378b46688293eb7ea3739"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a",
-                "reference": "fa0f136dd2334583309d32b62544682ee972b51a",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/43d129d6a0f81c78bee378b46688293eb7ea3739",
+                "reference": "43d129d6a0f81c78bee378b46688293eb7ea3739",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3",
-                "sebastian/diff": "^4.0",
-                "sebastian/exporter": "^4.0"
+                "ext-dom": "*",
+                "ext-mbstring": "*",
+                "php": ">=8.2",
+                "sebastian/diff": "^6.0",
+                "sebastian/exporter": "^6.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^11.4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-main": "6.2-dev"
                 }
             },
             "autoload": {
@@ -12159,7 +11861,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8"
+                "security": "https://github.com/sebastianbergmann/comparator/security/policy",
+                "source": "https://github.com/sebastianbergmann/comparator/tree/6.2.1"
             },
             "funding": [
                 {
@@ -12167,33 +11870,33 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-09-14T12:41:17+00:00"
+            "time": "2024-10-31T05:30:08+00:00"
         },
         {
             "name": "sebastian/complexity",
-            "version": "2.0.2",
+            "version": "4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/complexity.git",
-                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88"
+                "reference": "ee41d384ab1906c68852636b6de493846e13e5a0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88",
-                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/ee41d384ab1906c68852636b6de493846e13e5a0",
+                "reference": "ee41d384ab1906c68852636b6de493846e13e5a0",
                 "shasum": ""
             },
             "require": {
-                "nikic/php-parser": "^4.7",
-                "php": ">=7.3"
+                "nikic/php-parser": "^5.0",
+                "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^11.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -12216,7 +11919,8 @@
             "homepage": "https://github.com/sebastianbergmann/complexity",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/complexity/issues",
-                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2"
+                "security": "https://github.com/sebastianbergmann/complexity/security/policy",
+                "source": "https://github.com/sebastianbergmann/complexity/tree/4.0.1"
             },
             "funding": [
                 {
@@ -12224,33 +11928,33 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T15:52:27+00:00"
+            "time": "2024-07-03T04:49:50+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "4.0.5",
+            "version": "6.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131"
+                "reference": "b4ccd857127db5d41a5b676f24b51371d76d8544"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
-                "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/b4ccd857127db5d41a5b676f24b51371d76d8544",
+                "reference": "b4ccd857127db5d41a5b676f24b51371d76d8544",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3",
+                "phpunit/phpunit": "^11.0",
                 "symfony/process": "^4.2 || ^5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-main": "6.0-dev"
                 }
             },
             "autoload": {
@@ -12282,7 +11986,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5"
+                "security": "https://github.com/sebastianbergmann/diff/security/policy",
+                "source": "https://github.com/sebastianbergmann/diff/tree/6.0.2"
             },
             "funding": [
                 {
@@ -12290,27 +11995,27 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-05-07T05:35:17+00:00"
+            "time": "2024-07-03T04:53:05+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "5.1.5",
+            "version": "7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed"
+                "reference": "855f3ae0ab316bbafe1ba4e16e9f3c078d24a0c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
-                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/855f3ae0ab316bbafe1ba4e16e9f3c078d24a0c5",
+                "reference": "855f3ae0ab316bbafe1ba4e16e9f3c078d24a0c5",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^11.0"
             },
             "suggest": {
                 "ext-posix": "*"
@@ -12318,7 +12023,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.1-dev"
+                    "dev-main": "7.2-dev"
                 }
             },
             "autoload": {
@@ -12337,7 +12042,7 @@
                 }
             ],
             "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "homepage": "https://github.com/sebastianbergmann/environment",
             "keywords": [
                 "Xdebug",
                 "environment",
@@ -12345,7 +12050,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5"
+                "security": "https://github.com/sebastianbergmann/environment/security/policy",
+                "source": "https://github.com/sebastianbergmann/environment/tree/7.2.0"
             },
             "funding": [
                 {
@@ -12353,34 +12059,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-03T06:03:51+00:00"
+            "time": "2024-07-03T04:54:44+00:00"
         },
         {
             "name": "sebastian/exporter",
-            "version": "4.0.5",
+            "version": "6.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d"
+                "reference": "3473f61172093b2da7de1fb5782e1f24cc036dc3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
-                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/3473f61172093b2da7de1fb5782e1f24cc036dc3",
+                "reference": "3473f61172093b2da7de1fb5782e1f24cc036dc3",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3",
-                "sebastian/recursion-context": "^4.0"
+                "ext-mbstring": "*",
+                "php": ">=8.2",
+                "sebastian/recursion-context": "^6.0"
             },
             "require-dev": {
-                "ext-mbstring": "*",
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^11.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-main": "6.1-dev"
                 }
             },
             "autoload": {
@@ -12422,7 +12128,8 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5"
+                "security": "https://github.com/sebastianbergmann/exporter/security/policy",
+                "source": "https://github.com/sebastianbergmann/exporter/tree/6.3.0"
             },
             "funding": [
                 {
@@ -12430,38 +12137,35 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-09-14T06:03:37+00:00"
+            "time": "2024-12-05T09:17:50+00:00"
         },
         {
             "name": "sebastian/global-state",
-            "version": "5.0.5",
+            "version": "7.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2"
+                "reference": "3be331570a721f9a4b5917f4209773de17f747d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2",
-                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/3be331570a721f9a4b5917f4209773de17f747d7",
+                "reference": "3be331570a721f9a4b5917f4209773de17f747d7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3",
-                "sebastian/object-reflector": "^2.0",
-                "sebastian/recursion-context": "^4.0"
+                "php": ">=8.2",
+                "sebastian/object-reflector": "^4.0",
+                "sebastian/recursion-context": "^6.0"
             },
             "require-dev": {
                 "ext-dom": "*",
-                "phpunit/phpunit": "^9.3"
-            },
-            "suggest": {
-                "ext-uopz": "*"
+                "phpunit/phpunit": "^11.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-main": "7.0-dev"
                 }
             },
             "autoload": {
@@ -12480,13 +12184,14 @@
                 }
             ],
             "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "homepage": "https://www.github.com/sebastianbergmann/global-state",
             "keywords": [
                 "global state"
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5"
+                "security": "https://github.com/sebastianbergmann/global-state/security/policy",
+                "source": "https://github.com/sebastianbergmann/global-state/tree/7.0.2"
             },
             "funding": [
                 {
@@ -12494,33 +12199,33 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-02-14T08:28:10+00:00"
+            "time": "2024-07-03T04:57:36+00:00"
         },
         {
             "name": "sebastian/lines-of-code",
-            "version": "1.0.3",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/lines-of-code.git",
-                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc"
+                "reference": "d36ad0d782e5756913e42ad87cb2890f4ffe467a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc",
-                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/d36ad0d782e5756913e42ad87cb2890f4ffe467a",
+                "reference": "d36ad0d782e5756913e42ad87cb2890f4ffe467a",
                 "shasum": ""
             },
             "require": {
-                "nikic/php-parser": "^4.6",
-                "php": ">=7.3"
+                "nikic/php-parser": "^5.0",
+                "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^11.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-main": "3.0-dev"
                 }
             },
             "autoload": {
@@ -12543,7 +12248,8 @@
             "homepage": "https://github.com/sebastianbergmann/lines-of-code",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
-                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3"
+                "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy",
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/3.0.1"
             },
             "funding": [
                 {
@@ -12551,34 +12257,34 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-28T06:42:11+00:00"
+            "time": "2024-07-03T04:58:38+00:00"
         },
         {
             "name": "sebastian/object-enumerator",
-            "version": "4.0.4",
+            "version": "6.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71"
+                "reference": "f5b498e631a74204185071eb41f33f38d64608aa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71",
-                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/f5b498e631a74204185071eb41f33f38d64608aa",
+                "reference": "f5b498e631a74204185071eb41f33f38d64608aa",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3",
-                "sebastian/object-reflector": "^2.0",
-                "sebastian/recursion-context": "^4.0"
+                "php": ">=8.2",
+                "sebastian/object-reflector": "^4.0",
+                "sebastian/recursion-context": "^6.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^11.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-main": "6.0-dev"
                 }
             },
             "autoload": {
@@ -12600,7 +12306,8 @@
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
-                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4"
+                "security": "https://github.com/sebastianbergmann/object-enumerator/security/policy",
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/6.0.1"
             },
             "funding": [
                 {
@@ -12608,32 +12315,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:12:34+00:00"
+            "time": "2024-07-03T05:00:13+00:00"
         },
         {
             "name": "sebastian/object-reflector",
-            "version": "2.0.4",
+            "version": "4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7"
+                "reference": "6e1a43b411b2ad34146dee7524cb13a068bb35f9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
-                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/6e1a43b411b2ad34146dee7524cb13a068bb35f9",
+                "reference": "6e1a43b411b2ad34146dee7524cb13a068bb35f9",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^11.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-main": "4.0-dev"
                 }
             },
             "autoload": {
@@ -12655,7 +12362,8 @@
             "homepage": "https://github.com/sebastianbergmann/object-reflector/",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
-                "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4"
+                "security": "https://github.com/sebastianbergmann/object-reflector/security/policy",
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/4.0.1"
             },
             "funding": [
                 {
@@ -12663,32 +12371,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T13:14:26+00:00"
+            "time": "2024-07-03T05:01:32+00:00"
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "4.0.5",
+            "version": "6.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1"
+                "reference": "694d156164372abbd149a4b85ccda2e4670c0e16"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
-                "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/694d156164372abbd149a4b85ccda2e4670c0e16",
+                "reference": "694d156164372abbd149a4b85ccda2e4670c0e16",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^11.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0-dev"
+                    "dev-main": "6.0-dev"
                 }
             },
             "autoload": {
@@ -12718,7 +12426,8 @@
             "homepage": "https://github.com/sebastianbergmann/recursion-context",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5"
+                "security": "https://github.com/sebastianbergmann/recursion-context/security/policy",
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/6.0.2"
             },
             "funding": [
                 {
@@ -12726,87 +12435,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-03T06:07:39+00:00"
-        },
-        {
-            "name": "sebastian/resource-operations",
-            "version": "3.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
-                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^9.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides a list of PHP built-in functions that operate on resources",
-            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
-                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-09-28T06:45:17+00:00"
+            "time": "2024-07-03T05:10:34+00:00"
         },
         {
             "name": "sebastian/type",
-            "version": "3.2.1",
+            "version": "5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7"
+                "reference": "461b9c5da241511a2a0e8f240814fb23ce5c0aac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
-                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/461b9c5da241511a2a0e8f240814fb23ce5c0aac",
+                "reference": "461b9c5da241511a2a0e8f240814fb23ce5c0aac",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.5"
+                "phpunit/phpunit": "^11.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2-dev"
+                    "dev-main": "5.1-dev"
                 }
             },
             "autoload": {
@@ -12829,7 +12483,8 @@
             "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/3.2.1"
+                "security": "https://github.com/sebastianbergmann/type/security/policy",
+                "source": "https://github.com/sebastianbergmann/type/tree/5.1.0"
             },
             "funding": [
                 {
@@ -12837,29 +12492,29 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-02-03T06:13:03+00:00"
+            "time": "2024-09-17T13:12:04+00:00"
         },
         {
             "name": "sebastian/version",
-            "version": "3.0.2",
+            "version": "5.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "c6c1022351a901512170118436c764e473f6de8c"
+                "reference": "c687e3387b99f5b03b6caa64c74b63e2936ff874"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c",
-                "reference": "c6c1022351a901512170118436c764e473f6de8c",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c687e3387b99f5b03b6caa64c74b63e2936ff874",
+                "reference": "c687e3387b99f5b03b6caa64c74b63e2936ff874",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.3"
+                "php": ">=8.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-main": "5.0-dev"
                 }
             },
             "autoload": {
@@ -12882,7 +12537,8 @@
             "homepage": "https://github.com/sebastianbergmann/version",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/version/issues",
-                "source": "https://github.com/sebastianbergmann/version/tree/3.0.2"
+                "security": "https://github.com/sebastianbergmann/version/security/policy",
+                "source": "https://github.com/sebastianbergmann/version/tree/5.0.2"
             },
             "funding": [
                 {
@@ -12890,20 +12546,72 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T06:39:44+00:00"
+            "time": "2024-10-09T05:16:32+00:00"
         },
         {
-            "name": "theseer/tokenizer",
-            "version": "1.2.1",
+            "name": "staabm/side-effects-detector",
+            "version": "1.0.5",
             "source": {
                 "type": "git",
-                "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e"
+                "url": "https://github.com/staabm/side-effects-detector.git",
+                "reference": "d8334211a140ce329c13726d4a715adbddd0a163"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e",
-                "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e",
+                "url": "https://api.github.com/repos/staabm/side-effects-detector/zipball/d8334211a140ce329c13726d4a715adbddd0a163",
+                "reference": "d8334211a140ce329c13726d4a715adbddd0a163",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": "^7.4 || ^8.0"
+            },
+            "require-dev": {
+                "phpstan/extension-installer": "^1.4.3",
+                "phpstan/phpstan": "^1.12.6",
+                "phpunit/phpunit": "^9.6.21",
+                "symfony/var-dumper": "^5.4.43",
+                "tomasvotruba/type-coverage": "1.0.0",
+                "tomasvotruba/unused-public": "1.0.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "lib/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "A static analysis tool to detect side effects in PHP code",
+            "keywords": [
+                "static analysis"
+            ],
+            "support": {
+                "issues": "https://github.com/staabm/side-effects-detector/issues",
+                "source": "https://github.com/staabm/side-effects-detector/tree/1.0.5"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/staabm",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-10-20T05:08:20+00:00"
+        },
+        {
+            "name": "theseer/tokenizer",
+            "version": "1.2.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/theseer/tokenizer.git",
+                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
+                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
                 "shasum": ""
             },
             "require": {
@@ -12932,7 +12640,7 @@
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
             "support": {
                 "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.3"
             },
             "funding": [
                 {
@@ -12940,16 +12648,16 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-07-28T10:34:58+00:00"
+            "time": "2024-03-03T12:36:25+00:00"
         }
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
-        "php": "^8.1|^8.2",
+        "php": "^8.2|^8.3",
         "ext-bcmath": "*",
         "ext-ctype": "*",
         "ext-curl": "*",
@@ -12958,6 +12666,6 @@
         "ext-mbstring": "*",
         "ext-openssl": "*"
     },
-    "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "platform-dev": {},
+    "plugin-api-version": "2.6.0"
 }
diff --git a/config/api.php b/config/api.php
new file mode 100644
index 000000000..13003bc26
--- /dev/null
+++ b/config/api.php
@@ -0,0 +1,18 @@
+<?php
+
+return [
+    'rate-limits' => [
+        'v1Dot1' => [
+            'accounts' => [
+                'usernameToId' => [
+                    'enabled' => env('PF_API_RL_V1DOT1_ACCT_U2ID_ENABLED', true),
+                    'limit' => env('PF_API_RL_V1DOT1_ACCT_U2ID_LIMIT', 30),
+                    'decay' => env('PF_API_RL_V1DOT1_ACCT_U2ID_DECAY', 120),
+                    'ip_enabled' => env('PF_API_RL_V1DOT1_ACCT_U2ID_BY_IP_ENABLED', false),
+                    'ip_limit' => env('PF_API_RL_V1DOT1_ACCT_U2ID_BY_IP_LIMIT', 30),
+                    'ip_decay' => env('PF_API_RL_V1DOT1_ACCT_U2ID_BY_IP_DECAY', 120),
+                ]
+            ]
+        ]
+    ]
+];
diff --git a/config/autospam.php b/config/autospam.php
index 39975ec9b..bc0ce4681 100644
--- a/config/autospam.php
+++ b/config/autospam.php
@@ -33,5 +33,10 @@ return [
     'nlp' => [
     	'enabled' => false,
     	'spam_sample_limit' => env('PF_AUTOSPAM_NLP_SPAM_SAMPLE_LIMIT', 200),
+    ],
+
+    'live_filters' => [
+        'enabled' => env('PF_AUTOSPAM_LIVE_FILTERS_ENABLED', false),
+        'filters' => env('PF_AUTOSPAM_LIVE_FILTERS_CSV', ''),
     ]
 ];
diff --git a/config/cache.php b/config/cache.php
index b2a854623..88129848e 100644
--- a/config/cache.php
+++ b/config/cache.php
@@ -36,17 +36,20 @@ return [
 
         'array' => [
             'driver' => 'array',
+            'serialize' => false,
         ],
 
         'database' => [
             'driver'     => 'database',
             'table'      => 'cache',
             'connection' => null,
+            'lock_connection' => null,
         ],
 
         'file' => [
             'driver' => 'file',
             'path'   => storage_path('framework/cache/data'),
+            'lock_path' => storage_path('framework/cache/data'),
         ],
 
         'memcached' => [
@@ -70,7 +73,8 @@ return [
 
         'redis' => [
             'driver' => 'redis',
-            'client' => env('REDIS_CLIENT', 'phpredis'),
+            'lock_connection' => 'default',
+            'client' => env('REDIS_CLIENT', 'predis'),
 
             'default' => [
                 'scheme'   => env('REDIS_SCHEME', 'tcp'),
@@ -83,6 +87,25 @@ return [
 
         ],
 
+        'redis:session' => [
+            'driver' => 'redis',
+            'connection' => 'default',
+            'prefix' => 'pf_session',
+        ],
+
+        'dynamodb' => [
+            'driver' => 'dynamodb',
+            'key' => env('AWS_ACCESS_KEY_ID'),
+            'secret' => env('AWS_SECRET_ACCESS_KEY'),
+            'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
+            'table' => env('DYNAMODB_CACHE_TABLE', 'cache'),
+            'endpoint' => env('DYNAMODB_ENDPOINT'),
+        ],
+
+        'octane' => [
+            'driver' => 'octane',
+        ],
+
     ],
 
     /*
@@ -101,4 +124,5 @@ return [
         str_slug(env('APP_NAME', 'laravel'), '_').'_cache'
     ),
 
+    'limiter' => env('CACHE_LIMITER_DRIVER', 'redis'),
 ];
diff --git a/config/cors.php b/config/cors.php
index 92b4b8e8c..1e81a015c 100644
--- a/config/cors.php
+++ b/config/cors.php
@@ -22,7 +22,9 @@ return [
      * Example: ['api/*']
      */
     'paths' => [
-        '.well-known/*'
+        '.well-known/*',
+        'api/*',
+        'oauth/*'
     ],
 
     /*
@@ -48,7 +50,8 @@ return [
     /*
      * Sets the Access-Control-Expose-Headers response header with these headers.
      */
-    'exposed_headers' => [],
+    // TODO: Add support for rate-limit related headers
+    'exposed_headers' => ['Link'],
 
     /*
      * Sets the Access-Control-Max-Age response header when > 0.
@@ -59,4 +62,4 @@ return [
      * Sets the Access-Control-Allow-Credentials header.
      */
     'supports_credentials' => false,
-];
\ No newline at end of file
+];
diff --git a/config/database.php b/config/database.php
index 38a197dac..92d6a2ba2 100644
--- a/config/database.php
+++ b/config/database.php
@@ -60,6 +60,26 @@ return [
             ]
         ],
 
+        'mariadb' => [
+            'driver' => 'mariadb',
+            'url' => env('DB_URL'),
+            'host' => env('DB_HOST', '127.0.0.1'),
+            'port' => env('DB_PORT', '3306'),
+            'database' => env('DB_DATABASE', 'laravel'),
+            'username' => env('DB_USERNAME', 'root'),
+            'password' => env('DB_PASSWORD', ''),
+            'unix_socket' => env('DB_SOCKET', ''),
+            'charset' => env('DB_CHARSET', 'utf8mb4'),
+            'collation' => env('DB_COLLATION', 'utf8mb4_unicode_ci'),
+            'prefix' => '',
+            'prefix_indexes' => true,
+            'strict' => true,
+            'engine' => null,
+            'options' => extension_loaded('pdo_mysql') ? array_filter([
+                PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
+            ]) : [],
+        ],
+
         'pgsql' => [
             'driver'   => 'pgsql',
             'host'     => env('DB_HOST', '127.0.0.1'),
diff --git a/config/federation.php b/config/federation.php
index 773d3d16b..124935ec8 100644
--- a/config/federation.php
+++ b/config/federation.php
@@ -30,6 +30,8 @@ return [
         'ingest' => [
             'store_notes_without_followers' => env('AP_INGEST_STORE_NOTES_WITHOUT_FOLLOWERS', false),
         ],
+
+        'authorized_fetch' => env('AUTHORIZED_FETCH', false),
     ],
 
     'atom' => [
@@ -49,7 +51,7 @@ return [
     ],
 
     'network_timeline' => env('PF_NETWORK_TIMELINE', true),
-    'network_timeline_days_falloff' => env('PF_NETWORK_TIMELINE_DAYS_FALLOFF', 2),
+    'network_timeline_days_falloff' => env('PF_NETWORK_TIMELINE_DAYS_FALLOFF', 90),
 
     'custom_emoji' => [
         'enabled' => env('CUSTOM_EMOJI', false),
@@ -57,4 +59,6 @@ return [
         // max size in bytes, default is 2mb
         'max_size' => env('CUSTOM_EMOJI_MAX_SIZE', 2000000),
     ],
+
+    'migration' => env('PF_ACCT_MIGRATION_ENABLED', true),
 ];
diff --git a/config/filesystems.php b/config/filesystems.php
index 80e63ed99..00254e938 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -72,7 +72,7 @@ return [
             'secret'   => env('AWS_SECRET_ACCESS_KEY'),
             'region'   => env('AWS_DEFAULT_REGION'),
             'bucket'   => env('AWS_BUCKET'),
-            'visibility' => 'public',
+            'visibility' => env('AWS_VISIBILITY', 'public'),
             'url'      => env('AWS_URL'),
             'endpoint' => env('AWS_ENDPOINT'),
             'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
diff --git a/config/groups.php b/config/groups.php
new file mode 100644
index 000000000..24513e502
--- /dev/null
+++ b/config/groups.php
@@ -0,0 +1,13 @@
+<?php
+
+return [
+    'enabled' => env('GROUPS_ENABLED', false),
+    'federation' => env('GROUPS_FEDERATION', true),
+
+    'acl' => [
+        'create_group' => [
+            'admins' => env('GROUPS_ACL_CREATE_ADMINS', true),
+            'users' => env('GROUPS_ACL_CREATE_USERS', true),
+        ]
+    ]
+];
diff --git a/config/horizon.php b/config/horizon.php
index f9cfd960e..5f7b31c13 100644
--- a/config/horizon.php
+++ b/config/horizon.php
@@ -2,201 +2,206 @@
 
 return [
 
-	/*
-	|--------------------------------------------------------------------------
-	| Horizon Domain
-	|--------------------------------------------------------------------------
-	|
-	| This is the subdomain where Horizon will be accessible from. If this
-	| setting is null, Horizon will reside under the same domain as the
-	| application. Otherwise, this value will serve as the subdomain.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Horizon Domain
+    |--------------------------------------------------------------------------
+    |
+    | This is the subdomain where Horizon will be accessible from. If this
+    | setting is null, Horizon will reside under the same domain as the
+    | application. Otherwise, this value will serve as the subdomain.
+    |
+    */
 
-	'domain' => null,
+    'domain' => null,
 
-	/*
-	|--------------------------------------------------------------------------
-	| Horizon Path
-	|--------------------------------------------------------------------------
-	|
-	| This is the URI path where Horizon will be accessible from. Feel free
-	| to change this path to anything you like. Note that the URI will not
-	| affect the paths of its internal API that aren't exposed to users.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Horizon Path
+    |--------------------------------------------------------------------------
+    |
+    | This is the URI path where Horizon will be accessible from. Feel free
+    | to change this path to anything you like. Note that the URI will not
+    | affect the paths of its internal API that aren't exposed to users.
+    |
+    */
 
-	'path' => 'horizon',
+    'path' => 'horizon',
 
-	/*
-	|--------------------------------------------------------------------------
-	| Horizon Redis Connection
-	|--------------------------------------------------------------------------
-	|
-	| This is the name of the Redis connection where Horizon will store the
-	| meta information required for it to function. It includes the list
-	| of supervisors, failed jobs, job metrics, and other information.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Horizon Redis Connection
+    |--------------------------------------------------------------------------
+    |
+    | This is the name of the Redis connection where Horizon will store the
+    | meta information required for it to function. It includes the list
+    | of supervisors, failed jobs, job metrics, and other information.
+    |
+    */
 
-	'use' => 'default',
+    'use' => 'default',
 
-	/*
-	|--------------------------------------------------------------------------
-	| Horizon Redis Prefix
-	|--------------------------------------------------------------------------
-	|
-	| This prefix will be used when storing all Horizon data in Redis. You
-	| may modify the prefix when you are running multiple installations
-	| of Horizon on the same server so that they don't have problems.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Horizon Redis Prefix
+    |--------------------------------------------------------------------------
+    |
+    | This prefix will be used when storing all Horizon data in Redis. You
+    | may modify the prefix when you are running multiple installations
+    | of Horizon on the same server so that they don't have problems.
+    |
+    */
 
-	'prefix' => env('HORIZON_PREFIX', 'horizon-'),
+    'prefix' => env('HORIZON_PREFIX', 'horizon-'),
 
-	/*
-	|--------------------------------------------------------------------------
-	| Horizon Route Middleware
-	|--------------------------------------------------------------------------
-	|
-	| These middleware will get attached onto each Horizon route, giving you
-	| the chance to add your own middleware to this list or change any of
-	| the existing middleware. Or, you can simply stick with this list.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Horizon Route Middleware
+    |--------------------------------------------------------------------------
+    |
+    | These middleware will get attached onto each Horizon route, giving you
+    | the chance to add your own middleware to this list or change any of
+    | the existing middleware. Or, you can simply stick with this list.
+    |
+    */
 
-	'middleware' => ['web'],
+    'middleware' => ['web'],
 
-	/*
-	|--------------------------------------------------------------------------
-	| Queue Wait Time Thresholds
-	|--------------------------------------------------------------------------
-	|
-	| This option allows you to configure when the LongWaitDetected event
-	| will be fired. Every connection / queue combination may have its
-	| own, unique threshold (in seconds) before this event is fired.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Queue Wait Time Thresholds
+    |--------------------------------------------------------------------------
+    |
+    | This option allows you to configure when the LongWaitDetected event
+    | will be fired. Every connection / queue combination may have its
+    | own, unique threshold (in seconds) before this event is fired.
+    |
+    */
 
-	'waits' => [
-		'redis:feed' => 30,
-		'redis:follow' => 30,
-		'redis:shared' => 30,
-		'redis:default' => 30,
-		'redis:inbox' => 30,
-		'redis:low' => 30,
-		'redis:high' => 30,
-		'redis:delete' => 30,
-		'redis:story' => 30,
-		'redis:mmo' => 30,
-	],
+    'waits' => [
+        'redis:feed' => 30,
+        'redis:follow' => 30,
+        'redis:shared' => 30,
+        'redis:default' => 30,
+        'redis:inbox' => 30,
+        'redis:low' => 30,
+        'redis:high' => 30,
+        'redis:delete' => 30,
+        'redis:story' => 30,
+        'redis:mmo' => 30,
+        'redis:intbg' => 30,
+        'redis:adelete' => 30,
+        'redis:groups' => 30,
+        'redis:move' => 30,
+        'redis:pushnotify' => 30,
+    ],
 
-	/*
-	|--------------------------------------------------------------------------
-	| Job Trimming Times
-	|--------------------------------------------------------------------------
-	|
-	| Here you can configure for how long (in minutes) you desire Horizon to
-	| persist the recent and failed jobs. Typically, recent jobs are kept
-	| for one hour while all failed jobs are stored for an entire week.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Job Trimming Times
+    |--------------------------------------------------------------------------
+    |
+    | Here you can configure for how long (in minutes) you desire Horizon to
+    | persist the recent and failed jobs. Typically, recent jobs are kept
+    | for one hour while all failed jobs are stored for an entire week.
+    |
+    */
 
-	'trim' => [
-		'recent' => 60,
-		'pending' => 60,
-		'completed' => 60,
-		'recent_failed' => 10080,
-		'failed' => 10080,
-		'monitored' => 10080,
-	],
+    'trim' => [
+        'recent' => 60,
+        'pending' => 60,
+        'completed' => 60,
+        'recent_failed' => 10080,
+        'failed' => 10080,
+        'monitored' => 10080,
+    ],
 
-	/*
-	|--------------------------------------------------------------------------
-	| Metrics
-	|--------------------------------------------------------------------------
-	|
-	| Here you can configure how many snapshots should be kept to display in
-	| the metrics graph. This will get used in combination with Horizon's
-	| `horizon:snapshot` schedule to define how long to retain metrics.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Metrics
+    |--------------------------------------------------------------------------
+    |
+    | Here you can configure how many snapshots should be kept to display in
+    | the metrics graph. This will get used in combination with Horizon's
+    | `horizon:snapshot` schedule to define how long to retain metrics.
+    |
+    */
 
-	'metrics' => [
-		'trim_snapshots' => [
-			'job' => 24,
-			'queue' => 24,
-		],
-	],
+    'metrics' => [
+        'trim_snapshots' => [
+            'job' => 24,
+            'queue' => 24,
+        ],
+    ],
 
-	/*
-	|--------------------------------------------------------------------------
-	| Fast Termination
-	|--------------------------------------------------------------------------
-	|
-	| When this option is enabled, Horizon's "terminate" command will not
-	| wait on all of the workers to terminate unless the --wait option
-	| is provided. Fast termination can shorten deployment delay by
-	| allowing a new instance of Horizon to start while the last
-	| instance will continue to terminate each of its workers.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Fast Termination
+    |--------------------------------------------------------------------------
+    |
+    | When this option is enabled, Horizon's "terminate" command will not
+    | wait on all of the workers to terminate unless the --wait option
+    | is provided. Fast termination can shorten deployment delay by
+    | allowing a new instance of Horizon to start while the last
+    | instance will continue to terminate each of its workers.
+    |
+    */
 
-	'fast_termination' => false,
+    'fast_termination' => false,
 
-	/*
-	|--------------------------------------------------------------------------
-	| Memory Limit (MB)
-	|--------------------------------------------------------------------------
-	|
-	| This value describes the maximum amount of memory the Horizon worker
-	| may consume before it is terminated and restarted. You should set
-	| this value according to the resources available to your server.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Memory Limit (MB)
+    |--------------------------------------------------------------------------
+    |
+    | This value describes the maximum amount of memory the Horizon worker
+    | may consume before it is terminated and restarted. You should set
+    | this value according to the resources available to your server.
+    |
+    */
 
-	'memory_limit' => env('HORIZON_MEMORY_LIMIT', 64),
+    'memory_limit' => env('HORIZON_MEMORY_LIMIT', 64),
 
-	/*
-	|--------------------------------------------------------------------------
-	| Queue Worker Configuration
-	|--------------------------------------------------------------------------
-	|
-	| Here you may define the queue worker settings used by your application
-	| in all environments. These supervisors and settings handle all your
-	| queued jobs and will be provisioned by Horizon during deployment.
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Queue Worker Configuration
+    |--------------------------------------------------------------------------
+    |
+    | Here you may define the queue worker settings used by your application
+    | in all environments. These supervisors and settings handle all your
+    | queued jobs and will be provisioned by Horizon during deployment.
+    |
+    */
 
-	'environments' => [
-		'production' => [
-			'supervisor-1' => [
-				'connection'    => 'redis',
-				'queue'         => ['high', 'default', 'follow', 'shared', 'inbox', 'feed', 'low', 'story', 'delete', 'mmo'],
-				'balance'       => env('HORIZON_BALANCE_STRATEGY', 'auto'),
-				'minProcesses'  => env('HORIZON_MIN_PROCESSES', 1),
-				'maxProcesses'  => env('HORIZON_MAX_PROCESSES', 20),
-				'memory'        => env('HORIZON_SUPERVISOR_MEMORY', 64),
-				'tries'         => env('HORIZON_SUPERVISOR_TRIES', 3),
-				'nice'          => env('HORIZON_SUPERVISOR_NICE', 0),
-				'timeout'		=> env('HORIZON_SUPERVISOR_TIMEOUT', 300),
-			],
-		],
+    'environments' => [
+        'production' => [
+            'supervisor-1' => [
+                'connection'    => 'redis',
+                'queue'         => ['high', 'default', 'follow', 'shared', 'inbox', 'feed', 'low', 'story', 'delete', 'mmo', 'intbg', 'groups', 'adelete', 'move', 'pushnotify'],
+                'balance'       => env('HORIZON_BALANCE_STRATEGY', 'auto'),
+                'minProcesses'  => env('HORIZON_MIN_PROCESSES', 1),
+                'maxProcesses'  => env('HORIZON_MAX_PROCESSES', 20),
+                'memory'        => env('HORIZON_SUPERVISOR_MEMORY', 64),
+                'tries'         => env('HORIZON_SUPERVISOR_TRIES', 3),
+                'nice'          => env('HORIZON_SUPERVISOR_NICE', 0),
+                'timeout'       => env('HORIZON_SUPERVISOR_TIMEOUT', 300),
+            ],
+        ],
 
-		'local' => [
-			'supervisor-1' => [
-				'connection'    => 'redis',
-				'queue'         => ['high', 'default', 'follow', 'shared', 'inbox', 'feed', 'low', 'story', 'delete', 'mmo'],
-				'balance'       => 'auto',
-				'minProcesses' => 1,
-				'maxProcesses'  => 20,
-				'memory'        => 128,
-				'tries'         => 3,
-				'nice'          => 0,
-				'timeout'       => 300
-			],
-		],
-	],
+        'local' => [
+            'supervisor-1' => [
+                'connection'    => 'redis',
+                'queue'         => ['high', 'default', 'follow', 'shared', 'inbox', 'feed', 'low', 'story', 'delete', 'mmo', 'intbg', 'groups', 'adelete', 'move', 'pushnotify'],
+                'balance'       => 'auto',
+                'minProcesses' => 1,
+                'maxProcesses'  => 20,
+                'memory'        => 128,
+                'tries'         => 3,
+                'nice'          => 0,
+                'timeout'       => 300
+            ],
+        ],
+    ],
 
-	'darkmode' => env('HORIZON_DARKMODE', false),
+    'darkmode' => env('HORIZON_DARKMODE', false),
 ];
diff --git a/config/import.php b/config/import.php
index 2d1af28e1..f754da490 100644
--- a/config/import.php
+++ b/config/import.php
@@ -39,6 +39,12 @@ return [
 
             // Limit to specific user ids, in comma separated format
             'user_ids' => env('PF_IMPORT_IG_PERM_ONLY_USER_IDS', null),
+        ],
+
+        'storage' => [
+            'cloud' => [
+                'enabled' => env('PF_IMPORT_IG_CLOUD_STORAGE', env('PF_ENABLE_CLOUD', false)),
+            ]
         ]
     ]
 ];
diff --git a/config/instance.php b/config/instance.php
index 5161ecb80..18d887873 100644
--- a/config/instance.php
+++ b/config/instance.php
@@ -1,132 +1,189 @@
 <?php
 
 return [
-	'force_https_urls' => env('FORCE_HTTPS_URLS', true),
+    'force_https_urls' => env('FORCE_HTTPS_URLS', true),
 
-	'description' => env('INSTANCE_DESCRIPTION', 'Pixelfed - Photo sharing for everyone'),
+    'description' => env('INSTANCE_DESCRIPTION', 'Pixelfed - Photo sharing for everyone'),
 
-	'contact' => [
-		'enabled' => env('INSTANCE_CONTACT_FORM', false),
-		'max_per_day' => env('INSTANCE_CONTACT_MAX_PER_DAY', 1),
-	],
+    'contact' => [
+        'enabled' => env('INSTANCE_CONTACT_FORM', false),
+        'max_per_day' => env('INSTANCE_CONTACT_MAX_PER_DAY', 1),
+    ],
 
-	'discover' => [
-		'public' => env('INSTANCE_DISCOVER_PUBLIC', false),
-		'loops' => [
-			'enabled' => env('EXP_LOOPS', false),
-		],
-		'tags' => [
-			'is_public' => env('INSTANCE_PUBLIC_HASHTAGS', false)
-		],
-	],
+    'discover' => [
+        'public' => env('INSTANCE_DISCOVER_PUBLIC', false),
+        'loops' => [
+            'enabled' => env('EXP_LOOPS', false),
+        ],
+        'tags' => [
+            'is_public' => env('INSTANCE_PUBLIC_HASHTAGS', false),
+        ],
+        'beagle_api' => env('PF_INSTANCE_USE_BEAGLE_API', true),
+    ],
 
-	'email' => env('INSTANCE_CONTACT_EMAIL'),
+    'email' => env('INSTANCE_CONTACT_EMAIL'),
 
-	'timeline' => [
-		'home' => [
-			'cached' => env('PF_HOME_TIMELINE_CACHE', false),
-			'cache_ttl' => env('PF_HOME_TIMELINE_CACHE_TTL', 900)
-		],
+    'timeline' => [
+        'home' => [
+            'cached' => env('PF_HOME_TIMELINE_CACHE', false),
+            'cache_ttl' => env('PF_HOME_TIMELINE_CACHE_TTL', 900),
+        ],
 
-		'local' => [
-			'is_public' => env('INSTANCE_PUBLIC_LOCAL_TIMELINE', false)
-		],
+        'local' => [
+            'cached' => env('INSTANCE_PUBLIC_TIMELINE_CACHED', false),
+            'is_public' => env('INSTANCE_PUBLIC_LOCAL_TIMELINE', false),
+        ],
 
-		'network' => [
-			'cached' => env('PF_NETWORK_TIMELINE') ? env('INSTANCE_NETWORK_TIMELINE_CACHED', true) : false,
-			'cache_dropoff' => env('INSTANCE_NETWORK_TIMELINE_CACHE_DROPOFF', 100),
-			'max_hours_old' => env('INSTANCE_NETWORK_TIMELINE_CACHE_MAX_HOUR_INGEST', 6)
-		]
-	],
+        'network' => [
+            'cached' => env('PF_NETWORK_TIMELINE') ? env('INSTANCE_NETWORK_TIMELINE_CACHED', false) : false,
+            'cache_dropoff' => env('INSTANCE_NETWORK_TIMELINE_CACHE_DROPOFF', 100),
+            'max_hours_old' => env('INSTANCE_NETWORK_TIMELINE_CACHE_MAX_HOUR_INGEST', 2160),
+        ],
+    ],
 
-	'page' => [
-		'404' => [
-			'header' => env('PAGE_404_HEADER', 'Sorry, this page isn\'t available.'),
-			'body' => env('PAGE_404_BODY', 'The link you followed may be broken, or the page may have been removed. <a href="/">Go back to Pixelfed.</a>')
-		],
-		'503' => [
-			'header' => env('PAGE_503_HEADER', 'Service Unavailable'),
-			'body' => env('PAGE_503_BODY', 'Our service is in maintenance mode, please try again later.')
-		]
-	],
+    'page' => [
+        '404' => [
+            'header' => env('PAGE_404_HEADER', 'Sorry, this page isn\'t available.'),
+            'body' => env('PAGE_404_BODY', 'The link you followed may be broken, or the page may have been removed. <a href="/">Go back to Pixelfed.</a>'),
+        ],
+        '503' => [
+            'header' => env('PAGE_503_HEADER', 'Service Unavailable'),
+            'body' => env('PAGE_503_BODY', 'Our service is in maintenance mode, please try again later.'),
+        ],
+    ],
 
-	'username' => [
-		'banned' => env('BANNED_USERNAMES'),
-		'remote' => [
-			'formats' => ['@', 'from', 'custom'],
-			'format' => in_array(env('USERNAME_REMOTE_FORMAT', '@'), ['@','from','custom']) ? env('USERNAME_REMOTE_FORMAT', '@') : '@',
-			'custom' => env('USERNAME_REMOTE_CUSTOM_TEXT', null)
-		]
-	],
+    'username' => [
+        'banned' => env('BANNED_USERNAMES'),
+        'remote' => [
+            'formats' => ['@', 'from', 'custom'],
+            'format' => in_array(env('USERNAME_REMOTE_FORMAT', '@'), ['@', 'from', 'custom']) ? env('USERNAME_REMOTE_FORMAT', '@') : '@',
+            'custom' => env('USERNAME_REMOTE_CUSTOM_TEXT', null),
+        ],
+    ],
 
-	'polls' => [
-		'enabled' => false
-	],
+    'polls' => [
+        'enabled' => false,
+    ],
 
-	'stories' => [
-		'enabled' => env('STORIES_ENABLED', false),
-	],
+    'stories' => [
+        'enabled' => env('STORIES_ENABLED', false),
+    ],
 
-	'restricted' => [
-		'enabled' => env('RESTRICTED_INSTANCE', false),
-		'level' => 1
-	],
+    'restricted' => [
+        'enabled' => env('RESTRICTED_INSTANCE', false),
+        'level' => 1,
+    ],
 
-	'oauth' => [
-		'token_expiration' => env('OAUTH_TOKEN_DAYS', 365),
-		'refresh_expiration' => env('OAUTH_REFRESH_DAYS', 400),
-		'pat' => [
-			'enabled' => env('OAUTH_PAT_ENABLED', false),
-			'id' 	  => env('OAUTH_PAT_ID'),
-		]
-	],
+    'oauth' => [
+        'token_expiration' => env('OAUTH_TOKEN_DAYS', 365),
+        'refresh_expiration' => env('OAUTH_REFRESH_DAYS', 400),
+        'pat' => [
+            'enabled' => env('OAUTH_PAT_ENABLED', false),
+            'id' => env('OAUTH_PAT_ID'),
+        ],
+    ],
 
-	'label' => [
-		'covid' => [
-			'enabled' => env('ENABLE_COVID_LABEL', true),
-			'url' => env('COVID_LABEL_URL', 'https://www.who.int/emergencies/diseases/novel-coronavirus-2019/advice-for-public'),
-			'org' => env('COVID_LABEL_ORG', 'visit the WHO website')
-		]
-	],
+    'label' => [
+        'covid' => [
+            'enabled' => env('ENABLE_COVID_LABEL', true),
+            'url' => env('COVID_LABEL_URL', 'https://www.who.int/emergencies/diseases/novel-coronavirus-2019/advice-for-public'),
+            'org' => env('COVID_LABEL_ORG', 'visit the WHO website'),
+        ],
+    ],
 
-	'enable_cc' => env('ENABLE_CONFIG_CACHE', true),
+    'enable_cc' => env('ENABLE_CONFIG_CACHE', true),
 
-	'has_legal_notice' => env('INSTANCE_LEGAL_NOTICE', false),
+    'has_legal_notice' => env('INSTANCE_LEGAL_NOTICE', false),
 
-	'embed' => [
-		'profile' => env('INSTANCE_PROFILE_EMBEDS', true),
-		'post' => env('INSTANCE_POST_EMBEDS', true),
-	],
+    'embed' => [
+        'profile' => env('INSTANCE_PROFILE_EMBEDS', true),
+        'post' => env('INSTANCE_POST_EMBEDS', true),
+    ],
 
-	'hide_nsfw_on_public_feeds' => env('PF_HIDE_NSFW_ON_PUBLIC_FEEDS', false),
+    'hide_nsfw_on_public_feeds' => env('PF_HIDE_NSFW_ON_PUBLIC_FEEDS', false),
 
-	'avatar' => [
-		'local_to_cloud' => env('PF_LOCAL_AVATAR_TO_CLOUD', false)
-	],
+    'avatar' => [
+        'local_to_cloud' => env('PF_LOCAL_AVATAR_TO_CLOUD', false),
+    ],
 
-	'admin_invites' => [
-		'enabled' => env('PF_ADMIN_INVITES_ENABLED', true)
-	],
+    'admin_invites' => [
+        'enabled' => env('PF_ADMIN_INVITES_ENABLED', true),
+    ],
 
-	'user_filters' => [
-		'max_user_blocks' => env('PF_MAX_USER_BLOCKS', 50),
-		'max_user_mutes' => env('PF_MAX_USER_MUTES', 50)
-	],
+    'user_filters' => [
+        'max_user_blocks' => env('PF_MAX_USER_BLOCKS', 50),
+        'max_user_mutes' => env('PF_MAX_USER_MUTES', 50),
+        'max_domain_blocks' => env('PF_MAX_DOMAIN_BLOCKS', 50),
+    ],
 
-	'reports' => [
-		'email' => [
-			'enabled' => env('INSTANCE_REPORTS_EMAIL_ENABLED', false),
-			'to' => env('INSTANCE_REPORTS_EMAIL_ADDRESSES'),
-			'autospam' => env('INSTANCE_REPORTS_EMAIL_AUTOSPAM', false)
-		]
-	],
+    'reports' => [
+        'email' => [
+            'enabled' => env('INSTANCE_REPORTS_EMAIL_ENABLED', false),
+            'to' => env('INSTANCE_REPORTS_EMAIL_ADDRESSES'),
+            'autospam' => env('INSTANCE_REPORTS_EMAIL_AUTOSPAM', false),
+        ],
+    ],
 
-	'landing' => [
-		'show_directory' => env('INSTANCE_LANDING_SHOW_DIRECTORY', true),
-		'show_explore' => env('INSTANCE_LANDING_SHOW_EXPLORE', true),
-	],
+    'landing' => [
+        'show_directory' => env('INSTANCE_LANDING_SHOW_DIRECTORY', true),
+        'show_explore' => env('INSTANCE_LANDING_SHOW_EXPLORE', true),
+    ],
 
-	'banner' => [
-		'blurhash' => env('INSTANCE_BANNER_BLURHASH', 'UzJR]l{wHZRjM}R%XRkCH?X9xaWEjZj]kAjt')
-	]
+    'banner' => [
+        'blurhash' => env('INSTANCE_BANNER_BLURHASH', 'UzJR]l{wHZRjM}R%XRkCH?X9xaWEjZj]kAjt'),
+    ],
+
+    'parental_controls' => [
+        'enabled' => env('INSTANCE_PARENTAL_CONTROLS', false),
+
+        'limits' => [
+            'respect_open_registration' => env('INSTANCE_PARENTAL_CONTROLS_RESPECT_OPENREG', true),
+            'max_children' => env('INSTANCE_PARENTAL_CONTROLS_MAX_CHILDREN', 1),
+            'auto_verify_email' => true,
+        ],
+    ],
+
+    'software-update' => [
+        'disable_failed_warning' => env('INSTANCE_SOFTWARE_UPDATE_DISABLE_FAILED_WARNING', false),
+    ],
+
+    'notifications' => [
+        'gc' => [
+            'enabled' => env('INSTANCE_NOTIFY_AUTO_GC', false),
+            'delete_after_days' => env('INSTANCE_NOTIFY_AUTO_GC_DEL_AFTER_DAYS', 365),
+        ],
+
+        'nag' => [
+            'enabled' => (bool) env('INSTANCE_NOTIFY_APP_GATEWAY', true),
+            'api_key' => env('PIXELFED_PUSHGATEWAY_KEY', false),
+            'endpoint' => 'push.pixelfed.net',
+        ],
+    ],
+
+    'curated_registration' => [
+        'enabled' => env('INSTANCE_CUR_REG', false),
+
+        'resend_confirmation_limit' => env('INSTANCE_CUR_REG_RESEND_LIMIT', 5),
+
+        'captcha_enabled' => env('INSTANCE_CUR_REG_CAPTCHA', env('CAPTCHA_ENABLED', false)),
+
+        'state' => [
+            'fallback_on_closed_reg' => true,
+            'only_enabled_on_closed_reg' => env('INSTANCE_CUR_REG_STATE_ONLY_ON_CLOSED', true),
+        ],
+
+        'notify' => [
+            'admin' => [
+                'on_verify_email' => [
+                    'enabled' => env('INSTANCE_CUR_REG_NOTIFY_ADMIN_ON_VERIFY', false),
+                    'bundle' => env('INSTANCE_CUR_REG_NOTIFY_ADMIN_ON_VERIFY_BUNDLE', false),
+                    'max_per_day' => env('INSTANCE_CUR_REG_NOTIFY_ADMIN_ON_VERIFY_MPD', 10),
+                    'cc_addresses' => env('INSTANCE_CUR_REG_NOTIFY_ADMIN_ON_VERIFY_CC'),
+                ],
+                'on_user_response' => env('INSTANCE_CUR_REG_NOTIFY_ADMIN_ON_USER_RESPONSE', false),
+            ],
+        ],
+    ],
+
+    'show_peers' => env('INSTANCE_SHOW_PEERS', false),
 ];
diff --git a/config/mail.php b/config/mail.php
index 4baa90ec8..423f61736 100644
--- a/config/mail.php
+++ b/config/mail.php
@@ -4,45 +4,93 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Mail Driver
+    | Default Mailer
     |--------------------------------------------------------------------------
     |
-    | Laravel supports both SMTP and PHP's "mail" function as drivers for the
-    | sending of e-mail. You may specify which one you're using throughout
-    | your application here. By default, Laravel is setup for SMTP mail.
-    |
-    | Supported: "smtp", "sendmail", "mailgun", "mandrill", "ses",
-    |            "sparkpost", "log", "array"
+    | This option controls the default mailer that is used to send any email
+    | messages sent by your application. Alternative mailers may be setup
+    | and used as needed; however, this mailer will be used by default.
     |
     */
 
-    'driver' => env('MAIL_DRIVER', 'smtp'),
+    'default' => env('MAIL_DRIVER', 'smtp'),
 
     /*
     |--------------------------------------------------------------------------
-    | SMTP Host Address
+    | Mailer Configurations
     |--------------------------------------------------------------------------
     |
-    | Here you may provide the host address of the SMTP server used by your
-    | applications. A default option is provided that is compatible with
-    | the Mailgun mail service which will provide reliable deliveries.
+    | Here you may configure all of the mailers used by your application plus
+    | their respective settings. Several examples have been configured for
+    | you and you are free to add your own as your application requires.
+    |
+    | Laravel supports a variety of mail "transport" drivers to be used while
+    | sending an e-mail. You will specify which one you are using for your
+    | mailers below. You are free to add additional mailers as required.
+    |
+    | Supported: "smtp", "sendmail", "mailgun", "ses", "ses-v2",
+    |            "postmark", "log", "array", "failover"
     |
     */
 
-    'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
+    'mailers' => [
+        'smtp' => [
+            'transport' => 'smtp',
+            'url' => env('MAIL_URL'),
+            'host' => env('MAIL_HOST', '127.0.0.1'),
+            'port' => env('MAIL_PORT', 2525),
+            'encryption' => env('MAIL_ENCRYPTION', 'tls'),
+            'username' => env('MAIL_USERNAME'),
+            'password' => env('MAIL_PASSWORD'),
+            'timeout' => null,
+            'local_domain' => env('MAIL_EHLO_DOMAIN'),
+            'verify_peer' => env('MAIL_SMTP_VERIFY_PEER', true),
+        ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | SMTP Host Port
-    |--------------------------------------------------------------------------
-    |
-    | This is the SMTP port used by your application to deliver e-mails to
-    | users of the application. Like the host we have set this value to
-    | stay compatible with the Mailgun e-mail application by default.
-    |
-    */
+        'ses' => [
+            'transport' => 'ses',
+        ],
 
-    'port' => env('MAIL_PORT', 587),
+        'mailgun' => [
+            'transport' => 'mailgun',
+            'client' => [
+                'timeout' => 5,
+            ],
+        ],
+
+        'postmark' => [
+            'transport' => 'postmark',
+            'message_stream_id' => env('POSTMARK_MESSAGE_STREAM_ID'),
+            'client' => [
+                'timeout' => 5,
+            ],
+        ],
+
+        'resend' => [
+            'transport' => 'resend',
+        ],
+
+        'sendmail' => [
+            'transport' => 'sendmail',
+            'path' => env('MAIL_SENDMAIL_PATH', '/usr/sbin/sendmail -bs -i'),
+        ],
+
+        'log' => [
+            'transport' => 'log',
+            'channel' => env('MAIL_LOG_CHANNEL'),
+        ],
+
+        'array' => [
+            'transport' => 'array',
+        ],
+
+        'failover' => [
+            'transport' => 'failover',
+            'mailers' => [
+                'log',
+            ],
+        ],
+    ],
 
     /*
     |--------------------------------------------------------------------------
@@ -57,63 +105,9 @@ return [
 
     'from' => [
         'address' => env('MAIL_FROM_ADDRESS', 'hello@example.com'),
-        'name'    => env('MAIL_FROM_NAME', 'Example'),
+        'name' => env('MAIL_FROM_NAME', 'Example'),
     ],
 
-    /*
-    |--------------------------------------------------------------------------
-    | E-Mail Encryption Protocol
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify the encryption protocol that should be used when
-    | the application send e-mail messages. A sensible default using the
-    | transport layer security protocol should provide great security.
-    |
-    */
-
-    'encryption' => env('MAIL_ENCRYPTION', 'tls'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | SMTP Server Username
-    |--------------------------------------------------------------------------
-    |
-    | If your SMTP server requires a username for authentication, you should
-    | set it here. This will get used to authenticate with your server on
-    | connection. You may also set the "password" value below this one.
-    |
-    */
-
-    'username' => env('MAIL_USERNAME'),
-    'password' => env('MAIL_PASSWORD'),
-    
-    
-    /*
-    |--------------------------------------------------------------------------
-    | SMTP EHLO Domain
-    |--------------------------------------------------------------------------
-    |
-    | Some SMTP servers require to present a known domain in order to 
-    | allow sending through its relay. (ie: Google Workspace)
-    | This will use the MAIL_SMTP_EHLO env variable to avoid the 421 error
-    | if not present by authenticating the sender domain instead the host.
-    |
-    */
-    'local_domain' => env('MAIL_EHLO_DOMAIN'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Sendmail System Path
-    |--------------------------------------------------------------------------
-    |
-    | When using the "sendmail" driver to send e-mails, we will need to know
-    | the path to where Sendmail lives on this server. A default path has
-    | been provided here, which will work well on most of your systems.
-    |
-    */
-
-    'sendmail' => '/usr/sbin/sendmail -bs',
-
     /*
     |--------------------------------------------------------------------------
     | Markdown Mail Settings
diff --git a/config/pixelfed.php b/config/pixelfed.php
index fc7da598a..9e7898f88 100644
--- a/config/pixelfed.php
+++ b/config/pixelfed.php
@@ -23,7 +23,7 @@ return [
 	| This value is the version of your Pixelfed instance.
 	|
 	*/
-	'version' => '0.11.9',
+	'version' => '0.12.4',
 
 	/*
 	|--------------------------------------------------------------------------
@@ -195,7 +195,7 @@ return [
 	| Max User Limit
 	|--------------------------------------------------------------------------
 	|
-	| Allow a maximum number of user accounts. Default: off
+	| Allow a maximum number of user accounts. Default: enabled w/ 1000 max users
 	|
 	*/
     'max_users' => env('PF_MAX_USERS', 1000),
diff --git a/config/security.php b/config/security.php
index a8f92360d..929c05214 100644
--- a/config/security.php
+++ b/config/security.php
@@ -5,5 +5,18 @@ return [
         'verify_dns' => env('PF_SECURITY_URL_VERIFY_DNS', false),
 
         'trusted_domains' => env('PF_SECURITY_URL_TRUSTED_DOMAINS', 'pixelfed.social,pixelfed.art,mastodon.social'),
+    ],
+
+    'forgot-email' => [
+        'enabled' => env('PF_AUTH_ALLOW_EMAIL_FORGOT', true),
+
+        'limits' => [
+            'max' => [
+                'hourly' => env('PF_AUTH_FORGOT_EMAIL_MAX_HOURLY', 50),
+                'daily' => env('PF_AUTH_FORGOT_EMAIL_MAX_DAILY', 100),
+                'weekly' => env('PF_AUTH_FORGOT_EMAIL_MAX_WEEKLY', 200),
+                'monthly' => env('PF_AUTH_FORGOT_EMAIL_MAX_MONTHLY', 500),
+            ]
+        ]
     ]
 ];
diff --git a/config/services.php b/config/services.php
index 58db77fe5..a1e56ac99 100644
--- a/config/services.php
+++ b/config/services.php
@@ -17,10 +17,12 @@ return [
     'mailgun' => [
         'domain' => env('MAILGUN_DOMAIN'),
         'secret' => env('MAILGUN_SECRET'),
+        'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'),
+        'scheme' => 'https',
     ],
 
     'ses' => [
-        'key'    => env('SES_KEY'),
+        'key' => env('SES_KEY'),
         'secret' => env('SES_SECRET'),
         'region' => env('SES_REGION', 'us-east-1'),
     ],
@@ -30,9 +32,16 @@ return [
     ],
 
     'stripe' => [
-        'model'  => App\User::class,
-        'key'    => env('STRIPE_KEY'),
+        'model' => App\User::class,
+        'key' => env('STRIPE_KEY'),
         'secret' => env('STRIPE_SECRET'),
     ],
 
+    'expo' => [
+        'access_token' => env('EXPO_ACCESS_TOKEN'),
+    ],
+
+    'resend' => [
+        'key' => env('RESEND_KEY'),
+    ],
 ];
diff --git a/config/session.php b/config/session.php
index 1b692e3a4..d3e982bd4 100644
--- a/config/session.php
+++ b/config/session.php
@@ -70,7 +70,7 @@ return [
     |
     */
 
-    'connection' => null,
+    'connection' => env('SESSION_CONNECTION'),
 
     /*
     |--------------------------------------------------------------------------
@@ -96,7 +96,7 @@ return [
     |
     */
 
-    'store' => null,
+    'store' => env('SESSION_STORE'),
 
     /*
     |--------------------------------------------------------------------------
@@ -109,7 +109,7 @@ return [
     |
     */
 
-    'lottery' => [2, 1000],
+    'lottery' => [2, 100],
 
     /*
     |--------------------------------------------------------------------------
@@ -161,7 +161,7 @@ return [
     |
     */
 
-    'secure' => true,
+    'secure' => env('SESSION_SECURE_COOKIE', true),
 
     /*
     |--------------------------------------------------------------------------
@@ -183,12 +183,25 @@ return [
     |
     | This option determines how your cookies behave when cross-site requests
     | take place, and can be used to mitigate CSRF attacks. By default, we
-    | do not enable this as other CSRF protection services are in place.
+    | will set this value to "lax" since this is a secure default value.
     |
-    | Supported: "lax", "strict"
+    | Supported: "lax", "strict", "none", null
     |
     */
 
-    'same_site' => null,
+    'same_site' => env('SESSION_SAME_SITE_COOKIES', 'lax'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Partitioned Cookies
+    |--------------------------------------------------------------------------
+    |
+    | Setting this value to true will tie the cookie to the top-level site for
+    | a cross-site context. Partitioned cookies are accepted by the browser
+    | when flagged "secure" and the Same-Site attribute is set to "none".
+    |
+    */
+
+    'partitioned' => false,
 
 ];
diff --git a/config/webpush.php b/config/webpush.php
new file mode 100644
index 000000000..bef3e6653
--- /dev/null
+++ b/config/webpush.php
@@ -0,0 +1,48 @@
+<?php
+
+return [
+
+    /**
+     * These are the keys for authentication (VAPID).
+     * These keys must be safely stored and should not change.
+     */
+    'vapid' => [
+        'subject' => env('VAPID_SUBJECT'),
+        'public_key' => env('VAPID_PUBLIC_KEY'),
+        'private_key' => env('VAPID_PRIVATE_KEY'),
+        'pem_file' => env('VAPID_PEM_FILE'),
+    ],
+
+    /**
+     * This is model that will be used to for push subscriptions.
+     */
+    'model' => \NotificationChannels\WebPush\PushSubscription::class,
+
+    /**
+     * This is the name of the table that will be created by the migration and
+     * used by the PushSubscription model shipped with this package.
+     */
+    'table_name' => env('WEBPUSH_DB_TABLE', 'push_subscriptions'),
+
+    /**
+     * This is the database connection that will be used by the migration and
+     * the PushSubscription model shipped with this package.
+     */
+    'database_connection' => env('WEBPUSH_DB_CONNECTION', env('DB_CONNECTION', 'mysql')),
+
+    /**
+     * The Guzzle client options used by Minishlink\WebPush.
+     */
+    'client_options' => [],
+
+    /**
+     * Google Cloud Messaging.
+     *
+     * @deprecated
+     */
+    'gcm' => [
+        'key' => env('GCM_KEY'),
+        'sender_id' => env('GCM_SENDER_ID'),
+    ],
+
+];
diff --git a/contrib/docker-nginx.conf b/contrib/docker-nginx.conf
deleted file mode 100644
index 9d0a199e6..000000000
--- a/contrib/docker-nginx.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-upstream fe {
-    server 127.0.0.1:8080;
-}
-
-server {
-    server_name real.domain;
-    listen [::]:443 ssl ipv6only=on; 
-    listen 443 ssl;
-    ssl_certificate /etc/letsencrypt/live/real.domain/fullchain.pem; # managed by Certbot
-    ssl_certificate_key /etc/letsencrypt/live/real.domain/privkey.pem; # managed by Certbot
-    include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
-    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
-
-    location / {
-        proxy_set_header Host $host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_set_header X-Forwarded-Host $http_x_forwarded_host;
-        proxy_set_header X-Forwarded-Port $http_x_forwarded_port;
-        proxy_redirect off;
-        proxy_pass   http://fe/;
-    }
-}
-
-server {
-    if ($host = real.domain) {
-        return 301 https://$host$request_uri;
-    }
-
-    listen 80;
-    listen [::]:80;
-    server_name real.domain;
-    return 404;
-}
\ No newline at end of file
diff --git a/contrib/docker/Dockerfile.apache b/contrib/docker/Dockerfile.apache
deleted file mode 100644
index 9c33aee17..000000000
--- a/contrib/docker/Dockerfile.apache
+++ /dev/null
@@ -1,100 +0,0 @@
-FROM php:8.1-apache-bullseye
-
-ENV COMPOSER_MEMORY_LIMIT=-1
-ARG DEBIAN_FRONTEND=noninteractive
-WORKDIR /var/www/
-
-# Get Composer binary
-COPY --from=composer:2.4.4 /usr/bin/composer /usr/bin/composer
-
-# Install package dependencies
-RUN apt-get update \
-  && apt-get upgrade -y \
-#  && apt-get install -y --no-install-recommends apt-utils \
-  && apt-get install -y --no-install-recommends \
-## Standard
-      locales \
-      locales-all \
-      git \
-      gosu \
-      zip \
-      unzip \
-      libzip-dev \
-      libcurl4-openssl-dev \
-## Image Optimization
-      optipng \
-      pngquant \
-      jpegoptim \
-      gifsicle \
-## Image Processing
-      libjpeg62-turbo-dev \
-      libpng-dev \
-      libmagickwand-dev \
-# Required for GD
-      libxpm4 \
-      libxpm-dev \
-      libwebp6 \
-      libwebp-dev \
-## Video Processing
-      ffmpeg \
-## Database
-#      libpq-dev \
-#      libsqlite3-dev \
-      mariadb-client \
-# Locales Update
-  && sed -i '/en_US/s/^#//g' /etc/locale.gen \
-  && locale-gen \
-  && update-locale \
-# Install PHP extensions
-  && docker-php-source extract \
-#PHP Imagemagick extensions
-  && pecl install imagick \
-  && docker-php-ext-enable imagick \
-# PHP GD extensions
-  && docker-php-ext-configure gd \
-      --with-freetype \
-      --with-jpeg \
-      --with-webp \
-      --with-xpm \
-  && docker-php-ext-install -j$(nproc) gd \
-#PHP Redis extensions
-  && pecl install redis \
-  && docker-php-ext-enable redis \
-#PHP Database extensions
-  && docker-php-ext-install pdo_mysql \
-#pdo_pgsql pdo_sqlite \
-#PHP extensions (dependencies)
-  && docker-php-ext-configure intl \
-  && docker-php-ext-install -j$(nproc) intl bcmath zip pcntl exif curl \
-#APACHE Bootstrap
-  && a2enmod rewrite remoteip \
- && {\
-     echo RemoteIPHeader X-Real-IP ;\
-     echo RemoteIPTrustedProxy 10.0.0.0/8 ;\
-     echo RemoteIPTrustedProxy 172.16.0.0/12 ;\
-     echo RemoteIPTrustedProxy 192.168.0.0/16 ;\
-     echo SetEnvIf X-Forwarded-Proto "https" HTTPS=on ;\
-    } > /etc/apache2/conf-available/remoteip.conf \
- && a2enconf remoteip \
-#Cleanup
-  && docker-php-source delete \
-  && apt-get autoremove --purge -y \
-  && apt-get clean \
-  && rm -rf /var/cache/apt \
-  && rm -rf /var/lib/apt/lists/
-
-# Use the default production configuration
-COPY contrib/docker/php.production.ini "$PHP_INI_DIR/php.ini"
-
-COPY . /var/www/
-# for detail why storage is copied this way, pls refer to https://github.com/pixelfed/pixelfed/pull/2137#discussion_r434468862
-RUN cp -r storage storage.skel \
-  && composer install --prefer-dist --no-interaction --no-ansi --optimize-autoloader \
-  && rm -rf html && ln -s public html \
-  && chown -R www-data:www-data /var/www
-
-RUN php artisan horizon:publish
-
-VOLUME /var/www/storage /var/www/bootstrap
-
-CMD ["/var/www/contrib/docker/start.apache.sh"]
diff --git a/contrib/docker/Dockerfile.fpm b/contrib/docker/Dockerfile.fpm
deleted file mode 100644
index 0b8e5c113..000000000
--- a/contrib/docker/Dockerfile.fpm
+++ /dev/null
@@ -1,90 +0,0 @@
-FROM php:8.1-fpm-bullseye
-
-ENV COMPOSER_MEMORY_LIMIT=-1
-ARG DEBIAN_FRONTEND=noninteractive
-WORKDIR /var/www/
-
-# Get Composer binary
-COPY --from=composer:2.4.4 /usr/bin/composer /usr/bin/composer
-
-# Install package dependencies
-RUN apt-get update \
-  && apt-get upgrade -y \
-#  && apt-get install -y --no-install-recommends apt-utils \
-  && apt-get install -y --no-install-recommends \
-## Standard
-      locales \
-      locales-all \
-      git \
-      gosu \
-      zip \
-      unzip \
-      libzip-dev \
-      libcurl4-openssl-dev \
-## Image Optimization
-      optipng \
-      pngquant \
-      jpegoptim \
-      gifsicle \
-## Image Processing
-      libjpeg62-turbo-dev \
-      libpng-dev \
-      libmagickwand-dev \
-# Required for GD
-      libxpm4 \
-      libxpm-dev \
-      libwebp6 \
-      libwebp-dev \
-## Video Processing
-      ffmpeg \
-## Database
-#      libpq-dev \
-#      libsqlite3-dev \
-      mariadb-client \
-# Locales Update
-  && sed -i '/en_US/s/^#//g' /etc/locale.gen \
-  && locale-gen \
-  && update-locale \
-# Install PHP extensions
-  && docker-php-source extract \
-#PHP Imagemagick extensions
-  && pecl install imagick \
-  && docker-php-ext-enable imagick \
-# PHP GD extensions
-  && docker-php-ext-configure gd \
-      --with-freetype \
-      --with-jpeg \
-      --with-webp \
-      --with-xpm \
-  && docker-php-ext-install -j$(nproc) gd \
-#PHP Redis extensions
-  && pecl install redis \
-  && docker-php-ext-enable redis \
-#PHP Database extensions
-  && docker-php-ext-install pdo_mysql \
-#pdo_pgsql pdo_sqlite \
-#PHP extensions (dependencies)
-  && docker-php-ext-configure intl \
-  && docker-php-ext-install -j$(nproc) intl bcmath zip pcntl exif curl \
-#Cleanup
-  && docker-php-source delete \
-  && apt-get autoremove --purge -y \
-  && apt-get clean \
-  && rm -rf /var/cache/apt \
-  && rm -rf /var/lib/apt/lists/
-
-# Use the default production configuration
-COPY contrib/docker/php.production.ini "$PHP_INI_DIR/php.ini"
-
-COPY . /var/www/
-# for detail why storage is copied this way, pls refer to https://github.com/pixelfed/pixelfed/pull/2137#discussion_r434468862
-RUN cp -r storage storage.skel \
-  && composer install --prefer-dist --no-interaction --no-ansi --optimize-autoloader \
-  && rm -rf html && ln -s public html \
-  && chown -R www-data:www-data /var/www
-
-RUN php artisan horizon:publish
-
-VOLUME /var/www/storage /var/www/bootstrap
-
-CMD ["/var/www/contrib/docker/start.fpm.sh"]
diff --git a/contrib/docker/start.apache.sh b/contrib/docker/start.apache.sh
deleted file mode 100755
index 4fb19e476..000000000
--- a/contrib/docker/start.apache.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# Create the storage tree if needed and fix permissions
-cp -r storage.skel/* storage/
-chown -R www-data:www-data storage/ bootstrap/
-
-# Refresh the environment
-php artisan config:cache
-php artisan storage:link
-php artisan horizon:publish
-php artisan route:cache
-php artisan view:cache
-
-# Finally run Apache
-apache2-foreground
diff --git a/contrib/docker/start.fpm.sh b/contrib/docker/start.fpm.sh
deleted file mode 100755
index 199489fc6..000000000
--- a/contrib/docker/start.fpm.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# Create the storage tree if needed and fix permissions
-cp -r storage.skel/* storage/
-chown -R www-data:www-data storage/ bootstrap/
-
-# Refresh the environment
-php artisan config:cache
-php artisan storage:link
-php artisan horizon:publish
-php artisan route:cache
-php artisan view:cache
-
-# Finally run FPM
-php-fpm
diff --git a/contrib/nginx.conf b/contrib/nginx.conf
deleted file mode 100644
index 0f86ea9e7..000000000
--- a/contrib/nginx.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-server {
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
-    server_name pixelfed.example;                    # change this to your fqdn
-    root /home/pixelfed/public;                      # path to repo/public
-
-    ssl_certificate /etc/nginx/ssl/server.crt;       # generate your own
-    ssl_certificate_key /etc/nginx/ssl/server.key;   # or use letsencrypt
-
-    ssl_protocols TLSv1.2;
-    ssl_ciphers EECDH+AESGCM:EECDH+CHACHA20:EECDH+AES;
-    ssl_prefer_server_ciphers on;
-
-    #add_header X-Frame-Options "SAMEORIGIN";
-    add_header X-XSS-Protection "1; mode=block";
-    add_header X-Content-Type-Options "nosniff";
-
-    index index.php;
-
-    charset utf-8;
-    client_max_body_size 15M;
-
-    location / {
-        try_files $uri $uri/ /index.php?$query_string;
-    }
-
-    location = /favicon.ico { access_log off; log_not_found off; }
-    location = /robots.txt  { access_log off; log_not_found off; }
-
-    error_page 404 /index.php;
-
-    location ~ \.php$ {
-        fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_pass unix:/var/run/php/php8.1-fpm.sock;
-        fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
-        fastcgi_param   QUERY_STRING        $query_string;
-        fastcgi_param   REQUEST_METHOD      $request_method;
-        fastcgi_param   CONTENT_TYPE        $content_type;
-        fastcgi_param   CONTENT_LENGTH      $content_length;
-        fastcgi_param   SCRIPT_NAME     $fastcgi_script_name;
-        fastcgi_param   REQUEST_URI     $request_uri;
-        fastcgi_param   DOCUMENT_URI        $document_uri;
-        fastcgi_param   DOCUMENT_ROOT       $document_root;
-        fastcgi_param   SERVER_PROTOCOL     $server_protocol;
-        fastcgi_param   GATEWAY_INTERFACE   CGI/1.1;
-        fastcgi_param   SERVER_SOFTWARE     nginx/$nginx_version;
-        fastcgi_param   REMOTE_ADDR     $remote_addr;
-        fastcgi_param   REMOTE_PORT     $remote_port;
-        fastcgi_param   SERVER_ADDR     $server_addr;
-        fastcgi_param   SERVER_PORT     $server_port;
-        fastcgi_param   SERVER_NAME     $server_name;
-        fastcgi_param   HTTPS           $https if_not_empty;
-        fastcgi_param   REDIRECT_STATUS     200;
-        fastcgi_param   HTTP_PROXY  "";
-    }
-
-    location ~ /\.(?!well-known).* {
-        deny all;
-    }
-}
-
-server {                                             # Redirect http to https
-    server_name pixelfed.example;                    # change this to your fqdn
-    listen 80;
-    listen [::]:80;
-    return 301 https://$host$request_uri;
-}
diff --git a/database/migrations/2016_06_01_000001_create_oauth_auth_codes_table.php b/database/migrations/2016_06_01_000001_create_oauth_auth_codes_table.php
new file mode 100644
index 000000000..7b93b406a
--- /dev/null
+++ b/database/migrations/2016_06_01_000001_create_oauth_auth_codes_table.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('oauth_auth_codes', function (Blueprint $table) {
+            $table->string('id', 100)->primary();
+            $table->unsignedBigInteger('user_id')->index();
+            $table->unsignedBigInteger('client_id');
+            $table->text('scopes')->nullable();
+            $table->boolean('revoked');
+            $table->dateTime('expires_at')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('oauth_auth_codes');
+    }
+};
diff --git a/database/migrations/2016_06_01_000002_create_oauth_access_tokens_table.php b/database/migrations/2016_06_01_000002_create_oauth_access_tokens_table.php
new file mode 100644
index 000000000..598798eef
--- /dev/null
+++ b/database/migrations/2016_06_01_000002_create_oauth_access_tokens_table.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('oauth_access_tokens', function (Blueprint $table) {
+            $table->string('id', 100)->primary();
+            $table->unsignedBigInteger('user_id')->nullable()->index();
+            $table->unsignedBigInteger('client_id');
+            $table->string('name')->nullable();
+            $table->text('scopes')->nullable();
+            $table->boolean('revoked');
+            $table->timestamps();
+            $table->dateTime('expires_at')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('oauth_access_tokens');
+    }
+};
diff --git a/database/migrations/2016_06_01_000003_create_oauth_refresh_tokens_table.php b/database/migrations/2016_06_01_000003_create_oauth_refresh_tokens_table.php
new file mode 100644
index 000000000..b007904ce
--- /dev/null
+++ b/database/migrations/2016_06_01_000003_create_oauth_refresh_tokens_table.php
@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('oauth_refresh_tokens', function (Blueprint $table) {
+            $table->string('id', 100)->primary();
+            $table->string('access_token_id', 100)->index();
+            $table->boolean('revoked');
+            $table->dateTime('expires_at')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('oauth_refresh_tokens');
+    }
+};
diff --git a/database/migrations/2016_06_01_000004_create_oauth_clients_table.php b/database/migrations/2016_06_01_000004_create_oauth_clients_table.php
new file mode 100644
index 000000000..776ccfab2
--- /dev/null
+++ b/database/migrations/2016_06_01_000004_create_oauth_clients_table.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('oauth_clients', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->unsignedBigInteger('user_id')->nullable()->index();
+            $table->string('name');
+            $table->string('secret', 100)->nullable();
+            $table->string('provider')->nullable();
+            $table->text('redirect');
+            $table->boolean('personal_access_client');
+            $table->boolean('password_client');
+            $table->boolean('revoked');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('oauth_clients');
+    }
+};
diff --git a/database/migrations/2016_06_01_000005_create_oauth_personal_access_clients_table.php b/database/migrations/2016_06_01_000005_create_oauth_personal_access_clients_table.php
new file mode 100644
index 000000000..7c9d1e8f1
--- /dev/null
+++ b/database/migrations/2016_06_01_000005_create_oauth_personal_access_clients_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('oauth_personal_access_clients', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->unsignedBigInteger('client_id');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('oauth_personal_access_clients');
+    }
+};
diff --git a/database/migrations/2018_08_08_100000_create_telescope_entries_table.php b/database/migrations/2018_08_08_100000_create_telescope_entries_table.php
new file mode 100644
index 000000000..700a83f09
--- /dev/null
+++ b/database/migrations/2018_08_08_100000_create_telescope_entries_table.php
@@ -0,0 +1,70 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Get the migration connection name.
+     */
+    public function getConnection(): ?string
+    {
+        return config('telescope.storage.database.connection');
+    }
+
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        $schema = Schema::connection($this->getConnection());
+
+        $schema->create('telescope_entries', function (Blueprint $table) {
+            $table->bigIncrements('sequence');
+            $table->uuid('uuid');
+            $table->uuid('batch_id');
+            $table->string('family_hash')->nullable();
+            $table->boolean('should_display_on_index')->default(true);
+            $table->string('type', 20);
+            $table->longText('content');
+            $table->dateTime('created_at')->nullable();
+
+            $table->unique('uuid');
+            $table->index('batch_id');
+            $table->index('family_hash');
+            $table->index('created_at');
+            $table->index(['type', 'should_display_on_index']);
+        });
+
+        $schema->create('telescope_entries_tags', function (Blueprint $table) {
+            $table->uuid('entry_uuid');
+            $table->string('tag');
+
+            $table->primary(['entry_uuid', 'tag']);
+            $table->index('tag');
+
+            $table->foreign('entry_uuid')
+                ->references('uuid')
+                ->on('telescope_entries')
+                ->onDelete('cascade');
+        });
+
+        $schema->create('telescope_monitoring', function (Blueprint $table) {
+            $table->string('tag')->primary();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        $schema = Schema::connection($this->getConnection());
+
+        $schema->dropIfExists('telescope_entries_tags');
+        $schema->dropIfExists('telescope_entries');
+        $schema->dropIfExists('telescope_monitoring');
+    }
+};
diff --git a/database/migrations/2018_08_12_042648_update_status_table_change_caption_to_text.php b/database/migrations/2018_08_12_042648_update_status_table_change_caption_to_text.php
index 34d67e8c4..28484b42c 100644
--- a/database/migrations/2018_08_12_042648_update_status_table_change_caption_to_text.php
+++ b/database/migrations/2018_08_12_042648_update_status_table_change_caption_to_text.php
@@ -5,13 +5,6 @@ use Illuminate\Support\Facades\Schema;
 
 class UpdateStatusTableChangeCaptionToText extends Migration
 {
-    public function __construct()
-    {
-        DB::getDoctrineSchemaManager()
-            ->getDatabasePlatform()
-            ->registerDoctrineTypeMapping('enum', 'string');
-    }
-
     /**
      * Run the migrations.
      *
diff --git a/database/migrations/2018_09_30_051108_create_direct_messages_table.php b/database/migrations/2018_09_30_051108_create_direct_messages_table.php
index 63b305f4d..97db01e3c 100644
--- a/database/migrations/2018_09_30_051108_create_direct_messages_table.php
+++ b/database/migrations/2018_09_30_051108_create_direct_messages_table.php
@@ -19,7 +19,7 @@ class CreateDirectMessagesTable extends Migration
             $table->bigInteger('from_id')->unsigned()->index();
             $table->string('from_profile_ids')->nullable();
             $table->boolean('group_message')->default(false);
-            $table->bigInteger('status_id')->unsigned()->integer();
+            $table->bigInteger('status_id')->unsigned();
             $table->unique(['to_id', 'from_id', 'status_id']);
             $table->timestamp('read_at')->nullable();
             $table->timestamps();
diff --git a/database/migrations/2018_12_22_055940_add_account_status_to_profiles_table.php b/database/migrations/2018_12_22_055940_add_account_status_to_profiles_table.php
index 04a88060e..097e86753 100644
--- a/database/migrations/2018_12_22_055940_add_account_status_to_profiles_table.php
+++ b/database/migrations/2018_12_22_055940_add_account_status_to_profiles_table.php
@@ -54,12 +54,14 @@ class AddAccountStatusToProfilesTable extends Migration
             $table->string('hub_url')->nullable();
         });
 
-        Schema::table('stories', function (Blueprint $table) {
-            $table->dropColumn('id');
-        });
-        Schema::table('stories', function (Blueprint $table) {
-            $table->bigIncrements('bigIncrements')->first();
-        });
+        if (Schema::hasTable('stories')) {
+            Schema::table('stories', function (Blueprint $table) {
+                $table->dropColumn('id');
+            });
+            Schema::table('stories', function (Blueprint $table) {
+                $table->bigIncrements('bigIncrements')->first();
+            });
+        }
 
         Schema::table('profiles', function (Blueprint $table) {
             $table->dropColumn('status');
diff --git a/database/migrations/2019_01_12_054413_stories.php b/database/migrations/2019_01_12_054413_stories.php
index a61c447de..f58a8cf38 100644
--- a/database/migrations/2019_01_12_054413_stories.php
+++ b/database/migrations/2019_01_12_054413_stories.php
@@ -60,13 +60,7 @@ class Stories extends Migration
     {
         Schema::dropIfExists('story_items');
         Schema::dropIfExists('story_views');
-
-        Schema::table('stories', function (Blueprint $table) {
-            $table->dropColumn(['title','preview_photo','local_only','is_live','broadcast_url','broadcast_key']);
-        });
-
-        Schema::table('story_reactions', function (Blueprint $table) {
-            $table->dropColumn('story_id');
-        });
+        Schema::dropIfExists('story_reactions');
+        Schema::dropIfExists('stories');
     }
 }
diff --git a/database/migrations/2019_03_12_043935_add_snowflakeids_to_users_table.php b/database/migrations/2019_03_12_043935_add_snowflakeids_to_users_table.php
index 3815090ab..8c5dfad93 100644
--- a/database/migrations/2019_03_12_043935_add_snowflakeids_to_users_table.php
+++ b/database/migrations/2019_03_12_043935_add_snowflakeids_to_users_table.php
@@ -6,11 +6,6 @@ use Illuminate\Database\Migrations\Migration;
 
 class AddSnowflakeidsToUsersTable extends Migration
 {
-    public function __construct()
-    {
-        DB::getDoctrineSchemaManager()->getDatabasePlatform()->registerDoctrineTypeMapping('enum', 'string');
-    }
-
     /**
      * Run the migrations.
      *
@@ -19,8 +14,8 @@ class AddSnowflakeidsToUsersTable extends Migration
     public function up()
     {
         Schema::table('statuses', function (Blueprint $table) {
-            $table->dropPrimary('id');
             $table->bigInteger('id')->unsigned()->primary()->change();
+            $table->dropPrimary('id');
         });
     }
 
diff --git a/database/migrations/2019_04_16_184644_add_layout_to_profiles_table.php b/database/migrations/2019_04_16_184644_add_layout_to_profiles_table.php
index ed47eb17c..17328dea5 100644
--- a/database/migrations/2019_04_16_184644_add_layout_to_profiles_table.php
+++ b/database/migrations/2019_04_16_184644_add_layout_to_profiles_table.php
@@ -6,11 +6,6 @@ use Illuminate\Database\Migrations\Migration;
 
 class AddLayoutToProfilesTable extends Migration
 {
-    public function __construct()
-    {
-        DB::getDoctrineSchemaManager()->getDatabasePlatform()->registerDoctrineTypeMapping('enum', 'string');
-    }
-
     /**
      * Run the migrations.
      *
diff --git a/database/migrations/2019_04_25_200411_add_snowflake_ids_to_collections_table.php b/database/migrations/2019_04_25_200411_add_snowflake_ids_to_collections_table.php
index 10392de1f..a0e88ce7e 100644
--- a/database/migrations/2019_04_25_200411_add_snowflake_ids_to_collections_table.php
+++ b/database/migrations/2019_04_25_200411_add_snowflake_ids_to_collections_table.php
@@ -6,11 +6,6 @@ use Illuminate\Database\Migrations\Migration;
 
 class AddSnowflakeIdsToCollectionsTable extends Migration
 {
-    public function __construct()
-    {
-        DB::getDoctrineSchemaManager()->getDatabasePlatform()->registerDoctrineTypeMapping('enum', 'string');
-    }
-
     /**
      * Run the migrations.
      *
@@ -19,13 +14,13 @@ class AddSnowflakeIdsToCollectionsTable extends Migration
     public function up()
     {
         Schema::table('collections', function (Blueprint $table) {
-            $table->dropPrimary('id');
             $table->bigInteger('id')->unsigned()->primary()->change();
+            $table->dropPrimary('id');
         });
 
         Schema::table('collection_items', function (Blueprint $table) {
-            $table->dropPrimary('id');
             $table->bigInteger('id')->unsigned()->primary()->change();
+            $table->dropPrimary('id');
         });
     }
 
diff --git a/database/migrations/2019_08_12_074612_add_unique_to_statuses_table.php b/database/migrations/2019_08_12_074612_add_unique_to_statuses_table.php
index 8d47e6d4f..933ce23af 100644
--- a/database/migrations/2019_08_12_074612_add_unique_to_statuses_table.php
+++ b/database/migrations/2019_08_12_074612_add_unique_to_statuses_table.php
@@ -6,11 +6,6 @@ use Illuminate\Database\Migrations\Migration;
 
 class AddUniqueToStatusesTable extends Migration
 {
-    public function __construct()
-    {
-        DB::getDoctrineSchemaManager()->getDatabasePlatform()->registerDoctrineTypeMapping('enum', 'string');
-    }
-
     /**
      * Run the migrations.
      *
diff --git a/database/migrations/2019_09_09_032757_add_object_id_to_statuses_table.php b/database/migrations/2019_09_09_032757_add_object_id_to_statuses_table.php
index 3cdf9e25a..1832cdeee 100644
--- a/database/migrations/2019_09_09_032757_add_object_id_to_statuses_table.php
+++ b/database/migrations/2019_09_09_032757_add_object_id_to_statuses_table.php
@@ -6,11 +6,6 @@ use Illuminate\Database\Migrations\Migration;
 
 class AddObjectIdToStatusesTable extends Migration
 {
-    public function __construct()
-    {
-        DB::getDoctrineSchemaManager()->getDatabasePlatform()->registerDoctrineTypeMapping('enum', 'string');
-    }
-
     /**
      * Run the migrations.
      *
diff --git a/database/migrations/2019_12_10_023604_create_newsroom_table.php b/database/migrations/2019_12_10_023604_create_newsroom_table.php
index 2651d5c4d..b463f5624 100644
--- a/database/migrations/2019_12_10_023604_create_newsroom_table.php
+++ b/database/migrations/2019_12_10_023604_create_newsroom_table.php
@@ -40,6 +40,6 @@ class CreateNewsroomTable extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('site_news');
+        Schema::dropIfExists('newsroom');
     }
 }
diff --git a/database/migrations/2019_12_25_042317_update_stories_table.php b/database/migrations/2019_12_25_042317_update_stories_table.php
index da778225e..37f63c8ed 100644
--- a/database/migrations/2019_12_25_042317_update_stories_table.php
+++ b/database/migrations/2019_12_25_042317_update_stories_table.php
@@ -6,10 +6,6 @@ use Illuminate\Support\Facades\Schema;
 
 class UpdateStoriesTable extends Migration
 {
-    public function __construct()
-    {
-        DB::getDoctrineSchemaManager()->getDatabasePlatform()->registerDoctrineTypeMapping('enum', 'string');
-    }
     /**
      * Run the migrations.
      *
diff --git a/database/migrations/2021_01_14_034521_add_cache_locks_table.php b/database/migrations/2021_01_14_034521_add_cache_locks_table.php
index 121c69a37..07889b490 100644
--- a/database/migrations/2021_01_14_034521_add_cache_locks_table.php
+++ b/database/migrations/2021_01_14_034521_add_cache_locks_table.php
@@ -27,6 +27,6 @@ class AddCacheLocksTable extends Migration
      */
     public function down()
     {
-        Schema::dropTable('cache_locks');
+        Schema::dropIfExists('cache_locks');
     }
 }
diff --git a/database/migrations/2021_07_23_062326_add_compose_settings_to_user_settings_table.php b/database/migrations/2021_07_23_062326_add_compose_settings_to_user_settings_table.php
index 58837cab3..9cbb317c5 100644
--- a/database/migrations/2021_07_23_062326_add_compose_settings_to_user_settings_table.php
+++ b/database/migrations/2021_07_23_062326_add_compose_settings_to_user_settings_table.php
@@ -33,14 +33,25 @@ class AddComposeSettingsToUserSettingsTable extends Migration
     public function down()
     {
         Schema::table('user_settings', function (Blueprint $table) {
-            $table->dropColumn('compose_settings');
+            if (Schema::hasColumn('user_settings', 'compose_settings')) {
+                $table->dropColumn('compose_settings');
+            }
         });
 
         Schema::table('media', function (Blueprint $table) {
             $table->string('caption')->change();
-            $table->dropIndex('profile_id');
-            $table->dropIndex('mime');
-            $table->dropIndex('license');
+
+            $indexes = Schema::getIndexes('media');
+            $indexesFound = collect($indexes)->map(function($i) { return $i['name']; })->toArray();
+            if (in_array('media_profile_id_index', $indexesFound)) {
+                $table->dropIndex('media_profile_id_index');
+            }
+            if (in_array('media_mime_index', $indexesFound)) {
+                $table->dropIndex('media_mime_index');
+            }
+            if (in_array('media_license_index', $indexesFound)) {
+                $table->dropIndex('media_license_index');
+            }
         });
     }
 }
diff --git a/database/migrations/2021_08_04_100435_create_group_roles_table.php b/database/migrations/2021_08_04_100435_create_group_roles_table.php
new file mode 100644
index 000000000..c2b0d0ff4
--- /dev/null
+++ b/database/migrations/2021_08_04_100435_create_group_roles_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateGroupRolesTable extends Migration
+{
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('group_roles', function (Blueprint $table) {
+			$table->id();
+			$table->bigInteger('group_id')->unsigned()->index();
+			$table->string('name');
+			$table->string('slug')->nullable();
+			$table->text('abilities')->nullable();
+			$table->unique(['group_id', 'slug']);
+			$table->timestamps();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::dropIfExists('group_roles');
+	}
+}
diff --git a/database/migrations/2021_08_16_100034_create_group_interactions_table.php b/database/migrations/2021_08_16_100034_create_group_interactions_table.php
new file mode 100644
index 000000000..adc32d1d1
--- /dev/null
+++ b/database/migrations/2021_08_16_100034_create_group_interactions_table.php
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateGroupInteractionsTable extends Migration
+{
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('group_interactions', function (Blueprint $table) {
+			$table->bigIncrements('id');
+			$table->bigInteger('group_id')->unsigned()->index();
+			$table->bigInteger('profile_id')->unsigned()->index();
+			$table->string('type')->nullable()->index();
+			$table->string('item_type')->nullable()->index();
+			$table->string('item_id')->nullable()->index();
+			$table->json('metadata')->nullable();
+			$table->timestamps();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::dropIfExists('group_interactions');
+	}
+}
diff --git a/database/migrations/2021_08_17_073839_create_group_reports_table.php b/database/migrations/2021_08_17_073839_create_group_reports_table.php
new file mode 100644
index 000000000..93ed00d63
--- /dev/null
+++ b/database/migrations/2021_08_17_073839_create_group_reports_table.php
@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateGroupReportsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('group_reports', function (Blueprint $table) {
+            $table->id();
+            $table->bigInteger('group_id')->unsigned()->index();
+			$table->bigInteger('profile_id')->unsigned()->index();
+			$table->string('type')->nullable()->index();
+			$table->string('item_type')->nullable()->index();
+			$table->string('item_id')->nullable()->index();
+			$table->json('metadata')->nullable();
+			$table->boolean('open')->default(true)->index();
+			$table->unique(['group_id', 'profile_id', 'item_type', 'item_id']);
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('group_reports');
+    }
+}
diff --git a/database/migrations/2021_08_23_062246_update_stories_table_fix_expires_at_column.php b/database/migrations/2021_08_23_062246_update_stories_table_fix_expires_at_column.php
index 61ae60c01..26af256a7 100644
--- a/database/migrations/2021_08_23_062246_update_stories_table_fix_expires_at_column.php
+++ b/database/migrations/2021_08_23_062246_update_stories_table_fix_expires_at_column.php
@@ -14,12 +14,11 @@ class UpdateStoriesTableFixExpiresAtColumn extends Migration
 	public function up()
 	{
 		Schema::table('stories', function (Blueprint $table) {
-			$sm = Schema::getConnection()->getDoctrineSchemaManager();
-			$doctrineTable = $sm->listTableDetails('stories');
-
-			if($doctrineTable->hasIndex('stories_expires_at_index')) {
-				$table->dropIndex('stories_expires_at_index');
-			}
+            $indexes = Schema::getIndexes('stories');
+            $indexesFound = collect($indexes)->map(function($i) { return $i['name']; })->toArray();
+            if (in_array('stories_expires_at_index', $indexesFound)) {
+                $table->dropIndex('stories_expires_at_index');
+            }
 			$table->timestamp('expires_at')->default(null)->index()->nullable()->change();
 			$table->boolean('can_reply')->default(true);
 			$table->boolean('can_react')->default(true);
@@ -37,12 +36,11 @@ class UpdateStoriesTableFixExpiresAtColumn extends Migration
 	public function down()
 	{
 		Schema::table('stories', function (Blueprint $table) {
-			$sm = Schema::getConnection()->getDoctrineSchemaManager();
-			$doctrineTable = $sm->listTableDetails('stories');
-
-			if($doctrineTable->hasIndex('stories_expires_at_index')) {
-				$table->dropIndex('stories_expires_at_index');
-			}
+			$indexes = Schema::getIndexes('stories');
+            $indexesFound = collect($indexes)->map(function($i) { return $i['name']; })->toArray();
+            if (in_array('stories_expires_at_index', $indexesFound)) {
+                $table->dropIndex('stories_expires_at_index');
+            }
 			$table->timestamp('expires_at')->default(null)->index()->nullable()->change();
 			$table->dropColumn('can_reply');
 			$table->dropColumn('can_react');
diff --git a/database/migrations/2021_09_26_112423_create_group_blocks_table.php b/database/migrations/2021_09_26_112423_create_group_blocks_table.php
new file mode 100644
index 000000000..320fcf985
--- /dev/null
+++ b/database/migrations/2021_09_26_112423_create_group_blocks_table.php
@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateGroupBlocksTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('group_blocks', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->bigInteger('group_id')->unsigned()->index();
+			$table->bigInteger('admin_id')->unsigned()->nullable();
+			$table->bigInteger('profile_id')->nullable()->unsigned()->index();
+			$table->bigInteger('instance_id')->nullable()->unsigned()->index();
+			$table->string('name')->nullable()->index();
+			$table->string('reason')->nullable();
+			$table->boolean('is_user')->index();
+			$table->boolean('moderated')->default(false)->index();
+			$table->unique(['group_id', 'profile_id', 'instance_id']);
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('group_blocks');
+    }
+}
diff --git a/database/migrations/2021_09_29_023230_create_group_limits_table.php b/database/migrations/2021_09_29_023230_create_group_limits_table.php
new file mode 100644
index 000000000..67ca7bec8
--- /dev/null
+++ b/database/migrations/2021_09_29_023230_create_group_limits_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateGroupLimitsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('group_limits', function (Blueprint $table) {
+            $table->id();
+            $table->bigInteger('group_id')->unsigned()->index();
+			$table->bigInteger('profile_id')->unsigned()->index();
+			$table->json('limits')->nullable();
+			$table->json('metadata')->nullable();
+			$table->unique(['group_id', 'profile_id']);
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('group_limits');
+    }
+}
diff --git a/database/migrations/2021_10_01_083917_create_group_categories_table.php b/database/migrations/2021_10_01_083917_create_group_categories_table.php
new file mode 100644
index 000000000..481ddf5ef
--- /dev/null
+++ b/database/migrations/2021_10_01_083917_create_group_categories_table.php
@@ -0,0 +1,102 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use App\Models\GroupCategory;
+
+class CreateGroupCategoriesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::dropIfExists('group_categories');
+
+        Schema::create('group_categories', function (Blueprint $table) {
+            $table->id();
+            $table->string('name')->unique()->index();
+            $table->string('slug')->unique()->index();
+            $table->boolean('active')->default(true)->index();
+            $table->tinyInteger('order')->unsigned()->nullable();
+            $table->json('metadata')->nullable();
+            $table->timestamps();
+        });
+
+        $default = [
+        	'General',
+			'Photography',
+			'Fediverse',
+			'CompSci & Programming',
+			'Causes & Movements',
+			'Humor',
+			'Science & Tech',
+			'Travel',
+			'Buy & Sell',
+			'Business',
+			'Style',
+			'Animals',
+			'Sports & Fitness',
+			'Education',
+			'Arts',
+			'Entertainment',
+			'Faith & Spirituality',
+			'Relationships & Identity',
+			'Parenting',
+			'Hobbies & Interests',
+			'Food & Drink',
+			'Vehicles & Commutes',
+			'Civics & Community',
+		];
+
+		for ($i=1; $i <= 23; $i++) {
+			$cat = new GroupCategory;
+			$cat->name = $default[$i - 1];
+			$cat->slug = str_slug($cat->name);
+			$cat->active = true;
+			$cat->order = $i;
+			$cat->save();
+		}
+
+		Schema::table('groups', function (Blueprint $table) {
+			$table->unsignedInteger('category_id')->default(1)->index()->after('id');
+			$table->unsignedInteger('member_count')->nullable();
+			$table->boolean('recommended')->default(false)->index();
+			$table->boolean('discoverable')->default(false)->index();
+			$table->boolean('activitypub')->default(false);
+			$table->boolean('is_nsfw')->default(false);
+			$table->boolean('dms')->default(false);
+			$table->boolean('autospam')->default(false);
+			$table->boolean('verified')->default(false);
+			$table->timestamp('last_active_at')->nullable();
+			$table->softDeletes();
+		});
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('group_categories');
+
+		Schema::table('groups', function (Blueprint $table) {
+			$table->dropColumn('category_id');
+			$table->dropColumn('member_count');
+			$table->dropColumn('recommended');
+			$table->dropColumn('activitypub');
+			$table->dropColumn('is_nsfw');
+			$table->dropColumn('discoverable');
+			$table->dropColumn('dms');
+			$table->dropColumn('autospam');
+			$table->dropColumn('verified');
+			$table->dropColumn('last_active_at');
+			$table->dropColumn('deleted_at');
+		});
+    }
+}
diff --git a/database/migrations/2021_10_09_004230_create_group_hashtags_table.php b/database/migrations/2021_10_09_004230_create_group_hashtags_table.php
new file mode 100644
index 000000000..1d05dabb9
--- /dev/null
+++ b/database/migrations/2021_10_09_004230_create_group_hashtags_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateGroupHashtagsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('group_hashtags', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string('name')->unique()->index();
+            $table->string('formatted')->nullable();
+            $table->boolean('recommended')->default(false);
+            $table->boolean('sensitive')->default(false);
+            $table->boolean('banned')->default(false);
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('group_hashtags');
+    }
+}
diff --git a/database/migrations/2021_10_09_004436_create_group_post_hashtags_table.php b/database/migrations/2021_10_09_004436_create_group_post_hashtags_table.php
new file mode 100644
index 000000000..08014e399
--- /dev/null
+++ b/database/migrations/2021_10_09_004436_create_group_post_hashtags_table.php
@@ -0,0 +1,41 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateGroupPostHashtagsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('group_post_hashtags', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->bigInteger('hashtag_id')->unsigned()->index();
+            $table->bigInteger('group_id')->unsigned()->index();
+            $table->bigInteger('profile_id')->unsigned();
+            $table->bigInteger('status_id')->unsigned()->nullable();
+            $table->string('status_visibility')->nullable();
+            $table->boolean('nsfw')->default(false);
+            $table->unique(['hashtag_id', 'group_id', 'profile_id', 'status_id'], 'group_post_hashtags_gda_unique');
+            $table->foreign('group_id')->references('id')->on('groups')->onDelete('cascade');
+            $table->foreign('profile_id')->references('id')->on('profiles')->onDelete('cascade');
+            $table->foreign('hashtag_id')->references('id')->on('group_hashtags')->onDelete('cascade');
+            $table->foreign('status_id')->references('id')->on('group_posts')->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('group_post_hashtags');
+    }
+}
diff --git a/database/migrations/2021_10_13_002033_create_group_stores_table.php b/database/migrations/2021_10_13_002033_create_group_stores_table.php
new file mode 100644
index 000000000..efdf0a966
--- /dev/null
+++ b/database/migrations/2021_10_13_002033_create_group_stores_table.php
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateGroupStoresTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('group_stores', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->bigInteger('group_id')->unsigned()->nullable()->index();
+            $table->string('store_key')->index();
+            $table->json('store_value')->nullable();
+            $table->json('metadata')->nullable();
+            $table->unique(['group_id', 'store_key']);
+            $table->foreign('group_id')->references('id')->on('groups')->onDelete('cascade');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('group_stores');
+    }
+}
diff --git a/database/migrations/2021_10_13_002041_create_group_events_table.php b/database/migrations/2021_10_13_002041_create_group_events_table.php
new file mode 100644
index 000000000..166c35cf0
--- /dev/null
+++ b/database/migrations/2021_10_13_002041_create_group_events_table.php
@@ -0,0 +1,44 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateGroupEventsTable extends Migration
+{
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('group_events', function (Blueprint $table) {
+			$table->bigIncrements('id');
+			$table->bigInteger('group_id')->unsigned()->nullable()->index();
+			$table->bigInteger('profile_id')->unsigned()->nullable()->index();
+			$table->string('name')->nullable();
+			$table->string('type')->index();
+			$table->json('tags')->nullable();
+			$table->json('location')->nullable();
+			$table->text('description')->nullable();
+			$table->json('metadata')->nullable();
+			$table->boolean('open')->default(false)->index();
+			$table->boolean('comments_open')->default(false);
+			$table->boolean('show_guest_list')->default(false);
+			$table->timestamp('start_at')->nullable();
+			$table->timestamp('end_at')->nullable();
+			$table->timestamps();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::dropIfExists('group_events');
+	}
+}
diff --git a/database/migrations/2021_10_13_002124_create_group_activity_graphs_table.php b/database/migrations/2021_10_13_002124_create_group_activity_graphs_table.php
new file mode 100644
index 000000000..13fef7240
--- /dev/null
+++ b/database/migrations/2021_10_13_002124_create_group_activity_graphs_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateGroupActivityGraphsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('group_activity_graphs', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->bigInteger('instance_id')->nullable()->index();
+            $table->bigInteger('actor_id')->nullable()->index();
+            $table->string('verb')->nullable()->index();
+            $table->string('id_url')->nullable()->unique()->index();
+            $table->json('payload')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('group_activity_graphs');
+    }
+}
diff --git a/database/migrations/2022_10_07_055133_remove_old_compound_index_from_statuses_table.php b/database/migrations/2022_10_07_055133_remove_old_compound_index_from_statuses_table.php
index ae9b84bbc..e3f943dd8 100644
--- a/database/migrations/2022_10_07_055133_remove_old_compound_index_from_statuses_table.php
+++ b/database/migrations/2022_10_07_055133_remove_old_compound_index_from_statuses_table.php
@@ -14,8 +14,9 @@ class RemoveOldCompoundIndexFromStatusesTable extends Migration
     public function up()
     {
         Schema::table('statuses', function (Blueprint $table) {
-            $sc = Schema::getConnection()->getDoctrineSchemaManager();
-            if(array_key_exists('statuses_in_reply_to_id_reblog_of_id_index', $sc->listTableIndexes('statuses'))) {
+            $indexes = Schema::getIndexes('statuses');
+            $indexesFound = collect($indexes)->map(function($i) { return $i['name']; })->toArray();
+            if (in_array('statuses_in_reply_to_id_reblog_of_id_index', $indexesFound)) {
                 $table->dropIndex('statuses_in_reply_to_id_reblog_of_id_index');
             }
         });
diff --git a/database/migrations/2022_11_30_123940_update_avatars_table_remove_cdn_url_unique_constraint.php b/database/migrations/2022_11_30_123940_update_avatars_table_remove_cdn_url_unique_constraint.php
index 423ff1b85..a3767fec0 100644
--- a/database/migrations/2022_11_30_123940_update_avatars_table_remove_cdn_url_unique_constraint.php
+++ b/database/migrations/2022_11_30_123940_update_avatars_table_remove_cdn_url_unique_constraint.php
@@ -14,9 +14,9 @@ return new class extends Migration
     public function up()
     {
         Schema::table('avatars', function (Blueprint $table) {
-            $sm = Schema::getConnection()->getDoctrineSchemaManager();
-            $indexesFound = $sm->listTableIndexes('avatars');
-            if(array_key_exists("avatars_cdn_url_unique", $indexesFound)) {
+            $indexes = Schema::getIndexes('avatars');
+            $indexesFound = collect($indexes)->map(function($i) { return $i['name']; })->toArray();
+            if (in_array('avatars_cdn_url_unique', $indexesFound)) {
                 $table->dropUnique('avatars_cdn_url_unique');
             }
         });
diff --git a/database/migrations/2023_02_04_053028_fix_cloud_media_paths.php b/database/migrations/2023_02_04_053028_fix_cloud_media_paths.php
index b45ad7f80..31b16de1e 100644
--- a/database/migrations/2023_02_04_053028_fix_cloud_media_paths.php
+++ b/database/migrations/2023_02_04_053028_fix_cloud_media_paths.php
@@ -19,7 +19,7 @@ return new class extends Migration
     public function up()
     {
         ini_set('memory_limit', '-1');
-        if(config_cache('pixelfed.cloud_storage') == false) {
+        if((bool) config_cache('pixelfed.cloud_storage') == false) {
             return;
         }
 
diff --git a/database/migrations/2023_11_13_062429_add_followers_count_index_to_profiles_table.php b/database/migrations/2023_11_13_062429_add_followers_count_index_to_profiles_table.php
new file mode 100644
index 000000000..bcc97577c
--- /dev/null
+++ b/database/migrations/2023_11_13_062429_add_followers_count_index_to_profiles_table.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('profiles', function (Blueprint $table) {
+           $table->index('followers_count', 'profiles_followers_count_index');
+           $table->index('following_count', 'profiles_following_count_index');
+           $table->index('status_count', 'profiles_status_count_index');
+           $table->index('is_private', 'profiles_is_private_index');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('profiles', function (Blueprint $table) {
+            $table->dropIndex('profiles_followers_count_index');
+            $table->dropIndex('profiles_following_count_index');
+            $table->dropIndex('profiles_status_count_index');
+            $table->dropIndex('profiles_is_private_index');
+        });
+    }
+};
diff --git a/database/migrations/2023_11_16_124107_create_hashtag_related_table.php b/database/migrations/2023_11_16_124107_create_hashtag_related_table.php
new file mode 100644
index 000000000..33d7494d8
--- /dev/null
+++ b/database/migrations/2023_11_16_124107_create_hashtag_related_table.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('hashtag_related', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->bigInteger('hashtag_id')->unsigned()->unique()->index();
+            $table->json('related_tags')->nullable();
+            $table->bigInteger('agg_score')->unsigned()->nullable()->index();
+            $table->timestamp('last_calculated_at')->nullable()->index();
+            $table->timestamp('last_moderated_at')->nullable()->index();
+            $table->boolean('skip_refresh')->default(false)->index();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('hashtag_related');
+    }
+};
diff --git a/database/migrations/2023_11_26_082439_add_state_and_score_to_places_table.php b/database/migrations/2023_11_26_082439_add_state_and_score_to_places_table.php
new file mode 100644
index 000000000..d7f95aa3f
--- /dev/null
+++ b/database/migrations/2023_11_26_082439_add_state_and_score_to_places_table.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('places', function (Blueprint $table) {
+            $table->string('state')->nullable()->index()->after('name');
+            $table->tinyInteger('score')->default(0)->index()->after('long');
+            $table->unsignedBigInteger('cached_post_count')->nullable();
+            $table->timestamp('last_checked_at')->nullable()->index();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('places', function (Blueprint $table) {
+            $table->dropColumn('state');
+            $table->dropColumn('score');
+            $table->dropColumn('cached_post_count');
+            $table->dropColumn('last_checked_at');
+        });
+    }
+};
diff --git a/database/migrations/2023_12_04_041631_create_push_subscriptions_table.php b/database/migrations/2023_12_04_041631_create_push_subscriptions_table.php
new file mode 100644
index 000000000..550a98f6a
--- /dev/null
+++ b/database/migrations/2023_12_04_041631_create_push_subscriptions_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreatePushSubscriptionsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::connection(config('webpush.database_connection'))->create(config('webpush.table_name'), function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->morphs('subscribable');
+            $table->string('endpoint', 500)->unique();
+            $table->string('public_key')->nullable();
+            $table->string('auth_token')->nullable();
+            $table->string('content_encoding')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::connection(config('webpush.database_connection'))->dropIfExists(config('webpush.table_name'));
+    }
+}
diff --git a/database/migrations/2023_12_05_092152_add_active_deliver_to_instances_table.php b/database/migrations/2023_12_05_092152_add_active_deliver_to_instances_table.php
new file mode 100644
index 000000000..d6e413768
--- /dev/null
+++ b/database/migrations/2023_12_05_092152_add_active_deliver_to_instances_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('instances', function (Blueprint $table) {
+            $table->boolean('active_deliver')->nullable()->index()->after('domain');
+            $table->boolean('valid_nodeinfo')->nullable();
+            $table->timestamp('nodeinfo_last_fetched')->nullable();
+            $table->boolean('delivery_timeout')->default(false);
+            $table->timestamp('delivery_next_after')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('instances', function (Blueprint $table) {
+            $table->dropColumn('active_deliver');
+            $table->dropColumn('valid_nodeinfo');
+            $table->dropColumn('nodeinfo_last_fetched');
+            $table->dropColumn('delivery_timeout');
+            $table->dropColumn('delivery_next_after');
+        });
+    }
+};
diff --git a/database/migrations/2023_12_08_074345_add_direct_object_urls_to_statuses_table.php b/database/migrations/2023_12_08_074345_add_direct_object_urls_to_statuses_table.php
new file mode 100644
index 000000000..5211c658f
--- /dev/null
+++ b/database/migrations/2023_12_08_074345_add_direct_object_urls_to_statuses_table.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use App\Status;
+use Illuminate\Database\UniqueConstraintViolationException;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        foreach(Status::whereScope('direct')->whereNotNull('url')->whereNull('object_url')->lazyById(50, 'id') as $status) {
+            try {
+                $status->object_url = $status->url;
+                $status->uri = $status->url;
+                $status->save();
+            } catch (Exception | UniqueConstraintViolationException $e) {
+                continue;
+            }
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+    }
+};
diff --git a/database/migrations/2023_12_13_060425_add_uploaded_to_s3_to_import_posts_table.php b/database/migrations/2023_12_13_060425_add_uploaded_to_s3_to_import_posts_table.php
new file mode 100644
index 000000000..c7d5cdcbd
--- /dev/null
+++ b/database/migrations/2023_12_13_060425_add_uploaded_to_s3_to_import_posts_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('import_posts', function (Blueprint $table) {
+            $table->boolean('uploaded_to_s3')->default(false)->index()->after('skip_missing_media');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('import_posts', function (Blueprint $table) {
+            $table->dropColumn('uploaded_to_s3');
+        });
+    }
+};
diff --git a/database/migrations/2023_12_16_052413_create_user_domain_blocks_table.php b/database/migrations/2023_12_16_052413_create_user_domain_blocks_table.php
new file mode 100644
index 000000000..16f8f3fb2
--- /dev/null
+++ b/database/migrations/2023_12_16_052413_create_user_domain_blocks_table.php
@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('user_domain_blocks', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedBigInteger('profile_id')->index();
+            $table->string('domain')->index();
+            $table->unique(['profile_id', 'domain'], 'user_domain_blocks_by_id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('user_domain_blocks');
+    }
+};
diff --git a/database/migrations/2023_12_19_081928_create_job_batches_table.php b/database/migrations/2023_12_19_081928_create_job_batches_table.php
new file mode 100644
index 000000000..50e38c20f
--- /dev/null
+++ b/database/migrations/2023_12_19_081928_create_job_batches_table.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('job_batches', function (Blueprint $table) {
+            $table->string('id')->primary();
+            $table->string('name');
+            $table->integer('total_jobs');
+            $table->integer('pending_jobs');
+            $table->integer('failed_jobs');
+            $table->longText('failed_job_ids');
+            $table->mediumText('options')->nullable();
+            $table->integer('cancelled_at')->nullable();
+            $table->integer('created_at');
+            $table->integer('finished_at')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('job_batches');
+    }
+};
diff --git a/database/migrations/2023_12_21_103223_purge_deleted_status_hashtags.php b/database/migrations/2023_12_21_103223_purge_deleted_status_hashtags.php
new file mode 100644
index 000000000..bf2acc34e
--- /dev/null
+++ b/database/migrations/2023_12_21_103223_purge_deleted_status_hashtags.php
@@ -0,0 +1,25 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use App\StatusHashtag;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        StatusHashtag::doesntHave('status')->lazyById(200)->each->deleteQuietly();
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        //
+    }
+};
diff --git a/database/migrations/2023_12_21_104103_create_default_domain_blocks_table.php b/database/migrations/2023_12_21_104103_create_default_domain_blocks_table.php
new file mode 100644
index 000000000..72e61bda5
--- /dev/null
+++ b/database/migrations/2023_12_21_104103_create_default_domain_blocks_table.php
@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('default_domain_blocks', function (Blueprint $table) {
+            $table->id();
+            $table->string('domain')->unique()->index();
+            $table->text('note')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('default_domain_blocks');
+    }
+};
diff --git a/database/migrations/2023_12_27_081801_create_user_roles_table.php b/database/migrations/2023_12_27_081801_create_user_roles_table.php
new file mode 100644
index 000000000..59b8ab390
--- /dev/null
+++ b/database/migrations/2023_12_27_081801_create_user_roles_table.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('user_roles', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedBigInteger('profile_id')->unique()->index();
+            $table->unsignedInteger('user_id')->unique()->index();
+            $table->json('roles')->nullable();
+            $table->json('meta')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('user_roles');
+    }
+};
diff --git a/database/migrations/2023_12_27_082024_add_has_roles_to_users_table.php b/database/migrations/2023_12_27_082024_add_has_roles_to_users_table.php
new file mode 100644
index 000000000..f32fe599c
--- /dev/null
+++ b/database/migrations/2023_12_27_082024_add_has_roles_to_users_table.php
@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->boolean('has_roles')->default(false);
+            $table->unsignedInteger('parent_id')->nullable();
+            $table->tinyInteger('role_id')->unsigned()->nullable()->index();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            if (Schema::hasColumn('users', 'has_roles')) {
+                $table->dropColumn('has_roles');
+            }
+
+            if (Schema::hasColumn('users', 'role_id')) {
+                $table->dropColumn('role_id');
+            }
+
+            if (Schema::hasColumn('users', 'parent_id')) {
+                $table->dropColumn('parent_id');
+            }
+        });
+    }
+};
diff --git a/database/migrations/2024_01_09_052419_create_parental_controls_table.php b/database/migrations/2024_01_09_052419_create_parental_controls_table.php
new file mode 100644
index 000000000..9974c6241
--- /dev/null
+++ b/database/migrations/2024_01_09_052419_create_parental_controls_table.php
@@ -0,0 +1,53 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('parental_controls', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedInteger('parent_id')->index();
+            $table->unsignedInteger('child_id')->unique()->index()->nullable();
+            $table->string('email')->unique()->nullable();
+            $table->string('verify_code')->nullable();
+            $table->timestamp('email_sent_at')->nullable();
+            $table->timestamp('email_verified_at')->nullable();
+            $table->json('permissions')->nullable();
+            $table->softDeletes();
+            $table->timestamps();
+        });
+
+        Schema::table('user_roles', function (Blueprint $table) {
+            $indexes = Schema::getIndexes('user_roles');
+            $indexesFound = collect($indexes)->map(function($i) { return $i['name']; })->toArray();
+            if (in_array('user_roles_profile_id_unique', $indexesFound)) {
+                $table->dropUnique('user_roles_profile_id_unique');
+            }
+            $table->unsignedBigInteger('profile_id')->unique()->nullable()->index()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('parental_controls');
+
+        Schema::table('user_roles', function (Blueprint $table) {
+            $indexes = Schema::getIndexes('user_roles');
+            $indexesFound = collect($indexes)->map(function($i) { return $i['name']; })->toArray();
+            if (in_array('user_roles_profile_id_unique', $indexesFound)) {
+                $table->dropUnique('user_roles_profile_id_unique');
+            }
+            $table->unsignedBigInteger('profile_id')->unique()->index()->change();
+        });
+    }
+};
diff --git a/database/migrations/2024_01_16_073327_create_curated_registers_table.php b/database/migrations/2024_01_16_073327_create_curated_registers_table.php
new file mode 100644
index 000000000..8f665cdc3
--- /dev/null
+++ b/database/migrations/2024_01_16_073327_create_curated_registers_table.php
@@ -0,0 +1,44 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('curated_registers', function (Blueprint $table) {
+            $table->id();
+            $table->string('email')->unique()->nullable()->index();
+            $table->string('username')->unique()->nullable()->index();
+            $table->string('password')->nullable();
+            $table->string('ip_address')->nullable();
+            $table->string('verify_code')->nullable();
+            $table->text('reason_to_join')->nullable();
+            $table->unsignedBigInteger('invited_by')->nullable()->index();
+            $table->boolean('is_approved')->default(0)->index();
+            $table->boolean('is_rejected')->default(0)->index();
+            $table->boolean('is_awaiting_more_info')->default(0)->index();
+            $table->boolean('is_closed')->default(0)->index();
+            $table->json('autofollow_account_ids')->nullable();
+            $table->json('admin_notes')->nullable();
+            $table->unsignedInteger('approved_by_admin_id')->nullable();
+            $table->timestamp('email_verified_at')->nullable();
+            $table->timestamp('admin_notified_at')->nullable();
+            $table->timestamp('action_taken_at')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('curated_registers');
+    }
+};
diff --git a/database/migrations/2024_01_20_091352_create_curated_register_activities_table.php b/database/migrations/2024_01_20_091352_create_curated_register_activities_table.php
new file mode 100644
index 000000000..410804750
--- /dev/null
+++ b/database/migrations/2024_01_20_091352_create_curated_register_activities_table.php
@@ -0,0 +1,42 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('curated_register_activities', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedInteger('register_id')->nullable()->index();
+            $table->unsignedInteger('admin_id')->nullable();
+            $table->unsignedInteger('reply_to_id')->nullable()->index();
+            $table->string('secret_code')->nullable();
+            $table->string('type')->nullable()->index();
+            $table->string('title')->nullable();
+            $table->string('link')->nullable();
+            $table->text('message')->nullable();
+            $table->json('metadata')->nullable();
+            $table->boolean('from_admin')->default(false)->index();
+            $table->boolean('from_user')->default(false)->index();
+            $table->boolean('admin_only_view')->default(true);
+            $table->boolean('action_required')->default(false);
+            $table->timestamp('admin_notified_at')->nullable();
+            $table->timestamp('action_taken_at')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('curated_register_activities');
+    }
+};
diff --git a/database/migrations/2024_01_22_090048_create_user_email_forgots_table.php b/database/migrations/2024_01_22_090048_create_user_email_forgots_table.php
new file mode 100644
index 000000000..845b63934
--- /dev/null
+++ b/database/migrations/2024_01_22_090048_create_user_email_forgots_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('user_email_forgots', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedInteger('user_id')->index();
+            $table->string('ip_address')->nullable();
+            $table->string('user_agent')->nullable();
+            $table->string('referrer')->nullable();
+            $table->timestamp('email_sent_at')->nullable()->index();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('user_email_forgots');
+    }
+};
diff --git a/database/migrations/2024_02_24_093824_add_has_responded_to_curated_registers_table.php b/database/migrations/2024_02_24_093824_add_has_responded_to_curated_registers_table.php
new file mode 100644
index 000000000..9453a73d7
--- /dev/null
+++ b/database/migrations/2024_02_24_093824_add_has_responded_to_curated_registers_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use App\Models\CuratedRegister;
+use App\Models\CuratedRegisterActivity;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('curated_registers', function (Blueprint $table) {
+            $table->boolean('user_has_responded')->default(false)->index()->after('is_awaiting_more_info');
+        });
+
+        CuratedRegisterActivity::whereFromUser(true)->get()->each(function($cra) {
+            $cr = CuratedRegister::find($cra->register_id);
+            $cr->user_has_responded = true;
+            $cr->save();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('curated_registers', function (Blueprint $table) {
+            $table->dropColumn('user_has_responded');
+        });
+    }
+};
diff --git a/database/migrations/2024_02_24_105641_create_curated_register_templates_table.php b/database/migrations/2024_02_24_105641_create_curated_register_templates_table.php
new file mode 100644
index 000000000..4829fefb2
--- /dev/null
+++ b/database/migrations/2024_02_24_105641_create_curated_register_templates_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('curated_register_templates', function (Blueprint $table) {
+            $table->id();
+            $table->string('name')->nullable();
+            $table->text('description')->nullable();
+            $table->text('content')->nullable();
+            $table->boolean('is_active')->default(false)->index();
+            $table->tinyInteger('order')->default(10)->unsigned()->index();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('curated_register_templates');
+    }
+};
diff --git a/database/migrations/2024_03_02_094235_create_profile_migrations_table.php b/database/migrations/2024_03_02_094235_create_profile_migrations_table.php
new file mode 100644
index 000000000..2eafaa43b
--- /dev/null
+++ b/database/migrations/2024_03_02_094235_create_profile_migrations_table.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('profile_migrations', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedBigInteger('profile_id');
+            $table->string('acct')->nullable();
+            $table->unsignedBigInteger('followers_count')->default(0);
+            $table->unsignedBigInteger('target_profile_id')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('profile_migrations');
+    }
+};
diff --git a/database/migrations/2024_03_08_122947_add_shared_inbox_attribute_to_instances_table.php b/database/migrations/2024_03_08_122947_add_shared_inbox_attribute_to_instances_table.php
new file mode 100644
index 000000000..a3d69f271
--- /dev/null
+++ b/database/migrations/2024_03_08_122947_add_shared_inbox_attribute_to_instances_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('instances', function (Blueprint $table) {
+            $table->string('shared_inbox')->nullable()->index();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('instances', function (Blueprint $table) {
+            $table->dropColumn('shared_inbox');
+        });
+    }
+};
diff --git a/database/migrations/2024_03_08_123356_add_shared_inboxes_to_instances_table.php b/database/migrations/2024_03_08_123356_add_shared_inboxes_to_instances_table.php
new file mode 100644
index 000000000..ff7eebc69
--- /dev/null
+++ b/database/migrations/2024_03_08_123356_add_shared_inboxes_to_instances_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use App\Instance;
+use App\Profile;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        foreach(Instance::lazyById(50, 'id') as $instance) {
+            $si = Profile::whereDomain($instance->domain)->whereNotNull('sharedInbox')->first();
+            if($si && $si->sharedInbox) {
+                $instance->shared_inbox = $si->sharedInbox;
+                $instance->save();
+            }
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+
+    }
+};
diff --git a/database/migrations/2024_05_20_062706_update_group_posts_table.php b/database/migrations/2024_05_20_062706_update_group_posts_table.php
new file mode 100644
index 000000000..828727395
--- /dev/null
+++ b/database/migrations/2024_05_20_062706_update_group_posts_table.php
@@ -0,0 +1,52 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('group_posts', function (Blueprint $table) {
+            if (DB::getDriverName() === 'sqlite') {
+                $table->dropUnique(['status_id']);
+            }
+            $table->dropColumn('status_id');
+            $table->dropColumn('reply_child_id');
+            $table->dropColumn('in_reply_to_id');
+            $table->dropColumn('reblog_of_id');
+            $table->text('caption')->nullable();
+            $table->string('visibility')->nullable();
+            $table->boolean('is_nsfw')->default(false);
+            $table->unsignedInteger('likes_count')->default(0);
+            $table->text('cw_summary')->nullable();
+            $table->json('media_ids')->nullable();
+            $table->boolean('comments_disabled')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('group_posts', function (Blueprint $table) {
+            $table->bigInteger('status_id')->unsigned()->unique()->nullable();
+            $table->bigInteger('reply_child_id')->unsigned()->nullable();
+            $table->bigInteger('in_reply_to_id')->unsigned()->nullable();
+            $table->bigInteger('reblog_of_id')->unsigned()->nullable();
+            $table->dropColumn('caption');
+            $table->dropColumn('is_nsfw');
+            $table->dropColumn('visibility');
+            $table->dropColumn('likes_count');
+            $table->dropColumn('cw_summary');
+            $table->dropColumn('media_ids');
+            $table->dropColumn('comments_disabled');
+        });
+    }
+};
diff --git a/database/migrations/2024_05_20_063638_create_group_comments_table.php b/database/migrations/2024_05_20_063638_create_group_comments_table.php
new file mode 100644
index 000000000..ad49f58c8
--- /dev/null
+++ b/database/migrations/2024_05_20_063638_create_group_comments_table.php
@@ -0,0 +1,43 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('group_comments', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->unsignedBigInteger('group_id')->index();
+            $table->unsignedBigInteger('profile_id')->nullable();
+            $table->unsignedBigInteger('status_id')->nullable()->index();
+            $table->unsignedBigInteger('in_reply_to_id')->nullable()->index();
+            $table->string('remote_url')->nullable()->unique()->index();
+            $table->text('caption')->nullable();
+            $table->boolean('is_nsfw')->default(false);
+            $table->string('visibility')->nullable();
+            $table->unsignedInteger('likes_count')->default(0);
+            $table->unsignedInteger('replies_count')->default(0);
+            $table->text('cw_summary')->nullable();
+            $table->json('media_ids')->nullable();
+            $table->string('status')->nullable();
+            $table->string('type')->default('text')->nullable();
+            $table->boolean('local')->default(false);
+            $table->json('metadata')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('group_comments');
+    }
+};
diff --git a/database/migrations/2024_05_20_073054_create_group_likes_table.php b/database/migrations/2024_05_20_073054_create_group_likes_table.php
new file mode 100644
index 000000000..162ef7458
--- /dev/null
+++ b/database/migrations/2024_05_20_073054_create_group_likes_table.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('group_likes', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->unsignedBigInteger('group_id');
+            $table->unsignedBigInteger('profile_id')->index();
+            $table->unsignedBigInteger('status_id')->nullable();
+            $table->unsignedBigInteger('comment_id')->nullable();
+            $table->boolean('local')->default(true);
+            $table->unique(['group_id', 'profile_id', 'status_id', 'comment_id'], 'group_likes_gpsc_unique');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('group_likes');
+    }
+};
diff --git a/database/migrations/2024_05_20_083159_create_group_media_table.php b/database/migrations/2024_05_20_083159_create_group_media_table.php
new file mode 100644
index 000000000..732856097
--- /dev/null
+++ b/database/migrations/2024_05_20_083159_create_group_media_table.php
@@ -0,0 +1,50 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('group_media', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->unsignedBigInteger('group_id');
+            $table->unsignedBigInteger('profile_id');
+            $table->unsignedBigInteger('status_id')->nullable()->index();
+            $table->string('media_path')->unique();
+            $table->text('thumbnail_url')->nullable();
+            $table->text('cdn_url')->nullable();
+            $table->text('url')->nullable();
+            $table->string('mime')->nullable();
+            $table->unsignedInteger('size')->nullable();
+            $table->text('cw_summary')->nullable();
+            $table->string('license')->nullable();
+            $table->string('blurhash')->nullable();
+            $table->tinyInteger('order')->unsigned()->default(1);
+            $table->unsignedInteger('width')->nullable();
+            $table->unsignedInteger('height')->nullable();
+            $table->boolean('local_user')->default(true);
+            $table->boolean('is_cached')->default(false);
+            $table->boolean('is_comment')->default(false)->index();
+            $table->json('metadata')->nullable();
+            $table->string('version')->default(1);
+            $table->boolean('skip_optimize')->default(false);
+            $table->timestamp('processed_at')->nullable();
+            $table->timestamp('thumbnail_generated')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('group_media');
+    }
+};
diff --git a/database/migrations/2024_05_31_090555_update_instances_table_add_index_to_nodeinfo_last_fetched_at.php b/database/migrations/2024_05_31_090555_update_instances_table_add_index_to_nodeinfo_last_fetched_at.php
new file mode 100644
index 000000000..a5eb3b921
--- /dev/null
+++ b/database/migrations/2024_05_31_090555_update_instances_table_add_index_to_nodeinfo_last_fetched_at.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('instances', function (Blueprint $table) {
+            $indexes = Schema::getIndexes('instances');
+            $indexesFound = collect($indexes)->map(function($i) { return $i['name']; })->toArray();
+            if (!in_array('instances_nodeinfo_last_fetched_index', $indexesFound)) {
+                $table->index('nodeinfo_last_fetched');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('instances', function (Blueprint $table) {
+            $indexes = Schema::getIndexes('instances');
+            $indexesFound = collect($indexes)->map(function($i) { return $i['name']; })->toArray();
+            if (in_array('instances_nodeinfo_last_fetched_index', $indexesFound)) {
+                $table->dropIndex('instances_nodeinfo_last_fetched_index');
+            }
+        });
+    }
+};
diff --git a/database/migrations/2024_06_03_232204_add_url_index_to_statuses_table.php b/database/migrations/2024_06_03_232204_add_url_index_to_statuses_table.php
new file mode 100644
index 000000000..98ce0d5e9
--- /dev/null
+++ b/database/migrations/2024_06_03_232204_add_url_index_to_statuses_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('statuses', function (Blueprint $table) {
+            $indexes = Schema::getIndexes('statuses');
+            $indexesFound = collect($indexes)->map(function($i) { return $i['name']; })->toArray();
+            if (!in_array('statuses_url_index', $indexesFound)) {
+                $table->index('url');
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('statuses', function (Blueprint $table) {
+            $indexes = Schema::getIndexes('statuses');
+            $indexesFound = collect($indexes)->map(function($i) { return $i['name']; })->toArray();
+            if (in_array('statuses_url_index', $indexesFound)) {
+                $table->dropIndex('statuses_url_index');
+            }
+        });
+    }
+};
diff --git a/database/migrations/2024_06_19_084835_add_total_local_posts_to_config_cache.php b/database/migrations/2024_06_19_084835_add_total_local_posts_to_config_cache.php
new file mode 100644
index 000000000..35f00f60a
--- /dev/null
+++ b/database/migrations/2024_06_19_084835_add_total_local_posts_to_config_cache.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Storage;
+use App\Services\ConfigCacheService;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        $count = DB::table('statuses')->whereNull(['url', 'deleted_at'])->count();
+        $res = [
+            'count' => $count
+        ];
+        Storage::put('total_local_posts.json', json_encode($res, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT));
+        ConfigCacheService::put('instance.stats.total_local_posts', $res['count']);
+        Cache::forget('api:nodeinfo');
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        //
+    }
+};
diff --git a/database/migrations/2024_07_22_065800_add_expo_token_to_users_table.php b/database/migrations/2024_07_22_065800_add_expo_token_to_users_table.php
new file mode 100644
index 000000000..4f7c4688d
--- /dev/null
+++ b/database/migrations/2024_07_22_065800_add_expo_token_to_users_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('expo_token')->nullable();
+            $table->boolean('notify_like')->default(true);
+            $table->boolean('notify_follow')->default(true);
+            $table->boolean('notify_mention')->default(true);
+            $table->boolean('notify_comment')->default(true);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('expo_token');
+            $table->dropColumn('notify_like');
+            $table->dropColumn('notify_follow');
+            $table->dropColumn('notify_mention');
+            $table->dropColumn('notify_comment');
+        });
+    }
+};
diff --git a/database/migrations/2024_07_29_081002_add_storage_used_to_users_table.php b/database/migrations/2024_07_29_081002_add_storage_used_to_users_table.php
new file mode 100644
index 000000000..d794b945e
--- /dev/null
+++ b/database/migrations/2024_07_29_081002_add_storage_used_to_users_table.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->unsignedBigInteger('storage_used')->default(0);
+            $table->timestamp('storage_used_updated_at')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('storage_used');
+            $table->dropColumn('storage_used_updated_at');
+        });
+    }
+};
diff --git a/database/migrations/2024_09_18_093322_add_notify_shares_to_users_table.php b/database/migrations/2024_09_18_093322_add_notify_shares_to_users_table.php
new file mode 100644
index 000000000..54225d46a
--- /dev/null
+++ b/database/migrations/2024_09_18_093322_add_notify_shares_to_users_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->boolean('notify_enabled')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('notify_enabled');
+        });
+    }
+};
diff --git a/database/migrations/2024_10_06_035032_modify_caption_field_in_media_table.php b/database/migrations/2024_10_06_035032_modify_caption_field_in_media_table.php
new file mode 100644
index 000000000..9468e5344
--- /dev/null
+++ b/database/migrations/2024_10_06_035032_modify_caption_field_in_media_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('media', function (Blueprint $table) {
+            $table->text('caption')->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('media', function (Blueprint $table) {
+            $table->text('caption')->nullable(false)->change();
+        });
+    }
+};
diff --git a/database/migrations/2024_10_15_044935_create_moderated_profiles_table.php b/database/migrations/2024_10_15_044935_create_moderated_profiles_table.php
new file mode 100644
index 000000000..2aa9580a5
--- /dev/null
+++ b/database/migrations/2024_10_15_044935_create_moderated_profiles_table.php
@@ -0,0 +1,56 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use App\Profile;
+use App\ModLog;
+use App\Models\ModeratedProfile;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('moderated_profiles', function (Blueprint $table) {
+            $table->id();
+            $table->string('profile_url')->unique()->nullable()->index();
+            $table->unsignedBigInteger('profile_id')->unique()->nullable();
+            $table->string('domain')->nullable();
+            $table->text('note')->nullable();
+            $table->boolean('is_banned')->default(false);
+            $table->boolean('is_nsfw')->default(false);
+            $table->boolean('is_unlisted')->default(false);
+            $table->boolean('is_noautolink')->default(false);
+            $table->boolean('is_nodms')->default(false);
+            $table->boolean('is_notrending')->default(false);
+            $table->timestamps();
+        });
+
+        $logs = ModLog::whereObjectType('App\Profile::class')->whereAction('admin.user.delete')->get();
+
+        foreach($logs as $log) {
+            $profile = Profile::withTrashed()->find($log->object_id);
+            if(!$profile || $profile->private_key) {
+                continue;
+            }
+            ModeratedProfile::updateOrCreate([
+                'profile_url' => $profile->remote_url,
+                'profile_id' => $profile->id,
+            ], [
+                'is_banned' => true,
+                'domain' => $profile->domain,
+            ]);
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('moderated_profiles');
+    }
+};
diff --git a/docker-compose.migrate.yml b/docker-compose.migrate.yml
new file mode 100644
index 000000000..d0040b051
--- /dev/null
+++ b/docker-compose.migrate.yml
@@ -0,0 +1,40 @@
+---
+services:
+  migrate:
+    image: "servercontainers/rsync"
+    entrypoint: ""
+    working_dir: /migrate
+    command: 'bash -c "exit 1"'
+    restart: never
+    volumes:
+      ################################
+      # Storage volume
+      ################################
+      # OLD
+      - "app-storage:/migrate/app-storage/old"
+      # NEW
+      - "${DOCKER_APP_HOST_STORAGE_PATH}:/migrate/app-storage/new"
+
+      ################################
+      # MySQL/DB volume
+      ################################
+      # OLD
+      - "db-data:/migrate/db-data/old"
+      # NEW
+      - "${DOCKER_DB_HOST_DATA_PATH}:/migrate/db-data/new"
+
+      ################################
+      # Redis volume
+      ################################
+      # OLD
+      - "redis-data:/migrate/redis-data/old"
+      # NEW
+      - "${DOCKER_REDIS_HOST_DATA_PATH}:/migrate/redis-data/new"
+
+# Volumes from the old [docker-compose.yml] file
+# https://github.com/pixelfed/pixelfed/blob/b1ff44ca2f75c088a11576fb03b5bad2fbed4d5c/docker-compose.yml#L72-L76
+volumes:
+  db-data:
+  redis-data:
+  app-storage:
+  app-bootstrap:
diff --git a/docker-compose.yml b/docker-compose.yml
index 6fca2eeb3..2a805eb7c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,82 +1,217 @@
 ---
-version: '3'
-
-# In order to set configuration, please use a .env file in
-# your compose project directory (the same directory as your
-# docker-compose.yml), and set database options, application
-# name, key, and other settings there.
-# A list of available settings is available in .env.example
-#
-# The services should scale properly across a swarm cluster
-# if the volumes are properly shared between cluster members.
+###############################################################
+# Please see docker/README.md for usage information
+###############################################################
 
 services:
-## App and Worker
-  app:
-    # Comment to use dockerhub image
-    image: pixelfed/pixelfed:latest
+  # HTTP/HTTPS proxy
+  #
+  # Sits in front of the *real* webserver and manages SSL and (optionally)
+  # load-balancing between multiple web servers
+  #
+  # You can disable this service by setting [DOCKER_PROXY_PROFILE="disabled"]
+  # in your [.env] file - the setting is near the bottom of the file.
+  #
+  # This also disables the [proxy-acme] service, if this is not desired, change the
+  # [DOCKER_PROXY_ACME_PROFILE] setting to an empty string [""]
+  #
+  # See: https://github.com/nginx-proxy/nginx-proxy/tree/main/docs
+  proxy:
+    image: nginxproxy/nginx-proxy:1.4
+    container_name: "${DOCKER_ALL_CONTAINER_NAME_PREFIX}-proxy"
     restart: unless-stopped
-    env_file:
-      - .env.docker
+    profiles:
+      - ${DOCKER_PROXY_PROFILE:-}
+    environment:
+      DOCKER_SERVICE_NAME: "proxy"
     volumes:
-      - app-storage:/var/www/storage
-      - app-bootstrap:/var/www/bootstrap
-      - "./.env.docker:/var/www/.env"
-    networks:
-      - external
-      - internal
+      - "${DOCKER_PROXY_HOST_DOCKER_SOCKET_PATH}:/tmp/docker.sock:ro"
+      - "${DOCKER_ALL_HOST_CONFIG_ROOT_PATH}/proxy/conf.d:/etc/nginx/conf.d"
+      - "${DOCKER_ALL_HOST_CONFIG_ROOT_PATH}/proxy/vhost.d:/etc/nginx/vhost.d"
+      - "${DOCKER_ALL_HOST_CONFIG_ROOT_PATH}/proxy/certs:/etc/nginx/certs"
+      - "${DOCKER_ALL_HOST_DATA_ROOT_PATH}/proxy/html:/usr/share/nginx/html"
     ports:
-      - "8080:80"
+      - "${DOCKER_PROXY_HOST_PORT_HTTP}:80"
+      - "${DOCKER_PROXY_HOST_PORT_HTTPS}:443"
+    healthcheck:
+      test: "curl --fail https://${APP_DOMAIN}/api/service/health-check"
+      interval: "${DOCKER_PROXY_HEALTHCHECK_INTERVAL}"
+      retries: 2
+      timeout: 5s
+
+  # Proxy companion for managing letsencrypt SSL certificates
+  #
+  # You can disable this service by setting [DOCKER_PROXY_ACME_PROFILE="disabled"]
+  # in your [.env] file - the setting is near the bottom of the file.
+  #
+  # See: https://github.com/nginx-proxy/acme-companion/tree/main/docs
+  proxy-acme:
+    image: nginxproxy/acme-companion
+    container_name: "${DOCKER_ALL_CONTAINER_NAME_PREFIX}-proxy-acme"
+    restart: unless-stopped
+    profiles:
+      - ${DOCKER_PROXY_ACME_PROFILE:-}
+    environment:
+      DEBUG: 0
+      DEFAULT_EMAIL: "${DOCKER_PROXY_LETSENCRYPT_EMAIL:?error}"
+      NGINX_PROXY_CONTAINER: "${DOCKER_ALL_CONTAINER_NAME_PREFIX}-proxy"
+    depends_on:
+      - proxy
+    volumes:
+      - "${DOCKER_ALL_HOST_CONFIG_ROOT_PATH}/proxy-acme:/etc/acme.sh"
+      - "${DOCKER_ALL_HOST_CONFIG_ROOT_PATH}/proxy/certs:/etc/nginx/certs"
+      - "${DOCKER_ALL_HOST_CONFIG_ROOT_PATH}/proxy/conf.d:/etc/nginx/conf.d"
+      - "${DOCKER_ALL_HOST_CONFIG_ROOT_PATH}/proxy/vhost.d:/etc/nginx/vhost.d"
+      - "${DOCKER_ALL_HOST_DATA_ROOT_PATH}/proxy/html:/usr/share/nginx/html"
+      - "${DOCKER_PROXY_HOST_DOCKER_SOCKET_PATH}:/var/run/docker.sock:ro"
+
+  web:
+    image: "${DOCKER_APP_IMAGE}:${DOCKER_APP_TAG}"
+    container_name: "${DOCKER_ALL_CONTAINER_NAME_PREFIX}-web"
+    restart: unless-stopped
+    profiles:
+      - ${DOCKER_WEB_PROFILE:-}
+    build:
+      target: ${DOCKER_APP_RUNTIME}-runtime
+      cache_from:
+        - "type=registry,ref=${DOCKER_APP_IMAGE}-cache:${DOCKER_APP_TAG}"
+      args:
+        APT_PACKAGES_EXTRA: "${DOCKER_APP_APT_PACKAGES_EXTRA:-}"
+        BUILD_FRONTEND: "${DOCKER_APP_BUILD_FRONTEND:-0}"
+        PHP_BASE_TYPE: "${DOCKER_APP_BASE_TYPE}"
+        PHP_DEBIAN_RELEASE: "${DOCKER_APP_DEBIAN_RELEASE}"
+        PHP_EXTENSIONS_EXTRA: "${DOCKER_APP_PHP_EXTENSIONS_EXTRA:-}"
+        PHP_PECL_EXTENSIONS_EXTRA: "${DOCKER_APP_PHP_PECL_EXTENSIONS_EXTRA:-}"
+        PHP_VERSION: "${DOCKER_APP_PHP_VERSION:?error}"
+    environment:
+      # Used by Pixelfed Docker init script
+      DOCKER_SERVICE_NAME: "web"
+      DOCKER_APP_ENTRYPOINT_DEBUG: ${DOCKER_APP_ENTRYPOINT_DEBUG:-0}
+      ENTRYPOINT_SKIP_SCRIPTS: ${ENTRYPOINT_SKIP_SCRIPTS:-}
+      # Used by [proxy] service
+      LETSENCRYPT_HOST: "${DOCKER_PROXY_LETSENCRYPT_HOST:?error}"
+      LETSENCRYPT_EMAIL: "${DOCKER_PROXY_LETSENCRYPT_EMAIL:?error}"
+      LETSENCRYPT_TEST: "${DOCKER_PROXY_LETSENCRYPT_TEST:-}"
+      VIRTUAL_HOST: "${APP_DOMAIN}"
+      VIRTUAL_PORT: "80"
+    volumes:
+      - "./.env:/var/www/.env"
+      - "${DOCKER_ALL_HOST_CONFIG_ROOT_PATH}/proxy/conf.d:/shared/proxy/conf.d"
+      - "${DOCKER_APP_HOST_CACHE_PATH}:/var/www/bootstrap/cache"
+      - "${DOCKER_APP_HOST_OVERRIDES_PATH}:/docker/overrides:ro"
+      - "${DOCKER_APP_HOST_STORAGE_PATH}:/var/www/storage"
+    labels:
+      com.github.nginx-proxy.nginx-proxy.keepalive: 30
+      com.github.nginx-proxy.nginx-proxy.http2.enable: true
+      com.github.nginx-proxy.nginx-proxy.http3.enable: true
+    ports:
+      - "${DOCKER_WEB_PORT_EXTERNAL_HTTP}:80"
     depends_on:
       - db
       - redis
+    healthcheck:
+      test: 'curl --header "Host: ${APP_DOMAIN}" --fail http://localhost/api/service/health-check'
+      interval: "${DOCKER_WEB_HEALTHCHECK_INTERVAL}"
+      retries: 2
+      timeout: 5s
 
   worker:
-    image: pixelfed/pixelfed:latest
-    restart: unless-stopped
-    env_file:
-      - .env.docker
-    volumes:
-      - app-storage:/var/www/storage
-      - app-bootstrap:/var/www/bootstrap
-    networks:
-      - external
-      - internal
+    image: "${DOCKER_APP_IMAGE}:${DOCKER_APP_TAG}"
+    container_name: "${DOCKER_ALL_CONTAINER_NAME_PREFIX}-worker"
     command: gosu www-data php artisan horizon
+    restart: unless-stopped
+    stop_signal: SIGTERM
+    profiles:
+      - ${DOCKER_WORKER_PROFILE:-}
+    build:
+      target: ${DOCKER_APP_RUNTIME}-runtime
+      cache_from:
+        - "type=registry,ref=${DOCKER_APP_IMAGE}-cache:${DOCKER_APP_TAG}"
+      args:
+        APT_PACKAGES_EXTRA: "${DOCKER_APP_APT_PACKAGES_EXTRA:-}"
+        BUILD_FRONTEND: "${DOCKER_APP_BUILD_FRONTEND:-0}"
+        PHP_BASE_TYPE: "${DOCKER_APP_BASE_TYPE}"
+        PHP_DEBIAN_RELEASE: "${DOCKER_APP_DEBIAN_RELEASE}"
+        PHP_EXTENSIONS_EXTRA: "${DOCKER_APP_PHP_EXTENSIONS_EXTRA:-}"
+        PHP_PECL_EXTENSIONS_EXTRA: "${DOCKER_APP_PHP_PECL_EXTENSIONS_EXTRA:-}"
+        PHP_VERSION: "${DOCKER_APP_PHP_VERSION:?error}"
+    environment:
+      # Used by Pixelfed Docker init script
+      DOCKER_SERVICE_NAME: "worker"
+      DOCKER_APP_ENTRYPOINT_DEBUG: ${DOCKER_APP_ENTRYPOINT_DEBUG:-0}
+      ENTRYPOINT_SKIP_SCRIPTS: ${ENTRYPOINT_SKIP_SCRIPTS:-}
+    volumes:
+      - "./.env:/var/www/.env"
+      - "${DOCKER_ALL_HOST_CONFIG_ROOT_PATH}/proxy/conf.d:/shared/proxy/conf.d"
+      - "${DOCKER_APP_HOST_CACHE_PATH}:/var/www/bootstrap/cache"
+      - "${DOCKER_APP_HOST_OVERRIDES_PATH}:/docker/overrides:ro"
+      - "${DOCKER_APP_HOST_STORAGE_PATH}:/var/www/storage"
     depends_on:
       - db
       - redis
+    healthcheck:
+      test: gosu www-data php artisan horizon:status | grep running
+      interval: "${DOCKER_WORKER_HEALTHCHECK_INTERVAL:?error}"
+      timeout: 5s
+      retries: 2
 
-## DB and Cache
   db:
-    image: mariadb:jammy
+    image: ${DOCKER_DB_IMAGE:?error}
+    container_name: "${DOCKER_ALL_CONTAINER_NAME_PREFIX}-db"
+    command: ${DOCKER_DB_COMMAND:-}
     restart: unless-stopped
-    networks:
-      - internal
-    command: --default-authentication-plugin=mysql_native_password
-    env_file:
-      - .env.docker
+    profiles:
+      - ${DOCKER_DB_PROFILE:-}
+    environment:
+      TZ: "${TZ:?error}"
+      # MySQL (Oracle) - "Environment Variables" at https://hub.docker.com/_/mysql
+      MYSQL_ROOT_PASSWORD: "${DOCKER_DB_ROOT_PASSWORD:?error}"
+      MYSQL_USER: "${DB_USERNAME:?error}"
+      MYSQL_PASSWORD: "${DB_PASSWORD:?error}"
+      MYSQL_DATABASE: "${DB_DATABASE:?error}"
+      # MySQL (MariaDB) - "Start a mariadb server instance with user, password and database" at https://hub.docker.com/_/mariadb
+      MARIADB_ROOT_PASSWORD: "${DOCKER_DB_ROOT_PASSWORD:?error}"
+      MARIADB_USER: "${DB_USERNAME:?error}"
+      MARIADB_PASSWORD: "${DB_PASSWORD:?error}"
+      MARIADB_DATABASE: "${DB_DATABASE:?error}"
+      # PostgreSQL - "Environment Variables" at https://hub.docker.com/_/postgres
+      POSTGRES_USER: "${DB_USERNAME:?error}"
+      POSTGRES_PASSWORD: "${DB_PASSWORD:?error}"
+      POSTGRES_DB: "${DB_DATABASE:?error}"
     volumes:
-      - "db-data:/var/lib/mysql"
+      - "${DOCKER_DB_HOST_DATA_PATH:?error}:${DOCKER_DB_CONTAINER_DATA_PATH:?error}"
+    ports:
+      - "${DOCKER_DB_HOST_PORT:?error}:${DOCKER_DB_CONTAINER_PORT:?error}"
+    healthcheck:
+      test:
+        [
+          "CMD",
+          "healthcheck.sh",
+          "--su-mysql",
+          "--connect",
+          "--innodb_initialized",
+        ]
+      interval: "${DOCKER_DB_HEALTHCHECK_INTERVAL:?error}"
+      retries: 2
+      timeout: 5s
 
   redis:
-    image: redis:5-alpine
+    image: redis:${DOCKER_REDIS_VERSION}
+    container_name: "${DOCKER_ALL_CONTAINER_NAME_PREFIX}-redis"
     restart: unless-stopped
-    env_file:
-      - .env.docker
+    command: "${DOCKER_REDIS_CONFIG_FILE:-} --requirepass '${REDIS_PASSWORD:-}'"
+    profiles:
+      - ${DOCKER_REDIS_PROFILE:-}
+    environment:
+      TZ: "${TZ:?error}"
+      REDISCLI_AUTH: ${REDIS_PASSWORD:-}
     volumes:
-      - "redis-data:/data"
-    networks:
-      - internal
-
-volumes:
-  db-data:
-  redis-data:
-  app-storage:
-  app-bootstrap:
-
-networks:
-  internal:
-    internal: true
-  external:
-    driver: bridge
+      - "${DOCKER_ALL_HOST_CONFIG_ROOT_PATH}/redis:/etc/redis"
+      - "${DOCKER_REDIS_HOST_DATA_PATH}:/data"
+    ports:
+      - "${DOCKER_REDIS_HOST_PORT}:6379"
+    healthcheck:
+      test: ["CMD", "redis-cli", "-p", "6379", "ping"]
+      interval: "${DOCKER_REDIS_HEALTHCHECK_INTERVAL:?error}"
+      retries: 2
+      timeout: 5s
diff --git a/docker/README.md b/docker/README.md
new file mode 100644
index 000000000..5230f60fd
--- /dev/null
+++ b/docker/README.md
@@ -0,0 +1,5 @@
+# Pixelfed + Docker + Docker Compose
+
+Please see the [Pixelfed Docs (Next)](https://jippi.github.io/pixelfed-docs-next/pr-preview/pr-1/running-pixelfed/) for current documentation on Docker usage.
+
+The docs can be [reviewed in the pixelfed/docs-next](https://github.com/pixelfed/docs-next/pull/1) repository.
diff --git a/docker/apache/root/etc/apache2/conf-available/remoteip.conf b/docker/apache/root/etc/apache2/conf-available/remoteip.conf
new file mode 100644
index 000000000..516da9f5d
--- /dev/null
+++ b/docker/apache/root/etc/apache2/conf-available/remoteip.conf
@@ -0,0 +1,8 @@
+RemoteIPHeader X-Real-IP
+
+# All private IPs as outlined in rfc1918
+#
+# See: https://datatracker.ietf.org/doc/html/rfc1918
+RemoteIPTrustedProxy 10.0.0.0/8
+RemoteIPTrustedProxy 172.16.0.0/12
+RemoteIPTrustedProxy 192.168.0.0/16
diff --git a/docker/artisan b/docker/artisan
new file mode 100755
index 000000000..3bbf58aea
--- /dev/null
+++ b/docker/artisan
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+declare service="${PF_SERVICE:=worker}"
+declare user="${PF_USER:=www-data}"
+
+exec docker compose exec \
+    --user "${user}" \
+    --env TERM \
+    --env COLORTERM \
+    "${service}" \
+    php artisan "${@}"
diff --git a/docker/check-requirements b/docker/check-requirements
new file mode 100755
index 000000000..4da1d6427
--- /dev/null
+++ b/docker/check-requirements
@@ -0,0 +1,126 @@
+#!/bin/bash
+
+set -e -o errexit -o nounset -o pipefail
+
+#
+# Colors
+#
+
+declare -r RED="\e[31m"
+declare -r GREEN="\e[32m"
+declare -r BLUE="\e[34m"
+declare -r NO_COLOR="\e[0m"
+
+#
+# Helper functions
+#
+
+function highlight() {
+    local reset="${2:-$NO_COLOR}"
+    echo "${BLUE}$1${reset}"
+}
+
+function action_start() {
+    echo -en "⚙️ $1: "
+}
+
+function action_ok() {
+    echo -e "\n\t✅ ${GREEN}${*}${NO_COLOR}\n"
+}
+
+function action_error() {
+    echo -e "\n\t❌ ${RED}${*}${NO_COLOR}" >&2
+}
+
+function action_error_exit() {
+    action_error "${*}\n\n${RED}Aborting!${NO_COLOR}"
+
+    exit 1
+}
+
+#
+# Configuration
+#
+
+declare -r min_docker_compose_version_arr=(2 17)
+min_docker_compose_version=$(
+    IFS=.
+    echo "${min_docker_compose_version[*]}"
+)
+
+#
+# Help text
+#
+
+DOCKER_HELP="
+
+\tWe recommend installing Docker (and Compose) directly from Docker.com instead of your Operation System package registry.
+\tPlease see $(highlight "https://docs.docker.com/engine/install/")${RED} for information on how to install Docker on your system.
+
+\tA convinience script is provided by Docker to automate the installation that should work on all supported platforms:
+
+\t\t ${GREEN}\$${BLUE} curl -fsSL https://get.docker.com -o get-docker.sh
+\t\t ${GREEN}\$${BLUE} sudo sh ./get-docker.sh
+${RED}
+\tPlease see $(highlight "https://docs.docker.com/engine/install/ubuntu/#install-using-the-convenience-script")${RED} for more information
+
+\tAlternatively, you can update *JUST* the Compose plugin by following the guide here:
+\t$(highlight "https://docs.docker.com/compose/install/linux/#install-the-plugin-manually")${RED}
+
+\tLearn more about Docker compose release history here:
+\t$(highlight "https://docs.docker.com/compose/release-notes/")${RED}${NO_COLOR}"
+declare -r DOCKER_HELP
+
+#
+# System checks
+#
+
+echo -e "👋 ${GREEN}Hello!"
+echo -e ""
+echo -e "This script will check your system for the minimum requirements outlined in the Pixelfed Docker install guide"
+echo -e "You can find the guide here ${BLUE}https://jippi.github.io/pixelfed-docs-next/pr-preview/pr-1/running-pixelfed/docker/prerequisites.html#software${GREEN}."
+echo -e "${NO_COLOR}"
+
+# git installed?
+action_start "Checking if [$(highlight "git")] command is available"
+command -v git >/dev/null 2>&1 || {
+    action_error_exit "Pixelfed require the 'git' command, but it's not installed"
+}
+action_ok "git is installed"
+
+# docker installed?
+action_start "Checking if [$(highlight "docker")] command is available"
+command -v docker >/dev/null 2>&1 || {
+    action_error_exit "Pixelfed require the 'docker' command, but it's not installed. ${DOCKER_HELP}"
+}
+action_ok "docker is installed"
+
+# docker compose installed?
+action_start "Checking if [$(highlight "docker compose")] command is available"
+docker compose >/dev/null 2>&1 || {
+    action_error_exit "Pixelfed require the 'docker compose' command, but it's not installed. ${DOCKER_HELP}"
+}
+action_ok "docker compose is installed"
+
+# docker compose version is acceptable?
+compose_version=$(docker compose version --short)
+
+declare -a compose_version_arr
+IFS="." read -r -a compose_version_arr <<<"$compose_version"
+
+## major version
+action_start "Checking if [$(highlight "docker compose version")] major version (${min_docker_compose_version_arr[0]}) is acceptable"
+[[ ${compose_version_arr[0]} -eq ${min_docker_compose_version_arr[0]} ]] || {
+    action_error_exit "Pixelfed require minimum Docker Compose major version ${min_docker_compose_version_arr[0]}.x.x - found ${compose_version}.${DOCKER_HELP}"
+}
+action_ok "You're using major version ${compose_version_arr[0]}"
+
+## minor version
+action_start "Checking if [$(highlight "docker compose version")] minor version (${min_docker_compose_version_arr[1]}) is acceptable"
+[[ ${compose_version_arr[1]} -ge ${min_docker_compose_version_arr[1]} ]] || {
+    action_error_exit "Pixelfed require minimum Docker Compose minor version ${min_docker_compose_version_arr[0]}.${min_docker_compose_version_arr[1]} - found ${compose_version}.${DOCKER_HELP}"
+}
+action_ok "You're using minor version ${compose_version_arr[1]}"
+
+# Yay, everything is fine
+echo -e "🎉 ${GREEN}All checks passed, you should be ready to run Pixelfed on this server!${NO_COLOR}"
diff --git a/docker/dottie b/docker/dottie
new file mode 100755
index 000000000..8bd304a03
--- /dev/null
+++ b/docker/dottie
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+set -e -o errexit -o nounset -o pipefail
+
+declare project_root="${PWD}"
+declare user="${PF_USER:=www-data}"
+
+if command -v git &>/dev/null; then
+    project_root=$(git rev-parse --show-toplevel)
+fi
+
+declare -r release="${DOTTIE_VERSION:-latest}"
+
+declare -r update_check_file="/tmp/.dottie-update-check"      # file to check age of since last update
+declare -i update_check_max_age=$((8 * 60 * 60))              # 8 hours between checking for dottie version
+declare -i update_check_cur_age=$((update_check_max_age + 1)) # by default the "update" event should happen
+
+# default [docker run] flags
+declare -a flags=(
+    --rm
+    --interactive
+    --tty
+    --user "${user}"
+    --env TERM
+    --env COLORTERM
+    --volume "${project_root}:/var/www"
+    --workdir /var/www
+)
+
+# if update file exists, find its age since last modification
+if [[ -f "${update_check_file}" ]]; then
+    now=$(date +%s)
+    changed=$(date -r "${update_check_file}" +%s)
+    update_check_cur_age=$((now - changed))
+fi
+
+# if update file is older than max allowed poll for new version of dottie
+if [[ $update_check_cur_age -gt $update_check_max_age ]]; then
+    flags+=(--pull always)
+
+    touch "${update_check_file}"
+fi
+
+# run dottie
+exec docker run "${flags[@]}" "ghcr.io/jippi/dottie:${release}" "$@"
diff --git a/docker/fpm/root/.gitkeep b/docker/fpm/root/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/docker/nginx/Procfile b/docker/nginx/Procfile
new file mode 100644
index 000000000..bd375bf6a
--- /dev/null
+++ b/docker/nginx/Procfile
@@ -0,0 +1,2 @@
+fpm: php-fpm
+nginx: nginx -g "daemon off;"
diff --git a/docker/nginx/root/docker/templates/etc/nginx/conf.d/default.conf b/docker/nginx/root/docker/templates/etc/nginx/conf.d/default.conf
new file mode 100644
index 000000000..15bf17beb
--- /dev/null
+++ b/docker/nginx/root/docker/templates/etc/nginx/conf.d/default.conf
@@ -0,0 +1,49 @@
+server {
+    listen 80 default_server;
+
+    server_name {{ getenv "APP_DOMAIN" }};
+    root /var/www/public;
+
+    add_header X-Frame-Options "SAMEORIGIN";
+    add_header X-XSS-Protection "1; mode=block";
+    add_header X-Content-Type-Options "nosniff";
+
+    access_log /dev/stdout;
+    error_log /dev/stderr warn;
+
+    index index.html index.htm index.php;
+
+    charset utf-8;
+    client_max_body_size {{ getenv "POST_MAX_SIZE" "61M" }};
+
+    location / {
+        try_files $uri $uri/ /index.php?$query_string;
+    }
+
+    location = /favicon.ico {
+        access_log off;
+        log_not_found off;
+    }
+
+    location = /robots.txt {
+        access_log off;
+        log_not_found off;
+    }
+
+    error_page 404 /index.php;
+
+    location ~ \.php$ {
+        fastcgi_split_path_info ^(.+\.php)(/.+)$;
+
+        fastcgi_pass 127.0.0.1:9000;
+        fastcgi_index index.php;
+
+        include fastcgi_params;
+
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+    }
+
+    location ~ /\.(?!well-known).* {
+        deny all;
+    }
+}
diff --git a/docker/nginx/root/docker/templates/etc/nginx/nginx.conf b/docker/nginx/root/docker/templates/etc/nginx/nginx.conf
new file mode 100644
index 000000000..4e87a4565
--- /dev/null
+++ b/docker/nginx/root/docker/templates/etc/nginx/nginx.conf
@@ -0,0 +1,41 @@
+# This is changed from the original "nginx" in upstream to work properly
+# with permissions within pixelfed when serving static files.
+user www-data;
+
+worker_processes auto;
+
+# Ensure the PID is writable
+# Lifted from: https://hub.docker.com/r/nginxinc/nginx-unprivileged
+pid /tmp/nginx.pid;
+
+# Write error log to stderr (/proc/self/fd/2 -> /dev/stderr)
+error_log /proc/self/fd/2 notice;
+
+events {
+    worker_connections 1024;
+}
+
+http {
+    include /etc/nginx/mime.types;
+    default_type application/octet-stream;
+
+    log_format main '$remote_addr - $remote_user [$time_local] "$request" $status $body_bytes_sent "$http_referer" "$http_user_agent" "$http_x_forwarded_for"';
+
+    # Write error log to stdout (/proc/self/fd/1 -> /dev/stdout)
+    access_log /proc/self/fd/1 main;
+
+    sendfile on;
+    tcp_nopush on;
+    keepalive_timeout 65;
+    gzip on;
+
+    # Ensure all temp paths are in a writable by "www-data" user.
+    # Lifted from: https://hub.docker.com/r/nginxinc/nginx-unprivileged
+    client_body_temp_path /tmp/client_temp;
+    proxy_temp_path /tmp/proxy_temp_path;
+    fastcgi_temp_path /tmp/fastcgi_temp;
+    uwsgi_temp_path /tmp/uwsgi_temp;
+    scgi_temp_path /tmp/scgi_temp;
+
+    include /etc/nginx/conf.d/*.conf;
+}
diff --git a/docker/shared/root/docker/entrypoint.d/01-permissions.sh b/docker/shared/root/docker/entrypoint.d/01-permissions.sh
new file mode 100755
index 000000000..dc9dc7591
--- /dev/null
+++ b/docker/shared/root/docker/entrypoint.d/01-permissions.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+: "${ENTRYPOINT_ROOT:="/docker"}"
+
+# shellcheck source=SCRIPTDIR/../helpers.sh
+source "${ENTRYPOINT_ROOT}/helpers.sh"
+
+entrypoint-set-script-name "$0"
+
+# Ensure the Docker volumes and required files are owned by the runtime user as other scripts
+# will be writing to these
+run-as-current-user chown --verbose "${RUNTIME_UID}:${RUNTIME_GID}" "./.env"
+run-as-current-user chown --verbose "${RUNTIME_UID}:${RUNTIME_GID}" "./bootstrap/cache"
+run-as-current-user chown --verbose "${RUNTIME_UID}:${RUNTIME_GID}" "./storage"
+run-as-current-user chown --verbose --recursive "${RUNTIME_UID}:${RUNTIME_GID}" "./storage/docker"
+
+# Optionally fix ownership of configured paths
+: "${DOCKER_APP_ENSURE_OWNERSHIP_PATHS:=""}"
+
+declare -a ensure_ownership_paths=()
+IFS=' ' read -r -a ensure_ownership_paths <<<"${DOCKER_APP_ENSURE_OWNERSHIP_PATHS}"
+
+if [[ ${#ensure_ownership_paths[@]} == 0 ]]; then
+    log-info "No paths has been configured for ownership fixes via [\$DOCKER_APP_ENSURE_OWNERSHIP_PATHS]."
+
+    exit 0
+fi
+
+for path in "${ensure_ownership_paths[@]}"; do
+    log-info "Ensure ownership of [${path}] is correct"
+    stream-prefix-command-output run-as-current-user chown --recursive "${RUNTIME_UID}:${RUNTIME_GID}" "${path}"
+done
diff --git a/docker/shared/root/docker/entrypoint.d/02-check-config.sh b/docker/shared/root/docker/entrypoint.d/02-check-config.sh
new file mode 100755
index 000000000..627960352
--- /dev/null
+++ b/docker/shared/root/docker/entrypoint.d/02-check-config.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+: "${ENTRYPOINT_ROOT:="/docker"}"
+
+# shellcheck source=SCRIPTDIR/../helpers.sh
+source "${ENTRYPOINT_ROOT}/helpers.sh"
+
+entrypoint-set-script-name "$0"
+
+# Validating dot-env files for any issues
+for file in "${dot_env_files[@]}"; do
+    if ! file-exists "${file}"; then
+        log-warning "Could not source file [${file}]: does not exists"
+        continue
+    fi
+
+    # We ignore 'dir' + 'file' rules since they are validate *host* paths
+    # which do not (and should not) exists inside the container
+    #
+    # We disable fixer since its not interactive anyway
+    run-as-current-user dottie validate --file "${file}" --ignore-rule dir,file --exclude-prefix APP_KEY --no-fix
+done
diff --git a/docker/shared/root/docker/entrypoint.d/04-defaults.envsh b/docker/shared/root/docker/entrypoint.d/04-defaults.envsh
new file mode 100755
index 000000000..a55a56e6c
--- /dev/null
+++ b/docker/shared/root/docker/entrypoint.d/04-defaults.envsh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+# NOTE:
+#
+# This file is *sourced* not run by the entrypoint runner
+# so any environment values set here will be accessible to all sub-processes
+# and future entrypoint.d scripts
+#
+# We also don't need to source `helpers.sh` since it's already available
+
+entrypoint-set-script-name "${BASH_SOURCE[0]}"
+
+load-config-files
+
+: "${MAX_PHOTO_SIZE:=15000}"
+: "${MAX_ALBUM_LENGTH:=4}"
+
+# We assign a 1MB buffer to the just-in-time calculated max post size to allow for fields and overhead
+: "${POST_MAX_SIZE_BUFFER:=1M}"
+log-info "POST_MAX_SIZE_BUFFER is set to [${POST_MAX_SIZE_BUFFER}]"
+buffer=$(numfmt --invalid=fail --from=auto --to=none --to-unit=K "${POST_MAX_SIZE_BUFFER}")
+log-info "POST_MAX_SIZE_BUFFER converted to KB is [${buffer}]"
+
+# Automatically calculate the [post_max_size] value for [php.ini] and [nginx]
+log-info "POST_MAX_SIZE will be calculated by [({MAX_PHOTO_SIZE} * {MAX_ALBUM_LENGTH}) + {POST_MAX_SIZE_BUFFER}]"
+log-info "  MAX_PHOTO_SIZE=${MAX_PHOTO_SIZE}"
+log-info "  MAX_ALBUM_LENGTH=${MAX_ALBUM_LENGTH}"
+log-info "  POST_MAX_SIZE_BUFFER=${buffer}"
+: "${POST_MAX_SIZE:=$(numfmt --invalid=fail --from=auto --from-unit=K --to=si $(((MAX_PHOTO_SIZE * MAX_ALBUM_LENGTH) + buffer)))}"
+log-info "POST_MAX_SIZE was calculated to [${POST_MAX_SIZE}]"
+
+# NOTE: must export the value so it's available in other scripts!
+export POST_MAX_SIZE
diff --git a/docker/shared/root/docker/entrypoint.d/05-templating.sh b/docker/shared/root/docker/entrypoint.d/05-templating.sh
new file mode 100755
index 000000000..e699778cf
--- /dev/null
+++ b/docker/shared/root/docker/entrypoint.d/05-templating.sh
@@ -0,0 +1,56 @@
+#!/bin/bash
+: "${ENTRYPOINT_ROOT:="/docker"}"
+
+# shellcheck source=SCRIPTDIR/../helpers.sh
+source "${ENTRYPOINT_ROOT}/helpers.sh"
+
+entrypoint-set-script-name "$0"
+
+# Show [git diff] of templates being rendered (will help verify output)
+: "${ENTRYPOINT_SHOW_TEMPLATE_DIFF:=1}"
+# Directory where templates can be found
+: "${ENTRYPOINT_TEMPLATE_DIR:=/docker/templates/}"
+# Root path to write template template_files to (default is '', meaning it will be written to /<path>)
+: "${ENTRYPOINT_TEMPLATE_OUTPUT_PREFIX:=}"
+
+declare template_file relative_template_file_path output_file_dir
+
+# load all dot-env config files
+load-and-export-config-files
+
+
+find "${ENTRYPOINT_TEMPLATE_DIR}" -follow -type f -print | while read -r template_file; do
+    # Example: template_file=/docker/templates/usr/local/etc/php/php.ini
+
+    # The file path without the template dir prefix ($ENTRYPOINT_TEMPLATE_DIR)
+    #
+    # Example: /usr/local/etc/php/php.ini
+    relative_template_file_path="${template_file#"${ENTRYPOINT_TEMPLATE_DIR}"}"
+
+    # Adds optional prefix to the output file path
+    #
+    # Example: /usr/local/etc/php/php.ini
+    output_file_path="${ENTRYPOINT_TEMPLATE_OUTPUT_PREFIX}/${relative_template_file_path}"
+
+    # Remove the file from the path
+    #
+    # Example: /usr/local/etc/php
+    output_file_dir=$(dirname "${output_file_path}")
+
+    # Ensure the output directory is writable
+    if ! is-writable "${output_file_dir}"; then
+        log-error-and-exit "${output_file_dir} is not writable"
+    fi
+
+    # Create the output directory if it doesn't exists
+    ensure-directory-exists "${output_file_dir}"
+
+    # Render the template
+    log-info "Running [gomplate] on [${template_file}] --> [${output_file_path}]"
+    gomplate <"${template_file}" >"${output_file_path}"
+
+    # Show the diff from the envsubst command
+    if is-true "${ENTRYPOINT_SHOW_TEMPLATE_DIFF}"; then
+        git --no-pager diff --color=always "${template_file}" "${output_file_path}" || : # ignore diff exit code
+    fi
+done
diff --git a/docker/shared/root/docker/entrypoint.d/10-storage.sh b/docker/shared/root/docker/entrypoint.d/10-storage.sh
new file mode 100755
index 000000000..54145a365
--- /dev/null
+++ b/docker/shared/root/docker/entrypoint.d/10-storage.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+: "${ENTRYPOINT_ROOT:="/docker"}"
+
+# shellcheck source=SCRIPTDIR/../helpers.sh
+source "${ENTRYPOINT_ROOT}/helpers.sh"
+
+entrypoint-set-script-name "$0"
+
+# Copy the [storage/] skeleton files over the "real" [storage/] directory so assets are updated between versions
+run-as-runtime-user cp --force --recursive storage.skel/. ./storage/
+
+# Ensure storage linkk are correctly configured
+run-as-runtime-user php artisan storage:link
diff --git a/docker/shared/root/docker/entrypoint.d/11-first-time-setup.sh b/docker/shared/root/docker/entrypoint.d/11-first-time-setup.sh
new file mode 100755
index 000000000..fb5c86a39
--- /dev/null
+++ b/docker/shared/root/docker/entrypoint.d/11-first-time-setup.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+: "${ENTRYPOINT_ROOT:="/docker"}"
+
+# shellcheck source=SCRIPTDIR/../helpers.sh
+source "${ENTRYPOINT_ROOT}/helpers.sh"
+
+entrypoint-set-script-name "$0"
+
+load-config-files
+
+# Allow automatic applying of outstanding/new migrations on startup
+: "${DOCKER_APP_RUN_ONE_TIME_SETUP_TASKS:=1}"
+
+if is-false "${DOCKER_APP_RUN_ONE_TIME_SETUP_TASKS}"; then
+    log-warning "Automatic run of the 'One-time setup tasks' is disabled."
+    log-warning "Please set [DOCKER_APP_RUN_ONE_TIME_SETUP_TASKS=1] in your [.env] file to enable this."
+
+    exit 0
+fi
+
+await-database-ready
+
+# Following https://docs.pixelfed.org/running-pixelfed/installation/#one-time-setup-tasks
+#
+# NOTE: Caches happens in [30-cache.sh]
+
+only-once "key:generate" run-as-runtime-user php artisan key:generate
+only-once "storage:link" run-as-runtime-user php artisan storage:link
+only-once "initial:migrate" run-as-runtime-user php artisan migrate --force
+only-once "import:cities" run-as-runtime-user php artisan import:cities
+
+if is-true "${ACTIVITY_PUB:-false}"; then
+    only-once "instance:actor" run-as-runtime-user php artisan instance:actor
+fi
+
+if is-true "${OAUTH_ENABLED:-false}"; then
+    only-once "passport:keys" run-as-runtime-user php artisan passport:keys
+fi
diff --git a/docker/shared/root/docker/entrypoint.d/12-migrations.sh b/docker/shared/root/docker/entrypoint.d/12-migrations.sh
new file mode 100755
index 000000000..3b87daf1f
--- /dev/null
+++ b/docker/shared/root/docker/entrypoint.d/12-migrations.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+: "${ENTRYPOINT_ROOT:="/docker"}"
+
+# shellcheck source=SCRIPTDIR/../helpers.sh
+source "${ENTRYPOINT_ROOT}/helpers.sh"
+
+entrypoint-set-script-name "$0"
+
+# Allow automatic applying of outstanding/new migrations on startup
+: "${DB_APPLY_NEW_MIGRATIONS_AUTOMATICALLY:=0}"
+
+# Wait for the database to be ready
+await-database-ready
+
+# Run the migrate:status command and capture output
+output=$(run-as-runtime-user php artisan migrate:status || :)
+
+# By default we have no new migrations
+declare -i new_migrations=0
+
+# Detect if any new migrations are available by checking for "No" in the output
+echo "$output" | grep No && new_migrations=1
+
+if is-false "${new_migrations}"; then
+    log-info "No new migrations detected"
+
+    exit 0
+fi
+
+log-warning "New migrations available"
+
+# Print the output
+echo "$output"
+
+if is-false "${DB_APPLY_NEW_MIGRATIONS_AUTOMATICALLY}"; then
+    log-info "Automatic applying of new database migrations is disabled"
+    log-info "Please set [DB_APPLY_NEW_MIGRATIONS_AUTOMATICALLY=1] in your [.env] file to enable this."
+
+    exit 0
+fi
+
+run-as-runtime-user php artisan migrate --force
diff --git a/docker/shared/root/docker/entrypoint.d/20-horizon.sh b/docker/shared/root/docker/entrypoint.d/20-horizon.sh
new file mode 100755
index 000000000..55efd768d
--- /dev/null
+++ b/docker/shared/root/docker/entrypoint.d/20-horizon.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+: "${ENTRYPOINT_ROOT:="/docker"}"
+
+# shellcheck source=SCRIPTDIR/../helpers.sh
+source "${ENTRYPOINT_ROOT}/helpers.sh"
+
+entrypoint-set-script-name "$0"
+
+run-as-runtime-user php artisan horizon:publish
diff --git a/docker/shared/root/docker/entrypoint.d/30-cache.sh b/docker/shared/root/docker/entrypoint.d/30-cache.sh
new file mode 100755
index 000000000..c970db60b
--- /dev/null
+++ b/docker/shared/root/docker/entrypoint.d/30-cache.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+: "${ENTRYPOINT_ROOT:="/docker"}"
+
+# shellcheck source=SCRIPTDIR/../helpers.sh
+source "${ENTRYPOINT_ROOT}/helpers.sh"
+
+entrypoint-set-script-name "$0"
+
+run-as-runtime-user php artisan config:cache
+run-as-runtime-user php artisan route:cache
+run-as-runtime-user php artisan view:cache
diff --git a/docker/shared/root/docker/entrypoint.sh b/docker/shared/root/docker/entrypoint.sh
new file mode 100755
index 000000000..055cf25d7
--- /dev/null
+++ b/docker/shared/root/docker/entrypoint.sh
@@ -0,0 +1,105 @@
+#!/bin/bash
+# short curcuit the entrypoint if $ENTRYPOINT_SKIP isn't set to 0
+if [[ ${ENTRYPOINT_SKIP:=0} != 0 ]]; then
+    exec "$@"
+fi
+
+: "${ENTRYPOINT_ROOT:="/docker"}"
+export ENTRYPOINT_ROOT
+
+# Directory where entrypoint scripts lives
+: "${ENTRYPOINT_D_ROOT:="${ENTRYPOINT_ROOT}/entrypoint.d/"}"
+export ENTRYPOINT_D_ROOT
+
+: "${DOCKER_APP_HOST_OVERRIDES_PATH:="${ENTRYPOINT_ROOT}/overrides"}"
+export DOCKER_APP_HOST_OVERRIDES_PATH
+
+# Space separated list of scripts the entrypoint runner should skip
+: "${ENTRYPOINT_SKIP_SCRIPTS:=""}"
+
+# Load helper scripts
+#
+# shellcheck source=SCRIPTDIR/helpers.sh
+source "${ENTRYPOINT_ROOT}/helpers.sh"
+
+# Set the entrypoint name for logging
+entrypoint-set-script-name "entrypoint.sh"
+
+# Convert ENTRYPOINT_SKIP_SCRIPTS into a native bash array for easier lookup
+declare -a skip_scripts
+# shellcheck disable=SC2034
+IFS=' ' read -r -a skip_scripts <<< "$ENTRYPOINT_SKIP_SCRIPTS"
+
+# Ensure the entrypoint root folder exists
+mkdir -p "${ENTRYPOINT_D_ROOT}"
+
+# If ENTRYPOINT_D_ROOT directory is empty, warn and run the regular command
+if directory-is-empty "${ENTRYPOINT_D_ROOT}"; then
+    log-warning "No files found in ${ENTRYPOINT_D_ROOT}, skipping configuration"
+
+    exec "$@"
+fi
+
+# If the overridess directory exists, then copy all files into the container
+if ! directory-is-empty "${DOCKER_APP_HOST_OVERRIDES_PATH}"; then
+    log-info "Overrides directory is not empty, copying files"
+    run-as-current-user cp --verbose --recursive "${DOCKER_APP_HOST_OVERRIDES_PATH}/." /
+fi
+
+acquire-lock "entrypoint.sh"
+
+# Start scanning for entrypoint.d files to source or run
+log-info "looking for shell scripts in [${ENTRYPOINT_D_ROOT}]"
+
+find "${ENTRYPOINT_D_ROOT}" -follow -type f -print | sort -V | while read -r file; do
+    # Skip the script if it's in the skip-script list
+    if in-array "$(get-entrypoint-script-name "${file}")" skip_scripts; then
+        log-warning "Skipping script [${file}] since it's in the skip list (\$ENTRYPOINT_SKIP_SCRIPTS)"
+
+        continue
+    fi
+
+    # Inspect the file extension of the file we're processing
+    case "${file}" in
+        *.envsh)
+            if ! is-executable "${file}"; then
+                # warn on shell scripts without exec bit
+                log-error-and-exit "File [${file}] is not executable (please 'chmod +x' it)"
+            fi
+
+            log-info "${section_message_color}============================================================${color_clear}"
+            log-info "${section_message_color}Sourcing [${file}]${color_clear}"
+            log-info "${section_message_color}============================================================${color_clear}"
+
+            # shellcheck disable=SC1090
+            source "${file}"
+
+            # the sourced file will (should) than the log prefix, so this restores our own
+            # "global" log prefix once the file is done being sourced
+            entrypoint-restore-script-name
+            ;;
+
+        *.sh)
+            if ! is-executable "${file}"; then
+                # warn on shell scripts without exec bit
+                log-error-and-exit "File [${file}] is not executable (please 'chmod +x' it)"
+            fi
+
+            log-info "${section_message_color}============================================================${color_clear}"
+            log-info "${section_message_color}Executing [${file}]${color_clear}"
+            log-info "${section_message_color}============================================================${color_clear}"
+
+            "${file}"
+            ;;
+
+        *)
+            log-warning "Ignoring unrecognized file [${file}]"
+            ;;
+    esac
+done
+
+release-lock "entrypoint.sh"
+
+log-info "Configuration complete; ready for start up"
+
+exec "$@"
diff --git a/docker/shared/root/docker/helpers.sh b/docker/shared/root/docker/helpers.sh
new file mode 100644
index 000000000..631b0ef0e
--- /dev/null
+++ b/docker/shared/root/docker/helpers.sh
@@ -0,0 +1,592 @@
+#!/bin/bash
+set -e -o errexit -o nounset -o pipefail
+
+[[ ${DOCKER_APP_ENTRYPOINT_DEBUG:=0} == 1 ]] && set -x
+
+: "${RUNTIME_UID:="33"}"
+: "${RUNTIME_GID:="33"}"
+
+# Some splash of color for important messages
+declare -g error_message_color="\033[1;31m"
+declare -g warn_message_color="\033[1;33m"
+declare -g notice_message_color="\033[1;34m"
+declare -g success_message_color="\033[1;32m"
+# shellcheck disable=SC2034
+declare -g section_message_color="\033[1;35m"
+declare -g color_clear="\033[1;0m"
+
+# Current and previous log prefix
+declare -g script_name=
+declare -g script_name_previous=
+declare -g log_prefix=
+
+declare -Ag lock_fds=()
+
+# dot-env files to source when reading config
+declare -a dot_env_files=(
+    /var/www/.env
+)
+
+declare -g docker_state_path
+docker_state_path="$(readlink -f ./storage/docker)"
+
+declare -g docker_locks_path="${docker_state_path}/lock"
+declare -g docker_once_path="${docker_state_path}/once"
+
+declare -g runtime_username
+runtime_username=$(id -un "${RUNTIME_UID}")
+
+# We should already be in /var/www, but just to be explicit
+cd /var/www || log-error-and-exit "could not change to /var/www"
+
+# @description Restore the log prefix to the previous value that was captured in [entrypoint-set-script-name ]
+# @arg $1 string The name (or path) of the entrypoint script being run
+function entrypoint-set-script-name()
+{
+    script_name_previous="${script_name}"
+    script_name="${1}"
+
+    log_prefix="[entrypoint / $(get-entrypoint-script-name "$1")] - "
+}
+
+# @description Restore the log prefix to the previous value that was captured in [entrypoint-set-script-name ]
+function entrypoint-restore-script-name()
+{
+    entrypoint-set-script-name "${script_name_previous}"
+}
+
+# @description Run a command as the [runtime user]
+# @arg $@ string The command to run
+# @exitcode 0 if the command succeeeds
+# @exitcode 1 if the command fails
+function run-as-runtime-user()
+{
+    run-command-as "${runtime_username}" "${@}"
+}
+
+# @description Run a command as the [runtime user]
+# @arg $@ string The command to run
+# @exitcode 0 if the command succeeeds
+# @exitcode 1 if the command fails
+function run-as-current-user()
+{
+    run-command-as "$(id -un)" "${@}"
+}
+
+# @description Run a command as the a named user
+# @arg $1 string The user to run the command as
+# @arg $@ string The command to run
+# @exitcode 0 If the command succeeeds
+# @exitcode 1 If the command fails
+function run-command-as()
+{
+    local -i exit_code
+    local target_user
+
+    target_user=${1}
+    shift
+
+    log-info-stderr "${notice_message_color}👷 Running [${*}] as [${target_user}]${color_clear}"
+
+    # disable error on exit behavior temporarily while we run the command
+    set +e
+
+    if [[ ${target_user} != "root" ]]; then
+        stream-prefix-command-output su --preserve-environment "${target_user}" --shell /bin/bash --command "${*}"
+    else
+        stream-prefix-command-output "${@}"
+    fi
+
+    # capture exit code
+    exit_code=$?
+
+    # re-enable exit code handling
+    set -e
+
+    if [[ $exit_code != 0 ]]; then
+        log-error "${error_message_color}❌ Error!${color_clear}"
+
+        return "$exit_code"
+    fi
+
+    log-info-stderr "${success_message_color}✅ OK!${color_clear}"
+
+    return "$exit_code"
+}
+
+# @description Streams stdout from the command and echo it
+# with log prefixing.
+# @see stream-prefix-command-output
+function stream-stdout-handler()
+{
+    while read -r line; do
+        log-info "(stdout) ${line}"
+    done
+}
+
+# @description Streams stderr from the command and echo it
+# with a bit of color and log prefixing.
+# @see stream-prefix-command-output
+function stream-stderr-handler()
+{
+    while read -r line; do
+        log-info-stderr "(${error_message_color}stderr${color_clear}) ${line}"
+    done
+}
+
+# @description Steam stdout and stderr from a command with log prefix
+# and stdout/stderr prefix. If stdout or stderr is being piped/redirected
+# it will automatically fall back to non-prefixed output.
+# @arg $@ string The command to run
+function stream-prefix-command-output()
+{
+    local stdout=stream-stdout-handler
+    local stderr=stream-stderr-handler
+
+    # if stdout is being piped, print it like normal with echo
+    if [ ! -t 1 ]; then
+        # shellcheck disable=SC1007
+        stdout= echo >&1 -ne
+    fi
+
+    # if stderr is being piped, print it like normal with echo
+    if [ ! -t 2 ]; then
+        # shellcheck disable=SC1007
+        stderr= echo >&2 -ne
+    fi
+
+    "$@" > >($stdout) 2> >($stderr)
+}
+
+# @description Print the given error message to stderr
+# @arg $message string A error message.
+# @stderr The error message provided with log prefix
+function log-error()
+{
+    local msg
+
+    if [[ $# -gt 0 ]]; then
+        msg="$*"
+    elif [[ ! -t 0 ]]; then
+        read -r msg || log-error-and-exit "[${FUNCNAME[0]}] could not read from stdin"
+    else
+        log-error-and-exit "[${FUNCNAME[0]}] did not receive any input arguments and STDIN is empty"
+    fi
+
+    echo -e "${error_message_color}${log_prefix}ERROR -${color_clear} ${msg}" >/dev/stderr
+}
+
+# @description Print the given error message to stderr and exit 1
+# @arg $@ string A error message.
+# @stderr The error message provided with log prefix
+# @exitcode 1
+function log-error-and-exit()
+{
+    log-error "$@"
+
+    show-call-stack
+
+    exit 1
+}
+
+# @description Print the given warning message to stderr
+# @arg $@ string A warning message.
+# @stderr The warning message provided with log prefix
+function log-warning()
+{
+    local msg
+
+    if [[ $# -gt 0 ]]; then
+        msg="$*"
+    elif [[ ! -t 0 ]]; then
+        read -r msg || log-error-and-exit "[${FUNCNAME[0]}] could not read from stdin"
+    else
+        log-error-and-exit "[${FUNCNAME[0]}] did not receive any input arguments and STDIN is empty"
+    fi
+
+    echo -e "${warn_message_color}${log_prefix}WARNING -${color_clear} ${msg}" >/dev/stderr
+}
+
+# @description Print the given message to stdout unless [ENTRYPOINT_QUIET_LOGS] is set
+# @arg $@ string A info message.
+# @stdout The info message provided with log prefix unless $ENTRYPOINT_QUIET_LOGS
+function log-info()
+{
+    local msg
+
+    if [[ $# -gt 0 ]]; then
+        msg="$*"
+    elif [[ ! -t 0 ]]; then
+        read -r msg || log-error-and-exit "[${FUNCNAME[0]}] could not read from stdin"
+    else
+        log-error-and-exit "[${FUNCNAME[0]}] did not receive any input arguments and STDIN is empty"
+    fi
+
+    if [ -z "${ENTRYPOINT_QUIET_LOGS:-}" ]; then
+        echo -e "${notice_message_color}${log_prefix}${color_clear}${msg}"
+    fi
+}
+
+# @description Print the given message to stderr unless [ENTRYPOINT_QUIET_LOGS] is set
+# @arg $@ string A info message.
+# @stderr The info message provided with log prefix unless $ENTRYPOINT_QUIET_LOGS
+function log-info-stderr()
+{
+    local msg
+
+    if [[ $# -gt 0 ]]; then
+        msg="$*"
+    elif [[ ! -t 0 ]]; then
+        read -r msg || log-error-and-exit "[${FUNCNAME[0]}] could not read from stdin"
+    else
+        log-error-and-exit "[${FUNCNAME[0]}] did not receive any input arguments and STDIN is empty"
+    fi
+
+    if [ -z "${ENTRYPOINT_QUIET_LOGS:-}" ]; then
+        echo -e "${notice_message_color}${log_prefix}${color_clear}${msg}" >/dev/stderr
+    fi
+}
+
+# @description Loads the dot-env files used by Docker
+function load-config-files() {
+    local export_vars=0
+    load-config-files-impl "$export_vars"
+}
+
+# @description Loads the dot-env files used by Docker and exports the variables to subshells
+function load-and-export-config-files() {
+    local export_vars=1
+    load-config-files-impl "$export_vars"
+}
+
+# @description Implementation of the [load-config-files] and [load-and-export-config-files] functions. Loads th
+# @arg $1 int Whether to export the variables or just have them available in the current shell
+function load-config-files-impl()
+{
+    local export_vars=${1:-0}
+    for file in "${dot_env_files[@]}"; do
+        if ! file-exists "${file}"; then
+            log-warning "Could not source file [${file}]: does not exists"
+            continue
+        fi
+
+        log-info "Sourcing ${file}"
+        if ((export_vars)); then set -o allexport; fi
+        # shellcheck disable=SC1090
+        source "${file}"
+        if ((export_vars)); then set +o allexport; fi
+    done
+}
+
+# @description Checks if $needle exists in $haystack
+# @arg $1 string The needle (value) to search for
+# @arg $2 array  The haystack (array) to search in
+# @exitcode 0 If $needle was found in $haystack
+# @exitcode 1 If $needle was *NOT* found in $haystack
+function in-array()
+{
+    local -r needle="\<${1}\>"
+    local -nr haystack=$2
+
+    [[ ${haystack[*]} =~ $needle ]]
+}
+
+# @description Checks if $1 has executable bit set or not
+# @arg $1 string The path to check
+# @exitcode 0 If $1 has executable bit
+# @exitcode 1 If $1 does *NOT* have executable bit
+function is-executable()
+{
+    [[ -x "$1" ]]
+}
+
+# @description Checks if $1 is writable or not
+# @arg $1 string The path to check
+# @exitcode 0 If $1 is writable
+# @exitcode 1 If $1 is *NOT* writable
+function is-writable()
+{
+    [[ -w "$1" ]]
+}
+
+# @description Checks if $1 exists (directory or file)
+# @arg $1 string The path to check
+# @exitcode 0 If $1 exists
+# @exitcode 1 If $1 does *NOT* exists
+function path-exists()
+{
+    [[ -e "$1" ]]
+}
+
+# @description Checks if $1 exists (file only)
+# @arg $1 string The path to check
+# @exitcode 0 If $1 exists
+# @exitcode 1 If $1 does *NOT* exists
+function file-exists()
+{
+    [[ -f "$1" ]]
+}
+
+# @description Checks if $1 contains any files or not
+# @arg $1 string The path to check
+# @exitcode 0 If $1 contains files
+# @exitcode 1 If $1 does *NOT* contain files
+function directory-is-empty()
+{
+    ! path-exists "${1}" || [[ -z "$(ls -A "${1}")" ]]
+}
+
+# @description Ensures a directory exists (via mkdir)
+# @arg $1 string The path to create
+# @exitcode 0 If $1 If the path exists *or* was created
+# @exitcode 1 If $1 If the path does *NOT* exists and could *NOT* be created
+function ensure-directory-exists()
+{
+    stream-prefix-command-output mkdir -pv "$@"
+}
+
+# @description Find the relative path for a entrypoint script by removing the ENTRYPOINT_D_ROOT prefix
+# @arg $1 string The path to manipulate
+# @stdout The relative path to the entrypoint script
+function get-entrypoint-script-name()
+{
+    echo "${1#"$ENTRYPOINT_D_ROOT"}"
+}
+
+# @description Ensure a command is only run once (via a 'lock' file) in the storage directory.
+#   The 'lock' is only written if the passed in command ($2) successfully ran.
+# @arg $1 string The name of the lock file
+# @arg $@ string The command to run
+function only-once()
+{
+    local name="${1:-$script_name}"
+    local file="${docker_once_path}/${name}"
+    shift
+
+    if [[ -e "${file}" ]]; then
+        log-info "Command [${*}] has already run once before (remove file [${file}] to run it again)"
+
+        return 0
+    fi
+
+    ensure-directory-exists "$(dirname "${file}")"
+
+    if ! "$@"; then
+        return 1
+    fi
+
+    stream-prefix-command-output touch "${file}"
+    return 0
+}
+
+# @description Best effort file lock to ensure *something* is not running in multiple containers.
+#   The script uses "trap" to clean up after itself if the script crashes
+# @arg $1 string The lock identifier
+function acquire-lock()
+{
+    local name="${1:-$script_name}"
+    local file="${docker_locks_path}/${name}"
+    local lock_fd
+
+    ensure-directory-exists "$(dirname "${file}")"
+
+    exec {lock_fd}>"$file"
+
+    log-info "🔑 Trying to acquire lock: ${file}: "
+    while ! ([[ -v lock_fds[$name] ]] || flock -n -x "$lock_fd"); do
+        log-info "🔒 Waiting on lock ${file}"
+
+        staggered-sleep
+    done
+
+    [[ -v lock_fds[$name] ]] || lock_fds[$name]=$lock_fd
+
+    log-info "🔐 Lock acquired [${file}]"
+
+    on-trap "release-lock ${name}" EXIT INT QUIT TERM
+}
+
+# @description Release a lock aquired by [acquire-lock]
+# @arg $1 string The lock identifier
+function release-lock()
+{
+    local name="${1:-$script_name}"
+    local file="${docker_locks_path}/${name}"
+
+    log-info "🔓 Releasing lock [${file}]"
+
+    [[ -v lock_fds[$name] ]] || return
+
+    # shellcheck disable=SC1083,SC2086
+    flock --unlock ${lock_fds[$name]}
+    unset 'lock_fds[$name]'
+}
+
+# @description Helper function to append multiple actions onto
+#   the bash [trap] logic
+# @arg $1 string The command to run
+# @arg $@ string The list of trap signals to register
+function on-trap()
+{
+    local trap_add_cmd=$1
+    shift || log-error-and-exit "${FUNCNAME[0]} usage error"
+
+    for trap_add_name in "$@"; do
+        trap -- "$(
+            # helper fn to get existing trap command from output
+            # of trap -p
+            #
+            # shellcheck disable=SC2317
+            extract_trap_cmd()
+            {
+                printf '%s\n' "${3:-}"
+            }
+            # print existing trap command with newline
+            eval "extract_trap_cmd $(trap -p "${trap_add_name}")"
+            # print the new trap command
+            printf '%s\n' "${trap_add_cmd}"
+        )" "${trap_add_name}" \
+            || log-error-and-exit "unable to add to trap ${trap_add_name}"
+    done
+}
+
+# Set the trace attribute for the above function.
+#
+# This is required to modify DEBUG or RETURN traps because functions don't
+# inherit them unless the trace attribute is set
+declare -f -t on-trap
+
+# @description Waits for the database to be healthy and responsive
+function await-database-ready()
+{
+    log-info "❓ Waiting for database to be ready"
+
+    load-config-files
+
+    case "${DB_CONNECTION:-}" in
+        mysql)
+            # shellcheck disable=SC2154
+            while ! echo "SELECT 1" | mysql --user="${DB_USERNAME}" --password="${DB_PASSWORD}" --host="${DB_HOST}" --port="${DOCKER_DB_HOST_PORT}" "${DB_DATABASE}" --silent >/dev/null; do
+                staggered-sleep
+            done
+            ;;
+
+        pgsql)
+            # shellcheck disable=SC2154
+            while ! echo "SELECT 1" | PGPASSWORD="${DB_PASSWORD}" psql --user="${DB_USERNAME}" --host="${DB_HOST}" --port="${DOCKER_DB_HOST_PORT}" "${DB_DATABASE}" >/dev/null; do
+                staggered-sleep
+            done
+            ;;
+
+        sqlsrv)
+            log-warning "Don't know how to check if SQLServer is *truely* ready or not - so will just check if we're able to connect to it"
+
+            # shellcheck disable=SC2154
+            while ! timeout 1 bash -c "cat < /dev/null > /dev/tcp/${DB_HOST}/${DB_PORT}"; do
+                staggered-sleep
+            done
+            ;;
+
+        sqlite)
+            log-info "${success_message_color}sqlite is always ready${color_clear}"
+            ;;
+
+        *)
+            log-error-and-exit "Unknown database type: [${DB_CONNECTION:-}]"
+            ;;
+    esac
+
+    log-info "${success_message_color}✅ Successfully connected to database${color_clear}"
+}
+
+# @description sleeps between 1 and 3 seconds to ensure a bit of randomness
+#   in multiple scripts/containers doing work almost at the same time.
+function staggered-sleep()
+{
+    sleep "$(get-random-number-between 1 3)"
+}
+
+# @description Helper function to get a random number between $1 and $2
+# @arg $1 int Minimum number in the range (inclusive)
+# @arg $2 int Maximum number in the range (inclusive)
+function get-random-number-between()
+{
+    local -i from=${1:-1}
+    local -i to="${2:-10}"
+
+    shuf -i "${from}-${to}" -n 1
+}
+
+# @description Helper function to show the bask call stack when something
+#   goes wrong. Is super useful when needing to debug an issue
+function show-call-stack()
+{
+    local stack_size=${#FUNCNAME[@]}
+    local func
+    local lineno
+    local src
+
+    # to avoid noise we start with 1 to skip the get_stack function
+    for ((i = 1; i < stack_size; i++)); do
+        func="${FUNCNAME[$i]}"
+        [ -z "$func" ] && func="MAIN"
+
+        lineno="${BASH_LINENO[$((i - 1))]}"
+        src="${BASH_SOURCE[$i]}"
+        [ -z "$src" ] && src="non_file_source"
+
+        log-error "  at: ${func} ${src}:${lineno}"
+    done
+}
+
+# @description Helper function see if $1 could be considered truthy
+#   returns [0] if input is truthy, otherwise [1]
+# @arg $1 string The string to evaluate
+# @see as-boolean
+function is-true()
+{
+    as-boolean "${1:-}" && return 0
+
+    return 1
+}
+
+# @description Helper function see if $1 could be considered falsey
+#   returns [0] if input is falsey, otherwise [1]
+# @arg $1 string The string to evaluate
+# @see as-boolean
+function is-false()
+{
+    as-boolean "${1:-}" && return 1
+
+    return 0
+}
+
+# @description Helper function see if $1 could be truethy or falsey.
+#   since this is a bash context, returning 0 is true and 1 is false
+#   so it works with [if is-false $input; then .... fi]
+#
+#   This is a bit confusing, *especially* in a PHP world where [1] would be truthy and
+#   [0] would be falsely as return values
+# @arg $1 string The string to evaluate
+function as-boolean()
+{
+    local input="${1:-}"
+    local var="${input,,}" # convert input to lower-case
+
+    case "$var" in
+        1 | true)
+            return 0
+            ;;
+
+        0 | false)
+            return 1
+            ;;
+
+        *)
+            log-warning "[as-boolean] variable [${var}] could not be detected as true or false, returning [1] (false) as default"
+
+            return 1
+            ;;
+
+    esac
+}
diff --git a/docker/shared/root/docker/install/base.sh b/docker/shared/root/docker/install/base.sh
new file mode 100755
index 000000000..a1a32a003
--- /dev/null
+++ b/docker/shared/root/docker/install/base.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+set -ex -o errexit -o nounset -o pipefail
+
+# Ensure we keep apt cache around in a Docker environment
+rm -f /etc/apt/apt.conf.d/docker-clean
+echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
+
+# Don't install recommended packages by default
+echo 'APT::Install-Recommends "false";' >> /etc/apt/apt.conf
+
+# Don't install suggested packages by default
+echo 'APT::Install-Suggests "false";' >> /etc/apt/apt.conf
+
+declare -a packages=()
+
+# Standard packages
+packages+=(
+    apt-utils
+    ca-certificates
+    curl
+    git
+    gnupg1
+    gosu
+    locales
+    locales-all
+    moreutils
+    nano
+    procps
+    software-properties-common
+    unzip
+    wget
+    zip
+)
+
+# Image Optimization
+packages+=(
+    gifsicle
+    jpegoptim
+    optipng
+    pngquant
+)
+
+# Video Processing
+packages+=(
+    ffmpeg
+)
+
+# Database
+packages+=(
+    mariadb-client
+    postgresql-client
+)
+
+readarray -d ' ' -t -O "${#packages[@]}" packages < <(echo -n "${APT_PACKAGES_EXTRA:-}")
+
+apt-get update
+apt-get upgrade -y
+apt-get install -y "${packages[@]}"
+
+locale-gen
+update-locale
diff --git a/docker/shared/root/docker/install/php-extensions.sh b/docker/shared/root/docker/install/php-extensions.sh
new file mode 100755
index 000000000..222f2374d
--- /dev/null
+++ b/docker/shared/root/docker/install/php-extensions.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+set -ex -o errexit -o nounset -o pipefail
+
+declare -a pecl_extensions=()
+
+readarray -d ' ' -t pecl_extensions < <(echo -n "${PHP_PECL_EXTENSIONS:-}")
+readarray -d ' ' -t -O "${#pecl_extensions[@]}" pecl_extensions < <(echo -n "${PHP_PECL_EXTENSIONS_EXTRA:-}")
+
+declare -a php_extensions=()
+readarray -d ' ' -t php_extensions < <(echo -n "${PHP_EXTENSIONS:-}")
+readarray -d ' ' -t -O "${#php_extensions[@]}" php_extensions < <(echo -n "${PHP_EXTENSIONS_EXTRA:-}")
+readarray -d ' ' -t -O "${#php_extensions[@]}" php_extensions < <(echo -n "${PHP_EXTENSIONS_DATABASE:-}")
+
+# Optional script folks can copy into their image to do any [docker-php-ext-configure] work before the [docker-php-ext-install]
+# this can also overwirte the [gd] configure above by simply running it again
+declare -r custom_pre_configure_script=""
+if [[ -e "${custom_pre_configure_script}" ]]; then
+    if [ ! -x "${custom_pre_configure_script}" ]; then
+        echo >&2 "ERROR: found ${custom_pre_configure_script} but its not executable - please [chmod +x] the file!"
+        exit 1
+    fi
+
+    "${custom_pre_configure_script}"
+fi
+
+# PECL + PHP extensions
+IPE_KEEP_SYSPKG_CACHE=1 install-php-extensions "${pecl_extensions[@]}" "${php_extensions[@]}"
diff --git a/docker/shared/root/docker/templates/shared/proxy/conf.d/docker-pixelfed.conf b/docker/shared/root/docker/templates/shared/proxy/conf.d/docker-pixelfed.conf
new file mode 100644
index 000000000..0b221e604
--- /dev/null
+++ b/docker/shared/root/docker/templates/shared/proxy/conf.d/docker-pixelfed.conf
@@ -0,0 +1,16 @@
+###########################################################
+# DO NOT CHANGE
+###########################################################
+# This file is generated by the Pixelfed Docker setup, and
+# will be rewritten on every container start
+#
+# You can put any [.conf] file in this directory
+# (docker-compose-state/config/proxy/conf.d) and it will
+# be loaded by nginx on startup.
+#
+# Run [docker compose exec proxy bash -c 'nginx -t && nginx -s reload']
+# to test your config and reload the proxy
+#
+# See: https://github.com/nginx-proxy/nginx-proxy/blob/main/docs/README.md#custom-nginx-configuration
+
+client_max_body_size {{ getenv "POST_MAX_SIZE" "61M" }};
diff --git a/contrib/docker/php.production.ini b/docker/shared/root/docker/templates/usr/local/etc/php/php.ini
similarity index 98%
rename from contrib/docker/php.production.ini
rename to docker/shared/root/docker/templates/usr/local/etc/php/php.ini
index b84839ff5..130166e80 100644
--- a/contrib/docker/php.production.ini
+++ b/docker/shared/root/docker/templates/usr/local/etc/php/php.ini
@@ -363,7 +363,7 @@ zend.enable_gc = On
 
 ; Allows to include or exclude arguments from stack traces generated for exceptions
 ; Default: Off
-; In production, it is recommended to turn this setting on to prohibit the output 
+; In production, it is recommended to turn this setting on to prohibit the output
 ; of sensitive information in stack traces
 zend.exception_ignore_args = On
 
@@ -376,7 +376,7 @@ zend.exception_ignore_args = On
 ; threat in any way, but it makes it possible to determine whether you use PHP
 ; on your server or not.
 ; http://php.net/expose-php
-expose_php = On
+expose_php = Off
 
 ;;;;;;;;;;;;;;;;;;;
 ; Resource Limits ;
@@ -406,7 +406,7 @@ max_input_time = 60
 
 ; Maximum amount of memory a script may consume (128MB)
 ; http://php.net/memory-limit
-memory_limit = 128M
+memory_limit = {{ getenv "DOCKER_APP_PHP_MEMORY_LIMIT" "128M" }}
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Error handling and logging ;
@@ -462,7 +462,7 @@ memory_limit = 128M
 ; Development Value: E_ALL
 ; Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT
 ; http://php.net/error-reporting
-error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT
+error_reporting = {{ getenv "DOCKER_APP_PHP_ERROR_REPORTING" "E_ALL & ~E_DEPRECATED & ~E_STRICT" }}
 
 ; This directive controls whether or not and where PHP will output errors,
 ; notices and warnings too. Error output is very useful during development, but
@@ -479,7 +479,7 @@ error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT
 ; Development Value: On
 ; Production Value: Off
 ; http://php.net/display-errors
-display_errors = Off
+display_errors = {{ getenv "DOCKER_APP_PHP_DISPLAY_ERRORS" "off" }}
 
 ; The display of errors which occur during PHP's startup sequence are handled
 ; separately from display_errors. We strongly recommend you set this to 'off'
@@ -488,7 +488,7 @@ display_errors = Off
 ; Development Value: On
 ; Production Value: Off
 ; http://php.net/display-startup-errors
-display_startup_errors = Off
+display_startup_errors = {{ getenv "DOCKER_APP_PHP_DISPLAY_ERRORS" "off" }}
 
 ; Besides displaying errors, PHP can also log errors to locations such as a
 ; server-specific log, STDERR, or a location specified by the error_log
@@ -570,8 +570,9 @@ report_memleaks = On
 ; Log errors to specified file. PHP's default behavior is to leave this value
 ; empty.
 ; http://php.net/error-log
-; Example:
-;error_log = php_errors.log
+;
+; NOTE: Write error log to stderr (/proc/self/fd/2 -> /dev/stderr)
+error_log = /proc/self/fd/2
 ; Log errors to syslog (Event Log on Windows).
 ;error_log = syslog
 
@@ -679,7 +680,7 @@ auto_globals_jit = On
 ; Its value may be 0 to disable the limit. It is ignored if POST data reading
 ; is disabled through enable_post_data_reading.
 ; http://php.net/post-max-size
-post_max_size = 64M
+post_max_size = {{ getenv "POST_MAX_SIZE" "61M" }}
 
 ; Automatically add files before PHP document.
 ; http://php.net/auto-prepend-file
@@ -831,10 +832,10 @@ file_uploads = On
 
 ; Maximum allowed size for uploaded files.
 ; http://php.net/upload-max-filesize
-upload_max_filesize = 64M
+upload_max_filesize = {{ getenv "POST_MAX_SIZE" "61M" }}
 
 ; Maximum number of files that can be uploaded via a single request
-max_file_uploads = 20
+max_file_uploads = {{ getenv "MAX_ALBUM_LENGTH" "4" }}
 
 ;;;;;;;;;;;;;;;;;;
 ; Fopen wrappers ;
@@ -947,7 +948,7 @@ cli_server.color = On
 [Date]
 ; Defines the default timezone used by the date functions
 ; http://php.net/date.timezone
-;date.timezone =
+date.timezone = {{ getenv "TZ" "UTC" }}
 
 ; http://php.net/date.default-latitude
 ;date.default_latitude = 31.7667
@@ -1735,7 +1736,7 @@ ldap.max_links = -1
 
 [opcache]
 ; Determines if Zend OPCache is enabled
-;opcache.enable=1
+opcache.enable={{ getenv "DOCKER_APP_PHP_OPCACHE_ENABLE" "1" }}
 
 ; Determines if Zend OPCache is enabled for the CLI version of PHP
 ;opcache.enable_cli=0
@@ -1761,12 +1762,12 @@ ldap.max_links = -1
 
 ; When disabled, you must reset the OPcache manually or restart the
 ; webserver for changes to the filesystem to take effect.
-;opcache.validate_timestamps=1
+opcache.validate_timestamps={{ getenv "DOCKER_APP_PHP_OPCACHE_VALIDATE_TIMESTAMPS" "0" }}
 
 ; How often (in seconds) to check file timestamps for changes to the shared
 ; memory storage allocation. ("1" means validate once per second, but only
 ; once per request. "0" means always validate)
-;opcache.revalidate_freq=2
+opcache.revalidate_freq={{ getenv "DOCKER_APP_PHP_OPCACHE_REVALIDATE_FREQ" "2" }}
 
 ; Enables or disables file search in include_path optimization
 ;opcache.revalidate_path=0
diff --git a/docker/shared/root/shared/proxy/conf.d/.gitignore b/docker/shared/root/shared/proxy/conf.d/.gitignore
new file mode 100644
index 000000000..e69de29bb
diff --git a/docker/shell b/docker/shell
new file mode 100755
index 000000000..7b725e1b0
--- /dev/null
+++ b/docker/shell
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+declare service="${PF_SERVICE:=worker}"
+declare user="${PF_USER:=www-data}"
+
+declare -a command=("bash")
+
+if [[ $# -ge 1 ]]; then
+    command=("$@")
+fi
+
+exec docker compose exec \
+    --user "${user}" \
+    --env TERM \
+    --env COLORTERM \
+    "${service}" \
+    "${command[@]}"
diff --git a/funding.json b/funding.json
new file mode 100644
index 000000000..507d8441e
--- /dev/null
+++ b/funding.json
@@ -0,0 +1,68 @@
+{
+    "version": "v1.0.0",
+    "entity": {
+        "type": "individual",
+        "role": "owner",
+        "name": "Daniel Supernault",
+        "email": "danielsupernault@gmail.com",
+        "phone": "",
+        "description": "I'm the developer behind Pixelfed, an open-source, federated photo-sharing platform that prioritizes privacy, community, and creativity. With a passion for building ethical alternatives to mainstream social networks, I have championed decentralized technologies and empowered users to share their stories without compromising their digital autonomy. As the driving force behind Pixelfed, I combine innovative development with a thoughtful approach to user experience, fostering an online space that feels personal, authentic, and inclusive.",
+        "webpageUrl": {
+            "url": "https://github.com/pixelfed/pixelfed"
+        }
+    },
+    "projects": [
+        {
+            "guid": "pixelfed",
+            "name": "Pixelfed",
+            "description": "Pixelfed is a free, open-source photo-sharing platform designed to put users in control of their content. Built on the principles of decentralization, Pixelfed offers a refreshing alternative to traditional social media, prioritizing privacy, community, and ethical design. Whether you're an artist, photographer, or someone who loves sharing moments, Pixelfed lets you connect and create without intrusive ads, algorithms, or data exploitation. Fully federated and part of the Fediverse, Pixelfed empowers users to join or host their own instances while still connecting with a global network of creatives and communities. It's not just a platform—it's a movement toward a better, more user-centered internet.",
+            "webpageUrl": {
+                "url": "https://github.com/pixelfed/pixelfed"
+            },
+            "repositoryUrl": {
+                "url": "https://github.com/pixelfed/pixelfed"
+            },
+            "licenses": ["spdx:AGPL-3.0"],
+            "tags": ["activitypub", "fediverse", "laravel", "pixelfed"]
+        }
+    ],
+    "funding": {
+        "channels": [
+            {
+                "guid": "github-sponsors",
+                "type": "payment-provider",
+                "address": "https://github.com/sponsors/dansup",
+                "description": "Sponsor me through Github."
+            },
+            {
+                "guid": "paypal-sponsors",
+                "type": "payment-provider",
+                "address": "https://www.paypal.com/paypalme/dansup",
+                "description": "Sponsor me through Paypal."
+            }
+        ],
+        "plans": [
+            {
+                "guid": "developer-time",
+                "status": "active",
+                "name": "Developer compensation",
+                "description": "This will cover the cost of one developer working part-time on the projects.",
+                "amount": 0,
+                "currency": "USD",
+                "frequency": "monthly",
+                "channels": ["github-sponsors", "paypal-sponsors"]
+            },
+            {
+                "guid": "support-plan",
+                "status": "active",
+                "name": "Support plan",
+                "description": "Pay anything you wish/can to show your support for the projects.",
+                "amount": 0,
+                "currency": "USD",
+                "frequency": "one-time",
+                "channels": ["github-sponsors", "paypal-sponsors"]
+            }
+        ],
+        "history": []
+    }
+}
diff --git a/goss.yaml b/goss.yaml
new file mode 100644
index 000000000..73f245c64
--- /dev/null
+++ b/goss.yaml
@@ -0,0 +1,123 @@
+# See: https://github.com/goss-org/goss/blob/master/docs/manual.md#goss-manual
+
+package:
+  curl: { installed: true }
+  ffmpeg: { installed: true }
+  gifsicle: { installed: true }
+  gosu: { installed: true }
+  jpegoptim: { installed: true }
+  locales-all: { installed: true }
+  locales: { installed: true }
+  mariadb-client: { installed: true }
+  nano: { installed: true }
+  optipng: { installed: true }
+  pngquant: { installed: true }
+  postgresql-client: { installed: true }
+  unzip: { installed: true }
+  wget: { installed: true }
+  zip: { installed: true }
+
+user:
+  www-data:
+    exists: true
+    uid: 33
+    gid: 33
+    groups:
+      - www-data
+    home: /var/www
+    shell: /usr/sbin/nologin
+
+command:
+  php-version:
+    exit-status: 0
+    exec: 'php -v'
+    stdout:
+      - PHP {{ .Env.EXPECTED_PHP_VERSION }}
+    stderr: []
+
+  php-extensions:
+    exit-status: 0
+    exec: 'php -m'
+    stdout:
+      - bcmath
+      - Core
+      - ctype
+      - curl
+      - date
+      - dom
+      - exif
+      - fileinfo
+      - filter
+      - gd
+      - hash
+      - iconv
+      - imagick
+      - intl
+      - json
+      - libxml
+      - mbstring
+      - mysqlnd
+      - openssl
+      - pcntl
+      - pcre
+      - PDO
+      - pdo_mysql
+      - pdo_pgsql
+      - pdo_sqlite
+      - Phar
+      - posix
+      - readline
+      - redis
+      - Reflection
+      - session
+      - SimpleXML
+      - sodium
+      - SPL
+      - sqlite3
+      - standard
+      - tokenizer
+      - xml
+      - xmlreader
+      - xmlwriter
+      - zip
+      - zlib
+    stderr: []
+
+  forego-version:
+    exit-status: 0
+    exec: 'forego version'
+    stdout:
+      - dev
+    stderr: []
+
+  gomplate-version:
+    exit-status: 0
+    exec: 'gomplate -v'
+    stdout:
+      - gomplate version
+    stderr: []
+
+  gosu-version:
+    exit-status: 0
+    exec: 'gosu -v'
+    stdout:
+      - '1.12'
+    stderr: []
+
+{{ if eq .Env.PHP_BASE_TYPE "nginx" }}
+  nginx-version:
+    exit-status: 0
+    exec: 'nginx -v'
+    stdout: []
+    stderr:
+      - 'nginx version: nginx'
+{{ end }}
+
+{{ if eq .Env.PHP_BASE_TYPE "apache" }}
+  apache-version:
+    exit-status: 0
+    exec: 'apachectl -v'
+    stdout:
+      - 'Server version: Apache/'
+    stderr: []
+{{ end }}
diff --git a/package-lock.json b/package-lock.json
index 15443b198..2c64259da 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,6 +7,7 @@
 			"name": "pixelfed",
 			"dependencies": {
 				"@fancyapps/fancybox": "^3.5.7",
+				"@glidejs/glide": "^3.6.2",
 				"@hcaptcha/vue-hcaptcha": "^1.3.0",
 				"@peertube/p2p-media-loader-core": "^1.0.14",
 				"@peertube/p2p-media-loader-hlsjs": "^1.0.14",
@@ -20,7 +21,7 @@
 				"caniuse-lite": "^1.0.30001418",
 				"chart.js": "^2.7.2",
 				"filesize": "^3.6.1",
-				"hls.js": "^1.1.5",
+				"hls.js": "^1.5.13",
 				"howler": "^2.2.0",
 				"infinite-scroll": "^3.0.6",
 				"jquery-scroll-lock": "^3.1.3",
@@ -43,11 +44,12 @@
 				"vue-loading-overlay": "^3.3.3",
 				"vue-timeago": "^5.1.2",
 				"vue-tribute": "^1.0.7",
+				"webgl-media-editor": "^0.0.1",
 				"zuck.js": "^1.6.0"
 			},
 			"devDependencies": {
 				"acorn": "^8.7.1",
-				"axios": "^0.21.1",
+				"axios": ">=1.6.0",
 				"bootstrap": "^4.5.2",
 				"cross-env": "^5.2.1",
 				"jquery": "^3.6.0",
@@ -71,108 +73,53 @@
 			}
 		},
 		"node_modules/@ampproject/remapping": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
-			"integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+			"integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
 			"dependencies": {
-				"@jridgewell/gen-mapping": "^0.3.0",
-				"@jridgewell/trace-mapping": "^0.3.9"
+				"@jridgewell/gen-mapping": "^0.3.5",
+				"@jridgewell/trace-mapping": "^0.3.24"
 			},
 			"engines": {
 				"node": ">=6.0.0"
 			}
 		},
 		"node_modules/@babel/code-frame": {
-			"version": "7.22.13",
-			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
-			"integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
+			"version": "7.26.2",
+			"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+			"integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
 			"dependencies": {
-				"@babel/highlight": "^7.22.13",
-				"chalk": "^2.4.2"
+				"@babel/helper-validator-identifier": "^7.25.9",
+				"js-tokens": "^4.0.0",
+				"picocolors": "^1.0.0"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
-		"node_modules/@babel/code-frame/node_modules/ansi-styles": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-			"dependencies": {
-				"color-convert": "^1.9.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@babel/code-frame/node_modules/chalk": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-			"dependencies": {
-				"ansi-styles": "^3.2.1",
-				"escape-string-regexp": "^1.0.5",
-				"supports-color": "^5.3.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@babel/code-frame/node_modules/color-convert": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-			"dependencies": {
-				"color-name": "1.1.3"
-			}
-		},
-		"node_modules/@babel/code-frame/node_modules/color-name": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-			"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
-		},
-		"node_modules/@babel/code-frame/node_modules/has-flag": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-			"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@babel/code-frame/node_modules/supports-color": {
-			"version": "5.5.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-			"dependencies": {
-				"has-flag": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
 		"node_modules/@babel/compat-data": {
-			"version": "7.23.2",
-			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.2.tgz",
-			"integrity": "sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==",
+			"version": "7.26.3",
+			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.3.tgz",
+			"integrity": "sha512-nHIxvKPniQXpmQLb0vhY3VaFb3S0YrTAwpOWJZh1wn3oJPjJk9Asva204PsBdmAE8vpzfHudT8DB0scYvy9q0g==",
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/core": {
-			"version": "7.23.2",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.2.tgz",
-			"integrity": "sha512-n7s51eWdaWZ3vGT2tD4T7J6eJs3QoBXydv7vkUM06Bf1cbVD2Kc2UrkzhiQwobfV7NwOnQXYL7UBJ5VPU+RGoQ==",
+			"version": "7.26.0",
+			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz",
+			"integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==",
 			"dependencies": {
 				"@ampproject/remapping": "^2.2.0",
-				"@babel/code-frame": "^7.22.13",
-				"@babel/generator": "^7.23.0",
-				"@babel/helper-compilation-targets": "^7.22.15",
-				"@babel/helper-module-transforms": "^7.23.0",
-				"@babel/helpers": "^7.23.2",
-				"@babel/parser": "^7.23.0",
-				"@babel/template": "^7.22.15",
-				"@babel/traverse": "^7.23.2",
-				"@babel/types": "^7.23.0",
+				"@babel/code-frame": "^7.26.0",
+				"@babel/generator": "^7.26.0",
+				"@babel/helper-compilation-targets": "^7.25.9",
+				"@babel/helper-module-transforms": "^7.26.0",
+				"@babel/helpers": "^7.26.0",
+				"@babel/parser": "^7.26.0",
+				"@babel/template": "^7.25.9",
+				"@babel/traverse": "^7.25.9",
+				"@babel/types": "^7.26.0",
 				"convert-source-map": "^2.0.0",
 				"debug": "^4.1.0",
 				"gensync": "^1.0.0-beta.2",
@@ -196,49 +143,39 @@
 			}
 		},
 		"node_modules/@babel/generator": {
-			"version": "7.23.0",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
-			"integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
+			"version": "7.26.3",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.3.tgz",
+			"integrity": "sha512-6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ==",
 			"dependencies": {
-				"@babel/types": "^7.23.0",
-				"@jridgewell/gen-mapping": "^0.3.2",
-				"@jridgewell/trace-mapping": "^0.3.17",
-				"jsesc": "^2.5.1"
+				"@babel/parser": "^7.26.3",
+				"@babel/types": "^7.26.3",
+				"@jridgewell/gen-mapping": "^0.3.5",
+				"@jridgewell/trace-mapping": "^0.3.25",
+				"jsesc": "^3.0.2"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-annotate-as-pure": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
-			"integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+			"integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
 			"dependencies": {
-				"@babel/types": "^7.22.5"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-			"version": "7.22.15",
-			"resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz",
-			"integrity": "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==",
-			"dependencies": {
-				"@babel/types": "^7.22.15"
+				"@babel/types": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-compilation-targets": {
-			"version": "7.22.15",
-			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz",
-			"integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz",
+			"integrity": "sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==",
 			"dependencies": {
-				"@babel/compat-data": "^7.22.9",
-				"@babel/helper-validator-option": "^7.22.15",
-				"browserslist": "^4.21.9",
+				"@babel/compat-data": "^7.25.9",
+				"@babel/helper-validator-option": "^7.25.9",
+				"browserslist": "^4.24.0",
 				"lru-cache": "^5.1.1",
 				"semver": "^6.3.1"
 			},
@@ -255,18 +192,16 @@
 			}
 		},
 		"node_modules/@babel/helper-create-class-features-plugin": {
-			"version": "7.22.15",
-			"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.15.tgz",
-			"integrity": "sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz",
+			"integrity": "sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==",
 			"dependencies": {
-				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/helper-member-expression-to-functions": "^7.22.15",
-				"@babel/helper-optimise-call-expression": "^7.22.5",
-				"@babel/helper-replace-supers": "^7.22.9",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-				"@babel/helper-split-export-declaration": "^7.22.6",
+				"@babel/helper-annotate-as-pure": "^7.25.9",
+				"@babel/helper-member-expression-to-functions": "^7.25.9",
+				"@babel/helper-optimise-call-expression": "^7.25.9",
+				"@babel/helper-replace-supers": "^7.25.9",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+				"@babel/traverse": "^7.25.9",
 				"semver": "^6.3.1"
 			},
 			"engines": {
@@ -285,12 +220,12 @@
 			}
 		},
 		"node_modules/@babel/helper-create-regexp-features-plugin": {
-			"version": "7.22.15",
-			"resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz",
-			"integrity": "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==",
+			"version": "7.26.3",
+			"resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.26.3.tgz",
+			"integrity": "sha512-G7ZRb40uUgdKOQqPLjfD12ZmGA54PzqDFUv2BKImnC9QIfGhIHKvVML0oN8IUiDq4iRqpq74ABpvOaerfWdong==",
 			"dependencies": {
-				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"regexpu-core": "^5.3.1",
+				"@babel/helper-annotate-as-pure": "^7.25.9",
+				"regexpu-core": "^6.2.0",
 				"semver": "^6.3.1"
 			},
 			"engines": {
@@ -309,9 +244,9 @@
 			}
 		},
 		"node_modules/@babel/helper-define-polyfill-provider": {
-			"version": "0.4.3",
-			"resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz",
-			"integrity": "sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug==",
+			"version": "0.6.3",
+			"resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.3.tgz",
+			"integrity": "sha512-HK7Bi+Hj6H+VTHA3ZvBis7V/6hu9QuTrnMXNybfUf2iiuU/N97I8VjB+KbhFF8Rld/Lx5MzoCwPCpPjfK+n8Cg==",
 			"dependencies": {
 				"@babel/helper-compilation-targets": "^7.22.6",
 				"@babel/helper-plugin-utils": "^7.22.5",
@@ -323,69 +258,38 @@
 				"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
 			}
 		},
-		"node_modules/@babel/helper-environment-visitor": {
-			"version": "7.22.20",
-			"resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-			"integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-function-name": {
-			"version": "7.23.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-			"integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
-			"dependencies": {
-				"@babel/template": "^7.22.15",
-				"@babel/types": "^7.23.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-hoist-variables": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-			"integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
-			"dependencies": {
-				"@babel/types": "^7.22.5"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
 		"node_modules/@babel/helper-member-expression-to-functions": {
-			"version": "7.23.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz",
-			"integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz",
+			"integrity": "sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==",
 			"dependencies": {
-				"@babel/types": "^7.23.0"
+				"@babel/traverse": "^7.25.9",
+				"@babel/types": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-module-imports": {
-			"version": "7.22.15",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
-			"integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
+			"integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
 			"dependencies": {
-				"@babel/types": "^7.22.15"
+				"@babel/traverse": "^7.25.9",
+				"@babel/types": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-module-transforms": {
-			"version": "7.23.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.0.tgz",
-			"integrity": "sha512-WhDWw1tdrlT0gMgUJSlX0IQvoO1eN279zrAUbVB+KpV2c3Tylz8+GnKOLllCS6Z/iZQEyVYxhZVUdPTqs2YYPw==",
+			"version": "7.26.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
+			"integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
 			"dependencies": {
-				"@babel/helper-environment-visitor": "^7.22.20",
-				"@babel/helper-module-imports": "^7.22.15",
-				"@babel/helper-simple-access": "^7.22.5",
-				"@babel/helper-split-export-declaration": "^7.22.6",
-				"@babel/helper-validator-identifier": "^7.22.20"
+				"@babel/helper-module-imports": "^7.25.9",
+				"@babel/helper-validator-identifier": "^7.25.9",
+				"@babel/traverse": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -395,32 +299,32 @@
 			}
 		},
 		"node_modules/@babel/helper-optimise-call-expression": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz",
-			"integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz",
+			"integrity": "sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==",
 			"dependencies": {
-				"@babel/types": "^7.22.5"
+				"@babel/types": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-plugin-utils": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
-			"integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz",
+			"integrity": "sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==",
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-remap-async-to-generator": {
-			"version": "7.22.20",
-			"resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz",
-			"integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz",
+			"integrity": "sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==",
 			"dependencies": {
-				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"@babel/helper-environment-visitor": "^7.22.20",
-				"@babel/helper-wrap-function": "^7.22.20"
+				"@babel/helper-annotate-as-pure": "^7.25.9",
+				"@babel/helper-wrap-function": "^7.25.9",
+				"@babel/traverse": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -430,13 +334,13 @@
 			}
 		},
 		"node_modules/@babel/helper-replace-supers": {
-			"version": "7.22.20",
-			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz",
-			"integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.9.tgz",
+			"integrity": "sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ==",
 			"dependencies": {
-				"@babel/helper-environment-visitor": "^7.22.20",
-				"@babel/helper-member-expression-to-functions": "^7.22.15",
-				"@babel/helper-optimise-call-expression": "^7.22.5"
+				"@babel/helper-member-expression-to-functions": "^7.25.9",
+				"@babel/helper-optimise-call-expression": "^7.25.9",
+				"@babel/traverse": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -445,162 +349,74 @@
 				"@babel/core": "^7.0.0"
 			}
 		},
-		"node_modules/@babel/helper-simple-access": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
-			"integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
-			"dependencies": {
-				"@babel/types": "^7.22.5"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
 		"node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz",
-			"integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz",
+			"integrity": "sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==",
 			"dependencies": {
-				"@babel/types": "^7.22.5"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/helper-split-export-declaration": {
-			"version": "7.22.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-			"integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
-			"dependencies": {
-				"@babel/types": "^7.22.5"
+				"@babel/traverse": "^7.25.9",
+				"@babel/types": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-string-parser": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
-			"integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+			"integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-validator-identifier": {
-			"version": "7.22.20",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-			"integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+			"integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-validator-option": {
-			"version": "7.22.15",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz",
-			"integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
+			"integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helper-wrap-function": {
-			"version": "7.22.20",
-			"resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz",
-			"integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz",
+			"integrity": "sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==",
 			"dependencies": {
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/template": "^7.22.15",
-				"@babel/types": "^7.22.19"
+				"@babel/template": "^7.25.9",
+				"@babel/traverse": "^7.25.9",
+				"@babel/types": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/helpers": {
-			"version": "7.23.2",
-			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.2.tgz",
-			"integrity": "sha512-lzchcp8SjTSVe/fPmLwtWVBFC7+Tbn8LGHDVfDp9JGxpAY5opSaEFgt8UQvrnECWOTdji2mOWMz1rOhkHscmGQ==",
+			"version": "7.26.0",
+			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz",
+			"integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==",
 			"dependencies": {
-				"@babel/template": "^7.22.15",
-				"@babel/traverse": "^7.23.2",
-				"@babel/types": "^7.23.0"
+				"@babel/template": "^7.25.9",
+				"@babel/types": "^7.26.0"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
-		"node_modules/@babel/highlight": {
-			"version": "7.22.20",
-			"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
-			"integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
-			"dependencies": {
-				"@babel/helper-validator-identifier": "^7.22.20",
-				"chalk": "^2.4.2",
-				"js-tokens": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			}
-		},
-		"node_modules/@babel/highlight/node_modules/ansi-styles": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-			"dependencies": {
-				"color-convert": "^1.9.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@babel/highlight/node_modules/chalk": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-			"dependencies": {
-				"ansi-styles": "^3.2.1",
-				"escape-string-regexp": "^1.0.5",
-				"supports-color": "^5.3.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@babel/highlight/node_modules/color-convert": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-			"dependencies": {
-				"color-name": "1.1.3"
-			}
-		},
-		"node_modules/@babel/highlight/node_modules/color-name": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-			"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
-		},
-		"node_modules/@babel/highlight/node_modules/has-flag": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-			"integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/@babel/highlight/node_modules/supports-color": {
-			"version": "5.5.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-			"dependencies": {
-				"has-flag": "^3.0.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
 		"node_modules/@babel/parser": {
-			"version": "7.23.0",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
-			"integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
+			"version": "7.26.3",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.3.tgz",
+			"integrity": "sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==",
+			"dependencies": {
+				"@babel/types": "^7.26.3"
+			},
 			"bin": {
 				"parser": "bin/babel-parser.js"
 			},
@@ -608,12 +424,41 @@
 				"node": ">=6.0.0"
 			}
 		},
-		"node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-			"version": "7.22.15",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz",
-			"integrity": "sha512-FB9iYlz7rURmRJyXRKEnalYPPdn87H5no108cyuQQyMwlpJ2SJtpIUBI27kdTin956pz+LPypkPVPUTlxOmrsg==",
+		"node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz",
+			"integrity": "sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/traverse": "^7.25.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.9.tgz",
+			"integrity": "sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.25.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz",
+			"integrity": "sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -623,13 +468,13 @@
 			}
 		},
 		"node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-			"version": "7.22.15",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15.tgz",
-			"integrity": "sha512-Hyph9LseGvAeeXzikV88bczhsrLrIZqDPxO+sSmAunMPaGrBGhfMWzCPYTtiW9t+HzSE2wtV8e5cc5P6r1xMDQ==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz",
+			"integrity": "sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-				"@babel/plugin-transform-optional-chaining": "^7.22.15"
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+				"@babel/plugin-transform-optional-chaining": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -638,6 +483,21 @@
 				"@babel/core": "^7.13.0"
 			}
 		},
+		"node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.9.tgz",
+			"integrity": "sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/traverse": "^7.25.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
 		"node_modules/@babel/plugin-proposal-object-rest-spread": {
 			"version": "7.20.7",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz",
@@ -668,42 +528,6 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-syntax-async-generators": {
-			"version": "7.8.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
-			"integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-class-properties": {
-			"version": "7.12.13",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
-			"integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.12.13"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-class-static-block": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-			"integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.14.5"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
 		"node_modules/@babel/plugin-syntax-dynamic-import": {
 			"version": "7.8.3",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
@@ -715,23 +539,12 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-syntax-export-namespace-from": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
-			"integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.3"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
 		"node_modules/@babel/plugin-syntax-import-assertions": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz",
-			"integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==",
+			"version": "7.26.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz",
+			"integrity": "sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -741,11 +554,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-syntax-import-attributes": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz",
-			"integrity": "sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==",
+			"version": "7.26.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz",
+			"integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -754,61 +567,6 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-syntax-import-meta": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
-			"integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.10.4"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-json-strings": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
-			"integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-logical-assignment-operators": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
-			"integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.10.4"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
-			"integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-numeric-separator": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
-			"integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.10.4"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
 		"node_modules/@babel/plugin-syntax-object-rest-spread": {
 			"version": "7.8.3",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
@@ -820,56 +578,6 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-syntax-optional-catch-binding": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
-			"integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-optional-chaining": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
-			"integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.8.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-private-property-in-object": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
-			"integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.14.5"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
-		"node_modules/@babel/plugin-syntax-top-level-await": {
-			"version": "7.14.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
-			"integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
-			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.14.5"
-			},
-			"engines": {
-				"node": ">=6.9.0"
-			},
-			"peerDependencies": {
-				"@babel/core": "^7.0.0-0"
-			}
-		},
 		"node_modules/@babel/plugin-syntax-unicode-sets-regex": {
 			"version": "7.18.6",
 			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
@@ -886,11 +594,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-arrow-functions": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz",
-			"integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz",
+			"integrity": "sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -900,14 +608,13 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-async-generator-functions": {
-			"version": "7.23.2",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.2.tgz",
-			"integrity": "sha512-BBYVGxbDVHfoeXbOwcagAkOQAm9NxoTdMGfTqghu1GrvadSaw6iW3Je6IcL5PNOw8VwjxqBECXy50/iCQSY/lQ==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.9.tgz",
+			"integrity": "sha512-RXV6QAzTBbhDMO9fWwOmwwTuYaiPbggWQ9INdZqAYeSHyG7FzQ+nOZaUUjNwKv9pV3aE4WFqFm1Hnbci5tBCAw==",
 			"dependencies": {
-				"@babel/helper-environment-visitor": "^7.22.20",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-remap-async-to-generator": "^7.22.20",
-				"@babel/plugin-syntax-async-generators": "^7.8.4"
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/helper-remap-async-to-generator": "^7.25.9",
+				"@babel/traverse": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -917,13 +624,13 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-async-to-generator": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz",
-			"integrity": "sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.9.tgz",
+			"integrity": "sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==",
 			"dependencies": {
-				"@babel/helper-module-imports": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-remap-async-to-generator": "^7.22.5"
+				"@babel/helper-module-imports": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/helper-remap-async-to-generator": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -933,11 +640,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-block-scoped-functions": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz",
-			"integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.9.tgz",
+			"integrity": "sha512-toHc9fzab0ZfenFpsyYinOX0J/5dgJVA2fm64xPewu7CoYHWEivIWKxkK2rMi4r3yQqLnVmheMXRdG+k239CgA==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -947,11 +654,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-block-scoping": {
-			"version": "7.23.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.0.tgz",
-			"integrity": "sha512-cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.9.tgz",
+			"integrity": "sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -961,12 +668,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-class-properties": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz",
-			"integrity": "sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz",
+			"integrity": "sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==",
 			"dependencies": {
-				"@babel/helper-create-class-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-create-class-features-plugin": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -976,13 +683,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-class-static-block": {
-			"version": "7.22.11",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.11.tgz",
-			"integrity": "sha512-GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g==",
+			"version": "7.26.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.26.0.tgz",
+			"integrity": "sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==",
 			"dependencies": {
-				"@babel/helper-create-class-features-plugin": "^7.22.11",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-class-static-block": "^7.14.5"
+				"@babel/helper-create-class-features-plugin": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -992,18 +698,15 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-classes": {
-			"version": "7.22.15",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.15.tgz",
-			"integrity": "sha512-VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz",
+			"integrity": "sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==",
 			"dependencies": {
-				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"@babel/helper-compilation-targets": "^7.22.15",
-				"@babel/helper-environment-visitor": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/helper-optimise-call-expression": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-replace-supers": "^7.22.9",
-				"@babel/helper-split-export-declaration": "^7.22.6",
+				"@babel/helper-annotate-as-pure": "^7.25.9",
+				"@babel/helper-compilation-targets": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/helper-replace-supers": "^7.25.9",
+				"@babel/traverse": "^7.25.9",
 				"globals": "^11.1.0"
 			},
 			"engines": {
@@ -1014,12 +717,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-computed-properties": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz",
-			"integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz",
+			"integrity": "sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/template": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/template": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1029,11 +732,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-destructuring": {
-			"version": "7.23.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.0.tgz",
-			"integrity": "sha512-vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz",
+			"integrity": "sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1043,12 +746,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-dotall-regex": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz",
-			"integrity": "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz",
+			"integrity": "sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==",
 			"dependencies": {
-				"@babel/helper-create-regexp-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-create-regexp-features-plugin": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1058,11 +761,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-duplicate-keys": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz",
-			"integrity": "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz",
+			"integrity": "sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1071,13 +774,27 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-dynamic-import": {
-			"version": "7.22.11",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.11.tgz",
-			"integrity": "sha512-g/21plo58sfteWjaO0ZNVb+uEOkJNjAaHhbejrnBmu011l/eNDScmkbjCC3l4FKb10ViaGU4aOkFznSu2zRHgA==",
+		"node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.9.tgz",
+			"integrity": "sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-dynamic-import": "^7.8.3"
+				"@babel/helper-create-regexp-features-plugin": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-dynamic-import": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz",
+			"integrity": "sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1087,12 +804,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-exponentiation-operator": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz",
-			"integrity": "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==",
+			"version": "7.26.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.26.3.tgz",
+			"integrity": "sha512-7CAHcQ58z2chuXPWblnn1K6rLDnDWieghSOEmqQsrBenH0P9InCUtOJYD89pvngljmZlJcz3fcmgYsXFNGa1ZQ==",
 			"dependencies": {
-				"@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1102,12 +818,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-export-namespace-from": {
-			"version": "7.22.11",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.11.tgz",
-			"integrity": "sha512-xa7aad7q7OiT8oNZ1mU7NrISjlSkVdMbNxn9IuLZyL9AJEhs1Apba3I+u5riX1dIkdptP5EKDG5XDPByWxtehw==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz",
+			"integrity": "sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1117,11 +832,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-for-of": {
-			"version": "7.22.15",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.15.tgz",
-			"integrity": "sha512-me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.9.tgz",
+			"integrity": "sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1131,13 +847,13 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-function-name": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz",
-			"integrity": "sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz",
+			"integrity": "sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==",
 			"dependencies": {
-				"@babel/helper-compilation-targets": "^7.22.5",
-				"@babel/helper-function-name": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-compilation-targets": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/traverse": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1147,12 +863,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-json-strings": {
-			"version": "7.22.11",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.11.tgz",
-			"integrity": "sha512-CxT5tCqpA9/jXFlme9xIBCc5RPtdDq3JpkkhgHQqtDdiTnTI0jtZ0QzXhr5DILeYifDPp2wvY2ad+7+hLMW5Pw==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz",
+			"integrity": "sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-json-strings": "^7.8.3"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1162,11 +877,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-literals": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz",
-			"integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz",
+			"integrity": "sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1176,12 +891,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-logical-assignment-operators": {
-			"version": "7.22.11",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.11.tgz",
-			"integrity": "sha512-qQwRTP4+6xFCDV5k7gZBF3C31K34ut0tbEcTKxlX/0KXxm9GLcO14p570aWxFvVzx6QAfPgq7gaeIHXJC8LswQ==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz",
+			"integrity": "sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1191,11 +905,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-member-expression-literals": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz",
-			"integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz",
+			"integrity": "sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1205,12 +919,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-modules-amd": {
-			"version": "7.23.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.0.tgz",
-			"integrity": "sha512-xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz",
+			"integrity": "sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==",
 			"dependencies": {
-				"@babel/helper-module-transforms": "^7.23.0",
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-module-transforms": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1220,13 +934,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-modules-commonjs": {
-			"version": "7.23.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.0.tgz",
-			"integrity": "sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==",
+			"version": "7.26.3",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.26.3.tgz",
+			"integrity": "sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==",
 			"dependencies": {
-				"@babel/helper-module-transforms": "^7.23.0",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-simple-access": "^7.22.5"
+				"@babel/helper-module-transforms": "^7.26.0",
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1236,14 +949,14 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-modules-systemjs": {
-			"version": "7.23.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.0.tgz",
-			"integrity": "sha512-qBej6ctXZD2f+DhlOC9yO47yEYgUh5CZNz/aBoH4j/3NOlRfJXJbY7xDQCqQVf9KbrqGzIWER1f23doHGrIHFg==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz",
+			"integrity": "sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==",
 			"dependencies": {
-				"@babel/helper-hoist-variables": "^7.22.5",
-				"@babel/helper-module-transforms": "^7.23.0",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-validator-identifier": "^7.22.20"
+				"@babel/helper-module-transforms": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/helper-validator-identifier": "^7.25.9",
+				"@babel/traverse": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1253,12 +966,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-modules-umd": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz",
-			"integrity": "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz",
+			"integrity": "sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==",
 			"dependencies": {
-				"@babel/helper-module-transforms": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-module-transforms": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1268,12 +981,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz",
-			"integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz",
+			"integrity": "sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==",
 			"dependencies": {
-				"@babel/helper-create-regexp-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-create-regexp-features-plugin": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1283,11 +996,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-new-target": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz",
-			"integrity": "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz",
+			"integrity": "sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1297,12 +1010,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-			"version": "7.22.11",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.11.tgz",
-			"integrity": "sha512-YZWOw4HxXrotb5xsjMJUDlLgcDXSfO9eCmdl1bgW4+/lAGdkjaEvOnQ4p5WKKdUgSzO39dgPl0pTnfxm0OAXcg==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.9.tgz",
+			"integrity": "sha512-ENfftpLZw5EItALAD4WsY/KUWvhUlZndm5GC7G3evUsVeSJB6p0pBeLQUnRnBCBx7zV0RKQjR9kCuwrsIrjWog==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1312,12 +1024,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-numeric-separator": {
-			"version": "7.22.11",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.11.tgz",
-			"integrity": "sha512-3dzU4QGPsILdJbASKhF/V2TVP+gJya1PsueQCxIPCEcerqF21oEcrob4mzjsp2Py/1nLfF5m+xYNMDpmA8vffg==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz",
+			"integrity": "sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-numeric-separator": "^7.10.4"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1327,15 +1038,13 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-object-rest-spread": {
-			"version": "7.22.15",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.15.tgz",
-			"integrity": "sha512-fEB+I1+gAmfAyxZcX1+ZUwLeAuuf8VIg67CTznZE0MqVFumWkh8xWtn58I4dxdVf080wn7gzWoF8vndOViJe9Q==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz",
+			"integrity": "sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==",
 			"dependencies": {
-				"@babel/compat-data": "^7.22.9",
-				"@babel/helper-compilation-targets": "^7.22.15",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-				"@babel/plugin-transform-parameters": "^7.22.15"
+				"@babel/helper-compilation-targets": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/plugin-transform-parameters": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1345,12 +1054,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-object-super": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz",
-			"integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz",
+			"integrity": "sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-replace-supers": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/helper-replace-supers": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1360,12 +1069,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-optional-catch-binding": {
-			"version": "7.22.11",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.11.tgz",
-			"integrity": "sha512-rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz",
+			"integrity": "sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1375,13 +1083,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-optional-chaining": {
-			"version": "7.23.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.0.tgz",
-			"integrity": "sha512-sBBGXbLJjxTzLBF5rFWaikMnOGOk/BmK6vVByIdEggZ7Vn6CvWXZyRkkLFK6WE0IF8jSliyOkUN6SScFgzCM0g==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz",
+			"integrity": "sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-				"@babel/plugin-syntax-optional-chaining": "^7.8.3"
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1391,11 +1098,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-parameters": {
-			"version": "7.22.15",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz",
-			"integrity": "sha512-hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz",
+			"integrity": "sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1405,12 +1112,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-private-methods": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz",
-			"integrity": "sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz",
+			"integrity": "sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==",
 			"dependencies": {
-				"@babel/helper-create-class-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-create-class-features-plugin": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1420,14 +1127,13 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-private-property-in-object": {
-			"version": "7.22.11",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.11.tgz",
-			"integrity": "sha512-sSCbqZDBKHetvjSwpyWzhuHkmW5RummxJBVbYLkGkaiTOWGxml7SXt0iWa03bzxFIx7wOj3g/ILRd0RcJKBeSQ==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz",
+			"integrity": "sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==",
 			"dependencies": {
-				"@babel/helper-annotate-as-pure": "^7.22.5",
-				"@babel/helper-create-class-features-plugin": "^7.22.11",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+				"@babel/helper-annotate-as-pure": "^7.25.9",
+				"@babel/helper-create-class-features-plugin": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1437,11 +1143,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-property-literals": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz",
-			"integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz",
+			"integrity": "sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1451,11 +1157,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-regenerator": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz",
-			"integrity": "sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.9.tgz",
+			"integrity": "sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5",
+				"@babel/helper-plugin-utils": "^7.25.9",
 				"regenerator-transform": "^0.15.2"
 			},
 			"engines": {
@@ -1465,12 +1171,27 @@
 				"@babel/core": "^7.0.0-0"
 			}
 		},
-		"node_modules/@babel/plugin-transform-reserved-words": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz",
-			"integrity": "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==",
+		"node_modules/@babel/plugin-transform-regexp-modifiers": {
+			"version": "7.26.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.26.0.tgz",
+			"integrity": "sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-create-regexp-features-plugin": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			},
+			"peerDependencies": {
+				"@babel/core": "^7.0.0"
+			}
+		},
+		"node_modules/@babel/plugin-transform-reserved-words": {
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz",
+			"integrity": "sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==",
+			"dependencies": {
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1480,15 +1201,15 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-runtime": {
-			"version": "7.23.2",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.2.tgz",
-			"integrity": "sha512-XOntj6icgzMS58jPVtQpiuF6ZFWxQiJavISGx5KGjRj+3gqZr8+N6Kx+N9BApWzgS+DOjIZfXXj0ZesenOWDyA==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.25.9.tgz",
+			"integrity": "sha512-nZp7GlEl+yULJrClz0SwHPqir3lc0zsPrDHQUcxGspSL7AKrexNSEfTbfqnDNJUO13bgKyfuOLMF8Xqtu8j3YQ==",
 			"dependencies": {
-				"@babel/helper-module-imports": "^7.22.15",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"babel-plugin-polyfill-corejs2": "^0.4.6",
-				"babel-plugin-polyfill-corejs3": "^0.8.5",
-				"babel-plugin-polyfill-regenerator": "^0.5.3",
+				"@babel/helper-module-imports": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"babel-plugin-polyfill-corejs2": "^0.4.10",
+				"babel-plugin-polyfill-corejs3": "^0.10.6",
+				"babel-plugin-polyfill-regenerator": "^0.6.1",
 				"semver": "^6.3.1"
 			},
 			"engines": {
@@ -1507,11 +1228,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-shorthand-properties": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz",
-			"integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz",
+			"integrity": "sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1521,12 +1242,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-spread": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz",
-			"integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz",
+			"integrity": "sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1536,11 +1257,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-sticky-regex": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz",
-			"integrity": "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz",
+			"integrity": "sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1550,11 +1271,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-template-literals": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz",
-			"integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.9.tgz",
+			"integrity": "sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1564,11 +1285,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-typeof-symbol": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz",
-			"integrity": "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.9.tgz",
+			"integrity": "sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1578,11 +1299,11 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-unicode-escapes": {
-			"version": "7.22.10",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz",
-			"integrity": "sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz",
+			"integrity": "sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==",
 			"dependencies": {
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1592,12 +1313,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-unicode-property-regex": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz",
-			"integrity": "sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz",
+			"integrity": "sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==",
 			"dependencies": {
-				"@babel/helper-create-regexp-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-create-regexp-features-plugin": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1607,12 +1328,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-unicode-regex": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz",
-			"integrity": "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz",
+			"integrity": "sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==",
 			"dependencies": {
-				"@babel/helper-create-regexp-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-create-regexp-features-plugin": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1622,12 +1343,12 @@
 			}
 		},
 		"node_modules/@babel/plugin-transform-unicode-sets-regex": {
-			"version": "7.22.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz",
-			"integrity": "sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz",
+			"integrity": "sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==",
 			"dependencies": {
-				"@babel/helper-create-regexp-features-plugin": "^7.22.5",
-				"@babel/helper-plugin-utils": "^7.22.5"
+				"@babel/helper-create-regexp-features-plugin": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1637,89 +1358,78 @@
 			}
 		},
 		"node_modules/@babel/preset-env": {
-			"version": "7.23.2",
-			"resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.2.tgz",
-			"integrity": "sha512-BW3gsuDD+rvHL2VO2SjAUNTBe5YrjsTiDyqamPDWY723na3/yPQ65X5oQkFVJZ0o50/2d+svm1rkPoJeR1KxVQ==",
+			"version": "7.26.0",
+			"resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.26.0.tgz",
+			"integrity": "sha512-H84Fxq0CQJNdPFT2DrfnylZ3cf5K43rGfWK4LJGPpjKHiZlk0/RzwEus3PDDZZg+/Er7lCA03MVacueUuXdzfw==",
 			"dependencies": {
-				"@babel/compat-data": "^7.23.2",
-				"@babel/helper-compilation-targets": "^7.22.15",
-				"@babel/helper-plugin-utils": "^7.22.5",
-				"@babel/helper-validator-option": "^7.22.15",
-				"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.15",
-				"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.15",
+				"@babel/compat-data": "^7.26.0",
+				"@babel/helper-compilation-targets": "^7.25.9",
+				"@babel/helper-plugin-utils": "^7.25.9",
+				"@babel/helper-validator-option": "^7.25.9",
+				"@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.9",
+				"@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.9",
+				"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.9",
+				"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.25.9",
+				"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.9",
 				"@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
-				"@babel/plugin-syntax-async-generators": "^7.8.4",
-				"@babel/plugin-syntax-class-properties": "^7.12.13",
-				"@babel/plugin-syntax-class-static-block": "^7.14.5",
-				"@babel/plugin-syntax-dynamic-import": "^7.8.3",
-				"@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-				"@babel/plugin-syntax-import-assertions": "^7.22.5",
-				"@babel/plugin-syntax-import-attributes": "^7.22.5",
-				"@babel/plugin-syntax-import-meta": "^7.10.4",
-				"@babel/plugin-syntax-json-strings": "^7.8.3",
-				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-				"@babel/plugin-syntax-numeric-separator": "^7.10.4",
-				"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-				"@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-				"@babel/plugin-syntax-optional-chaining": "^7.8.3",
-				"@babel/plugin-syntax-private-property-in-object": "^7.14.5",
-				"@babel/plugin-syntax-top-level-await": "^7.14.5",
+				"@babel/plugin-syntax-import-assertions": "^7.26.0",
+				"@babel/plugin-syntax-import-attributes": "^7.26.0",
 				"@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-				"@babel/plugin-transform-arrow-functions": "^7.22.5",
-				"@babel/plugin-transform-async-generator-functions": "^7.23.2",
-				"@babel/plugin-transform-async-to-generator": "^7.22.5",
-				"@babel/plugin-transform-block-scoped-functions": "^7.22.5",
-				"@babel/plugin-transform-block-scoping": "^7.23.0",
-				"@babel/plugin-transform-class-properties": "^7.22.5",
-				"@babel/plugin-transform-class-static-block": "^7.22.11",
-				"@babel/plugin-transform-classes": "^7.22.15",
-				"@babel/plugin-transform-computed-properties": "^7.22.5",
-				"@babel/plugin-transform-destructuring": "^7.23.0",
-				"@babel/plugin-transform-dotall-regex": "^7.22.5",
-				"@babel/plugin-transform-duplicate-keys": "^7.22.5",
-				"@babel/plugin-transform-dynamic-import": "^7.22.11",
-				"@babel/plugin-transform-exponentiation-operator": "^7.22.5",
-				"@babel/plugin-transform-export-namespace-from": "^7.22.11",
-				"@babel/plugin-transform-for-of": "^7.22.15",
-				"@babel/plugin-transform-function-name": "^7.22.5",
-				"@babel/plugin-transform-json-strings": "^7.22.11",
-				"@babel/plugin-transform-literals": "^7.22.5",
-				"@babel/plugin-transform-logical-assignment-operators": "^7.22.11",
-				"@babel/plugin-transform-member-expression-literals": "^7.22.5",
-				"@babel/plugin-transform-modules-amd": "^7.23.0",
-				"@babel/plugin-transform-modules-commonjs": "^7.23.0",
-				"@babel/plugin-transform-modules-systemjs": "^7.23.0",
-				"@babel/plugin-transform-modules-umd": "^7.22.5",
-				"@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
-				"@babel/plugin-transform-new-target": "^7.22.5",
-				"@babel/plugin-transform-nullish-coalescing-operator": "^7.22.11",
-				"@babel/plugin-transform-numeric-separator": "^7.22.11",
-				"@babel/plugin-transform-object-rest-spread": "^7.22.15",
-				"@babel/plugin-transform-object-super": "^7.22.5",
-				"@babel/plugin-transform-optional-catch-binding": "^7.22.11",
-				"@babel/plugin-transform-optional-chaining": "^7.23.0",
-				"@babel/plugin-transform-parameters": "^7.22.15",
-				"@babel/plugin-transform-private-methods": "^7.22.5",
-				"@babel/plugin-transform-private-property-in-object": "^7.22.11",
-				"@babel/plugin-transform-property-literals": "^7.22.5",
-				"@babel/plugin-transform-regenerator": "^7.22.10",
-				"@babel/plugin-transform-reserved-words": "^7.22.5",
-				"@babel/plugin-transform-shorthand-properties": "^7.22.5",
-				"@babel/plugin-transform-spread": "^7.22.5",
-				"@babel/plugin-transform-sticky-regex": "^7.22.5",
-				"@babel/plugin-transform-template-literals": "^7.22.5",
-				"@babel/plugin-transform-typeof-symbol": "^7.22.5",
-				"@babel/plugin-transform-unicode-escapes": "^7.22.10",
-				"@babel/plugin-transform-unicode-property-regex": "^7.22.5",
-				"@babel/plugin-transform-unicode-regex": "^7.22.5",
-				"@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
+				"@babel/plugin-transform-arrow-functions": "^7.25.9",
+				"@babel/plugin-transform-async-generator-functions": "^7.25.9",
+				"@babel/plugin-transform-async-to-generator": "^7.25.9",
+				"@babel/plugin-transform-block-scoped-functions": "^7.25.9",
+				"@babel/plugin-transform-block-scoping": "^7.25.9",
+				"@babel/plugin-transform-class-properties": "^7.25.9",
+				"@babel/plugin-transform-class-static-block": "^7.26.0",
+				"@babel/plugin-transform-classes": "^7.25.9",
+				"@babel/plugin-transform-computed-properties": "^7.25.9",
+				"@babel/plugin-transform-destructuring": "^7.25.9",
+				"@babel/plugin-transform-dotall-regex": "^7.25.9",
+				"@babel/plugin-transform-duplicate-keys": "^7.25.9",
+				"@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.9",
+				"@babel/plugin-transform-dynamic-import": "^7.25.9",
+				"@babel/plugin-transform-exponentiation-operator": "^7.25.9",
+				"@babel/plugin-transform-export-namespace-from": "^7.25.9",
+				"@babel/plugin-transform-for-of": "^7.25.9",
+				"@babel/plugin-transform-function-name": "^7.25.9",
+				"@babel/plugin-transform-json-strings": "^7.25.9",
+				"@babel/plugin-transform-literals": "^7.25.9",
+				"@babel/plugin-transform-logical-assignment-operators": "^7.25.9",
+				"@babel/plugin-transform-member-expression-literals": "^7.25.9",
+				"@babel/plugin-transform-modules-amd": "^7.25.9",
+				"@babel/plugin-transform-modules-commonjs": "^7.25.9",
+				"@babel/plugin-transform-modules-systemjs": "^7.25.9",
+				"@babel/plugin-transform-modules-umd": "^7.25.9",
+				"@babel/plugin-transform-named-capturing-groups-regex": "^7.25.9",
+				"@babel/plugin-transform-new-target": "^7.25.9",
+				"@babel/plugin-transform-nullish-coalescing-operator": "^7.25.9",
+				"@babel/plugin-transform-numeric-separator": "^7.25.9",
+				"@babel/plugin-transform-object-rest-spread": "^7.25.9",
+				"@babel/plugin-transform-object-super": "^7.25.9",
+				"@babel/plugin-transform-optional-catch-binding": "^7.25.9",
+				"@babel/plugin-transform-optional-chaining": "^7.25.9",
+				"@babel/plugin-transform-parameters": "^7.25.9",
+				"@babel/plugin-transform-private-methods": "^7.25.9",
+				"@babel/plugin-transform-private-property-in-object": "^7.25.9",
+				"@babel/plugin-transform-property-literals": "^7.25.9",
+				"@babel/plugin-transform-regenerator": "^7.25.9",
+				"@babel/plugin-transform-regexp-modifiers": "^7.26.0",
+				"@babel/plugin-transform-reserved-words": "^7.25.9",
+				"@babel/plugin-transform-shorthand-properties": "^7.25.9",
+				"@babel/plugin-transform-spread": "^7.25.9",
+				"@babel/plugin-transform-sticky-regex": "^7.25.9",
+				"@babel/plugin-transform-template-literals": "^7.25.9",
+				"@babel/plugin-transform-typeof-symbol": "^7.25.9",
+				"@babel/plugin-transform-unicode-escapes": "^7.25.9",
+				"@babel/plugin-transform-unicode-property-regex": "^7.25.9",
+				"@babel/plugin-transform-unicode-regex": "^7.25.9",
+				"@babel/plugin-transform-unicode-sets-regex": "^7.25.9",
 				"@babel/preset-modules": "0.1.6-no-external-plugins",
-				"@babel/types": "^7.23.0",
-				"babel-plugin-polyfill-corejs2": "^0.4.6",
-				"babel-plugin-polyfill-corejs3": "^0.8.5",
-				"babel-plugin-polyfill-regenerator": "^0.5.3",
-				"core-js-compat": "^3.31.0",
+				"babel-plugin-polyfill-corejs2": "^0.4.10",
+				"babel-plugin-polyfill-corejs3": "^0.10.6",
+				"babel-plugin-polyfill-regenerator": "^0.6.1",
+				"core-js-compat": "^3.38.1",
 				"semver": "^6.3.1"
 			},
 			"engines": {
@@ -1750,15 +1460,10 @@
 				"@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0"
 			}
 		},
-		"node_modules/@babel/regjsgen": {
-			"version": "0.8.0",
-			"resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
-			"integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA=="
-		},
 		"node_modules/@babel/runtime": {
-			"version": "7.23.2",
-			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.2.tgz",
-			"integrity": "sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==",
+			"version": "7.26.0",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.0.tgz",
+			"integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==",
 			"dependencies": {
 				"regenerator-runtime": "^0.14.0"
 			},
@@ -1767,32 +1472,29 @@
 			}
 		},
 		"node_modules/@babel/template": {
-			"version": "7.22.15",
-			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
-			"integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
+			"version": "7.25.9",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
+			"integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
 			"dependencies": {
-				"@babel/code-frame": "^7.22.13",
-				"@babel/parser": "^7.22.15",
-				"@babel/types": "^7.22.15"
+				"@babel/code-frame": "^7.25.9",
+				"@babel/parser": "^7.25.9",
+				"@babel/types": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
 		},
 		"node_modules/@babel/traverse": {
-			"version": "7.23.2",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
-			"integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
+			"version": "7.26.4",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.4.tgz",
+			"integrity": "sha512-fH+b7Y4p3yqvApJALCPJcwb0/XaOSgtK4pzV6WVjPR5GLFQBRI7pfoX2V2iM48NXvX07NUxxm1Vw98YjqTcU5w==",
 			"dependencies": {
-				"@babel/code-frame": "^7.22.13",
-				"@babel/generator": "^7.23.0",
-				"@babel/helper-environment-visitor": "^7.22.20",
-				"@babel/helper-function-name": "^7.23.0",
-				"@babel/helper-hoist-variables": "^7.22.5",
-				"@babel/helper-split-export-declaration": "^7.22.6",
-				"@babel/parser": "^7.23.0",
-				"@babel/types": "^7.23.0",
-				"debug": "^4.1.0",
+				"@babel/code-frame": "^7.26.2",
+				"@babel/generator": "^7.26.3",
+				"@babel/parser": "^7.26.3",
+				"@babel/template": "^7.25.9",
+				"@babel/types": "^7.26.3",
+				"debug": "^4.3.1",
 				"globals": "^11.1.0"
 			},
 			"engines": {
@@ -1800,13 +1502,12 @@
 			}
 		},
 		"node_modules/@babel/types": {
-			"version": "7.23.0",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
-			"integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
+			"version": "7.26.3",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.3.tgz",
+			"integrity": "sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==",
 			"dependencies": {
-				"@babel/helper-string-parser": "^7.22.5",
-				"@babel/helper-validator-identifier": "^7.22.20",
-				"to-fast-properties": "^2.0.0"
+				"@babel/helper-string-parser": "^7.25.9",
+				"@babel/helper-validator-identifier": "^7.25.9"
 			},
 			"engines": {
 				"node": ">=6.9.0"
@@ -1829,6 +1530,351 @@
 				"node": ">=10.0.0"
 			}
 		},
+		"node_modules/@esbuild/aix-ppc64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+			"integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
+			"cpu": [
+				"ppc64"
+			],
+			"optional": true,
+			"os": [
+				"aix"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/android-arm": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+			"integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
+			"cpu": [
+				"arm"
+			],
+			"optional": true,
+			"os": [
+				"android"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/android-arm64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+			"integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
+			"cpu": [
+				"arm64"
+			],
+			"optional": true,
+			"os": [
+				"android"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/android-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+			"integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
+			"cpu": [
+				"x64"
+			],
+			"optional": true,
+			"os": [
+				"android"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/darwin-arm64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+			"integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
+			"cpu": [
+				"arm64"
+			],
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/darwin-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+			"integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
+			"cpu": [
+				"x64"
+			],
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/freebsd-arm64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+			"integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
+			"cpu": [
+				"arm64"
+			],
+			"optional": true,
+			"os": [
+				"freebsd"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/freebsd-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+			"integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
+			"cpu": [
+				"x64"
+			],
+			"optional": true,
+			"os": [
+				"freebsd"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/linux-arm": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+			"integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
+			"cpu": [
+				"arm"
+			],
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/linux-arm64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+			"integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
+			"cpu": [
+				"arm64"
+			],
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/linux-ia32": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+			"integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
+			"cpu": [
+				"ia32"
+			],
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/linux-loong64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+			"integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
+			"cpu": [
+				"loong64"
+			],
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/linux-mips64el": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+			"integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
+			"cpu": [
+				"mips64el"
+			],
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/linux-ppc64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+			"integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
+			"cpu": [
+				"ppc64"
+			],
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/linux-riscv64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+			"integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
+			"cpu": [
+				"riscv64"
+			],
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/linux-s390x": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+			"integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
+			"cpu": [
+				"s390x"
+			],
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/linux-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+			"integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+			"cpu": [
+				"x64"
+			],
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/netbsd-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+			"integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
+			"cpu": [
+				"x64"
+			],
+			"optional": true,
+			"os": [
+				"netbsd"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/openbsd-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+			"integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
+			"cpu": [
+				"x64"
+			],
+			"optional": true,
+			"os": [
+				"openbsd"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/sunos-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+			"integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
+			"cpu": [
+				"x64"
+			],
+			"optional": true,
+			"os": [
+				"sunos"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/win32-arm64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+			"integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
+			"cpu": [
+				"arm64"
+			],
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/win32-ia32": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+			"integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
+			"cpu": [
+				"ia32"
+			],
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
+		"node_modules/@esbuild/win32-x64": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+			"integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
+			"cpu": [
+				"x64"
+			],
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">=12"
+			}
+		},
 		"node_modules/@fancyapps/fancybox": {
 			"version": "3.5.7",
 			"resolved": "https://registry.npmjs.org/@fancyapps/fancybox/-/fancybox-3.5.7.tgz",
@@ -1837,6 +1883,11 @@
 				"jquery": ">=1.9.0"
 			}
 		},
+		"node_modules/@glidejs/glide": {
+			"version": "3.7.1",
+			"resolved": "https://registry.npmjs.org/@glidejs/glide/-/glide-3.7.1.tgz",
+			"integrity": "sha512-8he0pZpLSqTesSFYiuWdhBmtdlYSPWxfPUCKtkkiX6ZmT8UdMdmoFPtJaOwLBXv4p2JiGxqbuPdiRGGo2e/htQ=="
+		},
 		"node_modules/@hcaptcha/vue-hcaptcha": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/@hcaptcha/vue-hcaptcha/-/vue-hcaptcha-1.3.0.tgz",
@@ -1846,61 +1897,61 @@
 			}
 		},
 		"node_modules/@jridgewell/gen-mapping": {
-			"version": "0.3.3",
-			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
-			"integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+			"version": "0.3.8",
+			"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
+			"integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
 			"dependencies": {
-				"@jridgewell/set-array": "^1.0.1",
+				"@jridgewell/set-array": "^1.2.1",
 				"@jridgewell/sourcemap-codec": "^1.4.10",
-				"@jridgewell/trace-mapping": "^0.3.9"
+				"@jridgewell/trace-mapping": "^0.3.24"
 			},
 			"engines": {
 				"node": ">=6.0.0"
 			}
 		},
 		"node_modules/@jridgewell/resolve-uri": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
-			"integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+			"integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
 			"engines": {
 				"node": ">=6.0.0"
 			}
 		},
 		"node_modules/@jridgewell/set-array": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
-			"integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+			"integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
 			"engines": {
 				"node": ">=6.0.0"
 			}
 		},
 		"node_modules/@jridgewell/source-map": {
-			"version": "0.3.5",
-			"resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz",
-			"integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
+			"version": "0.3.6",
+			"resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
+			"integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
 			"dependencies": {
-				"@jridgewell/gen-mapping": "^0.3.0",
-				"@jridgewell/trace-mapping": "^0.3.9"
+				"@jridgewell/gen-mapping": "^0.3.5",
+				"@jridgewell/trace-mapping": "^0.3.25"
 			}
 		},
 		"node_modules/@jridgewell/sourcemap-codec": {
-			"version": "1.4.15",
-			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-			"integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+			"integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ=="
 		},
 		"node_modules/@jridgewell/trace-mapping": {
-			"version": "0.3.20",
-			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz",
-			"integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==",
+			"version": "0.3.25",
+			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+			"integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
 			"dependencies": {
 				"@jridgewell/resolve-uri": "^3.1.0",
 				"@jridgewell/sourcemap-codec": "^1.4.14"
 			}
 		},
 		"node_modules/@leichtgewicht/ip-codec": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
-			"integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz",
+			"integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw=="
 		},
 		"node_modules/@nodelib/fs.scandir": {
 			"version": "2.1.5",
@@ -1951,27 +2002,349 @@
 				"npm": ">=5.0.0"
 			}
 		},
-		"node_modules/@peertube/p2p-media-loader-core": {
-			"version": "1.0.14",
-			"resolved": "https://registry.npmjs.org/@peertube/p2p-media-loader-core/-/p2p-media-loader-core-1.0.14.tgz",
-			"integrity": "sha512-tjQv1CNziNY+zYzcL1h4q6AA2WuBUZnBIeVyjWR/EsO1EEC1VMdvPsL02cqYLz9yvIxgycjeTsWCm6XDqNgXRw==",
+		"node_modules/@parcel/watcher": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.0.tgz",
+			"integrity": "sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==",
+			"dev": true,
+			"hasInstallScript": true,
+			"optional": true,
 			"dependencies": {
-				"bittorrent-tracker": "^9.19.0",
-				"debug": "^4.3.4",
+				"detect-libc": "^1.0.3",
+				"is-glob": "^4.0.3",
+				"micromatch": "^4.0.5",
+				"node-addon-api": "^7.0.0"
+			},
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			},
+			"optionalDependencies": {
+				"@parcel/watcher-android-arm64": "2.5.0",
+				"@parcel/watcher-darwin-arm64": "2.5.0",
+				"@parcel/watcher-darwin-x64": "2.5.0",
+				"@parcel/watcher-freebsd-x64": "2.5.0",
+				"@parcel/watcher-linux-arm-glibc": "2.5.0",
+				"@parcel/watcher-linux-arm-musl": "2.5.0",
+				"@parcel/watcher-linux-arm64-glibc": "2.5.0",
+				"@parcel/watcher-linux-arm64-musl": "2.5.0",
+				"@parcel/watcher-linux-x64-glibc": "2.5.0",
+				"@parcel/watcher-linux-x64-musl": "2.5.0",
+				"@parcel/watcher-win32-arm64": "2.5.0",
+				"@parcel/watcher-win32-ia32": "2.5.0",
+				"@parcel/watcher-win32-x64": "2.5.0"
+			}
+		},
+		"node_modules/@parcel/watcher-android-arm64": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.0.tgz",
+			"integrity": "sha512-qlX4eS28bUcQCdribHkg/herLe+0A9RyYC+mm2PXpncit8z5b3nSqGVzMNR3CmtAOgRutiZ02eIJJgP/b1iEFQ==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"android"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-darwin-arm64": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.0.tgz",
+			"integrity": "sha512-hyZ3TANnzGfLpRA2s/4U1kbw2ZI4qGxaRJbBH2DCSREFfubMswheh8TeiC1sGZ3z2jUf3s37P0BBlrD3sjVTUw==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-darwin-x64": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.0.tgz",
+			"integrity": "sha512-9rhlwd78saKf18fT869/poydQK8YqlU26TMiNg7AIu7eBp9adqbJZqmdFOsbZ5cnLp5XvRo9wcFmNHgHdWaGYA==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"darwin"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-freebsd-x64": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.0.tgz",
+			"integrity": "sha512-syvfhZzyM8kErg3VF0xpV8dixJ+RzbUaaGaeb7uDuz0D3FK97/mZ5AJQ3XNnDsXX7KkFNtyQyFrXZzQIcN49Tw==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"freebsd"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-linux-arm-glibc": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.0.tgz",
+			"integrity": "sha512-0VQY1K35DQET3dVYWpOaPFecqOT9dbuCfzjxoQyif1Wc574t3kOSkKevULddcR9znz1TcklCE7Ht6NIxjvTqLA==",
+			"cpu": [
+				"arm"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-linux-arm-musl": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.0.tgz",
+			"integrity": "sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA==",
+			"cpu": [
+				"arm"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-linux-arm64-glibc": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.0.tgz",
+			"integrity": "sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-linux-arm64-musl": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.0.tgz",
+			"integrity": "sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-linux-x64-glibc": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.0.tgz",
+			"integrity": "sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-linux-x64-musl": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.0.tgz",
+			"integrity": "sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"linux"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-win32-arm64": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.0.tgz",
+			"integrity": "sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig==",
+			"cpu": [
+				"arm64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-win32-ia32": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.0.tgz",
+			"integrity": "sha512-+rgpsNRKwo8A53elqbbHXdOMtY/tAtTzManTWShB5Kk54N8Q9mzNWV7tV+IbGueCbcj826MfWGU3mprWtuf1TA==",
+			"cpu": [
+				"ia32"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@parcel/watcher-win32-x64": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.0.tgz",
+			"integrity": "sha512-lPrxve92zEHdgeff3aiu4gDOIt4u7sJYha6wbdEZDCDUhtjTsOMiaJzG5lMY4GkWH8p0fMmO2Ppq5G5XXG+DQw==",
+			"cpu": [
+				"x64"
+			],
+			"dev": true,
+			"optional": true,
+			"os": [
+				"win32"
+			],
+			"engines": {
+				"node": ">= 10.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/parcel"
+			}
+		},
+		"node_modules/@peertube/p2p-media-loader-core": {
+			"version": "1.0.20",
+			"resolved": "https://registry.npmjs.org/@peertube/p2p-media-loader-core/-/p2p-media-loader-core-1.0.20.tgz",
+			"integrity": "sha512-t6yYFcBTqDZSp3U0HqOI9fJzxFgb2C4PoiRI4FPGd28baUbsilO1PQBRwQzvu6wt8zwjzOE8FBpzYa+1gv1Sqg==",
+			"dependencies": {
+				"bittorrent-tracker": "^11.1.0",
+				"debug": "^4.3.5",
+				"esbuild": "^0.21.5",
 				"events": "^3.3.0",
 				"sha.js": "^2.4.11",
 				"simple-peer": "^9.11.1"
 			}
 		},
 		"node_modules/@peertube/p2p-media-loader-hlsjs": {
-			"version": "1.0.14",
-			"resolved": "https://registry.npmjs.org/@peertube/p2p-media-loader-hlsjs/-/p2p-media-loader-hlsjs-1.0.14.tgz",
-			"integrity": "sha512-ySUVgUvAFXCE5E94xxjfywQ8xzk3jy9UGVkgi5Oqq+QeY7uG+o7CZ+LsQ/RjXgWBD70tEnyyfADHtL+9FCnwyQ==",
+			"version": "1.0.20",
+			"resolved": "https://registry.npmjs.org/@peertube/p2p-media-loader-hlsjs/-/p2p-media-loader-hlsjs-1.0.20.tgz",
+			"integrity": "sha512-PZS9h+txV+BX3t5lsh5PZ0ZtOogPJv4GmheQ5etceQZHxRAx2UxcAchMBJsa/sQ5c4CSMsN61Megs9iZ3gWauQ==",
 			"dependencies": {
-				"@peertube/p2p-media-loader-core": "^1.0.14",
-				"debug": "^4.3.4",
+				"@peertube/p2p-media-loader-core": "^1.0.20",
+				"debug": "^4.3.5",
+				"esbuild": "^0.21.5",
 				"events": "^3.3.0",
-				"m3u8-parser": "^4.7.1"
+				"m3u8-parser": "~4.7.1"
+			}
+		},
+		"node_modules/@thaunknown/simple-peer": {
+			"version": "10.0.11",
+			"resolved": "https://registry.npmjs.org/@thaunknown/simple-peer/-/simple-peer-10.0.11.tgz",
+			"integrity": "sha512-A5MdmtZ6HUzRa4gwPOS4jG+09HvpTv2rFo4kk7Vwveo2ELm+WmbO124ZrJrQnZc2D7z2Q3AWKSitjl9OKXO88g==",
+			"dependencies": {
+				"debug": "^4.3.7",
+				"err-code": "^3.0.1",
+				"streamx": "^2.20.1",
+				"uint8-util": "^2.2.5",
+				"webrtc-polyfill": "^1.1.10"
+			}
+		},
+		"node_modules/@thaunknown/simple-websocket": {
+			"version": "9.1.3",
+			"resolved": "https://registry.npmjs.org/@thaunknown/simple-websocket/-/simple-websocket-9.1.3.tgz",
+			"integrity": "sha512-pf/FCJsgWtLJiJmIpiSI7acOZVq3bIQCpnNo222UFc8Ph1lOUOTpe6LoYhhiOSKB9GUaWJEVUtZ+sK1/aBgU5Q==",
+			"dependencies": {
+				"debug": "^4.3.5",
+				"queue-microtask": "^1.2.3",
+				"streamx": "^2.17.0",
+				"uint8-util": "^2.2.5",
+				"ws": "^8.17.1"
 			}
 		},
 		"node_modules/@trevoreyre/autocomplete-vue": {
@@ -1988,9 +2361,9 @@
 			}
 		},
 		"node_modules/@types/babel__core": {
-			"version": "7.20.3",
-			"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.3.tgz",
-			"integrity": "sha512-54fjTSeSHwfan8AyHWrKbfBWiEUrNTZsUwPTDSNaaP1QDQIZbeNUg3a59E9D+375MzUw/x1vx2/0F5LBz+AeYA==",
+			"version": "7.20.5",
+			"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
+			"integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
 			"dependencies": {
 				"@babel/parser": "^7.20.7",
 				"@babel/types": "^7.20.7",
@@ -2000,100 +2373,100 @@
 			}
 		},
 		"node_modules/@types/babel__generator": {
-			"version": "7.6.6",
-			"resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.6.tgz",
-			"integrity": "sha512-66BXMKb/sUWbMdBNdMvajU7i/44RkrA3z/Yt1c7R5xejt8qh84iU54yUWCtm0QwGJlDcf/gg4zd/x4mpLAlb/w==",
+			"version": "7.6.8",
+			"resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
+			"integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
 			"dependencies": {
 				"@babel/types": "^7.0.0"
 			}
 		},
 		"node_modules/@types/babel__template": {
-			"version": "7.4.3",
-			"resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.3.tgz",
-			"integrity": "sha512-ciwyCLeuRfxboZ4isgdNZi/tkt06m8Tw6uGbBSBgWrnnZGNXiEyM27xc/PjXGQLqlZ6ylbgHMnm7ccF9tCkOeQ==",
+			"version": "7.4.4",
+			"resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
+			"integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
 			"dependencies": {
 				"@babel/parser": "^7.1.0",
 				"@babel/types": "^7.0.0"
 			}
 		},
 		"node_modules/@types/babel__traverse": {
-			"version": "7.20.3",
-			"resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.3.tgz",
-			"integrity": "sha512-Lsh766rGEFbaxMIDH7Qa+Yha8cMVI3qAK6CHt3OR0YfxOIn5Z54iHiyDRycHrBqeIiqGa20Kpsv1cavfBKkRSw==",
+			"version": "7.20.6",
+			"resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz",
+			"integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==",
 			"dependencies": {
 				"@babel/types": "^7.20.7"
 			}
 		},
 		"node_modules/@types/body-parser": {
-			"version": "1.19.4",
-			"resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.4.tgz",
-			"integrity": "sha512-N7UDG0/xiPQa2D/XrVJXjkWbpqHCd2sBaB32ggRF2l83RhPfamgKGF8gwwqyksS95qUS5ZYF9aF+lLPRlwI2UA==",
+			"version": "1.19.5",
+			"resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",
+			"integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==",
 			"dependencies": {
 				"@types/connect": "*",
 				"@types/node": "*"
 			}
 		},
 		"node_modules/@types/bonjour": {
-			"version": "3.5.12",
-			"resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.12.tgz",
-			"integrity": "sha512-ky0kWSqXVxSqgqJvPIkgFkcn4C8MnRog308Ou8xBBIVo39OmUFy+jqNe0nPwLCDFxUpmT9EvT91YzOJgkDRcFg==",
+			"version": "3.5.13",
+			"resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz",
+			"integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==",
 			"dependencies": {
 				"@types/node": "*"
 			}
 		},
 		"node_modules/@types/clean-css": {
-			"version": "4.2.9",
-			"resolved": "https://registry.npmjs.org/@types/clean-css/-/clean-css-4.2.9.tgz",
-			"integrity": "sha512-pjzJ4n5eAXAz/L5Zur4ZymuJUvyo0Uh0iRnRI/1kADFLs76skDky0K0dX1rlv4iXXrJXNk3sxRWVJR7CMDroWA==",
+			"version": "4.2.11",
+			"resolved": "https://registry.npmjs.org/@types/clean-css/-/clean-css-4.2.11.tgz",
+			"integrity": "sha512-Y8n81lQVTAfP2TOdtJJEsCoYl1AnOkqDqMvXb9/7pfgZZ7r8YrEyurrAvAoAjHOGXKRybay+5CsExqIH6liccw==",
 			"dependencies": {
 				"@types/node": "*",
 				"source-map": "^0.6.0"
 			}
 		},
 		"node_modules/@types/connect": {
-			"version": "3.4.37",
-			"resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.37.tgz",
-			"integrity": "sha512-zBUSRqkfZ59OcwXon4HVxhx5oWCJmc0OtBTK05M+p0dYjgN6iTwIL2T/WbsQZrEsdnwaF9cWQ+azOnpPvIqY3Q==",
+			"version": "3.4.38",
+			"resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
+			"integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
 			"dependencies": {
 				"@types/node": "*"
 			}
 		},
 		"node_modules/@types/connect-history-api-fallback": {
-			"version": "1.5.2",
-			"resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.2.tgz",
-			"integrity": "sha512-gX2j9x+NzSh4zOhnRPSdPPmTepS4DfxES0AvIFv3jGv5QyeAJf6u6dY5/BAoAJU9Qq1uTvwOku8SSC2GnCRl6Q==",
+			"version": "1.5.4",
+			"resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz",
+			"integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==",
 			"dependencies": {
 				"@types/express-serve-static-core": "*",
 				"@types/node": "*"
 			}
 		},
 		"node_modules/@types/eslint": {
-			"version": "8.44.6",
-			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.6.tgz",
-			"integrity": "sha512-P6bY56TVmX8y9J87jHNgQh43h6VVU+6H7oN7hgvivV81K2XY8qJZ5vqPy/HdUoVIelii2kChYVzQanlswPWVFw==",
+			"version": "9.6.1",
+			"resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
+			"integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
 			"dependencies": {
 				"@types/estree": "*",
 				"@types/json-schema": "*"
 			}
 		},
 		"node_modules/@types/eslint-scope": {
-			"version": "3.7.6",
-			"resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.6.tgz",
-			"integrity": "sha512-zfM4ipmxVKWdxtDaJ3MP3pBurDXOCoyjvlpE3u6Qzrmw4BPbfm4/ambIeTk/r/J0iq/+2/xp0Fmt+gFvXJY2PQ==",
+			"version": "3.7.7",
+			"resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+			"integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
 			"dependencies": {
 				"@types/eslint": "*",
 				"@types/estree": "*"
 			}
 		},
 		"node_modules/@types/estree": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.3.tgz",
-			"integrity": "sha512-CS2rOaoQ/eAgAfcTfq6amKG7bsN+EMcgGY4FAFQdvSj2y1ixvOZTUA9mOtCai7E1SYu283XNw7urKK30nP3wkQ=="
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+			"integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="
 		},
 		"node_modules/@types/express": {
-			"version": "4.17.20",
-			"resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.20.tgz",
-			"integrity": "sha512-rOaqlkgEvOW495xErXMsmyX3WKBInbhG5eqojXYi3cGUaLoRDlXa5d52fkfWZT963AZ3v2eZ4MbKE6WpDAGVsw==",
+			"version": "4.17.21",
+			"resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
+			"integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==",
 			"dependencies": {
 				"@types/body-parser": "*",
 				"@types/express-serve-static-core": "^4.17.33",
@@ -2112,9 +2485,9 @@
 			}
 		},
 		"node_modules/@types/express/node_modules/@types/express-serve-static-core": {
-			"version": "4.17.39",
-			"resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.39.tgz",
-			"integrity": "sha512-BiEUfAiGCOllomsRAZOiMFP7LAnrifHpt56pc4Z7l9K6ACyN06Ns1JLMBxwkfLOjJRlSf06NwWsT7yzfpaVpyQ==",
+			"version": "4.19.6",
+			"resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz",
+			"integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==",
 			"dependencies": {
 				"@types/node": "*",
 				"@types/qs": "*",
@@ -2132,46 +2505,46 @@
 			}
 		},
 		"node_modules/@types/http-errors": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.3.tgz",
-			"integrity": "sha512-pP0P/9BnCj1OVvQR2lF41EkDG/lWWnDyA203b/4Fmi2eTyORnBtcDoKDwjWQthELrBvWkMOrvSOnZ8OVlW6tXA=="
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
+			"integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA=="
 		},
 		"node_modules/@types/http-proxy": {
-			"version": "1.17.13",
-			"resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.13.tgz",
-			"integrity": "sha512-GkhdWcMNiR5QSQRYnJ+/oXzu0+7JJEPC8vkWXK351BkhjraZF+1W13CUYARUvX9+NqIU2n6YHA4iwywsc/M6Sw==",
+			"version": "1.17.15",
+			"resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.15.tgz",
+			"integrity": "sha512-25g5atgiVNTIv0LBDTg1H74Hvayx0ajtJPLLcYE3whFv75J0pWNtOBzaXJQgDTmrX1bx5U9YC2w/n65BN1HwRQ==",
 			"dependencies": {
 				"@types/node": "*"
 			}
 		},
 		"node_modules/@types/imagemin": {
-			"version": "8.0.3",
-			"resolved": "https://registry.npmjs.org/@types/imagemin/-/imagemin-8.0.3.tgz",
-			"integrity": "sha512-se/hpaYxu5DyvPqmUEwbupmbQSx6JNislk0dkoIgWSmArkj+Ow9pGG9pGz8MRmbQDfGNYNzqwPQKHCUy+K+jpQ==",
+			"version": "9.0.0",
+			"resolved": "https://registry.npmjs.org/@types/imagemin/-/imagemin-9.0.0.tgz",
+			"integrity": "sha512-4IaT+BdPUAFf/AAy3XlFAbqGk4RawhdidxWO5XTe+PJAYAr4d7m2FHiqyEPXbDpwS+IaLIJq5AIjLE9HcwMGBg==",
 			"dependencies": {
 				"@types/node": "*"
 			}
 		},
 		"node_modules/@types/imagemin-gifsicle": {
-			"version": "7.0.3",
-			"resolved": "https://registry.npmjs.org/@types/imagemin-gifsicle/-/imagemin-gifsicle-7.0.3.tgz",
-			"integrity": "sha512-GQBKOk9doOd0Xp7OvO4QDl7U0Vkwk2Ps7J0rxafdAa7wG9lu7idvZTm8TtSZiRtHENdkW88Kz8OjmjMlgeeC5w==",
+			"version": "7.0.4",
+			"resolved": "https://registry.npmjs.org/@types/imagemin-gifsicle/-/imagemin-gifsicle-7.0.4.tgz",
+			"integrity": "sha512-ZghMBd/Jgqg5utTJNPmvf6DkuHzMhscJ8vgf/7MUGCpO+G+cLrhYltL+5d+h3A1B4W73S2SrmJZ1jS5LACpX+A==",
 			"dependencies": {
 				"@types/imagemin": "*"
 			}
 		},
 		"node_modules/@types/imagemin-mozjpeg": {
-			"version": "8.0.3",
-			"resolved": "https://registry.npmjs.org/@types/imagemin-mozjpeg/-/imagemin-mozjpeg-8.0.3.tgz",
-			"integrity": "sha512-+U/ibETP2/oRqeuaaXa67dEpKHfzmfK0OBVC09AR4c1CIFAKjQ5xY+dxH+fjoMQRlwdcRQLkn/ALtnxSl3Xsqw==",
+			"version": "8.0.4",
+			"resolved": "https://registry.npmjs.org/@types/imagemin-mozjpeg/-/imagemin-mozjpeg-8.0.4.tgz",
+			"integrity": "sha512-ZCAxV8SYJB8ehwHpnbRpHjg5Wc4HcyuAMiDhXbkgC7gujDoOTyHO3dhDkUtZ1oK1DLBRZapqG9etdLVhUml7yQ==",
 			"dependencies": {
 				"@types/imagemin": "*"
 			}
 		},
 		"node_modules/@types/imagemin-optipng": {
-			"version": "5.2.3",
-			"resolved": "https://registry.npmjs.org/@types/imagemin-optipng/-/imagemin-optipng-5.2.3.tgz",
-			"integrity": "sha512-Q80ANbJYn+WgKkWVfx9f7/q4LR6qun4NIiuV1eRWCg8KCAmNrU7ZH16a2hGs9kfkFqyJlhBv6oV9SDXe1vL3aQ==",
+			"version": "5.2.4",
+			"resolved": "https://registry.npmjs.org/@types/imagemin-optipng/-/imagemin-optipng-5.2.4.tgz",
+			"integrity": "sha512-mvKnDMC8eCYZetAQudjs1DbgpR84WhsTx1wgvdiXnpuUEti3oJ+MaMYBRWPY0JlQ4+y4TXKOfa7+LOuT8daegQ==",
 			"dependencies": {
 				"@types/imagemin": "*"
 			}
@@ -2186,14 +2559,14 @@
 			}
 		},
 		"node_modules/@types/json-schema": {
-			"version": "7.0.14",
-			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.14.tgz",
-			"integrity": "sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw=="
+			"version": "7.0.15",
+			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+			"integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="
 		},
 		"node_modules/@types/mime": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.3.tgz",
-			"integrity": "sha512-i8MBln35l856k5iOhKk2XJ4SeAWg75mLIpZB4v6imOagKL6twsukBZGDMNhdOVk7yRFTMPpfILocMos59Q1otQ=="
+			"version": "1.3.5",
+			"resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
+			"integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w=="
 		},
 		"node_modules/@types/minimatch": {
 			"version": "5.1.2",
@@ -2201,27 +2574,35 @@
 			"integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA=="
 		},
 		"node_modules/@types/node": {
-			"version": "20.8.7",
-			"resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.7.tgz",
-			"integrity": "sha512-21TKHHh3eUHIi2MloeptJWALuCu5H7HQTdTrWIFReA8ad+aggoX+lRes3ex7/FtpC+sVUpFMQ+QTfYr74mruiQ==",
+			"version": "22.10.2",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.2.tgz",
+			"integrity": "sha512-Xxr6BBRCAOQixvonOye19wnzyDiUtTeqldOOmj3CkeblonbccA12PFwlufvRdrpjXxqnmUaeiU5EOA+7s5diUQ==",
 			"dependencies": {
-				"undici-types": "~5.25.1"
+				"undici-types": "~6.20.0"
+			}
+		},
+		"node_modules/@types/node-forge": {
+			"version": "1.3.11",
+			"resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.11.tgz",
+			"integrity": "sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==",
+			"dependencies": {
+				"@types/node": "*"
 			}
 		},
 		"node_modules/@types/parse-json": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.1.tgz",
-			"integrity": "sha512-3YmXzzPAdOTVljVMkTMBdBEvlOLg2cDQaDhnnhT3nT9uDbnJzjWhKlzb+desT12Y7tGqaN6d+AbozcKzyL36Ng=="
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz",
+			"integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw=="
 		},
 		"node_modules/@types/qs": {
-			"version": "6.9.9",
-			"resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.9.tgz",
-			"integrity": "sha512-wYLxw35euwqGvTDx6zfY1vokBFnsK0HNrzc6xNHchxfO2hpuRg74GbkEW7e3sSmPvj0TjCDT1VCa6OtHXnubsg=="
+			"version": "6.9.17",
+			"resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.17.tgz",
+			"integrity": "sha512-rX4/bPcfmvxHDv0XjfJELTTr+iB+tn032nPILqHm5wbthUUUuVtNGGqzhya9XUxjTP8Fpr0qYgSZZKxGY++svQ=="
 		},
 		"node_modules/@types/range-parser": {
-			"version": "1.2.6",
-			"resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.6.tgz",
-			"integrity": "sha512-+0autS93xyXizIYiyL02FCY8N+KkKPhILhcUSA276HxzreZ16kl+cmwvV2qAM/PuCCwPXzOXOWhiPcw20uSFcA=="
+			"version": "1.2.7",
+			"resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
+			"integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ=="
 		},
 		"node_modules/@types/retry": {
 			"version": "0.12.0",
@@ -2229,41 +2610,36 @@
 			"integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="
 		},
 		"node_modules/@types/send": {
-			"version": "0.17.3",
-			"resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.3.tgz",
-			"integrity": "sha512-/7fKxvKUoETxjFUsuFlPB9YndePpxxRAOfGC/yJdc9kTjTeP5kRCTzfnE8kPUKCeyiyIZu0YQ76s50hCedI1ug==",
+			"version": "0.17.4",
+			"resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
+			"integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",
 			"dependencies": {
 				"@types/mime": "^1",
 				"@types/node": "*"
 			}
 		},
-		"node_modules/@types/send/node_modules/@types/mime": {
-			"version": "1.3.4",
-			"resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.4.tgz",
-			"integrity": "sha512-1Gjee59G25MrQGk8bsNvC6fxNiRgUlGn2wlhGf95a59DrprnnHk80FIMMFG9XHMdrfsuA119ht06QPDXA1Z7tw=="
-		},
 		"node_modules/@types/serve-index": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.3.tgz",
-			"integrity": "sha512-4KG+yMEuvDPRrYq5fyVm/I2uqAJSAwZK9VSa+Zf+zUq9/oxSSvy3kkIqyL+jjStv6UCVi8/Aho0NHtB1Fwosrg==",
+			"version": "1.9.4",
+			"resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz",
+			"integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==",
 			"dependencies": {
 				"@types/express": "*"
 			}
 		},
 		"node_modules/@types/serve-static": {
-			"version": "1.15.4",
-			"resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.4.tgz",
-			"integrity": "sha512-aqqNfs1XTF0HDrFdlY//+SGUxmdSUbjeRXb5iaZc3x0/vMbYmdw9qvOgHWOyyLFxSSRnUuP5+724zBgfw8/WAw==",
+			"version": "1.15.7",
+			"resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz",
+			"integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==",
 			"dependencies": {
 				"@types/http-errors": "*",
-				"@types/mime": "*",
-				"@types/node": "*"
+				"@types/node": "*",
+				"@types/send": "*"
 			}
 		},
 		"node_modules/@types/sockjs": {
-			"version": "0.3.35",
-			"resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.35.tgz",
-			"integrity": "sha512-tIF57KB+ZvOBpAQwSaACfEu7htponHXaFzP7RfKYgsOS0NoYnn+9+jzp7bbq4fWerizI3dTB4NfAZoyeQKWJLw==",
+			"version": "0.3.36",
+			"resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz",
+			"integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==",
 			"dependencies": {
 				"@types/node": "*"
 			}
@@ -2274,9 +2650,9 @@
 			"integrity": "sha512-AZU7vQcy/4WFEuwnwsNsJnFwupIpbllH1++LXScN6uxT1Z4zPzdrWG97w4/I7eFKFTvfy/bHFStWjdBAg2Vjug=="
 		},
 		"node_modules/@types/ws": {
-			"version": "8.5.8",
-			"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.8.tgz",
-			"integrity": "sha512-flUksGIQCnJd6sZ1l5dqCEG/ksaoAg/eUwiLAGTJQcfgvZJKF++Ta4bJA6A5aPSJmsr+xlseHn4KLgVlNnvPTg==",
+			"version": "8.5.13",
+			"resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.13.tgz",
+			"integrity": "sha512-osM/gWBTPKgHV8XkTunnegTRIsvF6owmf5w+JtAfOw472dptdm0dlGv4xCt6GwQRcC2XVOvvRE/0bAoQcL2QkA==",
 			"dependencies": {
 				"@types/node": "*"
 			}
@@ -2296,13 +2672,16 @@
 			}
 		},
 		"node_modules/@vue/compiler-sfc": {
-			"version": "2.7.14",
-			"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz",
-			"integrity": "sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==",
+			"version": "2.7.16",
+			"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz",
+			"integrity": "sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==",
 			"dependencies": {
-				"@babel/parser": "^7.18.4",
+				"@babel/parser": "^7.23.5",
 				"postcss": "^8.4.14",
 				"source-map": "^0.6.1"
+			},
+			"optionalDependencies": {
+				"prettier": "^1.18.2 || ^2.0.0"
 			}
 		},
 		"node_modules/@vue/component-compiler-utils": {
@@ -2369,133 +2748,133 @@
 			"integrity": "sha512-K1undnK70vLLauqdE8bq/l98isTF2FDhcP0UPpXVSjkSWe3xhAn5eRXk5jfA1E5ycNm84Ws/rQFUD7ue11nciw=="
 		},
 		"node_modules/@webassemblyjs/ast": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
-			"integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==",
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
+			"integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
 			"dependencies": {
-				"@webassemblyjs/helper-numbers": "1.11.6",
-				"@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+				"@webassemblyjs/helper-numbers": "1.13.2",
+				"@webassemblyjs/helper-wasm-bytecode": "1.13.2"
 			}
 		},
 		"node_modules/@webassemblyjs/floating-point-hex-parser": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
-			"integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw=="
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
+			"integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA=="
 		},
 		"node_modules/@webassemblyjs/helper-api-error": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
-			"integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q=="
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
+			"integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ=="
 		},
 		"node_modules/@webassemblyjs/helper-buffer": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz",
-			"integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA=="
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
+			"integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA=="
 		},
 		"node_modules/@webassemblyjs/helper-numbers": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
-			"integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
+			"integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
 			"dependencies": {
-				"@webassemblyjs/floating-point-hex-parser": "1.11.6",
-				"@webassemblyjs/helper-api-error": "1.11.6",
+				"@webassemblyjs/floating-point-hex-parser": "1.13.2",
+				"@webassemblyjs/helper-api-error": "1.13.2",
 				"@xtuc/long": "4.2.2"
 			}
 		},
 		"node_modules/@webassemblyjs/helper-wasm-bytecode": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
-			"integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA=="
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
+			"integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA=="
 		},
 		"node_modules/@webassemblyjs/helper-wasm-section": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz",
-			"integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==",
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
+			"integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.11.6",
-				"@webassemblyjs/helper-buffer": "1.11.6",
-				"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-				"@webassemblyjs/wasm-gen": "1.11.6"
+				"@webassemblyjs/ast": "1.14.1",
+				"@webassemblyjs/helper-buffer": "1.14.1",
+				"@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+				"@webassemblyjs/wasm-gen": "1.14.1"
 			}
 		},
 		"node_modules/@webassemblyjs/ieee754": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
-			"integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
+			"integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
 			"dependencies": {
 				"@xtuc/ieee754": "^1.2.0"
 			}
 		},
 		"node_modules/@webassemblyjs/leb128": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
-			"integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
+			"integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
 			"dependencies": {
 				"@xtuc/long": "4.2.2"
 			}
 		},
 		"node_modules/@webassemblyjs/utf8": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
-			"integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA=="
+			"version": "1.13.2",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
+			"integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ=="
 		},
 		"node_modules/@webassemblyjs/wasm-edit": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
-			"integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
+			"integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.11.6",
-				"@webassemblyjs/helper-buffer": "1.11.6",
-				"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-				"@webassemblyjs/helper-wasm-section": "1.11.6",
-				"@webassemblyjs/wasm-gen": "1.11.6",
-				"@webassemblyjs/wasm-opt": "1.11.6",
-				"@webassemblyjs/wasm-parser": "1.11.6",
-				"@webassemblyjs/wast-printer": "1.11.6"
+				"@webassemblyjs/ast": "1.14.1",
+				"@webassemblyjs/helper-buffer": "1.14.1",
+				"@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+				"@webassemblyjs/helper-wasm-section": "1.14.1",
+				"@webassemblyjs/wasm-gen": "1.14.1",
+				"@webassemblyjs/wasm-opt": "1.14.1",
+				"@webassemblyjs/wasm-parser": "1.14.1",
+				"@webassemblyjs/wast-printer": "1.14.1"
 			}
 		},
 		"node_modules/@webassemblyjs/wasm-gen": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
-			"integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
+			"integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.11.6",
-				"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-				"@webassemblyjs/ieee754": "1.11.6",
-				"@webassemblyjs/leb128": "1.11.6",
-				"@webassemblyjs/utf8": "1.11.6"
+				"@webassemblyjs/ast": "1.14.1",
+				"@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+				"@webassemblyjs/ieee754": "1.13.2",
+				"@webassemblyjs/leb128": "1.13.2",
+				"@webassemblyjs/utf8": "1.13.2"
 			}
 		},
 		"node_modules/@webassemblyjs/wasm-opt": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
-			"integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
+			"integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.11.6",
-				"@webassemblyjs/helper-buffer": "1.11.6",
-				"@webassemblyjs/wasm-gen": "1.11.6",
-				"@webassemblyjs/wasm-parser": "1.11.6"
+				"@webassemblyjs/ast": "1.14.1",
+				"@webassemblyjs/helper-buffer": "1.14.1",
+				"@webassemblyjs/wasm-gen": "1.14.1",
+				"@webassemblyjs/wasm-parser": "1.14.1"
 			}
 		},
 		"node_modules/@webassemblyjs/wasm-parser": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
-			"integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
+			"integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.11.6",
-				"@webassemblyjs/helper-api-error": "1.11.6",
-				"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-				"@webassemblyjs/ieee754": "1.11.6",
-				"@webassemblyjs/leb128": "1.11.6",
-				"@webassemblyjs/utf8": "1.11.6"
+				"@webassemblyjs/ast": "1.14.1",
+				"@webassemblyjs/helper-api-error": "1.13.2",
+				"@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+				"@webassemblyjs/ieee754": "1.13.2",
+				"@webassemblyjs/leb128": "1.13.2",
+				"@webassemblyjs/utf8": "1.13.2"
 			}
 		},
 		"node_modules/@webassemblyjs/wast-printer": {
-			"version": "1.11.6",
-			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
-			"integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
+			"version": "1.14.1",
+			"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
+			"integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
 			"dependencies": {
-				"@webassemblyjs/ast": "1.11.6",
+				"@webassemblyjs/ast": "1.14.1",
 				"@xtuc/long": "4.2.2"
 			}
 		},
@@ -2543,15 +2922,26 @@
 			"integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
 		},
 		"node_modules/@zip.js/zip.js": {
-			"version": "2.7.30",
-			"resolved": "https://registry.npmjs.org/@zip.js/zip.js/-/zip.js-2.7.30.tgz",
-			"integrity": "sha512-nhMvQCj+TF1ATBqYzFds7v+yxPBhdDYHh8J341KtC1D2UrVBUIYcYK4Jy1/GiTsxOXEiKOXSUxvPG/XR+7jMqw==",
+			"version": "2.7.54",
+			"resolved": "https://registry.npmjs.org/@zip.js/zip.js/-/zip.js-2.7.54.tgz",
+			"integrity": "sha512-qMrJVg2hoEsZJjMJez9yI2+nZlBUxgYzGV3mqcb2B/6T1ihXp0fWBDYlVHlHquuorgNUQP5a8qSmX6HF5rFJNg==",
 			"engines": {
 				"bun": ">=0.7.0",
 				"deno": ">=1.0.0",
 				"node": ">=16.5.0"
 			}
 		},
+		"node_modules/abort-controller": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
+			"integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+			"dependencies": {
+				"event-target-shim": "^5.0.0"
+			},
+			"engines": {
+				"node": ">=6.5"
+			}
+		},
 		"node_modules/accepts": {
 			"version": "1.3.8",
 			"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
@@ -2564,10 +2954,18 @@
 				"node": ">= 0.6"
 			}
 		},
+		"node_modules/accepts/node_modules/negotiator": {
+			"version": "0.6.3",
+			"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+			"integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+			"engines": {
+				"node": ">= 0.6"
+			}
+		},
 		"node_modules/acorn": {
-			"version": "8.10.0",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-			"integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
+			"version": "8.14.0",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+			"integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
 			"bin": {
 				"acorn": "bin/acorn"
 			},
@@ -2575,18 +2973,13 @@
 				"node": ">=0.4.0"
 			}
 		},
-		"node_modules/acorn-import-assertions": {
-			"version": "1.9.0",
-			"resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
-			"integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
-			"peerDependencies": {
-				"acorn": "^8"
-			}
-		},
 		"node_modules/addr-to-ip-port": {
-			"version": "1.5.4",
-			"resolved": "https://registry.npmjs.org/addr-to-ip-port/-/addr-to-ip-port-1.5.4.tgz",
-			"integrity": "sha512-ByxmJgv8vjmDcl3IDToxL2yrWFrRtFpZAToY0f46XFXl8zS081t7El5MXIodwm7RC6DhHBRoOSMLFSPKCtHukg=="
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/addr-to-ip-port/-/addr-to-ip-port-2.0.0.tgz",
+			"integrity": "sha512-9bYbtjamtdLHZSqVIUXhilOryNPiL+x+Q5J/Unpg4VY3ZIkK3fT52UoErj1NdUeVm3J1t2iBEAur4Ywbl/bahw==",
+			"engines": {
+				"node": ">=12.20.0"
+			}
 		},
 		"node_modules/adjust-sourcemap-loader": {
 			"version": "4.0.0",
@@ -2646,14 +3039,14 @@
 			}
 		},
 		"node_modules/ajv-formats/node_modules/ajv": {
-			"version": "8.12.0",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-			"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+			"version": "8.17.1",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
 			"dependencies": {
-				"fast-deep-equal": "^3.1.1",
+				"fast-deep-equal": "^3.1.3",
+				"fast-uri": "^3.0.1",
 				"json-schema-traverse": "^1.0.0",
-				"require-from-string": "^2.0.2",
-				"uri-js": "^4.2.2"
+				"require-from-string": "^2.0.2"
 			},
 			"funding": {
 				"type": "github",
@@ -2724,9 +3117,9 @@
 			}
 		},
 		"node_modules/array-flatten": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-			"integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+			"integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
 		},
 		"node_modules/array-union": {
 			"version": "2.1.0",
@@ -2737,20 +3130,19 @@
 			}
 		},
 		"node_modules/asn1.js": {
-			"version": "5.4.1",
-			"resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
-			"integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
+			"version": "4.10.1",
+			"resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+			"integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
 			"dependencies": {
 				"bn.js": "^4.0.0",
 				"inherits": "^2.0.1",
-				"minimalistic-assert": "^1.0.0",
-				"safer-buffer": "^2.1.0"
+				"minimalistic-assert": "^1.0.0"
 			}
 		},
 		"node_modules/asn1.js/node_modules/bn.js": {
-			"version": "4.12.0",
-			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-			"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+			"version": "4.12.1",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz",
+			"integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg=="
 		},
 		"node_modules/assert": {
 			"version": "1.5.1",
@@ -2774,10 +3166,16 @@
 				"inherits": "2.0.3"
 			}
 		},
+		"node_modules/asynckit": {
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+			"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+			"dev": true
+		},
 		"node_modules/autoprefixer": {
-			"version": "10.4.16",
-			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.16.tgz",
-			"integrity": "sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ==",
+			"version": "10.4.20",
+			"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.20.tgz",
+			"integrity": "sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==",
 			"funding": [
 				{
 					"type": "opencollective",
@@ -2793,11 +3191,11 @@
 				}
 			],
 			"dependencies": {
-				"browserslist": "^4.21.10",
-				"caniuse-lite": "^1.0.30001538",
-				"fraction.js": "^4.3.6",
+				"browserslist": "^4.23.3",
+				"caniuse-lite": "^1.0.30001646",
+				"fraction.js": "^4.3.7",
 				"normalize-range": "^0.1.2",
-				"picocolors": "^1.0.0",
+				"picocolors": "^1.0.1",
 				"postcss-value-parser": "^4.2.0"
 			},
 			"bin": {
@@ -2811,26 +3209,33 @@
 			}
 		},
 		"node_modules/axios": {
-			"version": "0.21.4",
-			"resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
-			"integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
+			"version": "1.7.9",
+			"resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
+			"integrity": "sha512-LhLcE7Hbiryz8oMDdDptSrWowmB4Bl6RCt6sIJKpRB4XtVf0iEgewX3au/pJqm+Py1kCASkb/FFKjxQaLtxJvw==",
 			"dev": true,
 			"dependencies": {
-				"follow-redirects": "^1.14.0"
+				"follow-redirects": "^1.15.6",
+				"form-data": "^4.0.0",
+				"proxy-from-env": "^1.1.0"
 			}
 		},
+		"node_modules/b4a": {
+			"version": "1.6.7",
+			"resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz",
+			"integrity": "sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg=="
+		},
 		"node_modules/babel-helper-vue-jsx-merge-props": {
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
 			"integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg=="
 		},
 		"node_modules/babel-loader": {
-			"version": "8.3.0",
-			"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz",
-			"integrity": "sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==",
+			"version": "8.4.1",
+			"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.4.1.tgz",
+			"integrity": "sha512-nXzRChX+Z1GoE6yWavBQg6jDslyFF3SDjl2paADuoQtQW10JqShJt62R6eJQ5m/pjJFDT8xgKIWSP85OY8eXeA==",
 			"dependencies": {
 				"find-cache-dir": "^3.3.1",
-				"loader-utils": "^2.0.0",
+				"loader-utils": "^2.0.4",
 				"make-dir": "^3.1.0",
 				"schema-utils": "^2.6.5"
 			},
@@ -2843,12 +3248,12 @@
 			}
 		},
 		"node_modules/babel-plugin-polyfill-corejs2": {
-			"version": "0.4.6",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz",
-			"integrity": "sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q==",
+			"version": "0.4.12",
+			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.12.tgz",
+			"integrity": "sha512-CPWT6BwvhrTO2d8QVorhTCQw9Y43zOu7G9HigcfxvepOU6b8o3tcWad6oVgZIsZCTt42FFv97aA7ZJsbM4+8og==",
 			"dependencies": {
 				"@babel/compat-data": "^7.22.6",
-				"@babel/helper-define-polyfill-provider": "^0.4.3",
+				"@babel/helper-define-polyfill-provider": "^0.6.3",
 				"semver": "^6.3.1"
 			},
 			"peerDependencies": {
@@ -2864,23 +3269,23 @@
 			}
 		},
 		"node_modules/babel-plugin-polyfill-corejs3": {
-			"version": "0.8.5",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.5.tgz",
-			"integrity": "sha512-Q6CdATeAvbScWPNLB8lzSO7fgUVBkQt6zLgNlfyeCr/EQaEQR+bWiBYYPYAFyE528BMjRhL+1QBMOI4jc/c5TA==",
+			"version": "0.10.6",
+			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.6.tgz",
+			"integrity": "sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==",
 			"dependencies": {
-				"@babel/helper-define-polyfill-provider": "^0.4.3",
-				"core-js-compat": "^3.32.2"
+				"@babel/helper-define-polyfill-provider": "^0.6.2",
+				"core-js-compat": "^3.38.0"
 			},
 			"peerDependencies": {
 				"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
 			}
 		},
 		"node_modules/babel-plugin-polyfill-regenerator": {
-			"version": "0.5.3",
-			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.3.tgz",
-			"integrity": "sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw==",
+			"version": "0.6.3",
+			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.3.tgz",
+			"integrity": "sha512-LiWSbl4CRSIa5x/JAU6jZiG9eit9w6mz+yVMFwDE83LAWvt0AfGBoZ7HS/mkhrKuh2ZlzfVZYKoLjXdqw6Yt7Q==",
 			"dependencies": {
-				"@babel/helper-define-polyfill-provider": "^0.4.3"
+				"@babel/helper-define-polyfill-provider": "^0.6.3"
 			},
 			"peerDependencies": {
 				"@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
@@ -2891,6 +3296,20 @@
 			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
 			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
 		},
+		"node_modules/bare-events": {
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.5.0.tgz",
+			"integrity": "sha512-/E8dDe9dsbLyh2qrZ64PEPadOQ0F4gbl1sUJOrmph7xOiIxfY8vwab/4bFLh4Y88/Hk/ujKcrQKc+ps0mv873A==",
+			"optional": true
+		},
+		"node_modules/base64-arraybuffer": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
+			"integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==",
+			"engines": {
+				"node": ">= 0.6.0"
+			}
+		},
 		"node_modules/base64-js": {
 			"version": "1.5.1",
 			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@@ -2916,9 +3335,15 @@
 			"integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw=="
 		},
 		"node_modules/bencode": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/bencode/-/bencode-2.0.3.tgz",
-			"integrity": "sha512-D/vrAD4dLVX23NalHwb8dSvsUsxeRPO8Y7ToKA015JQYq69MLDOMkC0uGZYA/MPpltLO8rt8eqFC2j8DxjTZ/w=="
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/bencode/-/bencode-4.0.0.tgz",
+			"integrity": "sha512-AERXw18df0pF3ziGOCyUjqKZBVNH8HV3lBxnx5w0qtgMIk4a1wb9BkcCQbkp9Zstfrn/dzRwl7MmUHHocX3sRQ==",
+			"dependencies": {
+				"uint8-util": "^2.2.2"
+			},
+			"engines": {
+				"node": ">=12.20.0"
+			}
 		},
 		"node_modules/big.js": {
 			"version": "5.2.2",
@@ -2929,16 +3354,19 @@
 			}
 		},
 		"node_modules/bigpicture": {
-			"version": "2.6.2",
-			"resolved": "https://registry.npmjs.org/bigpicture/-/bigpicture-2.6.2.tgz",
-			"integrity": "sha512-IZmRDr7ZSJLDtDvOP/dfqvJhMBqV/tGQAl3UgvkaCzePIkHYlYV/uCg9349E4RPF3ng7QM+eqFZ2CY7tE6pLMA=="
+			"version": "2.6.3",
+			"resolved": "https://registry.npmjs.org/bigpicture/-/bigpicture-2.6.3.tgz",
+			"integrity": "sha512-Zmnca4YpQn3iygBNSxiyILBVk/a0nvdn3BAmNyZ3KLG5aasDYg+f0oEBqsbohL2YPS5UPqrk3NZH2zXSSHDKIg=="
 		},
 		"node_modules/binary-extensions": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-			"integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+			"integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
 			"engines": {
 				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
 		"node_modules/bittorrent-peerid": {
@@ -2961,9 +3389,9 @@
 			]
 		},
 		"node_modules/bittorrent-tracker": {
-			"version": "9.19.0",
-			"resolved": "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.19.0.tgz",
-			"integrity": "sha512-09d0aD2b+MC+zWvWajkUAKkYMynYW4tMbTKiRSthKtJZbafzEoNQSUHyND24SoCe3ZOb2fKfa6fu2INAESL9wA==",
+			"version": "11.1.2",
+			"resolved": "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-11.1.2.tgz",
+			"integrity": "sha512-mzINNIJ3FjNBcqQPKPQoxpNzzqEVfbBohwdVxblaOKGQVxagMzipCWwbxiAt+J35WC3xs1wFeCDUXpzQ3TBA+A==",
 			"funding": [
 				{
 					"type": "github",
@@ -2979,39 +3407,83 @@
 				}
 			],
 			"dependencies": {
-				"bencode": "^2.0.1",
-				"bittorrent-peerid": "^1.3.3",
-				"bn.js": "^5.2.0",
+				"@thaunknown/simple-peer": "^10.0.8",
+				"@thaunknown/simple-websocket": "^9.1.3",
+				"bencode": "^4.0.0",
+				"bittorrent-peerid": "^1.3.6",
 				"chrome-dgram": "^3.0.6",
-				"clone": "^2.0.0",
 				"compact2string": "^1.4.1",
-				"debug": "^4.1.1",
-				"ip": "^1.1.5",
+				"cross-fetch-ponyfill": "^1.0.3",
+				"debug": "^4.3.4",
+				"ip": "^2.0.1",
 				"lru": "^3.1.0",
-				"minimist": "^1.2.5",
+				"minimist": "^1.2.8",
 				"once": "^1.4.0",
 				"queue-microtask": "^1.2.3",
 				"random-iterate": "^1.0.1",
-				"randombytes": "^2.1.0",
 				"run-parallel": "^1.2.0",
 				"run-series": "^1.1.9",
-				"simple-get": "^4.0.0",
-				"simple-peer": "^9.11.0",
-				"simple-websocket": "^9.1.0",
-				"socks": "^2.0.0",
-				"string2compact": "^1.3.0",
+				"socks": "^2.8.3",
+				"string2compact": "^2.0.1",
+				"uint8-util": "^2.2.5",
 				"unordered-array-remove": "^1.0.2",
-				"ws": "^7.4.5"
+				"ws": "^8.17.0"
 			},
 			"bin": {
 				"bittorrent-tracker": "bin/cmd.js"
 			},
 			"engines": {
-				"node": ">=12"
+				"node": ">=16.0.0"
 			},
 			"optionalDependencies": {
-				"bufferutil": "^4.0.3",
-				"utf-8-validate": "^5.0.5"
+				"bufferutil": "^4.0.8",
+				"utf-8-validate": "^6.0.4"
+			}
+		},
+		"node_modules/bl": {
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+			"integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+			"dependencies": {
+				"buffer": "^5.5.0",
+				"inherits": "^2.0.4",
+				"readable-stream": "^3.4.0"
+			}
+		},
+		"node_modules/bl/node_modules/buffer": {
+			"version": "5.7.1",
+			"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+			"integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/feross"
+				},
+				{
+					"type": "patreon",
+					"url": "https://www.patreon.com/feross"
+				},
+				{
+					"type": "consulting",
+					"url": "https://feross.org/support"
+				}
+			],
+			"dependencies": {
+				"base64-js": "^1.3.1",
+				"ieee754": "^1.1.13"
+			}
+		},
+		"node_modules/bl/node_modules/readable-stream": {
+			"version": "3.6.2",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+			"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+			"dependencies": {
+				"inherits": "^2.0.3",
+				"string_decoder": "^1.1.1",
+				"util-deprecate": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 6"
 			}
 		},
 		"node_modules/bluebird": {
@@ -3031,20 +3503,20 @@
 			"integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ=="
 		},
 		"node_modules/body-parser": {
-			"version": "1.20.1",
-			"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
-			"integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+			"version": "1.20.3",
+			"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
+			"integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
 			"dependencies": {
 				"bytes": "3.1.2",
-				"content-type": "~1.0.4",
+				"content-type": "~1.0.5",
 				"debug": "2.6.9",
 				"depd": "2.0.0",
 				"destroy": "1.2.0",
 				"http-errors": "2.0.0",
 				"iconv-lite": "0.4.24",
 				"on-finished": "2.4.1",
-				"qs": "6.11.0",
-				"raw-body": "2.5.1",
+				"qs": "6.13.0",
+				"raw-body": "2.5.2",
 				"type-is": "~1.6.18",
 				"unpipe": "1.0.0"
 			},
@@ -3053,14 +3525,6 @@
 				"npm": "1.2.8000 || >= 1.4.16"
 			}
 		},
-		"node_modules/body-parser/node_modules/bytes": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-			"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-			"engines": {
-				"node": ">= 0.8"
-			}
-		},
 		"node_modules/body-parser/node_modules/debug": {
 			"version": "2.6.9",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -3075,11 +3539,11 @@
 			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
 		},
 		"node_modules/body-parser/node_modules/qs": {
-			"version": "6.11.0",
-			"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-			"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+			"version": "6.13.0",
+			"resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+			"integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
 			"dependencies": {
-				"side-channel": "^1.0.4"
+				"side-channel": "^1.0.6"
 			},
 			"engines": {
 				"node": ">=0.6"
@@ -3089,12 +3553,10 @@
 			}
 		},
 		"node_modules/bonjour-service": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz",
-			"integrity": "sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==",
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.3.0.tgz",
+			"integrity": "sha512-3YuAUiSkWykd+2Azjgyxei8OWf8thdn8AITIog2M4UICzoqfjlqr64WIjEXZllf/W6vK1goqleSR6brGomxQqA==",
 			"dependencies": {
-				"array-flatten": "^2.1.2",
-				"dns-equal": "^1.0.0",
 				"fast-deep-equal": "^3.1.3",
 				"multicast-dns": "^7.2.5"
 			}
@@ -3146,11 +3608,11 @@
 			}
 		},
 		"node_modules/braces": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-			"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+			"integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
 			"dependencies": {
-				"fill-range": "^7.0.1"
+				"fill-range": "^7.1.1"
 			},
 			"engines": {
 				"node": ">=8"
@@ -3196,41 +3658,36 @@
 			}
 		},
 		"node_modules/browserify-rsa": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
-			"integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.1.tgz",
+			"integrity": "sha512-YBjSAiTqM04ZVei6sXighu679a3SqWORA3qZTEqZImnlkDIFtKc6pNutpjyZ8RJTjQtuYfeetkxM11GwoYXMIQ==",
 			"dependencies": {
-				"bn.js": "^5.0.0",
-				"randombytes": "^2.0.1"
+				"bn.js": "^5.2.1",
+				"randombytes": "^2.1.0",
+				"safe-buffer": "^5.2.1"
+			},
+			"engines": {
+				"node": ">= 0.10"
 			}
 		},
 		"node_modules/browserify-sign": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
-			"integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+			"version": "4.2.3",
+			"resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.3.tgz",
+			"integrity": "sha512-JWCZW6SKhfhjJxO8Tyiiy+XYB7cqd2S5/+WeYHsKdNKFlCBhKbblba1A/HN/90YwtxKc8tCErjffZl++UNmGiw==",
 			"dependencies": {
-				"bn.js": "^5.1.1",
-				"browserify-rsa": "^4.0.1",
+				"bn.js": "^5.2.1",
+				"browserify-rsa": "^4.1.0",
 				"create-hash": "^1.2.0",
 				"create-hmac": "^1.1.7",
-				"elliptic": "^6.5.3",
+				"elliptic": "^6.5.5",
+				"hash-base": "~3.0",
 				"inherits": "^2.0.4",
-				"parse-asn1": "^5.1.5",
-				"readable-stream": "^3.6.0",
-				"safe-buffer": "^5.2.0"
-			}
-		},
-		"node_modules/browserify-sign/node_modules/readable-stream": {
-			"version": "3.6.2",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-			"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-			"dependencies": {
-				"inherits": "^2.0.3",
-				"string_decoder": "^1.1.1",
-				"util-deprecate": "^1.0.1"
+				"parse-asn1": "^5.1.7",
+				"readable-stream": "^2.3.8",
+				"safe-buffer": "^5.2.1"
 			},
 			"engines": {
-				"node": ">= 6"
+				"node": ">= 0.12"
 			}
 		},
 		"node_modules/browserify-zlib": {
@@ -3242,9 +3699,9 @@
 			}
 		},
 		"node_modules/browserslist": {
-			"version": "4.22.1",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz",
-			"integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==",
+			"version": "4.24.3",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.3.tgz",
+			"integrity": "sha512-1CPmv8iobE2fyRMV97dAcMVegvvWKxmq94hkLiAkUGwKVTyDLw33K+ZxiFrREKmmps4rIw6grcCFCnTMSZ/YiA==",
 			"funding": [
 				{
 					"type": "opencollective",
@@ -3260,10 +3717,10 @@
 				}
 			],
 			"dependencies": {
-				"caniuse-lite": "^1.0.30001541",
-				"electron-to-chromium": "^1.4.535",
-				"node-releases": "^2.0.13",
-				"update-browserslist-db": "^1.0.13"
+				"caniuse-lite": "^1.0.30001688",
+				"electron-to-chromium": "^1.5.73",
+				"node-releases": "^2.0.19",
+				"update-browserslist-db": "^1.1.1"
 			},
 			"bin": {
 				"browserslist": "cli.js"
@@ -3311,21 +3768,52 @@
 			"integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ=="
 		},
 		"node_modules/bytes": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-			"integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+			"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
 			"engines": {
 				"node": ">= 0.8"
 			}
 		},
 		"node_modules/call-bind": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
-			"integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
+			"integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
 			"dependencies": {
-				"function-bind": "^1.1.2",
-				"get-intrinsic": "^1.2.1",
-				"set-function-length": "^1.1.1"
+				"call-bind-apply-helpers": "^1.0.0",
+				"es-define-property": "^1.0.0",
+				"get-intrinsic": "^1.2.4",
+				"set-function-length": "^1.2.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/call-bind-apply-helpers": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz",
+			"integrity": "sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==",
+			"dependencies": {
+				"es-errors": "^1.3.0",
+				"function-bind": "^1.1.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/call-bound": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz",
+			"integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==",
+			"dependencies": {
+				"call-bind-apply-helpers": "^1.0.1",
+				"get-intrinsic": "^1.2.6"
+			},
+			"engines": {
+				"node": ">= 0.4"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
@@ -3360,9 +3848,9 @@
 			}
 		},
 		"node_modules/caniuse-lite": {
-			"version": "1.0.30001553",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001553.tgz",
-			"integrity": "sha512-N0ttd6TrFfuqKNi+pMgWJTb9qrdJu4JSpgPFLe/lrD19ugC6fZgF0pUewRowDwzdDnb9V41mFcdlYgl/PyKf4A==",
+			"version": "1.0.30001690",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001690.tgz",
+			"integrity": "sha512-5ExiE3qQN6oF8Clf8ifIDcMRCRE/dMGcETG/XGMD8/XiXm6HXQgQTh1yZYLXXpSOsEUlJm1Xr7kGULZTuGtP/w==",
 			"funding": [
 				{
 					"type": "opencollective",
@@ -3441,15 +3929,9 @@
 			"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
 		},
 		"node_modules/chokidar": {
-			"version": "3.5.3",
-			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-			"integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-			"funding": [
-				{
-					"type": "individual",
-					"url": "https://paulmillr.com/funding/"
-				}
-			],
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+			"integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
 			"dependencies": {
 				"anymatch": "~3.1.2",
 				"braces": "~3.0.2",
@@ -3462,10 +3944,18 @@
 			"engines": {
 				"node": ">= 8.10.0"
 			},
+			"funding": {
+				"url": "https://paulmillr.com/funding/"
+			},
 			"optionalDependencies": {
 				"fsevents": "~2.3.2"
 			}
 		},
+		"node_modules/chownr": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+			"integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+		},
 		"node_modules/chrome-dgram": {
 			"version": "3.0.6",
 			"resolved": "https://registry.npmjs.org/chrome-dgram/-/chrome-dgram-3.0.6.tgz",
@@ -3490,26 +3980,29 @@
 			}
 		},
 		"node_modules/chrome-trace-event": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
-			"integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
+			"integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
 			"engines": {
 				"node": ">=6.0"
 			}
 		},
 		"node_modules/cipher-base": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-			"integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.6.tgz",
+			"integrity": "sha512-3Ek9H3X6pj5TgenXYtNWdaBon1tgYCaebd+XPg0keyjEbEfkD4KkmAxkQ/i1vYvxdcT5nscLBfq9VJRmCBcFSw==",
 			"dependencies": {
-				"inherits": "^2.0.1",
-				"safe-buffer": "^5.0.1"
+				"inherits": "^2.0.4",
+				"safe-buffer": "^5.2.1"
+			},
+			"engines": {
+				"node": ">= 0.10"
 			}
 		},
 		"node_modules/clean-css": {
-			"version": "5.3.2",
-			"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.2.tgz",
-			"integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==",
+			"version": "5.3.3",
+			"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.3.tgz",
+			"integrity": "sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==",
 			"dependencies": {
 				"source-map": "~0.6.0"
 			},
@@ -3527,9 +4020,9 @@
 			}
 		},
 		"node_modules/cli-table3": {
-			"version": "0.6.3",
-			"resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz",
-			"integrity": "sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==",
+			"version": "0.6.5",
+			"resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.5.tgz",
+			"integrity": "sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==",
 			"dependencies": {
 				"string-width": "^4.2.0"
 			},
@@ -3553,14 +4046,6 @@
 				"node": ">=12"
 			}
 		},
-		"node_modules/clone": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-			"integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
-			"engines": {
-				"node": ">=0.8"
-			}
-		},
 		"node_modules/clone-deep": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
@@ -3605,6 +4090,18 @@
 			"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
 			"integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w=="
 		},
+		"node_modules/combined-stream": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+			"dev": true,
+			"dependencies": {
+				"delayed-stream": "~1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.8"
+			}
+		},
 		"node_modules/commander": {
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
@@ -3638,16 +4135,16 @@
 			}
 		},
 		"node_modules/compression": {
-			"version": "1.7.4",
-			"resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-			"integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+			"version": "1.7.5",
+			"resolved": "https://registry.npmjs.org/compression/-/compression-1.7.5.tgz",
+			"integrity": "sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q==",
 			"dependencies": {
-				"accepts": "~1.3.5",
-				"bytes": "3.0.0",
-				"compressible": "~2.0.16",
+				"bytes": "3.1.2",
+				"compressible": "~2.0.18",
 				"debug": "2.6.9",
+				"negotiator": "~0.6.4",
 				"on-headers": "~1.0.2",
-				"safe-buffer": "5.1.2",
+				"safe-buffer": "5.2.1",
 				"vary": "~1.1.2"
 			},
 			"engines": {
@@ -3667,11 +4164,6 @@
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
 			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
 		},
-		"node_modules/compression/node_modules/safe-buffer": {
-			"version": "5.1.2",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-		},
 		"node_modules/concat": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/concat/-/concat-1.0.3.tgz",
@@ -3757,9 +4249,9 @@
 			"integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
 		},
 		"node_modules/cookie": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-			"integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+			"version": "0.7.1",
+			"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
+			"integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
 			"engines": {
 				"node": ">= 0.6"
 			}
@@ -3770,9 +4262,9 @@
 			"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
 		},
 		"node_modules/core-js": {
-			"version": "3.33.1",
-			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.33.1.tgz",
-			"integrity": "sha512-qVSq3s+d4+GsqN0teRCJtM6tdEEXyWxjzbhVrCHmBS5ZTM0FS2MOS0D13dUXAWDUN6a+lHI/N1hF9Ytz6iLl9Q==",
+			"version": "3.39.0",
+			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.39.0.tgz",
+			"integrity": "sha512-raM0ew0/jJUqkJ0E6e8UDtl+y/7ktFivgWvqw8dNSQeNWoSDLvQ1H/RN3aPXB9tBd4/FhyR4RDPGhsNIMsAn7g==",
 			"hasInstallScript": true,
 			"funding": {
 				"type": "opencollective",
@@ -3780,11 +4272,11 @@
 			}
 		},
 		"node_modules/core-js-compat": {
-			"version": "3.33.1",
-			"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.1.tgz",
-			"integrity": "sha512-6pYKNOgD/j/bkC5xS5IIg6bncid3rfrI42oBH1SQJbsmYPKF7rhzcFzYCcxYMmNQQ0rCEB8WqpW7QHndOggaeQ==",
+			"version": "3.39.0",
+			"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.39.0.tgz",
+			"integrity": "sha512-VgEUx3VwlExr5no0tXlBt+silBvhTryPwCXRI2Id1PN8WTKu7MreethvddqOubrYxkFdv/RnYrqlv1sFNAUelw==",
 			"dependencies": {
-				"browserslist": "^4.22.1"
+				"browserslist": "^4.24.2"
 			},
 			"funding": {
 				"type": "opencollective",
@@ -3821,9 +4313,9 @@
 			}
 		},
 		"node_modules/create-ecdh/node_modules/bn.js": {
-			"version": "4.12.0",
-			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-			"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+			"version": "4.12.1",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz",
+			"integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg=="
 		},
 		"node_modules/create-hash": {
 			"version": "1.2.0",
@@ -3851,9 +4343,9 @@
 			}
 		},
 		"node_modules/cropperjs": {
-			"version": "1.6.1",
-			"resolved": "https://registry.npmjs.org/cropperjs/-/cropperjs-1.6.1.tgz",
-			"integrity": "sha512-F4wsi+XkDHCOMrHMYjrTEE4QBOrsHHN5/2VsVAaRq8P7E5z7xQpT75S+f/9WikmBEailas3+yo+6zPIomW+NOA=="
+			"version": "1.6.2",
+			"resolved": "https://registry.npmjs.org/cropperjs/-/cropperjs-1.6.2.tgz",
+			"integrity": "sha512-nhymn9GdnV3CqiEHJVai54TULFAE3VshJTXSqSJKa8yXAKyBKDWdhHarnlIPrshJ0WMFTGuFvG02YjLXfPiuOA=="
 		},
 		"node_modules/cross-env": {
 			"version": "5.2.1",
@@ -3871,10 +4363,36 @@
 				"node": ">=4.0"
 			}
 		},
+		"node_modules/cross-fetch-ponyfill": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/cross-fetch-ponyfill/-/cross-fetch-ponyfill-1.0.3.tgz",
+			"integrity": "sha512-uOBkDhUAGAbx/FEzNKkOfx3w57H8xReBBXoZvUnOKTI0FW0Xvrj3GrYv2iZXUqlffC1LMGfQzhmBM/ke+6eTDA==",
+			"dependencies": {
+				"abort-controller": "^3.0.0",
+				"node-fetch": "^3.3.0"
+			}
+		},
+		"node_modules/cross-fetch-ponyfill/node_modules/node-fetch": {
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
+			"integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
+			"dependencies": {
+				"data-uri-to-buffer": "^4.0.0",
+				"fetch-blob": "^3.1.4",
+				"formdata-polyfill": "^4.0.10"
+			},
+			"engines": {
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/node-fetch"
+			}
+		},
 		"node_modules/cross-spawn": {
-			"version": "6.0.5",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-			"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+			"version": "6.0.6",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz",
+			"integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==",
 			"dev": true,
 			"dependencies": {
 				"nice-try": "^1.0.4",
@@ -3896,24 +4414,28 @@
 			}
 		},
 		"node_modules/crypto-browserify": {
-			"version": "3.12.0",
-			"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-			"integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+			"version": "3.12.1",
+			"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.1.tgz",
+			"integrity": "sha512-r4ESw/IlusD17lgQi1O20Fa3qNnsckR126TdUuBgAu7GBYSIPvdNyONd3Zrxh0xCwA4+6w/TDArBPsMvhur+KQ==",
 			"dependencies": {
-				"browserify-cipher": "^1.0.0",
-				"browserify-sign": "^4.0.0",
-				"create-ecdh": "^4.0.0",
-				"create-hash": "^1.1.0",
-				"create-hmac": "^1.1.0",
-				"diffie-hellman": "^5.0.0",
-				"inherits": "^2.0.1",
-				"pbkdf2": "^3.0.3",
-				"public-encrypt": "^4.0.0",
-				"randombytes": "^2.0.0",
-				"randomfill": "^1.0.3"
+				"browserify-cipher": "^1.0.1",
+				"browserify-sign": "^4.2.3",
+				"create-ecdh": "^4.0.4",
+				"create-hash": "^1.2.0",
+				"create-hmac": "^1.1.7",
+				"diffie-hellman": "^5.0.3",
+				"hash-base": "~3.0.4",
+				"inherits": "^2.0.4",
+				"pbkdf2": "^3.1.2",
+				"public-encrypt": "^4.0.3",
+				"randombytes": "^2.1.0",
+				"randomfill": "^1.0.4"
 			},
 			"engines": {
-				"node": "*"
+				"node": ">= 0.10"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
 		"node_modules/css-declaration-sorter": {
@@ -3928,54 +4450,47 @@
 			}
 		},
 		"node_modules/css-loader": {
-			"version": "6.8.1",
-			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.8.1.tgz",
-			"integrity": "sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==",
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/css-loader/-/css-loader-7.1.2.tgz",
+			"integrity": "sha512-6WvYYn7l/XEGN8Xu2vWFt9nVzrCn39vKyTEFf/ExEyoksJjjSZV/0/35XPlMbpnr6VGhZIUg5yJrL8tGfes/FA==",
 			"dev": true,
 			"peer": true,
 			"dependencies": {
 				"icss-utils": "^5.1.0",
-				"postcss": "^8.4.21",
-				"postcss-modules-extract-imports": "^3.0.0",
-				"postcss-modules-local-by-default": "^4.0.3",
-				"postcss-modules-scope": "^3.0.0",
+				"postcss": "^8.4.33",
+				"postcss-modules-extract-imports": "^3.1.0",
+				"postcss-modules-local-by-default": "^4.0.5",
+				"postcss-modules-scope": "^3.2.0",
 				"postcss-modules-values": "^4.0.0",
 				"postcss-value-parser": "^4.2.0",
-				"semver": "^7.3.8"
+				"semver": "^7.5.4"
 			},
 			"engines": {
-				"node": ">= 12.13.0"
+				"node": ">= 18.12.0"
 			},
 			"funding": {
 				"type": "opencollective",
 				"url": "https://opencollective.com/webpack"
 			},
 			"peerDependencies": {
-				"webpack": "^5.0.0"
-			}
-		},
-		"node_modules/css-loader/node_modules/lru-cache": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-			"dev": true,
-			"peer": true,
-			"dependencies": {
-				"yallist": "^4.0.0"
+				"@rspack/core": "0.x || 1.x",
+				"webpack": "^5.27.0"
 			},
-			"engines": {
-				"node": ">=10"
+			"peerDependenciesMeta": {
+				"@rspack/core": {
+					"optional": true
+				},
+				"webpack": {
+					"optional": true
+				}
 			}
 		},
 		"node_modules/css-loader/node_modules/semver": {
-			"version": "7.5.4",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-			"integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+			"version": "7.6.3",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+			"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
 			"dev": true,
 			"peer": true,
-			"dependencies": {
-				"lru-cache": "^6.0.0"
-			},
 			"bin": {
 				"semver": "bin/semver.js"
 			},
@@ -3983,13 +4498,6 @@
 				"node": ">=10"
 			}
 		},
-		"node_modules/css-loader/node_modules/yallist": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-			"dev": true,
-			"peer": true
-		},
 		"node_modules/css-select": {
 			"version": "4.3.0",
 			"resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
@@ -4138,15 +4646,23 @@
 			}
 		},
 		"node_modules/csstype": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
-			"integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+			"integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
 		},
 		"node_modules/custom-event-polyfill": {
 			"version": "1.0.7",
 			"resolved": "https://registry.npmjs.org/custom-event-polyfill/-/custom-event-polyfill-1.0.7.tgz",
 			"integrity": "sha512-TDDkd5DkaZxZFM8p+1I3yAlvM3rSr1wbrOliG4yJiwinMZN8z/iGL7BTlDkrJcYTmgUSb4ywVCc3ZaUtOtC76w=="
 		},
+		"node_modules/data-uri-to-buffer": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
+			"integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==",
+			"engines": {
+				"node": ">= 12"
+			}
+		},
 		"node_modules/date-fns": {
 			"version": "1.30.1",
 			"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz",
@@ -4159,11 +4675,11 @@
 			"dev": true
 		},
 		"node_modules/debug": {
-			"version": "4.3.4",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-			"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+			"version": "4.4.0",
+			"resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+			"integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
 			"dependencies": {
-				"ms": "2.1.2"
+				"ms": "^2.1.3"
 			},
 			"engines": {
 				"node": ">=6.0"
@@ -4188,6 +4704,14 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/deep-extend": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+			"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+			"engines": {
+				"node": ">=4.0.0"
+			}
+		},
 		"node_modules/default-gateway": {
 			"version": "6.0.3",
 			"resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
@@ -4200,16 +4724,19 @@
 			}
 		},
 		"node_modules/define-data-property": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
-			"integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+			"integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
 			"dependencies": {
-				"get-intrinsic": "^1.2.1",
-				"gopd": "^1.0.1",
-				"has-property-descriptors": "^1.0.0"
+				"es-define-property": "^1.0.0",
+				"es-errors": "^1.3.0",
+				"gopd": "^1.0.1"
 			},
 			"engines": {
 				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
 		"node_modules/define-lazy-prop": {
@@ -4255,6 +4782,15 @@
 				"node": ">=8"
 			}
 		},
+		"node_modules/delayed-stream": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+			"integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=0.4.0"
+			}
+		},
 		"node_modules/depd": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
@@ -4286,6 +4822,19 @@
 				"npm": "1.2.8000 || >= 1.4.16"
 			}
 		},
+		"node_modules/detect-libc": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+			"integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+			"dev": true,
+			"optional": true,
+			"bin": {
+				"detect-libc": "bin/detect-libc.js"
+			},
+			"engines": {
+				"node": ">=0.10"
+			}
+		},
 		"node_modules/detect-node": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
@@ -4302,9 +4851,9 @@
 			}
 		},
 		"node_modules/diffie-hellman/node_modules/bn.js": {
-			"version": "4.12.0",
-			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-			"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+			"version": "4.12.1",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz",
+			"integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg=="
 		},
 		"node_modules/dir-glob": {
 			"version": "3.0.1",
@@ -4317,11 +4866,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/dns-equal": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-			"integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg=="
-		},
 		"node_modules/dns-packet": {
 			"version": "5.6.1",
 			"resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz",
@@ -4448,20 +4992,33 @@
 			"resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
 			"integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="
 		},
+		"node_modules/dunder-proto": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+			"integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+			"dependencies": {
+				"call-bind-apply-helpers": "^1.0.1",
+				"es-errors": "^1.3.0",
+				"gopd": "^1.2.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
 		"node_modules/ee-first": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
 			"integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
 		},
 		"node_modules/electron-to-chromium": {
-			"version": "1.4.563",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.563.tgz",
-			"integrity": "sha512-dg5gj5qOgfZNkPNeyKBZQAQitIQ/xwfIDmEQJHCbXaD9ebTZxwJXUsDYcBlAvZGZLi+/354l35J1wkmP6CqYaw=="
+			"version": "1.5.75",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.75.tgz",
+			"integrity": "sha512-Lf3++DumRE/QmweGjU+ZcKqQ+3bKkU/qjaKYhIJKEOhgIO9Xs6IiAQFkfFoj+RhgDk4LUeNsLo6plExHqSyu6Q=="
 		},
 		"node_modules/elliptic": {
-			"version": "6.5.4",
-			"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-			"integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
+			"version": "6.6.1",
+			"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.6.1.tgz",
+			"integrity": "sha512-RaddvvMatK2LJHqFJ+YA4WysVN5Ita9E35botqIYspQ4TkRAlCicdzKOjlyv/1Za5RyTNn7di//eEV0uTAfe3g==",
 			"dependencies": {
 				"bn.js": "^4.11.9",
 				"brorand": "^1.1.0",
@@ -4473,9 +5030,9 @@
 			}
 		},
 		"node_modules/elliptic/node_modules/bn.js": {
-			"version": "4.12.0",
-			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-			"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+			"version": "4.12.1",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz",
+			"integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg=="
 		},
 		"node_modules/emoji-regex": {
 			"version": "8.0.0",
@@ -4491,17 +5048,25 @@
 			}
 		},
 		"node_modules/encodeurl": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-			"integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+			"integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
 			"engines": {
 				"node": ">= 0.8"
 			}
 		},
+		"node_modules/end-of-stream": {
+			"version": "1.4.4",
+			"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+			"integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+			"dependencies": {
+				"once": "^1.4.0"
+			}
+		},
 		"node_modules/enhanced-resolve": {
-			"version": "5.15.0",
-			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
-			"integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
+			"version": "5.18.0",
+			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.0.tgz",
+			"integrity": "sha512-0/r0MySGYG8YqlayBZ6MuCfECmHFdJ5qyPh8s8wa5Hnm6SaFLSK1VYCbj+NKp090Nm1caZhD+QTnmxO7esYGyQ==",
 			"dependencies": {
 				"graceful-fs": "^4.2.4",
 				"tapable": "^2.2.0"
@@ -4519,9 +5084,9 @@
 			}
 		},
 		"node_modules/envinfo": {
-			"version": "7.10.0",
-			"resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.10.0.tgz",
-			"integrity": "sha512-ZtUjZO6l5mwTHvc1L9+1q5p/R3wTopcfqMW8r5t8SJSKqeVI/LtajORwRFEKpEFuekjD0VBjwu1HMxL4UalIRw==",
+			"version": "7.14.0",
+			"resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.14.0.tgz",
+			"integrity": "sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==",
 			"bin": {
 				"envinfo": "dist/cli.js"
 			},
@@ -4542,20 +5107,84 @@
 				"is-arrayish": "^0.2.1"
 			}
 		},
+		"node_modules/es-define-property": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+			"integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
+		"node_modules/es-errors": {
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+			"integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
 		"node_modules/es-module-lexer": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.1.tgz",
-			"integrity": "sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q=="
+			"version": "1.5.4",
+			"resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz",
+			"integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw=="
+		},
+		"node_modules/es-object-atoms": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
+			"integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
+			"dependencies": {
+				"es-errors": "^1.3.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
 		},
 		"node_modules/es6-object-assign": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz",
 			"integrity": "sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw=="
 		},
+		"node_modules/esbuild": {
+			"version": "0.21.5",
+			"resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+			"integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
+			"hasInstallScript": true,
+			"bin": {
+				"esbuild": "bin/esbuild"
+			},
+			"engines": {
+				"node": ">=12"
+			},
+			"optionalDependencies": {
+				"@esbuild/aix-ppc64": "0.21.5",
+				"@esbuild/android-arm": "0.21.5",
+				"@esbuild/android-arm64": "0.21.5",
+				"@esbuild/android-x64": "0.21.5",
+				"@esbuild/darwin-arm64": "0.21.5",
+				"@esbuild/darwin-x64": "0.21.5",
+				"@esbuild/freebsd-arm64": "0.21.5",
+				"@esbuild/freebsd-x64": "0.21.5",
+				"@esbuild/linux-arm": "0.21.5",
+				"@esbuild/linux-arm64": "0.21.5",
+				"@esbuild/linux-ia32": "0.21.5",
+				"@esbuild/linux-loong64": "0.21.5",
+				"@esbuild/linux-mips64el": "0.21.5",
+				"@esbuild/linux-ppc64": "0.21.5",
+				"@esbuild/linux-riscv64": "0.21.5",
+				"@esbuild/linux-s390x": "0.21.5",
+				"@esbuild/linux-x64": "0.21.5",
+				"@esbuild/netbsd-x64": "0.21.5",
+				"@esbuild/openbsd-x64": "0.21.5",
+				"@esbuild/sunos-x64": "0.21.5",
+				"@esbuild/win32-arm64": "0.21.5",
+				"@esbuild/win32-ia32": "0.21.5",
+				"@esbuild/win32-x64": "0.21.5"
+			}
+		},
 		"node_modules/escalade": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+			"integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
 			"engines": {
 				"node": ">=6"
 			}
@@ -4565,14 +5194,6 @@
 			"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
 			"integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
 		},
-		"node_modules/escape-string-regexp": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-			"integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-			"engines": {
-				"node": ">=0.8.0"
-			}
-		},
 		"node_modules/eslint-scope": {
 			"version": "5.1.1",
 			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
@@ -4633,6 +5254,14 @@
 			"resolved": "https://registry.npmjs.org/ev-emitter/-/ev-emitter-1.1.1.tgz",
 			"integrity": "sha512-ipiDYhdQSCZ4hSbX4rMW+XzNKMD1prg/sTvoVmSLkuQ1MVlwjJQQA+sW8tMYR3BLUr9KjodFV4pvzunvRhd33Q=="
 		},
+		"node_modules/event-target-shim": {
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+			"integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
+			"engines": {
+				"node": ">=6"
+			}
+		},
 		"node_modules/eventemitter3": {
 			"version": "4.0.7",
 			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
@@ -4678,9 +5307,9 @@
 			}
 		},
 		"node_modules/execa/node_modules/cross-spawn": {
-			"version": "7.0.3",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+			"version": "7.0.6",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+			"integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
 			"dependencies": {
 				"path-key": "^3.1.0",
 				"shebang-command": "^2.0.0",
@@ -4731,37 +5360,45 @@
 				"node": ">= 8"
 			}
 		},
+		"node_modules/expand-template": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
+			"integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
+			"engines": {
+				"node": ">=6"
+			}
+		},
 		"node_modules/express": {
-			"version": "4.18.2",
-			"resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
-			"integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+			"version": "4.21.2",
+			"resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+			"integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
 			"dependencies": {
 				"accepts": "~1.3.8",
 				"array-flatten": "1.1.1",
-				"body-parser": "1.20.1",
+				"body-parser": "1.20.3",
 				"content-disposition": "0.5.4",
 				"content-type": "~1.0.4",
-				"cookie": "0.5.0",
+				"cookie": "0.7.1",
 				"cookie-signature": "1.0.6",
 				"debug": "2.6.9",
 				"depd": "2.0.0",
-				"encodeurl": "~1.0.2",
+				"encodeurl": "~2.0.0",
 				"escape-html": "~1.0.3",
 				"etag": "~1.8.1",
-				"finalhandler": "1.2.0",
+				"finalhandler": "1.3.1",
 				"fresh": "0.5.2",
 				"http-errors": "2.0.0",
-				"merge-descriptors": "1.0.1",
+				"merge-descriptors": "1.0.3",
 				"methods": "~1.1.2",
 				"on-finished": "2.4.1",
 				"parseurl": "~1.3.3",
-				"path-to-regexp": "0.1.7",
+				"path-to-regexp": "0.1.12",
 				"proxy-addr": "~2.0.7",
-				"qs": "6.11.0",
+				"qs": "6.13.0",
 				"range-parser": "~1.2.1",
 				"safe-buffer": "5.2.1",
-				"send": "0.18.0",
-				"serve-static": "1.15.0",
+				"send": "0.19.0",
+				"serve-static": "1.16.2",
 				"setprototypeof": "1.2.0",
 				"statuses": "2.0.1",
 				"type-is": "~1.6.18",
@@ -4770,13 +5407,12 @@
 			},
 			"engines": {
 				"node": ">= 0.10.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/express"
 			}
 		},
-		"node_modules/express/node_modules/array-flatten": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-			"integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
-		},
 		"node_modules/express/node_modules/debug": {
 			"version": "2.6.9",
 			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -4791,11 +5427,11 @@
 			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
 		},
 		"node_modules/express/node_modules/qs": {
-			"version": "6.11.0",
-			"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
-			"integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+			"version": "6.13.0",
+			"resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+			"integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
 			"dependencies": {
-				"side-channel": "^1.0.4"
+				"side-channel": "^1.0.6"
 			},
 			"engines": {
 				"node": ">=0.6"
@@ -4809,10 +5445,15 @@
 			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
 			"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
 		},
+		"node_modules/fast-fifo": {
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
+			"integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ=="
+		},
 		"node_modules/fast-glob": {
-			"version": "3.3.1",
-			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
-			"integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+			"integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
 			"dependencies": {
 				"@nodelib/fs.stat": "^2.0.2",
 				"@nodelib/fs.walk": "^1.2.3",
@@ -4829,6 +5470,11 @@
 			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
 			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
 		},
+		"node_modules/fast-uri": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.3.tgz",
+			"integrity": "sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw=="
+		},
 		"node_modules/fastest-levenshtein": {
 			"version": "1.0.16",
 			"resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
@@ -4838,9 +5484,9 @@
 			}
 		},
 		"node_modules/fastq": {
-			"version": "1.15.0",
-			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
-			"integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
+			"version": "1.17.1",
+			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
+			"integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
 			"dependencies": {
 				"reusify": "^1.0.4"
 			}
@@ -4856,6 +5502,28 @@
 				"node": ">=0.8.0"
 			}
 		},
+		"node_modules/fetch-blob": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
+			"integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/jimmywarting"
+				},
+				{
+					"type": "paypal",
+					"url": "https://paypal.me/jimmywarting"
+				}
+			],
+			"dependencies": {
+				"node-domexception": "^1.0.0",
+				"web-streams-polyfill": "^3.0.3"
+			},
+			"engines": {
+				"node": "^12.20 || >= 14.13"
+			}
+		},
 		"node_modules/file-loader": {
 			"version": "6.2.0",
 			"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
@@ -4909,9 +5577,9 @@
 			}
 		},
 		"node_modules/fill-range": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-			"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+			"integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
 			"dependencies": {
 				"to-regex-range": "^5.0.1"
 			},
@@ -4920,12 +5588,12 @@
 			}
 		},
 		"node_modules/finalhandler": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
-			"integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
+			"integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
 			"dependencies": {
 				"debug": "2.6.9",
-				"encodeurl": "~1.0.2",
+				"encodeurl": "~2.0.0",
 				"escape-html": "~1.0.3",
 				"on-finished": "2.4.1",
 				"parseurl": "~1.3.3",
@@ -4994,9 +5662,9 @@
 			}
 		},
 		"node_modules/follow-redirects": {
-			"version": "1.15.3",
-			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
-			"integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
+			"version": "1.15.9",
+			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+			"integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
 			"funding": [
 				{
 					"type": "individual",
@@ -5012,6 +5680,31 @@
 				}
 			}
 		},
+		"node_modules/form-data": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz",
+			"integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==",
+			"dev": true,
+			"dependencies": {
+				"asynckit": "^0.4.0",
+				"combined-stream": "^1.0.8",
+				"mime-types": "^2.1.12"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
+		"node_modules/formdata-polyfill": {
+			"version": "4.0.10",
+			"resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
+			"integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
+			"dependencies": {
+				"fetch-blob": "^3.1.2"
+			},
+			"engines": {
+				"node": ">=12.20.0"
+			}
+		},
 		"node_modules/forwarded": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@@ -5040,6 +5733,11 @@
 				"node": ">= 0.6"
 			}
 		},
+		"node_modules/fs-constants": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+			"integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
+		},
 		"node_modules/fs-extra": {
 			"version": "10.1.0",
 			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
@@ -5054,9 +5752,9 @@
 			}
 		},
 		"node_modules/fs-monkey": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.5.tgz",
-			"integrity": "sha512-8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew=="
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.6.tgz",
+			"integrity": "sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg=="
 		},
 		"node_modules/fs.realpath": {
 			"version": "1.0.0",
@@ -5106,14 +5804,23 @@
 			}
 		},
 		"node_modules/get-intrinsic": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz",
-			"integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==",
+			"version": "1.2.6",
+			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.6.tgz",
+			"integrity": "sha512-qxsEs+9A+u85HhllWJJFicJfPDhRmjzoYdl64aMWW9yRIJmSyxdn8IEkuIM530/7T+lv0TIHd8L6Q/ra0tEoeA==",
 			"dependencies": {
+				"call-bind-apply-helpers": "^1.0.1",
+				"dunder-proto": "^1.0.0",
+				"es-define-property": "^1.0.1",
+				"es-errors": "^1.3.0",
+				"es-object-atoms": "^1.0.0",
 				"function-bind": "^1.1.2",
-				"has-proto": "^1.0.1",
-				"has-symbols": "^1.0.3",
-				"hasown": "^2.0.0"
+				"gopd": "^1.2.0",
+				"has-symbols": "^1.1.0",
+				"hasown": "^2.0.2",
+				"math-intrinsics": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
@@ -5130,10 +5837,22 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/github-from-package": {
+			"version": "0.0.0",
+			"resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz",
+			"integrity": "sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw=="
+		},
+		"node_modules/gl-matrix": {
+			"version": "3.4.3",
+			"resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.4.3.tgz",
+			"integrity": "sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA==",
+			"license": "MIT"
+		},
 		"node_modules/glob": {
 			"version": "7.2.3",
 			"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
 			"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+			"deprecated": "Glob versions prior to v9 are no longer supported",
 			"dependencies": {
 				"fs.realpath": "^1.0.0",
 				"inflight": "^1.0.4",
@@ -5201,11 +5920,11 @@
 			}
 		},
 		"node_modules/gopd": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-			"integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-			"dependencies": {
-				"get-intrinsic": "^1.1.3"
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+			"integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+			"engines": {
+				"node": ">= 0.4"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
@@ -5235,31 +5954,20 @@
 			}
 		},
 		"node_modules/has-property-descriptors": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz",
-			"integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==",
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+			"integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
 			"dependencies": {
-				"get-intrinsic": "^1.2.2"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
-		"node_modules/has-proto": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-			"integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
-			"engines": {
-				"node": ">= 0.4"
+				"es-define-property": "^1.0.0"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
 		"node_modules/has-symbols": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-			"integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+			"integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
 			"engines": {
 				"node": ">= 0.4"
 			},
@@ -5268,29 +5976,15 @@
 			}
 		},
 		"node_modules/hash-base": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
-			"integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+			"version": "3.0.5",
+			"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.5.tgz",
+			"integrity": "sha512-vXm0l45VbcHEVlTCzs8M+s0VeYsB2lnlAaThoLKGXr3bE/VWDOelNUnycUPEhKEaXARL2TEFjBOyUiM6+55KBg==",
 			"dependencies": {
 				"inherits": "^2.0.4",
-				"readable-stream": "^3.6.0",
-				"safe-buffer": "^5.2.0"
+				"safe-buffer": "^5.2.1"
 			},
 			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/hash-base/node_modules/readable-stream": {
-			"version": "3.6.2",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-			"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-			"dependencies": {
-				"inherits": "^2.0.3",
-				"string_decoder": "^1.1.1",
-				"util-deprecate": "^1.0.1"
-			},
-			"engines": {
-				"node": ">= 6"
+				"node": ">= 0.10"
 			}
 		},
 		"node_modules/hash-sum": {
@@ -5308,9 +6002,9 @@
 			}
 		},
 		"node_modules/hasown": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
-			"integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+			"integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
 			"dependencies": {
 				"function-bind": "^1.1.2"
 			},
@@ -5327,9 +6021,9 @@
 			}
 		},
 		"node_modules/hls.js": {
-			"version": "1.4.12",
-			"resolved": "https://registry.npmjs.org/hls.js/-/hls.js-1.4.12.tgz",
-			"integrity": "sha512-1RBpx2VihibzE3WE9kGoVCtrhhDWTzydzElk/kyRbEOLnb1WIE+3ZabM/L8BqKFTCL3pUy4QzhXgD1Q6Igr1JA=="
+			"version": "1.5.18",
+			"resolved": "https://registry.npmjs.org/hls.js/-/hls.js-1.5.18.tgz",
+			"integrity": "sha512-znxR+2jecWluu/0KOBqUcvVyAB5tLff10vjMGrpAlz1eFY+ZhF1bY3r82V+Bk7WJdk03iTjtja9KFFz5BrqjSA=="
 		},
 		"node_modules/hmac-drbg": {
 			"version": "1.0.1",
@@ -5358,9 +6052,9 @@
 			}
 		},
 		"node_modules/html-entities": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz",
-			"integrity": "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==",
+			"version": "2.5.2",
+			"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.5.2.tgz",
+			"integrity": "sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==",
 			"funding": [
 				{
 					"type": "github",
@@ -5520,9 +6214,9 @@
 			}
 		},
 		"node_modules/http-proxy-middleware": {
-			"version": "2.0.6",
-			"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
-			"integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
+			"version": "2.0.7",
+			"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz",
+			"integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==",
 			"dependencies": {
 				"@types/http-proxy": "^1.17.8",
 				"http-proxy": "^1.18.1",
@@ -5597,9 +6291,9 @@
 			]
 		},
 		"node_modules/ignore": {
-			"version": "5.2.4",
-			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
-			"integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
+			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+			"integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
 			"engines": {
 				"node": ">= 4"
 			}
@@ -5660,9 +6354,9 @@
 			}
 		},
 		"node_modules/immutable": {
-			"version": "4.3.4",
-			"resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.4.tgz",
-			"integrity": "sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==",
+			"version": "5.0.3",
+			"resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.3.tgz",
+			"integrity": "sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==",
 			"dev": true
 		},
 		"node_modules/import-fresh": {
@@ -5681,9 +6375,9 @@
 			}
 		},
 		"node_modules/import-local": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
-			"integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
+			"integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
 			"dependencies": {
 				"pkg-dir": "^4.2.0",
 				"resolve-cwd": "^3.0.0"
@@ -5720,6 +6414,7 @@
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
 			"integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+			"deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
 			"dependencies": {
 				"once": "^1.3.0",
 				"wrappy": "1"
@@ -5730,6 +6425,11 @@
 			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
 			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
 		},
+		"node_modules/ini": {
+			"version": "1.3.8",
+			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+			"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+		},
 		"node_modules/interpret": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
@@ -5739,14 +6439,26 @@
 			}
 		},
 		"node_modules/ip": {
-			"version": "1.1.8",
-			"resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
-			"integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz",
+			"integrity": "sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ=="
+		},
+		"node_modules/ip-address": {
+			"version": "9.0.5",
+			"resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
+			"integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+			"dependencies": {
+				"jsbn": "1.1.0",
+				"sprintf-js": "^1.1.3"
+			},
+			"engines": {
+				"node": ">= 12"
+			}
 		},
 		"node_modules/ipaddr.js": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz",
-			"integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==",
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz",
+			"integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==",
 			"engines": {
 				"node": ">= 10"
 			}
@@ -5773,11 +6485,14 @@
 			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
 		},
 		"node_modules/is-core-module": {
-			"version": "2.13.1",
-			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
-			"integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
+			"version": "2.16.0",
+			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.0.tgz",
+			"integrity": "sha512-urTSINYfAYgcbLb0yDQ6egFm6h3Mo1DcF9EkyXSRjjzdHbsulg01qhwWuXdOoUBuTkbQ80KDboXa0vFJ+BDH+g==",
 			"dependencies": {
-				"hasown": "^2.0.0"
+				"hasown": "^2.0.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
@@ -5964,15 +6679,20 @@
 			"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
 			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
 		},
+		"node_modules/jsbn": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
+			"integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="
+		},
 		"node_modules/jsesc": {
-			"version": "2.5.2",
-			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-			"integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+			"integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
 			"bin": {
 				"jsesc": "bin/jsesc"
 			},
 			"engines": {
-				"node": ">=4"
+				"node": ">=6"
 			}
 		},
 		"node_modules/json-parse-even-better-errors": {
@@ -6032,9 +6752,9 @@
 			}
 		},
 		"node_modules/laravel-echo": {
-			"version": "1.15.3",
-			"resolved": "https://registry.npmjs.org/laravel-echo/-/laravel-echo-1.15.3.tgz",
-			"integrity": "sha512-SRXzccaat6w4qKgZ4/rjFKr3nJfVxB+ly4V0MEJNIF1/TpERNXepo3uk7NnOjBGsiV/np1fl2XitAzW4Sa1s/w==",
+			"version": "1.17.1",
+			"resolved": "https://registry.npmjs.org/laravel-echo/-/laravel-echo-1.17.1.tgz",
+			"integrity": "sha512-ORWc4vDfnBj/Oe5ThZ5kYyGItRjLDqAQUyhD/7UhehUOqc+s5x9HEBjtMVludNMP6VuXw6t7Uxt8bp63kaTofg==",
 			"dev": true,
 			"engines": {
 				"node": ">=10"
@@ -6151,17 +6871,6 @@
 				"webpack": "^4.27.0 || ^5.0.0"
 			}
 		},
-		"node_modules/laravel-mix/node_modules/lru-cache": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-			"dependencies": {
-				"yallist": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
 		"node_modules/laravel-mix/node_modules/schema-utils": {
 			"version": "3.3.0",
 			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
@@ -6180,12 +6889,9 @@
 			}
 		},
 		"node_modules/laravel-mix/node_modules/semver": {
-			"version": "7.5.4",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-			"integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-			"dependencies": {
-				"lru-cache": "^6.0.0"
-			},
+			"version": "7.6.3",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+			"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
 			"bin": {
 				"semver": "bin/semver.js"
 			},
@@ -6193,15 +6899,10 @@
 				"node": ">=10"
 			}
 		},
-		"node_modules/laravel-mix/node_modules/yallist": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-		},
 		"node_modules/launch-editor": {
-			"version": "2.6.1",
-			"resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.1.tgz",
-			"integrity": "sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw==",
+			"version": "2.9.1",
+			"resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.9.1.tgz",
+			"integrity": "sha512-Gcnl4Bd+hRO9P9icCP/RVVT2o8SFlPXofuCxvA2SaZuH45whSvf5p8x5oih5ftLiVhEI4sp5xDY+R+b3zJBh5w==",
 			"dependencies": {
 				"picocolors": "^1.0.0",
 				"shell-quote": "^1.8.1"
@@ -6242,9 +6943,9 @@
 			}
 		},
 		"node_modules/loadjs": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/loadjs/-/loadjs-4.2.0.tgz",
-			"integrity": "sha512-AgQGZisAlTPbTEzrHPb6q+NYBMD+DP9uvGSIjSUM5uG+0jG15cb8axWpxuOIqrmQjn6scaaH8JwloiP27b2KXA=="
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/loadjs/-/loadjs-4.3.0.tgz",
+			"integrity": "sha512-vNX4ZZLJBeDEOBvdr2v/F+0aN5oMuPu7JTqrMwp+DtgK+AryOlpy6Xtm2/HpNr+azEa828oQjOtWsB6iDtSfSQ=="
 		},
 		"node_modules/locate-path": {
 			"version": "5.0.0",
@@ -6305,9 +7006,9 @@
 			}
 		},
 		"node_modules/m3u8-parser": {
-			"version": "4.8.0",
-			"resolved": "https://registry.npmjs.org/m3u8-parser/-/m3u8-parser-4.8.0.tgz",
-			"integrity": "sha512-UqA2a/Pw3liR6Df3gwxrqghCP17OpPlQj6RBPLYygf/ZSQ4MoSgvdvhvt35qV+3NaaA0FSZx93Ix+2brT1U7cA==",
+			"version": "4.7.1",
+			"resolved": "https://registry.npmjs.org/m3u8-parser/-/m3u8-parser-4.7.1.tgz",
+			"integrity": "sha512-pbrQwiMiq+MmI9bl7UjtPT3AK603PV9bogNlr83uC+X9IoxqL5E4k7kU7fMQ0dpRgxgeSMygqUa0IMLQNXLBNA==",
 			"dependencies": {
 				"@babel/runtime": "^7.12.5",
 				"@videojs/vhs-utils": "^3.0.5",
@@ -6336,6 +7037,14 @@
 				"semver": "bin/semver.js"
 			}
 		},
+		"node_modules/math-intrinsics": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+			"integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
 		"node_modules/md5": {
 			"version": "2.3.0",
 			"resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
@@ -6381,9 +7090,12 @@
 			}
 		},
 		"node_modules/merge-descriptors": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-			"integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+			"integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
 		},
 		"node_modules/merge-source-map": {
 			"version": "1.1.0",
@@ -6416,11 +7128,11 @@
 			}
 		},
 		"node_modules/micromatch": {
-			"version": "4.0.5",
-			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-			"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+			"version": "4.0.8",
+			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+			"integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
 			"dependencies": {
-				"braces": "^3.0.2",
+				"braces": "^3.0.3",
 				"picomatch": "^2.3.1"
 			},
 			"engines": {
@@ -6440,9 +7152,9 @@
 			}
 		},
 		"node_modules/miller-rabin/node_modules/bn.js": {
-			"version": "4.12.0",
-			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-			"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+			"version": "4.12.1",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz",
+			"integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg=="
 		},
 		"node_modules/mime": {
 			"version": "1.6.0",
@@ -6567,18 +7279,23 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/mkdirp-classic": {
+			"version": "0.5.3",
+			"resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+			"integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
+		},
 		"node_modules/moment": {
-			"version": "2.29.4",
-			"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
-			"integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==",
+			"version": "2.30.1",
+			"resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
+			"integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
 			"engines": {
 				"node": "*"
 			}
 		},
 		"node_modules/ms": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
 		},
 		"node_modules/multicast-dns": {
 			"version": "7.2.5",
@@ -6593,9 +7310,9 @@
 			}
 		},
 		"node_modules/nanoid": {
-			"version": "3.3.6",
-			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
-			"integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
+			"version": "3.3.8",
+			"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+			"integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
 			"funding": [
 				{
 					"type": "github",
@@ -6609,10 +7326,15 @@
 				"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
 			}
 		},
+		"node_modules/napi-build-utils": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
+			"integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="
+		},
 		"node_modules/negotiator": {
-			"version": "0.6.3",
-			"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-			"integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+			"version": "0.6.4",
+			"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
+			"integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
 			"engines": {
 				"node": ">= 0.6"
 			}
@@ -6637,6 +7359,84 @@
 				"tslib": "^2.0.3"
 			}
 		},
+		"node_modules/node-abi": {
+			"version": "3.71.0",
+			"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.71.0.tgz",
+			"integrity": "sha512-SZ40vRiy/+wRTf21hxkkEjPJZpARzUMVcJoQse2EF8qkUWbbO2z7vd5oA/H6bVH6SZQ5STGcu0KRDS7biNRfxw==",
+			"dependencies": {
+				"semver": "^7.3.5"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/node-abi/node_modules/semver": {
+			"version": "7.6.3",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+			"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+			"bin": {
+				"semver": "bin/semver.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/node-addon-api": {
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
+			"integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
+			"dev": true,
+			"optional": true
+		},
+		"node_modules/node-datachannel": {
+			"version": "0.12.0",
+			"resolved": "https://registry.npmjs.org/node-datachannel/-/node-datachannel-0.12.0.tgz",
+			"integrity": "sha512-pZ9FsVZpHdUKqyWynuCc9IBLkZPJMpDzpNk4YNPCizbIXHYifpYeWqSF35REHGIWi9JMCf11QzapsyQGo/Y4Ig==",
+			"hasInstallScript": true,
+			"dependencies": {
+				"node-domexception": "^2.0.1",
+				"prebuild-install": "^7.0.1"
+			},
+			"engines": {
+				"node": ">=16.0.0"
+			}
+		},
+		"node_modules/node-datachannel/node_modules/node-domexception": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-2.0.1.tgz",
+			"integrity": "sha512-M85rnSC7WQ7wnfQTARPT4LrK7nwCHLdDFOCcItZMhTQjyCebJH8GciKqYJNgaOFZs9nFmTmd/VMyi3OW5jA47w==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/jimmywarting"
+				},
+				{
+					"type": "github",
+					"url": "https://paypal.me/jimmywarting"
+				}
+			],
+			"engines": {
+				"node": ">=16"
+			}
+		},
+		"node_modules/node-domexception": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
+			"integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/jimmywarting"
+				},
+				{
+					"type": "github",
+					"url": "https://paypal.me/jimmywarting"
+				}
+			],
+			"engines": {
+				"node": ">=10.5.0"
+			}
+		},
 		"node_modules/node-fetch": {
 			"version": "2.7.0",
 			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
@@ -6665,9 +7465,9 @@
 			}
 		},
 		"node_modules/node-gyp-build": {
-			"version": "4.6.1",
-			"resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.1.tgz",
-			"integrity": "sha512-24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ==",
+			"version": "4.8.4",
+			"resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.4.tgz",
+			"integrity": "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==",
 			"optional": true,
 			"bin": {
 				"node-gyp-build": "bin.js",
@@ -6718,24 +7518,10 @@
 				"which": "^2.0.2"
 			}
 		},
-		"node_modules/node-notifier/node_modules/lru-cache": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-			"dependencies": {
-				"yallist": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
 		"node_modules/node-notifier/node_modules/semver": {
-			"version": "7.5.4",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-			"integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-			"dependencies": {
-				"lru-cache": "^6.0.0"
-			},
+			"version": "7.6.3",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+			"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
 			"bin": {
 				"semver": "bin/semver.js"
 			},
@@ -6757,15 +7543,10 @@
 				"node": ">= 8"
 			}
 		},
-		"node_modules/node-notifier/node_modules/yallist": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-		},
 		"node_modules/node-releases": {
-			"version": "2.0.13",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
-			"integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ=="
+			"version": "2.0.19",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+			"integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw=="
 		},
 		"node_modules/normalize-path": {
 			"version": "3.0.0",
@@ -6825,9 +7606,12 @@
 			}
 		},
 		"node_modules/object-inspect": {
-			"version": "1.13.1",
-			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
-			"integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
+			"version": "1.13.3",
+			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz",
+			"integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==",
+			"engines": {
+				"node": ">= 0.4"
+			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
 			}
@@ -6841,13 +7625,15 @@
 			}
 		},
 		"node_modules/object.assign": {
-			"version": "4.1.4",
-			"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
-			"integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
+			"version": "4.1.7",
+			"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz",
+			"integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
 			"dependencies": {
-				"call-bind": "^1.0.2",
-				"define-properties": "^1.1.4",
-				"has-symbols": "^1.0.3",
+				"call-bind": "^1.0.8",
+				"call-bound": "^1.0.3",
+				"define-properties": "^1.2.1",
+				"es-object-atoms": "^1.0.0",
+				"has-symbols": "^1.1.0",
 				"object-keys": "^1.1.1"
 			},
 			"engines": {
@@ -7018,15 +7804,19 @@
 			}
 		},
 		"node_modules/parse-asn1": {
-			"version": "5.1.6",
-			"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
-			"integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
+			"version": "5.1.7",
+			"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.7.tgz",
+			"integrity": "sha512-CTM5kuWR3sx9IFamcl5ErfPl6ea/N8IYwiJ+vpeB2g+1iknv7zBl5uPwbMbRVznRVbrNY6lGuDoE5b30grmbqg==",
 			"dependencies": {
-				"asn1.js": "^5.2.0",
-				"browserify-aes": "^1.0.0",
-				"evp_bytestokey": "^1.0.0",
-				"pbkdf2": "^3.0.3",
-				"safe-buffer": "^5.1.1"
+				"asn1.js": "^4.10.1",
+				"browserify-aes": "^1.2.0",
+				"evp_bytestokey": "^1.0.3",
+				"hash-base": "~3.0",
+				"pbkdf2": "^3.1.2",
+				"safe-buffer": "^5.2.1"
+			},
+			"engines": {
+				"node": ">= 0.10"
 			}
 		},
 		"node_modules/parse-json": {
@@ -7099,9 +7889,9 @@
 			"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
 		},
 		"node_modules/path-to-regexp": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-			"integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
+			"version": "0.1.12",
+			"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+			"integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="
 		},
 		"node_modules/path-type": {
 			"version": "4.0.0",
@@ -7127,9 +7917,9 @@
 			}
 		},
 		"node_modules/picocolors": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-			"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+			"integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
 		},
 		"node_modules/picomatch": {
 			"version": "2.3.1",
@@ -7184,9 +7974,9 @@
 			}
 		},
 		"node_modules/postcss": {
-			"version": "8.4.31",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
-			"integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
+			"version": "8.4.49",
+			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
+			"integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
 			"funding": [
 				{
 					"type": "opencollective",
@@ -7202,9 +7992,9 @@
 				}
 			],
 			"dependencies": {
-				"nanoid": "^3.3.6",
-				"picocolors": "^1.0.0",
-				"source-map-js": "^1.0.2"
+				"nanoid": "^3.3.7",
+				"picocolors": "^1.1.1",
+				"source-map-js": "^1.2.1"
 			},
 			"engines": {
 				"node": "^10 || ^12 || >=14"
@@ -7347,24 +8137,10 @@
 				"webpack": "^5.0.0"
 			}
 		},
-		"node_modules/postcss-loader/node_modules/lru-cache": {
-			"version": "6.0.0",
-			"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-			"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-			"dependencies": {
-				"yallist": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=10"
-			}
-		},
 		"node_modules/postcss-loader/node_modules/semver": {
-			"version": "7.5.4",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-			"integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-			"dependencies": {
-				"lru-cache": "^6.0.0"
-			},
+			"version": "7.6.3",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+			"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
 			"bin": {
 				"semver": "bin/semver.js"
 			},
@@ -7372,11 +8148,6 @@
 				"node": ">=10"
 			}
 		},
-		"node_modules/postcss-loader/node_modules/yallist": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-			"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-		},
 		"node_modules/postcss-merge-longhand": {
 			"version": "5.1.7",
 			"resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz",
@@ -7470,9 +8241,9 @@
 			}
 		},
 		"node_modules/postcss-modules-extract-imports": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
-			"integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
+			"integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
 			"engines": {
 				"node": "^10 || ^12 || >= 14"
 			},
@@ -7481,12 +8252,12 @@
 			}
 		},
 		"node_modules/postcss-modules-local-by-default": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz",
-			"integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==",
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.2.0.tgz",
+			"integrity": "sha512-5kcJm/zk+GJDSfw+V/42fJ5fhjL5YbFDl8nVdXkJPLLW+Vf9mTD5Xe0wqIaDnLuL2U6cDNpTr+UQ+v2HWIBhzw==",
 			"dependencies": {
 				"icss-utils": "^5.0.0",
-				"postcss-selector-parser": "^6.0.2",
+				"postcss-selector-parser": "^7.0.0",
 				"postcss-value-parser": "^4.1.0"
 			},
 			"engines": {
@@ -7496,12 +8267,24 @@
 				"postcss": "^8.1.0"
 			}
 		},
-		"node_modules/postcss-modules-scope": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
-			"integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
+		"node_modules/postcss-modules-local-by-default/node_modules/postcss-selector-parser": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz",
+			"integrity": "sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==",
 			"dependencies": {
-				"postcss-selector-parser": "^6.0.4"
+				"cssesc": "^3.0.0",
+				"util-deprecate": "^1.0.2"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/postcss-modules-scope": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz",
+			"integrity": "sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==",
+			"dependencies": {
+				"postcss-selector-parser": "^7.0.0"
 			},
 			"engines": {
 				"node": "^10 || ^12 || >= 14"
@@ -7510,6 +8293,18 @@
 				"postcss": "^8.1.0"
 			}
 		},
+		"node_modules/postcss-modules-scope/node_modules/postcss-selector-parser": {
+			"version": "7.0.0",
+			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz",
+			"integrity": "sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==",
+			"dependencies": {
+				"cssesc": "^3.0.0",
+				"util-deprecate": "^1.0.2"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
 		"node_modules/postcss-modules-values": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
@@ -7694,9 +8489,9 @@
 			}
 		},
 		"node_modules/postcss-selector-parser": {
-			"version": "6.0.13",
-			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
-			"integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
+			"version": "6.1.2",
+			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+			"integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
 			"dependencies": {
 				"cssesc": "^3.0.0",
 				"util-deprecate": "^1.0.2"
@@ -7739,11 +8534,43 @@
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
 			"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
 		},
+		"node_modules/prebuild-install": {
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.2.tgz",
+			"integrity": "sha512-UnNke3IQb6sgarcZIDU3gbMeTp/9SSU1DAIkil7PrqG1vZlBtY5msYccSKSHDqa3hNg436IXK+SNImReuA1wEQ==",
+			"dependencies": {
+				"detect-libc": "^2.0.0",
+				"expand-template": "^2.0.3",
+				"github-from-package": "0.0.0",
+				"minimist": "^1.2.3",
+				"mkdirp-classic": "^0.5.3",
+				"napi-build-utils": "^1.0.1",
+				"node-abi": "^3.3.0",
+				"pump": "^3.0.0",
+				"rc": "^1.2.7",
+				"simple-get": "^4.0.0",
+				"tar-fs": "^2.0.0",
+				"tunnel-agent": "^0.6.0"
+			},
+			"bin": {
+				"prebuild-install": "bin.js"
+			},
+			"engines": {
+				"node": ">=10"
+			}
+		},
+		"node_modules/prebuild-install/node_modules/detect-libc": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
+			"integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==",
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/prettier": {
 			"version": "2.8.8",
 			"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
 			"integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
-			"dev": true,
 			"optional": true,
 			"bin": {
 				"prettier": "bin-prettier.js"
@@ -7801,6 +8628,12 @@
 				"node": ">= 0.10"
 			}
 		},
+		"node_modules/proxy-from-env": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+			"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+			"dev": true
+		},
 		"node_modules/pseudomap": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
@@ -7821,9 +8654,18 @@
 			}
 		},
 		"node_modules/public-encrypt/node_modules/bn.js": {
-			"version": "4.12.0",
-			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
-			"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+			"version": "4.12.1",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.1.tgz",
+			"integrity": "sha512-k8TVBiPkPJT9uHLdOKfFpqcfprwBFOAAXXozRubr7R7PfIuKvQlzcI4M0pALeqXN09vdaMbUdUj+pass+uULAg=="
+		},
+		"node_modules/pump": {
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
+			"integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
+			"dependencies": {
+				"end-of-stream": "^1.1.0",
+				"once": "^1.3.1"
+			}
 		},
 		"node_modules/punycode": {
 			"version": "1.4.1",
@@ -7848,11 +8690,11 @@
 			"dev": true
 		},
 		"node_modules/qs": {
-			"version": "6.11.2",
-			"resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz",
-			"integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==",
+			"version": "6.13.1",
+			"resolved": "https://registry.npmjs.org/qs/-/qs-6.13.1.tgz",
+			"integrity": "sha512-EJPeIn0CYrGu+hli1xilKAPXODtJ12T0sP63Ijx2/khC2JtuaN3JyNIpvmnkmaEtha9ocbG4A4cMcr+TvqvwQg==",
 			"dependencies": {
-				"side-channel": "^1.0.4"
+				"side-channel": "^1.0.6"
 			},
 			"engines": {
 				"node": ">=0.6"
@@ -7888,6 +8730,11 @@
 				}
 			]
 		},
+		"node_modules/queue-tick": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz",
+			"integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag=="
+		},
 		"node_modules/random-iterate": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/random-iterate/-/random-iterate-1.0.1.tgz",
@@ -7924,9 +8771,9 @@
 			"integrity": "sha512-sln+pNSc8NGaHoLzwNBssFSf/rSYkqeBXzX1AtJlkJiUaVSJSbRAWJk+4omsXkN+EJalzkZhWQ3th1m0FpR5xA=="
 		},
 		"node_modules/raw-body": {
-			"version": "2.5.1",
-			"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
-			"integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+			"version": "2.5.2",
+			"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+			"integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
 			"dependencies": {
 				"bytes": "3.1.2",
 				"http-errors": "2.0.0",
@@ -7937,12 +8784,18 @@
 				"node": ">= 0.8"
 			}
 		},
-		"node_modules/raw-body/node_modules/bytes": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-			"integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-			"engines": {
-				"node": ">= 0.8"
+		"node_modules/rc": {
+			"version": "1.2.8",
+			"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+			"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+			"dependencies": {
+				"deep-extend": "^0.6.0",
+				"ini": "~1.3.0",
+				"minimist": "^1.2.0",
+				"strip-json-comments": "~2.0.1"
+			},
+			"bin": {
+				"rc": "cli.js"
 			}
 		},
 		"node_modules/readable-stream": {
@@ -8008,9 +8861,9 @@
 			"integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
 		},
 		"node_modules/regenerate-unicode-properties": {
-			"version": "10.1.1",
-			"resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz",
-			"integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==",
+			"version": "10.2.0",
+			"resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz",
+			"integrity": "sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==",
 			"dependencies": {
 				"regenerate": "^1.4.2"
 			},
@@ -8019,9 +8872,9 @@
 			}
 		},
 		"node_modules/regenerator-runtime": {
-			"version": "0.14.0",
-			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
-			"integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
+			"version": "0.14.1",
+			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+			"integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
 		},
 		"node_modules/regenerator-transform": {
 			"version": "0.15.2",
@@ -8032,20 +8885,20 @@
 			}
 		},
 		"node_modules/regex-parser": {
-			"version": "2.2.11",
-			"resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz",
-			"integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==",
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.3.0.tgz",
+			"integrity": "sha512-TVILVSz2jY5D47F4mA4MppkBrafEaiUWJO/TcZHEIuI13AqoZMkK1WMA4Om1YkYbTx+9Ki1/tSUXbceyr9saRg==",
 			"dev": true
 		},
 		"node_modules/regexpu-core": {
-			"version": "5.3.2",
-			"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
-			"integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
+			"version": "6.2.0",
+			"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.2.0.tgz",
+			"integrity": "sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==",
 			"dependencies": {
-				"@babel/regjsgen": "^0.8.0",
 				"regenerate": "^1.4.2",
-				"regenerate-unicode-properties": "^10.1.0",
-				"regjsparser": "^0.9.1",
+				"regenerate-unicode-properties": "^10.2.0",
+				"regjsgen": "^0.8.0",
+				"regjsparser": "^0.12.0",
 				"unicode-match-property-ecmascript": "^2.0.0",
 				"unicode-match-property-value-ecmascript": "^2.1.0"
 			},
@@ -8053,23 +8906,31 @@
 				"node": ">=4"
 			}
 		},
+		"node_modules/regjsgen": {
+			"version": "0.8.0",
+			"resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz",
+			"integrity": "sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q=="
+		},
 		"node_modules/regjsparser": {
-			"version": "0.9.1",
-			"resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
-			"integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
+			"version": "0.12.0",
+			"resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.12.0.tgz",
+			"integrity": "sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==",
 			"dependencies": {
-				"jsesc": "~0.5.0"
+				"jsesc": "~3.0.2"
 			},
 			"bin": {
 				"regjsparser": "bin/parser"
 			}
 		},
 		"node_modules/regjsparser/node_modules/jsesc": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-			"integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
+			"integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
 			"bin": {
 				"jsesc": "bin/jsesc"
+			},
+			"engines": {
+				"node": ">=6"
 			}
 		},
 		"node_modules/relateurl": {
@@ -8110,17 +8971,20 @@
 			"integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
 		},
 		"node_modules/resolve": {
-			"version": "1.22.8",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
-			"integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+			"version": "1.22.10",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
+			"integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
 			"dependencies": {
-				"is-core-module": "^2.13.0",
+				"is-core-module": "^2.16.0",
 				"path-parse": "^1.0.7",
 				"supports-preserve-symlinks-flag": "^1.0.0"
 			},
 			"bin": {
 				"resolve": "bin/resolve"
 			},
+			"engines": {
+				"node": ">= 0.4"
+			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
 			}
@@ -8195,6 +9059,7 @@
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
 			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+			"deprecated": "Rimraf versions prior to v4 are no longer supported",
 			"dependencies": {
 				"glob": "^7.1.3"
 			},
@@ -8280,13 +9145,13 @@
 			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
 		},
 		"node_modules/sass": {
-			"version": "1.69.4",
-			"resolved": "https://registry.npmjs.org/sass/-/sass-1.69.4.tgz",
-			"integrity": "sha512-+qEreVhqAy8o++aQfCJwp0sklr2xyEzkm9Pp/Igu9wNPoe7EZEQ8X/MBvvXggI2ql607cxKg/RKOwDj6pp2XDA==",
+			"version": "1.83.0",
+			"resolved": "https://registry.npmjs.org/sass/-/sass-1.83.0.tgz",
+			"integrity": "sha512-qsSxlayzoOjdvXMVLkzF84DJFc2HZEL/rFyGIKbbilYtAvlCxyuzUeff9LawTn4btVnLKg75Z8MMr1lxU1lfGw==",
 			"dev": true,
 			"dependencies": {
-				"chokidar": ">=3.0.0 <4.0.0",
-				"immutable": "^4.0.0",
+				"chokidar": "^4.0.0",
+				"immutable": "^5.0.2",
 				"source-map-js": ">=0.6.2 <2.0.0"
 			},
 			"bin": {
@@ -8294,6 +9159,9 @@
 			},
 			"engines": {
 				"node": ">=14.0.0"
+			},
+			"optionalDependencies": {
+				"@parcel/watcher": "^2.4.1"
 			}
 		},
 		"node_modules/sass-loader": {
@@ -8334,6 +9202,34 @@
 				}
 			}
 		},
+		"node_modules/sass/node_modules/chokidar": {
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
+			"integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
+			"dev": true,
+			"dependencies": {
+				"readdirp": "^4.0.1"
+			},
+			"engines": {
+				"node": ">= 14.16.0"
+			},
+			"funding": {
+				"url": "https://paulmillr.com/funding/"
+			}
+		},
+		"node_modules/sass/node_modules/readdirp": {
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz",
+			"integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==",
+			"dev": true,
+			"engines": {
+				"node": ">= 14.16.0"
+			},
+			"funding": {
+				"type": "individual",
+				"url": "https://paulmillr.com/funding/"
+			}
+		},
 		"node_modules/schema-utils": {
 			"version": "2.7.1",
 			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
@@ -8357,10 +9253,11 @@
 			"integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg=="
 		},
 		"node_modules/selfsigned": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz",
-			"integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==",
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz",
+			"integrity": "sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==",
 			"dependencies": {
+				"@types/node-forge": "^1.3.0",
 				"node-forge": "^1"
 			},
 			"engines": {
@@ -8377,9 +9274,9 @@
 			}
 		},
 		"node_modules/send": {
-			"version": "0.18.0",
-			"resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-			"integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+			"version": "0.19.0",
+			"resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+			"integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
 			"dependencies": {
 				"debug": "2.6.9",
 				"depd": "2.0.0",
@@ -8412,15 +9309,18 @@
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
 			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
 		},
-		"node_modules/send/node_modules/ms": {
-			"version": "2.1.3",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+		"node_modules/send/node_modules/encodeurl": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+			"integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+			"engines": {
+				"node": ">= 0.8"
+			}
 		},
 		"node_modules/serialize-javascript": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
-			"integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
+			"version": "6.0.2",
+			"resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
+			"integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
 			"dependencies": {
 				"randombytes": "^2.1.0"
 			}
@@ -8496,28 +9396,30 @@
 			}
 		},
 		"node_modules/serve-static": {
-			"version": "1.15.0",
-			"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
-			"integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+			"version": "1.16.2",
+			"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
+			"integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==",
 			"dependencies": {
-				"encodeurl": "~1.0.2",
+				"encodeurl": "~2.0.0",
 				"escape-html": "~1.0.3",
 				"parseurl": "~1.3.3",
-				"send": "0.18.0"
+				"send": "0.19.0"
 			},
 			"engines": {
 				"node": ">= 0.8.0"
 			}
 		},
 		"node_modules/set-function-length": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
-			"integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+			"integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
 			"dependencies": {
-				"define-data-property": "^1.1.1",
-				"get-intrinsic": "^1.2.1",
+				"define-data-property": "^1.1.4",
+				"es-errors": "^1.3.0",
+				"function-bind": "^1.1.2",
+				"get-intrinsic": "^1.2.4",
 				"gopd": "^1.0.1",
-				"has-property-descriptors": "^1.0.0"
+				"has-property-descriptors": "^1.0.2"
 			},
 			"engines": {
 				"node": ">= 0.4"
@@ -8578,9 +9480,12 @@
 			}
 		},
 		"node_modules/shell-quote": {
-			"version": "1.8.1",
-			"resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
-			"integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
+			"version": "1.8.2",
+			"resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.2.tgz",
+			"integrity": "sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==",
+			"engines": {
+				"node": ">= 0.4"
+			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
 			}
@@ -8591,13 +9496,68 @@
 			"integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww=="
 		},
 		"node_modules/side-channel": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-			"integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+			"integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
 			"dependencies": {
-				"call-bind": "^1.0.0",
-				"get-intrinsic": "^1.0.2",
-				"object-inspect": "^1.9.0"
+				"es-errors": "^1.3.0",
+				"object-inspect": "^1.13.3",
+				"side-channel-list": "^1.0.0",
+				"side-channel-map": "^1.0.1",
+				"side-channel-weakmap": "^1.0.2"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/side-channel-list": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+			"integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+			"dependencies": {
+				"es-errors": "^1.3.0",
+				"object-inspect": "^1.13.3"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/side-channel-map": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+			"integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+			"dependencies": {
+				"call-bound": "^1.0.2",
+				"es-errors": "^1.3.0",
+				"get-intrinsic": "^1.2.5",
+				"object-inspect": "^1.13.3"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
+		"node_modules/side-channel-weakmap": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+			"integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+			"dependencies": {
+				"call-bound": "^1.0.2",
+				"es-errors": "^1.3.0",
+				"get-intrinsic": "^1.2.5",
+				"object-inspect": "^1.13.3",
+				"side-channel-map": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
@@ -8715,45 +9675,6 @@
 				"node": ">= 6"
 			}
 		},
-		"node_modules/simple-websocket": {
-			"version": "9.1.0",
-			"resolved": "https://registry.npmjs.org/simple-websocket/-/simple-websocket-9.1.0.tgz",
-			"integrity": "sha512-8MJPnjRN6A8UCp1I+H/dSFyjwJhp6wta4hsVRhjf8w9qBHRzxYt14RaOcjvQnhD1N4yKOddEjflwMnQM4VtXjQ==",
-			"funding": [
-				{
-					"type": "github",
-					"url": "https://github.com/sponsors/feross"
-				},
-				{
-					"type": "patreon",
-					"url": "https://www.patreon.com/feross"
-				},
-				{
-					"type": "consulting",
-					"url": "https://feross.org/support"
-				}
-			],
-			"dependencies": {
-				"debug": "^4.3.1",
-				"queue-microtask": "^1.2.2",
-				"randombytes": "^2.1.0",
-				"readable-stream": "^3.6.0",
-				"ws": "^7.4.2"
-			}
-		},
-		"node_modules/simple-websocket/node_modules/readable-stream": {
-			"version": "3.6.2",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-			"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-			"dependencies": {
-				"inherits": "^2.0.3",
-				"string_decoder": "^1.1.1",
-				"util-deprecate": "^1.0.1"
-			},
-			"engines": {
-				"node": ">= 6"
-			}
-		},
 		"node_modules/slash": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
@@ -8782,23 +9703,18 @@
 			}
 		},
 		"node_modules/socks": {
-			"version": "2.7.1",
-			"resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz",
-			"integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==",
+			"version": "2.8.3",
+			"resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
+			"integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
 			"dependencies": {
-				"ip": "^2.0.0",
+				"ip-address": "^9.0.5",
 				"smart-buffer": "^4.2.0"
 			},
 			"engines": {
-				"node": ">= 10.13.0",
+				"node": ">= 10.0.0",
 				"npm": ">= 3.0.0"
 			}
 		},
-		"node_modules/socks/node_modules/ip": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz",
-			"integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="
-		},
 		"node_modules/source-list-map": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -8813,9 +9729,9 @@
 			}
 		},
 		"node_modules/source-map-js": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-			"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+			"integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -8870,6 +9786,11 @@
 				"node": ">= 6"
 			}
 		},
+		"node_modules/sprintf-js": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
+			"integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="
+		},
 		"node_modules/stable": {
 			"version": "0.1.8",
 			"resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
@@ -8885,9 +9806,9 @@
 			}
 		},
 		"node_modules/std-env": {
-			"version": "3.4.3",
-			"resolved": "https://registry.npmjs.org/std-env/-/std-env-3.4.3.tgz",
-			"integrity": "sha512-f9aPhy8fYBuMN+sNfakZV18U39PbalgjXG3lLB9WkaYTxijru61wb57V9wxxNthXM5Sd88ETBWi29qLAsHO52Q=="
+			"version": "3.8.0",
+			"resolved": "https://registry.npmjs.org/std-env/-/std-env-3.8.0.tgz",
+			"integrity": "sha512-Bc3YwwCB+OzldMxOXJIIvC6cPRWr/LxOp48CdQTOkPyk/t4JWWJbrilwBd7RJzKV8QW7tJkcgAmeuLLJugl5/w=="
 		},
 		"node_modules/stream-browserify": {
 			"version": "2.0.2",
@@ -8910,6 +9831,19 @@
 				"xtend": "^4.0.0"
 			}
 		},
+		"node_modules/streamx": {
+			"version": "2.21.1",
+			"resolved": "https://registry.npmjs.org/streamx/-/streamx-2.21.1.tgz",
+			"integrity": "sha512-PhP9wUnFLa+91CPy3N6tiQsK+gnYyUNuk15S3YG/zjYE7RuPeCjJngqnzpC31ow0lzBHQ+QGO4cNJnd0djYUsw==",
+			"dependencies": {
+				"fast-fifo": "^1.3.2",
+				"queue-tick": "^1.0.1",
+				"text-decoder": "^1.1.0"
+			},
+			"optionalDependencies": {
+				"bare-events": "^2.2.0"
+			}
+		},
 		"node_modules/string_decoder": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -8932,12 +9866,15 @@
 			}
 		},
 		"node_modules/string2compact": {
-			"version": "1.3.2",
-			"resolved": "https://registry.npmjs.org/string2compact/-/string2compact-1.3.2.tgz",
-			"integrity": "sha512-3XUxUgwhj7Eqh2djae35QHZZT4mN3fsO7kagZhSGmhhlrQagVvWSFuuFIWnpxFS0CdTB2PlQcaL16RDi14I8uw==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/string2compact/-/string2compact-2.0.1.tgz",
+			"integrity": "sha512-Bm/T8lHMTRXw+u83LE+OW7fXmC/wM+Mbccfdo533ajSBNxddDHlRrvxE49NdciGHgXkUQM5WYskJ7uTkbBUI0A==",
 			"dependencies": {
-				"addr-to-ip-port": "^1.0.1",
+				"addr-to-ip-port": "^2.0.0",
 				"ipaddr.js": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=12.20.0"
 			}
 		},
 		"node_modules/strip-ansi": {
@@ -8959,6 +9896,14 @@
 				"node": ">=6"
 			}
 		},
+		"node_modules/strip-json-comments": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+			"integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
 		"node_modules/style-loader": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/style-loader/-/style-loader-2.0.0.tgz",
@@ -9074,10 +10019,49 @@
 				"node": ">=6"
 			}
 		},
+		"node_modules/tar-fs": {
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+			"integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+			"dependencies": {
+				"chownr": "^1.1.1",
+				"mkdirp-classic": "^0.5.2",
+				"pump": "^3.0.0",
+				"tar-stream": "^2.1.4"
+			}
+		},
+		"node_modules/tar-stream": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+			"integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+			"dependencies": {
+				"bl": "^4.0.3",
+				"end-of-stream": "^1.4.1",
+				"fs-constants": "^1.0.0",
+				"inherits": "^2.0.3",
+				"readable-stream": "^3.1.1"
+			},
+			"engines": {
+				"node": ">=6"
+			}
+		},
+		"node_modules/tar-stream/node_modules/readable-stream": {
+			"version": "3.6.2",
+			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+			"integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+			"dependencies": {
+				"inherits": "^2.0.3",
+				"string_decoder": "^1.1.1",
+				"util-deprecate": "^1.0.1"
+			},
+			"engines": {
+				"node": ">= 6"
+			}
+		},
 		"node_modules/terser": {
-			"version": "5.22.0",
-			"resolved": "https://registry.npmjs.org/terser/-/terser-5.22.0.tgz",
-			"integrity": "sha512-hHZVLgRA2z4NWcN6aS5rQDc+7Dcy58HOf2zbYwmFcQ+ua3h6eEFf5lIDKTzbWwlazPyOZsFQO8V80/IjVNExEw==",
+			"version": "5.37.0",
+			"resolved": "https://registry.npmjs.org/terser/-/terser-5.37.0.tgz",
+			"integrity": "sha512-B8wRRkmre4ERucLM/uXx4MOV5cbnOlVAqUst+1+iLKPI0dOgFO28f84ptoQt9HEI537PMzfYa/d+GEPKTRXmYA==",
 			"dependencies": {
 				"@jridgewell/source-map": "^0.3.3",
 				"acorn": "^8.8.2",
@@ -9092,15 +10076,15 @@
 			}
 		},
 		"node_modules/terser-webpack-plugin": {
-			"version": "5.3.9",
-			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz",
-			"integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==",
+			"version": "5.3.11",
+			"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.11.tgz",
+			"integrity": "sha512-RVCsMfuD0+cTt3EwX8hSl2Ks56EbFHWmhluwcqoPKtBnfjiT6olaq7PRIRfhyU8nnC2MrnDrBLfrD/RGE+cVXQ==",
 			"dependencies": {
-				"@jridgewell/trace-mapping": "^0.3.17",
+				"@jridgewell/trace-mapping": "^0.3.25",
 				"jest-worker": "^27.4.5",
-				"schema-utils": "^3.1.1",
-				"serialize-javascript": "^6.0.1",
-				"terser": "^5.16.8"
+				"schema-utils": "^4.3.0",
+				"serialize-javascript": "^6.0.2",
+				"terser": "^5.31.1"
 			},
 			"engines": {
 				"node": ">= 10.13.0"
@@ -9124,14 +10108,46 @@
 				}
 			}
 		},
-		"node_modules/terser-webpack-plugin/node_modules/schema-utils": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-			"integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
+		"node_modules/terser-webpack-plugin/node_modules/ajv": {
+			"version": "8.17.1",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
 			"dependencies": {
-				"@types/json-schema": "^7.0.8",
-				"ajv": "^6.12.5",
-				"ajv-keywords": "^3.5.2"
+				"fast-deep-equal": "^3.1.3",
+				"fast-uri": "^3.0.1",
+				"json-schema-traverse": "^1.0.0",
+				"require-from-string": "^2.0.2"
+			},
+			"funding": {
+				"type": "github",
+				"url": "https://github.com/sponsors/epoberezkin"
+			}
+		},
+		"node_modules/terser-webpack-plugin/node_modules/ajv-keywords": {
+			"version": "5.1.0",
+			"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+			"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+			"dependencies": {
+				"fast-deep-equal": "^3.1.3"
+			},
+			"peerDependencies": {
+				"ajv": "^8.8.2"
+			}
+		},
+		"node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+		},
+		"node_modules/terser-webpack-plugin/node_modules/schema-utils": {
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
+			"integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
+			"dependencies": {
+				"@types/json-schema": "^7.0.9",
+				"ajv": "^8.9.0",
+				"ajv-formats": "^2.1.1",
+				"ajv-keywords": "^5.1.0"
 			},
 			"engines": {
 				"node": ">= 10.13.0"
@@ -9146,6 +10162,23 @@
 			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
 			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
 		},
+		"node_modules/text-decoder": {
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.3.tgz",
+			"integrity": "sha512-3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA==",
+			"dependencies": {
+				"b4a": "^1.6.4"
+			}
+		},
+		"node_modules/throttle-debounce": {
+			"version": "5.0.2",
+			"resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-5.0.2.tgz",
+			"integrity": "sha512-B71/4oyj61iNH0KeCamLuE2rmKuTO5byTOSVwECM5FA7TiAiAW+UqTKZ9ERueC4qvgSttUhdmq1mXC3kJqGX7A==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=12.22"
+			}
+		},
 		"node_modules/thunky": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
@@ -9167,14 +10200,6 @@
 			"resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
 			"integrity": "sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA=="
 		},
-		"node_modules/to-fast-properties": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-			"integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-			"engines": {
-				"node": ">=4"
-			}
-		},
 		"node_modules/to-regex-range": {
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -9205,21 +10230,38 @@
 			"integrity": "sha512-B5CXihaVzXw+1UHhNFyAwUTMDk1EfoLP5Tj1VhD9yybZ1I8DZJEv8tZ1l0RJo0t0tk9ZhR8eG5tEsaCvRigmdQ=="
 		},
 		"node_modules/tslib": {
-			"version": "2.6.2",
-			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-			"integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+			"version": "2.8.1",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+			"integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
 		},
 		"node_modules/tty-browserify": {
 			"version": "0.0.0",
 			"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
 			"integrity": "sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw=="
 		},
+		"node_modules/tunnel-agent": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+			"integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
+			"dependencies": {
+				"safe-buffer": "^5.0.1"
+			},
+			"engines": {
+				"node": "*"
+			}
+		},
 		"node_modules/tweetnacl": {
 			"version": "1.0.3",
 			"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz",
 			"integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==",
 			"dev": true
 		},
+		"node_modules/twgl.js": {
+			"version": "5.5.4",
+			"resolved": "https://registry.npmjs.org/twgl.js/-/twgl.js-5.5.4.tgz",
+			"integrity": "sha512-6kFOmijOpmblTN9CCwOTCxK4lPg7rCyQjLuub6EMOlEp89Ex6yUcsMjsmH7andNPL2NE3XmHdqHeP5gVKKPhxw==",
+			"license": "MIT"
+		},
 		"node_modules/twitter-text": {
 			"version": "2.0.5",
 			"resolved": "https://registry.npmjs.org/twitter-text/-/twitter-text-2.0.5.tgz",
@@ -9240,15 +10282,23 @@
 				"node": ">= 0.6"
 			}
 		},
+		"node_modules/uint8-util": {
+			"version": "2.2.5",
+			"resolved": "https://registry.npmjs.org/uint8-util/-/uint8-util-2.2.5.tgz",
+			"integrity": "sha512-/QxVQD7CttWpVUKVPz9znO+3Dd4BdTSnFQ7pv/4drVhC9m4BaL2LFHTkJn6EsYoxT79VDq/2Gg8L0H22PrzyMw==",
+			"dependencies": {
+				"base64-arraybuffer": "^1.0.2"
+			}
+		},
 		"node_modules/undici-types": {
-			"version": "5.25.3",
-			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.25.3.tgz",
-			"integrity": "sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA=="
+			"version": "6.20.0",
+			"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
+			"integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg=="
 		},
 		"node_modules/unicode-canonical-property-names-ecmascript": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
-			"integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz",
+			"integrity": "sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==",
 			"engines": {
 				"node": ">=4"
 			}
@@ -9266,9 +10316,9 @@
 			}
 		},
 		"node_modules/unicode-match-property-value-ecmascript": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
-			"integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz",
+			"integrity": "sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==",
 			"engines": {
 				"node": ">=4"
 			}
@@ -9282,9 +10332,9 @@
 			}
 		},
 		"node_modules/universalify": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-			"integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+			"integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
 			"engines": {
 				"node": ">= 10.0.0"
 			}
@@ -9303,9 +10353,9 @@
 			}
 		},
 		"node_modules/update-browserslist-db": {
-			"version": "1.0.13",
-			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
-			"integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
+			"integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
 			"funding": [
 				{
 					"type": "opencollective",
@@ -9321,8 +10371,8 @@
 				}
 			],
 			"dependencies": {
-				"escalade": "^3.1.1",
-				"picocolors": "^1.0.0"
+				"escalade": "^3.2.0",
+				"picocolors": "^1.1.0"
 			},
 			"bin": {
 				"update-browserslist-db": "cli.js"
@@ -9340,20 +10390,23 @@
 			}
 		},
 		"node_modules/uri-js/node_modules/punycode": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-			"integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+			"integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
 			"engines": {
 				"node": ">=6"
 			}
 		},
 		"node_modules/url": {
-			"version": "0.11.3",
-			"resolved": "https://registry.npmjs.org/url/-/url-0.11.3.tgz",
-			"integrity": "sha512-6hxOLGfZASQK/cijlZnZJTq8OXAkt/3YGfQX45vvMYXpZoo8NdWZcY73K108Jf759lS1Bv/8wXnHDTSz17dSRw==",
+			"version": "0.11.4",
+			"resolved": "https://registry.npmjs.org/url/-/url-0.11.4.tgz",
+			"integrity": "sha512-oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==",
 			"dependencies": {
 				"punycode": "^1.4.1",
-				"qs": "^6.11.2"
+				"qs": "^6.12.3"
+			},
+			"engines": {
+				"node": ">= 0.4"
 			}
 		},
 		"node_modules/url-polyfill": {
@@ -9367,9 +10420,9 @@
 			"integrity": "sha512-mtN6xk+Nac+oyJ/PrI7tzfmomRVNFIWKUbG8jdYFt52hxbiReFAXIjYskvu64/dvuW71IcB7lV8l0HvZMac6Jg=="
 		},
 		"node_modules/utf-8-validate": {
-			"version": "5.0.10",
-			"resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz",
-			"integrity": "sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==",
+			"version": "6.0.5",
+			"resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-6.0.5.tgz",
+			"integrity": "sha512-EYZR+OpIXp9Y1eG1iueg8KRsY8TuT8VNgnanZ0uA3STqhHQTLwbl+WX76/9X5OY12yQubymBpaBSmMPkSTQcKA==",
 			"hasInstallScript": true,
 			"optional": true,
 			"dependencies": {
@@ -9427,11 +10480,12 @@
 			"integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="
 		},
 		"node_modules/vue": {
-			"version": "2.7.14",
-			"resolved": "https://registry.npmjs.org/vue/-/vue-2.7.14.tgz",
-			"integrity": "sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ==",
+			"version": "2.7.16",
+			"resolved": "https://registry.npmjs.org/vue/-/vue-2.7.16.tgz",
+			"integrity": "sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==",
+			"deprecated": "Vue 2 has reached EOL and is no longer actively maintained. See https://v2.vuejs.org/eol/ for more details.",
 			"dependencies": {
-				"@vue/compiler-sfc": "2.7.14",
+				"@vue/compiler-sfc": "2.7.16",
 				"csstype": "^3.1.0"
 			}
 		},
@@ -9617,9 +10671,9 @@
 			}
 		},
 		"node_modules/vue-template-compiler": {
-			"version": "2.7.14",
-			"resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz",
-			"integrity": "sha512-zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ==",
+			"version": "2.7.16",
+			"resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz",
+			"integrity": "sha512-AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ==",
 			"dev": true,
 			"dependencies": {
 				"de-indent": "^1.0.2",
@@ -9668,9 +10722,9 @@
 			}
 		},
 		"node_modules/watchpack": {
-			"version": "2.4.0",
-			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
-			"integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
+			"integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
 			"dependencies": {
 				"glob-to-regexp": "^0.4.1",
 				"graceful-fs": "^4.1.2"
@@ -9687,39 +10741,58 @@
 				"minimalistic-assert": "^1.0.0"
 			}
 		},
+		"node_modules/web-streams-polyfill": {
+			"version": "3.3.3",
+			"resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz",
+			"integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==",
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/webgl-media-editor": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/webgl-media-editor/-/webgl-media-editor-0.0.1.tgz",
+			"integrity": "sha512-TxnuRl3rpWa1Cia/pn+vh+0iz3yDNwzsrnRGJ61YkdZAYuimu2afBivSHv0RK73hKza6Y/YoRCkuEcsFmtxPNw==",
+			"license": "AGPL-3.0-only",
+			"dependencies": {
+				"cropperjs": "^1.6.2",
+				"gl-matrix": "^3.4.3",
+				"throttle-debounce": "^5.0.2",
+				"twgl.js": "^5.5.4"
+			}
+		},
 		"node_modules/webidl-conversions": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
 			"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
 		},
 		"node_modules/webpack": {
-			"version": "5.89.0",
-			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz",
-			"integrity": "sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==",
+			"version": "5.97.1",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.97.1.tgz",
+			"integrity": "sha512-EksG6gFY3L1eFMROS/7Wzgrii5mBAFe4rIr3r2BTfo7bcc+DWwFZ4OJ/miOuHJO/A85HwyI4eQ0F6IKXesO7Fg==",
 			"dependencies": {
-				"@types/eslint-scope": "^3.7.3",
-				"@types/estree": "^1.0.0",
-				"@webassemblyjs/ast": "^1.11.5",
-				"@webassemblyjs/wasm-edit": "^1.11.5",
-				"@webassemblyjs/wasm-parser": "^1.11.5",
-				"acorn": "^8.7.1",
-				"acorn-import-assertions": "^1.9.0",
-				"browserslist": "^4.14.5",
+				"@types/eslint-scope": "^3.7.7",
+				"@types/estree": "^1.0.6",
+				"@webassemblyjs/ast": "^1.14.1",
+				"@webassemblyjs/wasm-edit": "^1.14.1",
+				"@webassemblyjs/wasm-parser": "^1.14.1",
+				"acorn": "^8.14.0",
+				"browserslist": "^4.24.0",
 				"chrome-trace-event": "^1.0.2",
-				"enhanced-resolve": "^5.15.0",
+				"enhanced-resolve": "^5.17.1",
 				"es-module-lexer": "^1.2.1",
 				"eslint-scope": "5.1.1",
 				"events": "^3.2.0",
 				"glob-to-regexp": "^0.4.1",
-				"graceful-fs": "^4.2.9",
+				"graceful-fs": "^4.2.11",
 				"json-parse-even-better-errors": "^2.3.1",
 				"loader-runner": "^4.2.0",
 				"mime-types": "^2.1.27",
 				"neo-async": "^2.6.2",
 				"schema-utils": "^3.2.0",
 				"tapable": "^2.1.1",
-				"terser-webpack-plugin": "^5.3.7",
-				"watchpack": "^2.4.0",
+				"terser-webpack-plugin": "^5.3.10",
+				"watchpack": "^2.4.1",
 				"webpack-sources": "^3.2.3"
 			},
 			"bin": {
@@ -9785,9 +10858,9 @@
 			}
 		},
 		"node_modules/webpack-cli/node_modules/cross-spawn": {
-			"version": "7.0.3",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+			"version": "7.0.6",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+			"integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
 			"dependencies": {
 				"path-key": "^3.1.0",
 				"shebang-command": "^2.0.0",
@@ -9839,9 +10912,9 @@
 			}
 		},
 		"node_modules/webpack-dev-middleware": {
-			"version": "5.3.3",
-			"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
-			"integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
+			"version": "5.3.4",
+			"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
+			"integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
 			"dependencies": {
 				"colorette": "^2.0.10",
 				"memfs": "^3.4.3",
@@ -9861,14 +10934,14 @@
 			}
 		},
 		"node_modules/webpack-dev-middleware/node_modules/ajv": {
-			"version": "8.12.0",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-			"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+			"version": "8.17.1",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
 			"dependencies": {
-				"fast-deep-equal": "^3.1.1",
+				"fast-deep-equal": "^3.1.3",
+				"fast-uri": "^3.0.1",
 				"json-schema-traverse": "^1.0.0",
-				"require-from-string": "^2.0.2",
-				"uri-js": "^4.2.2"
+				"require-from-string": "^2.0.2"
 			},
 			"funding": {
 				"type": "github",
@@ -9892,9 +10965,9 @@
 			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
 		},
 		"node_modules/webpack-dev-middleware/node_modules/schema-utils": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-			"integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
+			"integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
 			"dependencies": {
 				"@types/json-schema": "^7.0.9",
 				"ajv": "^8.9.0",
@@ -9902,7 +10975,7 @@
 				"ajv-keywords": "^5.1.0"
 			},
 			"engines": {
-				"node": ">= 12.13.0"
+				"node": ">= 10.13.0"
 			},
 			"funding": {
 				"type": "opencollective",
@@ -9910,9 +10983,9 @@
 			}
 		},
 		"node_modules/webpack-dev-server": {
-			"version": "4.15.1",
-			"resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz",
-			"integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==",
+			"version": "4.15.2",
+			"resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.2.tgz",
+			"integrity": "sha512-0XavAZbNJ5sDrCbkpWL8mia0o5WPOd2YGtxrEiZkBK9FjLppIUK2TgxK6qGD2P3hUXTJNNPVibrerKcx5WkR1g==",
 			"dependencies": {
 				"@types/bonjour": "^3.5.9",
 				"@types/connect-history-api-fallback": "^1.3.5",
@@ -9942,7 +11015,7 @@
 				"serve-index": "^1.9.1",
 				"sockjs": "^0.3.24",
 				"spdy": "^4.0.2",
-				"webpack-dev-middleware": "^5.3.1",
+				"webpack-dev-middleware": "^5.3.4",
 				"ws": "^8.13.0"
 			},
 			"bin": {
@@ -9968,14 +11041,14 @@
 			}
 		},
 		"node_modules/webpack-dev-server/node_modules/ajv": {
-			"version": "8.12.0",
-			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-			"integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+			"version": "8.17.1",
+			"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+			"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
 			"dependencies": {
-				"fast-deep-equal": "^3.1.1",
+				"fast-deep-equal": "^3.1.3",
+				"fast-uri": "^3.0.1",
 				"json-schema-traverse": "^1.0.0",
-				"require-from-string": "^2.0.2",
-				"uri-js": "^4.2.2"
+				"require-from-string": "^2.0.2"
 			},
 			"funding": {
 				"type": "github",
@@ -9999,9 +11072,9 @@
 			"integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
 		},
 		"node_modules/webpack-dev-server/node_modules/schema-utils": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-			"integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
+			"integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
 			"dependencies": {
 				"@types/json-schema": "^7.0.9",
 				"ajv": "^8.9.0",
@@ -10009,33 +11082,13 @@
 				"ajv-keywords": "^5.1.0"
 			},
 			"engines": {
-				"node": ">= 12.13.0"
+				"node": ">= 10.13.0"
 			},
 			"funding": {
 				"type": "opencollective",
 				"url": "https://opencollective.com/webpack"
 			}
 		},
-		"node_modules/webpack-dev-server/node_modules/ws": {
-			"version": "8.14.2",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz",
-			"integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==",
-			"engines": {
-				"node": ">=10.0.0"
-			},
-			"peerDependencies": {
-				"bufferutil": "^4.0.1",
-				"utf-8-validate": ">=5.0.2"
-			},
-			"peerDependenciesMeta": {
-				"bufferutil": {
-					"optional": true
-				},
-				"utf-8-validate": {
-					"optional": true
-				}
-			}
-		},
 		"node_modules/webpack-merge": {
 			"version": "5.10.0",
 			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz",
@@ -10117,6 +11170,18 @@
 				"webpack": "3 || 4 || 5"
 			}
 		},
+		"node_modules/webrtc-polyfill": {
+			"version": "1.1.10",
+			"resolved": "https://registry.npmjs.org/webrtc-polyfill/-/webrtc-polyfill-1.1.10.tgz",
+			"integrity": "sha512-sOn0bj3/noUdzQX7rvk0jFbBurqWDGGo2ipl+WfgoOe/x3cxbGLk/ZUY+WHCISSlLaIeBumi1X3wxQZnUESExQ==",
+			"dependencies": {
+				"node-datachannel": "^v0.12.0",
+				"node-domexception": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=16.0.0"
+			}
+		},
 		"node_modules/websocket-driver": {
 			"version": "0.7.4",
 			"resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
@@ -10186,15 +11251,15 @@
 			"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
 		},
 		"node_modules/ws": {
-			"version": "7.5.9",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-			"integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+			"version": "8.18.0",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+			"integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
 			"engines": {
-				"node": ">=8.3.0"
+				"node": ">=10.0.0"
 			},
 			"peerDependencies": {
 				"bufferutil": "^4.0.1",
-				"utf-8-validate": "^5.0.2"
+				"utf-8-validate": ">=5.0.2"
 			},
 			"peerDependenciesMeta": {
 				"bufferutil": {
diff --git a/package.json b/package.json
index 6598175d9..691972ced 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
 	},
 	"devDependencies": {
 		"acorn": "^8.7.1",
-		"axios": "^0.21.1",
+		"axios": ">=1.6.0",
 		"bootstrap": "^4.5.2",
 		"cross-env": "^5.2.1",
 		"jquery": "^3.6.0",
@@ -34,6 +34,7 @@
 	},
 	"dependencies": {
 		"@fancyapps/fancybox": "^3.5.7",
+		"@glidejs/glide": "^3.6.2",
 		"@hcaptcha/vue-hcaptcha": "^1.3.0",
 		"@peertube/p2p-media-loader-core": "^1.0.14",
 		"@peertube/p2p-media-loader-hlsjs": "^1.0.14",
@@ -47,7 +48,7 @@
 		"caniuse-lite": "^1.0.30001418",
 		"chart.js": "^2.7.2",
 		"filesize": "^3.6.1",
-		"hls.js": "^1.1.5",
+		"hls.js": "^1.5.13",
 		"howler": "^2.2.0",
 		"infinite-scroll": "^3.0.6",
 		"jquery-scroll-lock": "^3.1.3",
@@ -70,6 +71,7 @@
 		"vue-loading-overlay": "^3.3.3",
 		"vue-timeago": "^5.1.2",
 		"vue-tribute": "^1.0.7",
+		"webgl-media-editor": "^0.0.1",
 		"zuck.js": "^1.6.0"
 	},
 	"collective": {
diff --git a/public/css/admin.css b/public/css/admin.css
index 658de1dbc..54df3aa46 100644
Binary files a/public/css/admin.css and b/public/css/admin.css differ
diff --git a/public/css/app.css b/public/css/app.css
index 0c96787bd..8b93403a2 100644
Binary files a/public/css/app.css and b/public/css/app.css differ
diff --git a/public/css/appdark.css b/public/css/appdark.css
index 414d666f8..9cd24c41c 100644
Binary files a/public/css/appdark.css and b/public/css/appdark.css differ
diff --git a/public/css/landing.css b/public/css/landing.css
index 152a6a78f..bfec69d9f 100644
Binary files a/public/css/landing.css and b/public/css/landing.css differ
diff --git a/public/css/profile.css b/public/css/profile.css
new file mode 100644
index 000000000..4f5b6ef16
Binary files /dev/null and b/public/css/profile.css differ
diff --git a/public/css/spa.css b/public/css/spa.css
index fd4124d27..9847ed198 100644
Binary files a/public/css/spa.css and b/public/css/spa.css differ
diff --git a/public/embed.js b/public/embed.js
index 5acc20efe..ab7f9a539 100644
Binary files a/public/embed.js and b/public/embed.js differ
diff --git a/public/js/account-import.js b/public/js/account-import.js
index 20ca89318..bf2e40b37 100644
Binary files a/public/js/account-import.js and b/public/js/account-import.js differ
diff --git a/public/js/activity.js b/public/js/activity.js
index 6d643b050..d32596a9a 100644
Binary files a/public/js/activity.js and b/public/js/activity.js differ
diff --git a/public/js/admin.js b/public/js/admin.js
index d71cbfa94..1a7357d38 100644
Binary files a/public/js/admin.js and b/public/js/admin.js differ
diff --git a/public/js/admin_invite.js b/public/js/admin_invite.js
index 071d24aca..2f232337f 100644
Binary files a/public/js/admin_invite.js and b/public/js/admin_invite.js differ
diff --git a/public/js/app.js b/public/js/app.js
index 86bae4e30..c01f7a131 100644
Binary files a/public/js/app.js and b/public/js/app.js differ
diff --git a/public/js/changelog.bundle.742a06ba0a547120.js b/public/js/changelog.bundle.742a06ba0a547120.js
deleted file mode 100644
index 3e0be8d49..000000000
Binary files a/public/js/changelog.bundle.742a06ba0a547120.js and /dev/null differ
diff --git a/public/js/changelog.bundle.7fc2ee6c4475458c.js b/public/js/changelog.bundle.7fc2ee6c4475458c.js
new file mode 100644
index 000000000..822d2599b
Binary files /dev/null and b/public/js/changelog.bundle.7fc2ee6c4475458c.js differ
diff --git a/public/js/collectioncompose.js b/public/js/collectioncompose.js
index e295e7965..ae3e62289 100644
Binary files a/public/js/collectioncompose.js and b/public/js/collectioncompose.js differ
diff --git a/public/js/collections.js b/public/js/collections.js
index 73ebdde48..45efad196 100644
Binary files a/public/js/collections.js and b/public/js/collections.js differ
diff --git a/public/js/components.js b/public/js/components.js
index 4604aedf5..b5eec688d 100644
Binary files a/public/js/components.js and b/public/js/components.js differ
diff --git a/public/js/compose-classic.js b/public/js/compose-classic.js
index 19a9c3f2e..dc2236620 100644
Binary files a/public/js/compose-classic.js and b/public/js/compose-classic.js differ
diff --git a/public/js/compose.chunk.965eab35620423e5.js b/public/js/compose.chunk.965eab35620423e5.js
deleted file mode 100644
index 787f7dd6b..000000000
Binary files a/public/js/compose.chunk.965eab35620423e5.js and /dev/null differ
diff --git a/public/js/compose.chunk.e1f297b242137d23.js b/public/js/compose.chunk.e1f297b242137d23.js
new file mode 100644
index 000000000..91ed42f8b
Binary files /dev/null and b/public/js/compose.chunk.e1f297b242137d23.js differ
diff --git a/public/js/home.chunk.351f55e9d09b6482.js.LICENSE.txt b/public/js/compose.chunk.e1f297b242137d23.js.LICENSE.txt
similarity index 100%
rename from public/js/home.chunk.351f55e9d09b6482.js.LICENSE.txt
rename to public/js/compose.chunk.e1f297b242137d23.js.LICENSE.txt
diff --git a/public/js/compose.js b/public/js/compose.js
index 242f07420..358d724f3 100644
Binary files a/public/js/compose.js and b/public/js/compose.js differ
diff --git a/public/js/post.chunk.74f8b1d1954f5d01.js.LICENSE.txt b/public/js/compose.js.LICENSE.txt
similarity index 100%
rename from public/js/post.chunk.74f8b1d1954f5d01.js.LICENSE.txt
rename to public/js/compose.js.LICENSE.txt
diff --git a/public/js/daci.chunk.3ed914c15dec4ff4.js b/public/js/daci.chunk.3ed914c15dec4ff4.js
new file mode 100644
index 000000000..afa171eaf
Binary files /dev/null and b/public/js/daci.chunk.3ed914c15dec4ff4.js differ
diff --git a/public/js/daci.chunk.b17a0b11877389d7.js b/public/js/daci.chunk.b17a0b11877389d7.js
deleted file mode 100644
index ccbc67f41..000000000
Binary files a/public/js/daci.chunk.b17a0b11877389d7.js and /dev/null differ
diff --git a/public/js/developers.js b/public/js/developers.js
index b76d00957..d4f9859b0 100644
Binary files a/public/js/developers.js and b/public/js/developers.js differ
diff --git a/public/js/direct.js b/public/js/direct.js
index 704d14c08..a9fd7e0ac 100644
Binary files a/public/js/direct.js and b/public/js/direct.js differ
diff --git a/public/js/discover.chunk.2986d7e977f5188a.js b/public/js/discover.chunk.2986d7e977f5188a.js
new file mode 100644
index 000000000..998af561b
Binary files /dev/null and b/public/js/discover.chunk.2986d7e977f5188a.js differ
diff --git a/public/js/discover.chunk.9606885dad3c8a99.js b/public/js/discover.chunk.9606885dad3c8a99.js
deleted file mode 100644
index 7892b83f2..000000000
Binary files a/public/js/discover.chunk.9606885dad3c8a99.js and /dev/null differ
diff --git a/public/js/discover.js b/public/js/discover.js
index 4102b71f7..35f72887a 100644
Binary files a/public/js/discover.js and b/public/js/discover.js differ
diff --git a/public/js/discover~findfriends.chunk.02be60ab26503531.js b/public/js/discover~findfriends.chunk.02be60ab26503531.js
deleted file mode 100644
index 60d93a0a6..000000000
Binary files a/public/js/discover~findfriends.chunk.02be60ab26503531.js and /dev/null differ
diff --git a/public/js/discover~findfriends.chunk.84758c764668a02c.js b/public/js/discover~findfriends.chunk.84758c764668a02c.js
new file mode 100644
index 000000000..412cd73a4
Binary files /dev/null and b/public/js/discover~findfriends.chunk.84758c764668a02c.js differ
diff --git a/public/js/discover~hashtag.bundle.9cfffc517f35044e.js b/public/js/discover~hashtag.bundle.9cfffc517f35044e.js
deleted file mode 100644
index afb2b3de0..000000000
Binary files a/public/js/discover~hashtag.bundle.9cfffc517f35044e.js and /dev/null differ
diff --git a/public/js/discover~hashtag.bundle.db1d86f9e9dcb79a.js b/public/js/discover~hashtag.bundle.db1d86f9e9dcb79a.js
new file mode 100644
index 000000000..b6c51b20b
Binary files /dev/null and b/public/js/discover~hashtag.bundle.db1d86f9e9dcb79a.js differ
diff --git a/public/js/discover~memories.chunk.3b45432a80b08e9b.js b/public/js/discover~memories.chunk.3b45432a80b08e9b.js
new file mode 100644
index 000000000..1d8d83814
Binary files /dev/null and b/public/js/discover~memories.chunk.3b45432a80b08e9b.js differ
diff --git a/public/js/discover~memories.chunk.ce9cc6446020e9b3.js b/public/js/discover~memories.chunk.ce9cc6446020e9b3.js
deleted file mode 100644
index ec86c87f7..000000000
Binary files a/public/js/discover~memories.chunk.ce9cc6446020e9b3.js and /dev/null differ
diff --git a/public/js/discover~myhashtags.chunk.67fd16950ee21ad8.js b/public/js/discover~myhashtags.chunk.67fd16950ee21ad8.js
new file mode 100644
index 000000000..e91438ebd
Binary files /dev/null and b/public/js/discover~myhashtags.chunk.67fd16950ee21ad8.js differ
diff --git a/public/js/discover~myhashtags.chunk.6eab2414b2b16e19.js b/public/js/discover~myhashtags.chunk.6eab2414b2b16e19.js
deleted file mode 100644
index 31039621f..000000000
Binary files a/public/js/discover~myhashtags.chunk.6eab2414b2b16e19.js and /dev/null differ
diff --git a/public/js/discover~serverfeed.chunk.0f2dcc473fdce17e.js b/public/js/discover~serverfeed.chunk.0f2dcc473fdce17e.js
deleted file mode 100644
index ed30efc2f..000000000
Binary files a/public/js/discover~serverfeed.chunk.0f2dcc473fdce17e.js and /dev/null differ
diff --git a/public/js/discover~serverfeed.chunk.93bc564867eaa7c3.js b/public/js/discover~serverfeed.chunk.93bc564867eaa7c3.js
new file mode 100644
index 000000000..59f1826ce
Binary files /dev/null and b/public/js/discover~serverfeed.chunk.93bc564867eaa7c3.js differ
diff --git a/public/js/discover~settings.chunk.732c1f76a00d9204.js b/public/js/discover~settings.chunk.732c1f76a00d9204.js
deleted file mode 100644
index 959ab4d3f..000000000
Binary files a/public/js/discover~settings.chunk.732c1f76a00d9204.js and /dev/null differ
diff --git a/public/js/discover~settings.chunk.950c11c918a541b0.js b/public/js/discover~settings.chunk.950c11c918a541b0.js
new file mode 100644
index 000000000..620fcb701
Binary files /dev/null and b/public/js/discover~settings.chunk.950c11c918a541b0.js differ
diff --git a/public/js/dms.chunk.53a951c5de2d95ac.js b/public/js/dms.chunk.53a951c5de2d95ac.js
deleted file mode 100644
index 0ee8967ee..000000000
Binary files a/public/js/dms.chunk.53a951c5de2d95ac.js and /dev/null differ
diff --git a/public/js/dms.chunk.b7e970fb49da0199.js b/public/js/dms.chunk.b7e970fb49da0199.js
new file mode 100644
index 000000000..4845baf6d
Binary files /dev/null and b/public/js/dms.chunk.b7e970fb49da0199.js differ
diff --git a/public/js/dms~message.chunk.011f31232754f650.js b/public/js/dms~message.chunk.011f31232754f650.js
new file mode 100644
index 000000000..86f49696e
Binary files /dev/null and b/public/js/dms~message.chunk.011f31232754f650.js differ
diff --git a/public/js/dms~message.chunk.15157ff4a6c17cc7.js b/public/js/dms~message.chunk.15157ff4a6c17cc7.js
deleted file mode 100644
index e74ff4325..000000000
Binary files a/public/js/dms~message.chunk.15157ff4a6c17cc7.js and /dev/null differ
diff --git a/public/js/error404.bundle.3bbc118159460db6.js b/public/js/error404.bundle.3bbc118159460db6.js
deleted file mode 100644
index 93b6b5acd..000000000
Binary files a/public/js/error404.bundle.3bbc118159460db6.js and /dev/null differ
diff --git a/public/js/error404.bundle.ad885ef6f9b2c101.js b/public/js/error404.bundle.ad885ef6f9b2c101.js
new file mode 100644
index 000000000..904132756
Binary files /dev/null and b/public/js/error404.bundle.ad885ef6f9b2c101.js differ
diff --git a/public/js/group-status.js b/public/js/group-status.js
new file mode 100644
index 000000000..106c271ed
Binary files /dev/null and b/public/js/group-status.js differ
diff --git a/public/js/group-topic-feed.js b/public/js/group-topic-feed.js
new file mode 100644
index 000000000..e7ca72a39
Binary files /dev/null and b/public/js/group-topic-feed.js differ
diff --git a/public/js/group.create.0d645a1de271e28d.js b/public/js/group.create.0d645a1de271e28d.js
new file mode 100644
index 000000000..0c2274c61
Binary files /dev/null and b/public/js/group.create.0d645a1de271e28d.js differ
diff --git a/public/js/groups-page-about.06576420562628e3.js b/public/js/groups-page-about.06576420562628e3.js
new file mode 100644
index 000000000..551db02c7
Binary files /dev/null and b/public/js/groups-page-about.06576420562628e3.js differ
diff --git a/public/js/groups-page-media.f611a51e684c48ef.js b/public/js/groups-page-media.f611a51e684c48ef.js
new file mode 100644
index 000000000..81cc2098d
Binary files /dev/null and b/public/js/groups-page-media.f611a51e684c48ef.js differ
diff --git a/public/js/groups-page-members.bfdefdd66058e838.js b/public/js/groups-page-members.bfdefdd66058e838.js
new file mode 100644
index 000000000..f862c4c0e
Binary files /dev/null and b/public/js/groups-page-members.bfdefdd66058e838.js differ
diff --git a/public/js/groups-page-topics.431ebaf843ca9b16.js b/public/js/groups-page-topics.431ebaf843ca9b16.js
new file mode 100644
index 000000000..40f026580
Binary files /dev/null and b/public/js/groups-page-topics.431ebaf843ca9b16.js differ
diff --git a/public/js/groups-page.53eccead9512c61f.js b/public/js/groups-page.53eccead9512c61f.js
new file mode 100644
index 000000000..5ed4c8dbd
Binary files /dev/null and b/public/js/groups-page.53eccead9512c61f.js differ
diff --git a/public/js/groups-post.639cb121bdc6f4a7.js b/public/js/groups-post.639cb121bdc6f4a7.js
new file mode 100644
index 000000000..6db341dc2
Binary files /dev/null and b/public/js/groups-post.639cb121bdc6f4a7.js differ
diff --git a/public/js/groups-profile.3b11ffa46ae76520.js b/public/js/groups-profile.3b11ffa46ae76520.js
new file mode 100644
index 000000000..4d2dda3fc
Binary files /dev/null and b/public/js/groups-profile.3b11ffa46ae76520.js differ
diff --git a/public/js/groups.js b/public/js/groups.js
new file mode 100644
index 000000000..0c589194e
Binary files /dev/null and b/public/js/groups.js differ
diff --git a/public/js/hashtag.js b/public/js/hashtag.js
index 5ef001f9f..e543b0162 100644
Binary files a/public/js/hashtag.js and b/public/js/hashtag.js differ
diff --git a/public/js/home.chunk.351f55e9d09b6482.js b/public/js/home.chunk.351f55e9d09b6482.js
deleted file mode 100644
index c6f3e4d4f..000000000
Binary files a/public/js/home.chunk.351f55e9d09b6482.js and /dev/null differ
diff --git a/public/js/home.chunk.c362371940daf318.js b/public/js/home.chunk.c362371940daf318.js
new file mode 100644
index 000000000..4ebd0feb2
Binary files /dev/null and b/public/js/home.chunk.c362371940daf318.js differ
diff --git a/public/js/home.chunk.c362371940daf318.js.LICENSE.txt b/public/js/home.chunk.c362371940daf318.js.LICENSE.txt
new file mode 100644
index 000000000..ae386fb79
--- /dev/null
+++ b/public/js/home.chunk.c362371940daf318.js.LICENSE.txt
@@ -0,0 +1 @@
+/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
diff --git a/public/js/i18n.bundle.47cbf9f04d955267.js b/public/js/i18n.bundle.47cbf9f04d955267.js
deleted file mode 100644
index bf83a1075..000000000
Binary files a/public/js/i18n.bundle.47cbf9f04d955267.js and /dev/null differ
diff --git a/public/js/i18n.bundle.882da44b752e4e1a.js b/public/js/i18n.bundle.882da44b752e4e1a.js
new file mode 100644
index 000000000..4f85b6937
Binary files /dev/null and b/public/js/i18n.bundle.882da44b752e4e1a.js differ
diff --git a/public/js/landing.js b/public/js/landing.js
index 8a3b2322c..3069baa87 100644
Binary files a/public/js/landing.js and b/public/js/landing.js differ
diff --git a/public/js/manifest.js b/public/js/manifest.js
index 7ba9d795b..38f8d015d 100644
Binary files a/public/js/manifest.js and b/public/js/manifest.js differ
diff --git a/public/js/notifications.chunk.3b92cf46da469de1.js b/public/js/notifications.chunk.3b92cf46da469de1.js
deleted file mode 100644
index 94f7da536..000000000
Binary files a/public/js/notifications.chunk.3b92cf46da469de1.js and /dev/null differ
diff --git a/public/js/notifications.chunk.8c41265737b2568a.js b/public/js/notifications.chunk.8c41265737b2568a.js
new file mode 100644
index 000000000..dc1c1ffb4
Binary files /dev/null and b/public/js/notifications.chunk.8c41265737b2568a.js differ
diff --git a/public/js/portfolio.js b/public/js/portfolio.js
index ce1e7097f..d4b0f18f2 100644
Binary files a/public/js/portfolio.js and b/public/js/portfolio.js differ
diff --git a/public/js/post.chunk.5f457aeaa4ae598c.js b/public/js/post.chunk.5f457aeaa4ae598c.js
new file mode 100644
index 000000000..8b86545da
Binary files /dev/null and b/public/js/post.chunk.5f457aeaa4ae598c.js differ
diff --git a/public/js/post.chunk.5f457aeaa4ae598c.js.LICENSE.txt b/public/js/post.chunk.5f457aeaa4ae598c.js.LICENSE.txt
new file mode 100644
index 000000000..ae386fb79
--- /dev/null
+++ b/public/js/post.chunk.5f457aeaa4ae598c.js.LICENSE.txt
@@ -0,0 +1 @@
+/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
diff --git a/public/js/post.chunk.74f8b1d1954f5d01.js b/public/js/post.chunk.74f8b1d1954f5d01.js
deleted file mode 100644
index 55d35a437..000000000
Binary files a/public/js/post.chunk.74f8b1d1954f5d01.js and /dev/null differ
diff --git a/public/js/profile-directory.js b/public/js/profile-directory.js
index 11324401e..59acb414d 100644
Binary files a/public/js/profile-directory.js and b/public/js/profile-directory.js differ
diff --git a/public/js/profile.chunk.0e5bd852054d6355.js b/public/js/profile.chunk.0e5bd852054d6355.js
deleted file mode 100644
index acf4175dc..000000000
Binary files a/public/js/profile.chunk.0e5bd852054d6355.js and /dev/null differ
diff --git a/public/js/profile.chunk.9e77e21e157a47c5.js b/public/js/profile.chunk.9e77e21e157a47c5.js
new file mode 100644
index 000000000..3ec558805
Binary files /dev/null and b/public/js/profile.chunk.9e77e21e157a47c5.js differ
diff --git a/public/js/profile.js b/public/js/profile.js
index a9fcd40df..7a210d81d 100644
Binary files a/public/js/profile.js and b/public/js/profile.js differ
diff --git a/public/js/profile.js.LICENSE.txt b/public/js/profile.js.LICENSE.txt
new file mode 100644
index 000000000..ae386fb79
--- /dev/null
+++ b/public/js/profile.js.LICENSE.txt
@@ -0,0 +1 @@
+/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
diff --git a/public/js/profile~followers.bundle.731f680cfb96563d.js b/public/js/profile~followers.bundle.731f680cfb96563d.js
deleted file mode 100644
index 51805c382..000000000
Binary files a/public/js/profile~followers.bundle.731f680cfb96563d.js and /dev/null differ
diff --git a/public/js/profile~followers.bundle.f26ee6ed6ced9aa7.js b/public/js/profile~followers.bundle.f26ee6ed6ced9aa7.js
new file mode 100644
index 000000000..141b5ea05
Binary files /dev/null and b/public/js/profile~followers.bundle.f26ee6ed6ced9aa7.js differ
diff --git a/public/js/profile~following.bundle.3d95796c9f1678dd.js b/public/js/profile~following.bundle.3d95796c9f1678dd.js
deleted file mode 100644
index 24db7dafa..000000000
Binary files a/public/js/profile~following.bundle.3d95796c9f1678dd.js and /dev/null differ
diff --git a/public/js/profile~following.bundle.4ac5466dca6ca1c4.js b/public/js/profile~following.bundle.4ac5466dca6ca1c4.js
new file mode 100644
index 000000000..b435bf157
Binary files /dev/null and b/public/js/profile~following.bundle.4ac5466dca6ca1c4.js differ
diff --git a/public/js/remote_auth.js b/public/js/remote_auth.js
index bbc0e463f..390b4c9a5 100644
Binary files a/public/js/remote_auth.js and b/public/js/remote_auth.js differ
diff --git a/public/js/search.js b/public/js/search.js
index 12c3c6751..448799422 100644
Binary files a/public/js/search.js and b/public/js/search.js differ
diff --git a/public/js/spa.js b/public/js/spa.js
index b496ba432..5c1950c77 100644
Binary files a/public/js/spa.js and b/public/js/spa.js differ
diff --git a/public/js/status.js b/public/js/status.js
index fb8eb6b7e..e90c8a402 100644
Binary files a/public/js/status.js and b/public/js/status.js differ
diff --git a/public/js/stories.js b/public/js/stories.js
index e38874d8e..8992e412c 100644
Binary files a/public/js/stories.js and b/public/js/stories.js differ
diff --git a/public/js/story-compose.js b/public/js/story-compose.js
index 85b348200..6f208b266 100644
Binary files a/public/js/story-compose.js and b/public/js/story-compose.js differ
diff --git a/public/js/timeline.js b/public/js/timeline.js
index a0ec87563..73ff3311e 100644
Binary files a/public/js/timeline.js and b/public/js/timeline.js differ
diff --git a/public/js/vendor.js b/public/js/vendor.js
index 530259cb1..1753e176e 100644
Binary files a/public/js/vendor.js and b/public/js/vendor.js differ
diff --git a/public/js/vendor.js.LICENSE.txt b/public/js/vendor.js.LICENSE.txt
index bd8662c18..83e24868a 100644
--- a/public/js/vendor.js.LICENSE.txt
+++ b/public/js/vendor.js.LICENSE.txt
@@ -31,13 +31,19 @@
  */
 
 /*!
- * Cropper.js v1.6.1
+ * Cropper.js v1.6.2
  * https://fengyuanchen.github.io/cropperjs
  *
  * Copyright 2015-present Chen Fengyuan
  * Released under the MIT license
  *
- * Date: 2023-09-17T03:44:19.860Z
+ * Date: 2024-04-21T07:43:05.335Z
+ */
+
+/*!
+ * Glide.js v3.6.2
+ * (c) 2013-2024 Jędrzej Chałubek (https://github.com/jedrzejchalubek/)
+ * Released under the MIT License.
  */
 
 /*!
@@ -64,15 +70,8 @@
  */
 
 /*!
- * The buffer module from node.js, for the browser.
- *
- * @author   Feross Aboukhadijeh <https://feross.org>
- * @license  MIT
- */
-
-/*!
- * Vue.js v2.7.14
- * (c) 2014-2022 Evan You
+ * Vue.js v2.7.16
+ * (c) 2014-2023 Evan You
  * Released under the MIT License.
  */
 
@@ -159,16 +158,6 @@ and limitations under the License.
 
 /*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
 
-/*! queue-microtask. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
-
-/*! run-parallel. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
-
-/*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
-
-/*! simple-peer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
-
-/*! simple-websocket. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
-
 /**
   * vue-class-component v7.2.3
   * (c) 2015-present Evan You
@@ -184,23 +173,6 @@ and limitations under the License.
  * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
  */
 
-/**
- * @license Apache-2.0
- * Copyright 2018 Novage LLC.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 /**
  * filesize
  *
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 787d3c4bb..fa05d8a82 100644
Binary files a/public/mix-manifest.json and b/public/mix-manifest.json differ
diff --git a/resources/assets/components/AccountImport.vue b/resources/assets/components/AccountImport.vue
index b669345db..4cc6408f1 100644
--- a/resources/assets/components/AccountImport.vue
+++ b/resources/assets/components/AccountImport.vue
@@ -197,8 +197,17 @@
                     <div class="list-group">
                         <div class="list-group-item d-flex justify-content-between align-items-center">
                             <p class="text-center font-weight-bold mb-0">Media #{{idx + 1}}</p>
-                            <img :src="getFileNameUrl(media.uri)" width="30" height="30" style="object-fit: cover; border-radius: 5px;">
+                            <template v-if="media.uri.endsWith('.jpg') || media.uri.endsWith('.png')">
+                                <img :src="getFileNameUrl(media.uri)" width="30" height="30" style="object-fit: cover; border-radius: 5px;">
+                            </template>
                         </div>
+                        <template v-if="media.uri.endsWith('.mp4')">
+                            <div class="list-group-item">
+                                <div class="embed-responsive embed-responsive-4by3">
+                                    <video :src="getFileNameUrl(media.uri)" controls></video>
+                                </div>
+                            </div>
+                        </template>
                         <div class="list-group-item">
                             <p class="small text-muted">Caption</p>
                             <p class="mb-0 small read-more" style="font-size: 12px;overflow-y: hidden;">{{ media.title ? media.title : modalData.title }}</p>
@@ -348,8 +357,22 @@
                 }, 500);
             },
 
-            filterPostMeta(media) {
-                let json = JSON.parse(media);
+            async fixFacebookEncoding(string) {
+                // Facebook and Instagram are encoding UTF8 characters in a weird way in their json
+                // here is a good explanation what's going wrong https://sorashi.github.io/fix-facebook-json-archive-encoding
+                // See https://github.com/pixelfed/pixelfed/pull/4726 for more info
+                const replaced = string.replace(/\\u00([a-f0-9]{2})/g, (x) => String.fromCharCode(parseInt(x.slice(2), 16)));
+                const buffer = Array.from(replaced, (c) => c.charCodeAt(0));
+                return new TextDecoder().decode(new Uint8Array(buffer));
+            },
+
+            async filterPostMeta(media) {
+            	let fbfix = await this.fixFacebookEncoding(media);
+                let json = JSON.parse(fbfix);
+                /* Sometimes the JSON isn't an array, when there's only one post */
+                if (!Array.isArray(json)) {
+                    json = new Array(json);
+                }
                 let res = json.filter(j => {
                     let ids = j.media.map(m => m.uri).filter(m => {
                         if(this.config.allow_video_posts == true) {
@@ -371,7 +394,7 @@
                 let file = this.$refs.zipInput.files[0];
                 let entries = await this.model(file);
                 if (entries && entries.length) {
-                    let files = await entries.filter(e => e.filename === 'content/posts_1.json');
+                    let files = await entries.filter(e => e.filename === 'content/posts_1.json' || e.filename === 'your_instagram_activity/content/posts_1.json');
 
                     if(!files || !files.length) {
                         this.contactModal(
@@ -392,16 +415,18 @@
                 let entries = await this.model(file);
                 if (entries && entries.length) {
                     this.zipFiles = entries;
-                    let media = await entries.filter(e => e.filename === 'content/posts_1.json')[0].getData(new zip.TextWriter());
+                    let media = await entries.filter(e => e.filename === 'content/posts_1.json' || e.filename === 'your_instagram_activity/content/posts_1.json')[0].getData(new zip.TextWriter());
                     this.filterPostMeta(media);
 
                     let imgs = await Promise.all(entries.filter(entry => {
-                        return entry.filename.startsWith('media/posts/') && (entry.filename.endsWith('.png') || entry.filename.endsWith('.jpg') || entry.filename.endsWith('.mp4'));
+                        return (entry.filename.startsWith('media/posts/') || entry.filename.startsWith('media/other/')) && (entry.filename.endsWith('.png') || entry.filename.endsWith('.jpg') || entry.filename.endsWith('.mp4'));
                     })
                     .map(async entry => {
                         if(
-                            entry.filename.startsWith('media/posts/') &&
                             (
+                                entry.filename.startsWith('media/posts/') ||
+                                entry.filename.startsWith('media/other/')
+                            ) && (
                                 entry.filename.endsWith('.png') ||
                                 entry.filename.endsWith('.jpg') ||
                                 entry.filename.endsWith('.mp4')
diff --git a/resources/assets/components/Direct.vue b/resources/assets/components/Direct.vue
index bd8cf2078..3de61c3c0 100644
--- a/resources/assets/components/Direct.vue
+++ b/resources/assets/components/Direct.vue
@@ -112,14 +112,17 @@
 	import Sidebar from './partials/sidebar.vue';
 	import Placeholder from './partials/placeholders/DirectMessagePlaceholder.vue';
 	import Intersect from 'vue-intersect'
+	import Autocomplete from '@trevoreyre/autocomplete-vue'
+	import '@trevoreyre/autocomplete-vue/dist/style.css';
 
 	export default {
 		components: {
 			"drawer": Drawer,
-            "sidebar": Sidebar,
-            "intersect": Intersect,
-            "dm-placeholder": Placeholder
-        },
+			"sidebar": Sidebar,
+			"intersect": Intersect,
+			"dm-placeholder": Placeholder,
+			"autocomplete": Autocomplete
+		},
 
 		data() {
 			return {
diff --git a/resources/assets/components/DirectMessage.vue b/resources/assets/components/DirectMessage.vue
index e91ecdfaf..4766e5df1 100644
--- a/resources/assets/components/DirectMessage.vue
+++ b/resources/assets/components/DirectMessage.vue
@@ -456,7 +456,9 @@
 					// 	objDiv.scrollTop = objDiv.scrollHeight;
 					// }, 300);
 				}).catch(err => {
-					if(err.response.status == 403) {
+					if(err.response.status == 400) {
+						swal('Error', err.response.data.error, 'error');
+					} else if(err.response.status == 403) {
 						self.blocked = true;
 						swal('Profile Unavailable', 'You cannot message this profile at this time.', 'error');
 					}
diff --git a/resources/assets/components/Discover.vue b/resources/assets/components/Discover.vue
index 44f8f9cef..366d38196 100644
--- a/resources/assets/components/Discover.vue
+++ b/resources/assets/components/Discover.vue
@@ -1,196 +1,14 @@
 <template>
 	<div class="web-wrapper">
-		<div v-if="isLoaded" class="container-fluid mt-3">
+		<div class="container-fluid mt-3">
 			<div class="row">
 				<div class="col-md-4 col-lg-3">
 					<sidebar :user="profile" />
 				</div>
 
-				<div v-if="tab == 'index'" class="col-md-8 col-lg-9 mt-n4">
-					<div v-if="profile.is_admin" class="d-md-flex my-md-3">
-						<grid-card
-							:dark="true"
-							:title="'Hello ' + profile.username"
-							subtitle="Welcome to the new Discover experience! Only admins can see this"
-							button-text="Manage Discover Settings"
-							button-link="/i/web/discover/settings"
-							icon-class="fal fa-cog"
-							:small="true" />
-					</div>
-					<!-- <section class="mb-1 mb-md-3 mb-lg-4">
-						<news-slider />
-					</section> -->
-
-					<!-- <discover-spotlight /> -->
-
-					<!-- <div class="d-md-flex my-md-3">
-						<grid-card
-							:dark="true"
-							title="The Not So Trending"
-							subtitle="Explore the posts that deserve more attention"
-							button-text="Explore posts"
-							icon-class="fal fa-analytics"
-							button-link="/i/web/discover/future-trending"
-							:button-event="true"
-							v-on:btn-click="toggleTab('trending')"
-							:small="true" />
-
-						<grid-card
-							title="Behind The Posts"
-							subtitle="Discover the people"
-							button-text="Discover People"
-							button-link="/i/web/discover/people"
-							icon-class="fal fa-user-friends"
-							:small="true" />
-					</div> -->
-
-					<daily-trending v-on:btn-click="toggleTab('trending')"/>
-
-					<!-- <div class="d-md-flex my-md-3">
-						<grid-card
-							title="Explore Loops"
-							subtitle="Loops are short, looping videos"
-							button-text="Explore Loops"
-							icon-class="fal fa-camcorder"
-							button-link="/i/web/discover/loops"
-							:small="false" />
-
-						<grid-card
-							:dark="true"
-							title="Popular Places"
-							subtitle="Explore posts by popular locations"
-							button-text="Explore Popular Places"
-							icon-class="fal fa-map"
-							:button-event="true"
-							v-on:btn-click="toggleTab('popular-places')"
-							button-link="/i/web/discover/popular-places"
-							:small="false" />
-					</div> -->
-
-					<div class="d-md-flex my-md-3">
-						<grid-card
-							v-if="config.hashtags.enabled"
-							:dark="true"
-							title="My Hashtags"
-							subtitle="Explore posts tagged with hashtags you follow"
-							button-text="Explore Posts"
-							button-link="/i/web/discover/my-hashtags"
-							icon-class="fal fa-hashtag"
-							:small="false" />
-
-						<grid-card
-							v-if="config.memories.enabled"
-							title="My Memories"
-							subtitle="A distant look back"
-							button-text="View Memories"
-							button-link="/i/web/discover/my-memories"
-							icon-class="fal fa-history"
-							:small="false" />
-					</div>
-
-					<div class="d-md-flex my-md-3">
-						<grid-card
-							v-if="config.insights.enabled"
-							title="Account Insights"
-							subtitle="Get a rich overview of your account activity and interactions"
-							button-text="View Account Insights"
-							icon-class="fal fa-user-circle"
-							button-link="/i/web/discover/account-insights"
-							:small="false" />
-
-						<grid-card
-							v-if="config.friends.enabled"
-							:dark="true"
-							title="Find Friends"
-							subtitle="Find accounts to follow based on common interests"
-							button-text="Find Friends & Followers"
-							button-link="/i/web/discover/find-friends"
-							icon-class="fal fa-user-plus"
-							:small="false" />
-					</div>
-
-					<div class="d-md-flex my-md-3">
-						<grid-card
-							v-if="config.server.enabled && config.server.domains && config.server.domains.length"
-							:dark="true"
-							title="Server Timelines"
-							subtitle="Browse timelines of a specific remote instance"
-							button-text="Browse Server Feeds"
-							icon-class="fal fa-list"
-							button-link="/i/web/discover/server-timelines"
-							:small="false" />
-
-						<!-- <grid-card
-							title="Curate the Spotlight"
-							subtitle="Apply to curate the spotlight for one week"
-							button-text="Apply to Curate Spotlight"
-							button-link="/i/web/discover/spotlight/curate/apply"
-							icon-class="fal fa-thumbs-up"
-							:small="false" /> -->
-					</div>
-				</div>
-
-				<div v-else-if="tab == 'trending'" class="col-md-8 col-lg-9 mt-n4">
+				<div class="col-md-8 col-lg-9 mt-n4">
 					<discover :profile="profile" />
 				</div>
-
-				<div v-else-if="tab == 'popular-places'" class="col-md-8 col-lg-9 mt-n4">
-					<section class="mt-3 mb-5 section-explore">
-						<div class="profile-timeline">
-							<div class="row p-0 mt-5">
-								<div class="col-12 mb-4 d-flex justify-content-between align-items-center">
-									<p class="d-block d-md-none h1 font-weight-bold mb-0 font-default">Popular Places</p>
-									<p class="d-none d-md-block display-4 font-weight-bold mb-0 font-default">Popular Places</p>
-								</div>
-							</div>
-						</div>
-
-						<div class="row mt-5">
-							<div class="col-12 col-md-12 mb-3">
-								<div class="card-img big">
-									<img src="/img/places/nyc.jpg">
-									<div class="title font-default">New York City</div>
-								</div>
-							</div>
-
-							<div class="col-12 col-md-6 mb-3">
-								<div class="card-img">
-									<img src="/img/places/edmonton.jpg">
-									<div class="title font-default">Edmonton</div>
-								</div>
-							</div>
-
-							<div class="col-12 col-md-6 mb-3">
-								<div class="card-img">
-									<img src="/img/places/paris.jpg">
-									<div class="title font-default">Paris</div>
-								</div>
-							</div>
-
-							<div class="col-12 col-md-4 mb-3">
-								<div class="card-img">
-									<img src="/img/places/london.jpg">
-									<div class="title font-default">London</div>
-								</div>
-							</div>
-
-							<div class="col-12 col-md-4 mb-3">
-								<div class="card-img">
-									<img src="/img/places/vancouver.jpg">
-									<div class="title font-default">Vancouver</div>
-								</div>
-							</div>
-
-							<div class="col-12 col-md-4 mb-3">
-								<div class="card-img">
-									<img src="/img/places/toronto.jpg">
-									<div class="title font-default">Toronto</div>
-								</div>
-							</div>
-						</div>
-					</section>
-				</div>
-
 			</div>
 
 			<drawer />
@@ -201,205 +19,23 @@
 <script type="text/javascript">
 	import Drawer from './partials/drawer.vue';
 	import Sidebar from './partials/sidebar.vue';
-	import Rightbar from './partials/rightbar.vue';
 	import Discover from './sections/DiscoverFeed.vue';
-	import DiscoverNewsSlider from './partials/discover/news-slider.vue';
-	import DiscoverSpotlight from './partials/discover/discover-spotlight.vue';
-	import DailyTrending from './partials/discover/daily-trending.vue';
-	import DiscoverGridCard from './partials/discover/grid-card.vue';
 
 	export default {
 		 components: {
 		 	"drawer": Drawer,
             "sidebar": Sidebar,
-            "rightbar": Rightbar,
             "discover": Discover,
-            "news-slider": DiscoverNewsSlider,
-            "discover-spotlight": DiscoverSpotlight,
-            "daily-trending": DailyTrending,
-            "grid-card": DiscoverGridCard
         },
 
         data() {
         	return {
-        		isLoaded: false,
         		profile: undefined,
-        		config: {},
-        		tab: 'index',
-        		popularAccounts: [],
-        		followingIndex: undefined
         	}
         },
 
-        updated() {
-			// let u = new URLSearchParams(window.location.search);
-			// if(u.has('ft') && u.get('ft') == '1') {
-			// 	this.tab = 'index';
-			// }
-        },
-
         mounted() {
 			this.profile = window._sharedData.user;
-			this.fetchConfig();
-        },
-
-        methods: {
-			fetchConfig() {
-				axios.get('/api/pixelfed/v2/discover/meta')
-				.then(res => {
-					this.config = res.data;
-					this.isLoaded = true;
-					window._sharedData.discoverMeta = res.data;
-					// this.fetchPopularAccounts();
-				})
-			},
-
-        	fetchPopularAccounts() {
-        		// axios.get('/api/pixelfed/discover/accounts/popular')
-        		// .then(res => {
-        		// 	this.popularAccounts = res.data;
-        		// })
-        	},
-
-        	followProfile(index) {
-        		event.currentTarget.blur();
-        		this.followingIndex = index;
-        		let id = this.popularAccounts[index].id;
-
-        		axios.post('/api/v1/accounts/' + id + '/follow')
-				.then(res => {
-        			this.followingIndex = undefined;
-        			this.popularAccounts.splice(index, 1);
-				}).catch(err => {
-        			this.followingIndex = undefined;
-					swal('Oops!', 'An error occured when attempting to follow this account.', 'error');
-				});
-        	},
-
-        	goToProfile(account) {
-				this.$router.push({
-					path: `/i/web/profile/${account.id}`,
-					params: {
-						id: account.id,
-						cachedProfile: account,
-						cachedUser: this.profile
-					}
-				})
-			},
-
-			toggleTab(index) {
-				this.tab = index;
-				setTimeout(() => {
-					window.scrollTo({top: 0, behavior: 'smooth'});
-				}, 300);
-			},
-
-			openManageModal() {
-				event.currentTarget.blur();
-				swal('Settings', 'Discover settings here', 'info');
-			}
         }
 	}
 </script>
-
-<style lang="scss" scoped>
-	.card-img {
-		position: relative;
-
-		img {
-			object-fit: cover;
-			width: 100%;
-			height: 200px;
-			border-radius: 10px;
-
-		}
-
-		&:before,
-		&:after {
-			content: "";
-			background: rgba(0,0,0,0.2);
-			z-index: 2;
-			width: 100%;
-			height: 100%;
-			position: absolute;
-			left: 0;
-			top: 0;
-			border-radius: 10px;
-		}
-
-		.title {
-			position: absolute;
-			bottom: 5px;
-			left: 10px;
-			font-size: 40px;
-			color: #fff;
-			z-index: 3;
-			font-weight: 700;
-		}
-
-		&.big {
-			img {
-				height: 300px;
-			}
-		}
-	}
-	.font-default {
-		font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif;
-		letter-spacing: -0.7px;
-	}
-
-	.bg-stellar {
-		background: #7474BF;
-		background: -webkit-linear-gradient(to right, #348AC7, #7474BF);
-		background: linear-gradient(to right, #348AC7, #7474BF);
-	}
-
-	.bg-berry {
-		background: #5433FF;
-		background: -webkit-linear-gradient(to right, #acb6e5, #86fde8);
-		background: linear-gradient(to right, #acb6e5, #86fde8);
-	}
-
-	.bg-midnight {
-		background: #232526;
-		background: -webkit-linear-gradient(to right, #414345, #232526);
-		background: linear-gradient(to right, #414345, #232526);
-	}
-
-	.media-body {
-		margin-right: 0.5rem;
-	}
-
-	.avatar {
-		border-radius: 15px;
-	}
-
-	.username {
-		font-size: 14px;
-		line-height: 14px;
-		margin-bottom: 2px;
-		word-break: break-word !important;
-		word-wrap: break-word !important;
-	}
-
-	.display-name {
-		margin-bottom: 0;
-		font-size: 12px;
-		word-break: break-word !important;
-		word-wrap: break-word !important;
-	}
-
-	.follower-count {
-		margin-bottom: 0;
-		font-size: 10px;
-		word-break: break-word !important;
-		word-wrap: break-word !important;
-	}
-
-	.follow {
-		background-color: var(--primary);
-		border-radius: 18px;
-		font-weight: 600;
-		padding: 5px 15px;
-	}
-</style>
diff --git a/resources/assets/components/FullscreenCarousel.vue b/resources/assets/components/FullscreenCarousel.vue
new file mode 100644
index 000000000..1aac449f9
--- /dev/null
+++ b/resources/assets/components/FullscreenCarousel.vue
@@ -0,0 +1,336 @@
+<template>
+  <div class="fullscreen-carousel">
+    <div class="glide" ref="glide">
+      <div class="glide__track" data-glide-el="track">
+        <ul class="glide__slides">
+          <li class="glide__slide" v-for="(item, index) in feed" :key="index">
+            <div class="slide-content">
+              <img :src="item.media_url" :alt="item.caption" class="slide-image" loading="lazy">
+              <div v-if="withOverlay" class="slide-overlay">
+                <p v-if="withLinks" class="slide-username"><a :href="item.account.url">{{ webfinger }}</a></p>
+                <p v-else class="slide-username">{{ webfinger }}</p>
+                <div class="d-flex gap-1">
+                    <div v-if="withLinks" class="slide-date">
+                        <a :href="item.url" target="_blank">{{ formatDate(item.created_at) }}</a>
+                    </div>
+                    <div v-else class="slide-date">{{ formatDate(item.created_at) }}</div>
+                </div>
+              </div>
+            </div>
+          </li>
+        </ul>
+      </div>
+      
+      <div class="glide__arrows" data-glide-el="controls">
+        <button class="glide__arrow glide__arrow--left fancy-arrow" data-glide-dir="<">
+          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+            <polyline points="15 18 9 12 15 6"></polyline>
+          </svg>
+        </button>
+        <button class="glide__arrow glide__arrow--right fancy-arrow" data-glide-dir=">">
+          <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+            <polyline points="9 18 15 12 9 6"></polyline>
+          </svg>
+        </button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Glide from '@glidejs/glide'
+
+export default {
+  props: {
+    feed: {
+      type: Array,
+      required: true
+    },
+    canLoadMore: {
+      type: Boolean,
+      default: false
+    },
+    withLinks: {
+        type: Boolean,
+        default: false
+    },
+    withOverlay: {
+        type: Boolean,
+        default: true
+    },
+    autoPlay: {
+        type: Boolean,
+        default: false
+    },
+    autoPlayInterval: {
+        type: Number,
+        default: () => { return 5000; }
+    }
+  },
+  
+  data() {
+    return {
+      glideInstance: null
+    }
+  },
+  
+  mounted() {
+    this.initGlide()
+  },
+
+  computed: {
+    webfinger: {
+        get() {
+            if(this.feed && this.feed.length) {
+                const account = this.feed[0].account
+                const domain = new URL(account.url).host
+                return `@${account.username}@${domain}`
+            }
+            return ""
+        }
+    }
+  },
+  
+    methods: {
+        initGlide() {
+            this.glideInstance = new Glide(this.$refs.glide, {
+                type: 'carousel',
+                startAt: 0,
+                perView: 1,
+                gap: 0,
+                hoverpause: false,
+                autoplay: this.autoPlay ? this.autoPlayInterval : false,
+                keyboard: true
+            })
+
+            this.glideInstance.on('run.after', this.checkForPagination)
+            this.glideInstance.mount()
+        },
+    
+        checkForPagination() {
+            const currentIndex = this.glideInstance.index
+            if (currentIndex === this.feed.length - 1 && this.canLoadMore) {
+                this.$emit('load-more')
+            }
+        },
+    
+    loadMore() {
+      this.$emit('load-more')
+    },
+
+    formatDate(dateInput, locale = navigator.language) {
+        let date;
+
+        if (typeof dateInput === 'string') {
+            date = new Date(dateInput);
+            if (isNaN(date.getTime())) {
+                throw new Error('Invalid date string. Please provide a valid ISO 8601 format.');
+            }
+        } else if (dateInput instanceof Date) {
+            date = dateInput;
+        } else {
+            throw new Error('Invalid input. Please provide a Date object or an ISO 8601 string.');
+        }
+
+        const options = {
+            year: 'numeric',
+            month: 'long',
+            day: 'numeric',
+            hour: 'numeric',
+            minute: 'numeric',
+            hour12: true
+        };
+
+        return new Intl.DateTimeFormat(locale, options).format(date);
+    },
+    
+    updateGlide() {
+      this.$nextTick(() => {
+        if (this.glideInstance) {
+          this.glideInstance.update()
+        }
+      })
+    }
+  },
+  
+  watch: {
+    feed() {
+      this.updateGlide()
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.fullscreen-carousel {
+  height: 100dvh;
+  width: 100dvw;
+  position: relative;
+  overflow: hidden;
+  z-index: 2;
+  background: #000;
+}
+
+.glide, .glide__track, .glide__slides, .glide__slide {
+  height: 100%;
+}
+
+.slide-content {
+  position: relative;
+  height: 100%;
+  width: 100%;
+}
+
+.slide-image {
+  object-fit: contain;
+  width: 100%;
+  height: 100%;
+}
+
+.slide-overlay {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: rgba(0, 0, 0, 0.5);
+  color: white;
+  padding: 8px 20px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  gap: 1rem;
+}
+
+.gap-1 {
+    gap: 2rem;
+}
+
+.slide-image {
+    .slide-overlay {
+        &:not(:hover) {
+            height: 0;
+            opacity: 0;
+            transform: height 1s ease;
+        }
+    }
+}
+
+.slide-username {
+  margin: 0;
+  user-select: all;
+  font-size: 14px;
+
+  a {
+    color: white;
+    font-weight: 500;
+  }
+}
+
+.slide-caption {
+  margin: 0;
+  font-size: 14px;
+}
+
+.slide-date {
+  margin: 0;
+  font-size: 14px;
+
+    a {
+        color: white;
+        font-weight: bold;
+        text-decoration: none;
+    }
+}
+
+.glide__arrow {
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+  background: rgba(255, 255, 255, 0.5);
+  border: none;
+  font-size: 24px;
+  padding: 10px;
+  cursor: pointer;
+}
+
+.fancy-arrow {
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+  background: rgba(255, 255, 255, 0.2);
+  border: none;
+  border-radius: 50%;
+  width: 50px;
+  height: 50px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  overflow: hidden;
+}
+
+.fancy-arrow:hover {
+  background: rgba(255, 255, 255, 0.4);
+  box-shadow: 0 0 15px rgba(255, 255, 255, 0.5);
+}
+
+.fancy-arrow:focus {
+  outline: none;
+}
+
+.fancy-arrow svg {
+  width: 24px;
+  height: 24px;
+  color: white;
+  transition: all 0.3s ease;
+}
+
+.fancy-arrow:hover svg {
+  transform: scale(1.2);
+}
+
+.glide__arrow--left {
+  left: 20px;
+}
+
+.glide__arrow--right {
+  right: 20px;
+}
+
+@keyframes pulse {
+  0% {
+    transform: translateY(-50%) scale(1);
+  }
+  50% {
+    transform: translateY(-50%) scale(1.05);
+  }
+  100% {
+    transform: translateY(-50%) scale(1);
+  }
+}
+
+.fancy-arrow:active {
+  animation: pulse 0.3s ease-in-out;
+}
+
+@media (max-width: 768px) {
+  .fancy-arrow {
+    width: 40px;
+    height: 40px;
+  }
+
+  .fancy-arrow svg {
+    width: 20px;
+    height: 20px;
+  }
+
+  .glide__arrow--left {
+    left: 10px;
+  }
+
+  .glide__arrow--right {
+    right: 10px;
+  }
+}
+</style>
diff --git a/resources/assets/components/GroupCreate.vue b/resources/assets/components/GroupCreate.vue
new file mode 100644
index 000000000..26c48948b
--- /dev/null
+++ b/resources/assets/components/GroupCreate.vue
@@ -0,0 +1,51 @@
+<template>
+    <div class="group-notifications-component">
+        <div class="row border-bottom m-0 p-0">
+            <sidebar />
+
+            <create-group />
+        </div>
+    </div>
+</template>
+
+<script type="text/javascript">
+    import SidebarComponent from '@/groups/sections/Sidebar.vue';
+    import LoaderComponent from '@/groups/sections/Loader.vue';
+    import CreateGroup from '@/groups/CreateGroup.vue';
+
+    export default {
+        components: {
+            "sidebar": SidebarComponent,
+            "loader": LoaderComponent,
+            "create-group": CreateGroup
+        },
+
+        data() {
+            return {
+                loaded: false,
+                loadTimeout: undefined,
+            }
+        },
+
+        created() {
+            this.loadTimeout = setTimeout(() => {
+                this.loaded = true;
+            }, 1000);
+        },
+
+        beforeUnmount() {
+            clearTimeout(this.loadTimeout);
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .group-notifications-component {
+        font-family: var(--font-family-sans-serif);
+
+        .jumbotron {
+            background-color: #fff;
+            border-radius: 0px;
+        }
+    }
+</style>
diff --git a/resources/assets/components/GroupDiscover.vue b/resources/assets/components/GroupDiscover.vue
new file mode 100644
index 000000000..bfdc537d3
--- /dev/null
+++ b/resources/assets/components/GroupDiscover.vue
@@ -0,0 +1,83 @@
+<template>
+    <div class="group-discover-component">
+        <div class="row border-bottom m-0 p-0">
+            <sidebar />
+
+            <div class="col-12 col-md-9 px-md-0">
+                <loader v-if="!loaded" :loaded="loaded" />
+
+                <template v-else>
+                    <div class="container-fluid">
+                        <div class="py-5">
+                            <h1>Discover</h1>
+                        </div>
+
+                        <div class="popular row">
+                            <group-card
+                                v-for="(popular, idx) in popularGroups"
+                                :key="idx"
+                                :group="popular"
+                            />
+                        </div>
+                    </div>
+                </template>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script type="text/javascript">
+    import SidebarComponent from '@/groups/sections/Sidebar.vue';
+    import LoaderComponent from '@/groups/sections/Loader.vue';
+    import GroupCard from '@/groups/partials/GroupCard.vue';
+
+    export default {
+        components: {
+            "sidebar": SidebarComponent,
+            "loader": LoaderComponent,
+            "group-card": GroupCard
+        },
+
+        data() {
+            return {
+                loaded: false,
+                loadTimeout: undefined,
+                popularGroups: [],
+                newGroups: [],
+            }
+        },
+
+        methods: {
+            fetchPopular() {
+                axios.get('/api/v0/groups/discover/popular')
+                .then(res => this.popularGroups = res.data)
+                .finally(() => this.fetchNewGroups())
+            },
+
+            fetchNewGroups() {
+                axios.get('/api/v0/groups/discover/new')
+                .then(res => this.newGroups = res.data)
+                .finally(() => this.loaded = true)
+            },
+        },
+
+        created() {
+            this.fetchPopular()
+        },
+
+        beforeUnmount() {
+            clearTimeout(this.loadTimeout);
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .group-discover-component {
+        font-family: var(--font-family-sans-serif);
+
+        .jumbotron {
+            background-color: #fff;
+            border-radius: 0px;
+        }
+    }
+</style>
diff --git a/resources/assets/components/GroupFeed.vue b/resources/assets/components/GroupFeed.vue
new file mode 100644
index 000000000..8d752f271
--- /dev/null
+++ b/resources/assets/components/GroupFeed.vue
@@ -0,0 +1,315 @@
+<template>
+    <div class="groups-home-component w-100 h-100">
+        <div v-if="initialLoad" class="row border-bottom m-0 p-0">
+            <sidebar />
+
+                    <self-feed :profile="profile" v-on:switchtab="switchTab" />
+                    <!-- <self-discover v-if="tab == 'discover'" :profile="profile" />
+                    <self-notifications v-if="tab == 'notifications'" :profile="profile" />
+                    <self-invitations v-if="tab == 'invitations'" :profile="profile" />
+                    <self-remote-search v-if="tab == 'remotesearch'" :profile="profile" />
+                    <self-groups v-if="tab == 'mygroups'" :profile="profile" />
+                    <create-group v-if="tab == 'creategroup'" :profile="profile" />
+                    <div v-if="tab == 'gsearch'">
+                        <div class="col-12 px-5">
+                            <div class="my-4">
+                                <p class="h1 font-weight-bold mb-1">Group Search</p>
+                                <p class="lead text-muted mb-0">Search and explore groups.</p>
+                            </div>
+                            <div class="media align-items-center text-lighter">
+                                <i class="far fa-chevron-left fa-lg mr-3"></i>
+                                <div class="media-body">
+                                    <p class="lead mb-0">Use the search bar on the side menu</p>
+                                </div>
+                            </div>
+                        </div>
+                    </div> -->
+
+        </div>
+        <div v-else class="row justify-content-center mt-5">
+            <b-spinner />
+        </div>
+    </div>
+</template>
+
+<script type="text/javascript">
+    import GroupStatus from '@/groups/partials/GroupStatus.vue';
+    import SelfFeed from '@/groups/partials/SelfFeed.vue';
+    import SelfDiscover from '@/groups/partials/SelfDiscover.vue';
+    import SelfGroups from '@/groups/partials/SelfGroups.vue';
+    import SelfNotifications from '@/groups/partials/SelfNotifications.vue';
+    import SelfInvitations from '@/groups/partials/SelfInvitations.vue';
+    import SelfRemoteSearch from '@/groups/partials/SelfRemoteSearch.vue';
+    import CreateGroup from '@/groups/CreateGroup.vue';
+    import SidebarComponent from '@/groups/sections/Sidebar.vue';
+    import Autocomplete from '@trevoreyre/autocomplete-vue'
+    import '@trevoreyre/autocomplete-vue/dist/style.css'
+
+    export default {
+        data() {
+            return {
+                initialLoad: false,
+                config: {},
+                groups: [],
+                profile: {},
+                tab: null,
+                searchQuery: undefined,
+            };
+        },
+
+        components: {
+            'autocomplete-input': Autocomplete,
+            'group-status': GroupStatus,
+            'self-discover': SelfDiscover,
+            'self-groups': SelfGroups,
+            'self-feed': SelfFeed,
+            'self-notifications': SelfNotifications,
+            'self-invitations': SelfInvitations,
+            'self-remote-search': SelfRemoteSearch,
+            "create-group": CreateGroup,
+            "sidebar": SidebarComponent
+        },
+
+        mounted() {
+            this.fetchConfig();
+        },
+
+        methods: {
+            init() {
+                document.querySelectorAll("footer").forEach(e => e.parentNode.removeChild(e));
+                document.querySelectorAll(".mobile-footer-spacer").forEach(e => e.parentNode.removeChild(e));
+                document.querySelectorAll(".mobile-footer").forEach(e => e.parentNode.removeChild(e));
+                // let u = new URLSearchParams(window.location.search);
+                // if(u.has('ct')) {
+                //     if(['mygroups', 'notifications', 'discover', 'remotesearch', 'creategroup', 'gsearch'].includes(u.get('ct'))) {
+                //         if(u.get('ct') == 'creategroup' && this.config.limits.user.create.new == false) {
+                //             this.tab = 'feed';
+                //             history.pushState(null, null, '/groups/feed');
+                //         } else {
+                //             this.tab = u.get('ct');
+                //         }
+                //     } else {
+                //         this.tab = 'feed';
+                //         history.pushState(null, null, '/groups/feed');
+                //     }
+                // } else {
+                //     this.tab = 'feed';
+                // }
+                this.initialLoad = true;
+            },
+
+            fetchConfig() {
+                axios.get('/api/v0/groups/config')
+                .then(res => {
+                    this.config = res.data;
+                    this.fetchProfile();
+                });
+            },
+
+            fetchProfile() {
+                axios.get('/api/pixelfed/v1/accounts/verify_credentials')
+                .then(res => {
+                    this.profile = res.data;
+                    this.init();
+                    window._sharedData.curUser = res.data;
+                    window.App.util.navatar();
+                })
+            },
+
+            fetchSelfGroups() {
+                axios.get('/api/v0/groups/self/list')
+                .then(res => {
+                    this.groups = res.data;
+                });
+            },
+
+            switchTab(tab) {
+                event.currentTarget.blur();
+                window.scrollTo(0,0);
+                this.tab = tab;
+
+                if(tab != 'feed') {
+                    history.pushState(null, null, '/groups/home?ct=' + tab);
+                } else {
+                    history.pushState(null, null, '/groups/home');
+                }
+            },
+
+            autocompleteSearch(input) {
+                if (!input || input.length < 2) {
+                    if(this.tab = 'searchresults') {
+                        this.tab = 'feed';
+                    }
+                    return [];
+                };
+
+                this.searchQuery = input;
+                // this.tab = 'searchresults';
+
+                if(input.startsWith('http')) {
+                    let url = new URL(input);
+                    if(url.hostname == location.hostname) {
+                        location.href = input;
+                        return [];
+                    }
+                    return [];
+                }
+
+                if(input.startsWith('#')) {
+                    this.$bvToast.toast(input, {
+                        title: 'Hashtag detected',
+                        variant: 'info',
+                        autoHideDelay: 5000
+                    });
+                    return [];
+                }
+
+                return axios.post('/api/v0/groups/search/global', {
+                    q: input,
+                    v: '0.2'
+                })
+                .then(res => {
+                    this.searchLoading = false;
+                    return res.data;
+                }).catch(err => {
+
+                    if(err.response.status === 422) {
+                        this.$bvToast.toast(err.response.data.error.message, {
+                            title: 'Cannot display search results',
+                            variant: 'danger',
+                            autoHideDelay: 5000
+                        });
+                    }
+
+                    return [];
+                })
+            },
+
+            getSearchResultValue(result) {
+                return result.name;
+            },
+
+            onSearchSubmit(result) {
+                if (result.length < 1) {
+                    return [];
+                }
+
+                location.href = result.url;
+            },
+
+            truncateName(val) {
+                if(val.length < 24) {
+                    return val;
+                }
+
+                return val.substr(0, 23) + '...';
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+    .groups-home-component {
+        font-family: var(--font-family-sans-serif);
+
+        .group-nav-btn {
+            display: block;
+            width: 100%;
+            padding-left: 0;
+            padding-top: 0.3rem;
+            padding-bottom: 0.3rem;
+            margin-bottom: 0.3rem;
+            border-radius: 1.5rem;
+            text-align: left;
+            color: #6c757d;
+            background-color: transparent;
+            border-color: transparent;
+            justify-content: flex-start;
+
+            &.active {
+                background-color: #EFF6FF !important;
+                border:1px solid #DBEAFE !important;
+                color: #212529;
+
+                .group-nav-btn-icon {
+                    background-color: #2c78bf !important;
+                    color: #fff !important;
+                }
+            }
+
+            &-icon {
+                display: inline-flex;
+                width: 35px;
+                height: 35px;
+                padding: 12px;
+                background-color: #E5E7EB;
+                border-radius: 17px;
+                margin: auto 0.3rem;
+                align-items: center;
+                justify-content: center;
+            }
+
+            &-name {
+                display: inline-block;
+                margin-left: 0.3rem;
+                font-weight: 700;
+            }
+        }
+
+        .autocomplete-input {
+            height: 2.375rem;
+            background-color: #f8f9fa !important;
+            font-size: 0.9rem;
+            color: #495057;
+            border-radius: 50rem;
+            border-color: transparent;
+
+            &:focus,
+            &[aria-expanded=true] {
+                box-shadow: none;
+            }
+        }
+
+        .autocomplete-result {
+            background: none;
+            padding: 12px;
+
+            &:hover,
+            &:focus {
+                background-color: #EFF6FF !important;
+            }
+
+            .media {
+                img {
+                    object-fit: cover;
+                    border-radius: 4px;
+                    margin-right: 0.6rem;
+                }
+
+                .icon-placeholder {
+                    display: flex;
+                    width: 32px;
+                    height: 32px;
+                    background-color: #2c78bf;
+                    border-radius: 4px;
+                    justify-content: center;
+                    align-items: center;
+                    color: #fff;
+                    margin-right: 0.6rem;
+                }
+            }
+        }
+
+        .autocomplete-result-list {
+            padding-bottom: 0;
+        }
+
+        .fade-enter-active, .fade-leave-active {
+            transition: opacity 200ms;
+        }
+
+        .fade-enter, .fade-leave-to {
+            opacity: 0;
+        }
+    }
+</style>
diff --git a/resources/assets/components/GroupJoins.vue b/resources/assets/components/GroupJoins.vue
new file mode 100644
index 000000000..81295f56d
--- /dev/null
+++ b/resources/assets/components/GroupJoins.vue
@@ -0,0 +1,79 @@
+<template>
+    <div class="group-joins-component">
+        <div class="row border-bottom m-0 p-0">
+            <sidebar />
+
+            <div class="col-12 col-md-9 px-0 mx-0">
+                <loader v-if="!loaded" :loaded="loaded" />
+
+                <template v-else>
+                    <div class="px-5 pt-4 pb-2">
+                        <h2 class="fw-bold">My Groups</h2>
+                        <self-groups :profile="profile" />
+                    </div>
+                </template>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script type="text/javascript">
+    import SidebarComponent from '@/groups/sections/Sidebar.vue';
+    import LoaderComponent from '@/groups/sections/Loader.vue';
+    import SelfGroups from '@/groups/partials/SelfGroups.vue';
+
+    export default {
+        components: {
+            "sidebar": SidebarComponent,
+            "loader": LoaderComponent,
+            "self-groups": SelfGroups
+        },
+
+        data() {
+            return {
+                loaded: false,
+                loadTimeout: undefined,
+                config: {},
+                groups: [],
+                profile: {},
+            }
+        },
+
+        methods: {
+            init() {
+                document.querySelectorAll("footer").forEach(e => e.parentNode.removeChild(e));
+                document.querySelectorAll(".mobile-footer-spacer").forEach(e => e.parentNode.removeChild(e));
+                document.querySelectorAll(".mobile-footer").forEach(e => e.parentNode.removeChild(e));
+                this.loaded = true;
+            },
+
+            fetchConfig() {
+                axios.get('/api/v0/groups/config')
+                .then(res => {
+                    this.config = res.data;
+                    this.fetchProfile();
+                });
+            },
+
+            fetchProfile() {
+                axios.get('/api/pixelfed/v1/accounts/verify_credentials')
+                .then(res => {
+                    this.profile = res.data;
+                    this.init();
+                    window._sharedData.curUser = res.data;
+                    window.App.util.navatar();
+                })
+            },
+        },
+
+        created() {
+            this.fetchConfig();
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .group-joins-component {
+        font-family: var(--font-family-sans-serif);
+    }
+</style>
diff --git a/resources/assets/components/GroupNotifications.vue b/resources/assets/components/GroupNotifications.vue
new file mode 100644
index 000000000..69b33f355
--- /dev/null
+++ b/resources/assets/components/GroupNotifications.vue
@@ -0,0 +1,57 @@
+<template>
+    <div class="group-notifications-component">
+        <div class="row border-bottom m-0 p-0">
+            <sidebar />
+
+            <div class="col-12 col-md-9 px-0 mx-0">
+                <loader v-if="!loaded" :loaded="loaded" />
+
+                <template v-else>
+                    <div class="px-5 pt-4 pb-2">
+                        <h2 class="fw-bold">Group Notifications</h2>
+                    </div>
+                </template>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script type="text/javascript">
+    import SidebarComponent from '@/groups/sections/Sidebar.vue';
+    import LoaderComponent from '@/groups/sections/Loader.vue';
+
+    export default {
+        components: {
+            "sidebar": SidebarComponent,
+            "loader": LoaderComponent
+        },
+
+        data() {
+            return {
+                loaded: false,
+                loadTimeout: undefined,
+            }
+        },
+
+        created() {
+            this.loadTimeout = setTimeout(() => {
+                this.loaded = true;
+            }, 1000);
+        },
+
+        beforeUnmount() {
+            clearTimeout(this.loadTimeout);
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .group-notifications-component {
+        font-family: var(--font-family-sans-serif);
+
+        .jumbotron {
+            background-color: #fff;
+            border-radius: 0px;
+        }
+    }
+</style>
diff --git a/resources/assets/components/GroupPage.vue b/resources/assets/components/GroupPage.vue
new file mode 100644
index 000000000..ea9edfdc8
--- /dev/null
+++ b/resources/assets/components/GroupPage.vue
@@ -0,0 +1,1190 @@
+<template>
+    <div class="group-feed-component">
+        <div v-if="!initalLoad">
+            <p class="text-center mt-5 pt-5 font-weight-bold">Loading...</p>
+        </div>
+
+        <template v-else>
+            <div class="row border-bottom m-0 p-0">
+                <sidebar />
+
+                <div class="col-12 col-md-9 px-md-0">
+                    <div class="bg-white mb-3 border-bottom">
+                        <div class="">
+                            <group-banner :group="group" />
+
+                            <div class="col-12 group-feed-component-header px-3 px-md-5">
+                                <div class="media align-items-end">
+                                    <img
+                                        v-if="group.metadata && group.metadata.hasOwnProperty('avatar')"
+                                        :src="group.metadata.avatar.url"
+                                        width="169"
+                                        height="169"
+                                        class="bg-white mx-4 rounded-circle border shadow p-1"
+                                        style="object-fit: cover;"
+                                        :style="{ 'margin-top': group.metadata && group.metadata.hasOwnProperty('header') && group.metadata.header.url ? '-100px' : '0' }">
+
+                                    <div class="media-body">
+                                        <h3 class="d-flex align-items-start">
+                                            <span>{{ group.name.slice(0,118) }}</span>
+                                            <sup v-if="group.verified" class="fa-stack ml-n2" title="Verified Group" data-toggle="tooltip">
+                                                <i class="fas fa-circle fa-stack-1x fa-lg" style="color: #22a7f0cc;font-size:18px"></i>
+                                                <i class="fas fa-check fa-stack-1x text-white" style="font-size:10px"></i>
+                                            </sup>
+                                        </h3>
+                                        <p class="text-muted mb-0" style="font-weight: 300;">
+                                            <span>
+                                                <i class="fas fa-globe mr-1"></i>
+                                                {{ group.membership == 'all' ? 'Public Group' : 'Private Group'}}
+                                            </span>
+                                            <span class="mx-2">
+                                                ·
+                                            </span>
+                                            <span>{{ group.member_count == 1 ? group.member_count + ' Member' : group.member_count + ' Members' }}</span>
+                                            <span class="mx-2">
+                                                ·
+                                            </span>
+                                            <span v-if="group.local" class="rounded member-label">Local</span>
+                                            <span v-else class="rounded remote-label">Remote</span>
+                                            <span v-if="group.self && group.self.hasOwnProperty('role') && group.self.role">
+                                                <span class="mx-2">
+                                                    ·
+                                                </span>
+                                                <span class="rounded member-label">{{ group.self.role }}</span>
+                                            </span>
+                                        </p>
+                                    </div>
+                                </div>
+                                <div>
+                                    <button v-if="!isMember && !group.self.is_requested" class="btn btn-primary cta-btn font-weight-bold" @click="joinGroup" :disabled="requestingMembership">
+                                        <span v-if="!requestingMembership">
+                                            {{ group.membership == 'all' ? 'Join' : 'Request Membership' }}
+                                        </span>
+                                        <div
+                                            v-else
+                                            class="spinner-border spinner-border-sm"
+                                            role="status">
+                                            <span class="sr-only">Loading...</span>
+                                        </div>
+                                    </button>
+
+                                    <button
+                                        v-else-if="!isMember && group.self.is_requested"
+                                        class="btn btn-light border cta-btn font-weight-bold"
+                                        @click.prevent="cancelJoinRequest">
+                                        <i class="fas fa-user-clock mr-1"></i> Requested to Join
+                                    </button>
+
+                                    <button
+                                        v-else-if="!isAdmin && isMember && !group.self.is_requested"
+                                        type="button"
+                                        class="btn btn-light border cta-btn font-weight-bold"
+                                        @click.prevent="leaveGroup">
+                                        <i class="fas sign-out-alt mr-1"></i> Leave Group
+                                    </button>
+
+                                    <!-- <div v-if="isAdmin">
+                                        <a
+                                            class="btn btn-light border cta-btn font-weight-bold"
+                                            :href="group.url + '/settings'">
+                                            Settings
+                                        </a>
+                                    </div> -->
+                                </div>
+                            </div>
+                            <div class="col-12 border-top group-feed-component-menu px-5">
+                                <ul class="nav font-weight-bold group-feed-component-menu-nav">
+                                    <li class="nav-item">
+                                        <a :class="{active: tab == 'about'}" class="nav-link" href="#" @click.prevent="switchTab('about')">About</a>
+                                    </li>
+                                    <li class="nav-item">
+                                        <a :class="{active: tab == 'feed'}" class="nav-link" href="#" @click.prevent="switchTab('feed')">Feed</a>
+                                    </li>
+                                    <li v-if="group.self.is_member" class="nav-item">
+                                        <a :class="{active: tab == 'topics'}" class="nav-link" href="#" @click.prevent="switchTab('topics')">Topics</a>
+                                    </li>
+                                    <li v-if="group.self.is_member" class="nav-item">
+                                        <a :class="{active: tab == 'members'}" class="nav-link" href="#" @click.prevent="switchTab('members')">
+                                            Members
+                                            <span v-if="group.self.is_member && isAdmin && atabs.request_count" class="badge badge-danger rounded-pill ml-2" style="height: 20px;padding:4px 8px;font-size: 11px;">{{atabs.request_count}}</span>
+                                        </a>
+                                    </li>
+                                    <!-- <li v-if="group.self.is_member" class="nav-item">
+                                        <a :class="{active: tab == 'events'}" class="nav-link" href="#" @click.prevent="switchTab('events')">Events</a>
+                                    </li> -->
+                                    <li v-if="group.self.is_member" class="nav-item">
+                                        <a :class="{active: tab == 'media'}" class="nav-link" href="#" @click.prevent="switchTab('media')">Media</a>
+                                    </li>
+                                    <!-- <li v-if="group.self.is_member" class="nav-item">
+                                        <a class="nav-link" href="#">Popular</a>
+                                    </li> -->
+                                    <!-- <li v-if="group.self.is_member" class="nav-item">
+                                        <a :class="{active: tab == 'polls'}" class="nav-link" href="#" @click.prevent="switchTab('polls')">Polls</a>
+                                    </li> -->
+
+                                    <!-- <li v-if="group.self.is_member && isAdmin" class="nav-item">
+                                        <a class="nav-link" href="#">Messages</a>
+                                    </li> -->
+
+                                    <!-- <li v-if="group.self.is_member && isAdmin" class="nav-item">
+                                        <a :class="{active: tab == 'insights'}" class="nav-link" href="#" @click.prevent="switchTab('insights')">Insights</a>
+                                    </li> -->
+                                    <!-- <li v-if="group.self.is_member && isAdmin && group.membership != 'all'" class="nav-item">
+                                        <a :class="{active: tab == 'requests'}" class="nav-link" href="#" @click.prevent="switchTab('requests')">
+                                            <span class="mr-2">
+                                                <i class="far fa-user-plus mr-1"></i>
+                                                Requests
+                                            </span>
+                                            <span v-if="atabs.request_count" class="badge badge-danger rounded-pill" style="height: 20px;padding:4px 8px;font-size: 11px;">{{atabs.request_count}}</span>
+                                            <span v-if="atabs.request_count" class="badge badge-danger rounded-pill" style="height: 20px;padding:4px 8px;font-size: 11px;">99+</span>
+                                        </a>
+                                    </li> -->
+                                    <li v-if="group.self.is_member && isAdmin" class="nav-item">
+                                        <a :class="{active: tab == 'moderation'}" class="nav-link d-flex align-items-top" href="#" @click.prevent="switchTab('moderation')">
+                                            <span class="mr-2">Moderation</span>
+                                            <span v-if="atabs.moderation_count" class="badge badge-danger rounded-pill" style="height: 20px;padding:4px 8px;font-size: 11px;">{{atabs.moderation_count}}</span>
+                                        </a>
+                                    </li>
+                                </ul>
+                                <div>
+                                    <button
+                                        v-if="group.self.is_member"
+                                        class="btn btn-light btn-sm border px-3 rounded-pill mr-2"
+                                        @click="showSearchModal">
+                                        <i class="far fa-search"></i>
+                                    </button>
+                                    <div class="dropdown d-inline">
+                                        <button class="btn btn-light btn-sm border px-3 rounded-pill dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                            <i class="far fa-cog"></i>
+                                        </button>
+                                        <div class="dropdown-menu dropdown-menu-right">
+                                            <a class="dropdown-item" href="#" @click.prevent="copyLink">
+                                                Copy Group Link
+                                            </a>
+
+                                            <a class="dropdown-item" href="#" @click.prevent="showInviteModal">
+                                                Invite friends
+                                            </a>
+
+                                            <a v-if="!isAdmin" class="dropdown-item" href="#" @click.prevent="reportGroup">
+                                                Report Group
+                                            </a>
+
+                                            <a v-if="isAdmin" class="dropdown-item" :href="group.url + '/settings'">
+                                                Settings
+                                            </a>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="container-xl group-feed-component-body">
+                        <keep-alive>
+                            <div v-if="tab == 'feed'" class="row mb-5">
+
+                                <div v-if="!permalinkMode" class="col-12 col-md-7 mt-3">
+                                    <div v-if="group.self.is_member">
+                                        <!-- <div class="card card-body border my-3 shadow-sm rounded-lg">
+                                            <div class="media align-items-center">
+                                                <img :src="profile.avatar" class="rounded-circle border mr-3" width="42px" height="42px">
+                                                <div class="media-body">
+                                                    <div class="reply-form form-group mb-0">
+                                                        <input class="form-control form-control-lg rounded-pill bg-light border-0" placeholder="Write something..." v-model="composeText">
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <p v-if="composeText && composeText.length > 1" class="mb-0">
+                                                <button class="btn btn-primary font-weight-bold float-right mt-3" @click="newPost()">Post</button>
+                                            </p>
+                                        </div> -->
+
+                                        <group-compose
+                                            v-if="initalLoad"
+                                            :profile="profile"
+                                            :group-id="groupId"
+                                            v-on:new-status="pushNewStatus" />
+
+                                        <div v-if="feed.length == 0" class="mt-3">
+                                            <div class="card card-body shadow-none border d-flex align-items-center justify-content-center" style="height: 200px;">
+                                                <p class="font-weight-bold mb-0">No posts yet!</p>
+                                            </div>
+                                        </div>
+
+                                        <div v-else class="group-timeline">
+                                            <p class="font-weight-bold mb-1">Recent Posts</p>
+
+
+                                            <!-- <div class="status-card-component shadow-sm mb-3 rounded-lg">
+                                                <div class="card shadow-none border rounded-0">
+                                                    <div class="card-body pb-0">
+                                                        <div class="media">
+                                                            <img src="https://pixelfed.test/storage/avatars/321493203255693312/5a6nqo.jpg?v=2" width="42px" height="42px" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'" alt="avatar" class="rounded-circle box-shadow mr-2">
+
+                                                            <div class="media-body">
+                                                                <div class="pl-2 d-flex align-items-top">
+                                                                    <div>
+                                                                        <p class="mb-0">
+                                                                            <a href="https://pixelfed.test/dansup" class="username font-weight-bold text-dark text-decoration-none text-break">
+                                                                                dansup
+                                                                            </a>
+                                                                        </p>
+
+                                                                        <p class="mb-0">
+                                                                            <a href="https://pixelfed.test/groups/328821658771132416/329186991407239168" class="font-weight-light text-muted small">13h</a>
+
+                                                                            <span class="text-lighter" style="padding-left: 2px; padding-right: 2px;">·</span>
+
+                                                                            <span class="text-muted small">
+                                                                                <i class="fas fa-globe"></i>
+                                                                            </span>
+                                                                        </p>
+                                                                    </div>
+
+                                                                    <span class="text-right" style="flex-grow: 1;">
+                                                                        <button type="button" class="btn btn-link text-dark py-0">
+                                                                            <span class="fas fa-ellipsis-h text-lighter"></span>
+
+                                                                            <span class="sr-only">Post Menu</span>
+                                                                        </button>
+                                                                    </span>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+
+                                                        <div>
+                                                            <div>
+                                                                <div class="">
+                                                                    <p class="pt-2 text-break" style="font-size: 15px;">
+                                                                        Made some improvements!
+                                                                    </p>
+
+                                                                    <div class="my-3 row px-0 mx-0 card card-body my-0 py-0 border shadow-none">
+                                                                            <img src="https://opengraph.githubassets.com/f66d0f7bf17df4a45382b83c1ffde2f25e3d700f9d87ab8c9ec2029c3a1e16b6/pixelfed/pixelfed/pull/2865" class="img-fluid">
+                                                                        <div class="bg-light px-3 pt-2 pb-3">
+                                                                            <p class="text-muted mb-0 small">GITHUB.COM</p>
+                                                                            <p class="mb-0" style="font-size: 16px;font-weight:500;">Update LikeController, add UndoLikePipeline and federate Undo Like ac… by dansup · Pull Request #2865 · pixelfed/pixelfed</p>
+                                                                            <p class="mb-0 text-muted" style="font-size:14px;line-height:15px;">…tivities</p>
+                                                                        </div>
+                                                                    </div>
+
+                                                                    <div class="border-top my-0">
+                                                                        <div class="d-flex justify-content-between py-2 px-4">
+                                                                            <button class="btn btn-link py-0 text-decoration-none text-muted">
+                                                                                <i class="far fa-heart mr-1"></i>
+                                                                                Like
+                                                                            </button>
+
+                                                                            <div>
+                                                                                <i class="far fa-comment cursor-pointer text-muted mr-1"></i>
+                                                                                Comment
+                                                                            </div>
+
+                                                                            <div>
+                                                                                <i class="fas fa-external-link-alt cursor-pointer text-muted mr-1"></i>
+                                                                                Share
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div> -->
+
+                                            <!-- OGP -->
+                                            <!-- <div class="status-card-component shadow-sm mb-3 rounded-lg">
+                                                <div class="card shadow-none border rounded-0">
+                                                    <div class="card-body pb-0">
+                                                        <div class="media">
+                                                            <img src="https://pixelfed.test/storage/avatars/321493203255693312/5a6nqo.jpg?v=2" width="42px" height="42px" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'" alt="avatar" class="rounded-circle box-shadow mr-2">
+
+                                                            <div class="media-body">
+                                                                <div class="pl-2 d-flex align-items-top">
+                                                                    <div>
+                                                                        <p class="mb-0">
+                                                                            <a href="https://pixelfed.test/dansup" class="username font-weight-bold text-dark text-decoration-none text-break">
+                                                                                dansup
+                                                                            </a>
+                                                                        </p>
+
+                                                                        <p class="mb-0">
+                                                                            <a href="https://pixelfed.test/groups/328821658771132416/329186991407239168" class="font-weight-light text-muted small">13h</a>
+
+                                                                            <span class="text-lighter" style="padding-left: 2px; padding-right: 2px;">·</span>
+
+                                                                            <span class="text-muted small">
+                                                                                <i class="fas fa-globe"></i>
+                                                                            </span>
+                                                                        </p>
+                                                                    </div>
+
+                                                                    <span class="text-right" style="flex-grow: 1;">
+                                                                        <button type="button" class="btn btn-link text-dark py-0">
+                                                                            <span class="fas fa-ellipsis-h text-lighter"></span>
+
+                                                                            <span class="sr-only">Post Menu</span>
+                                                                        </button>
+                                                                    </span>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+
+                                                        <div>
+                                                            <div>
+                                                                <div class="">
+                                                                    <div class="my-3 row px-0 mx-0 card card-body my-0 py-0 border shadow-none">
+                                                                            <img src="https://www.ctvnews.ca/polopoly_fs/1.5533318.1628281952!/httpImage/image.jpg_gen/derivatives/landscape_620/image.jpg" class="img-fluid">
+                                                                        <div class="bg-light px-3 pt-2 pb-3">
+                                                                            <p class="text-muted mb-0 small">CTVNEWS.CA</p>
+                                                                            <p class="mb-0" style="font-size: 16px;font-weight:500;">No charges against Alberta man who fatally shot home intruder: RCMP</p>
+                                                                            <p class="mb-0 text-muted" style="font-size:14px;line-height:15px;">No charges will be laid against an Alberta man who shot and killed an intruder after being beaten with a baseball bat, RCMP announced Friday.</p>
+                                                                        </div>
+                                                                    </div>
+
+                                                                    <div class="border-top my-0">
+                                                                        <div class="d-flex justify-content-between py-2 px-4">
+                                                                            <button class="btn btn-link py-0 text-decoration-none text-muted">
+                                                                                <i class="far fa-heart mr-1"></i>
+                                                                                Like
+                                                                            </button>
+
+                                                                            <div>
+                                                                                <i class="far fa-comment cursor-pointer text-muted mr-1"></i>
+                                                                                Comment
+                                                                            </div>
+
+                                                                            <div>
+                                                                                <i class="fas fa-external-link-alt cursor-pointer text-muted mr-1"></i>
+                                                                                Share
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div> -->
+
+                                            <!-- SOUNDCLOUD -->
+                                            <!-- <div class="status-card-component shadow-sm mb-3 rounded-lg">
+                                                <div class="card shadow-none border rounded-0">
+                                                    <div class="card-body pb-0">
+                                                        <div class="media">
+                                                            <img src="https://pixelfed.test/storage/avatars/321493203255693312/5a6nqo.jpg?v=2" width="42px" height="42px" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'" alt="avatar" class="rounded-circle box-shadow mr-2">
+
+                                                            <div class="media-body">
+                                                                <div class="pl-2 d-flex align-items-top">
+                                                                    <div>
+                                                                        <p class="mb-0">
+                                                                            <a href="https://pixelfed.test/dansup" class="username font-weight-bold text-dark text-decoration-none text-break">
+                                                                                dansup
+                                                                            </a>
+                                                                        </p>
+
+                                                                        <p class="mb-0">
+                                                                            <a href="https://pixelfed.test/groups/328821658771132416/329186991407239168" class="font-weight-light text-muted small">13h</a>
+
+                                                                            <span class="text-lighter" style="padding-left: 2px; padding-right: 2px;">·</span>
+
+                                                                            <span class="text-muted small">
+                                                                                <i class="fas fa-globe"></i>
+                                                                            </span>
+                                                                        </p>
+                                                                    </div>
+
+                                                                    <span class="text-right" style="flex-grow: 1;">
+                                                                        <button type="button" class="btn btn-link text-dark py-0">
+                                                                            <span class="fas fa-ellipsis-h text-lighter"></span>
+
+                                                                            <span class="sr-only">Post Menu</span>
+                                                                        </button>
+                                                                    </span>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+
+                                                        <div>
+                                                            <div>
+                                                                <div class="">
+                                                                    <p class="pt-2 text-break" style="font-size: 15px;">
+                                                                        What does everyone think??
+                                                                    </p>
+
+                                                                    <div class="my-3 row p-0 m-0">
+                                                                        <iframe width="100%" height="166" scrolling="no" frameborder="no" allow="autoplay" src="https://w.soundcloud.com/player/?url=https%3A//api.soundcloud.com/tracks/34019569&color=0066cc"></iframe><div style="font-size: 10px; color: #cccccc;line-break: anywhere;word-break: normal;overflow: hidden;white-space: nowrap;text-overflow: ellipsis; font-family: Interstate,Lucida Grande,Lucida Sans Unicode,Lucida Sans,Garuda,Verdana,Tahoma,sans-serif;font-weight: 100;"><a href="https://soundcloud.com/the-bugle" title="The Bugle" target="_blank" style="color: #cccccc; text-decoration: none;">The Bugle</a> · <a href="https://soundcloud.com/the-bugle/bugle-179-playas-gon-play" title="Bugle 179 - Playas gon play" target="_blank" style="color: #cccccc; text-decoration: none;">Bugle 179 - Playas gon play</a></div>
+                                                                    </div>
+
+                                                                    <div class="border-top my-0">
+                                                                        <div class="d-flex justify-content-between py-2 px-4">
+                                                                            <button class="btn btn-link py-0 text-decoration-none text-muted">
+                                                                                <i class="far fa-heart mr-1"></i>
+                                                                                Like
+                                                                            </button>
+
+                                                                            <div>
+                                                                                <i class="far fa-comment cursor-pointer text-muted mr-1"></i>
+                                                                                Comment
+                                                                            </div>
+
+                                                                            <div>
+                                                                                <i class="fas fa-external-link-alt cursor-pointer text-muted mr-1"></i>
+                                                                                Share
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div> -->
+
+                                            <!-- YOUTUBE -->
+                                            <!-- <div class="status-card-component shadow-sm mb-3 rounded-lg">
+                                                <div class="card shadow-none border rounded-0">
+                                                    <div class="card-body pb-0">
+                                                        <div class="media">
+                                                            <img src="https://pixelfed.test/storage/avatars/321493203255693312/5a6nqo.jpg?v=2" width="42px" height="42px" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'" alt="avatar" class="rounded-circle box-shadow mr-2">
+
+                                                            <div class="media-body">
+                                                                <div class="pl-2 d-flex align-items-top">
+                                                                    <div>
+                                                                        <p class="mb-0">
+                                                                            <a href="https://pixelfed.test/dansup" class="username font-weight-bold text-dark text-decoration-none text-break">
+                                                                                dansup
+                                                                            </a>
+                                                                        </p>
+
+                                                                        <p class="mb-0">
+                                                                            <a href="https://pixelfed.test/groups/328821658771132416/329186991407239168" class="font-weight-light text-muted small">13h</a>
+
+                                                                            <span class="text-lighter" style="padding-left: 2px; padding-right: 2px;">·</span>
+
+                                                                            <span class="text-muted small">
+                                                                                <i class="fas fa-globe"></i>
+                                                                            </span>
+                                                                        </p>
+                                                                    </div>
+
+                                                                    <span class="text-right" style="flex-grow: 1;">
+                                                                        <button type="button" class="btn btn-link text-dark py-0">
+                                                                            <span class="fas fa-ellipsis-h text-lighter"></span>
+
+                                                                            <span class="sr-only">Post Menu</span>
+                                                                        </button>
+                                                                    </span>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+
+                                                        <div>
+                                                            <div>
+                                                                <div class="">
+                                                                    <p class="pt-2 text-break" style="font-size: 15px;">
+                                                                        What does everyone think??
+                                                                    </p>
+
+                                                                    <div class="my-3 row p-0 m-0">
+                                                                        <iframe width="100%" height="315" src="https://www.youtube.com/embed/lH78Tb0r_f8" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+                                                                    </div>
+
+                                                                    <div class="border-top my-0">
+                                                                        <div class="d-flex justify-content-between py-2 px-4">
+                                                                            <button class="btn btn-link py-0 text-decoration-none text-muted">
+                                                                                <i class="far fa-heart mr-1"></i>
+                                                                                Like
+                                                                            </button>
+
+                                                                            <div>
+                                                                                <i class="far fa-comment cursor-pointer text-muted mr-1"></i>
+                                                                                Comment
+                                                                            </div>
+
+                                                                            <div>
+                                                                                <i class="fas fa-external-link-alt cursor-pointer text-muted mr-1"></i>
+                                                                                Share
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div> -->
+
+                                            <!-- PHOTOS -->
+                                            <!-- <div class="status-card-component shadow-sm mb-3 rounded-lg">
+                                                <div class="card shadow-none border rounded-0">
+                                                    <div class="card-body pb-0">
+                                                        <div class="media">
+                                                            <img src="https://pixelfed.test/storage/avatars/321493203255693312/5a6nqo.jpg?v=2" width="42px" height="42px" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'" alt="avatar" class="rounded-circle box-shadow mr-2">
+
+                                                            <div class="media-body">
+                                                                <div class="pl-2 d-flex align-items-top">
+                                                                    <div>
+                                                                        <p class="mb-0">
+                                                                            <a href="https://pixelfed.test/dansup" class="username font-weight-bold text-dark text-decoration-none text-break">
+                                                                                dansup
+                                                                            </a>
+                                                                        </p>
+
+                                                                        <p class="mb-0">
+                                                                            <a href="https://pixelfed.test/groups/328821658771132416/329186991407239168" class="font-weight-light text-muted small">13h</a>
+
+                                                                            <span class="text-lighter" style="padding-left: 2px; padding-right: 2px;">·</span>
+
+                                                                            <span class="text-muted small">
+                                                                                <i class="fas fa-globe"></i>
+                                                                            </span>
+                                                                        </p>
+                                                                    </div>
+
+                                                                    <span class="text-right" style="flex-grow: 1;">
+                                                                        <button type="button" class="btn btn-link text-dark py-0">
+                                                                            <span class="fas fa-ellipsis-h text-lighter"></span>
+
+                                                                            <span class="sr-only">Post Menu</span>
+                                                                        </button>
+                                                                    </span>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+
+                                                        <div>
+                                                            <div>
+                                                                <div class="">
+                                                                    <p class="pt-2 text-break" style="font-size: 15px;">
+                                                                        What does everyone think??
+                                                                    </p>
+
+                                                                    <div class="mb-1 row px-3">
+                                                                        <div class="col px-0">
+                                                                            <img src="https://pixelfed.test/img/sample-post.jpeg" class="img-fluid border rounded-lg">
+                                                                        </div>
+                                                                        <div class="col px-0">
+                                                                            <img src="https://pixelfed.test/img/sample-post.jpeg" class="img-fluid border rounded-lg">
+                                                                        </div>
+                                                                    </div>
+
+                                                                    <div class="mb-3 row px-3">
+                                                                        <div class="col px-0">
+                                                                            <img src="https://pixelfed.test/img/sample-post.jpeg" class="img-fluid border rounded-lg">
+                                                                        </div>
+                                                                        <div class="col px-0">
+                                                                            <img src="https://pixelfed.test/img/sample-post.jpeg" class="img-fluid border rounded-lg">
+                                                                        </div>
+                                                                    </div>
+
+                                                                    <div class="border-top my-0">
+                                                                        <div class="d-flex justify-content-between py-2 px-4">
+                                                                            <button class="btn btn-link py-0 text-decoration-none text-muted">
+                                                                                <i class="far fa-heart mr-1"></i>
+                                                                                Like
+                                                                            </button>
+
+                                                                            <div>
+                                                                                <i class="far fa-comment cursor-pointer text-muted mr-1"></i>
+                                                                                Comment
+                                                                            </div>
+
+                                                                            <div>
+                                                                                <i class="fas fa-external-link-alt cursor-pointer text-muted mr-1"></i>
+                                                                                Share
+                                                                            </div>
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div> -->
+
+                                            <group-status
+                                                v-for="(status, index) in feed"
+                                                :key="'gs:' + status.id + index"
+                                                :prestatus="status"
+                                                :profile="profile"
+                                                :group-id="groupId"
+                                                v-on:comment-focus="commentFocus(index)"
+                                                v-on:status-delete="statusDelete(index)"
+                                                v-on:likes-modal="showLikesModal(index)" />
+
+                                            <b-modal
+                                                ref="likeBox"
+                                                size="sm"
+                                                centered
+                                                hide-footer
+                                                title="Likes"
+                                                body-class="list-group-flush p-0">
+                                                <div class="list-group py-1" style="max-height:300px;overflow-y:auto;">
+                                                    <div
+                                                        class="list-group-item border-top-0 border-left-0 border-right-0 py-2"
+                                                        :class="{ 'border-bottom-0': index + 1 == likes.length }"
+                                                        v-for="(user, index) in likes" :key="'modal_likes_'+index">
+                                                        <div class="media align-items-center">
+                                                            <a :href="user.url">
+                                                                <img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '’s avatar'" width="30px" onerror="this.onerror=null;this.src='/storage/avatars/default.jpg';">
+                                                            </a>
+                                                            <div class="media-body">
+                                                                <p class="mb-0" style="font-size: 14px">
+                                                                    <a :href="user.url" class="font-weight-bold text-dark">
+                                                                        {{user.username}}
+                                                                    </a>
+                                                                </p>
+                                                                <p v-if="!user.local" class="text-muted mb-0 text-truncate mr-3" style="font-size: 14px" :title="user.acct" data-toggle="dropdown" data-placement="bottom">
+                                                                    <span class="font-weight-bold">{{user.acct.split('@')[0]}}</span><span class="text-lighter">&commat;{{user.acct.split('@')[1]}}</span>
+                                                                </p>
+                                                                <p v-else class="text-muted mb-0 text-truncate" style="font-size: 14px">
+                                                                    {{user.display_name}}
+                                                                </p>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <infinite-loading @infinite="infiniteLikesHandler" :distance="800" spinner="spiral">
+                                                        <div slot="no-more"></div>
+                                                        <div slot="no-results"></div>
+                                                    </infinite-loading>
+                                                </div>
+                                            </b-modal>
+
+                                            <div v-if="feed.length > 2" :distance="800">
+                                                <infinite-loading @infinite="infiniteFeed">
+                                                    <div slot="no-more"></div>
+                                                    <div slot="no-results"></div>
+                                                </infinite-loading>
+                                            </div>
+                                        </div>
+                                    </div>
+
+                                    <div v-else>
+                                        <div class="card card-body mt-3 shadow-none border d-flex align-items-center justify-content-center" style="height: 100px;">
+                                            <p class="lead mb-0">Join to participate in this group.</p>
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div v-else class="col-12 col-md-7 mt-3">
+                                    <group-status
+                                        :prestatus="status"
+                                        :profile="profile"
+                                        :group-id="groupId"
+                                        :permalink-mode="true" />
+                                </div>
+
+                                <div class="col-12 col-md-5">
+                                    <group-info-card :group="group" />
+                                </div>
+                            </div>
+
+                            <group-about v-else-if="tab == 'about'" :group="group" />
+
+                            <group-media v-else-if="tab == 'media'" :group="group" />
+
+                            <group-members
+                                v-else-if="tab == 'members'"
+                                :group="group"
+                                :request-count="atabs.request_count"
+                                :is-admin="isAdmin"
+                                :profile="profile"
+                                v-on:decrementrc="decrementJoinRequestCount"
+                                v-on:incrementMemberCount="incrementMemberCount"/>
+
+                            <group-topics v-else-if="tab == 'topics'" :group="group" />
+
+                            <group-insights v-else-if="tab == 'insights'" :group="group" />
+
+                            <group-moderation
+                                v-else-if="tab == 'moderation'"
+                                :group="group"
+                                v-on:decrement="decrementModCounter" />
+
+                            <div v-else>
+                                <p class="lead text-center font-weight-bold mt-5 text-muted">No content found</p>
+                            </div>
+
+                        </keep-alive>
+                        <search-modal ref="searchModal" :group="group" :profile="profile" />
+                        <invite-modal ref="inviteModal" :group="group" :profile="profile" />
+                    </div>
+                </div>
+            </div>
+        </template>
+    </div>
+</template>
+
+<script type="text/javascript">
+    import StatusCard from '~/partials/StatusCard.vue';
+    import GroupMembers from '@/groups/partials/GroupMembers.vue';
+    import GroupCompose from '@/groups/partials/GroupCompose.vue';
+    import GroupStatus from '@/groups/partials/GroupStatus.vue';
+    import GroupAbout from '@/groups/partials/GroupAbout.vue';
+    import GroupMedia from '@/groups/partials/GroupMedia.vue';
+    import GroupModeration from '@/groups/partials/GroupModeration.vue';
+    import GroupTopics from '@/groups/partials/GroupTopics.vue';
+    import GroupInfoCard from '@/groups/partials/GroupInfoCard.vue';
+    import LeaveGroup from '@/groups/partials/LeaveGroup.vue';
+    import GroupInsights from '@/groups/partials/GroupInsights.vue';
+    import SearchModal from '@/groups/partials/GroupSearchModal.vue';
+    import InviteModal from '@/groups/partials/GroupInviteModal.vue';
+    import SidebarComponent from '@/groups/sections/Sidebar.vue';
+    import GroupBanner from '@/groups/partials/Page/GroupBanner.vue';
+
+    export default {
+        props: {
+            groupId: {
+                type: String
+            },
+
+            path: {
+                type: String
+            },
+
+            permalinkMode: {
+                type: Boolean,
+                default: false
+            },
+
+            permalinkId: {
+                type: String,
+            }
+        },
+
+        components: {
+            'status-card': StatusCard,
+            'group-about': GroupAbout,
+            'group-status': GroupStatus,
+            'group-members': GroupMembers,
+            'group-compose': GroupCompose,
+            'group-topics': GroupTopics,
+            'group-info-card': GroupInfoCard,
+            'group-media': GroupMedia,
+            'group-moderation': GroupModeration,
+            'leave-group': LeaveGroup,
+            'group-insights': GroupInsights,
+            'search-modal': SearchModal,
+            'invite-modal': InviteModal,
+            'sidebar': SidebarComponent,
+            'group-banner': GroupBanner
+        },
+
+        data() {
+            return {
+                initalLoad: false,
+                profile: undefined,
+                group: {},
+                isMember: false,
+                isAdmin: false,
+                tab: 'feed',
+                requestingMembership: false,
+                composeText: null,
+                feed: [],
+                ids: [],
+                maxId: null,
+                status: undefined,
+                likes: [],
+                likesPage: 1,
+                likesId: undefined,
+                atabs: {
+                    moderation_count: 0,
+                    request_count: 0
+                }
+            };
+        },
+
+        mounted() {
+            axios.get('/api/pixelfed/v1/accounts/verify_credentials')
+            .then(res => {
+                this.profile = res.data;
+                this.fetchGroup();
+            })
+            .catch(err => {
+                window.location.href = '/login?_next=' + encodeURIComponent(window.location.href);
+            });
+
+            if(this.permalinkMode) {
+                this.fetchPermalink();
+            } else {
+                this.fetchFeed();
+            }
+        },
+
+        methods: {
+            initObservers() {
+                // let video = document.querySelectorAll('video');
+                // let isPaused = false;
+                // let observer = new IntersectionObserver((entries, observer) => {
+                //  entries.forEach(entry => {
+                //      if (entry.intersectionRatio !=1  && !video.paused){
+                //          video.pause();
+                //          isPaused = true;
+                //      }
+                //      else if (isPaused) {
+                //          video.play();
+                //          isPaused = false
+                //      }
+                //  });
+                // }, {threshold: 1});
+                // observer.observe(video);
+            },
+
+            fetchGroup() {
+                axios.get('/api/v0/groups/' + this.groupId)
+                .then(res => {
+                    this.group = res.data;
+                    this.isMember = res.data.self.is_member;
+                    this.isAdmin = ['founder', 'admin'].includes(res.data.self.role);
+
+                    if(this.isAdmin) {
+                        this.fetchAdminTabs();
+                    }
+
+                    if(this.path) {
+                        if(this.isMember && ['about', 'topics', 'members', 'events', 'media', 'polls'].includes(this.path)) {
+                            setTimeout(() => {
+                                this.tab = this.path;
+                                this.initalLoad = true;
+                            }, 500);
+                        } else if (this.isAdmin && ['insights', 'moderation'].includes(this.path)) {
+                            setTimeout(() => {
+                                this.tab = this.path;
+                                this.initalLoad = true;
+                            }, 500);
+                        } else {
+                            history.pushState(null, null, this.group.url);
+                            this.initalLoad = true;
+                        }
+                    } else {
+                        this.initalLoad = true;
+                    }
+                })
+                .catch(err => {
+                    // window.location.href = '/groups/unavailable';
+                });
+            },
+
+            fetchAdminTabs() {
+                axios.get('/api/v0/groups/' + this.groupId + '/atabs')
+                .then(res => {
+                    this.atabs = res.data;
+                })
+            },
+
+            fetchFeed() {
+                axios.get('/api/v0/groups/' + this.groupId + '/feed')
+                .then(res => {
+                    let self = this;
+                    if(res.data && res.data.length) {
+                        this.feed = res.data;
+                        this.maxId = this.feed[this.feed.length - 1].id;
+                        res.data.forEach(d => {
+                            if(self.ids.indexOf(d.id) == -1) {
+                                self.ids.push(d.id);
+                            }
+                        });
+                    }
+                    this.initObservers();
+                })
+            },
+
+            fetchPermalink() {
+                axios.get('/api/v0/groups/status', {
+                    params: {
+                        gid: this.groupId,
+                        sid: this.permalinkId
+                    }
+                }).then(res => {
+                    this.status = res.data;
+                    if(this.status.in_reply_to_id) {
+                        this.status.showCommentDrawer = true;
+                    }
+                }).catch(err => {
+                    this.permalinkMode = false;
+                    this.fetchFeed();
+                });
+            },
+
+            timestampFormat(date, showTime = false) {
+                let ts = new Date(date);
+                return showTime ? ts.toDateString() + ' · ' + ts.toLocaleTimeString() : ts.toDateString();
+            },
+
+            switchTab(tab) {
+                window.scrollTo(0,0);
+                if(tab == 'feed' && this.permalinkMode) {
+                    this.permalinkMode = false;
+                    this.fetchFeed();
+                }
+                let url = tab == 'feed' ? this.group.url : this.group.url + '/' + tab;
+                history.pushState(tab, null, url);
+                this.tab = tab;
+            },
+
+            joinGroup() {
+                this.requestingMembership = true;
+
+                axios.post('/api/v0/groups/'+this.groupId+'/join')
+                .then(res => {
+                    this.requestingMembership = false;
+                    this.group = res.data;
+                    this.fetchGroup();
+                    this.fetchFeed();
+                }).catch(err => {
+                    let body = err.response;
+
+                    if(body.status == 422) {
+                        this.tab = 'feed';
+                        history.pushState('', null, this.group.url);
+                        this.requestingMembership = false;
+                        swal('Oops!', body.data.error, 'error');
+                    }
+                });
+            },
+
+            cancelJoinRequest() {
+                if(!window.confirm('Are you sure you want to cancel your request to join this group?')) {
+                    return;
+                }
+
+                axios.post('/api/v0/groups/'+this.groupId+'/cjr')
+                .then(res => {
+                    this.requestingMembership = false;
+                }).catch(err => {
+                    let body = err.response;
+
+                    if(body.status == 422) {
+                        swal('Oops!', body.data.error, 'error');
+                    }
+                });
+            },
+
+            leaveGroup() {
+                if(!window.confirm('Are you sure you want to leave this group? Any content you shared will remain accessible. You won\'t be able to rejoin for 24 hours.')) {
+                    return;
+                }
+
+                axios.post('/api/v0/groups/'+this.groupId+'/leave')
+                .then(res => {
+                    this.tab = 'feed';
+                    history.pushState('', null, this.group.url);
+                    this.feed = [];
+                    this.isMember = false;
+                    this.isAdmin = false;
+                    this.group.self.role = null;
+                    this.group.self.is_member = false;
+                });
+            },
+
+            pushNewStatus(status) {
+                this.feed.unshift(status);
+            },
+
+            commentFocus(index) {
+                let status = this.feed[index];
+                status.showCommentDrawer = true;
+            },
+
+            statusDelete(index) {
+                this.feed.splice(index, 1);
+            },
+
+            infiniteFeed($state) {
+                if(this.feed.length < 3) {
+                    $state.complete();
+                    return;
+                }
+                let apiUrl = '/api/v0/groups/' + this.groupId + '/feed';
+                axios.get(apiUrl, {
+                    params: {
+                        limit: 6,
+                        max_id: this.maxId
+                    },
+                }).then(res => {
+                    if (res.data.length) {
+                        // let self = this;
+                        // data.forEach(d => {
+                        //  if(self.ids.indexOf(d.id) == -1) {
+                        //      if(self.maxId >= d.id) {
+                        //          self.maxId = d.id;
+                        //      }
+                        //      self.ids.push(d.id);
+                        //      self.feed.push(d);
+                        //  }
+                        // });
+                        let posts = res.data.filter(p => this.ids.indexOf(p.id) == -1);
+                        this.maxId = posts[posts.length - 1].id;
+                        this.feed.push(...posts);
+                        this.ids.push(...posts.map(p => p.id));
+                        setTimeout(() => {
+                            this.initObservers();
+                        }, 1000);
+                        $state.loaded();
+                    } else {
+                        $state.complete();
+                    }
+                });
+            },
+
+            decrementModCounter(amount) {
+                let count = this.atabs.moderation_count;
+                if(count == 0) {
+                    return;
+                }
+                this.atabs.moderation_count = (count - amount);
+            },
+
+            setModCounter(amount) {
+                this.atabs.moderation_count = amount;
+            },
+
+            decrementJoinRequestCount(amount = 1) {
+                let count = this.atabs.request_count;
+                this.atabs.request_count = (count - amount)
+            },
+
+            incrementMemberCount() {
+                let count = this.group.member_count;
+                this.group.member_count = (count + 1);
+            },
+
+            copyLink() {
+                window.App.util.clipboard(this.group.url);
+                this.$bvToast.toast(`Succesfully copied group url to clipboard`, {
+                    title: 'Success',
+                    variant: 'success',
+                    autoHideDelay: 5000
+                });
+            },
+
+            reportGroup() {
+                swal('Report Group', 'Are you sure you want to report this group?')
+                .then(res => {
+                    if(res) {
+                        location.href = `/i/report?id=${this.group.id}&type=group`;
+                    }
+                });
+            },
+
+            showSearchModal() {
+                event.currentTarget.blur();
+                this.$refs.searchModal.open();
+            },
+
+            showInviteModal() {
+                event.currentTarget.blur();
+                this.$refs.inviteModal.open();
+            },
+
+            showLikesModal(index) {
+                this.likesId = this.feed[index].id;
+                axios.get('/api/v0/groups/'+this.groupId+'/likes/'+this.likesId)
+                .then(res => {
+                    this.likes = res.data;
+                    this.likesPage++;
+                    this.$refs.likeBox.show();
+                });
+            },
+
+            infiniteLikesHandler($state) {
+                if(this.likes.length < 3) {
+                    $state.complete();
+                    return;
+                }
+                axios.get('/api/v0/groups/'+this.groupId+'/likes/'+this.likesId, {
+                    params: {
+                        page: this.likesPage,
+                    },
+                }).then(res => {
+                    if (res.data.length > 0) {
+                        this.likes.push(...res.data);
+                        this.likesPage++;
+                        if(res.data.length != 10) {
+                            $state.complete();
+                        } else {
+                            $state.loaded();
+                        }
+                    } else {
+                        $state.complete();
+                    }
+                });
+            },
+        }
+    }
+</script>
+
+<style lang="scss">
+    .group-feed-component {
+        &-header {
+            display: flex;
+            justify-content: space-between;
+            align-items: flex-end;
+            padding: 1rem 0;
+            background-color: #fff;
+
+            .cta-btn {
+                width: 190px;
+            }
+        }
+
+        &-menu {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            padding: 0;
+
+            &-nav {
+                .nav-item {
+                    .nav-link {
+                        padding-top: 1rem;
+                        padding-bottom: 1rem;
+                        color: #6c757d;
+
+                        &.active {
+                            color: #2c78bf;
+                            border-bottom: 2px solid #2c78bf;
+                        }
+                    }
+                }
+
+                &:not(last-child) {
+                    .nav-item {
+                        margin-right: 14px;
+                    }
+                }
+            }
+        }
+
+        &-body {
+            min-height: 40vh;
+        }
+
+        .member-label {
+            padding: 2px 5px;
+            font-size: 12px;
+            color: rgba(75, 119, 190, 1);
+            background:rgba(137, 196, 244, 0.2);
+            border:1px solid rgba(137, 196, 244, 0.3);
+            font-weight:400;
+            text-transform: capitalize;
+        }
+
+        .dropdown-item {
+            font-weight: 600;
+        }
+
+        .remote-label {
+            padding: 2px 5px;
+            font-size: 12px;
+            color: #B45309;
+            background: #FEF3C7;
+            border: 1px solid #FCD34D;
+            font-weight: 400;
+            text-transform: capitalize;
+        }
+    }
+</style>
diff --git a/resources/assets/components/GroupPost.vue b/resources/assets/components/GroupPost.vue
new file mode 100644
index 000000000..8eb5dc9d4
--- /dev/null
+++ b/resources/assets/components/GroupPost.vue
@@ -0,0 +1,33 @@
+<template>
+    <div class="group-status-permalink-component">
+        <div class="row border-bottom m-0 p-0">
+            <sidebar />
+
+            <div class="col-12 col-md-9 px-md-0">
+                <group-feed :group-id="gid" :permalinkMode="true" :permalinkId="sid" />
+            </div>
+        </div>
+    </div>
+</template>
+
+<script type="text/javascript">
+    import GroupFeed from '@/groups/GroupFeed.vue';
+    import SidebarComponent from '@/groups/sections/Sidebar.vue';
+
+    export default {
+        props: {
+            gid: {
+                type: String
+            },
+
+            sid: {
+                type: String
+            }
+        },
+
+        components: {
+            "group-feed": GroupFeed,
+            "sidebar": SidebarComponent
+        }
+    }
+</script>
diff --git a/resources/assets/components/GroupProfile.vue b/resources/assets/components/GroupProfile.vue
new file mode 100644
index 000000000..8affdee26
--- /dev/null
+++ b/resources/assets/components/GroupProfile.vue
@@ -0,0 +1,443 @@
+<template>
+    <div class="group-profile-component w-100 h-100">
+        <div v-if="!loaded" class="w-100 h-100">
+            <div class="d-flex justify-content-center align-items-center mt-5">
+                <div class="spinner-border" role="status">
+                  <span class="sr-only">Loading...</span>
+                </div>
+            </div>
+        </div>
+        <template v-else>
+            <div class="bg-white mb-3 border-bottom">
+                <div class="container-xl header">
+                    <div class="header-jumbotron"></div>
+
+                    <div class="header-profile-card">
+                        <img :src="profile.avatar" class="avatar" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'">
+                        <p class="name">
+                            {{ profile.display_name }}
+                        </p>
+                        <p class="username text-muted">
+                            <span v-if="profile.local">&commat;{{ profile.username }}</span>
+                            <span v-else>{{ profile.acct }}</span>
+
+                            <span v-if="profile.is_admin" class="text-danger ml-1" title="Site administrator" data-toggle="tooltip" data-placement="bottom"><i class="far fa-users-crown"></i></span>
+                        </p>
+                    </div>
+                    <!-- <hr> -->
+                    <div class="header-navbar">
+                        <div></div>
+
+                        <div>
+                            <a
+                                v-if="currentProfile.id === profile.id"
+                                class="btn btn-light font-weight-bold mr-2"
+                                href="/settings/home">
+                                <i class="fas fa-edit mr-1"></i> Edit Profile
+                            </a>
+
+                            <a
+                                v-if="relationship.following"
+                                class="btn btn-primary font-weight-bold mr-2"
+                                :href="profile.url">
+                                <i class="far fa-comment-alt-dots mr-1"></i> Message
+                            </a>
+
+                            <a
+                                v-if="relationship.following"
+                                class="btn btn-light font-weight-bold mr-2"
+                                :href="profile.url">
+                                <i class="fas fa-user-check mr-1"></i> {{ relationship.followed_by ? 'Friends' : 'Following' }}
+                            </a>
+
+                            <a
+                                v-if="!relationship.following"
+                                class="btn btn-light font-weight-bold mr-2"
+                                :href="profile.url">
+                                <i class="fas fa-user mr-1"></i> View Main Profile
+                            </a>
+
+                            <div class="dropdown">
+                                <button class="btn btn-light font-weight-bold dropdown-toggle" type="button" id="amenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                    <i class="fas fa-ellipsis-h"></i>
+                                </button>
+                                <div class="dropdown-menu dropdown-menu-right" aria-labelledby="amenu">
+                                    <a v-if="currentProfile.id != profile.id" class="dropdown-item font-weight-bold" :href="`/i/report?type=user&id=${profile.id}`">Report</a>
+                                    <a v-if="currentProfile.id == profile.id" class="dropdown-item font-weight-bold" href="#">Leave Group</a>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="w-100 h-100 group-profile-feed">
+                <div class="container-xl">
+                    <div class="row">
+                        <div class="col-12 col-md-5">
+                            <div class="card card-body shadow-sm infolet">
+                                <h5 class="font-weight-bold mb-3">Intro</h5>
+                                <div v-if="!profile.local" class="media mb-3 align-items-center">
+                                    <div class="media-icon">
+                                        <i class="far fa-globe" title="User is from a remote server" data-toggle="tooltip" data-placement="bottom"></i>
+                                    </div>
+                                    <div class="media-body">
+                                        Remote member from <strong>{{ profile.acct.split('@')[1] }}</strong>
+                                    </div>
+                                </div>
+                                <!-- <div v-if="profile.note.length" class="media mb-3 align-items-center">
+                                    <i class="far fa-book-user fa-lg text-lighter mr-3" title="User bio" data-toggle="tooltip" data-placement="bottom"></i>
+                                    <div class="media-body">
+                                        <span v-html="profile.note"></span>
+                                    </div>
+                                </div> -->
+                                <div class="media align-items-center">
+                                    <div class="media-icon">
+                                        <i class="fas fa-users" title="User joined group on this date" data-toggle="tooltip" data-placement="bottom"></i>
+                                    </div>
+                                    <div class="media-body">
+                                        {{ roleTitle }} of <strong>{{ group.name }}</strong> since {{ formatJoinedDate(profile.group?.joined) }}
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div v-if="canIntersect" class="card card-body shadow-sm infolet">
+                                <h5 class="font-weight-bold mb-3">Things in Common</h5>
+
+                                <div v-if="commonIntersects.friends.length" class="media mb-3 align-items-center" v-once>
+                                    <div class="media-icon">
+                                        <i class="far fa-user-friends"></i>
+                                    </div>
+                                    <div class="media-body">
+                                        {{ commonIntersects.friends_count }} mutual friend<span v-if="commonIntersects.friends.length > 1">s</span> including
+                                        <span v-for="(friend, index) in commonIntersects.friends"><a :href="friend.url" class="text-dark font-weight-bold">{{ friend.acct }}</a><span v-if="commonIntersects.friends.length > index + 1">, </span><span v-else> </span></span>
+                                        <!-- <a href="#" class="text-dark font-weight-bold">dansup</a>, <a href="#" class="text-dark font-weight-bold">admin</a> and 1 other -->
+                                    </div>
+                                </div>
+
+                                <!-- <div class="media mb-3 align-items-center">
+                                    <div class="media-icon">
+                                        <i class="fas fa-home"></i>
+                                    </div>
+                                    <div class="media-body">
+                                        Lives in <strong>Canada</strong>
+                                    </div>
+                                </div> -->
+
+                                <div v-if="commonIntersects.groups.length" class="media mb-3 align-items-center">
+                                    <div class="media-icon">
+                                        <i class="fas fa-users"></i>
+                                    </div>
+                                    <div class="media-body">
+                                        Also member of <a :href="commonIntersects.groups[0].url" class="text-dark font-weight-bold">{{ commonIntersects.groups[0].name }}</a> and {{ commonIntersects.groups_count }} other groups
+                                    </div>
+                                </div>
+
+                                <div v-if="commonIntersects.topics.length" class="media mb-0 align-items-center">
+                                    <div class="media-icon">
+                                        <i class="far fa-thumbs-up fa-lg text-lighter"></i>
+                                    </div>
+                                    <div class="media-body">
+                                        Also interested in topics containing
+                                        <span v-for="(topic, index) in commonIntersects.topics">
+                                            <span v-if="commonIntersects.topics.length - 1 == index"> and </span><a :href="topic.url" class="font-weight-bold text-dark">#{{ topic.name }}</a><span v-if="commonIntersects.topics.length > index + 2">, </span>
+                                        </span> hashtags
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="col-12 col-md-7">
+                            <div class="card card-body shadow-sm">
+                                <h5 class="font-weight-bold mb-0">Group Posts</h5>
+                            </div>
+
+                            <div v-if="feedEmpty" class="pt-5 text-center">
+                                <h5>No New Posts</h5>
+                                <p>{{ profile.username }} hasn't posted anything yet in <strong>{{ group.name }}</strong>.</p>
+
+                                <a :href="group.url" class="font-weight-bold">Go Back</a>
+                            </div>
+
+                            <div v-if="feedLoaded" class="mt-2">
+                                <group-status
+                                    v-for="(status, index) in feed"
+                                    :key="'gps:' + status.id"
+                                    :permalinkMode="true"
+                                    :showGroupChevron="true"
+                                    :group="group"
+                                    :prestatus="status"
+                                    :profile="profile"
+                                    :group-id="group.id" />
+
+                                <div v-if="feed.length >= 1" :distance="800">
+                                    <infinite-loading @infinite="infiniteFeed">
+                                        <div slot="no-more"></div>
+                                        <div slot="no-results"></div>
+                                    </infinite-loading>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </template>
+    </div>
+</template>
+
+<script type="text/javascript">
+    import GroupStatus from '@/groups/partials/GroupStatus.vue';
+
+    export default {
+        props: {
+            gid: {
+                type: String
+            },
+
+            pid: {
+                type: String
+            }
+        },
+
+        components: {
+            'group-status': GroupStatus
+        },
+
+        data() {
+            return {
+                loaded: false,
+                currentProfile: {},
+                roleTitle: 'Member',
+                group: {},
+                profile: {},
+                relationship: {
+                    following: false,
+                },
+                feed: [],
+                ids: [],
+                feedLoaded: false,
+                feedEmpty: false,
+                page: 1,
+                canIntersect: false,
+                commonIntersects: []
+            }
+        },
+
+        beforeMount() {
+            $('body').css('background-color', '#f0f2f5');
+        },
+
+        mounted() {
+            this.fetchGroup();
+            this.$nextTick(() => {
+                $('[data-toggle="tooltip"]').tooltip();
+            });
+        },
+
+        methods: {
+            fetchGroup() {
+                axios.get('/api/v0/groups/' + this.gid)
+                .then(res => {
+                    this.group = res.data;
+                })
+                .finally(() => {
+                    this.fetchSelfProfile();
+                })
+            },
+
+            fetchSelfProfile() {
+                axios.get('/api/pixelfed/v1/accounts/verify_credentials')
+                .then(res => {
+                    this.currentProfile = res.data;
+                })
+                .catch(err => {
+                    this.$router.push('/groups/' + this.gid)
+                })
+                .finally(() => {
+                    this.fetchProfile();
+                })
+
+                this.$nextTick(() => {
+                    $('[data-toggle="tooltip"]').tooltip();
+                });
+            },
+
+            fetchProfile() {
+                axios.get('/api/v0/groups/accounts/' + this.gid + '/' + this.pid)
+                .then(res => {
+                    this.profile = res.data;
+                    if(res.data.group.role == 'founder') {
+                        this.roleTitle = 'Admin';
+                    }
+                })
+
+                if(window._sharedData.user.id == this.pid) {
+                    this.fetchInitialFeed();
+                    return;
+                }
+
+                axios.get('/api/v1/accounts/relationships?id[]=' + this.pid)
+                .then(res => {
+                    this.relationship = res.data[0];
+                })
+                .finally(() => {
+                    this.fetchInitialFeed();
+                })
+            },
+            fetchInitialFeed() {
+                if(window._sharedData.user && window._sharedData.user.id != this.pid) {
+                    this.fetchCommonIntersections();
+                }
+                axios.get(`/api/v0/groups/${this.gid}/user/${this.pid}/feed`)
+                .then(res => {
+                    this.feed = res.data.filter(s => {
+                        return s.pf_type != 'reply:text' || s.account.id != this.profile.id;
+                    });
+                    this.feedLoaded = true;
+                    this.feedEmpty = this.feed.length == 0;
+                    this.page++;
+                    this.loaded = true;
+                })
+                .catch(err => {
+                    this.$router.push('/groups/' + this.gid);
+                    console.log(err)
+                });
+            },
+
+            infiniteFeed($state) {
+                if(this.feed.length == 0) {
+                    $state.complete();
+                    return;
+                }
+
+                axios.get(`/api/v0/groups/${this.group.id}/user/${this.profile.id}/feed`, {
+                    params: {
+                        page: this.page
+                    },
+                }).then(res => {
+                    if (res.data.length) {
+                        let data = res.data.filter(s => {
+                            return s.pf_type != 'reply:text' || s.account.id != this.profile.id;
+                        });
+                        let self = this;
+                        data.forEach(d => {
+                            if(self.ids.indexOf(d.id) == -1) {
+                                self.ids.push(d.id);
+                                self.feed.push(d);
+                            }
+                        });
+                        $state.loaded();
+                        this.page++;
+                    } else {
+                        $state.complete();
+                    }
+                });
+            },
+
+            fetchCommonIntersections() {
+                axios.get('/api/v0/groups/member/intersect/common', {
+                    params: {
+                        gid: this.gid,
+                        pid: this.pid
+                    }
+                }).then(res => {
+                    this.commonIntersects = res.data;
+                    this.canIntersect = res.data.groups.length || res.data.topics.length;
+                });
+
+            },
+
+            formatJoinedDate(ts) {
+                let date = new Date(ts);
+                let options = { year: 'numeric', month: 'long' };
+                let formatter = new Intl.DateTimeFormat('en-US', options);
+                return formatter.format(date);
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+    .group-profile-component {
+        background-color: #f0f2f5;
+
+        .header {
+            &-jumbotron {
+                background-color: #F3F4F6;
+                height: 320px;
+                border-bottom-left-radius: 20px;
+                border-bottom-right-radius: 20px;
+            }
+
+            &-profile-card {
+                display: flex;
+                flex-direction: column;
+                justify-content: center;
+                align-items: center;
+
+                .avatar {
+                    width: 170px;
+                    height: 170px;
+                    border-radius: 50%;
+                    margin-top: -150px;
+                    margin-bottom: 20px;
+                }
+
+                .name {
+                    font-size: 30px;
+                    line-height: 30px;
+                    font-weight: 700;
+                    text-align: center;
+                    margin-bottom: 6px;
+                }
+
+                .username {
+                    font-size: 16px;
+                    font-weight: 500;
+                    text-align: center;
+                }
+            }
+
+            &-navbar {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                height: 60px;
+                border-top: 1px solid #F3F4F6;
+
+                .dropdown {
+                    display: inline-block;
+
+                    &-toggle:after {
+                        display: none;
+                    }
+                }
+            }
+        }
+
+        .group-profile-feed {
+            min-height: 500px;
+        }
+
+        .infolet {
+            margin-bottom: 1rem;
+
+            .media {
+                &-icon {
+                    display: flex;
+                    justify-content: center;
+                    width: 30px;
+                    margin-right: 10px;
+
+                    i {
+                        font-size: 1.1rem;
+                        color: #D1D5DB !important;
+                    }
+                }
+            }
+        }
+
+        .btn-light {
+            border-color: #F3F4F6;
+        }
+    }
+</style>
diff --git a/resources/assets/components/GroupSearch.vue b/resources/assets/components/GroupSearch.vue
new file mode 100644
index 000000000..e23a75112
--- /dev/null
+++ b/resources/assets/components/GroupSearch.vue
@@ -0,0 +1,91 @@
+<template>
+    <div class="groups-home-component w-100 h-100">
+        <div v-if="initialLoad" class="row border-bottom m-0 p-0">
+            <sidebar />
+
+            <div class="col-12 col-md-10">
+                <self-notifications :profile="profile" />
+            </div>
+        </div>
+        <div v-else class="row justify-content-center mt-5">
+            <b-spinner />
+        </div>
+    </div>
+</template>
+
+<script type="text/javascript">
+    import GroupStatus from '@/groups/partials/GroupStatus.vue';
+    import SelfFeed from '@/groups/partials/SelfFeed.vue';
+    import SelfDiscover from '@/groups/partials/SelfDiscover.vue';
+    import SelfGroups from '@/groups/partials/SelfGroups.vue';
+    import SelfNotifications from '@/groups/partials/SelfNotifications.vue';
+    import SelfInvitations from '@/groups/partials/SelfInvitations.vue';
+    import SelfRemoteSearch from '@/groups/partials/SelfRemoteSearch.vue';
+    import CreateGroup from '@/groups/CreateGroup.vue';
+    import SidebarComponent from '@/groups/sections/Sidebar.vue';
+    import Autocomplete from '@trevoreyre/autocomplete-vue'
+    import '@trevoreyre/autocomplete-vue/dist/style.css'
+
+    export default {
+        data() {
+            return {
+                initialLoad: false,
+                config: {},
+                groups: [],
+                profile: {},
+                tab: null,
+                searchQuery: undefined,
+            };
+        },
+
+        components: {
+            'autocomplete-input': Autocomplete,
+            'group-status': GroupStatus,
+            'self-discover': SelfDiscover,
+            'self-groups': SelfGroups,
+            'self-feed': SelfFeed,
+            'self-notifications': SelfNotifications,
+            'self-invitations': SelfInvitations,
+            'self-remote-search': SelfRemoteSearch,
+            "create-group": CreateGroup,
+            "sidebar": SidebarComponent
+        },
+
+        mounted() {
+            this.fetchConfig();
+        },
+
+        methods: {
+            init() {
+                document.querySelectorAll("footer").forEach(e => e.parentNode.removeChild(e));
+                document.querySelectorAll(".mobile-footer-spacer").forEach(e => e.parentNode.removeChild(e));
+                document.querySelectorAll(".mobile-footer").forEach(e => e.parentNode.removeChild(e));
+                this.initialLoad = true;
+            },
+
+            fetchConfig() {
+                axios.get('/api/v0/groups/config')
+                .then(res => {
+                    this.config = res.data;
+                    this.fetchProfile();
+                });
+            },
+
+            fetchProfile() {
+                axios.get('/api/pixelfed/v1/accounts/verify_credentials')
+                .then(res => {
+                    this.profile = res.data;
+                    this.init();
+                    window._sharedData.curUser = res.data;
+                    window.App.util.navatar();
+                })
+            },
+        }
+    }
+</script>
+
+<style lang="scss">
+    .groups-home-component {
+        font-family: var(--font-family-sans-serif);
+    }
+</style>
diff --git a/resources/assets/components/Groups.vue b/resources/assets/components/Groups.vue
new file mode 100644
index 000000000..af0dc2e61
--- /dev/null
+++ b/resources/assets/components/Groups.vue
@@ -0,0 +1,80 @@
+<template>
+    <div class="group-component">
+        <div v-if="tab === 'home'">
+            <groups-home />
+        </div>
+
+        <div v-if="tab === 'createGroup'">
+            <!-- <div class="col-12 group-component-hero">
+                <h3 class="font-weight-bold">Create Group</h3>
+                <button class="btn btn-outline-primary px-3 rounded-pill font-weight-bold" @click="switchTab('home')">Back to Groups</button>
+            </div> -->
+
+            <create-group />
+        </div>
+
+        <div v-if="tab === 'show'">
+            <group-feed :group-id="groupId" :path="path" />
+        </div>
+    </div>
+</template>
+
+<script type="text/javascript">
+    import GroupsHome from '@/groups/GroupsHome.vue';
+    import GroupFeed from '@/groups/GroupFeed.vue';
+    import CreateGroup from '@/groups/CreateGroup.vue';
+
+    export default {
+        props: {
+            groupId: {
+                type: String
+            },
+
+            path: {
+                type: String
+            }
+        },
+
+        data() {
+            return {
+                tab: 'home'
+            }
+        },
+
+        components: {
+            "groups-home": GroupsHome,
+            "create-group": CreateGroup,
+            "group-feed": GroupFeed,
+        },
+
+        mounted() {
+            if(this.groupId) {
+                this.tab = 'show';
+            }
+        },
+
+        methods: {
+            switchTab(newTab) {
+                this.tab = newTab;
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+    .group-component {
+        &-hero {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            padding: 1rem;
+            border: 1px solid #dee2e6;
+            border-top: 0;
+            background-color: #fff;
+
+            h3 {
+                margin-bottom: 0;
+            }
+        }
+    }
+</style>
diff --git a/resources/assets/components/Hashtag.vue b/resources/assets/components/Hashtag.vue
index e2ac77681..01094a85b 100644
--- a/resources/assets/components/Hashtag.vue
+++ b/resources/assets/components/Hashtag.vue
@@ -202,16 +202,12 @@
 					if(res.data && res.data.length) {
 						this.feed = res.data;
 						this.maxId = res.data[res.data.length - 1].id;
-						return true;
+					    this.canLoadMore = true;
 					} else {
 						this.feedLoaded = true;
 						this.isLoaded = true;
-						return false;
 					}
 				})
-				.then(res => {
-					this.canLoadMore = res;
-				})
 				.finally(() => {
 					this.feedLoaded = true;
 					this.isLoaded = true;
@@ -242,14 +238,11 @@
 					if(res.data && res.data.length) {
 						this.feed.push(...res.data);
 						this.maxId = res.data[res.data.length - 1].id;
-						return true;
+                        this.canLoadMore = true;
 					} else {
-						return false;
+                        this.canLoadMore = false;
 					}
 				})
-				.then(res => {
-					this.canLoadMore = res;
-				})
 				.finally(() => {
 					this.isIntersecting = false;
 				})
diff --git a/resources/assets/components/Home.vue b/resources/assets/components/Home.vue
index c75ed0a13..dac188281 100644
--- a/resources/assets/components/Home.vue
+++ b/resources/assets/components/Home.vue
@@ -9,6 +9,48 @@
                 </div>
 
                 <div class="col-md-8 col-lg-6 px-0">
+                    <template v-if="showUpdateWarning && updateInfo && updateInfo.hasOwnProperty('running_latest')">
+                        <div class="card rounded-lg mb-4 ft-std" style="background: #e11d48;border: 3px dashed #fff">
+                            <div class="card-body">
+                                <div class="d-flex justify-content-between align-items-center flex-column flex-lg-row" style="gap:1rem">
+                                    <div class="d-flex justify-content-between align-items-center" style="gap:1rem">
+                                        <i class="d-none d-sm-block far fa-exclamation-triangle fa-5x text-white"></i>
+
+                                        <div>
+                                            <h1 class="h3 font-weight-bold text-light mb-0">New Update Available</h1>
+                                            <p class="mb-0 text-white" style="font-size:18px;">Update your Pixelfed server as soon as possible!</p>
+                                            <p class="mb-n1 text-white small" style="opacity:.7">Once you update, this message will disappear.</p>
+                                            <p class="mb-0 text-white small d-flex" style="opacity:.5;gap:1rem;">
+                                                <span>Current version: <strong>{{ updateInfo?.current ?? 'Unknown' }}</strong></span>
+                                                <span>Latest version: <strong>{{ updateInfo?.latest?.version ?? 'Unknown' }}</strong></span>
+                                            </p>
+                                        </div>
+                                    </div>
+
+                                    <a v-if="updateInfo.latest.url" class="btn btn-light font-weight-bold" :href="updateInfo.latest.url" target="_blank">View Update</a>
+                                </div>
+                            </div>
+                        </div>
+                    </template>
+                    <template v-if="showUpdateConnectionWarning">
+                        <div class="card rounded-lg mb-4 ft-std" style="background: #e11d48;border: 3px dashed #fff">
+                            <div class="card-body">
+                                <div class="d-flex justify-content-between align-items-center flex-column flex-lg-row" style="gap:1rem">
+                                    <div class="d-flex justify-content-between align-items-center" style="gap:1rem">
+                                        <i class="d-none d-sm-block far fa-exclamation-triangle fa-5x text-white"></i>
+
+                                        <div>
+                                            <h1 class="h3 font-weight-bold text-light mb-1">Software Update Check Failed</h1>
+                                            <p class="mb-1 text-white" style="font-size:18px;line-height: 1.2;">We attempted to check if there is a new version available, however we encountered an error. <a href="https://github.com/pixelfed/pixelfed/releases" class="text-white font-weight-bold" style="text-decoration: underline;" target="_blank">Click here</a> to view the latest releases.</p>
+                                            <p class="mb-0 text-white small">You can set <code class="text-white">INSTANCE_SOFTWARE_UPDATE_DISABLE_FAILED_WARNING=true</code> to remove this warning.</p>
+                                            <p class="mb-0 text-white small" style="opacity:.7">Current version: {{ updateInfo?.current ?? 'Unknown' }}</p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </template>
+
                     <story-carousel
                         v-if="storiesEnabled"
                         :profile="profile" />
@@ -59,7 +101,6 @@
             "rightbar": Rightbar,
             "story-carousel": StoryCarousel,
         },
-
         data() {
             return {
                 isLoaded: false,
@@ -67,7 +108,10 @@
                 recommended: [],
                 trending: [],
                 storiesEnabled: false,
-                shouldRefresh: false
+                shouldRefresh: false,
+                showUpdateWarning: false,
+                showUpdateConnectionWarning: false,
+                updateInfo: undefined,
             }
         },
 
@@ -84,10 +128,33 @@
                 this.profile = window._sharedData.user;
                 this.isLoaded = true;
                 this.storiesEnabled = window.App?.config?.features?.hasOwnProperty('stories') ? window.App.config.features.stories : false;
+
+                if(this.profile.is_admin) {
+                    this.softwareUpdateCheck();
+                }
             },
 
             updateProfile(delta) {
                 this.profile = Object.assign(this.profile, delta);
+            },
+
+            softwareUpdateCheck() {
+                axios.get('/api/web-admin/software-update/check')
+                .then(res => {
+                    if(!res || !res.data || !res.data.hasOwnProperty('running_latest') || res.data.running_latest) {
+                        return;
+                    }
+                    if(res.data.running_latest === null) {
+                        this.updateInfo = res.data;
+                        this.showUpdateConnectionWarning = true;
+                        return;
+                    }
+                    this.updateInfo = res.data;
+                    this.showUpdateWarning = !res.data.running_latest;
+                })
+                .catch(err => {
+                    this.showUpdateConnectionWarning = true;
+                })
             }
         }
     }
diff --git a/resources/assets/components/Post.vue b/resources/assets/components/Post.vue
index 6b3361351..3af231d71 100644
--- a/resources/assets/components/Post.vue
+++ b/resources/assets/components/Post.vue
@@ -171,7 +171,7 @@
 			}
 		},
 
-		beforeMount() {
+		created() {
 			this.init();
 		},
 
@@ -181,20 +181,7 @@
 
 		methods: {
 			init() {
-				if(this.cachedStatus && this.cachedProfile) {
-					this.post = this.cachedStatus;
-					this.media = this.post.media_attachments;
-					this.profile = this.post.account;
-					this.user = this.cachedProfile;
-					if(this.post.in_reply_to_id) {
-						this.fetchReply();
-					} else {
-						this.isReply = false;
-						this.fetchRelationship();
-					}
-				} else {
-					this.fetchSelf();
-				}
+				this.fetchSelf();
 			},
 
 			fetchSelf() {
diff --git a/resources/assets/components/Profile.vue b/resources/assets/components/Profile.vue
index 1dc90d0ba..f526109e4 100644
--- a/resources/assets/components/Profile.vue
+++ b/resources/assets/components/Profile.vue
@@ -1,7 +1,40 @@
 <template>
     <div class="profile-timeline-component">
         <div v-if="isLoaded" class="container-fluid mt-3">
-            <div class="row">
+            <div v-if="profile && profile.hasOwnProperty('moved') && profile.moved.hasOwnProperty('id') && !showMoved">
+                <div class="row justify-content-center">
+                    <div class="col-12 col-md-6">
+                        <div class="card shadow-none border card-body mt-5 mb-3 ft-std" style="border-radius: 20px;">
+                            <p class="lead font-weight-bold text-center mb-0"><i class="far fa-exclamation-triangle mr-2"></i>This account has indicated their new account is:</p>
+                        </div>
+                        <div class="card shadow-none border" style="border-radius: 20px;">
+                            <div class="card-body ft-std">
+                                <div class="d-flex justify-content-between align-items-center" style="gap: 1rem;">
+                                    <div class="d-flex align-items-center flex-shrink-1" style="gap: 1rem;">
+                                        <img :src="profile.moved.avatar" width="50" height="50" class="rounded-circle">
+                                        <p class="h3 font-weight-light mb-0 text-break">&commat;{{ profile.moved.acct }}</p>
+                                    </div>
+
+                                    <div class="d-flex flex-grow-1 justify-content-end" style="min-width: 200px;">
+                                        <router-link
+                                            :to="`/i/web/profile/${profile.moved.id}`"
+                                            class="btn btn-outline-primary rounded-pill font-weight-bold"
+                                            >View New Account</router-link>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <hr>
+                        <p class="lead text-center ft-std">
+                            <a
+                                href="#"
+                                class="btn btn-primary btn-lg rounded-pill font-weight-bold px-5"
+                                @click.prevent="showMoved = true">Proceed</a>
+                        </p>
+                    </div>
+                </div>
+            </div>
+            <div v-else class="row">
                 <div class="col-md-3 d-md-block px-md-3 px-xl-5">
                     <profile-sidebar
                         :profile="profile"
@@ -72,7 +105,8 @@
                 curUser: undefined,
                 tab: "index",
                 profile: undefined,
-                relationship: undefined
+                relationship: undefined,
+                showMoved: false,
             }
         },
 
diff --git a/resources/assets/components/ProfileCarousel.vue b/resources/assets/components/ProfileCarousel.vue
new file mode 100644
index 000000000..fa27f174e
--- /dev/null
+++ b/resources/assets/components/ProfileCarousel.vue
@@ -0,0 +1,197 @@
+<template>
+    <div class="profile-carousel-component">
+        <template v-if="showSplash">
+            <SplashScreen />
+        </template>
+
+        <template v-else>
+            <template v-if="emptyFeed">
+                <div class="bg-dark d-flex justify-content-center align-items-center w-100 h-100">
+                    <div>
+                        <h2 class="text-light">Oops! This account hasn't posted yet or is private.</h2>
+                        <a href="/" class="font-weight-bold text-muted">Go back home</a>
+                    </div>
+                </div>
+            </template>
+
+            <template v-else>
+                <FullscreenCarousel
+                    :feed="feed"
+                    :withLinks="withLinks"
+                    :withOverlay="withOverlay"
+                    :autoPlay="autoPlay"
+                    :autoPlayInterval="autoPlayInterval"
+                    :canLoadMore="hasMoreData"
+                    @load-more="loadMoreData"
+                  />
+            </template>
+        </template>
+    </div>
+</template>
+
+<script>
+    import SplashScreen from './SplashScreen.vue';
+    import FullscreenCarousel from './FullscreenCarousel.vue'
+
+    export default {
+        props: ['profile-id'],
+
+        components: {
+            SplashScreen,
+            FullscreenCarousel
+        },
+
+        data() {
+            return {
+                showSplash: true,
+                profile: {},
+                feed: [],
+                emptyFeed: false,
+                hasMoreData: false,
+                withLinks: true,
+                withOverlay: true,
+                autoPlay: false,
+                autoPlayInterval: 5000,
+                maxId: null
+            }
+        },
+
+        mounted() {
+            const url = new URL(window.location.href);
+            const params = url.searchParams;
+            if(params.has('linkless') == true) {
+                this.withLinks = false;
+            }
+
+            if(params.has('clean') == true) {
+                this.withOverlay = false;
+            }
+
+            if(params.has('interval') == true) {
+                const val = parseInt(params.get('interval'));
+                const valid = this.validateIntegerRange(val, { min: 1000, max: 30000 })
+                if(valid) {
+                    this.autoPlayInterval = val;
+                }
+            }
+
+            if(params.has('autoplay') == true) {
+                this.autoPlay = true;
+
+            }
+            this.init();
+        },
+
+        methods: {
+            async init() {
+                await axios.get(`/api/pixelfed/v1/accounts/${this.profileId}/statuses?media_type=photo&limit=10`)
+                .then(res => {
+                    if(!res || !res.data || !res.data.length) {
+                        this.emptyFeed = true;
+                        return;
+                    }
+
+                    this.maxId = this.arrayMinId(res.data);
+                    const posts = res.data.flatMap(post =>
+                      post.media_attachments.filter(media => {
+                        return ['image/jpeg','image/png', 'image/jpg', 'image/webp'].includes(media.mime)
+                      }).map(media => ({
+                        media_url: media.url,
+                        id: post.id,
+                        caption: post.content_text,
+                        created_at: post.created_at,
+                        url: post.url,
+                        account: {
+                            username: post.account.username,
+                            url: post.account.url
+                        }
+                      }))
+                    );
+                    this.feed = posts;
+                    this.hasMoreData = res.data.length === 10;
+                    setTimeout(() => {
+                        this.showSplash = false;
+                    }, 3000);
+                })
+            },
+
+            async fetchMore() {
+                await axios.get(`/api/pixelfed/v1/accounts/${this.profileId}/statuses?media_type=photo&limit=10&max_id=${this.maxId}`)
+                .then(res => {
+                    this.maxId = this.arrayMinId(res.data);
+                    const posts = res.data.flatMap(post =>
+                      post.media_attachments.filter(media => {
+                        return ['image/jpeg','image/png', 'image/jpg', 'image/webp'].includes(media.mime)
+                      }).map(media => ({
+                        media_url: media.url,
+                        id: post.id,
+                        caption: post.content_text,
+                        created_at: post.created_at,
+                        url: post.url,
+                        account: {
+                            username: post.account.username,
+                            url: post.account.url
+                        }
+                      }))
+                    );
+                    this.feed.push(...posts);
+                    this.hasMoreData = res.data.length === 10;
+                })
+            },
+
+            arrayMinId(arr) {
+                if (arr.length === 0) return null;
+                let smallest = BigInt(arr[0].id);
+                for (let i = 1; i < arr.length; i++) {
+                    const current = BigInt(arr[i].id);
+                    if (current < smallest) {
+                        smallest = current;
+                    }
+                }
+                return smallest.toString();
+            },
+
+            loadMoreData() {
+                this.fetchMore();
+            },
+
+            validateIntegerRange(value, options = {}) {
+                if (typeof value !== 'number' || !Number.isInteger(value)) {
+                    return false;
+                }
+
+                const {
+                    min = Number.MIN_SAFE_INTEGER,
+                    max = Number.MAX_SAFE_INTEGER,
+                    inclusiveMin = true,
+                    inclusiveMax = true
+                } = options;
+
+                if (min !== undefined && !Number.isInteger(min)) {
+                    return false;
+                }
+                if (max !== undefined && !Number.isInteger(max)) {
+                    return false;
+                }
+                if (min > max) {
+                    return false;
+                }
+
+                const aboveMin = inclusiveMin ? value >= min : value > min;
+                const belowMax = inclusiveMax ? value <= max : value < max;
+
+                return aboveMin && belowMax;
+            }
+        }
+    }
+</script>
+
+<style type="text/css">
+    .profile-carousel-component {
+        display: block;
+        width: 100dvw;
+        height: 100dvh;
+        z-index: 2;
+        background: #000;
+    }
+</style>
diff --git a/resources/assets/components/SplashScreen.vue b/resources/assets/components/SplashScreen.vue
new file mode 100644
index 000000000..3088949b2
--- /dev/null
+++ b/resources/assets/components/SplashScreen.vue
@@ -0,0 +1,46 @@
+<template>
+  <div class="splash-screen" :class="{ 'fade-out': fadeOut }">
+    <img src="/img/pixelfed-icon-white.svg" alt="Pixelfed Logo" class="logo">
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      fadeOut: false
+    }
+  },
+  mounted() {
+    setTimeout(() => {
+      this.fadeOut = true
+    }, 2000)
+  }
+}
+</script>
+
+<style scoped>
+.splash-screen {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: black;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 9999;
+  transition: opacity 1s ease-out;
+}
+
+.logo {
+  max-width: 200px;
+  max-height: 200px;
+}
+
+.fade-out {
+  opacity: 0;
+  pointer-events: none;
+}
+</style>
diff --git a/resources/assets/components/admin/AdminDirectory.vue b/resources/assets/components/admin/AdminDirectory.vue
index 0676b4057..53eade198 100644
--- a/resources/assets/components/admin/AdminDirectory.vue
+++ b/resources/assets/components/admin/AdminDirectory.vue
@@ -109,12 +109,20 @@
                                             <div class="card text-left">
                                                 <div class="list-group list-group-flush">
                                                     <div class="list-group-item">
-                                                        <i
-                                                            class="far"
-                                                            :class="[ requirements.open_registration ? 'fa-check-circle text-success' : 'fa-exclamation-circle text-danger']"></i>
-                                                        <span class="ml-2 font-weight-bold">
-                                                            {{ requirements.open_registration ? 'Open' : 'Closed' }} account registration
-                                                        </span>
+                                                        <template v-if="requirements.curated_onboarding === true">
+                                                            <i class="far fa-exclamation-circle text-success"></i>
+                                                            <span class="ml-2 font-weight-bold">
+                                                                Curated account registration
+                                                            </span>
+                                                        </template>
+                                                        <template v-else>
+                                                            <i
+                                                                class="far"
+                                                                :class="[ requirements.open_registration ? 'fa-check-circle text-success' : 'fa-exclamation-circle text-danger']"></i>
+                                                            <span class="ml-2 font-weight-bold">
+                                                                {{ requirements.open_registration ? 'Open' : 'Closed' }} account registration
+                                                            </span>
+                                                        </template>
                                                     </div>
 
                                                     <div class="list-group-item">
@@ -895,6 +903,7 @@
                     activitypub_enabled: undefined,
                     open_registration: undefined,
                     oauth_enabled: undefined,
+                    curated_onboarding: undefined,
                 },
                 feature_config: [],
                 requirements_validator: [],
@@ -951,6 +960,10 @@
                         this.requirements.open_registration = res.data.open_registration;
                     }
 
+                    if(res.data.curated_onboarding) {
+                        this.requirements.curated_onboarding = res.data.curated_onboarding;
+                    }
+
                     if(res.data.oauth_enabled) {
                         this.requirements.oauth_enabled = res.data.oauth_enabled;
                     }
diff --git a/resources/assets/components/admin/AdminInstances.vue b/resources/assets/components/admin/AdminInstances.vue
index e1c242d14..b0ecc098b 100644
--- a/resources/assets/components/admin/AdminInstances.vue
+++ b/resources/assets/components/admin/AdminInstances.vue
@@ -251,10 +251,11 @@
 			</div>
 		  <div>
 			  <b-button
-				variant="secondary"
-				@click="showInstanceModal = false"
+				variant="link-dark"
+                size="sm"
+				@click="onViewMoreInstance"
 			  >
-				Close
+				View More
 			  </b-button>
 			  <b-button
 				variant="primary"
@@ -885,8 +886,12 @@
 						};
 					}
 				}
-			}
+			},
 
+            onViewMoreInstance() {
+                this.showInstanceModal = false;
+                window.location.href = '/i/admin/instances/show/' + this.instanceModal.id
+            }
 		}
 	}
 </script>
diff --git a/resources/assets/components/admin/AdminReports.vue b/resources/assets/components/admin/AdminReports.vue
index fdd11b012..708b994cb 100644
--- a/resources/assets/components/admin/AdminReports.vue
+++ b/resources/assets/components/admin/AdminReports.vue
@@ -9,15 +9,15 @@
                     </div>
                 </div>
                 <div class="row">
-                	<div class="col-12 col-sm-6 col-lg-3">
+                    <div class="col-12 col-sm-6 col-lg-3">
                         <div class="mb-3">
                             <h5 class="text-light text-uppercase mb-0">Active Reports</h5>
                             <span
-                            	class="text-white h2 font-weight-bold mb-0 human-size"
-                            	data-toggle="tooltip"
-                            	data-placement="bottom"
-                            	:title="stats.open + ' open reports'">
-                            	{{ prettyCount(stats.open) }}
+                                class="text-white h2 font-weight-bold mb-0 human-size"
+                                data-toggle="tooltip"
+                                data-placement="bottom"
+                                :title="stats.open + ' open reports'">
+                                {{ prettyCount(stats.open) }}
                             </span>
                         </div>
                     </div>
@@ -26,11 +26,11 @@
                         <div class="mb-3">
                             <h5 class="text-light text-uppercase mb-0">Active Spam Detections</h5>
                             <span
-                            	class="text-white h2 font-weight-bold mb-0 human-size"
-                            	data-toggle="tooltip"
-                            	data-placement="bottom"
-                            	:title="stats.autospam_open + ' open spam detections'"
-                            	>{{ prettyCount(stats.autospam_open) }}</span>
+                                class="text-white h2 font-weight-bold mb-0 human-size"
+                                data-toggle="tooltip"
+                                data-placement="bottom"
+                                :title="stats.autospam_open + ' open spam detections'"
+                                >{{ prettyCount(stats.autospam_open) }}</span>
                         </div>
                     </div>
 
@@ -38,11 +38,11 @@
                         <div class="mb-3">
                             <h5 class="text-light text-uppercase mb-0">Total Reports</h5>
                             <span
-                            	class="text-white h2 font-weight-bold mb-0 human-size"
-                            	data-toggle="tooltip"
-                            	data-placement="bottom"
-                            	:title="stats.total + ' total reports'"
-                            	>{{ prettyCount(stats.total) }}
+                                class="text-white h2 font-weight-bold mb-0 human-size"
+                                data-toggle="tooltip"
+                                data-placement="bottom"
+                                :title="stats.total + ' total reports'"
+                                >{{ prettyCount(stats.total) }}
                             </span>
                         </div>
                     </div>
@@ -51,11 +51,11 @@
                         <div class="mb-3">
                             <h5 class="text-light text-uppercase mb-0">Total Spam Detections</h5>
                             <span
-                            	class="text-white h2 font-weight-bold mb-0 human-size"
-                            	data-toggle="tooltip"
-                            	data-placement="bottom"
-                            	:title="stats.autospam + ' total spam detections'">
-                            	{{ prettyCount(stats.autospam) }}
+                                class="text-white h2 font-weight-bold mb-0 human-size"
+                                data-toggle="tooltip"
+                                data-placement="bottom"
+                                :title="stats.autospam + ' total spam detections'">
+                                {{ prettyCount(stats.autospam) }}
                             </span>
                         </div>
                     </div>
@@ -75,73 +75,83 @@
                     <ul class="nav nav-pills">
                         <li class="nav-item">
                             <a
-                            	:class="['nav-link d-flex align-items-center', { active: tabIndex == 0}]"
-                            	href="#"
-                            	@click.prevent="toggleTab(0)">
+                                :class="['nav-link d-flex align-items-center', { active: tabIndex == 0}]"
+                                href="#"
+                                @click.prevent="toggleTab(0)">
 
-                            	<span>Open Reports</span>
-                            	<span
-                            		v-if="stats.open"
-                            		class="badge badge-sm badge-floating badge-danger border-white ml-2"
-                            		style="background-color: red;color:white;font-size:11px;">
-                            		{{prettyCount(stats.open)}}
-                            	</span>
+                                <span>Open Reports</span>
+                                <span
+                                    v-if="stats.open"
+                                    class="badge badge-sm badge-floating badge-danger border-white ml-2"
+                                    style="background-color: red;color:white;font-size:11px;">
+                                    {{prettyCount(stats.open)}}
+                                </span>
                             </a>
                         </li>
                         <li class="nav-item">
                             <a
-                            	:class="['nav-link d-flex align-items-center', { active: tabIndex == 2}]"
-                            	href="#"
-                            	@click.prevent="toggleTab(2)">
+                                :class="['nav-link d-flex align-items-center', { active: tabIndex == 2}]"
+                                href="#"
+                                @click.prevent="toggleTab(2)">
 
-                            	<span>Spam Detections</span>
-                            	<span
-                            		v-if="stats.autospam_open"
-                            		class="badge badge-sm badge-floating badge-danger border-white ml-2"
-                            		style="background-color: red;color:white;font-size:11px;">
-                            		{{prettyCount(stats.autospam_open)}}
-                            	</span>
+                                <span>Spam Detections</span>
+                                <span
+                                    v-if="stats.autospam_open"
+                                    class="badge badge-sm badge-floating badge-danger border-white ml-2"
+                                    style="background-color: red;color:white;font-size:11px;">
+                                    {{prettyCount(stats.autospam_open)}}
+                                </span>
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a
+                                :class="['nav-link d-flex align-items-center', { active: tabIndex == 3}]"
+                                href="#"
+                                @click.prevent="toggleTab(3)">
+
+                                <span>Remote Reports</span>
+                                <span
+                                    v-if="stats.remote_open"
+                                    class="badge badge-sm badge-floating badge-danger border-white ml-2"
+                                    style="background-color: red;color:white;font-size:11px;">
+                                    {{prettyCount(stats.remote_open)}}
+                                </span>
                             </a>
                         </li>
                         <li class="d-none d-md-block nav-item">
                             <a
-                            	:class="['nav-link d-flex align-items-center', { active: tabIndex == 1}]"
-                            	href="#"
-                            	@click.prevent="toggleTab(1)">
-                            	<span>Closed Reports</span>
-                            	<span
-                            		v-if="stats.autospam_open"
-                            		class="badge badge-sm badge-floating badge-secondary border-white ml-2"
-                            		style="font-size:11px;">
-	                            	{{prettyCount(stats.closed)}}
-	                            </span>
+                                :class="['nav-link d-flex align-items-center', { active: tabIndex == 1}]"
+                                href="#"
+                                @click.prevent="toggleTab(1)">
+                                <span>Closed Reports</span>
+                                <span
+                                    v-if="stats.autospam_open"
+                                    class="badge badge-sm badge-floating badge-secondary border-white ml-2"
+                                    style="font-size:11px;">
+                                    {{prettyCount(stats.closed)}}
+                                </span>
                             </a>
                         </li>
                         <li class="d-none d-md-block nav-item">
-                        	<a
-                        		href="/i/admin/reports/email-verifications"
-                        		class="nav-link d-flex align-items-center">
-                        		<span>Email Verification Requests</span>
-                        		<span
-                            		v-if="stats.email_verification_requests"
-                            		class="badge badge-sm badge-floating badge-secondary border-white ml-2"
-                            		style="font-size:11px;">
-	                            	{{prettyCount(stats.email_verification_requests)}}
-	                            </span>
-                        	</a>
+                            <a
+                                href="/i/admin/reports/email-verifications"
+                                class="nav-link d-flex align-items-center">
+                                <span>Email Verification Requests</span>
+                                <span
+                                    v-if="stats.email_verification_requests"
+                                    class="badge badge-sm badge-floating badge-secondary border-white ml-2"
+                                    style="font-size:11px;">
+                                    {{prettyCount(stats.email_verification_requests)}}
+                                </span>
+                            </a>
                         </li>
                         <li class="d-none d-md-block nav-item">
-                        	<a
-                        		href="/i/admin/reports/appeals"
-                        		class="nav-link d-flex align-items-center">
-                        		<span>Appeal Requests</span>
-                        		<span
-                            		v-if="stats.appeals"
-                            		class="badge badge-sm badge-floating badge-secondary border-white ml-2"
-                            		style="font-size:11px;">
-                        			{{ prettyCount(stats.appeals) }}
-                            	</span>
-                        	</a>
+                            <a
+                                :class="['nav-link d-flex align-items-center', { active: tabIndex == 4}]"
+                                href="#"
+                                @click.prevent="toggleTab(4)">
+                                <span>Moderated Profiles</span>
+                            </a>
                         </li>
                     </ul>
                 </div>
@@ -151,10 +161,10 @@
                 <table v-if="reports && reports.length" class="table table-dark">
                     <thead class="thead-dark">
                         <tr>
-                        	<th scope="col">ID</th>
-                        	<th scope="col">Report</th>
-                        	<th scope="col">Reported Account</th>
-                        	<th scope="col">Reported By</th>
+                            <th scope="col">ID</th>
+                            <th scope="col">Report</th>
+                            <th scope="col">Reported Account</th>
+                            <th scope="col">Reported By</th>
                             <th scope="col">Created</th>
                             <th scope="col">View Report</th>
                         </tr>
@@ -167,49 +177,53 @@
                                 </a>
                             </td>
                             <td class="align-middle">
-                            	<p class="text-capitalize font-weight-bold mb-0" v-html="reportLabel(report)"></p>
-                            </td>
-							<td class="align-middle">
-                            	<a v-if="report.reported && report.reported.id" :href="`/i/web/profile/${report.reported.id}`" target="_blank" class="text-white">
-	                            	<div class="d-flex align-items-center" style="gap:0.61rem;">
-	                            		<img
-	                            			:src="report.reported.avatar"
-	                            			width="30"
-	                            			height="30"
-	                            			style="object-fit: cover;border-radius:30px;"
-	                            			onerror="this.src='/storage/avatars/default.png';this.error=null;">
-
-	                            		<div class="d-flex flex-column">
-	                            			<p class="font-weight-bold mb-0" style="font-size: 14px;">@{{report.reported.username}}</p>
-	                            			<div class="d-flex small text-muted mb-0" style="gap: 0.5rem;">
-	                            				<span>{{report.reported.followers_count}} Followers</span>
-	                            				<span>·</span>
-	                            				<span>Joined {{ timeAgo(report.reported.created_at) }}</span>
-	                            			</div>
-	                            		</div>
-	                            	</div>
-	                            </a>
+                                <p class="text-capitalize font-weight-bold mb-0" v-html="reportLabel(report)"></p>
                             </td>
                             <td class="align-middle">
-                            	<a :href="`/i/web/profile/${report.reporter.id}`" target="_blank" class="text-white">
-	                            	<div class="d-flex align-items-center" style="gap:0.61rem;">
-	                            		<img
-	                            			:src="report.reporter.avatar"
-	                            			width="30"
-	                            			height="30"
-	                            			style="object-fit: cover;border-radius:30px;"
-	                            			onerror="this.src='/storage/avatars/default.png';this.error=null;">
+                                <a v-if="report.reported && report.reported.id" :href="`/i/web/profile/${report.reported.id}`" target="_blank" class="text-white">
+                                    <div class="d-flex align-items-center" style="gap:0.61rem;">
+                                        <img
+                                            :src="report.reported.avatar"
+                                            width="30"
+                                            height="30"
+                                            style="object-fit: cover;border-radius:30px;"
+                                            onerror="this.src='/storage/avatars/default.png';this.error=null;">
 
-	                            		<div class="d-flex flex-column">
-	                            			<p class="font-weight-bold mb-0" style="font-size: 14px;">@{{report.reporter.username}}</p>
-	                            			<div class="d-flex small text-muted mb-0" style="gap: 0.5rem;">
-	                            				<span>{{report.reporter.followers_count}} Followers</span>
-	                            				<span>·</span>
-	                            				<span>Joined {{ timeAgo(report.reporter.created_at) }}</span>
-	                            			</div>
-	                            		</div>
-	                            	</div>
-	                            </a>
+                                        <div class="d-flex flex-column">
+                                            <p class="font-weight-bold mb-0" style="font-size: 14px;">@{{report.reported.username}}</p>
+                                            <div class="d-flex small text-muted mb-0" style="gap: 0.5rem;">
+                                                <span>{{report.reported.followers_count}} Followers</span>
+                                                <span>·</span>
+                                                <span>Joined {{ timeAgo(report.reported.created_at) }}</span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </a>
+                            </td>
+                            <td class="align-middle">
+                                <a
+                                    v-if="report && report.reporter && report.reporter.id"
+                                    :href="`/i/web/profile/${report.reporter.id}`"
+                                    target="_blank"
+                                    class="text-white">
+                                    <div class="d-flex align-items-center" style="gap:0.61rem;">
+                                        <img
+                                            :src="report.reporter.avatar"
+                                            width="30"
+                                            height="30"
+                                            style="object-fit: cover;border-radius:30px;"
+                                            onerror="this.src='/storage/avatars/default.png';this.error=null;">
+
+                                        <div class="d-flex flex-column">
+                                            <p class="font-weight-bold mb-0" style="font-size: 14px;">@{{report.reporter.username}}</p>
+                                            <div class="d-flex small text-muted mb-0" style="gap: 0.5rem;">
+                                                <span>{{report.reporter.followers_count}} Followers</span>
+                                                <span>·</span>
+                                                <span>Joined {{ timeAgo(report.reporter.created_at) }}</span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </a>
                             </td>
                             <td class="font-weight-bold align-middle">{{ timeAgo(report.created_at) }}</td>
                             <td class="align-middle"><a href="#" class="btn btn-primary btn-sm" @click.prevent="viewReport(report)">View</a></td>
@@ -218,17 +232,17 @@
                 </table>
 
                 <div v-else>
-                	<div class="card card-body p-5">
-                		<div class="d-flex justify-content-between align-items-center flex-column">
-                			<p class="mt-3 mb-0"><i class="far fa-check-circle fa-5x text-success"></i></p>
-                			<p class="lead">{{ tabIndex === 0 ? 'No Active Reports Found!' : 'No Closed Reports Found!' }}</p>
-                		</div>
-                	</div>
+                    <div class="card card-body p-5">
+                        <div class="d-flex justify-content-between align-items-center flex-column">
+                            <p class="mt-3 mb-0"><i class="far fa-check-circle fa-5x text-success"></i></p>
+                            <p class="lead">{{ tabIndex === 0 ? 'No Active Reports Found!' : 'No Closed Reports Found!' }}</p>
+                        </div>
+                    </div>
                 </div>
             </div>
 
             <div v-if="[0, 1].includes(this.tabIndex) && reports.length && (pagination.prev || pagination.next)" class="d-flex align-items-center justify-content-center">
-              	<button
+                <button
                     class="btn btn-primary rounded-pill"
                     :disabled="!pagination.prev"
                     @click="paginate('prev')">
@@ -243,71 +257,71 @@
             </div>
 
             <div v-if="this.tabIndex === 2" class="table-responsive rounded">
-            	<template v-if="autospamLoaded">
-	                <table v-if="autospam && autospam.length" class="table table-dark">
-	                    <thead class="thead-dark">
-	                        <tr>
-	                        	<th scope="col">ID</th>
-	                        	<th scope="col">Report</th>
-	                        	<th scope="col">Reported Account</th>
-	                            <th scope="col">Created</th>
-	                            <th scope="col">View Report</th>
-	                        </tr>
-	                    </thead>
-	                    <tbody>
-	                        <tr v-for="(report, idx) in autospam">
-	                            <td class="font-weight-bold text-monospace text-muted align-middle">
-	                                <a href="#" @click.prevent="viewSpamReport(report)">
-	                                    {{ report.id }}
-	                                </a>
-	                            </td>
-	                            <td class="align-middle">
-	                            	<p class="text-capitalize font-weight-bold mb-0">Spam Post</p>
-	                            </td>
-								<td class="align-middle">
-	                            	<a v-if="report.status && report.status.account" :href="`/i/web/profile/${report.status.account.id}`" target="_blank" class="text-white">
-		                            	<div class="d-flex align-items-center" style="gap:0.61rem;">
-		                            		<img
-		                            			:src="report.status.account.avatar"
-		                            			width="30"
-		                            			height="30"
-		                            			style="object-fit: cover;border-radius:30px;"
-		                            			onerror="this.src='/storage/avatars/default.png';this.error=null;">
+                <template v-if="autospamLoaded">
+                    <table v-if="autospam && autospam.length" class="table table-dark">
+                        <thead class="thead-dark">
+                            <tr>
+                                <th scope="col">ID</th>
+                                <th scope="col">Report</th>
+                                <th scope="col">Reported Account</th>
+                                <th scope="col">Created</th>
+                                <th scope="col">View Report</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr v-for="(report, idx) in autospam">
+                                <td class="font-weight-bold text-monospace text-muted align-middle">
+                                    <a href="#" @click.prevent="viewSpamReport(report)">
+                                        {{ report.id }}
+                                    </a>
+                                </td>
+                                <td class="align-middle">
+                                    <p class="text-capitalize font-weight-bold mb-0">Spam Post</p>
+                                </td>
+                                <td class="align-middle">
+                                    <a v-if="report.status && report.status.account" :href="`/i/web/profile/${report.status.account.id}`" target="_blank" class="text-white">
+                                        <div class="d-flex align-items-center" style="gap:0.61rem;">
+                                            <img
+                                                :src="report.status.account.avatar"
+                                                width="30"
+                                                height="30"
+                                                style="object-fit: cover;border-radius:30px;"
+                                                onerror="this.src='/storage/avatars/default.png';this.error=null;">
 
-		                            		<div class="d-flex flex-column">
-		                            			<p class="font-weight-bold mb-0" style="font-size: 14px;">@{{report.status.account.username}}</p>
-		                            			<div class="d-flex small text-muted mb-0" style="gap: 0.5rem;">
-		                            				<span>{{report.status.account.followers_count}} Followers</span>
-		                            				<span>·</span>
-		                            				<span>Joined {{ timeAgo(report.status.account.created_at) }}</span>
-		                            			</div>
-		                            		</div>
-		                            	</div>
-		                            </a>
-	                            </td>
-	                            <td class="font-weight-bold align-middle">{{ timeAgo(report.created_at) }}</td>
-	                            <td class="align-middle"><a href="#" class="btn btn-primary btn-sm" @click.prevent="viewSpamReport(report)">View</a></td>
-	                        </tr>
-	                    </tbody>
-	                </table>
+                                            <div class="d-flex flex-column">
+                                                <p class="font-weight-bold mb-0" style="font-size: 14px;">@{{report.status.account.username}}</p>
+                                                <div class="d-flex small text-muted mb-0" style="gap: 0.5rem;">
+                                                    <span>{{report.status.account.followers_count}} Followers</span>
+                                                    <span>·</span>
+                                                    <span>Joined {{ timeAgo(report.status.account.created_at) }}</span>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </a>
+                                </td>
+                                <td class="font-weight-bold align-middle">{{ timeAgo(report.created_at) }}</td>
+                                <td class="align-middle"><a href="#" class="btn btn-primary btn-sm" @click.prevent="viewSpamReport(report)">View</a></td>
+                            </tr>
+                        </tbody>
+                    </table>
 
-	                <div v-else>
-	                	<div class="card card-body p-5">
-	                		<div class="d-flex justify-content-between align-items-center flex-column">
-	                			<p class="mt-3 mb-0"><i class="far fa-check-circle fa-5x text-success"></i></p>
-	                			<p class="lead">No Spam Reports Found!</p>
-	                		</div>
-	                	</div>
-	                </div>
-            	</template>
+                    <div v-else>
+                        <div class="card card-body p-5">
+                            <div class="d-flex justify-content-between align-items-center flex-column">
+                                <p class="mt-3 mb-0"><i class="far fa-check-circle fa-5x text-success"></i></p>
+                                <p class="lead">No Spam Reports Found!</p>
+                            </div>
+                        </div>
+                    </div>
+                </template>
 
-            	<div v-else class="d-flex align-items-center justify-content-center" style="min-height: 300px;">
-            		<b-spinner />
-            	</div>
+                <div v-else class="d-flex align-items-center justify-content-center" style="min-height: 300px;">
+                    <b-spinner />
+                </div>
             </div>
 
             <div v-if="this.tabIndex === 2 && autospamLoaded && autospam && autospam.length" class="d-flex align-items-center justify-content-center">
-              	<button
+                <button
                     class="btn btn-primary rounded-pill"
                     :disabled="!autospamPagination.prev"
                     @click="autospamPaginate('prev')">
@@ -320,359 +334,799 @@
                     Next
                 </button>
             </div>
+
+            <div v-if="this.tabIndex === 3" class="table-responsive rounded">
+                <table v-if="reports && reports.length" class="table table-dark">
+                    <thead class="thead-dark">
+                        <tr>
+                            <th scope="col">ID</th>
+                            <th scope="col">Instance</th>
+                            <th scope="col">Reported Account</th>
+                            <th scope="col">Comment</th>
+                            <th scope="col">Created</th>
+                            <th scope="col">View Report</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr
+                            v-for="(report, idx) in reports"
+                            :key="`remote-reports-${report.id}-${idx}`">
+                            <td class="font-weight-bold text-monospace text-muted align-middle">
+                                <a href="#" @click.prevent="showRemoteReport(report)">
+                                    {{ report.id }}
+                                </a>
+                            </td>
+                            <td class="align-middle">
+                                <p class="font-weight-bold mb-0">{{ report.instance }}</p>
+                            </td>
+                            <td class="align-middle">
+                                <a v-if="report.reported && report.reported.id" :href="`/i/web/profile/${report.reported.id}`" target="_blank" class="text-white">
+                                    <div class="d-flex align-items-center" style="gap:0.61rem;">
+                                        <img
+                                            :src="report.reported.avatar"
+                                            width="30"
+                                            height="30"
+                                            style="object-fit: cover;border-radius:30px;"
+                                            onerror="this.src='/storage/avatars/default.png';this.error=null;">
+
+                                        <div class="d-flex flex-column">
+                                            <p class="font-weight-bold mb-0" style="font-size: 14px;">@{{report.reported.username}}</p>
+                                            <div class="d-flex small text-muted mb-0" style="gap: 0.5rem;">
+                                                <span>{{report.reported.followers_count}} Followers</span>
+                                                <span>·</span>
+                                                <span>Joined {{ timeAgo(report.reported.created_at) }}</span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </a>
+                            </td>
+                            <td class="align-middle">
+                                <p class="small mb-0 text-wrap" style="max-width: 300px;word-break: break-all;">{{ report.message && report.message.length > 120 ? report.message.slice(0, 120) + '...' : report.message }}</p>
+                            </td>
+                            <td class="font-weight-bold align-middle">{{ timeAgo(report.created_at) }}</td>
+                            <td class="align-middle"><a href="#" class="btn btn-primary btn-sm" @click.prevent="showRemoteReport(report)">View</a></td>
+                        </tr>
+                    </tbody>
+                </table>
+
+                <div v-else>
+                    <div class="card card-body p-5">
+                        <div class="d-flex justify-content-between align-items-center flex-column">
+                            <p class="mt-3 mb-0"><i class="far fa-check-circle fa-5x text-success"></i></p>
+                            <p class="lead">{{ tabIndex === 0 ? 'No Active Reports Found!' : 'No Closed Reports Found!' }}</p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div v-if="this.tabIndex === 3 && remoteReportsLoaded && reports && reports.length" class="d-flex align-items-center justify-content-center">
+                <button
+                    class="btn btn-primary rounded-pill"
+                    :disabled="!pagination.prev"
+                    @click="remoteReportPaginate('prev')">
+                    Prev
+                </button>
+                <button
+                    class="btn btn-primary rounded-pill"
+                    :disabled="!pagination.next"
+                    @click="remoteReportPaginate('next')">
+                    Next
+                </button>
+            </div>
+
+            <div v-if="this.tabIndex === 4" class="table-responsive rounded">
+                <div class="d-flex justify-content-between align-items-center mb-3">
+                    <form class="navbar-search navbar-search-dark form-inline mr-sm-3" @submit.prevent="handleModeratedProfileSearch">
+                        <div class="form-group mb-0">
+                            <div class="input-group input-group-alternative input-group-merge">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text">
+                                        <i class="fas fa-search"></i>
+                                    </span>
+                                </div>
+                                <input
+                                    type="text"
+                                    name="username"
+                                    placeholder="Search by username"
+                                    class="form-control"
+                                    v-model="moderatedProfilesSearchInput">
+                            </div>
+                        </div>
+                    </form>
+                    <div class="d-flex gap-1">
+                        <button type="button" class="btn btn-outline-primary fw-bold" @click="exportModeratedProfiles()">Export</button>
+                        <button type="button" class="btn btn-primary fw-bold" @click.prevent="addModeratedProfile()">Add Moderated Profile</button>
+                    </div>
+                </div>
+
+                <table v-if="moderatedProfiles && moderatedProfiles.length" class="table table-dark">
+                    <thead class="thead-dark">
+                        <tr>
+                            <th scope="col">ID</th>
+                            <th scope="col">Username</th>
+                            <th scope="col">Moderation</th>
+                            <th scope="col">Comment</th>
+                            <th scope="col">Created</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr
+                            v-for="(report, idx) in moderatedProfiles"
+                            :key="`remote-reports-${report.id}-${idx}`">
+                            <td class="font-weight-bold text-monospace text-muted align-middle">
+                                <button class="btn btn-primary btn-sm" @click.prevent="openModeratedProfileModal(report)">
+                                    {{ report.id }}
+                                </button>
+                            </td>
+                            <td class="align-middle">
+                                <p v-if="report.profile.name" class="small mb-0 text-muted">
+                                    {{ truncateText(report.profile.name, 40) }}
+                                </p>
+                                <p
+                                    class="font-weight-bold mb-0"
+                                    data-toggle="tooltip"
+                                    data-placement="bottom"
+                                    :title="report.profile.username">
+                                    {{ truncateText(report.profile.username, 40) }}
+                                </p>
+                            </td>
+                            <td class="align-middle">
+                                <p class="mb-0" v-html="getModerationLabels(report)"></p>
+                            </td>
+                            <td class="align-middle">
+                                <p class="small mb-0 text-wrap" style="max-width: 200px;word-break: break-word;">{{ truncateText(report.note, 140) }}</p>
+                            </td>
+                            <td class="font-weight-bold align-middle">
+                                <span
+                                    data-toggle="tooltip"
+                                    data-placement="bottom"
+                                    :title="report.created_at">
+                                    {{ timeAgo(report.created_at) }}
+                                </span>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+
+                <div v-else>
+                    <div class="card card-body p-5">
+                        <div class="d-flex justify-content-between align-items-center flex-column">
+
+                            <template v-if="moderatedProfilesSearchInput">
+                                <p class="mt-3 mb-0"><i class="far fa-times fa-5x text-danger"></i></p>
+                                <p class="lead">No results found!</p>
+                                <button class="btn btn-primary" @click.prevent="clearModeratedProfileSearch()">Go back</button>
+                            </template>
+
+                            <template v-else>
+                                <p class="mt-3 mb-0"><i class="far fa-check-circle fa-5x text-success"></i></p>
+                                <p class="lead">No active moderation accounts found!</p>
+                            </template>
+                        </div>
+                    </div>
+                </div>
+
+                <div v-if="moderatedProfiles && moderatedProfiles.length && (moderatedProfilesPagination.prev || moderatedProfilesPagination.next)" class="mt-3 d-flex align-items-center justify-content-center">
+                    <button
+                        class="btn btn-primary rounded-pill"
+                        :disabled="!moderatedProfilesPagination.prev"
+                        @click="paginateModeratedAccounts('prev')">
+                        Prev
+                    </button>
+                    <button
+                        class="btn btn-primary rounded-pill"
+                        :disabled="!moderatedProfilesPagination.next"
+                        @click="paginateModeratedAccounts('next')">
+                        Next
+                    </button>
+                </div>
+            </div>
         </div>
     </div>
 
     <b-modal v-model="showReportModal" :title="tabIndex === 0 ? 'View Report' : 'Viewing Closed Report'" :ok-only="true" ok-title="Close" ok-variant="outline-primary">
-    	<div v-if="viewingReportLoading" class="d-flex align-items-center justify-content-center">
-    		<b-spinner />
-    	</div>
+        <div v-if="viewingReportLoading" class="d-flex align-items-center justify-content-center">
+            <b-spinner />
+        </div>
 
-    	<template v-else>
-	    	<div v-if="viewingReport" class="list-group">
-	            <div class="list-group-item d-flex align-items-center justify-content-between">
-	                <div class="text-muted small">Type</div>
-	                <div class="font-weight-bold text-capitalize" v-html="reportLabel(viewingReport)"></div>
-	            </div>
-	            <div v-if="viewingReport.admin_seen_at" class="list-group-item d-flex align-items-center justify-content-between">
-	                <div class="text-muted small">Report Closed</div>
-	                <div class="font-weight-bold text-capitalize">{{ formatDate(viewingReport.admin_seen_at) }}</div>
-	            </div>
-	            <div v-if="viewingReport.reporter_message" class="list-group-item d-flex flex-column" style="gap:10px;">
-	                <div class="text-muted small">Message</div>
-	                <p class="mb-0 read-more" style="font-size: 12px;overflow-y: hidden;">{{ viewingReport.reporter_message }}</p>
-	            </div>
-	    	</div>
+        <template v-else>
+            <div v-if="viewingReport" class="list-group">
+                <div class="list-group-item d-flex align-items-center justify-content-between">
+                    <div class="text-muted small">Type</div>
+                    <div class="font-weight-bold text-capitalize" v-html="reportLabel(viewingReport)"></div>
+                </div>
+                <div v-if="viewingReport.admin_seen_at" class="list-group-item d-flex align-items-center justify-content-between">
+                    <div class="text-muted small">Report Closed</div>
+                    <div class="font-weight-bold text-capitalize">{{ formatDate(viewingReport.admin_seen_at) }}</div>
+                </div>
+                <div v-if="viewingReport.reporter_message" class="list-group-item d-flex flex-column" style="gap:10px;">
+                    <div class="text-muted small">Message</div>
+                    <p class="mb-0 read-more" style="font-size: 12px;overflow-y: hidden;">{{ viewingReport.reporter_message }}</p>
+                </div>
+            </div>
 
-	    	<div class="list-group list-group-horizontal mt-3">
-		    	<div v-if="viewingReport && viewingReport.reported" class="list-group-item d-flex align-items-center justify-content-between flex-column flex-grow-1" style="gap:0.4rem;">
-	                <div class="text-muted small font-weight-bold mt-n1">Reported Account</div>
+            <div class="list-group list-group-horizontal mt-3">
+                <div v-if="viewingReport && viewingReport.reported" class="list-group-item d-flex align-items-center justify-content-between flex-column flex-grow-1" style="gap:0.4rem;">
+                    <div class="text-muted small font-weight-bold mt-n1">Reported Account</div>
 
-					<a v-if="viewingReport.reported && viewingReport.reported.id" :href="`/i/web/profile/${viewingReport.reported.id}`" target="_blank" class="text-primary">
-		            	<div class="d-flex align-items-center" style="gap:0.61rem;">
-		            		<img
-		            			:src="viewingReport.reported.avatar"
-		            			width="30"
-		            			height="30"
-		            			style="object-fit: cover;border-radius:30px;"
-		            			onerror="this.src='/storage/avatars/default.png';this.error=null;">
+                    <a v-if="viewingReport.reported && viewingReport.reported.id" :href="`/i/web/profile/${viewingReport.reported.id}`" target="_blank" class="text-primary">
+                        <div class="d-flex align-items-center" style="gap:0.61rem;">
+                            <img
+                                :src="viewingReport.reported.avatar"
+                                width="30"
+                                height="30"
+                                style="object-fit: cover;border-radius:30px;"
+                                onerror="this.src='/storage/avatars/default.png';this.error=null;">
 
-		            		<div class="d-flex flex-column">
-		            			<p class="font-weight-bold mb-0 text-break" style="font-size: 12px;max-width: 140px;line-height: 16px;" :class="[ viewingReport.reported.is_admin ? 'text-danger': '']">@{{viewingReport.reported.acct}}</p>
-		            			<div class="d-flex text-muted mb-0" style="font-size: 10px;gap: 0.5rem;">
-		            				<span>{{viewingReport.reported.followers_count}} Followers</span>
-		            				<span>·</span>
-		            				<span>Joined {{ timeAgo(viewingReport.reported.created_at) }}</span>
-		            			</div>
-		            		</div>
-		            	</div>
-		            </a>
-		    	</div>
+                            <div class="d-flex flex-column">
+                                <p class="font-weight-bold mb-0 text-break" style="font-size: 12px;max-width: 140px;line-height: 16px;" :class="[ viewingReport.reported.is_admin ? 'text-danger': '']">@{{viewingReport.reported.acct}}</p>
+                                <div class="d-flex text-muted mb-0" style="font-size: 10px;gap: 0.5rem;">
+                                    <span>{{viewingReport.reported.followers_count}} Followers</span>
+                                    <span>·</span>
+                                    <span>Joined {{ timeAgo(viewingReport.reported.created_at) }}</span>
+                                </div>
+                            </div>
+                        </div>
+                    </a>
+                </div>
 
-				<div v-if="viewingReport && viewingReport.reporter" class="list-group-item d-flex align-items-center justify-content-between flex-column flex-grow-1" style="gap:0.4rem;">
-	                <div class="text-muted small font-weight-bold mt-n1">Reporter Account</div>
+                <div v-if="viewingReport && viewingReport.reporter" class="list-group-item d-flex align-items-center justify-content-between flex-column flex-grow-1" style="gap:0.4rem;">
+                    <div class="text-muted small font-weight-bold mt-n1">Reporter Account</div>
 
-					<a v-if="viewingReport.reporter && viewingReport.reporter.id" :href="`/i/web/profile/${viewingReport.reporter.id}`" target="_blank" class="text-primary">
-		            	<div class="d-flex align-items-center" style="gap:0.61rem;">
-		            		<img
-		            			:src="viewingReport.reporter.avatar"
-		            			width="30"
-		            			height="30"
-		            			style="object-fit: cover;border-radius:30px;"
-		            			onerror="this.src='/storage/avatars/default.png';this.error=null;">
+                    <a v-if="viewingReport.reporter && viewingReport.reporter?.id" :href="`/i/web/profile/${viewingReport.reporter?.id}`" target="_blank" class="text-primary">
+                        <div class="d-flex align-items-center" style="gap:0.61rem;">
+                            <img
+                                :src="viewingReport.reporter.avatar"
+                                width="30"
+                                height="30"
+                                style="object-fit: cover;border-radius:30px;"
+                                onerror="this.src='/storage/avatars/default.png';this.error=null;">
 
-		            		<div class="d-flex flex-column">
-		            			<p class="font-weight-bold mb-0 text-break" style="font-size: 12px;max-width: 140px;line-height: 16px;">@{{viewingReport.reporter.acct}}</p>
-		            			<div class="d-flex text-muted mb-0" style="font-size: 10px;gap: 0.5rem;">
-		            				<span>{{viewingReport.reporter.followers_count}} Followers</span>
-		            				<span>·</span>
-		            				<span>Joined {{ timeAgo(viewingReport.reporter.created_at) }}</span>
-		            			</div>
-		            		</div>
-		            	</div>
-		            </a>
-		    	</div>
-	    	</div>
+                            <div class="d-flex flex-column">
+                                <p class="font-weight-bold mb-0 text-break" style="font-size: 12px;max-width: 140px;line-height: 16px;">@{{viewingReport.reporter.acct}}</p>
+                                <div class="d-flex text-muted mb-0" style="font-size: 10px;gap: 0.5rem;">
+                                    <span>{{viewingReport.reporter.followers_count}} Followers</span>
+                                    <span>·</span>
+                                    <span>Joined {{ timeAgo(viewingReport.reporter.created_at) }}</span>
+                                </div>
+                            </div>
+                        </div>
+                    </a>
+                </div>
+            </div>
 
-			<div v-if="viewingReport && viewingReport.object_type === 'App\\Status' && viewingReport.status" class="list-group mt-3">
-				<div v-if="viewingReport && viewingReport.status && viewingReport.status.media_attachments.length" class="list-group-item d-flex flex-column flex-grow-1" style="gap:0.4rem;">
-					<div class="d-flex justify-content-between mt-n1 text-muted small font-weight-bold">
-						<div>Reported Post</div>
-						<a class="font-weight-bold" :href="viewingReport.status.url" target="_blank">View</a>
-					</div>
+            <div v-if="viewingReport && viewingReport.object_type === 'App\\Status' && viewingReport.status" class="list-group mt-3">
+                <div v-if="viewingReport && viewingReport.status && viewingReport.status.media_attachments.length" class="list-group-item d-flex flex-column flex-grow-1" style="gap:0.4rem;">
+                    <div class="d-flex justify-content-between mt-n1 text-muted small font-weight-bold">
+                        <div>Reported Post</div>
+                        <a class="font-weight-bold" :href="viewingReport.status.url" target="_blank">View</a>
+                    </div>
 
-					<img
-						v-if="viewingReport.status.media_attachments[0].type === 'image'"
-						:src="viewingReport.status.media_attachments[0].url"
-						height="140"
-						class="rounded"
-						style="object-fit: cover;"
-						onerror="this.src='/storage/no-preview.png';this.error=null;" />
+                    <img
+                        v-if="viewingReport.status.media_attachments[0].type === 'image'"
+                        :src="viewingReport.status.media_attachments[0].url"
+                        height="140"
+                        class="rounded"
+                        style="object-fit: cover;"
+                        onerror="this.src='/storage/no-preview.png';this.error=null;" />
 
-					<video
-						v-else-if="viewingReport.status.media_attachments[0].type === 'video'"
-						height="140"
-						controls
-						:src="viewingReport.status.media_attachments[0].url"
-						onerror="this.src='/storage/no-preview.png';this.onerror=null;"
-						></video>
-				</div>
+                    <video
+                        v-else-if="viewingReport.status.media_attachments[0].type === 'video'"
+                        height="140"
+                        controls
+                        :src="viewingReport.status.media_attachments[0].url"
+                        onerror="this.src='/storage/no-preview.png';this.onerror=null;"
+                        ></video>
+                </div>
 
-				<div v-if="viewingReport && viewingReport.status" class="list-group-item d-flex flex-column flex-grow-1" style="gap:0.4rem;">
-					<div class="d-flex justify-content-between mt-n1 text-muted small font-weight-bold">
-						<div>Reported Post Caption</div>
-						<a class="font-weight-bold" :href="viewingReport.status.url" target="_blank">View</a>
-					</div>
-					<p class="mb-0 read-more" style="font-size:12px;overflow-y: hidden">{{ viewingReport.status.content_text }}</p>
-				</div>
-			</div>
+                <div v-if="viewingReport && viewingReport.status" class="list-group-item d-flex flex-column flex-grow-1" style="gap:0.4rem;">
+                    <div class="d-flex justify-content-between mt-n1 text-muted small font-weight-bold">
+                        <div>Reported Post Caption</div>
+                        <a class="font-weight-bold" :href="viewingReport.status.url" target="_blank">View</a>
+                    </div>
+                    <p class="mb-0 read-more" style="font-size:12px;overflow-y: hidden">{{ viewingReport.status.content_text }}</p>
+                </div>
+            </div>
 
-	    	<div v-if="viewingReport && viewingReport.admin_seen_at === null" class="mt-4">
-	    		<div v-if="viewingReport && viewingReport.object_type === 'App\\Profile'">
-		    		<button class="btn btn-dark btn-block rounded-pill" @click="handleAction('profile', 'ignore')">Ignore Report</button>
-		    		<hr v-if="viewingReport.reported && viewingReport.reported.id && !viewingReport.reported.is_admin" class="mt-3 mb-1">
-		    		<div
-		    			v-if="viewingReport.reported && viewingReport.reported.id && !viewingReport.reported.is_admin"
-		    			class="d-flex flex-row mt-2"
-		    			style="gap:0.3rem;">
-		    			<button
-		    				class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-0"
-		    				@click="handleAction('profile', 'nsfw')">
-		    				Mark all Posts NSFW
-		    			</button>
-		    			<button
-		    				class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-0"
-		    				@click="handleAction('profile', 'unlist')">
-		    				Unlist all Posts
-		    			</button>
-		    		</div>
-		    		<button
-		    			v-if="viewingReport.reported && viewingReport.reported.id && !viewingReport.reported.is_admin"
-		    			class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-2"
-		    			@click="handleAction('profile', 'delete')">
-		    			Delete Profile
-		    		</button>
-	    		</div>
+            <div v-else-if="viewingReport && viewingReport.object_type === 'App\\Story' && viewingReport.story" class="list-group mt-3">
+                <div v-if="viewingReport && viewingReport.story" class="list-group-item d-flex flex-column flex-grow-1" style="gap:0.4rem;">
+                    <div class="d-flex justify-content-between mt-n1 text-muted small font-weight-bold">
+                        <div>Reported Story</div>
+                        <a class="font-weight-bold" :href="viewingReport.story.url" target="_blank">View</a>
+                    </div>
 
-	    		<div v-if="viewingReport && viewingReport.object_type === 'App\\Status'">
-		    		<button class="btn btn-dark btn-block rounded-pill" @click="handleAction('post', 'ignore')">Ignore Report</button>
-		    		<hr v-if="viewingReport && viewingReport.reported && !viewingReport.reported.is_admin" class="mt-3 mb-1">
-	    			<div
-	    				v-if="viewingReport && viewingReport.reported && !viewingReport.reported.is_admin"
-	    				class="d-flex flex-row mt-2"
-	    				style="gap:0.3rem;">
-		    			<button class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-0" @click="handleAction('post', 'nsfw')">Mark Post NSFW</button>
-		    			<button v-if="viewingReport.status.visibility === 'public'" class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-0" @click="handleAction('post', 'unlist')">Unlist Post</button>
-		    			<button v-else-if="viewingReport.status.visibility === 'unlisted'" class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-0" @click="handleAction('post', 'private')">Make Post Private</button>
-	    			</div>
-	    			<div
-	    				v-if="viewingReport && viewingReport.reported && !viewingReport.reported.is_admin"
-	    				class="d-flex flex-row mt-2"
-	    				style="gap:0.3rem;">
-		    			<button class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-0" @click="handleAction('profile', 'nsfw')">Make all NSFW</button>
-		    			<button class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-0" @click="handleAction('profile', 'unlist')">Make all Unlisted</button>
-		    			<button class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-0" @click="handleAction('profile', 'private')">Make all Private</button>
-		    		</div>
-		    		<div v-if="viewingReport && viewingReport.reported && !viewingReport.reported.is_admin">
-						<hr class="my-2">
-						<div class="d-flex flex-row mt-2" style="gap:0.3rem;">
-							<button class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-0" @click="handleAction('post', 'delete')">Delete Post</button>
-							<button class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-0" @click="handleAction('profile', 'delete')">Delete Account</button>
-						</div>
-		    		</div>
-	    		</div>
-	    	</div>
-	    </template>
+                    <img
+                        v-if="viewingReport.story.type === 'photo'"
+                        :src="viewingReport.story.media_src"
+                        height="140"
+                        class="rounded"
+                        style="object-fit: cover;"
+                        onerror="this.src='/storage/no-preview.png';this.error=null;" />
+
+                    <video
+                        v-else-if="viewingReport.story.type === 'video'"
+                        height="140"
+                        controls
+                        :src="viewingReport.story.media_src"
+                        onerror="this.src='/storage/no-preview.png';this.onerror=null;"
+                        ></video>
+                </div>
+            </div>
+
+            <div v-if="viewingReport && viewingReport.admin_seen_at === null" class="mt-4">
+                <div v-if="viewingReport && viewingReport.object_type === 'App\\Profile'">
+                    <button class="btn btn-dark btn-block rounded-pill" @click="handleAction('profile', 'ignore')">Ignore Report</button>
+                    <hr v-if="viewingReport.reported && viewingReport.reported.id && !viewingReport.reported.is_admin" class="mt-3 mb-1">
+                    <div
+                        v-if="viewingReport.reported && viewingReport.reported.id && !viewingReport.reported.is_admin"
+                        class="d-flex flex-row mt-2"
+                        style="gap:0.3rem;">
+                        <button
+                            class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-0"
+                            @click="handleAction('profile', 'nsfw')">
+                            Mark all Posts NSFW
+                        </button>
+                        <button
+                            class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-0"
+                            @click="handleAction('profile', 'unlist')">
+                            Unlist all Posts
+                        </button>
+                    </div>
+                    <button
+                        v-if="viewingReport.reported && viewingReport.reported.id && !viewingReport.reported.is_admin"
+                        class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-2"
+                        @click="handleAction('profile', 'delete')">
+                        Delete Profile
+                    </button>
+                </div>
+
+                <div v-else-if="viewingReport && viewingReport.object_type === 'App\\Status'">
+                    <button class="btn btn-dark btn-block rounded-pill" @click="handleAction('post', 'ignore')">Ignore Report</button>
+                    <hr v-if="viewingReport && viewingReport.reported && !viewingReport.reported.is_admin" class="mt-3 mb-1">
+                    <div
+                        v-if="viewingReport && viewingReport.reported && !viewingReport.reported.is_admin"
+                        class="d-flex flex-row mt-2"
+                        style="gap:0.3rem;">
+                        <button class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-0" @click="handleAction('post', 'nsfw')">Mark Post NSFW</button>
+                        <button v-if="viewingReport.status.visibility === 'public'" class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-0" @click="handleAction('post', 'unlist')">Unlist Post</button>
+                        <button v-else-if="viewingReport.status.visibility === 'unlisted'" class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-0" @click="handleAction('post', 'private')">Make Post Private</button>
+                    </div>
+                    <div
+                        v-if="viewingReport && viewingReport.reported && !viewingReport.reported.is_admin"
+                        class="d-flex flex-row mt-2"
+                        style="gap:0.3rem;">
+                        <button class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-0" @click="handleAction('profile', 'nsfw')">Make all NSFW</button>
+                        <button class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-0" @click="handleAction('profile', 'unlist')">Make all Unlisted</button>
+                        <button class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-0" @click="handleAction('profile', 'private')">Make all Private</button>
+                    </div>
+                    <div v-if="viewingReport && viewingReport.reported && !viewingReport.reported.is_admin">
+                        <hr class="my-2">
+                        <div class="d-flex flex-row mt-2" style="gap:0.3rem;">
+                            <button class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-0" @click="handleAction('post', 'delete')">Delete Post</button>
+                            <button class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-0" @click="handleAction('profile', 'delete')">Delete Account</button>
+                        </div>
+                    </div>
+                </div>
+
+                <div v-else-if="viewingReport && viewingReport.object_type === 'App\\Story'">
+                    <button class="btn btn-dark btn-block rounded-pill" @click="handleAction('story', 'ignore')">Ignore Report</button>
+                    <hr v-if="viewingReport && viewingReport.reported && !viewingReport.reported.is_admin" class="mt-3 mb-1">
+                    <div v-if="viewingReport && viewingReport.reported && !viewingReport.reported.is_admin">
+                        <div class="d-flex flex-row mt-2" style="gap:0.3rem;">
+                            <button class="btn btn-danger btn-block rounded-pill mt-0" @click="handleAction('story', 'delete')">Delete Story</button>
+                            <button class="btn btn-outline-danger btn-block rounded-pill mt-0" @click="handleAction('story', 'delete-all')">Delete All Stories</button>
+                        </div>
+                    </div>
+
+                    <div v-if="viewingReport && viewingReport.reported && !viewingReport.reported.is_admin">
+                        <hr class="my-2">
+                        <div class="d-flex flex-row mt-2" style="gap:0.3rem;">
+                            <button class="btn btn-outline-danger btn-sm btn-block rounded-pill mt-0" @click="handleAction('profile', 'delete')">Delete Account</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </template>
     </b-modal>
 
     <b-modal v-model="showSpamReportModal" title="Potential Spam Post Detected" :ok-only="true" ok-title="Close" ok-variant="outline-primary">
-    	<div v-if="viewingSpamReportLoading" class="d-flex align-items-center justify-content-center">
-    		<b-spinner />
-    	</div>
+        <div v-if="viewingSpamReportLoading" class="d-flex align-items-center justify-content-center">
+            <b-spinner />
+        </div>
 
-    	<template v-else>
-	    	<div class="list-group list-group-horizontal mt-3">
-		    	<div v-if="viewingSpamReport && viewingSpamReport.status && viewingSpamReport.status.account" class="list-group-item d-flex align-items-center justify-content-between flex-column flex-grow-1" style="gap:0.4rem;">
-	                <div class="text-muted small font-weight-bold mt-n1">Reported Account</div>
+        <template v-else>
+            <div class="list-group list-group-horizontal mt-3">
+                <div v-if="viewingSpamReport && viewingSpamReport.status && viewingSpamReport.status.account" class="list-group-item d-flex align-items-center justify-content-between flex-column flex-grow-1" style="gap:0.4rem;">
+                    <div class="text-muted small font-weight-bold mt-n1">Reported Account</div>
 
-					<a v-if="viewingSpamReport.status.account && viewingSpamReport.status.account.id" :href="`/i/web/profile/${viewingSpamReport.status.account.id}`" target="_blank" class="text-primary">
-		            	<div class="d-flex align-items-center" style="gap:0.61rem;">
-		            		<img
-		            			:src="viewingSpamReport.status.account.avatar"
-		            			width="30"
-		            			height="30"
-		            			style="object-fit: cover;border-radius:30px;"
-		            			onerror="this.src='/storage/avatars/default.png';this.error=null;">
+                    <a v-if="viewingSpamReport.status.account && viewingSpamReport.status.account.id" :href="`/i/web/profile/${viewingSpamReport.status.account.id}`" target="_blank" class="text-primary">
+                        <div class="d-flex align-items-center" style="gap:0.61rem;">
+                            <img
+                                :src="viewingSpamReport.status.account.avatar"
+                                width="30"
+                                height="30"
+                                style="object-fit: cover;border-radius:30px;"
+                                onerror="this.src='/storage/avatars/default.png';this.error=null;">
 
-		            		<div class="d-flex flex-column">
-		            			<p class="font-weight-bold mb-0 text-break" style="font-size: 12px;max-width: 140px;line-height: 16px;" :class="[ viewingSpamReport.status.account.is_admin ? 'text-danger': '']">@{{viewingSpamReport.status.account.acct}}</p>
-		            			<div class="d-flex text-muted mb-0" style="font-size: 10px;gap: 0.5rem;">
-		            				<span>{{viewingSpamReport.status.account.followers_count}} Followers</span>
-		            				<span>·</span>
-		            				<span>Joined {{ timeAgo(viewingSpamReport.status.account.created_at) }}</span>
-		            			</div>
-		            		</div>
-		            	</div>
-		            </a>
-		    	</div>
-	    	</div>
+                            <div class="d-flex flex-column">
+                                <p class="font-weight-bold mb-0 text-break" style="font-size: 12px;max-width: 140px;line-height: 16px;" :class="[ viewingSpamReport.status.account.is_admin ? 'text-danger': '']">@{{viewingSpamReport.status.account.acct}}</p>
+                                <div class="d-flex text-muted mb-0" style="font-size: 10px;gap: 0.5rem;">
+                                    <span>{{viewingSpamReport.status.account.followers_count}} Followers</span>
+                                    <span>·</span>
+                                    <span>Joined {{ timeAgo(viewingSpamReport.status.account.created_at) }}</span>
+                                </div>
+                            </div>
+                        </div>
+                    </a>
+                </div>
+            </div>
 
-			<div v-if="viewingSpamReport && viewingSpamReport.status" class="list-group mt-3">
-				<div v-if="viewingSpamReport && viewingSpamReport.status && viewingSpamReport.status.media_attachments.length" class="list-group-item d-flex flex-column flex-grow-1" style="gap:0.4rem;">
-					<div class="d-flex justify-content-between mt-n1 text-muted small font-weight-bold">
-						<div>Reported Post</div>
-						<a class="font-weight-bold" :href="viewingSpamReport.status.url" target="_blank">View</a>
-					</div>
+            <div v-if="viewingSpamReport && viewingSpamReport.status" class="list-group mt-3">
+                <div v-if="viewingSpamReport && viewingSpamReport.status && viewingSpamReport.status.media_attachments.length" class="list-group-item d-flex flex-column flex-grow-1" style="gap:0.4rem;">
+                    <div class="d-flex justify-content-between mt-n1 text-muted small font-weight-bold">
+                        <div>Reported Post</div>
+                        <a class="font-weight-bold" :href="viewingSpamReport.status.url" target="_blank">View</a>
+                    </div>
 
-					<img
-						v-if="viewingSpamReport.status.media_attachments[0].type === 'image'"
-						:src="viewingSpamReport.status.media_attachments[0].url"
-						height="140"
-						class="rounded"
-						style="object-fit: cover;"
-						onerror="this.src='/storage/no-preview.png';this.error=null;" />
+                    <img
+                        v-if="viewingSpamReport.status.media_attachments[0].type === 'image'"
+                        :src="viewingSpamReport.status.media_attachments[0].url"
+                        height="140"
+                        class="rounded"
+                        style="object-fit: cover;"
+                        onerror="this.src='/storage/no-preview.png';this.error=null;" />
 
-					<video
-						v-else-if="viewingSpamReport.status.media_attachments[0].type === 'video'"
-						height="140"
-						controls
-						:src="viewingSpamReport.status.media_attachments[0].url"
-						onerror="this.src='/storage/no-preview.png';this.onerror=null;"
-						></video>
-				</div>
+                    <video
+                        v-else-if="viewingSpamReport.status.media_attachments[0].type === 'video'"
+                        height="140"
+                        controls
+                        :src="viewingSpamReport.status.media_attachments[0].url"
+                        onerror="this.src='/storage/no-preview.png';this.onerror=null;"
+                        ></video>
+                </div>
 
-				<div
-					v-if="viewingSpamReport &&
-						viewingSpamReport.status &&
-						viewingSpamReport.status.content_text &&
-						viewingSpamReport.status.content_text.length"
-					class="list-group-item d-flex flex-column flex-grow-1"
-					style="gap:0.4rem;">
-					<div class="d-flex justify-content-between mt-n1 text-muted small font-weight-bold">
-						<div>Reported Post Caption</div>
-						<a class="font-weight-bold" :href="viewingSpamReport.status.url" target="_blank">View</a>
-					</div>
-					<p class="mb-0 read-more" style="font-size:12px;overflow-y: hidden">{{ viewingSpamReport.status.content_text }}</p>
-				</div>
-			</div>
+                <div
+                    v-if="viewingSpamReport &&
+                        viewingSpamReport.status &&
+                        viewingSpamReport.status.content_text &&
+                        viewingSpamReport.status.content_text.length"
+                    class="list-group-item d-flex flex-column flex-grow-1"
+                    style="gap:0.4rem;">
+                    <div class="d-flex justify-content-between mt-n1 text-muted small font-weight-bold">
+                        <div>Reported Post Caption</div>
+                        <a class="font-weight-bold" :href="viewingSpamReport.status.url" target="_blank">View</a>
+                    </div>
+                    <p class="mb-0 read-more" style="font-size:12px;overflow-y: hidden">{{ viewingSpamReport.status.content_text }}</p>
+                </div>
+            </div>
 
-	    	<div class="mt-4">
-	    		<div>
-		    		<button
-		    			type="button"
-		    			class="btn btn-dark btn-block rounded-pill"
-		    			@click="handleSpamAction('mark-read')">
-		    			Mark as Read
-		    		</button>
+            <div class="mt-4">
+                <div>
+                    <button
+                        type="button"
+                        class="btn btn-dark btn-block rounded-pill"
+                        @click="handleSpamAction('mark-read')">
+                        Mark as Read
+                    </button>
 
-		    		<button
-		    			type="button"
-		    			class="btn btn-danger btn-block rounded-pill"
-		    			@click="handleSpamAction('mark-not-spam')">
-		    			Mark As Not Spam
-		    		</button>
+                    <button
+                        type="button"
+                        class="btn btn-danger btn-block rounded-pill"
+                        @click="handleSpamAction('mark-not-spam')">
+                        Mark As Not Spam
+                    </button>
 
-		    		<hr class="mt-3 mb-1">
+                    <hr class="mt-3 mb-1">
 
-	    			<div
-	    				class="d-flex flex-row mt-2"
-	    				style="gap:0.3rem;">
-		    			<button
-		    				type="button"
-		    				class="btn btn-dark btn-block btn-sm rounded-pill mt-0"
-		    				@click="handleSpamAction('mark-all-read')">
-		    				Mark All As Read
-		    			</button>
+                    <div
+                        class="d-flex flex-row mt-2"
+                        style="gap:0.3rem;">
+                        <button
+                            type="button"
+                            class="btn btn-dark btn-block btn-sm rounded-pill mt-0"
+                            @click="handleSpamAction('mark-all-read')">
+                            Mark All As Read
+                        </button>
 
-		    			<button
-		    				type="button"
-		    				class="btn btn-dark btn-block btn-sm rounded-pill mt-0"
-		    				@click="handleSpamAction('mark-all-not-spam')">
-		    				Mark All As Not Spam
-		    			</button>
-	    			</div>
+                        <button
+                            type="button"
+                            class="btn btn-dark btn-block btn-sm rounded-pill mt-0"
+                            @click="handleSpamAction('mark-all-not-spam')">
+                            Mark All As Not Spam
+                        </button>
+                    </div>
 
-		    		<div>
-						<hr class="my-2">
-						<div class="d-flex flex-row mt-2" style="gap:0.3rem;">
-							<button
-								type="button"
-								class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-0"
-								@click="handleSpamAction('delete-profile')">
-								Delete Account
-							</button>
-						</div>
-		    		</div>
-	    		</div>
-	    	</div>
-	    </template>
+                    <div>
+                        <hr class="my-2">
+                        <div class="d-flex flex-row mt-2" style="gap:0.3rem;">
+                            <button
+                                type="button"
+                                class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-0"
+                                @click="handleSpamAction('delete-profile')">
+                                Delete Account
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </template>
     </b-modal>
+
+    <template v-if="showRemoteReportModal">
+        <admin-report-modal
+            :open="showRemoteReportModal"
+            :model="remoteReportModalModel"
+            v-on:close="handleCloseRemoteReportModal()"
+            v-on:refresh="refreshRemoteReports()" />
+    </template>
+
+    <div
+        class="modal fade"
+        id="moderatedProfileView"
+        tabindex="-1"
+        role="dialog"
+        aria-labelledby="moderatedProfileViewLabel"
+        aria-hidden="true"
+        data-backdrop="static"
+        ref="moderatedProfileModal">
+      <div class="modal-dialog modal-dialog-centered" role="document">
+        <div v-if="modModalData" class="modal-content">
+          <div class="modal-header">
+            <div class="w-100 d-flex justify-content-between align-items-center">
+                <div class="flex-grow-1">
+                    <i class="far fa-shield-alt"></i>
+                </div>
+                <h5 class="mb-0 lead mt-0 font-weight-bold">Moderated Profile</h5>
+                <div class="flex-grow-1">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close" @click="closeModeratedProfileModal()">
+                      <span aria-hidden="true">&times;</span>
+                    </button>
+                </div>
+            </div>
+          </div>
+          <div class="modal-body">
+            <div class="card mb-0">
+                <div class="card-body bg-lighter text-dark p-3 font-weight-bold d-flex align-items-center justify-content-center flex-column">
+                    <p v-if="modModalData?.profile?.name" class="mb-0 small text-muted">{{ modModalData?.profile?.name }}</p>
+                    <p class="mb-0 font-weight-bold">
+                        {{ modModalData?.profile?.username }}
+                    </p>
+                </div>
+            </div>
+            <p v-if="modModalData?.profile?.remote_url" class="small text-muted text-right mb-1">
+                <a :href="modModalData?.profile?.remote_url" rel="noreferrer" target="_blank">
+                    View remote profile
+                </a>
+            </p>
+
+            <div class="list-group mpl-form">
+                <div class="list-group-item d-flex justify-content-between align-items-center">
+                    <div class="mp-form-label">
+                        <div class="d-flex flex-column">
+                            <p class="mb-0 font-weight-bold">
+                                Banned
+                            </p>
+                            <p class="mb-0 small text-muted">
+                                Ban any activities from this account.
+                            </p>
+                        </div>
+                    </div>
+                    <div class="custom-control custom-checkbox">
+                        <input type="checkbox" class="custom-control-input" id="mp-form-is_banned" v-model="modModalModel.is_banned">
+                        <label class="custom-control-label" for="mp-form-is_banned"></label>
+                    </div>
+                </div>
+
+                <div class="list-group-item d-none justify-content-between align-items-center">
+                    <div class="mp-form-label">
+                        <div class="d-flex flex-column">
+                            <p class="mb-0 font-weight-bold">
+                                No Autolink
+                            </p>
+                            <p class="mb-0 small text-muted">
+                                Disable hashtag, mention and url autolinking from this account.
+                            </p>
+                        </div>
+                    </div>
+                    <div class="custom-control custom-checkbox">
+                        <input type="checkbox" class="custom-control-input" id="mp-form-is_noautolink" v-model="modModalModel.is_noautolink">
+                        <label class="custom-control-label" for="mp-form-is_noautolink"></label>
+                    </div>
+                </div>
+
+                <div class="list-group-item d-none justify-content-between align-items-center">
+                    <div class="mp-form-label">
+                        <div class="d-flex flex-column">
+                            <p class="mb-0 font-weight-bold">
+                                No DMs
+                            </p>
+                            <p class="mb-0 small text-muted">
+                                Ignore DMs from this account.
+                            </p>
+                        </div>
+                    </div>
+                    <div class="custom-control custom-checkbox">
+                        <input type="checkbox" class="custom-control-input" id="mp-form-is_nodms" v-model="modModalModel.is_nodms">
+                        <label class="custom-control-label" for="mp-form-is_nodms"></label>
+                    </div>
+                </div>
+
+                <div class="list-group-item d-none justify-content-between align-items-center">
+                    <div class="mp-form-label">
+                        <div class="d-flex flex-column">
+                            <p class="mb-0 font-weight-bold">
+                                No Trending
+                            </p>
+                            <p class="mb-0 small text-muted">
+                                Prevent posts from this account from appearing in trending lists or feeds.
+                            </p>
+                        </div>
+                    </div>
+                    <div class="custom-control custom-checkbox">
+                        <input type="checkbox" class="custom-control-input" id="mp-form-is_notrending" v-model="modModalModel.is_notrending">
+                        <label class="custom-control-label" for="mp-form-is_notrending"></label>
+                    </div>
+                </div>
+
+                <div class="list-group-item d-none justify-content-between align-items-center">
+                    <div class="mp-form-label">
+                        <div class="d-flex flex-column">
+                            <p class="mb-0 font-weight-bold">
+                                Mark NSFW
+                            </p>
+                            <p class="mb-0 small text-muted">
+                                Mark all posts as sensitive, and apply CWs to future posts.
+                            </p>
+                        </div>
+                    </div>
+                    <div class="custom-control custom-checkbox">
+                        <input type="checkbox" class="custom-control-input" id="mp-form-is_nsfw" v-model="modModalModel.is_nsfw">
+                        <label class="custom-control-label" for="mp-form-is_nsfw"></label>
+                    </div>
+                </div>
+
+                <div class="list-group-item d-none justify-content-between align-items-center">
+                    <div class="mp-form-label">
+                        <div class="d-flex flex-column">
+                            <p class="mb-0 font-weight-bold">
+                                Mark Unlisted
+                            </p>
+                            <p class="mb-0 small text-muted">
+                                Mark all future posts as unlisted, hidden from global/tag feeds.
+                            </p>
+                        </div>
+                    </div>
+                    <div class="custom-control custom-checkbox">
+                        <input type="checkbox" class="custom-control-input" id="mp-form-is_unlisted" v-model="modModalModel.is_unlisted">
+                        <label class="custom-control-label" for="mp-form-is_unlisted"></label>
+                    </div>
+                </div>
+            </div>
+
+            <div class="py-3">
+                <label class="small text-muted">Account Notes (only visible to admins)</label>
+                <textarea class="form-control" v-model="modModalData.note" placeholder="Add an optional note" maxlength="500"></textarea>
+            </div>
+          </div>
+          <div class="modal-footer d-flex justify-content-between align-items-center">
+            <button type="button" class="btn btn-link text-dark" data-dismiss="modal" @click="closeModeratedProfileModal()">Close</button>
+            <div class="d-flex flex-grow-1 align-items-center gap-1">
+                <button type="button" class="btn btn-danger" @click.prevent="handleModProfileModalDelete()">Delete</button>
+                <button type="button" class="btn btn-primary btn-block" @click.prevent="handleModProfileModalUpdate()">Save</button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
 </div>
 </template>
 
 <script type="text/javascript">
-	export default {
-		data() {
-			return {
-				loaded: false,
-				stats: {
-					total: 0,
-					open: 0,
-					closed: 0,
-					autospam: 0,
-					autospam_open: 0,
-				},
-				tabIndex: 0,
-				reports: [],
-				pagination: {},
-				showReportModal: false,
-				viewingReport: undefined,
-				viewingReportLoading: false,
-				autospam: [],
-				autospamPagination: {},
-				autospamLoaded: false,
-				showSpamReportModal: false,
-				viewingSpamReport: undefined,
-				viewingSpamReportLoading: false
-			}
-		},
+    import AdminRemoteReportModal from "./partial/AdminRemoteReportModal.vue";
 
-		mounted() {
-			let u = new URLSearchParams(window.location.search);
-			if(u.has('tab') && u.has('id') && u.get('tab') === 'autospam') {
-				this.fetchStats(null, '/i/admin/api/reports/spam/all');
-				this.fetchSpamReport(u.get('id'));
-			} else if(u.has('tab') && u.has('id') && u.get('tab') === 'report') {
-				this.fetchStats();
-				this.fetchReport(u.get('id'));
-			} else {
-				window.history.pushState(null, null, '/i/admin/reports');
-				this.fetchStats();
-			}
+    export default {
+        components: {
+            "admin-report-modal": AdminRemoteReportModal
+        },
 
-			this.$root.$on('bv::modal::hide', (bvEvent, modalId) => {
-				window.history.pushState(null, null, '/i/admin/reports');
-			})
-		},
+        data() {
+            return {
+                loaded: false,
+                stats: {
+                    total: 0,
+                    open: 0,
+                    closed: 0,
+                    autospam: 0,
+                    autospam_open: 0,
+                    remote_open: 0,
+                },
+                tabIndex: 0,
+                reports: [],
+                pagination: {},
+                showReportModal: false,
+                viewingReport: undefined,
+                viewingReportLoading: false,
+                autospam: [],
+                autospamPagination: {},
+                autospamLoaded: false,
+                showSpamReportModal: false,
+                viewingSpamReport: undefined,
+                viewingSpamReportLoading: false,
+                remoteReportsLoaded: false,
+                showRemoteReportModal: undefined,
+                remoteReportModalModel: {},
+                moderatedProfiles: [],
+                moderatedProfilesPagination: {},
+                moderatedProfilesSearchInput: undefined,
+                modModalData: undefined,
+                modModalModel: {},
+            }
+        },
 
-		methods: {
-			toggleTab(idx) {
-				switch(idx) {
-					case 0:
-						this.fetchStats('/i/admin/api/reports/all');
-					break;
+        mounted() {
+            let u = new URLSearchParams(window.location.search);
+            if(u.has('tab') && u.get('tab') === 'moderated-profiles' && u.has('action') && u.has('id') && u.get('action') === 'view') {
+                this.tabIndex = 4;
+                this.fetchModeratedAccounts();
+                this.fetchModeratedProfile(u.get('id'));
+            } else if(u.has('tab') && u.get('tab') === 'autospam' && !u.has('id')) {
+                this.tabIndex = 2;
+                this.fetchStats(null, '/i/admin/api/reports/spam/all');
+            } else if(u.has('tab') && u.get('tab') === 'closed') {
+                this.tabIndex = 1;
+                this.fetchStats('/i/admin/api/reports/all?filter=closed')
+            } else if(u.has('tab') && u.get('tab') === 'closed') {
+                this.tabIndex = 3;
+                this.fetchStats('/i/admin/api/reports/all?filter=remote')
+            } else if(u.has('tab') && u.get('tab') === 'moderated-profiles') {
+                this.tabIndex = 4;
+                this.fetchModeratedAccounts();
+            } else if(u.has('tab') && u.has('id') && u.get('tab') === 'autospam') {
+                this.fetchStats(null, '/i/admin/api/reports/spam/all');
+                this.fetchSpamReport(u.get('id'));
+            } else if(u.has('tab') && u.has('id') && u.get('tab') === 'report') {
+                this.fetchStats();
+                this.fetchReport(u.get('id'));
+            } else {
+                window.history.pushState(null, null, '/i/admin/reports');
+                this.fetchStats();
+            }
 
-					case 1:
-						this.fetchStats('/i/admin/api/reports/all?filter=closed')
-					break;
+            this.$root.$on('bv::modal::hide', (bvEvent, modalId) => {
+                window.history.pushState(null, null, '/i/admin/reports');
+            })
+        },
 
-					case 2:
-						this.fetchStats(null, '/i/admin/api/reports/spam/all');
-					break;
-				}
-				window.history.pushState(null, null, '/i/admin/reports');
-				this.tabIndex = idx;
-			},
+        methods: {
+            toggleTab(idx) {
+                switch(idx) {
+                    case 0:
+                        this.fetchStats('/i/admin/api/reports/all');
+                        window.history.pushState(null, null, '/i/admin/reports');
+                    break;
+
+                    case 1:
+                        this.fetchStats('/i/admin/api/reports/all?filter=closed')
+                        window.history.pushState(null, null, '/i/admin/reports?tab=closed');
+                    break;
+
+                    case 2:
+                        this.fetchStats(null, '/i/admin/api/reports/spam/all');
+                        window.history.pushState(null, null, '/i/admin/reports?tab=autospam');
+                    break;
+
+                    case 3:
+                        this.fetchRemoteReports();
+                        window.history.pushState(null, null, '/i/admin/reports?tab=remote');
+                    break;
+
+                    case 4:
+                        this.fetchModeratedAccounts();
+                        window.history.pushState(null, null, '/i/admin/reports?tab=moderated-profiles');
+                    break;
+                }
+                this.tabIndex = idx;
+            },
 
             prettyCount(str) {
                 if(str) {
@@ -689,55 +1143,116 @@
             },
 
             formatDate(str) {
-            	let date = new Date(str);
-            	return new Intl.DateTimeFormat('default', {
-            		month: 'long',
-            		day: 'numeric',
-            		year: 'numeric',
-            		hour: 'numeric',
-            		minute: 'numeric'
-            	}).format(date);
+                let date = new Date(str);
+                return new Intl.DateTimeFormat('default', {
+                    month: 'long',
+                    day: 'numeric',
+                    year: 'numeric',
+                    hour: 'numeric',
+                    minute: 'numeric'
+                }).format(date);
             },
 
             reportLabel(report) {
-            	switch(report.object_type) {
-            		case 'App\\Profile':
-            			return `${report.type} Profile`;
-            		break;
-            		case 'App\\Status':
-            			return `${report.type} Post`;
-            		break;
-            	}
+                switch(report.object_type) {
+                    case 'App\\Profile':
+                        return `${report.type} Profile`;
+                    break;
+                    case 'App\\Status':
+                        return `${report.type} Post`;
+                    break;
+                    case 'App\\Story':
+                        return `${report.type} Story`;
+                    break;
+                }
             },
 
-			fetchStats(fetchReportsUrl = '/i/admin/api/reports/all', fetchSpamUrl = null) {
-				axios.get('/i/admin/api/reports/stats')
-				.then(res => {
-					this.stats = res.data;
-				})
-				.finally(() => {
-					if(fetchReportsUrl) {
-						this.fetchReports(fetchReportsUrl);
-					} else if(fetchSpamUrl) {
-						this.fetchAutospam(fetchSpamUrl);
-					}
-					$('[data-toggle="tooltip"]').tooltip()
-				});
-			},
+            fetchStats(fetchReportsUrl = '/i/admin/api/reports/all', fetchSpamUrl = null) {
+                axios.get('/i/admin/api/reports/stats')
+                .then(res => {
+                    this.stats = res.data;
+                })
+                .finally(() => {
+                    if(fetchReportsUrl) {
+                        this.fetchReports(fetchReportsUrl);
+                    } else if(fetchSpamUrl) {
+                        this.fetchAutospam(fetchSpamUrl);
+                    }
+                    $('[data-toggle="tooltip"]').tooltip()
+                });
+            },
 
-			fetchReports(url = '/i/admin/api/reports/all') {
-				axios.get(url)
-				.then(res => {
-					this.reports = res.data.data;
-            		this.pagination = {
+            fetchModeratedAccounts(apiUrl = '/i/admin/api/reports/moderated-profiles') {
+                axios.get(apiUrl)
+                .then(res => {
+                    this.moderatedProfiles = res.data.data;
+                    this.moderatedProfilesPagination = {
+                        prev: res.data.links.prev,
+                        next: res.data.links.next
+                    };
+                })
+                .finally(() => {
+                    this.loaded = true;
+                    $('[data-toggle="tooltip"]').tooltip()
+                })
+            },
+
+            paginateModeratedAccounts(dir) {
+                event.currentTarget.blur();
+                let url = dir == 'next' ? this.moderatedProfilesPagination.next : this.moderatedProfilesPagination.prev;
+                this.fetchModeratedAccounts(url);
+            },
+
+            fetchReports(url = '/i/admin/api/reports/all') {
+                axios.get(url)
+                .then(res => {
+                    this.reports = res.data.data;
+                    this.pagination = {
                         next: res.data.links.next,
                         prev: res.data.links.prev
                     };
-				})
-				.finally(() => {
-					this.loaded = true;
-				});
-			},
+                })
+                .finally(() => {
+                    this.loaded = true;
+                });
+            },
+
+            fetchRemoteReports(url = '/i/admin/api/reports/remote') {
+                axios.get(url)
+                .then(res => {
+                    this.reports = res.data.data;
+                    this.pagination = {
+                        next: res.data.links.next,
+                        prev: res.data.links.prev
+                    };
+                })
+                .finally(() => {
+                    this.loaded = true;
+                    this.remoteReportsLoaded = true;
+                });
+            },
+
+            remoteReportPaginate(dir) {
+                event.currentTarget.blur();
+                let url = dir == 'next' ? this.pagination.next : this.pagination.prev;
+                this.fetchRemoteReports(url);
+            },
+
+            handleCloseRemoteReportModal() {
+                this.showRemoteReportModal = false;
+            },
+
+            showRemoteReport(report) {
+                this.remoteReportModalModel = report;
+                this.showRemoteReportModal = true;
+            },
+
+            refreshRemoteReports() {
+                this.fetchStats('');
+                this.$nextTick(() => {
+                    this.toggleTab(3);
+                })
+            },
 
             paginate(dir) {
                 event.currentTarget.blur();
@@ -746,107 +1261,122 @@
             },
 
             viewReport(report) {
-            	this.viewingReportLoading = false;
-            	this.viewingReport = report;
-            	this.showReportModal = true;
-            	window.history.pushState(null, null, '/i/admin/reports?tab=report&id=' + report.id);
-            	setTimeout(() => {
-            		pixelfed.readmore()
-            	}, 1000)
+                this.viewingReportLoading = false;
+                this.viewingReport = report;
+                this.showReportModal = true;
+                window.history.pushState(null, null, '/i/admin/reports?tab=report&id=' + report.id);
+                setTimeout(() => {
+                    pixelfed.readmore()
+                }, 1000)
             },
 
             handleAction(type, action) {
-            	event.currentTarget.blur();
+                event.currentTarget.blur();
 
-            	this.viewingReportLoading = true;
+                this.viewingReportLoading = true;
 
-				if(action !== 'ignore' && !window.confirm(this.getActionLabel(type, action))) {
-					this.viewingReportLoading = false;
-					return;
-				}
+                if(action !== 'ignore' && !window.confirm(this.getActionLabel(type, action))) {
+                    this.viewingReportLoading = false;
+                    return;
+                }
 
-				this.loaded = false;
-				axios.post('/i/admin/api/reports/handle', {
-					id: this.viewingReport.id,
-					object_id: this.viewingReport.object_id,
-					object_type: this.viewingReport.object_type,
-					action: action,
-					action_type: type
-				})
-				.catch(err => {
-					swal('Error', err.response.data.error, 'error');
-				})
-				.finally(() => {
-					this.viewingReportLoading = true;
-					this.viewingReport = false;
-					this.showReportModal = false;
-					setTimeout(() => {
-						this.fetchStats();
-					}, 1000);
-				})
+                this.loaded = false;
+
+                axios.post('/i/admin/api/reports/handle', {
+                    id: this.viewingReport.id,
+                    object_id: this.viewingReport.object_id,
+                    object_type: this.viewingReport.object_type,
+                    action: action,
+                    action_type: type
+                })
+                .catch(err => {
+                    swal('Error', err.response.data.error, 'error');
+                })
+                .finally(() => {
+                    this.viewingReportLoading = true;
+                    this.viewingReport = false;
+                    this.showReportModal = false;
+                    setTimeout(() => {
+                        this.fetchStats();
+                    }, 1000);
+                })
             },
 
             getActionLabel(type, action) {
-            	if(type === 'profile') {
-            		switch(action) {
-            			case 'ignore':
-            				return 'Are you sure you want to ignore this profile report?';
-            			break;
+                if(type === 'profile') {
+                    switch(action) {
+                        case 'ignore':
+                            return 'Are you sure you want to ignore this profile report?';
+                        break;
 
-            			case 'nsfw':
-            				return 'Are you sure you want to mark this profile as NSFW?';
-            			break;
+                        case 'nsfw':
+                            return 'Are you sure you want to mark this profile as NSFW?';
+                        break;
 
-            			case 'unlist':
-            				return 'Are you sure you want to mark all posts by this profile as unlisted?';
-            			break;
+                        case 'unlist':
+                            return 'Are you sure you want to mark all posts by this profile as unlisted?';
+                        break;
 
-            			case 'private':
-            				return 'Are you sure you want to mark all posts by this profile as private?';
-            			break;
+                        case 'private':
+                            return 'Are you sure you want to mark all posts by this profile as private?';
+                        break;
 
-            			case 'delete':
-            				return 'Are you sure you want to delete this profile?';
-            			break;
-            		}
-            	} else if(type === 'post') {
-            		switch(action) {
-            			case 'ignore':
-            				return 'Are you sure you want to ignore this post report?';
-            			break;
+                        case 'delete':
+                            return 'Are you sure you want to delete this profile?';
+                        break;
+                    }
+                } else if(type === 'post') {
+                    switch(action) {
+                        case 'ignore':
+                            return 'Are you sure you want to ignore this post report?';
+                        break;
 
-            			case 'nsfw':
-            				return 'Are you sure you want to mark this post as NSFW?';
-            			break;
+                        case 'nsfw':
+                            return 'Are you sure you want to mark this post as NSFW?';
+                        break;
 
-            			case 'unlist':
-            				return 'Are you sure you want to mark this post as unlisted?';
-            			break;
+                        case 'unlist':
+                            return 'Are you sure you want to mark this post as unlisted?';
+                        break;
 
-            			case 'private':
-            				return 'Are you sure you want to mark this post as private?';
-            			break;
+                        case 'private':
+                            return 'Are you sure you want to mark this post as private?';
+                        break;
 
-            			case 'delete':
-            				return 'Are you sure you want to delete this post?';
-            			break;
-            		}
-            	}
+                        case 'delete':
+                            return 'Are you sure you want to delete this post?';
+                        break;
+                    }
+                } else if(type === 'story') {
+                    switch(action) {
+                        case 'ignore':
+                            return 'Are you sure you want to ignore this story report?';
+                        break;
+
+                        case 'delete':
+                            return 'Are you sure you want to delete this story?';
+                        break;
+
+                        case 'delete-all':
+                            return 'Are you sure you want to delete all stories by this account?';
+                        break;
+                    }
+                }
             },
 
             fetchAutospam(url = '/i/admin/api/reports/spam/all') {
-            	axios.get(url)
-            	.then(res => {
-            		this.autospam = res.data.data;
-            		this.autospamPagination = {
+                axios.get(url)
+                .then(res => {
+                    this.autospam = res.data.data;
+                    this.autospamPagination = {
                         next: res.data.links.next,
                         prev: res.data.links.prev
                     }
-            	})
-            	.finally(() => {
-            		this.autospamLoaded = true;
-            		this.loaded = true;
-            	})
+                })
+                .finally(() => {
+                    this.autospamLoaded = true;
+                    this.loaded = true;
+                })
             },
 
             autospamPaginate(dir) {
@@ -856,82 +1386,301 @@
             },
 
             viewSpamReport(report) {
-            	this.viewingSpamReportLoading = false;
-            	this.viewingSpamReport = report;
-            	this.showSpamReportModal = true;
-            	window.history.pushState(null, null, '/i/admin/reports?tab=autospam&id=' + report.id);
-            	setTimeout(() => {
-            		pixelfed.readmore()
-            	}, 1000)
+                this.viewingSpamReportLoading = false;
+                this.viewingSpamReport = report;
+                this.showSpamReportModal = true;
+                window.history.pushState(null, null, '/i/admin/reports?tab=autospam&id=' + report.id);
+                setTimeout(() => {
+                    pixelfed.readmore()
+                }, 1000)
             },
 
             getSpamActionLabel(action) {
-        		switch(action) {
-        			case 'mark-all-read':
-        				return 'Are you sure you want to mark all spam reports by this account as read?';
-        			break;
+                switch(action) {
+                    case 'mark-all-read':
+                        return 'Are you sure you want to mark all spam reports by this account as read?';
+                    break;
 
-        			case 'mark-all-not-spam':
-        				return 'Are you sure you want to mark all spam reports by this account as not spam?';
-        			break;
+                    case 'mark-all-not-spam':
+                        return 'Are you sure you want to mark all spam reports by this account as not spam?';
+                    break;
 
-        			case 'delete-profile':
-        				return 'Are you sure you want to delete this profile?';
-        			break;
-        		}
+                    case 'delete-profile':
+                        return 'Are you sure you want to delete this profile?';
+                    break;
+                }
             },
 
             handleSpamAction(action) {
-            	event.currentTarget.blur();
+                event.currentTarget.blur();
 
-            	this.viewingSpamReportLoading = true;
+                this.viewingSpamReportLoading = true;
 
-				if(action !== 'mark-not-spam' && action !== 'mark-read' && !window.confirm(this.getSpamActionLabel(action))) {
-					this.viewingSpamReportLoading = false;
-					return;
-				}
+                if(action !== 'mark-not-spam' && action !== 'mark-read' && !window.confirm(this.getSpamActionLabel(action))) {
+                    this.viewingSpamReportLoading = false;
+                    return;
+                }
 
-				this.loaded = false;
-				axios.post('/i/admin/api/reports/spam/handle', {
-					id: this.viewingSpamReport.id,
-					action: action,
-				})
-				.catch(err => {
-					swal('Error', err.response.data.error, 'error');
-				})
-				.finally(() => {
-					this.viewingSpamReportLoading = true;
-					this.viewingSpamReport = false;
-					this.showSpamReportModal = false;
-					setTimeout(() => {
-						this.fetchStats(null, '/i/admin/api/reports/spam/all');
-					}, 500);
-				})
+                this.loaded = false;
+                axios.post('/i/admin/api/reports/spam/handle', {
+                    id: this.viewingSpamReport.id,
+                    action: action,
+                })
+                .catch(err => {
+                    swal('Error', err.response.data.error, 'error');
+                })
+                .finally(() => {
+                    this.viewingSpamReportLoading = true;
+                    this.viewingSpamReport = false;
+                    this.showSpamReportModal = false;
+                    setTimeout(() => {
+                        this.fetchStats(null, '/i/admin/api/reports/spam/all');
+                    }, 500);
+                })
             },
 
             fetchReport(id) {
-            	axios.get('/i/admin/api/reports/get/' + id)
-            	.then(res => {
-            		this.tabIndex = 0;
-            		this.viewReport(res.data.data);
-            	})
-            	.catch(err => {
-            		this.fetchStats();
-            		window.history.pushState(null, null, '/i/admin/reports');
-            	})
+                axios.get('/i/admin/api/reports/get/' + id)
+                .then(res => {
+                    this.tabIndex = 0;
+                    this.viewReport(res.data.data);
+                })
+                .catch(err => {
+                    this.fetchStats();
+                    window.history.pushState(null, null, '/i/admin/reports');
+                })
             },
 
             fetchSpamReport(id) {
-            	axios.get('/i/admin/api/reports/spam/get/' + id)
-            	.then(res => {
-            		this.tabIndex = 2;
-            		this.viewSpamReport(res.data.data);
-            	})
-            	.catch(err => {
-            		this.fetchStats();
-            		window.history.pushState(null, null, '/i/admin/reports');
-            	})
+                axios.get('/i/admin/api/reports/spam/get/' + id)
+                .then(res => {
+                    this.tabIndex = 2;
+                    this.viewSpamReport(res.data.data);
+                })
+                .catch(err => {
+                    this.fetchStats();
+                    window.history.pushState(null, null, '/i/admin/reports');
+                })
+            },
+
+            truncateText(text, maxLength, appendEllipsis = true) {
+                if(!text || !text.length) {
+                    return
+                }
+
+                if (text.length <= maxLength) {
+                    return text;
+                }
+
+                const truncated = text.slice(0, maxLength).trim();
+                return appendEllipsis ? truncated + '...' : truncated;
+            },
+
+            getModerationLabels(acct) {
+                if(acct.is_banned) {
+                    return `<span class="badge badge-danger">Banned</span>`
+                }
+
+                let labels = [];
+
+                if(acct.is_banned) labels.push('Banned')
+                if(acct.is_noautolink) labels.push('No Autolink')
+                if(acct.is_nodms) labels.push('No DMS')
+                if(acct.is_notrending) labels.push('No Trending')
+                if(acct.is_nsfw) labels.push('NSFW')
+                if(acct.is_unlisted) labels.push('Unlisted')
+
+                return labels.map((item, index) => {
+                    const colorClass = item === 'Banned' ? 'danger' : 'primary';
+                    return `<span class="badge badge-${colorClass}">${item}</span>`;
+                }).join(' ');
+            },
+
+            handleModeratedProfileSearch(event) {
+                event.currentTarget.blur()
+                let url = `/i/admin/api/reports/moderated-profiles?search=${this.moderatedProfilesSearchInput}`
+                this.fetchModeratedAccounts(url)
+            },
+
+            clearModeratedProfileSearch() {
+                this.moderatedProfilesSearchInput = undefined;
+                this.fetchModeratedAccounts();
+            },
+
+            openModeratedProfileModal(report) {
+                this.modModalData = report;
+                this.modModalModel = {
+                    is_banned: report.is_banned,
+                    is_noautolink: report.is_noautolink,
+                    is_nodms: report.is_nodms,
+                    is_notrending: report.is_notrending,
+                    is_nsfw: report.is_nsfw,
+                    is_unlisted: report.is_unlisted,
+                }
+                $(this.$refs.moderatedProfileModal).modal('show');
+                window.history.pushState(null, null, `/i/admin/reports?tab=moderated-profiles&action=view&id=${report.id}`)
+            },
+
+            handleModProfileModalUpdate() {
+                axios.post(
+                    '/i/admin/api/reports/moderated-profiles/update',
+                    {...this.modModalData, ...this.modModalModel}
+                ).then(res => {
+                    window.history.pushState(null, null, `/i/admin/reports?tab=moderated-profiles`)
+                    window.location.reload();
+                }).catch(error => {
+                    let errorMessage = 'An error occurred';
+                    if (error.response) {
+                        errorMessage = `Error ${error.response.status}: ${error.response.data.error || error.response.data.message || error.response.statusText}`;
+                    } else if (error.request) {
+                        errorMessage = 'No response received from server';
+                    } else {
+                        errorMessage = error.message;
+                    }
+                    swal('Error', errorMessage, 'error')
+                }).finally(() => {
+                    $(this.$refs.moderatedProfileModal).modal('hide');
+                })
+            },
+
+            handleModProfileModalDelete() {
+                swal({
+                    title: 'Confirm Delete',
+                    text: 'Are you sure you want to delete this moderated profile ruleset?',
+                    buttons: {
+                        cancel: "Cancel",
+                        danger: {
+                            text: "Delete",
+                            value: 'delete',
+                        }
+                    }
+                }).then((val) => {
+                    if(val === 'delete') {
+                        axios.post('/i/admin/api/reports/moderated-profiles/delete', { id: this.modModalData.id})
+                        .then(res => {
+                            window.history.pushState(null, null, '/i/admin/reports?tab=moderated-profiles');
+                            window.location.reload();
+                        })
+                    }
+                    $(this.$refs.moderatedProfileModal).modal('hide');
+                    swal.close()
+                })
+            },
+
+            fetchModeratedProfile(id) {
+                axios.get(`/i/admin/api/reports/moderated-profiles/show?id=${id}`)
+                .then(res => {
+                    this.modModalData = res.data.data;
+                    let report = res.data.data;
+
+                    this.modModalModel = {
+                        is_banned: report.is_banned,
+                        is_noautolink: report.is_noautolink,
+                        is_nodms: report.is_nodms,
+                        is_notrending: report.is_notrending,
+                        is_nsfw: report.is_nsfw,
+                        is_unlisted: report.is_unlisted,
+                    }
+
+                    $(this.$refs.moderatedProfileModal).modal('show');
+                }).catch(err => {
+                    window.history.pushState(null, null, '/i/admin/reports?tab=moderated-profiles');
+                    swal('Error', 'Invalid moderated profile id!', 'error');
+                })
+            },
+
+            addModeratedProfile() {
+                swal({
+                    text: 'Enter profile URL (ie: https://mastodon.social/@Mastodon)',
+                    content: "input",
+                    button: {
+                        text: "Add",
+                        closeModal: false,
+                    },
+                }).then(val => {
+                    if (!val) throw null;
+
+                    if(val.startsWith('@')) {
+                        swal('Error', 'Invalid URL, webfinger is not supported yet.', 'error');
+                        throw null;
+                    }
+
+                    if(!val.startsWith('http')) {
+                        swal('Error', 'Invalid URL', 'error');
+                        throw null;
+                    }
+
+                    if(val.indexOf('.') === -1) {
+                        swal('Error', 'Invalid URL', 'error');
+                        throw null;
+                    }
+
+                    let params = {
+                        url: val
+                    }
+
+                    return axios.post('/i/admin/api/reports/moderated-profiles/create', params);
+                }).then(json => {
+                    if(json && json.data && json.data?.id) {
+                        window.location.href = `/i/admin/reports?tab=moderated-profiles&action=view&id=${json.data?.id}`
+                        return;
+                    }
+                    swal.stopLoading();
+                    swal.close();
+                }).catch(err => {
+                    if (err) {
+                        if(err?.response?.data?.error) {
+                            swal("Error", err?.response?.data?.error, "error");
+                        } else {
+                            swal("Error", "Something went wrong!", "error");
+                        }
+                    } else {
+                        swal.stopLoading();
+                        swal.close();
+                    }
+                });
+            },
+
+            closeModeratedProfileModal() {
+                window.history.pushState(null, null, '/i/admin/reports?tab=moderated-profiles');
+            },
+
+            exportModeratedProfiles() {
+                axios.get('/i/admin/api/reports/moderated-profiles/export', {
+                    responseType: "blob"
+                })
+                .then(res => {
+                    let host = new URL(window.location.href)
+                    let date = new Date();
+                    let dateStamp = `${date.getMonth()}-${date.getDate()}-${date.getFullYear()}-${Date.now()}`;
+                    let filename = host.host + '-moderated-profiles-' + dateStamp + '.json';
+                    let el = document.createElement('a');
+                    el.setAttribute('download', filename)
+                    const href = URL.createObjectURL(res.data);
+                    el.href = href;
+                    el.setAttribute('target', '_blank');
+                    el.click();
+
+                    swal(
+                        'Success!',
+                        'You have successfully exported the moderated profile backup.',
+                        'success'
+                    )
+                })
             }
-		}
-	}
+        }
+    }
 </script>
+
+<style lang="scss" scoped>
+    .mpl-form {
+        p {
+            line-height: 1;
+
+            &:first-child {
+                font-size: 14px;
+                line-height: 1.6;
+            }
+        }
+    }
+</style>
diff --git a/resources/assets/components/admin/AdminSettings.vue b/resources/assets/components/admin/AdminSettings.vue
new file mode 100644
index 000000000..88b6192d4
--- /dev/null
+++ b/resources/assets/components/admin/AdminSettings.vue
@@ -0,0 +1,1568 @@
+<template>
+<div v-if="loaded">
+    <div class="header bg-primary pb-2 mt-n4">
+        <div class="container-fluid">
+            <div class="header-body">
+                <div class="row align-items-center py-4">
+                    <div class="col-lg-6 col-7">
+                        <p class="display-1 text-white d-inline-block mb-0">Settings</p>
+                        <p class="h3 text-white font-weight-light">Manage your server settings</p>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="container">
+        <div class="row">
+            <div class="col-12 col-md-3">
+                <div class="nav-wrapper">
+                    <div class="nav flex-column nav-pills" id="tabs-icons-text" role="tablist" aria-orientation="vertical">
+                        <div v-for="tab in tabs" class="nav-item">
+                            <a class="nav-link mb-sm-3" :class="{ active: tabIndex === tab.id }" href="#" @click.prevent="toggleTab(tab.id)">
+                                <i :class="tab.icon"></i>
+                                <span class="ml-2">{{ tab.title }}</span>
+                            </a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-12 col-md-9">
+                <div class="card shadow mt-3">
+                    <div class="card-body">
+                        <div class="tab-content">
+
+                            <div v-if="tabIndex === 1" class="tab-pane fade show active">
+                                <tab-header title="Settings" :saving="isSubmitting" :saved="isSubmittingTimeout" @save="handleSave('overview')" />
+
+                                <div class="row">
+                                    <div class="col-12 col-md-6">
+                                        <div class="card shadow-none border card-body" style="padding: 1.1rem 1.6rem">
+                                            <div class="form-group mb-0">
+                                                <label for="form-summary" class="font-weight-bold">Registration Status</label>
+                                                <select v-model="features.registration_status" class="form-control form-control-muted">
+                                                    <option value="open" >Open - Anyone can register</option>
+                                                    <option value="filtered">Filtered - Anyone can apply (Curated Onboarding)</option>
+                                                    <option value="closed">Closed - Nobody can register</option>
+                                                </select>
+                                            </div>
+                                        </div>
+
+                                        <checkbox
+                                            name="Cloud Storage"
+                                            :value="features.cloud_storage"
+                                            description="Store photos and videos on S3 compatible object storage providers."
+                                            @change="handleChange($event, 'features', 'cloud_storage')"
+                                        />
+
+                                        <checkbox
+                                            name="ActivityPub"
+                                            :value="features.activitypub_enabled"
+                                            description="ActivityPub federation, compatible with Pixelfed, Mastodon and other projects."
+                                            @change="handleChange($event, 'features', 'activitypub_enabled')"
+                                        />
+
+                                        <checkbox
+                                            name="Authorized Fetch Mode"
+                                            :value="features.authorized_fetch"
+                                            description="Strictly enforce domain restrictions by enabling Authorized Fetch mode."
+                                            @change="handleChange($event, 'features', 'authorized_fetch')"
+                                        />
+
+                                        <checkbox
+                                            name="Account Migration"
+                                            :value="features.account_migration"
+                                            description="Allow local accounts to migrate to other local or remote accounts."
+                                            @change="handleChange($event, 'features', 'account_migration')"
+                                        />
+                                    </div>
+
+                                    <div class="col-12 col-md-6">
+                                        <checkbox
+                                            name="Mobile APIs"
+                                            :value="features.mobile_apis"
+                                            description="Enable apis required for official mobile app support and 3rd party apps."
+                                            @change="handleChange($event, 'features', 'mobile_apis')"
+                                        />
+
+                                        <checkbox
+                                            name="Stories"
+                                            :value="features.stories"
+                                            description="Allow users to share federated ephemeral Stories that disappear after 24 hours."
+                                            @change="handleChange($event, 'features', 'stories')"
+                                        />
+
+                                        <checkbox
+                                            name="Instagram Import"
+                                            :value="features.instagram_import"
+                                            description="Enable users to use the <span class='font-weight-bold'>experimental</span> Instagram Import support."
+                                            @change="handleChange($event, 'features', 'instagram_import')"
+                                        />
+
+                                        <!-- <checkbox
+                                            name="Allowlist Mode"
+                                            :value="features.activitypub_enabled"
+                                            description="Permit interactions only with instances you specifically authorize, both for sending and receiving."
+                                            @change="handleChange($event, 'features', 'activitypub_enabled')"
+                                        /> -->
+
+                                        <checkbox
+                                            name="Spam detection"
+                                            :value="features.autospam_enabled"
+                                            description="Detect and remove spam from timelines using the automated Autospam detection."
+                                            @change="handleChange($event, 'features', 'autospam_enabled')"
+                                        />
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div v-else-if="tabIndex === 'landing'" class="tab-pane fade show active" role="tabpanel">
+                                <tab-header title="Landing" :saving="isSubmitting" :saved="isSubmittingTimeout" @save="handleSave('landing')" />
+
+                                <div class="row">
+                                   <div class="col-12 col-md-6">
+                                        <div class="card shadow-none border card-body" style="padding: 1.1rem 1.6rem">
+                                            <div class="form-group mb-0">
+                                                <label for="form-summary" class="font-weight-bold">Admin Account</label>
+                                                <select v-model="landing.current_admin" class="form-control form-control-muted">
+                                                    <option disabled="" value="0">Select a designated admin</option>
+                                                    <option v-for="(acct, index) in landing.admins" :key="'pfc-' + acct + index" :value="acct.profile_id">{{ acct.username }}</option>
+                                                </select>
+                                            </div>
+                                        </div>
+
+                                        <checkbox
+                                            name="Show Directory"
+                                            :value="landing.show_directory"
+                                            description="Show the account directory on the landing page for guest users."
+                                            @change="handleChange($event, 'landing', 'show_directory')"
+                                        />
+                                    </div>
+
+                                    <div class="col-12 col-md-6">
+                                        <checkbox
+                                            name="Show Explore Feed"
+                                            :value="landing.show_explore"
+                                            description="Show the explore feed of popular posts on the landing page for guest users."
+                                            @change="handleChange($event, 'landing', 'show_explore')"
+                                        />
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div v-else-if="tabIndex === 'branding'" class="tab-pane fade show active" role="tabpanel">
+                                <tab-header title="Branding" :saving="isSubmitting" :saved="isSubmittingTimeout" @save="handleSave('branding')" />
+
+                                <div class="row">
+                                    <div class="col-12 col-md-8">
+                                        <div class="card shadow-none border card-body" style="padding: 1.1rem 1.6rem">
+                                            <div class="form-group mb-1">
+                                                <label for="form-summary" class="font-weight-bold">Server Name</label>
+                                                <input
+                                                    class="form-control form-control-muted"
+                                                    placeholder="Pixelfed"
+                                                    v-model="branding.name" />
+                                            </div>
+                                            <p class="help-text small text-muted mb-0">
+                                                The instance name used in titles, metadata and apis.
+                                            </p>
+                                        </div>
+
+                                        <div class="card shadow-none border card-body">
+                                            <div class="form-group mb-1">
+                                                <label for="form-summary" class="font-weight-bold">Short Description</label>
+                                                <textarea
+                                                    class="form-control form-control-muted"
+                                                    placeholder="Pixelfed"
+                                                    rows="4"
+                                                    v-model="branding.short_description"></textarea>
+                                            </div>
+                                            <p class="help-text small text-muted mb-0">
+                                                Short description of instance used on various pages and apis.
+                                            </p>
+                                        </div>
+
+                                        <div class="card shadow-none border card-body">
+                                            <div class="form-group mb-1">
+                                                <label for="form-summary" class="font-weight-bold">Long Description</label>
+                                                <textarea
+                                                    class="form-control form-control-muted"
+                                                    placeholder="Pixelfed"
+                                                    rows="8"
+                                                    v-model="branding.long_description"></textarea>
+                                            </div>
+                                            <p class="help-text small text-muted mb-0">
+                                                Longer description of instance used on about page.
+                                            </p>
+                                        </div>
+                                    </div>
+                                    <div class="col-12 col-md-4">
+                                        <p>
+                                            <a class="btn btn-dark btn-block" href="/i/admin/settings/custom-css">Edit Custom CSS</a>
+                                        </p>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div v-else-if="tabIndex === 'media'" class="tab-pane fade show active" role="tabpanel">
+                                <tab-header title="Media" :saving="isSubmitting" :saved="isSubmittingTimeout" @save="handleSave('media')" />
+
+                                <div class="row">
+                                    <div class="col-12 col-md-6">
+                                        <div class="card shadow-none border card-body">
+                                            <div class="form-group mb-1">
+                                                <label class="font-weight-bold text-muted">Max Media Size</label>
+                                                <div class="input-group mb-0">
+                                                    <input
+                                                        type="text"
+                                                        class="form-control"
+                                                        placeholder="15000"
+                                                        aria-label="Max media size"
+                                                        aria-describedby="maxMediaSize"
+                                                        v-model="media.max_photo_size">
+                                                    <div class="input-group-append">
+                                                        <span class="input-group-text" id="maxMediaSize">= {{ maxMediaSizeToMb }}</span>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <p class="help-text small text-muted mb-0">
+                                                Maximum file upload size in KB
+                                            </p>
+                                        </div>
+
+                                        <checkbox
+                                            name="Optimize Images"
+                                            :value="media.optimize_image"
+                                            description="Enable to optimize images and generate thumbnails for local image media uploads."
+                                            @change="handleChange($event, 'media', 'optimize_image')"
+                                        />
+
+                                        <checkbox
+                                            name="Optimize Video"
+                                            :value="media.optimize_video"
+                                            description="Enable to generate video thumbnails for local video media uploads."
+                                            @change="handleChange($event, 'media', 'optimize_video')"
+                                        />
+
+                                        <div class="card shadow-none border card-body">
+                                            <div class="form-group mb-1">
+                                                <label class="font-weight-bold text-muted">Media Types</label>
+
+                                                <div class="list-group">
+                                                    <div v-for="(mediaType, key) in mediaTypes" class="list-group-item py-2">
+                                                        <div class="custom-control custom-checkbox">
+                                                            <input
+                                                                type="checkbox"
+                                                                class="custom-control-input"
+                                                                :name="key"
+                                                                :id="key"
+                                                                v-model="mediaTypes[key]">
+                                                            <label class="custom-control-label font-weight-bold" :for="key">{{ key }}</label>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <p class="help-text small text-muted mb-0">
+                                                Supported mime types for media uploads
+                                            </p>
+                                        </div>
+                                    </div>
+                                    <div class="col-12 col-md-6">
+                                        <div class="card shadow-none border card-body">
+                                            <div class="form-group mb-1">
+                                                <label class="font-weight-bold text-muted">Photo Album Limit</label>
+                                                <input
+                                                    type="number"
+                                                    min="1"
+                                                    max="20"
+                                                    class="form-control"
+                                                    name="max_album_length"
+                                                    v-model="media.max_album_length">
+                                            </div>
+                                            <p class="help-text small text-muted mb-0">
+                                                The maximum number of photos or videos per album
+                                            </p>
+                                        </div>
+
+                                        <transition name="fade">
+                                            <div v-if="media.optimize_image" class="card shadow-none border card-body">
+                                                <div class="form-group mb-1">
+                                                    <label class="font-weight-bold text-muted">Image Quality</label>
+                                                    <input
+                                                        type="number"
+                                                        min="20"
+                                                        max="100"
+                                                        class="form-control"
+                                                        name="image_quality"
+                                                        v-model="media.image_quality">
+                                                </div>
+                                                <p class="help-text small text-muted mb-0">
+                                                    Image optimization quality from 0-100%.
+                                                </p>
+                                            </div>
+                                        </transition>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div v-else-if="tabIndex === 'platform'" class="tab-pane fade show active" role="tabpanel">
+                                <tab-header title="Platform" :saving="isSubmitting" :saved="isSubmittingTimeout" @save="handleSave('platform')" />
+
+                                <div class="row">
+                                    <div class="col-12 col-md-6">
+                                        <checkbox
+                                            name="Allow Profile Embeds"
+                                            :value="platform.allow_profile_embeds"
+                                            description="Allow anyone to embed public profiles on other websites."
+                                            @change="handleChange($event, 'platform', 'allow_profile_embeds')"
+                                        />
+
+                                        <div class="card shadow-none border card-body">
+                                            <div class="form-group mb-0">
+                                                <div class="custom-control custom-checkbox">
+                                                    <input
+                                                        type="checkbox"
+                                                        name="allow_app_registrations"
+                                                        class="custom-control-input"
+                                                        id="platform1"
+                                                        :disabled="features.registration_status !== 'open'"
+                                                        v-model="platform.allow_app_registration">
+                                                    <label class="custom-control-label font-weight-bold" for="platform1">Allow App Registrations</label>
+                                                </div>
+                                                <p v-if="features.registration_status !== 'open'" class="mb-0 small text-muted">Requires open registration to be enabled.</p>
+                                                <p v-else class="mb-0 small">Allow users to register via the official Pixelfed mobile application.</p>
+                                            </div>
+                                        </div>
+
+                                        <checkbox
+                                            name="Custom Emoji"
+                                            :value="platform.custom_emoji_enabled"
+                                            description="Enable federated custom emoji that is compatible with Mastodon, Pleroma and others."
+                                            @change="handleChange($event, 'platform', 'custom_emoji_enabled')"
+                                        />
+
+                                        <template v-if="features.registration_status === 'open' && features.allow_app_registration">
+                                            <div class="card shadow-none border card-body">
+                                                <div class="form-group mb-1">
+                                                    <label class="font-weight-bold text-muted">app_registration_rate_limit_attempts</label>
+                                                    <input
+                                                        type="number"
+                                                        class="form-control"
+                                                        name="app_registration_rate_limit_attempts"
+                                                        v-model="platform.app_registration_rate_limit_attempts">
+                                                </div>
+                                                <p class="help-text small text-muted mb-0">
+                                                    app_registration_rate_limit_attempts.
+                                                </p>
+                                            </div>
+                                            <div class="card shadow-none border card-body">
+                                                <div class="form-group mb-1">
+                                                    <label class="font-weight-bold text-muted">app_registration_rate_limit_decay</label>
+                                                    <input
+                                                        type="number"
+                                                        class="form-control"
+                                                        name="app_registration_rate_limit_decay"
+                                                        v-model="platform.app_registration_rate_limit_decay">
+                                                </div>
+                                                <p class="help-text small text-muted mb-0">
+                                                    app_registration_rate_limit_decay
+                                                </p>
+                                            </div>
+                                        </template>
+                                    </div>
+
+                                    <div class="col-12 col-md-6">
+                                        <checkbox
+                                            name="Allow Post Embeds"
+                                            :value="platform.allow_post_embeds"
+                                            description="Allow anyone to embed public posts on other websites."
+                                            @change="handleChange($event, 'platform', 'allow_post_embeds')"
+                                        />
+
+                                        <div class="card shadow-none border card-body">
+                                            <div class="form-group mb-1">
+                                                <div class="custom-control custom-checkbox">
+                                                    <input
+                                                        type="checkbox"
+                                                        name="hcaps"
+                                                        class="custom-control-input"
+                                                        id="hcp"
+                                                        v-model="platform.captcha_enabled">
+                                                    <label class="custom-control-label font-weight-bold" for="hcp">Enable hCaptcha</label>
+                                                </div>
+                                            </div>
+                                            <template v-if="platform.captcha_enabled">
+                                                <hr class="my-2">
+                                                <div class="row">
+                                                    <div class="col-12 col-md-6">
+                                                        <div class="form-group my-1">
+                                                            <label class="text-muted small">hCaptcha Secret</label>
+                                                            <input
+                                                                type="text"
+                                                                class="form-control"
+                                                                name="captcha_secret"
+                                                                v-model="platform.captcha_secret">
+                                                        </div>
+                                                    </div>
+                                                    <div class="col-12 col-md-6">
+                                                        <div class="form-group my-1">
+                                                            <label class="text-muted small">hCaptcha Sitekey</label>
+                                                            <input
+                                                                type="text"
+                                                                class="form-control"
+                                                                name="captcha_sitekey"
+                                                                v-model="platform.captcha_sitekey">
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <hr class="mt-2 mb-4">
+                                                <div class="row">
+                                                    <div class="col-12 col-lg-6">
+                                                        <div class="custom-control custom-checkbox">
+                                                            <input
+                                                                type="checkbox"
+                                                                name="captcha_on_login"
+                                                                class="custom-control-input"
+                                                                id="captcha_on_login"
+                                                                v-model="platform.captcha_on_login">
+                                                            <label class="custom-control-label font-weight-bold" for="captcha_on_login">Login Captcha</label>
+                                                        </div>
+                                                    </div>
+                                                    <div class="col-12 col-lg-6">
+                                                        <div class="custom-control custom-checkbox">
+                                                            <input
+                                                                type="checkbox"
+                                                                name="captcha_on_register"
+                                                                class="custom-control-input"
+                                                                id="captcha_on_register"
+                                                                v-model="platform.captcha_on_register">
+                                                            <label class="custom-control-label font-weight-bold" for="captcha_on_register">Register Captcha</label>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <hr class="mt-4 mb-2">
+                                            </template>
+                                            <p class="help-text small text-muted mb-0">
+                                                Enable hCaptcha on login and register pages
+                                            </p>
+                                        </div>
+
+                                        <template v-if="features.registration_status === 'open' && features.allow_app_registration">
+                                            <div class="card shadow-none border card-body">
+                                                <div class="form-group mb-1">
+                                                    <label class="font-weight-bold text-muted">app_registration_confirm_rate_limit_attempts</label>
+                                                    <input
+                                                        type="number"
+                                                        class="form-control"
+                                                        name="app_registration_confirm_rate_limit_attempts"
+                                                        v-model="platform.app_registration_confirm_rate_limit_attempts">
+                                                </div>
+                                                <p class="help-text small text-muted mb-0">
+                                                    app_registration_confirm_rate_limit_attempts.
+                                                </p>
+                                            </div>
+                                            <div class="card shadow-none border card-body">
+                                                <div class="form-group mb-1">
+                                                    <label class="font-weight-bold text-muted">app_registration_confirm_rate_limit_decay</label>
+                                                    <input
+                                                        type="number"
+                                                        class="form-control"
+                                                        name="app_registration_confirm_rate_limit_decay"
+                                                        v-model="platform.app_registration_confirm_rate_limit_decay">
+                                                </div>
+                                                <p class="help-text small text-muted mb-0">
+                                                    app_registration_confirm_rate_limit_decay.
+                                                </p>
+                                            </div>
+                                        </template>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div v-else-if="tabIndex === 'posts'" class="tab-pane fade show active" role="tabpanel">
+                                <tab-header title="Posts" :saving="isSubmitting" :saved="isSubmittingTimeout" @save="handleSave('posts')" />
+
+                                <div class="row">
+                                    <div class="col-12 col-md-6">
+                                        <div class="card shadow-none border card-body">
+                                            <div class="form-group mb-1">
+                                                <label class="font-weight-bold text-muted">Max Caption Length</label>
+                                                <input
+                                                    type="number"
+                                                    min="1"
+                                                    max="10000"
+                                                    class="form-control"
+                                                    name="max_caption_limit"
+                                                    v-model="posts.max_caption_length">
+                                            </div>
+                                            <p class="help-text small text-muted mb-0">
+                                                The maximum character count of post captions. We recommend a limit between 500-2000.
+                                            </p>
+                                        </div>
+                                    </div>
+
+                                    <div class="col-12 col-md-6">
+                                        <div class="card shadow-none border card-body">
+                                            <div class="form-group mb-1">
+                                                <label class="font-weight-bold text-muted">Max Alttext Length</label>
+                                                <input
+                                                    type="number"
+                                                    min="1"
+                                                    max="10000"
+                                                    class="form-control"
+                                                    name="max_altext_length"
+                                                    v-model="posts.max_altext_length">
+                                            </div>
+                                            <p class="help-text small text-muted mb-0">
+                                                The maximum character count of post media alttext captions. We recommend a limit between 2000-10000.
+                                            </p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div v-else-if="tabIndex === 'rules'" class="tab-pane fade show active" role="tabpanel">
+                                <tab-header title="Rules" :saving="isSubmitting" :saved="isSubmittingTimeout" @save="handleSave('rules')" />
+
+                                <div class="row">
+                                    <div class="col-12 mb-3">
+                                        <div v-if="hasDuplicateRulesComputed" class="alert alert-danger">
+                                            <p class="font-weight-bold mb-0">Duplicate rules detected, you should fix this!</p>
+                                        </div>
+                                        <div class="position-relative">
+                                            <div class="card shadow-none border">
+                                                <div class="card-header py-2 bg-primary text-white font-weight-bold text-center">Active Rules</div>
+                                                <div class="list-group list-group-flush">
+                                                    <div
+                                                        v-for="(rule, idx) in rulesComputed"
+                                                        class="list-group-item">
+                                                        <div class="d-flex justify-content-between align-items-start">
+                                                            <div class="d-flex gap-1 align-items-start">
+                                                                <div class="rule-badge">
+                                                                    <div class="rule-badge-inner">{{ idx + 1 }}</div>
+                                                                </div>
+                                                                <admin-read-more
+                                                                    :key="rule"
+                                                                    class="text-dark rule-text"
+                                                                    :content="rule"
+                                                                    :maxLength="140"
+                                                                    :initialLimit="30"
+                                                                    fontSize="13" />
+                                                            </div>
+
+                                                            <button
+                                                                class="btn btn-link btn-sm"
+                                                                :disabled="isDeletingRule"
+                                                                @click.prevent="handleDeleteRule(rule, idx, $event)">
+                                                                <i class="fas fa-trash-alt text-danger"></i>
+                                                            </button>
+                                                        </div>
+                                                    </div>
+
+
+                                                    <div v-if="!rules || !rules.length" class="list-group-item">
+                                                        <p class="text-center mb-0">No rules set!</p>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div v-if="!showAllRules && rules.length > 2" class="d-flex justify-content-center" style="position:absolute;width: 100%;padding-top: 10rem;bottom:0;background: linear-gradient(to bottom, rgba(255,255,255,0), rgba(255,255,255, 1));">
+                                                <button class="btn btn-dark font-weight-bold rounded-pill btn-block" @click.prevent="showAllRules = true">Show all rules</button>
+                                        </div>
+                                        </div>
+                                    </div>
+
+                                    <div class="col-12 col-md-6">
+                                        <div class="card shadow-none border card-body">
+                                            <div class="form-group mb-1">
+                                                <label class="font-weight-bold text-muted">Add New Rule</label>
+                                                <textarea
+                                                    type="text"
+                                                    class="form-control"
+                                                    name="new_rule"
+                                                    rows="5"
+                                                    minlength="5"
+                                                    maxlength="1000"
+                                                    placeholder="Add your new rule here..."
+                                                    :disabled="isSubmittingNewRule || isDeletingRule"
+                                                    v-model="newRule"></textarea>
+                                            </div>
+                                            <div class="d-flex justify-content-between align-items-center">
+                                                <p class="help-text small text-muted mb-0">
+                                                    Add a new rule
+                                                </p>
+                                                <p class="help-text small text-muted mb-0">
+                                                    {{ newRule && newRule.length ? newRule.length : 0 }}/1000
+                                                </p>
+                                            </div>
+                                            <hr class="my-2">
+                                            <p class="mb-0">
+                                                <button
+                                                    class="btn btn-primary btn-sm btn-block font-weight-bold rounded-pill"
+                                                    :disabled="!newRule || !newRule.length || isSubmittingNewRule || isDeletingRule"
+                                                    @click.prevent="handleAddRule">Add Rule</button>
+                                            </p>
+                                        </div>
+
+                                        <button v-if="rules && rules.length" class="btn btn-outline-danger rounded-pill btn-block btn-sm" @click.prevent="handleDeleteAllRules">Delete all rules</button>
+                                    </div>
+
+                                    <div v-if="suggestedRulesComputed && suggestedRulesComputed.length" class="col-12 col-md-6">
+                                        <div class="border-bottom pb-2 mb-3 d-flex justify-content-between align-items-center">
+                                            <p class="font-weight-bold mb-0">Suggested Rules</p>
+                                            <a v-if="!rules.length" class="font-weight-bold small" href="#" @click.prevent="importAllDefaultRules">Import All</a>
+                                        </div>
+
+                                        <div class="list-group">
+                                            <a
+                                                v-for="rule in suggestedRulesComputed"
+                                                class="list-group-item small"
+                                                href="#"
+                                                @click.prevent="addSuggestedRule(rule, $event)">{{ rule }}</a>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div v-else-if="tabIndex === 'storage'" class="tab-pane fade show active" role="tabpanel">
+                                <tab-header title="Storage" :saving="isSubmitting" :saved="isSubmittingTimeout" @save="handleSave('storage')" />
+
+                                <div class="row">
+                                    <div class="col-12 col-md-6">
+                                        <div class="card shadow-none border card-body" style="padding: 1.1rem 1.6rem">
+                                            <div class="form-group mb-0">
+                                                <label for="form-summary" class="font-weight-bold">Primary Storage Disk</label>
+                                                <select v-model="storage.primary_disk" class="form-control form-control-muted">
+                                                    <option value="local" >Local</option>
+                                                    <option value="cloud">Cloud/S3</option>
+                                                </select>
+                                            </div>
+                                            <p class="help-text small text-muted mt-2 mb-0">
+                                                The storage disk where avatars and media uploads are stored.
+                                            </p>
+                                        </div>
+                                    </div>
+
+                                    <div class="col-12 col-md-6">
+                                        <div class="card border">
+                                            <div class="card-header bg-gradient-primary">
+                                                <p class="text-center mb-0 text-white font-weight-bold">Cloud Disk Config</p>
+                                            </div>
+
+                                            <div v-if="!showDiskConfig" class="card-body">
+                                                <p class="text-center mb-0">
+                                                    <a
+                                                        class="btn btn-primary bg-gradient-primary shadow-lg rounded-pill"
+                                                        href="#"
+                                                        @click.prevent="showDiskConfig = true">
+                                                        View/Edit
+                                                    </a>
+                                                </p>
+                                            </div>
+                                            <div v-else class="card-body">
+                                                <div class="form-group mb-4 d-flex align-items-center gap-1">
+                                                    <label for="form-summary" class="font-weight-bold mb-0">Disk</label>
+                                                    <select v-model="storage.disk_config.driver" class="form-control form-control-muted mb-0">
+                                                        <option value="s3" >S3</option>
+                                                        <option value="spaces">DigitalOcean Spaces</option>
+                                                    </select>
+                                                </div>
+
+                                                <form-input
+                                                    name="Key"
+                                                    :value="storage.disk_config.key"
+                                                    description=""
+                                                    :isCard="false"
+                                                    :isInline="true"
+                                                    @change="handleSubChange($event, 'storage', 'disk_config', 'key')"
+                                                />
+                                                <form-input
+                                                    name="Secret"
+                                                    :value="storage.disk_config.secret"
+                                                    description=""
+                                                    :isCard="false"
+                                                    :isInline="true"
+                                                    @change="handleSubChange($event, 'storage', 'disk_config', 'secret')"
+                                                />
+                                                <form-input
+                                                    name="Region"
+                                                    :value="storage.disk_config.region"
+                                                    description=""
+                                                    :isCard="false"
+                                                    :isInline="true"
+                                                    @change="handleSubChange($event, 'storage', 'disk_config', 'region')"
+                                                />
+                                                <form-input
+                                                    name="Bucket"
+                                                    :value="storage.disk_config.bucket"
+                                                    description=""
+                                                    :isCard="false"
+                                                    :isInline="true"
+                                                    @change="handleSubChange($event, 'storage', 'disk_config', 'bucket')"
+                                                />
+                                                <form-input
+                                                    name="Endpoint"
+                                                    :value="storage.disk_config.endpoint"
+                                                    description=""
+                                                    :isCard="false"
+                                                    :isInline="true"
+                                                    @change="handleSubChange($event, 'storage', 'disk_config', 'endpoint')"
+                                                />
+                                                <form-input
+                                                    name="Visibility"
+                                                    :value="storage.disk_config.visibility"
+                                                    description=""
+                                                    :isCard="false"
+                                                    :isInline="true"
+                                                    :isDisabled="true"
+                                                    @change="handleSubChange($event, 'storage', 'disk_config', 'visibility')"
+                                                />
+                                                <form-input
+                                                    name="Url"
+                                                    :value="storage.disk_config.url"
+                                                    description=""
+                                                    :isCard="false"
+                                                    :isInline="true"
+                                                    @change="handleSubChange($event, 'storage', 'disk_config', 'url')"
+                                                />
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                </div>
+                            </div>
+
+                            <div v-else-if="tabIndex === 'users'" class="tab-pane fade show active" role="tabpanel">
+                                <tab-header title="Users" :saving="isSubmitting" :saved="isSubmittingTimeout" @save="handleSave('users')" />
+
+                                <div class="row">
+                                    <div class="col-12 col-md-6">
+                                        <checkbox
+                                            name="Require Email Verifications"
+                                            :value="users.require_email_verification"
+                                            description="Require users to verify their email address is valid before they can use the account."
+                                            @change="handleChange($event, 'users', 'require_email_verification')"
+                                        />
+
+                                        <form-input
+                                            name="Max User Blocks"
+                                            :value="users.max_user_blocks.toString()"
+                                            description="The max number of account blocks per user."
+                                            @change="handleChange($event, 'users', 'max_user_blocks')"
+                                        />
+
+                                        <form-input
+                                            name="Max User Mutes"
+                                            :value="users.max_user_mutes.toString()"
+                                            description="The max number of account mutes per user."
+                                            @change="handleChange($event, 'users', 'max_user_mutes')"
+                                        />
+
+                                        <form-input
+                                            name="Max User Domain Blocks"
+                                            :value="users.max_domain_blocks.toString()"
+                                            description="The max number of domain blocks per user."
+                                            @change="handleChange($event, 'users', 'max_domain_blocks')"
+                                        />
+                                    </div>
+
+                                    <div class="col-12 col-md-6">
+                                        <div class="card shadow-none border card-body">
+                                            <div class="form-group mb-0">
+                                                <div class="custom-control custom-checkbox">
+                                                    <input type="checkbox" name="enforce_account_limit" class="custom-control-input" id="users2" v-model="users.enforce_account_limit">
+                                                    <label class="custom-control-label font-weight-bold" for="users2">Enforce Account Limit</label>
+                                                </div>
+                                                <p class="mb-0 small">Set a storage limit per user account for all uploaded media (photo + video).</p>
+                                            </div>
+                                            <transition name="fade">
+                                            <div v-if="users.enforce_account_limit">
+                                                <hr class="my-2">
+                                                <div class="form-group mb-1">
+                                                    <div class="input-group mb-0">
+                                                        <input
+                                                            type="text"
+                                                            class="form-control"
+                                                            placeholder="15000"
+                                                            aria-label="Max account size"
+                                                            aria-describedby="maxMediaSize"
+                                                            v-model="users.max_account_size">
+                                                        <div class="input-group-append">
+                                                            <span class="input-group-text">= {{maxAccountSizeToMb }}</span>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                                <p class="help-text small text-muted mb-0">
+                                                    Maximum file storage limit per user account.
+                                                </p>
+                                            </div>
+                                            </transition>
+                                        </div>
+
+                                        <div class="card shadow-none border">
+                                            <div class="card-body">
+                                                <div class="form-group mb-0">
+                                                    <div class="custom-control custom-checkbox">
+                                                        <input type="checkbox" name="admin_autofollow" class="custom-control-input" id="users4" v-model="users.admin_autofollow">
+                                                        <label class="custom-control-label font-weight-bold" for="users4">Autofollow Accounts</label>
+                                                    </div>
+                                                    <p class="mb-0 small">Force new accounts to follow accounts you specify below</p>
+                                                </div>
+                                            </div>
+                                            <transition name="fade">
+                                                <div v-if="users.admin_autofollow" class="list-group list-group-flush">
+                                                    <div v-if="users.admin_autofollow_accounts?.length">
+                                                        <div v-for="user in users.admin_autofollow_accounts" class="list-group-item">
+                                                            <div class="d-flex justify-content-between align-items-center">
+                                                                <p class="font-weight-bold mb-0">&commat;{{ user }}</p>
+                                                                <button class="btn btn-link p-0" @click.prevent="removeAutofollow(user, $event)"><i class="fas fa-trash-alt text-danger"></i></button>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    <div v-else class="list-group-item">
+                                                        <p class="text-center mb-0">No autofollow accounts active.</p>
+                                                    </div>
+                                                </div>
+                                            </transition>
+                                            <transition name="fade">
+                                                <div v-if="users.admin_autofollow && (users.admin_autofollow_accounts && users.admin_autofollow_accounts.length < 5)" class="card-footer">
+                                                    <button
+                                                        class="btn btn-primary btn-block rounded-pill"
+                                                        @click.prevent="addAutofollow">Add Autofollow Account</button>
+                                                </div>
+                                            </transition>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<div v-else>
+    <div class="container my-5 py-5 text-center">
+        <div class="spinner-border text-primary" role="status">
+            <span class="sr-only">Loading...</span>
+        </div>
+    </div>
+</div>
+</template>
+
+<script type="text/javascript">
+    import AdminReadMore from "./partial/AdminReadMore.vue";
+    import AdminSettingsTabHeader from "./partial/AdminSettingsTabHeader.vue";
+    import Checkbox from "./partial/AdminSettingsCheckbox.vue";
+    import FormInput from "./partial/AdminSettingsInput.vue";
+
+    export default {
+        components: {
+            "admin-read-more": AdminReadMore,
+            "tab-header": AdminSettingsTabHeader,
+            "checkbox": Checkbox,
+            "form-input": FormInput
+        },
+
+        data() {
+            return {
+                loaded: false,
+                initialData: {},
+                tabIndex: 1,
+                tabbies: [
+                    'landing',
+                    'branding',
+                    'media',
+                    'posts',
+                    'platform',
+                    'rules',
+                    'users',
+                    'storage'
+                ],
+                tabs: [
+                    { id: 1, title: "Overview", icon: "far fa-home" },
+                    // { id: 2, title: "Status", icon: "far fa-asterisk" },
+                    { id: 'landing', title: "Landing", icon: "far fa-info-circle" },
+                    { id: 'branding', title: "Branding", icon: "far fa-user-crown" },
+                    { id: 'media', title: "Media", icon: "far fa-image" },
+                    { id: 'platform', title: "Platform", icon: "far fa-database" },
+                    { id: 'posts', title: "Posts", icon: "far fa-heart" },
+                    { id: 'rules', title: "Rules", icon: "far fa-eye-slash" },
+                    { id: 'storage', title: "Storage", icon: "far fa-hdd" },
+                    { id: 'users', title: "Users", icon: "far fa-users" },
+                ],
+
+                isSubmitting: false,
+                isSubmittingTimeout: false,
+                isSubmittingTimeoutHandler: undefined,
+
+                features: [],
+                landing: {
+                    current_admin: 0,
+                },
+                branding: [],
+                media: [],
+                mediaTypes: {
+                    jpeg: false,
+                    png: false,
+                    gif: false,
+                    webp: false,
+                    avif: false,
+                    heic: false,
+                    mp4: false,
+                    mov: false,
+                },
+                rules: [],
+                users: [],
+                posts: [],
+                platform: [],
+                storage: [],
+                newRule: undefined,
+                isSubmittingNewRule: false,
+                isDeletingRule: false,
+                suggestedRules: [],
+                hasDuplicateRules: false,
+                showAllRules: false,
+                showDiskConfig: false,
+            }
+        },
+
+        computed: {
+            maxMediaSizeToMb: {
+                get() {
+                    if(!this.media || !this.media.max_photo_size) {
+                        return '0.00 MB';
+                    }
+
+                    return (this.media.max_photo_size / 1000).toFixed(2) + ' MB';
+                }
+            },
+
+            maxAccountSizeToMb: {
+                get() {
+                    if(!this.users || !this.users.max_account_size) {
+                        return '0.00 MB';
+                    }
+
+                    const mb = (this.users.max_account_size / 1024);
+
+                    if(mb > 1000000) {
+                        return (mb / 1000000).toFixed(1) + 'TB';
+                    }
+
+                    if(mb > 1000) {
+                        return (mb / 1024).toFixed(2) + 'GB';
+                    }
+                    return (this.users.max_account_size / 1024).toFixed(2) + ' MB';
+                }
+            },
+
+            rulesComputed: {
+                get() {
+                    if(!this.rules || !this.rules.length) {
+                        return [];
+                    }
+
+                    if(this.rules.length > 2) {
+                        if(!this.showAllRules) {
+                            return this.rules.slice(0, 2);
+                        }
+                    }
+                    return this.rules;
+                }
+            },
+
+            suggestedRulesComputed: {
+                get() {
+                    if(!this.rules || !this.rules.length) {
+                        return this.suggestedRules;
+                    }
+
+                    return this.suggestedRules.filter(rule => {
+                        if(this.rules.includes(rule)) {
+                            return false;
+                        }
+
+                        return true;
+                    });
+                }
+            },
+
+            hasDuplicateRulesComputed: {
+                get() {
+                    if(!this.rules || !this.rules.length) {
+                        return false;
+                    }
+                    const array = this.rules;
+                    const duplicates = array.filter((item, index) => array.indexOf(item) !== index);
+
+                    return duplicates.length;
+                }
+            },
+
+            activeMediaTypes: {
+                get() {
+                    let res = '';
+
+                    if(this.mediaTypes.jpeg) {
+                        res += 'image/jpeg,'
+                    }
+
+                    if(this.mediaTypes.png) {
+                        res += 'image/png,'
+                    }
+
+                    if(this.mediaTypes.gif) {
+                        res += 'image/gif,'
+                    }
+
+                    if(this.mediaTypes.webp) {
+                        res += 'image/webp,'
+                    }
+
+                    if(this.mediaTypes.mp4) {
+                        res += 'video/mp4'
+                    }
+
+                    if(res.endsWith(',')) {
+                        res = res.slice(0, -1);
+                    }
+                    return res;
+                }
+            }
+        },
+
+        mounted() {
+            this.fetchInitialData();
+
+            const params = new URL(window.location.href);
+
+            if(params.searchParams.has('t')) {
+                const tab = params.searchParams.get('t');
+                if(this.tabbies.includes(tab)) {
+                    this.tabIndex = tab;
+                } else {
+                    window.history.pushState(null, null, '/i/admin/settings')
+                }
+            }
+        },
+
+        methods: {
+            toggleTab(idx) {
+                clearTimeout(this.isSubmittingTimeoutHandler)
+                this.isSubmittingTimeout = false;
+                this.tabIndex = idx;
+                this.showAllRules = false;
+                if(this.tabbies.includes(idx)) {
+                    window.history.pushState(null, null, '/i/admin/settings?t=' + idx);
+                } else {
+                    window.history.pushState(null, null, '/i/admin/settings');
+                }
+            },
+
+            fetchInitialData() {
+                axios.get('/i/admin/api/settings/fetch')
+                .then(res => {
+                    this.initialData = res.data;
+
+                    this.features = res.data.features;
+                    this.landing = res.data.landing;
+                    this.branding = res.data.branding;
+                    this.media = res.data.media;
+                    this.setMediaTypes();
+                    this.rules = res.data.rules;
+                    this.users = res.data.users;
+                    this.suggestedRules = res.data['suggested_rules'];
+                    this.posts = res.data.posts;
+                    this.platform = res.data.platform;
+                    this.storage = res.data.storage;
+                })
+                .then(() => {
+                    this.loaded = true;
+                })
+            },
+
+            setMediaTypes() {
+                const types = this.media.media_types.split(',');
+                if(types && types.length) {
+                    types.forEach((type) => {
+                        let mime = type.split('/')[1];
+                        if(['jpeg', 'png', 'gif', 'webp', 'mp4'].includes(mime)) {
+                            this.mediaTypes[mime] = true;
+                        }
+                    })
+                }
+            },
+
+            formatCount(c) {
+                return window.App.util.format.count(c);
+            },
+
+            formatDateTime(ts) {
+                let date = new Date(ts);
+                return new Intl.DateTimeFormat('en-US', {dateStyle: 'medium', timeStyle: 'short'}).format(date);
+            },
+
+            formatDate(ts) {
+                let date = new Date(ts);
+                return new Intl.DateTimeFormat('en-US', {month: 'short', year: 'numeric'}).format(date);
+            },
+
+            formatTimestamp(ts) {
+                return window.App.util.format.timeAgo(ts);
+            },
+
+            handleSave(type) {
+                this.isSubmitting = true;
+                switch(type) {
+                    case 'overview':
+                        return this.saveHome();
+                    break;
+                    case 'landing':
+                        return this.saveLanding();
+                    break;
+                    case 'branding':
+                        return this.saveBranding();
+                    break;
+                    case 'posts':
+                        return this.savePosts();
+                    break;
+                    case 'media':
+                        return this.saveMedia();
+                    break;
+                    case 'platform':
+                        return this.savePlatform();
+                    break;
+                    case 'users':
+                        return this.saveUsers();
+                    break;
+                    case 'storage':
+                        return this.saveStorage();
+                    break;
+                }
+            },
+
+            handleAddRule($event) {
+                $event.currentTarget?.blur();
+                this.isSubmittingNewRule = true;
+
+                axios.post('/i/admin/api/settings/rules/add', {
+                    rule: this.newRule
+                }).then(res => {
+                    this.rules.push(this.newRule);
+                    this.newRule = undefined;
+                    this.isSubmittingNewRule = false;
+                    this.showAllRules = true;
+                })
+                .catch(err => {
+                    if(err.response.data && err.response.data?.message) {
+                        swal('Error', err.response.data.message, 'error');
+                    }
+                    this.isSubmittingNewRule = false;
+                })
+            },
+
+            addSuggestedRule(rule, $event) {
+                $event.currentTarget?.blur();
+
+                this.newRule = rule;
+            },
+
+            importAllDefaultRules($event) {
+                $event.currentTarget?.blur();
+                this.isSubmittingNewRule = true;
+                this.showAllRules = true;
+                for (var i = this.suggestedRules.length - 1; i >= 0; i--) {
+                    const rule = this.suggestedRules[i]
+                    setTimeout(() => {
+                        axios.post('/i/admin/api/settings/rules/add', {
+                            rule: rule
+                        }).then(res => {
+                            this.rules.push(rule);
+                        })
+                    }, (i * 300))
+                }
+                this.isSubmittingNewRule = false;
+            },
+
+            handleDeleteRule(rule, idx, $event) {
+                $event.currentTarget?.blur();
+                this.isDeletingRule = true;
+
+                axios.post('/i/admin/api/settings/rules/delete', {
+                    rule: rule,
+                }).then(res => {
+                    this.isDeletingRule = false;
+                    this.rules = res.data;
+                })
+                .catch(err => {
+
+                })
+            },
+
+            handleDeleteAllRules($event) {
+                $event.currentTarget?.blur();
+                this.isDeletingRule = true;
+
+                swal({
+                    title: 'Confirm',
+                    text: 'Are you sure you want to delete all rules?',
+                    buttons: true,
+                    dangerMode: true,
+                }).then(res => {
+                    if(res === true) {
+                        axios.post('/i/admin/api/settings/rules/delete/all')
+                        .then(res => {
+                            this.isDeletingRule = false;
+                            this.rules = []
+                        })
+                        .catch(err => {
+
+                        })
+                    } else {
+                        this.isDeletingRule = false;
+                    }
+                })
+            },
+
+            removeAutofollow(username, $event) {
+                $event.currentTarget?.blur();
+
+                axios.post('/i/admin/api/settings/autofollow/delete', {
+                    username: username
+                }).then(res => {
+                    this.users.admin_autofollow_accounts = res.data.accounts;
+                }).catch(err => {
+                    swal("Oops!", "An error occurred, please try again later!", "error");
+                });
+            },
+
+            addAutofollow($event) {
+                $event.currentTarget?.blur();
+
+                swal({
+                    text: 'Enter account username',
+                    content: "input",
+                    button: {
+                        text: "Add Autofollow",
+                        closeModal: false,
+                    },
+                }).then(username => {
+                    if (!username) throw null;
+
+                    axios.post('/i/admin/api/settings/autofollow/add', {
+                        username: username
+                    })
+                    .then(res => {
+                        if(!res.data.accounts.map(acc => acc.toLowerCase()).includes(username.toLowerCase())) {
+                            swal("Oops!", "The account you attempted to add does not exist or cannot be added!", "error");
+                        }
+                        this.users.admin_autofollow_accounts = res.data.accounts;
+                        swal.stopLoading();
+                        swal.close();
+                    })
+                    .catch(err => {
+                        if(err.response.data && err.response.data.message) {
+                            swal('Error', err.response.data.message, 'error');
+                        } else {
+                            swal("Oops!", "The account you attempted to add does not exist or cannot be added!", "error");
+                        }
+                        swal.stopLoading();
+                        swal.close();
+                    });
+                })
+
+            },
+
+            saveHome() {
+                axios.post('/i/admin/api/settings/update/home', {
+                    registration_status: this.features.registration_status,
+                    cloud_storage: this.features.cloud_storage,
+                    activitypub_enabled: this.features.activitypub_enabled,
+                    account_migration: this.features.account_migration,
+                    mobile_apis: this.features.mobile_apis,
+                    stories: this.features.stories,
+                    instagram_import: this.features.instagram_import,
+                    autospam_enabled: this.features.autospam_enabled,
+                    authorized_fetch: this.features.authorized_fetch,
+                }).then(res => {
+                    this.isSubmitting = false;
+                    this.isSubmittingTimeout = true;
+                    this.isSubmittingTimeoutHandler = setTimeout(() => {
+                        this.isSubmittingTimeout = false;
+                    }, 4000);
+                })
+            },
+
+            saveLanding() {
+                axios.post('/i/admin/api/settings/update/landing', {
+                    current_admin: this.landing.current_admin,
+                    show_directory: this.landing.show_directory,
+                    show_explore: this.landing.show_explore
+                }).then(res => {
+                    this.isSubmitting = false;
+                    this.isSubmittingTimeout = true;
+                    this.isSubmittingTimeoutHandler = setTimeout(() => {
+                        this.isSubmittingTimeout = false;
+                    }, 4000);
+                })
+            },
+
+            saveBranding() {
+                axios.post('/i/admin/api/settings/update/branding', {
+                    name: this.branding.name,
+                    short_description: this.branding.short_description,
+                    long_description: this.branding.long_description
+                }).then(res => {
+                    this.isSubmitting = false;
+                    this.isSubmittingTimeout = true;
+                    this.isSubmittingTimeoutHandler = setTimeout(() => {
+                        this.isSubmittingTimeout = false;
+                    }, 4000);
+                })
+            },
+
+            savePosts() {
+                axios.post('/i/admin/api/settings/update/posts', {
+                    max_caption_length: this.posts.max_caption_length,
+                    max_altext_length: this.posts.max_altext_length,
+                }).then(res => {
+                    this.posts = res.data;
+                    this.isSubmitting = false;
+                    this.isSubmittingTimeout = true;
+                    this.isSubmittingTimeoutHandler = setTimeout(() => {
+                        this.isSubmittingTimeout = false;
+                    }, 4000);
+                })
+                .catch(err => {
+                    this.isSubmitting = false;
+                    if(err.response.data && err.response.data.message) {
+                        swal('Error', err.response.data.message, 'error');
+                    } else {
+                        swal('Oops!', 'An error occured', 'error');
+                    }
+                })
+            },
+
+            saveMedia() {
+                axios.post('/i/admin/api/settings/update/media', {
+                    image_quality: this.media.image_quality,
+                    max_album_length: this.media.max_album_length,
+                    max_photo_size: this.media.max_photo_size,
+                    media_types: this.activeMediaTypes,
+                    optimize_image: this.media.optimize_image,
+                    optimize_video: this.media.optimize_video,
+                }).then(res => {
+                    this.isSubmitting = false;
+                    this.isSubmittingTimeout = true;
+                    this.isSubmittingTimeoutHandler = setTimeout(() => {
+                        this.isSubmittingTimeout = false;
+                    }, 4000);
+                }).catch(err => {
+                    this.isSubmitting = false;
+                    if(err.response.data && err.response.data.message) {
+                        swal('Error', err.response.data.message, 'error');
+                    } else {
+                        swal('Oops!', 'An error occured', 'error');
+                    }
+                })
+            },
+
+            savePlatform() {
+                axios.post('/i/admin/api/settings/update/platform', {
+                    allow_app_registration: this.platform.allow_app_registration,
+                    app_registration_rate_limit_attempts: this.platform.app_registration_rate_limit_attempts,
+                    app_registration_rate_limit_decay: this.platform.app_registration_rate_limit_decay,
+                    app_registration_confirm_rate_limit_attempts: this.platform.app_registration_confirm_rate_limit_attempts,
+                    app_registration_confirm_rate_limit_decay: this.platform.app_registration_confirm_rate_limit_decay,
+                    allow_post_embeds: this.platform.allow_post_embeds,
+                    allow_profile_embeds: this.platform.allow_profile_embeds,
+                    captcha_enabled: this.platform.captcha_enabled,
+                    captcha_secret: this.platform.captcha_secret,
+                    captcha_sitekey: this.platform.captcha_sitekey,
+                    captcha_on_login: this.platform.captcha_on_login,
+                    captcha_on_register: this.platform.captcha_on_register,
+                    custom_emoji_enabled: this.platform.custom_emoji_enabled,
+                }).then(res => {
+                    this.platform = res.data;
+                    this.isSubmitting = false;
+                    this.isSubmittingTimeout = true;
+                    this.isSubmittingTimeoutHandler = setTimeout(() => {
+                        this.isSubmittingTimeout = false;
+                    }, 4000);
+                })
+                .catch(err => {
+                    this.isSubmitting = false;
+                    if(err.response.data && err.response.data.message) {
+                        swal('Error', err.response.data.message, 'error');
+                    } else {
+                        swal('Oops!', 'An error occured', 'error');
+                    }
+                })
+            },
+
+            saveUsers() {
+                axios.post('/i/admin/api/settings/update/users', {
+                    require_email_verification: this.users.require_email_verification,
+                    enforce_account_limit: this.users.enforce_account_limit,
+                    max_account_size: this.users.max_account_size,
+                    admin_autofollow: this.users.admin_autofollow,
+                    admin_autofollow_accounts: this.users.admin_autofollow_accounts,
+                    max_user_blocks: this.users.max_user_blocks,
+                    max_user_mutes: this.users.max_user_mutes,
+                    max_domain_blocks: this.users.max_domain_blocks,
+                }).then(res => {
+                    this.isSubmitting = false;
+                    this.isSubmittingTimeout = true;
+                    this.isSubmittingTimeoutHandler = setTimeout(() => {
+                        this.isSubmittingTimeout = false;
+                    }, 4000);
+                }).catch(err => {
+                    if(err.response.data.message) {
+                        swal('Error', err.response.data.message, 'error');
+                    } else {
+                        swal('Error', 'An unexpected error occurred, please try again!', 'error');
+                    }
+                    this.isSubmitting = false;
+                })
+            },
+
+            saveStorage() {
+                let data = this.showDiskConfig ?
+                    {
+                        primary_disk: this.storage.primary_disk,
+                        update_disk: true,
+                        disk_config: this.storage.disk_config,
+                    } : {
+                        primary_disk: this.storage.primary_disk,
+                    }
+                axios.post('/i/admin/api/settings/update/storage', data)
+                .then(res => {
+                    this.features.cloud_storage = res.data.primary_disk === 'cloud';
+                    this.isSubmitting = false;
+                    this.isSubmittingTimeout = true;
+                    this.isSubmittingTimeoutHandler = setTimeout(() => {
+                        this.isSubmittingTimeout = false;
+                    }, 4000);
+                }).catch(err => {
+                    if(err.response.data.error) {
+                        if(err.response.data.s3_vce) {
+                            let el = document.createElement('div');
+                            el.classList.add('text-left');
+                            el.innerHTML = err.response.data.message;
+                            let wrapper = document.createElement('div');
+                            wrapper.appendChild(el);
+                            swal({
+                                title: 'Invalid S3 Credentials',
+                                content: wrapper,
+                                icon: 'error'
+                            });
+                        } else {
+                            swal('Error', err.response.data.message, 'error');
+                        }
+                    }
+                    this.isSubmitting = false;
+                })
+            },
+
+            handleChange($event, cat, type) {
+                switch(cat) {
+                    case 'features':
+                        this.features[type] = $event;
+                    break;
+
+                    case 'landing':
+                        this.landing[type] = $event;
+                    break;
+
+                    case 'platform':
+                        this.platform[type] = $event;
+                    break;
+
+                    case 'media':
+                        this.media[type] = $event;
+                    break;
+
+                    case 'users':
+                        this.users[type] = $event;
+                    break;
+
+                    case 'storage':
+                        this.storage[type] = $event;
+                    break;
+                }
+                console.log($event)
+                console.log(type)
+            },
+
+            handleSubChange($event, cat, type, sub) {
+                switch(cat) {
+                    case 'features':
+                        this.features[type][sub] = $event;
+                    break;
+
+                    case 'landing':
+                        this.landing[type][sub] = $event;
+                    break;
+
+                    case 'platform':
+                        this.platform[type][sub] = $event;
+                    break;
+
+                    case 'media':
+                        this.media[type][sub] = $event;
+                    break;
+
+                    case 'users':
+                        this.users[type][sub] = $event;
+                    break;
+
+                    case 'storage':
+                        this.storage[type][sub] = $event;
+                    break;
+                }
+                console.log($event)
+                console.log(type)
+            },
+        },
+
+        watch: {
+
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .rule-badge {
+        display: flex;
+        width: 34px;
+        height: 34px;
+        justify-content: center;
+        align-items: center;
+        background-color: #fff;
+        border-radius: 34px;
+        border: 2px solid var(--primary);
+
+        &-inner {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            width: 26px;
+            height: 26px;
+            border-radius: 26px;
+            background-color: var(--primary);
+            color: #fff;
+            font-weight: bold;
+            font-size: 13px;
+        }
+    }
+    .rule-text {
+        max-width: 90%;
+        margin-bottom: 0px;
+        font-size: 14px;
+    }
+    .gap-1 {
+        gap: 1rem;
+    }
+</style>
diff --git a/resources/assets/components/admin/partial/AdminModalPost.vue b/resources/assets/components/admin/partial/AdminModalPost.vue
new file mode 100644
index 000000000..ac5ad0df6
--- /dev/null
+++ b/resources/assets/components/admin/partial/AdminModalPost.vue
@@ -0,0 +1,139 @@
+<template>
+<div class="mb-3">
+    <div v-if="status.media_attachments && status.media_attachments.length" class="list-group-item" style="gap:1rem;overflow:hidden;">
+        <div class="text-center text-muted small font-weight-bold mb-3">Reported Post Media</div>
+        <div v-if="status.media_attachments && status.media_attachments.length" class="d-flex flex-grow-1" style="gap: 1rem;overflow-x:auto;">
+            <template
+                v-for="media in status.media_attachments">
+                <img
+                    v-if="media.type === 'image'"
+                    :src="media.url"
+                    width="70"
+                    height="70"
+                    class="rounded"
+                    style="object-fit: cover;"
+                    @click="toggleLightbox"
+                    onerror="this.src='/storage/no-preview.png';this.error=null;" />
+
+                <video
+                    v-else-if="media.type === 'video'"
+                    width="140"
+                    height="90"
+                    playsinline
+                    @click.prevent="toggleVideoLightbox($event, media.url)"
+                    class="rounded"
+                    >
+                    <source :src="media.url" :type="media.mime">
+                </video>
+            </template>
+        </div>
+    </div>
+    <div class="list-group-item d-flex flex-row flex-grow-1" style="gap:1rem;">
+        <div class="flex-grow-1">
+            <div v-if="status && status.in_reply_to_id && status.parent && status.parent.account" class="mb-3">
+                <template v-if="showInReplyTo">
+                    <div class="mt-n1 text-center text-muted small font-weight-bold mb-1">Reply to</div>
+                    <div class="media" style="gap: 1rem;">
+                        <img
+                            :src="status.parent.account.avatar"
+                            width="40"
+                            height="40"
+                            class="rounded-lg"
+                            onerror="this.onerror=null;this.src='/storage/avatars/default.jpg?v=0';">
+                        <div class="d-flex flex-column">
+                            <p class="font-weight-bold mb-0" style="font-size: 11px;">
+                                <a :href="`/i/web/profile/${status.parent.account.id}`" target="_blank">{{ status.parent.account.acct }}</a>
+                            </p>
+                            <admin-read-more :content="status.parent.content_text" />
+                            <p class="mb-1">
+                                <a :href="`/i/web/post/${status.parent.id}`" target="_blank" class="text-muted" style="font-size: 11px;">
+                                    <i class="far fa-link mr-1"></i> {{ formatDate(status.parent.created_at)}}
+                                </a>
+                            </p>
+                        </div>
+                    </div>
+                    <hr class="my-1">
+                </template>
+                <a v-else class="btn btn-dark font-weight-bold btn-block btn-sm" href="#" @click.prevent="showInReplyTo = true">Show parent post</a>
+            </div>
+
+            <div>
+                <div class="mt-n1 text-center text-muted small font-weight-bold mb-1">Reported Post</div>
+                <div class="media" style="gap: 1rem;">
+                    <img
+                        :src="status.account.avatar"
+                        width="40"
+                        height="40"
+                        class="rounded-lg"
+                        onerror="this.onerror=null;this.src='/storage/avatars/default.jpg?v=0';">
+                    <div class="d-flex flex-column">
+                        <p class="font-weight-bold mb-0" style="font-size: 11px;">
+                            <a :href="`/i/web/profile/${status.account.id}`" target="_blank">{{ status.account.acct }}</a>
+                        </p>
+                        <template v-if="status && status.content_text && status.content_text.length">
+                            <admin-read-more :content="status.content_text" />
+                        </template>
+                        <template v-else>
+                            <admin-read-more content="EMPTY CAPTION" class="font-weight-bold text-muted" />
+                        </template>
+                        <p class="mb-0">
+                            <a :href="`/i/web/post/${status.id}`" target="_blank" class="text-muted" style="font-size: 11px;">
+                                <i class="far fa-link mr-1"></i> {{ formatDate(status.created_at)}}
+                            </a>
+                        </p>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</template>
+
+<script>
+    import BigPicture from 'bigpicture';
+    import AdminReadMore from './AdminReadMore.vue';
+
+    export default {
+        props: {
+            status: {
+                type: Object
+            }
+        },
+
+        data() {
+            return {
+                showInReplyTo: false,
+            }
+        },
+
+        components: {
+            "admin-read-more": AdminReadMore
+        },
+
+        methods: {
+            toggleLightbox(e) {
+                BigPicture({
+                    el: e.target
+                })
+            },
+
+            toggleVideoLightbox($event, src) {
+                BigPicture({
+                    el: event.target,
+                    vidSrc: src
+                })
+            },
+
+            formatDate(str) {
+                let date = new Date(str);
+                return new Intl.DateTimeFormat('default', {
+                    month: 'long',
+                    day: 'numeric',
+                    year: 'numeric',
+                    hour: 'numeric',
+                    minute: 'numeric'
+                }).format(date);
+            },
+        }
+    }
+</script>
diff --git a/resources/assets/components/admin/partial/AdminReadMore.vue b/resources/assets/components/admin/partial/AdminReadMore.vue
new file mode 100644
index 000000000..b5c1e47f2
--- /dev/null
+++ b/resources/assets/components/admin/partial/AdminReadMore.vue
@@ -0,0 +1,106 @@
+<template>
+    <div>
+        <div class="mb-0" :style="{ 'font-size':`${fontSize}px` }">{{ contentText }}</div>
+        <p class="mb-0"><a v-if="canStepExpand || (canExpand && !expanded)" class="font-weight-bold small" href="#" @click.prevent="expand()">Read more</a></p>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            content: {
+                type: String
+            },
+            maxLength: {
+                type: Number,
+                default: 140
+            },
+            fontSize: {
+                type: String,
+                default: "13"
+            },
+            step: {
+                type: Boolean,
+                default: false
+            },
+            stepLimit: {
+                type: Number,
+                default: 140
+            },
+            initialLimit: {
+                type: Number,
+                default: 10
+            }
+        },
+
+        computed: {
+            contentText: {
+                get() {
+                    if(this.step) {
+                        const len = this.content.length;
+                        const steps = len / this.stepLimit;
+                        if(this.stepIndex == 1 || steps < this.stepIndex) {
+                            this.canStepExpand = true;
+                        }
+
+                        return this.steppedTruncate();
+                    }
+                    if(this.content && this.content.length > this.maxLength) {
+                        this.canExpand = true;
+                    }
+                    return this.expanded ? this.content : this.truncate();
+                }
+            }
+        },
+
+        data() {
+            return {
+                expanded: false,
+                canExpand: false,
+                canStepExpand: false,
+                stepIndex: 1,
+            }
+        },
+
+        methods: {
+            expand() {
+                if(this.step) {
+                    this.stepIndex++;
+                    this.canStepExpand = true;
+                } else {
+                    this.expanded = true;
+                }
+            },
+
+            truncate() {
+                if(!this.content || !this.content.length) {
+                    return;
+                }
+
+                if(this.content && this.content.length < this.maxLength) {
+                    return this.content;
+                }
+
+                return this.content.slice(0, this.maxLength) + '...';
+            },
+
+            steppedTruncate() {
+                if(!this.content || !this.content.length) {
+                    return;
+                }
+                const len = this.content.length;
+                const steps = len / this.stepLimit;
+                const maxLen = this.stepLimit * this.stepIndex;
+                if(this.initialLimit != 10 && this.stepIndex === 1 && this.canStepExpand) {
+                    this.canStepExpand = len > this.stepLimit;
+                    return this.content.slice(0, this.initialLimit);
+                } else if(this.canStepExpand && this.stepIndex < steps) {
+                    return this.content.slice(0, maxLen);
+                } else {
+                    this.canStepExpand = false;
+                    return this.content;
+                }
+            }
+        }
+    }
+</script>
diff --git a/resources/assets/components/admin/partial/AdminRemoteReportModal.vue b/resources/assets/components/admin/partial/AdminRemoteReportModal.vue
new file mode 100644
index 000000000..63beff06d
--- /dev/null
+++ b/resources/assets/components/admin/partial/AdminRemoteReportModal.vue
@@ -0,0 +1,304 @@
+<template>
+    <b-modal
+        v-model="isOpen"
+        title="Remote Report"
+        :ok-only="true"
+        ok-title="Close"
+        :lazy="true"
+        :scrollable="true"
+        ok-variant="outline-primary"
+        v-on:hide="$emit('close')">
+        <div v-if="isLoading" class="d-flex align-items-center justify-content-center">
+            <b-spinner />
+        </div>
+
+        <template v-else>
+            <div class="list-group">
+                <div class="list-group-item d-flex justify-content-between align-items-center">
+                    <div class="text-muted small font-weight-bold">Instance</div>
+                    <div class="font-weight-bold">{{ model.instance }}</div>
+                </div>
+                <div v-if="model.message && model.message.length" class="list-group-item d-flex justify-content-between align-items-center flex-column gap-1">
+                    <div class="text-muted small font-weight-bold mb-2">Message</div>
+                    <div class="text-wrap w-100" style="word-break:break-all;font-size:12.5px;">
+                        <admin-read-more
+                            :content="model.message"
+                            font-size="11"
+                            :step="true"
+                            :initial-limit="100"
+                            :stepLimit="1000" />
+                    </div>
+                </div>
+            </div>
+            <div class="list-group list-group-horizontal mt-3">
+                <div
+                    v-if="model && model.reported"
+                    class="list-group-item d-flex align-items-center justify-content-between flex-row flex-grow-1"
+                    style="gap:0.4rem;">
+                    <div class="text-muted small font-weight-bold">Reported Account</div>
+
+                    <div class="d-flex justify-content-end flex-grow-1">
+                        <a v-if="model.reported && model.reported.id" :href="`/i/web/profile/${model.reported.id}`" target="_blank" class="text-primary">
+                            <div class="d-flex align-items-center" style="gap:0.61rem;">
+                                <img
+                                    :src="model.reported.avatar"
+                                    width="30"
+                                    height="30"
+                                    style="object-fit: cover;border-radius:30px;"
+                                    onerror="this.src='/storage/avatars/default.png';this.error=null;">
+
+                                <div class="d-flex flex-column">
+                                    <p class="font-weight-bold mb-0 text-break" style="font-size: 12px;max-width: 140px;line-height: 16px;" :class="[ model.reported.is_admin ? 'text-danger': '']">@{{model.reported.acct}}</p>
+                                    <div class="d-flex text-muted mb-0" style="font-size: 10px;gap: 0.5rem;">
+                                        <span>{{prettyCount(model.reported.followers_count)}} Followers</span>
+                                        <span>·</span>
+                                        <span>Joined {{ timeAgo(model.reported.created_at) }}</span>
+                                    </div>
+                                </div>
+                            </div>
+                        </a>
+                    </div>
+                </div>
+                <div
+                    v-else
+                    class="list-group-item d-flex align-items-center justify-content-center flex-column flex-grow-1">
+                    <p class="font-weight-bold mb-0">Reported Account Unavailable</p>
+                    <p class="small mb-0">The reported account may have been deleted, or is otherwise not currently active. You can safely <strong>Close Report</strong> to mark this report as read.</p>
+                </div>
+            </div>
+
+            <div v-if="model && model.statuses && model.statuses.length" class="list-group mt-3">
+                <admin-modal-post
+                    v-for="(status, idx) in model.statuses"
+                    :key="`admin-modal-post-remote-post:${status.id}:${idx}`"
+                    :status="status"
+                />
+            </div>
+
+            <div class="mt-4">
+                <div>
+                    <button
+                        type="button"
+                        class="btn btn-dark btn-block rounded-pill"
+                        @click="handleAction('mark-read')">
+                        Close Report
+                    </button>
+
+                    <button
+                        type="button"
+                        class="btn btn-outline-dark btn-block text-center rounded-pill"
+                        style="word-break: break-all;"
+                        @click="handleAction('mark-all-read-by-domain')">
+                        <span class="font-weight-light">Close all reports from</span> <strong>{{ model.instance}}</strong>
+                    </button>
+                    <button
+                        v-if="model.reported"
+                        type="button"
+                        class="btn btn-outline-dark btn-block rounded-pill flex-grow-1"
+                        @click="handleAction('mark-all-read-by-username')">
+                        <span class="font-weight-light">Close all reports against</span> <strong>&commat;{{ model.reported.username }}</strong>
+                    </button>
+
+                    <template
+                        v-if="model && model.statuses && model.statuses.length && model.reported">
+                        <hr class="mt-3 mb-1">
+
+                        <div
+                            class="d-flex flex-row mt-2"
+                            style="gap:0.3rem;">
+                            <button
+                                type="button"
+                                class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-0"
+                                @click="handleAction('cw-posts')">
+                                Apply CW to Post(s)
+                            </button>
+
+                            <button
+                                type="button"
+                                class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-0"
+                                @click="handleAction('unlist-posts')">
+                                Unlist Post(s)
+                            </button>
+                        </div>
+                        <div class="d-flex flex-row mt-2">
+                            <button
+                                type="button"
+                                class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-0"
+                                @click="handleAction('private-posts')">
+                                Make Post(s) Private
+                            </button>
+                            <button
+                                type="button"
+                                class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-0"
+                                @click="handleAction('delete-posts')">
+                                Delete Post(s)
+                            </button>
+                        </div>
+                    </template>
+
+                    <template v-else-if="model && model.statuses && !model.statuses.length && model.reported">
+                        <hr class="mt-3 mb-1">
+
+                        <div
+                            class="d-flex flex-row mt-2"
+                            style="gap:0.3rem;">
+                            <button
+                                type="button"
+                                class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-0"
+                                @click="handleAction('cw-all-posts')">
+                                Apply CW to all posts
+                            </button>
+
+                            <button
+                                type="button"
+                                class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-0"
+                                @click="handleAction('unlist-all-posts')">
+                                Unlist all account posts
+                            </button>
+                        </div>
+                        <div
+                            class="d-flex flex-row mt-2"
+                            style="gap:0.3rem;">
+
+                            <button
+                                type="button"
+                                class="btn btn-outline-danger btn-block btn-sm rounded-pill mt-0"
+                                @click="handleAction('private-all-posts')">
+                                Make all posts private
+                            </button>
+                        </div>
+                    </template>
+                </div>
+            </div>
+        </template>
+    </b-modal>
+</template>
+
+<script>
+    import AdminModalPost from "./AdminModalPost.vue";
+    import AdminReadMore from "./AdminReadMore.vue";
+
+    export default {
+        props: {
+            open: {
+                type: Boolean,
+                default: false
+            },
+            model: {
+                type: Object
+            }
+        },
+
+        components: {
+            "admin-modal-post": AdminModalPost,
+            "admin-read-more": AdminReadMore
+        },
+
+        watch: {
+            open: {
+                handler() {
+                    this.isOpen = this.open;
+                },
+                immediate: true,
+                deep: true,
+            }
+        },
+
+        data() {
+            return {
+                isLoading: true,
+                isOpen: false,
+                actions: [
+                    'mark-read',
+                    'cw-posts',
+                    'unlist-posts',
+                    'private-posts',
+                    'delete-posts',
+                    'mark-all-read-by-domain',
+                    'mark-all-read-by-username',
+                    'cw-all-posts',
+                    'unlist-all-posts',
+                    'private-all-posts',
+                ],
+                actionMap: {
+                    'cw-posts': 'apply content warnings to all post(s) in this report?',
+                    'unlist-posts': 'unlist all post(s) in this report?',
+                    'delete-posts': 'delete all post(s) in this report?',
+                    'private-posts': 'make all post(s) in this report private/followers-only?',
+                    'mark-all-read-by-domain': 'mark all reports by this instance as closed?',
+                    'mark-all-read-by-username': 'mark all reports against this user as closed?',
+                    'cw-all-posts': 'apply content warnings to all post(s) belonging to this account?',
+                    'unlist-all-posts': 'make all post(s) belonging to this account as unlisted?',
+                    'private-all-posts': 'make all post(s) belonging to this account as private?',
+                }
+            }
+        },
+
+        mounted() {
+            setTimeout(() => {
+                this.isLoading = false;
+            }, 300);
+        },
+
+        methods: {
+            prettyCount(str) {
+                if(str) {
+                   return str.toLocaleString('en-CA', { compactDisplay: "short", notation: "compact"});
+                }
+                return str;
+            },
+
+            timeAgo(str) {
+                if(!str) {
+                    return str;
+                }
+                return App.util.format.timeAgo(str);
+            },
+
+            formatDate(str) {
+                let date = new Date(str);
+                return new Intl.DateTimeFormat('default', {
+                    month: 'long',
+                    day: 'numeric',
+                    year: 'numeric',
+                    hour: 'numeric',
+                    minute: 'numeric'
+                }).format(date);
+            },
+
+            handleAction(action) {
+                if(action === 'mark-read') {
+                    axios.post('/i/admin/api/reports/remote/handle', {
+                        id: this.model.id,
+                        action: action,
+                    }).then(res => {
+                        console.log(res.data)
+                    })
+                    .finally(() => {
+                        this.$emit('refresh');
+                        this.$emit('close');
+                    })
+                    return;
+                }
+
+                swal({
+                    title: 'Confirm',
+                    text: 'Are you sure you want to ' + this.actionMap[action],
+                    icon: 'warning',
+                    buttons: true,
+                    dangerMode: true,
+                }).then(res => {
+                    if(res === true) {
+                        axios.post('/i/admin/api/reports/remote/handle', {
+                            id: this.model.id,
+                            action: action,
+                        }).finally(() => {
+                            this.$emit('refresh');
+                            this.$emit('close');
+                        })
+                    }
+                });
+            }
+        }
+    }
+</script>
diff --git a/resources/assets/components/admin/partial/AdminSettingsCheckbox.vue b/resources/assets/components/admin/partial/AdminSettingsCheckbox.vue
new file mode 100644
index 000000000..bb8cfec96
--- /dev/null
+++ b/resources/assets/components/admin/partial/AdminSettingsCheckbox.vue
@@ -0,0 +1,42 @@
+<template>
+    <div class="card shadow-none border card-body">
+        <div class="form-group mb-0">
+            <div class="custom-control custom-checkbox">
+                <input type="checkbox" :name="elementId" class="custom-control-input" :id="elementId" :checked="value" @change="$emit('change', !value)">
+                <label class="custom-control-label font-weight-bold" :for="elementId">{{ name }}</label>
+            </div>
+            <p class="mt-1 mb-0 small text-muted" v-html="description"></p>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            name: {
+                type: String
+            },
+
+            value: {
+                type: Boolean
+            },
+
+            description: {
+                type: String
+            }
+        },
+
+        computed: {
+            elementId: {
+                get() {
+                    let name = this.name;
+                    name = name.toLowerCase();
+                    name = name.replace(/[^a-z0-9 -]/g, ' ');
+                    name = name.replace(/\s+/g, '-');
+                    name = name.replace(/^-+|-+$/g, '');
+                    return 'fec_' + name;
+                }
+            }
+        }
+    }
+</script>
diff --git a/resources/assets/components/admin/partial/AdminSettingsInput.vue b/resources/assets/components/admin/partial/AdminSettingsInput.vue
new file mode 100644
index 000000000..25309134d
--- /dev/null
+++ b/resources/assets/components/admin/partial/AdminSettingsInput.vue
@@ -0,0 +1,74 @@
+<template>
+    <div :class="[ isCard ? 'card shadow-none border card-body' : '' ]">
+        <div
+            class="form-group"
+            :class="[ isInline ? 'd-flex align-items-center gap-1' : 'mb-1' ]">
+            <label :for="elementId" class="font-weight-bold mb-0">{{ name }}</label>
+            <input
+                :id="elementId"
+                class="form-control form-control-muted mb-0"
+                :placeholder="placeholder"
+                :value="value"
+                @input="$emit('change', $event.target.value)"
+                :disabled="isDisabled" />
+        </div>
+        <p v-if="description && description.length" class="help-text small text-muted mb-0" v-html="description">
+        </p>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            name: {
+                type: String
+            },
+
+            value: {
+                type: String
+            },
+
+            placeholder: {
+                type: String
+            },
+
+            description: {
+                type: String
+            },
+
+            isCard: {
+                type: Boolean,
+                default: true
+            },
+
+            isInline: {
+                type: Boolean,
+                default: false
+            },
+
+            isDisabled: {
+                type: Boolean,
+                default: false
+            }
+        },
+
+        computed: {
+            elementId: {
+                get() {
+                    let name = this.name;
+                    name = name.toLowerCase();
+                    name = name.replace(/[^a-z0-9 -]/g, ' ');
+                    name = name.replace(/\s+/g, '-');
+                    name = name.replace(/^-+|-+$/g, '');
+                    return 'fec_' + name;
+                }
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped="true">
+    .gap-1 {
+        gap: 1rem;
+    }
+</style>
diff --git a/resources/assets/components/admin/partial/AdminSettingsTabHeader.vue b/resources/assets/components/admin/partial/AdminSettingsTabHeader.vue
new file mode 100644
index 000000000..ac75d3f37
--- /dev/null
+++ b/resources/assets/components/admin/partial/AdminSettingsTabHeader.vue
@@ -0,0 +1,63 @@
+<template>
+    <div>
+        <div class="d-flex justify-content-between align-items-center">
+            <div style="width:100px;"></div>
+            <div>
+                <h2 class="display-4 mb-0" style="font-weight: 800;">{{ title }}</h2>
+            </div>
+            <div>
+                <button
+                    class="btn btn-primary rounded-pill font-weight-bold px-5"
+                    :disabled="isSaving || saved"
+                    @click.prevent="save">
+                    <template v-if="isSaving === true"><b-spinner small class="mx-2" /></template>
+                    <template v-else>{{ buttonLabel }}</template>
+                </button>
+            </div>
+        </div>
+        <hr class="mt-3">
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            title: {
+                type: String
+            },
+            saving: {
+                type: Boolean
+            },
+            saved: {
+                type: Boolean
+            }
+        },
+
+        computed: {
+            buttonLabel: {
+                get() {
+                    if(this.saved) {
+                        return 'Saved';
+                    }
+                    if(this.saving) {
+                        return 'Saving';
+                    }
+
+                    return 'Save';
+                }
+            },
+            isSaving: {
+                get() {
+                    return this.saving;
+                }
+            }
+        },
+
+        methods: {
+            save($event) {
+                $event.currentTarget?.blur();
+                this.$emit('save');
+            }
+        }
+    }
+</script>
diff --git a/resources/assets/components/groups/CreateGroup.vue b/resources/assets/components/groups/CreateGroup.vue
new file mode 100644
index 000000000..55a857ab8
--- /dev/null
+++ b/resources/assets/components/groups/CreateGroup.vue
@@ -0,0 +1,359 @@
+<template>
+	<div class="create-group-component col-12 col-md-9" style="height: 100vh - 51px !important;overflow:hidden">
+        <div v-if="!hide" class="row h-100 bg-lighter">
+			<div class="col-12 col-md-8 border-left">
+
+                <div class="bg-dark p-5 mx-n3">
+                    <p class="h1 font-weight-bold text-light mb-2">Create Group</p>
+                    <p class="text-lighter mb-0">Create a new federated Group that is compatible with other Pixelfed and Lemmy servers</p>
+                </div>
+				<div class="px-2 mb-5">
+					<div class="mt-4">
+                        <text-input
+                            label="Group Name"
+                            :value="name"
+                            :hasLimit="true"
+                            :maxLimit="limit.name.max"
+                            placeholder="Add your group name"
+                            helpText="Alphanumeric characters only, you can change this later."
+                            :largeInput="true"
+                            @update="handleUpdate('name', $event)"
+                        />
+
+                        <hr>
+
+                        <select-input
+                            label="Group Type"
+                            :value="membership"
+                            :categories="membershipCategories"
+                            placeholder="Select a type"
+                            helpText="Select the membership type, you can change this later."
+                            @update="handleUpdate('membership', $event)"
+                        />
+
+                        <hr>
+
+                        <select-input
+                            label="Group Category"
+                            :value="category"
+                            :categories="categories"
+                            placeholder="Select a category"
+                            helpText="Choose the most relevant category to improve discovery and visibility"
+                            @update="handleUpdate('category', $event)"
+                        />
+
+						<hr>
+
+                        <text-area-input
+                            label="Group Description"
+                            :value="description"
+                            :hasLimit="true"
+                            :maxLimit="limit.description.max"
+                            placeholder="Describe your groups purpose in a few words"
+                            helpText="Describe your groups purpose in a few words, you can change this later."
+                            @update="handleUpdate('description', $event)"
+                        />
+
+                        <hr>
+
+                        <checkbox-input
+                            label="Adult Content"
+                            inputText="Allow Adult Content"
+                            :value="configuration.adult"
+                            helpText="Groups that allow adult content should enable this or risk suspension or deletion by instance admins. Illegal content is prohibited. You can change this later."
+                        />
+
+                        <hr>
+
+                        <checkbox-input
+                            label=""
+                            inputText="I agree to the the Community Guidelines and Terms of Use and will administrate this group according to the rules set by this server. I understand that failure to abide by these terms may lead to the suspension of this group, and my account."
+                            :value="hasConfirmed"
+                            :strongText="false"
+                            @update="handleUpdate('hasConfirmed', $event)"
+                        />
+
+						<!-- <div class="form-group row">
+							<div class="col-sm-10 offset-sm-2">
+								<div class="form-check">
+									<input class="form-check-input" type="checkbox" id="gridCheck1" v-model="hasConfirmed">
+									<label class="form-check-label" for="gridCheck1">
+										I agree to the <a href="#">Community Guidelines</a> and <a href="#">Terms of Use</a>
+									</label>
+								</div>
+							</div>
+						</div> -->
+
+                        <button
+                            class="btn btn-primary btn-block font-weight-bold rounded-pill mt-4"
+                            @click="createGroup"
+                            :disabled="!hasConfirmed">
+                            Create Group
+                        </button>
+					</div>
+				</div>
+			</div>
+			<div class="col-12 col-md-4 bg-white">
+				<!-- <div>
+					<button
+						v-if="page <= 4"
+						class="btn btn-primary btn-block font-weight-bold rounded-pill mt-4"
+						@click="nextPage"
+						:disabled="!membership">
+						Next
+					</button>
+
+					<button
+						v-if="page == 5"
+						class="btn btn-primary btn-block font-weight-bold rounded-pill mt-4"
+						@click="createGroup"
+						:disabled="!hasConfirmed">
+						Create Group
+					</button>
+
+					<button
+						v-if="page >= 2"
+						class="btn btn-light btn-block font-weight-bold rounded-pill border mt-4"
+						@click="prevPage">
+						Back
+					</button>
+
+					<div v-if="maxPage > 2" class="mt-4">
+						<p v-if="name && name.length">
+							<span class="text-lighter">Name:</span>
+							<span class="font-weight-bold">{{ name }}</span>
+						</p>
+
+						<p v-if="description && description.length">
+							<span class="text-lighter">Description:</span>
+							<span>{{ description }}</span>
+						</p>
+
+						<p v-if="membership && membership.length">
+							<span class="text-lighter">Membership:</span>
+							<span class="text-capitalize">{{ membership }}</span>
+						</p>
+
+						<p v-if="category && category.length">
+							<span class="text-lighter">Category:</span>
+							<span class="text-capitalize">{{ category }}</span>
+						</p>
+					</div>
+				</div> -->
+			</div>
+		</div>
+     </div>
+</template>
+
+<script type="text/javascript">
+    import TextInput from '@/groups/partials/CreateForm/TextInput.vue';
+    import SelectInput from '@/groups/partials/CreateForm/SelectInput.vue';
+    import TextAreaInput from '@/groups/partials/CreateForm/TextAreaInput.vue';
+    import CheckboxInput from '@/groups/partials/CreateForm/CheckboxInput.vue';
+
+	export default {
+        components: {
+            "text-input": TextInput,
+            "select-input": SelectInput,
+            "text-area-input": TextAreaInput,
+            "checkbox-input": CheckboxInput,
+        },
+
+		data() {
+			return {
+				hide: true,
+				name: null,
+				page: 1,
+				maxPage: 1,
+				description: null,
+				membership: "placeholder",
+				submitting: false,
+				categories: [],
+				category: "",
+				limit: {
+					name: {
+						max: 60
+					},
+					description: {
+						max: 500
+					}
+				},
+				configuration: {
+					types: {
+						text: true,
+						photos: true,
+						videos: true,
+						// events: false,
+						polls: true
+					},
+					federation: true,
+					adult: false,
+					discoverable: false,
+					autospam: false,
+					dms: false,
+					slowjoin: {
+						enabled: false,
+						age: 90,
+						limit: {
+							post: 1,
+							comment: 20,
+							threads: 2,
+							likes: 5,
+							hashtags: 5,
+							mentions: 1,
+							autolinks: 1
+						}
+					}
+				},
+				hasConfirmed: false,
+				permissionChecked: false,
+                membershipCategories: [
+                    { key: 'Public', value: 'public' },
+                    // { key: 'Private', value: 'private' },
+                    // { key: 'Local', value: 'local' },
+                ],
+			}
+		},
+
+		mounted() {
+			this.permissionCheck();
+			this.fetchCategories();
+		},
+
+		methods: {
+			permissionCheck() {
+				axios.post('/api/v0/groups/permission/create')
+				.then(res => {
+					if(res.data.permission == false) {
+						swal('Limit reached', 'You cannot create any more groups', 'error');
+						this.hide = true;
+					} else {
+						this.hide = false;
+					}
+					this.permissionChecked = true;
+				});
+			},
+
+			submit($event) {
+				$event.preventDefault();
+				this.submitting = true;
+
+				axios.post('/api/v0/groups/create', {
+					name: this.name,
+					description: this.description,
+					membership: this.membership
+				}).then(res => {
+					console.log(res.data);
+					window.location.href = res.data.url;
+				}).catch(err => {
+					console.log(err.response);
+
+				})
+			},
+
+			fetchCategories() {
+				axios.get('/api/v0/groups/categories/list')
+				.then(res => {
+					this.categories = res.data.map(c => {
+                        return {
+                            key: c,
+                            value: c
+                        }
+                    });
+				})
+			},
+
+			createGroup() {
+				axios.post('/api/v0/groups/create', {
+					name: this.name,
+					description: this.description,
+					membership: this.membership,
+					configuration: this.configuration
+				})
+				.then(res => {
+					console.log(res.data);
+					location.href = res.data.url;
+				})
+			},
+
+            handleUpdate(key, val) {
+                this[key] = val;
+            }
+		}
+	}
+</script>
+
+<style lang="scss">
+	.create-group-component {
+		.submit-button {
+			width: 130px;
+		}
+
+		.multistep {
+			margin-top: 30px;
+			margin-bottom: 30px;
+			overflow: hidden;
+			counter-reset: step;
+			text-align: center;
+			padding-left: 0;
+		}
+
+		.multistep li {
+			list-style-type: none;
+			text-transform: uppercase;
+			font-size: 9px;
+			font-weight: 700;
+			width: 20%;
+			float: left;
+			position: relative;
+			color: #B8C2CC;
+		}
+
+		.multistep li.active {
+			color: #000;
+		}
+
+		.multistep li:before {
+			content: counter(step);
+			counter-increment: step;
+			width: 24px;
+			height: 24px;
+			line-height: 26px;
+			display: block;
+			font-size: 12px;
+			color: #B8C2CC;
+			background: #F3F4F6;
+			border-radius: 25px;
+			margin: 0 auto 10px auto;
+			transition: background 400ms;
+		}
+
+		.multistep li:after {
+			content: '';
+			width: 100%;
+			height: 2px;
+			background: #dee2e6;
+			position: absolute;
+			left: -50%;
+			top: 11px;
+			z-index: -1;
+			transition: background 400ms;
+		}
+
+		.multistep li:first-child:after {
+			content: none;
+		}
+
+		.multistep li.active:before,
+		.multistep li.active:after {
+			background: #2c78bf;
+			color: white;
+			transition: background 400ms;
+		}
+
+		.col-form-label {
+			font-weight: 600;
+			text-align: right;
+		}
+	}
+</style>
diff --git a/resources/assets/components/groups/GroupFeed.vue b/resources/assets/components/groups/GroupFeed.vue
new file mode 100644
index 000000000..9a357d4ee
--- /dev/null
+++ b/resources/assets/components/groups/GroupFeed.vue
@@ -0,0 +1,989 @@
+<template>
+	<div class="group-feed-component">
+		<div v-if="!initalLoad">
+			<p class="text-center mt-5 pt-5 font-weight-bold">Loading...</p>
+		</div>
+
+		<div v-else>
+			<div class="mb-3 border-bottom">
+				<div class="container-xl">
+                    <group-banner
+                        :group="group"
+                    />
+                    <group-header-details
+                        :group="group"
+                        :isAdmin="isAdmin"
+                        :isMember="isMember"
+                        @refresh="handleRefresh"
+                    />
+                    <group-nav-tabs
+                        :group="group"
+                        :isAdmin="isAdmin"
+                        :isMember="isMember"
+                        :atabs="atabs"
+                    />
+				</div>
+			</div>
+
+			<div class="container-xl group-feed-component-body">
+				<div class="row mb-5">
+					<div class="col-12 col-md-7 mt-3">
+						<div v-if="group.self.is_member">
+							<group-compose
+								v-if="initalLoad"
+								:profile="profile"
+								:group-id="groupId"
+								v-on:new-status="pushNewStatus" />
+
+							<div v-if="feed.length == 0" class="mt-3">
+								<div class="card card-body shadow-none border d-flex align-items-center justify-content-center" style="height: 200px;">
+									<p class="font-weight-bold mb-0">No posts yet!</p>
+								</div>
+							</div>
+
+							<div v-else class="group-timeline">
+								<p class="font-weight-bold mb-1">Recent Posts</p>
+
+
+								<!-- <div class="status-card-component shadow-sm mb-3 rounded-lg">
+								    <div class="card shadow-none border rounded-0">
+								        <div class="card-body pb-0">
+								            <div class="media">
+								                <img src="https://pixelfed.test/storage/avatars/321493203255693312/5a6nqo.jpg?v=2" width="42px" height="42px" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'" alt="avatar" class="rounded-circle box-shadow mr-2">
+
+								                <div class="media-body">
+								                    <div class="pl-2 d-flex align-items-top">
+								                        <div>
+								                            <p class="mb-0">
+								                                <a href="https://pixelfed.test/dansup" class="username font-weight-bold text-dark text-decoration-none text-break">
+								                                    dansup
+								                                </a>
+								                            </p>
+
+								                            <p class="mb-0">
+								                                <a href="https://pixelfed.test/groups/328821658771132416/329186991407239168" class="font-weight-light text-muted small">13h</a>
+
+								                                <span class="text-lighter" style="padding-left: 2px; padding-right: 2px;">·</span>
+
+								                                <span class="text-muted small">
+								                                    <i class="fas fa-globe"></i>
+								                                </span>
+								                            </p>
+								                        </div>
+
+								                        <span class="text-right" style="flex-grow: 1;">
+								                            <button type="button" class="btn btn-link text-dark py-0">
+								                                <span class="fas fa-ellipsis-h text-lighter"></span>
+
+								                                <span class="sr-only">Post Menu</span>
+								                            </button>
+								                        </span>
+								                    </div>
+								                </div>
+								            </div>
+
+								            <div>
+								                <div>
+								                    <div class="">
+								                    	<p class="pt-2 text-break" style="font-size: 15px;">
+								                            Made some improvements!
+								                        </p>
+
+								                        <div class="my-3 row px-0 mx-0 card card-body my-0 py-0 border shadow-none">
+								                        		<img src="https://opengraph.githubassets.com/f66d0f7bf17df4a45382b83c1ffde2f25e3d700f9d87ab8c9ec2029c3a1e16b6/pixelfed/pixelfed/pull/2865" class="img-fluid">
+								                        	<div class="bg-light px-3 pt-2 pb-3">
+								                        		<p class="text-muted mb-0 small">GITHUB.COM</p>
+								                        		<p class="mb-0" style="font-size: 16px;font-weight:500;">Update LikeController, add UndoLikePipeline and federate Undo Like ac… by dansup · Pull Request #2865 · pixelfed/pixelfed</p>
+								                        		<p class="mb-0 text-muted" style="font-size:14px;line-height:15px;">…tivities</p>
+								                        	</div>
+								                        </div>
+
+									                    <div class="border-top my-0">
+									                        <div class="d-flex justify-content-between py-2 px-4">
+									                            <button class="btn btn-link py-0 text-decoration-none text-muted">
+									                                <i class="far fa-heart mr-1"></i>
+									                                Like
+									                            </button>
+
+									                            <div>
+									                                <i class="far fa-comment cursor-pointer text-muted mr-1"></i>
+									                                Comment
+									                            </div>
+
+									                            <div>
+									                                <i class="fas fa-external-link-alt cursor-pointer text-muted mr-1"></i>
+									                                Share
+									                            </div>
+									                        </div>
+									                    </div>
+									                </div>
+									            </div>
+								        	</div>
+									    </div>
+									</div>
+								</div> -->
+
+								<!-- OGP -->
+								<!-- <div class="status-card-component shadow-sm mb-3 rounded-lg">
+								    <div class="card shadow-none border rounded-0">
+								        <div class="card-body pb-0">
+								            <div class="media">
+								                <img src="https://pixelfed.test/storage/avatars/321493203255693312/5a6nqo.jpg?v=2" width="42px" height="42px" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'" alt="avatar" class="rounded-circle box-shadow mr-2">
+
+								                <div class="media-body">
+								                    <div class="pl-2 d-flex align-items-top">
+								                        <div>
+								                            <p class="mb-0">
+								                                <a href="https://pixelfed.test/dansup" class="username font-weight-bold text-dark text-decoration-none text-break">
+								                                    dansup
+								                                </a>
+								                            </p>
+
+								                            <p class="mb-0">
+								                                <a href="https://pixelfed.test/groups/328821658771132416/329186991407239168" class="font-weight-light text-muted small">13h</a>
+
+								                                <span class="text-lighter" style="padding-left: 2px; padding-right: 2px;">·</span>
+
+								                                <span class="text-muted small">
+								                                    <i class="fas fa-globe"></i>
+								                                </span>
+								                            </p>
+								                        </div>
+
+								                        <span class="text-right" style="flex-grow: 1;">
+								                            <button type="button" class="btn btn-link text-dark py-0">
+								                                <span class="fas fa-ellipsis-h text-lighter"></span>
+
+								                                <span class="sr-only">Post Menu</span>
+								                            </button>
+								                        </span>
+								                    </div>
+								                </div>
+								            </div>
+
+								            <div>
+								                <div>
+								                    <div class="">
+								                        <div class="my-3 row px-0 mx-0 card card-body my-0 py-0 border shadow-none">
+								                        		<img src="https://www.ctvnews.ca/polopoly_fs/1.5533318.1628281952!/httpImage/image.jpg_gen/derivatives/landscape_620/image.jpg" class="img-fluid">
+								                        	<div class="bg-light px-3 pt-2 pb-3">
+								                        		<p class="text-muted mb-0 small">CTVNEWS.CA</p>
+								                        		<p class="mb-0" style="font-size: 16px;font-weight:500;">No charges against Alberta man who fatally shot home intruder: RCMP</p>
+								                        		<p class="mb-0 text-muted" style="font-size:14px;line-height:15px;">No charges will be laid against an Alberta man who shot and killed an intruder after being beaten with a baseball bat, RCMP announced Friday.</p>
+								                        	</div>
+								                        </div>
+
+									                    <div class="border-top my-0">
+									                        <div class="d-flex justify-content-between py-2 px-4">
+									                            <button class="btn btn-link py-0 text-decoration-none text-muted">
+									                                <i class="far fa-heart mr-1"></i>
+									                                Like
+									                            </button>
+
+									                            <div>
+									                                <i class="far fa-comment cursor-pointer text-muted mr-1"></i>
+									                                Comment
+									                            </div>
+
+									                            <div>
+									                                <i class="fas fa-external-link-alt cursor-pointer text-muted mr-1"></i>
+									                                Share
+									                            </div>
+									                        </div>
+									                    </div>
+									                </div>
+									            </div>
+								        	</div>
+									    </div>
+									</div>
+								</div> -->
+
+								<!-- SOUNDCLOUD -->
+								<!-- <div class="status-card-component shadow-sm mb-3 rounded-lg">
+								    <div class="card shadow-none border rounded-0">
+								        <div class="card-body pb-0">
+								            <div class="media">
+								                <img src="https://pixelfed.test/storage/avatars/321493203255693312/5a6nqo.jpg?v=2" width="42px" height="42px" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'" alt="avatar" class="rounded-circle box-shadow mr-2">
+
+								                <div class="media-body">
+								                    <div class="pl-2 d-flex align-items-top">
+								                        <div>
+								                            <p class="mb-0">
+								                                <a href="https://pixelfed.test/dansup" class="username font-weight-bold text-dark text-decoration-none text-break">
+								                                    dansup
+								                                </a>
+								                            </p>
+
+								                            <p class="mb-0">
+								                                <a href="https://pixelfed.test/groups/328821658771132416/329186991407239168" class="font-weight-light text-muted small">13h</a>
+
+								                                <span class="text-lighter" style="padding-left: 2px; padding-right: 2px;">·</span>
+
+								                                <span class="text-muted small">
+								                                    <i class="fas fa-globe"></i>
+								                                </span>
+								                            </p>
+								                        </div>
+
+								                        <span class="text-right" style="flex-grow: 1;">
+								                            <button type="button" class="btn btn-link text-dark py-0">
+								                                <span class="fas fa-ellipsis-h text-lighter"></span>
+
+								                                <span class="sr-only">Post Menu</span>
+								                            </button>
+								                        </span>
+								                    </div>
+								                </div>
+								            </div>
+
+								            <div>
+								                <div>
+								                    <div class="">
+								                        <p class="pt-2 text-break" style="font-size: 15px;">
+								                            What does everyone think??
+								                        </p>
+
+								                        <div class="my-3 row p-0 m-0">
+								                        	<iframe width="100%" height="166" scrolling="no" frameborder="no" allow="autoplay" src="https://w.soundcloud.com/player/?url=https%3A//api.soundcloud.com/tracks/34019569&color=0066cc"></iframe><div style="font-size: 10px; color: #cccccc;line-break: anywhere;word-break: normal;overflow: hidden;white-space: nowrap;text-overflow: ellipsis; font-family: Interstate,Lucida Grande,Lucida Sans Unicode,Lucida Sans,Garuda,Verdana,Tahoma,sans-serif;font-weight: 100;"><a href="https://soundcloud.com/the-bugle" title="The Bugle" target="_blank" style="color: #cccccc; text-decoration: none;">The Bugle</a> · <a href="https://soundcloud.com/the-bugle/bugle-179-playas-gon-play" title="Bugle 179 - Playas gon play" target="_blank" style="color: #cccccc; text-decoration: none;">Bugle 179 - Playas gon play</a></div>
+								                        </div>
+
+									                    <div class="border-top my-0">
+									                        <div class="d-flex justify-content-between py-2 px-4">
+									                            <button class="btn btn-link py-0 text-decoration-none text-muted">
+									                                <i class="far fa-heart mr-1"></i>
+									                                Like
+									                            </button>
+
+									                            <div>
+									                                <i class="far fa-comment cursor-pointer text-muted mr-1"></i>
+									                                Comment
+									                            </div>
+
+									                            <div>
+									                                <i class="fas fa-external-link-alt cursor-pointer text-muted mr-1"></i>
+									                                Share
+									                            </div>
+									                        </div>
+									                    </div>
+									                </div>
+									            </div>
+								        	</div>
+									    </div>
+									</div>
+								</div> -->
+
+								<!-- YOUTUBE -->
+								<!-- <div class="status-card-component shadow-sm mb-3 rounded-lg">
+								    <div class="card shadow-none border rounded-0">
+								        <div class="card-body pb-0">
+								            <div class="media">
+								                <img src="https://pixelfed.test/storage/avatars/321493203255693312/5a6nqo.jpg?v=2" width="42px" height="42px" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'" alt="avatar" class="rounded-circle box-shadow mr-2">
+
+								                <div class="media-body">
+								                    <div class="pl-2 d-flex align-items-top">
+								                        <div>
+								                            <p class="mb-0">
+								                                <a href="https://pixelfed.test/dansup" class="username font-weight-bold text-dark text-decoration-none text-break">
+								                                    dansup
+								                                </a>
+								                            </p>
+
+								                            <p class="mb-0">
+								                                <a href="https://pixelfed.test/groups/328821658771132416/329186991407239168" class="font-weight-light text-muted small">13h</a>
+
+								                                <span class="text-lighter" style="padding-left: 2px; padding-right: 2px;">·</span>
+
+								                                <span class="text-muted small">
+								                                    <i class="fas fa-globe"></i>
+								                                </span>
+								                            </p>
+								                        </div>
+
+								                        <span class="text-right" style="flex-grow: 1;">
+								                            <button type="button" class="btn btn-link text-dark py-0">
+								                                <span class="fas fa-ellipsis-h text-lighter"></span>
+
+								                                <span class="sr-only">Post Menu</span>
+								                            </button>
+								                        </span>
+								                    </div>
+								                </div>
+								            </div>
+
+								            <div>
+								                <div>
+								                    <div class="">
+								                        <p class="pt-2 text-break" style="font-size: 15px;">
+								                            What does everyone think??
+								                        </p>
+
+								                        <div class="my-3 row p-0 m-0">
+								                        	<iframe width="100%" height="315" src="https://www.youtube.com/embed/lH78Tb0r_f8" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+								                        </div>
+
+									                    <div class="border-top my-0">
+									                        <div class="d-flex justify-content-between py-2 px-4">
+									                            <button class="btn btn-link py-0 text-decoration-none text-muted">
+									                                <i class="far fa-heart mr-1"></i>
+									                                Like
+									                            </button>
+
+									                            <div>
+									                                <i class="far fa-comment cursor-pointer text-muted mr-1"></i>
+									                                Comment
+									                            </div>
+
+									                            <div>
+									                                <i class="fas fa-external-link-alt cursor-pointer text-muted mr-1"></i>
+									                                Share
+									                            </div>
+									                        </div>
+									                    </div>
+									                </div>
+									            </div>
+								        	</div>
+									    </div>
+									</div>
+								</div> -->
+
+								<!-- PHOTOS -->
+								<!-- <div class="status-card-component shadow-sm mb-3 rounded-lg">
+								    <div class="card shadow-none border rounded-0">
+								        <div class="card-body pb-0">
+								            <div class="media">
+								                <img src="https://pixelfed.test/storage/avatars/321493203255693312/5a6nqo.jpg?v=2" width="42px" height="42px" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'" alt="avatar" class="rounded-circle box-shadow mr-2">
+
+								                <div class="media-body">
+								                    <div class="pl-2 d-flex align-items-top">
+								                        <div>
+								                            <p class="mb-0">
+								                                <a href="https://pixelfed.test/dansup" class="username font-weight-bold text-dark text-decoration-none text-break">
+								                                    dansup
+								                                </a>
+								                            </p>
+
+								                            <p class="mb-0">
+								                                <a href="https://pixelfed.test/groups/328821658771132416/329186991407239168" class="font-weight-light text-muted small">13h</a>
+
+								                                <span class="text-lighter" style="padding-left: 2px; padding-right: 2px;">·</span>
+
+								                                <span class="text-muted small">
+								                                    <i class="fas fa-globe"></i>
+								                                </span>
+								                            </p>
+								                        </div>
+
+								                        <span class="text-right" style="flex-grow: 1;">
+								                            <button type="button" class="btn btn-link text-dark py-0">
+								                                <span class="fas fa-ellipsis-h text-lighter"></span>
+
+								                                <span class="sr-only">Post Menu</span>
+								                            </button>
+								                        </span>
+								                    </div>
+								                </div>
+								            </div>
+
+								            <div>
+								                <div>
+								                    <div class="">
+								                        <p class="pt-2 text-break" style="font-size: 15px;">
+								                            What does everyone think??
+								                        </p>
+
+								                        <div class="mb-1 row px-3">
+								                        	<div class="col px-0">
+								                        		<img src="https://pixelfed.test/img/sample-post.jpeg" class="img-fluid border rounded-lg">
+								                        	</div>
+								                        	<div class="col px-0">
+								                        		<img src="https://pixelfed.test/img/sample-post.jpeg" class="img-fluid border rounded-lg">
+								                        	</div>
+								                        </div>
+
+								                        <div class="mb-3 row px-3">
+								                        	<div class="col px-0">
+								                        		<img src="https://pixelfed.test/img/sample-post.jpeg" class="img-fluid border rounded-lg">
+								                        	</div>
+								                        	<div class="col px-0">
+								                        		<img src="https://pixelfed.test/img/sample-post.jpeg" class="img-fluid border rounded-lg">
+								                        	</div>
+								                        </div>
+
+									                    <div class="border-top my-0">
+									                        <div class="d-flex justify-content-between py-2 px-4">
+									                            <button class="btn btn-link py-0 text-decoration-none text-muted">
+									                                <i class="far fa-heart mr-1"></i>
+									                                Like
+									                            </button>
+
+									                            <div>
+									                                <i class="far fa-comment cursor-pointer text-muted mr-1"></i>
+									                                Comment
+									                            </div>
+
+									                            <div>
+									                                <i class="fas fa-external-link-alt cursor-pointer text-muted mr-1"></i>
+									                                Share
+									                            </div>
+									                        </div>
+									                    </div>
+									                </div>
+									            </div>
+								        	</div>
+									    </div>
+									</div>
+								</div> -->
+
+								<group-status
+									v-for="(status, index) in feed"
+									:key="'gs:' + status.id + index"
+									:prestatus="status"
+									:profile="profile"
+									:group-id="groupId"
+									v-on:comment-focus="commentFocus(index)"
+									v-on:status-delete="statusDelete(index)"
+									v-on:likes-modal="showLikesModal(index)" />
+
+								<b-modal
+									ref="likeBox"
+									size="sm"
+									centered
+									hide-footer
+									title="Likes"
+									body-class="list-group-flush p-0">
+									<div class="list-group py-1" style="max-height:300px;overflow-y:auto;">
+										<div
+											class="list-group-item border-top-0 border-left-0 border-right-0 py-2"
+											:class="{ 'border-bottom-0': index + 1 == likes.length }"
+											v-for="(user, index) in likes" :key="'modal_likes_'+index">
+											<div class="media align-items-center">
+												<a :href="user.url">
+													<img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '’s avatar'" width="30px" onerror="this.onerror=null;this.src='/storage/avatars/default.jpg';">
+												</a>
+												<div class="media-body">
+													<p class="mb-0" style="font-size: 14px">
+														<a :href="user.url" class="font-weight-bold text-dark">
+															{{user.username}}
+														</a>
+													</p>
+													<p v-if="!user.local" class="text-muted mb-0 text-truncate mr-3" style="font-size: 14px" :title="user.acct" data-toggle="dropdown" data-placement="bottom">
+														<span class="font-weight-bold">{{user.acct.split('@')[0]}}</span><span class="text-lighter">&commat;{{user.acct.split('@')[1]}}</span>
+													</p>
+													<p v-else class="text-muted mb-0 text-truncate" style="font-size: 14px">
+														{{user.display_name}}
+													</p>
+												</div>
+											</div>
+										</div>
+										<infinite-loading @infinite="infiniteLikesHandler" :distance="800" spinner="spiral">
+											<div slot="no-more"></div>
+											<div slot="no-results"></div>
+										</infinite-loading>
+									</div>
+								</b-modal>
+
+								<div v-if="feed.length > 2" :distance="800">
+									<infinite-loading @infinite="infiniteFeed">
+										<div slot="no-more"></div>
+										<div slot="no-results"></div>
+									</infinite-loading>
+								</div>
+							</div>
+						</div>
+
+						<div v-else>
+							<div class="card card-body mt-3 shadow-none border d-flex align-items-center justify-content-center" style="height: 100px;">
+								<p class="lead mb-0">Join to participate in this group.</p>
+							</div>
+						</div>
+					</div>
+
+					<div class="col-12 col-md-5">
+						<group-info-card :group="group" />
+					</div>
+                </div>
+				<search-modal ref="searchModal" :group="group" :profile="profile" />
+				<invite-modal ref="inviteModal" :group="group" :profile="profile" />
+			</div>
+		</div>
+	</div>
+</template>
+
+<script type="text/javascript">
+	import StatusCard from '~/partials/StatusCard.vue';
+	import GroupCompose from './partials/GroupCompose.vue';
+	import GroupStatus from './partials/GroupStatus.vue';
+	import GroupInfoCard from './partials/GroupInfoCard.vue';
+	import LeaveGroup from './partials/LeaveGroup.vue';
+	import SearchModal from './partials/GroupSearchModal.vue';
+	import InviteModal from './partials/GroupInviteModal.vue';
+    import GroupBanner from '@/groups/partials/Page/GroupBanner.vue';
+    import GroupNavTabs from '@/groups/partials/Page/GroupNavTabs.vue';
+    import GroupHeaderDetails from '@/groups/partials/Page/GroupHeaderDetails.vue';
+
+	export default {
+		props: {
+			groupId: {
+				type: String
+			},
+
+			path: {
+				type: String
+			},
+
+			permalinkMode: {
+				type: Boolean,
+				default: false
+			},
+
+			permalinkId: {
+				type: String,
+			}
+		},
+
+		components: {
+			'status-card': StatusCard,
+			'group-status': GroupStatus,
+			'group-compose': GroupCompose,
+			'group-info-card': GroupInfoCard,
+			'leave-group': LeaveGroup,
+			'search-modal': SearchModal,
+			'invite-modal': InviteModal,
+            'group-banner': GroupBanner,
+            'group-header-details': GroupHeaderDetails,
+            'group-nav-tabs': GroupNavTabs,
+		},
+
+		data() {
+			return {
+				initalLoad: false,
+				profile: undefined,
+				group: {},
+				isMember: false,
+				isAdmin: false,
+				tab: 'feed',
+				requestingMembership: false,
+				composeText: null,
+				feed: [],
+				ids: [],
+				maxId: null,
+				status: undefined,
+				likes: [],
+				likesPage: 1,
+				likesId: undefined,
+                renderIdx: 1,
+				atabs: {
+					moderation_count: 0,
+					request_count: 0
+				}
+			};
+		},
+
+		created() {
+			this.fetchSelf();
+		},
+
+		methods: {
+            fetchSelf() {
+                axios.get('/api/v1/accounts/verify_credentials?_pe=1')
+                .then(res => {
+                    this.profile = res.data;
+                })
+                .catch(err => {
+                    window.location.href = '/login?_next=' + encodeURIComponent(window.location.href);
+                })
+                .finally(() => {
+                    this.fetchGroup();
+                });
+            },
+
+			initObservers() {
+				// let video = document.querySelectorAll('video');
+				// let isPaused = false;
+				// let observer = new IntersectionObserver((entries, observer) => {
+				// 	entries.forEach(entry => {
+				// 		if (entry.intersectionRatio !=1  && !video.paused){
+				// 			video.pause();
+				// 			isPaused = true;
+				// 		}
+				// 		else if (isPaused) {
+				// 			video.play();
+				// 			isPaused = false
+				// 		}
+				// 	});
+				// }, {threshold: 1});
+				// observer.observe(video);
+			},
+
+			fetchGroup() {
+				axios.get('/api/v0/groups/' + this.groupId)
+				.then(res => {
+					this.group = res.data;
+					this.isMember = res.data.self.is_member;
+					this.isAdmin = ['founder', 'admin'].includes(res.data.self.role);
+
+					if(this.isAdmin) {
+						this.fetchAdminTabs();
+					}
+
+					if(this.path) {
+						if(this.isMember && ['about', 'topics', 'members', 'events', 'media', 'polls'].includes(this.path)) {
+							setTimeout(() => {
+								this.tab = this.path;
+								this.initalLoad = true;
+							}, 500);
+						} else if (this.isAdmin && ['insights', 'moderation'].includes(this.path)) {
+							setTimeout(() => {
+								this.tab = this.path;
+								this.initalLoad = true;
+							}, 500);
+						} else {
+							history.pushState(null, null, this.group.url);
+							this.initalLoad = true;
+						}
+					} else {
+						this.initalLoad = true;
+					}
+				})
+				.catch(err => {
+					window.location.href = '/groups/unavailable';
+				})
+                .finally(() => {
+                    this.fetchFeed();
+                });
+			},
+
+			fetchAdminTabs() {
+				axios.get('/api/v0/groups/' + this.groupId + '/atabs')
+				.then(res => {
+					this.atabs = res.data;
+				})
+			},
+
+			fetchFeed() {
+				axios.get('/api/v0/groups/' + this.groupId + '/feed')
+				.then(res => {
+					let self = this;
+                    if(res.data && res.data.length) {
+    					this.feed = res.data;
+
+    					this.maxId = this.feed[this.feed.length - 1].id;
+    					res.data.forEach(d => {
+    						if(self.ids.indexOf(d.id) == -1) {
+    							self.ids.push(d.id);
+    						}
+    					});
+                    }
+					this.initObservers();
+				})
+			},
+
+			fetchPermalink() {
+				axios.get('/api/v0/groups/status', {
+					params: {
+						gid: this.groupId,
+						sid: this.permalinkId
+					}
+				}).then(res => {
+					this.status = res.data;
+					if(this.status.in_reply_to_id) {
+						this.status.showCommentDrawer = true;
+					}
+				}).catch(err => {
+					this.permalinkMode = false;
+					this.fetchFeed();
+				});
+			},
+
+            handleRefresh() {
+                this.initialLoad = false;
+                this.init();
+                this.renderIdx++;
+            },
+
+			timestampFormat(date, showTime = false) {
+				let ts = new Date(date);
+				return showTime ? ts.toDateString() + ' · ' + ts.toLocaleTimeString() : ts.toDateString();
+			},
+
+			switchTab(tab) {
+				window.scrollTo(0,0);
+				if(tab == 'feed' && this.permalinkMode) {
+					this.permalinkMode = false;
+					this.fetchFeed();
+				}
+				let url = tab == 'feed' ? this.group.url : this.group.url + '/' + tab;
+				history.pushState(tab, null, url);
+				this.tab = tab;
+			},
+
+			joinGroup() {
+				this.requestingMembership = true;
+
+				axios.post('/api/v0/groups/'+this.groupId+'/join')
+				.then(res => {
+					this.requestingMembership = false;
+					this.group = res.data;
+					this.fetchGroup();
+					this.fetchFeed();
+				}).catch(err => {
+					let body = err.response;
+
+					if(body.status == 422) {
+						this.tab = 'feed';
+						history.pushState('', null, this.group.url);
+						this.requestingMembership = false;
+						swal('Oops!', body.data.error, 'error');
+					}
+				});
+			},
+
+			cancelJoinRequest() {
+				if(!window.confirm('Are you sure you want to cancel your request to join this group?')) {
+					return;
+				}
+
+				axios.post('/api/v0/groups/'+this.groupId+'/cjr')
+				.then(res => {
+					this.requestingMembership = false;
+				}).catch(err => {
+					let body = err.response;
+
+					if(body.status == 422) {
+						swal('Oops!', body.data.error, 'error');
+					}
+				});
+			},
+
+			leaveGroup() {
+				if(!window.confirm('Are you sure you want to leave this group? Any content you shared will remain accessible. You won\'t be able to rejoin for 24 hours.')) {
+					return;
+				}
+
+				axios.post('/api/v0/groups/'+this.groupId+'/leave')
+				.then(res => {
+					this.tab = 'feed';
+					history.pushState('', null, this.group.url);
+					this.feed = [];
+					this.isMember = false;
+					this.isAdmin = false;
+					this.group.self.role = null;
+					this.group.self.is_member = false;
+				});
+			},
+
+			pushNewStatus(status) {
+				this.feed.unshift(status);
+			},
+
+			commentFocus(index) {
+				let status = this.feed[index];
+				status.showCommentDrawer = true;
+			},
+
+			statusDelete(index) {
+				this.feed.splice(index, 1);
+			},
+
+			infiniteFeed($state) {
+				if(this.feed.length < 3) {
+					$state.complete();
+					return;
+				}
+				let apiUrl = '/api/v0/groups/' + this.groupId + '/feed';
+				axios.get(apiUrl, {
+					params: {
+						limit: 6,
+						max_id: this.maxId
+					},
+				}).then(res => {
+					if (res.data.length) {
+						// let self = this;
+						// data.forEach(d => {
+						// 	if(self.ids.indexOf(d.id) == -1) {
+						// 		if(self.maxId >= d.id) {
+						// 			self.maxId = d.id;
+						// 		}
+						// 		self.ids.push(d.id);
+						// 		self.feed.push(d);
+						// 	}
+						// });
+						let posts = res.data.filter(p => this.ids.indexOf(p.id) == -1);
+						this.maxId = posts[posts.length - 1].id;
+						this.feed.push(...posts);
+						this.ids.push(...posts.map(p => p.id));
+						setTimeout(() => {
+							this.initObservers();
+						}, 1000);
+						$state.loaded();
+					} else {
+						$state.complete();
+					}
+				});
+			},
+
+			decrementModCounter(amount) {
+				let count = this.atabs.moderation_count;
+				if(count == 0) {
+					return;
+				}
+				this.atabs.moderation_count = (count - amount);
+			},
+
+			setModCounter(amount) {
+				this.atabs.moderation_count = amount;
+			},
+
+			decrementJoinRequestCount(amount = 1) {
+				let count = this.atabs.request_count;
+				this.atabs.request_count = (count - amount)
+			},
+
+			incrementMemberCount() {
+				let count = this.group.member_count;
+				this.group.member_count = (count + 1);
+			},
+
+			copyLink() {
+				window.App.util.clipboard(this.group.url);
+				this.$bvToast.toast(`Succesfully copied group url to clipboard`, {
+					title: 'Success',
+					variant: 'success',
+					autoHideDelay: 5000
+				});
+			},
+
+			reportGroup() {
+				swal('Report Group', 'Are you sure you want to report this group?')
+				.then(res => {
+					if(res) {
+						location.href = `/i/report?id=${this.group.id}&type=group`;
+					}
+				});
+			},
+
+			showSearchModal() {
+				event.currentTarget.blur();
+				this.$refs.searchModal.open();
+			},
+
+			showInviteModal() {
+				event.currentTarget.blur();
+				this.$refs.inviteModal.open();
+			},
+
+			showLikesModal(index) {
+				this.likesId = this.feed[index].id;
+				axios.get('/api/v0/groups/'+this.groupId+'/likes/'+this.likesId)
+				.then(res => {
+					this.likes = res.data;
+					this.likesPage++;
+					this.$refs.likeBox.show();
+				});
+			},
+
+			infiniteLikesHandler($state) {
+				if(this.likes.length < 3) {
+					$state.complete();
+					return;
+				}
+				axios.get('/api/v0/groups/'+this.groupId+'/likes/'+this.likesId, {
+					params: {
+						page: this.likesPage,
+					},
+				}).then(res => {
+					if (res.data.length > 0) {
+						this.likes.push(...res.data);
+						this.likesPage++;
+						if(res.data.length != 10) {
+							$state.complete();
+						} else {
+							$state.loaded();
+						}
+					} else {
+						$state.complete();
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.group-feed-component {
+		&-header {
+			display: flex;
+			justify-content: space-between;
+			align-items: flex-end;
+			padding: 1rem 0;
+			background-color: transparent;
+
+			.cta-btn {
+				width: 190px;
+			}
+		}
+
+		.header-jumbotron {
+			background-color: #F3F4F6;
+			height: 320px;
+			border-bottom-left-radius: 20px;
+			border-bottom-right-radius: 20px;
+		}
+
+		&-menu {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 0;
+
+			&-nav {
+				.nav-item {
+					.nav-link {
+						padding-top: 1rem;
+						padding-bottom: 1rem;
+						color: #6c757d;
+
+						&.active {
+							color: #2c78bf;
+							border-bottom: 2px solid #2c78bf;
+						}
+					}
+				}
+
+				&:not(last-child) {
+					.nav-item {
+						margin-right: 14px;
+					}
+				}
+			}
+		}
+
+		&-body {
+			min-height: 40vh;
+		}
+
+		.member-label {
+			padding: 2px 5px;
+			font-size: 12px;
+			color: rgba(75, 119, 190, 1);
+			background:rgba(137, 196, 244, 0.2);
+			border:1px solid rgba(137, 196, 244, 0.3);
+			font-weight:400;
+			text-transform: capitalize;
+		}
+
+		.dropdown-item {
+			font-weight: 600;
+		}
+
+		.remote-label {
+			padding: 2px 5px;
+			font-size: 12px;
+			color: #B45309;
+			background: #FEF3C7;
+			border: 1px solid #FCD34D;
+			font-weight: 400;
+			text-transform: capitalize;
+		}
+	}
+</style>
diff --git a/resources/assets/components/groups/GroupInvite.vue b/resources/assets/components/groups/GroupInvite.vue
new file mode 100644
index 000000000..ec11185a5
--- /dev/null
+++ b/resources/assets/components/groups/GroupInvite.vue
@@ -0,0 +1,217 @@
+<template>
+	<div class="group-invite-component">
+		<div class="container">
+			<div class="row justify-content-center mt-5">
+				<div class="col-12 col-md-7">
+					<div class="card shadow-none border" style="min-height: 300px;">
+						<div class="card-body d-flex justify-content-center align-items-center">
+
+						<transition-group name="fade">
+							<div v-if="tab === 'initial'" key="initial">
+								<p class="text-center mb-1"><b-spinner variant="lighter" /></p>
+								<p class="text-center small text-muted mb-0">{{ loadingStatus }}</p>
+							</div>
+
+							<div v-else-if="tab === 'loading'" key="loading">
+								<p class="text-center mb-1"><b-spinner variant="lighter" /></p>
+							</div>
+
+							<div v-else-if="tab === 'login'" key="login">
+								<p class="text-center mb-0">Please <a href="/login">login</a> to continue</p>
+							</div>
+
+							<div v-else-if="tab === 'form'" key="form">
+								<div class="d-flex justify-content-center align-items-center flex-column">
+									<p class="text-center h4 font-weight-bold"><a href="#">@dansup</a> invited you to join</p>
+
+									<div class="card my-3 shadow-none border" style="width: 300px;">
+										<img v-if="group.metadata && group.metadata.hasOwnProperty('header')" :src="group.metadata.header.url" class="card-img-top" style="width: 100%; height: 100px;object-fit: cover;">
+										<div v-else class="card-img-top" style="width: 100px; height: 100px;padding: 5px;">
+											<div class="bg-primary d-flex align-items-center justify-content-center" style="width: 100%; height:100%;">
+												<i class="fal fa-users text-white fa-lg"></i>
+											</div>
+										</div>
+
+										<div class="card-body">
+											<p class="h5 font-weight-bold mb-1 text-dark">
+												{{ group.name || 'Untitled Group' }}
+											</p>
+
+											<transition name="fade">
+												<p v-if="showMore" class="text-muted small mb-1">
+													{{ group.description }}
+												</p>
+											</transition>
+
+											<p class="mb-1">
+												<span class="text-muted mr-2">
+													<i class="far fa-users fa-sm text-lighter mr-1"></i>
+													<span class="small font-weight-bold">{{ prettyCount(group.member_count) }} Members</span>
+												</span>
+
+												<span v-if="!group.local" class="remote-label ml-2">
+													<i class="fal fa-globe"></i> Remote
+												</span>
+											</p>
+
+											<transition name="fade">
+												<div v-if="showMore">
+													<p class="text-muted small mb-1">
+														<i class="far fa-tag fa-sm text-lighter mr-2"></i>
+														<span class="font-weight-bold">Category: {{ group.category.name }}</span>
+													</p>
+													<p class="text-muted small mb-1">
+														<i class="far fa-clock fa-sm text-lighter mr-2"></i>
+														<span class="font-weight-bold">Created {{ timeago(group.created_at) }} ago</span>
+													</p>
+												</div>
+											</transition>
+										</div>
+									</div>
+
+								</div>
+								<div class="d-flex justify-content-between">
+									<button class="btn btn-light border-lighter font-weight-bold btn-sm" @click="showMoreInfo">
+										{{ showMore ? 'Less' :'More' }} info
+									</button>
+									<div>
+										<button class="btn btn-light font-weight-bold btn-sm" @click="declineInvite">Decline</button>
+										<button class="btn btn-primary font-weight-bold btn-sm" @click="acceptInvite">Accept</button>
+									</div>
+								</div>
+								<!-- <p class="text-center h4 font-weight-bold">by <a href="#" class="font-weight-bold">@dansup</a></p> -->
+							</div>
+
+							<div v-else-if="tab === 'existingmember'" key="existingmember">
+								<p class="text-center mb-0">You already are a member of this group</p>
+								<p class="text-center mb-0">
+									<a :href="group.url" class="font-weight-bold">View Group</a>
+								</p>
+							</div>
+
+							<div v-else-if="tab === 'notinvited'" key="notinvited">
+								<p class="text-center mb-0">We cannot find an active invitation for your account.</p>
+							</div>
+
+							<div v-else-if="tab === 'error'" key="error">
+								<p class="text-center mb-0">An unknown error occured. Please try again later.</p>
+							</div>
+
+							<div v-else key="unknown">
+								<p class="text-center mb-0">An unknown error occured. Please try again later.</p>
+							</div>
+
+						</transition-group>
+						</div>
+					</div>
+					<!-- <h4>You've been invited to {{ group.name }}</h4> -->
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script type="text/javascript">
+	export default {
+		props: [
+			'id'
+		],
+
+		data() {
+			return {
+				loadingStatus: 'Determining invite eligibility',
+				tab: 'initial',
+				profile: {},
+				group: {},
+				showMore: false
+			}
+		},
+
+		mounted() {
+			axios.get('/api/pixelfed/v1/accounts/verify_credentials')
+			.then(res => {
+				this.profile = res.data;
+				this.fetchGroup();
+			}).catch(err => {
+				if(err.response.status === 403) {
+					this.tab = 'login';
+					return;
+				} else {
+					this.tab = 'error';
+					return
+				}
+			});
+		},
+
+		methods: {
+			fetchGroup() {
+				axios.get(`/api/v0/groups/${this.id}`)
+				.then(res => {
+					this.group = res.data;
+					this.loadingStatus = 'Checking group invitations';
+					this.checkForInvitation();
+				}).catch(err => {
+					this.tab = 'error';
+				});
+			},
+
+			checkForInvitation() {
+				axios.post(`/api/v0/groups/${this.group.id}/invite/check`)
+				.then(res => {
+					this.tab = res.data.can_join == true ? 'form' : 'notinvited';
+				}).catch(err => {
+					if(err.response.status === 422 && err.response.data.error === 'Already a member') {
+						this.tab = 'existingmember';
+					} else {
+						this.tab = 'error';
+					}
+				})
+			},
+
+			prettyCount(val) {
+				return App.util.format.count(val);
+			},
+
+			timeago(ts) {
+				return App.util.format.timeAgo(ts);
+			},
+
+			showMoreInfo() {
+				event.currentTarget.blur();
+				this.showMore = !this.showMore;
+			},
+
+			acceptInvite() {
+				event.currentTarget.blur();
+				this.tab = 'loading';
+				axios.post(`/api/v0/groups/${this.group.id}/invite/accept`)
+				.then(res => {
+					setTimeout(() => {
+						location.href = res.data.next_url;
+					}, 2000);
+				}).catch(err => {
+					this.tab = 'error';
+				});
+			},
+
+			declineInvite() {
+				event.currentTarget.blur();
+				this.tab = 'loading';
+				axios.post(`/api/v0/groups/${this.group.id}/invite/decline`)
+				.then(res => {
+					location.href = res.data.next_url;
+				}).catch(err => {
+					this.tab = 'error';
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.group-invite-component {
+		.btn-light {
+			border-color: #E5E7EB;
+		}
+	}
+</style>
diff --git a/resources/assets/components/groups/GroupProfile.vue b/resources/assets/components/groups/GroupProfile.vue
new file mode 100644
index 000000000..67077b84e
--- /dev/null
+++ b/resources/assets/components/groups/GroupProfile.vue
@@ -0,0 +1,379 @@
+<template>
+	<div class="group-profile-component w-100 h-100">
+		<div class="bg-white mb-3 border-bottom">
+			<div class="container-xl header">
+				<div class="header-jumbotron"></div>
+
+				<div class="header-profile-card">
+					<img :src="profile.avatar" class="avatar" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'">
+					<p class="name">
+						{{ profile.display_name }}
+					</p>
+					<p class="username text-muted">
+						<span v-if="profile.local">&commat;{{ profile.username }}</span>
+						<span v-else>{{ profile.acct }}</span>
+
+						<span v-if="profile.is_admin" class="text-danger ml-1" title="Site administrator" data-toggle="tooltip" data-placement="bottom"><i class="far fa-users-crown"></i></span>
+					</p>
+				</div>
+				<!-- <hr> -->
+				<div class="header-navbar">
+					<div></div>
+
+					<div>
+						<a
+							v-if="currentProfile.id === profile.id"
+							class="btn btn-light font-weight-bold mr-2"
+							href="/settings/home">
+							<i class="fas fa-edit mr-1"></i> Edit Profile
+						</a>
+
+						<a
+							v-if="profile.relationship.following"
+							class="btn btn-primary font-weight-bold mr-2"
+							:href="profile.url">
+							<i class="far fa-comment-alt-dots mr-1"></i> Message
+						</a>
+
+						<a
+							v-if="profile.relationship.following"
+							class="btn btn-light font-weight-bold mr-2"
+							:href="profile.url">
+							<i class="fas fa-user-check mr-1"></i> {{ profile.relationship.followed_by ? 'Friends' : 'Following' }}
+						</a>
+
+						<a
+							v-if="!profile.relationship.following"
+							class="btn btn-light font-weight-bold mr-2"
+							:href="profile.url">
+							<i class="fas fa-user mr-1"></i> View Main Profile
+						</a>
+
+						<div class="dropdown">
+							<button class="btn btn-light font-weight-bold dropdown-toggle" type="button" id="amenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+								<i class="fas fa-ellipsis-h"></i>
+							</button>
+							<div class="dropdown-menu dropdown-menu-right" aria-labelledby="amenu">
+								<a v-if="currentProfile.id != profile.id" class="dropdown-item font-weight-bold" :href="`/i/report?type=user&id=${profile.id}`">Report</a>
+								<a v-if="currentProfile.id == profile.id" class="dropdown-item font-weight-bold" href="#">Leave Group</a>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="w-100 h-100 group-profile-feed">
+			<div class="container-xl">
+				<div class="row">
+					<div class="col-12 col-md-5">
+						<div class="card card-body shadow-sm infolet">
+							<h5 class="font-weight-bold mb-3">Intro</h5>
+							<div v-if="!profile.local" class="media mb-3 align-items-center">
+								<div class="media-icon">
+									<i class="far fa-globe" title="User is from a remote server" data-toggle="tooltip" data-placement="bottom"></i>
+								</div>
+								<div class="media-body">
+									Remote member from <strong>{{ profile.acct.split('@')[1] }}</strong>
+								</div>
+							</div>
+							<!-- <div v-if="profile.note.length" class="media mb-3 align-items-center">
+								<i class="far fa-book-user fa-lg text-lighter mr-3" title="User bio" data-toggle="tooltip" data-placement="bottom"></i>
+								<div class="media-body">
+									<span v-html="profile.note"></span>
+								</div>
+							</div> -->
+							<div class="media align-items-center">
+								<div class="media-icon">
+									<i class="fas fa-users" title="User joined group on this date" data-toggle="tooltip" data-placement="bottom"></i>
+								</div>
+								<div class="media-body">
+									{{ roleTitle }} of <strong>{{ group.name }}</strong> since {{ profile.group.joined }}
+								</div>
+							</div>
+						</div>
+
+						<div v-if="canIntersect" class="card card-body shadow-sm infolet">
+							<h5 class="font-weight-bold mb-3">Things in Common</h5>
+
+							<div v-if="commonIntersects.friends.length" class="media mb-3 align-items-center" v-once>
+								<div class="media-icon">
+									<i class="far fa-user-friends"></i>
+								</div>
+								<div class="media-body">
+									{{ commonIntersects.friends_count }} mutual friend<span v-if="commonIntersects.friends.length > 1">s</span> including
+									<span v-for="(friend, index) in commonIntersects.friends"><a :href="friend.url" class="text-dark font-weight-bold">{{ friend.acct }}</a><span v-if="commonIntersects.friends.length > index + 1">, </span><span v-else> </span></span>
+									<!-- <a href="#" class="text-dark font-weight-bold">dansup</a>, <a href="#" class="text-dark font-weight-bold">admin</a> and 1 other -->
+								</div>
+							</div>
+
+							<div class="media mb-3 align-items-center">
+								<div class="media-icon">
+									<i class="fas fa-home"></i>
+								</div>
+								<div class="media-body">
+									Lives in <strong>Canada</strong>
+								</div>
+							</div>
+
+							<div v-if="commonIntersects.groups.length" class="media mb-3 align-items-center">
+								<div class="media-icon">
+									<i class="fas fa-users"></i>
+								</div>
+								<div class="media-body">
+									Also member of <a :href="commonIntersects.groups[0].url" class="text-dark font-weight-bold">{{ commonIntersects.groups[0].name }}</a> and {{ commonIntersects.groups_count }} other groups
+								</div>
+							</div>
+
+							<div v-if="commonIntersects.topics.length" class="media mb-0 align-items-center">
+								<div class="media-icon">
+									<i class="far fa-thumbs-up fa-lg text-lighter"></i>
+								</div>
+								<div class="media-body">
+									Also interested in topics containing
+									<span v-for="(topic, index) in commonIntersects.topics">
+										<span v-if="commonIntersects.topics.length - 1 == index"> and </span><a :href="topic.url" class="font-weight-bold text-dark">#{{ topic.name }}</a><span v-if="commonIntersects.topics.length > index + 2">, </span>
+									</span> hashtags
+								</div>
+							</div>
+						</div>
+					</div>
+
+					<div class="col-12 col-md-7">
+						<div class="card card-body shadow-sm">
+							<h5 class="font-weight-bold mb-0">Group Posts</h5>
+						</div>
+
+						<div v-if="feedEmpty" class="pt-5 text-center">
+							<h5>No New Posts</h5>
+							<p>{{ profile.username }} hasn't posted anything yet in <strong>{{ group.name }}</strong>.</p>
+
+							<a :href="group.url" class="font-weight-bold">Go Back</a>
+						</div>
+
+						<div v-if="feedLoaded" class="mt-2">
+							<group-status
+								v-for="(status, index) in feed"
+								:key="'gps:' + status.id"
+								:permalinkMode="true"
+								:showGroupChevron="true"
+								:group="group"
+								:prestatus="status"
+								:profile="profile"
+								:group-id="group.id" />
+
+							<div v-if="feed.length >= 1" :distance="800">
+								<infinite-loading @infinite="infiniteFeed">
+									<div slot="no-more"></div>
+									<div slot="no-results"></div>
+								</infinite-loading>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script type="text/javascript">
+	import GroupStatus from '@/groups/partials/GroupStatus.vue';
+
+	export default {
+		props: {
+			pg: {
+				type: String
+			},
+
+			pp: {
+				type: String
+			}
+		},
+
+		components: {
+			'group-status': GroupStatus
+		},
+
+		data() {
+			return {
+				currentProfile: {},
+				roleTitle: 'Member',
+				group: {},
+				profile: {},
+				feed: [],
+				ids: [],
+				feedLoaded: false,
+				feedEmpty: false,
+				page: 1,
+				canIntersect: false,
+				commonIntersects: []
+			}
+		},
+
+		beforeMount() {
+			$('body').css('background-color', '#f0f2f5');
+			this.group = JSON.parse(this.pg);
+			this.profile = JSON.parse(this.pp);
+
+			if(this.profile.group.role == 'founder') {
+				this.roleTitle = 'Admin';
+			}
+		},
+
+		mounted() {
+			axios.get('/api/pixelfed/v1/accounts/verify_credentials')
+			.then(res => {
+				this.currentProfile = res.data;
+				this.fetchInitialFeed();
+				if(res.data.id != this.profile.id) {
+					this.fetchCommonIntersections();
+				}
+			})
+			this.$nextTick(() => {
+				$('[data-toggle="tooltip"]').tooltip();
+			});
+		},
+
+		methods: {
+			fetchInitialFeed() {
+				axios.get(`/api/v0/groups/${this.group.id}/user/${this.profile.id}/feed`)
+				.then(res => {
+					this.feed = res.data.filter(s => {
+						return s.pf_type != 'reply:text' || s.account.id != this.profile.id;
+					});
+					this.feedLoaded = true;
+					this.feedEmpty = this.feed.length == 0;
+					this.page++;
+				});
+			},
+
+			infiniteFeed($state) {
+				if(this.feed.length == 0) {
+					$state.complete();
+					return;
+				}
+
+				axios.get(`/api/v0/groups/${this.group.id}/user/${this.profile.id}/feed`, {
+					params: {
+						page: this.page
+					},
+				}).then(res => {
+					if (res.data.length) {
+						let data = res.data.filter(s => {
+							return s.pf_type != 'reply:text' || s.account.id != this.profile.id;
+						});
+						let self = this;
+						data.forEach(d => {
+							if(self.ids.indexOf(d.id) == -1) {
+								self.ids.push(d.id);
+								self.feed.push(d);
+							}
+						});
+						$state.loaded();
+						this.page++;
+					} else {
+						$state.complete();
+					}
+				});
+			},
+
+			fetchCommonIntersections() {
+				axios.get('/api/v0/groups/member/intersect/common', {
+					params: {
+						gid: this.group.id,
+						pid: this.profile.id
+					}
+				}).then(res => {
+					this.commonIntersects = res.data;
+					this.canIntersect = res.data.groups.length || res.data.topics.length;
+				});
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.group-profile-component {
+		background-color: #f0f2f5;
+
+		.header {
+			&-jumbotron {
+				background-color: #F3F4F6;
+				height: 320px;
+				border-bottom-left-radius: 20px;
+				border-bottom-right-radius: 20px;
+			}
+
+			&-profile-card {
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+
+				.avatar {
+					width: 170px;
+					height: 170px;
+					border-radius: 50%;
+					margin-top: -150px;
+					margin-bottom: 20px;
+				}
+
+				.name {
+					font-size: 30px;
+					line-height: 30px;
+					font-weight: 700;
+					text-align: center;
+					margin-bottom: 6px;
+				}
+
+				.username {
+					font-size: 16px;
+					font-weight: 500;
+					text-align: center;
+				}
+			}
+
+			&-navbar {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				height: 60px;
+				border-top: 1px solid #F3F4F6;
+
+				.dropdown {
+					display: inline-block;
+
+					&-toggle:after {
+						display: none;
+					}
+				}
+			}
+		}
+
+		.group-profile-feed {
+			min-height: 500px;
+		}
+
+		.infolet {
+			margin-bottom: 1rem;
+
+			.media {
+				&-icon {
+					display: flex;
+					justify-content: center;
+					width: 30px;
+					margin-right: 10px;
+
+					i {
+						font-size: 1.1rem;
+						color: #D1D5DB !important;
+					}
+				}
+			}
+		}
+
+		.btn-light {
+			border-color: #F3F4F6;
+		}
+	}
+</style>
diff --git a/resources/assets/components/groups/GroupSettings.vue b/resources/assets/components/groups/GroupSettings.vue
new file mode 100644
index 000000000..099d598f2
--- /dev/null
+++ b/resources/assets/components/groups/GroupSettings.vue
@@ -0,0 +1,1079 @@
+<template>
+	<div class="group-settings-component">
+		<div v-if="!initalLoad">
+			<p class="text-center mt-5 pt-5 font-weight-bold">Loading...</p>
+		</div>
+
+		<div v-else>
+			<div class="bg-white mb-3 border-bottom">
+				<div class="container">
+					<div class="col-12 group-settings-component-header">
+						<div>
+							<h1 class="font-weight-bold mb-4">Group Settings</h1>
+							<p class="text-muted mb-0">
+								<span v-once>
+									<i class="fas fa-globe mr-1"></i>
+									{{ group.membership == 'all' ? 'Public Group' : 'Private Group'}}
+								</span>
+								<span class="mx-2">
+									·
+								</span>
+								<span>{{ group.member_count == 1 ? group.member_count + ' Member' : group.member_count + ' Members' }}</span>
+								<span class="mx-2">
+									·
+								</span>
+								<span class="text-lighter">ID:{{ group.id }}</span>
+							</p>
+						</div>
+						<div>
+							<a
+								v-if="isAdmin"
+								class="mr-2 btn btn-outline-secondary rounded-pill cta-btn font-weight-bold"
+								:href="group.url">
+								<i class="fas fa-chevron-left mr-1"></i> Back to Group
+							</a>
+							<button class="btn btn-primary font-weight-bold rounded-pill px-4" :disabled="savingChanges" @click="submit">
+								Save Changes
+							</button>
+						</div>
+					</div>
+					<div class="col-12">
+						<ul class="nav nav-tabs border-bottom-0 font-weight-bold small">
+							<li class="nav-item">
+								<a
+									:class="{ active: tab == 'home'}"
+									class="nav-link"
+									href="#"
+									@click.prevent="toggleTab('home')">
+									General
+								</a>
+							</li>
+							<li class="nav-item">
+								<a
+									:class="{ active: tab == 'customize'}"
+									class="nav-link"
+									href="#"
+									@click.prevent="toggleTab('customize')">
+									Customize
+								</a>
+							</li>
+							<!-- <li class="nav-item">
+								<a
+									:class="{ active: tab == 'mod'}"
+									class="nav-link"
+									href="#"
+									@click.prevent="toggleTab('mod')">
+									Moderation
+								</a>
+							</li> -->
+							<li class="nav-item">
+								<a
+									:class="{ active: tab == 'blocked'}"
+									class="nav-link"
+									href="#"
+									@click.prevent="toggleTab('blocked')">
+									Domain/User Blocks
+								</a>
+							</li>
+							<li class="nav-item">
+								<a
+									:class="{ active: tab == 'interactions'}"
+									class="nav-link"
+									href="#"
+									@click.prevent="toggleTab('interactions')">
+									Interactions
+								</a>
+							</li>
+							<!-- <li class="nav-item">
+								<a class="nav-link" href="#">Interaction Log</a>
+							</li>
+							<li class="nav-item">
+								<a class="nav-link" href="#">Blocked Instances &amp; Users</a>
+							</li> -->
+							<li class="nav-item">
+								<a
+									:class="{ active: tab == 'limits'}"
+									class="nav-link"
+									href="#"
+									@click.prevent="toggleTab('limits')">
+									Limits
+								</a>
+							</li>
+							<!-- <li class="nav-item">
+								<a class="nav-link" href="#">Limits</a>
+							</li>
+							<li class="nav-item">
+								<a class="nav-link" href="#">Roles</a>
+							</li>
+							<li class="nav-item">
+								<a class="nav-link" href="#">Import &amp; Export</a>
+							</li> -->
+							<li class="nav-item">
+								<a
+									:class="{ active: tab == 'advanced'}"
+									class="nav-link"
+									href="#"
+									@click.prevent="toggleTab('advanced')">
+									Advanced
+								</a>
+							</li>
+						</ul>
+					</div>
+				</div>
+			</div>
+
+			<div class="container-xl pt-3">
+
+				<div v-if="tab == 'home'" class="row">
+					<div class="col-12 col-md-6 offset-md-3">
+						<div class="">
+							<div class="form-group">
+								<label class="font-weight-bold">Name</label>
+								<input class="form-control" :value="group.name" disabled>
+								<p class="form-text small text-muted">You cannot change a groups name at this time.</p>
+							</div>
+							<hr>
+
+							<div class="form-group">
+								<label class="font-weight-bold">Category</label>
+								<select class="custom-select" v-model="category">
+									<option value="" selected="" disabled="">Select a category</option>
+									<option v-for="c in categories" :value="c">{{ c }}</option>
+								</select>
+								<p class="form-text small text-muted">Choose the most relevant category to improve discovery and visibility</p>
+							</div>
+							<hr>
+
+							<div class="form-group">
+								<label class="font-weight-bold">Description</label>
+								<textarea class="form-control" rows="4" v-model="group.description" style="resize: none;">
+								</textarea>
+								<span class="form-text small text-muted font-weight-bold text-right">
+									{{group.description ? group.description.length : 0}}/500
+								</span>
+								<p class="form-text small text-muted">A plain text description of your group. Be as descriptive as possible to give potential members a better idea of what to expect.</p>
+							</div>
+							<!-- <hr>
+							<div class="form-group">
+								<label class="font-weight-bold">Avatar Photo</label>
+								<div v-if="group.metadata && group.metadata.hasOwnProperty('avatar')" class="d-flex justify-content-between align-items-center">
+									<img :src="group.metadata.avatar.url" width="100" height="100" class="rounded-circle border" style="object-fit: cover;">
+									<p class="mb-0 mt-2 text-lighter">
+										<a href="" class="text-muted font-weight-bold">
+											Preview
+										</a>
+										<span class="mx-1">·</span>
+										<a href="" class="text-muted font-weight-bold">
+											Update
+										</a>
+										<span class="mx-1">·</span>
+										<a href="" class="text-danger font-weight-bold">
+											Delete
+										</a>
+									</p>
+								</div>
+								<div v-else>
+									<div class="custom-file">
+										<input type="file" class="custom-file-input" ref="avatarInput">
+										<label class="custom-file-label" for="avatarInput">Choose file</label>
+									</div>
+									<p class="form-text small text-muted">Must be jpeg or png format, up to 2MB</p>
+								</div>
+							</div>
+							<hr>
+							<div class="form-group">
+								<label class="font-weight-bold">Header Photo</label>
+
+								<div v-if="group.metadata && group.metadata.hasOwnProperty('header')" class="d-flex justify-content-between align-items-center">
+									<img :src="group.metadata.header.url" width="200" height="100" class="rounded border" style="object-fit: cover;">
+									<p class="mb-0 mt-2 text-lighter">
+										<a href="" class="text-muted font-weight-bold">
+											Preview
+										</a>
+										<span class="mx-1">·</span>
+										<a href="" class="text-muted font-weight-bold">
+											Update
+										</a>
+										<span class="mx-1">·</span>
+										<a href="" class="text-danger font-weight-bold">
+											Delete
+										</a>
+									</p>
+								</div>
+								<div v-else>
+									<div class="custom-file">
+										<input type="file" class="custom-file-input" ref="headerInput">
+										<label class="custom-file-label" for="headerInput">Choose file</label>
+									</div>
+									<p class="form-text small text-muted">Must be jpeg or png format, up to 10MB</p>
+								</div>
+							</div> -->
+						</div>
+					</div>
+				</div>
+
+				<div v-if="tab == 'customize'" class="row">
+					<div class="col-12 col-md-6 offset-md-3">
+						<div class="">
+							<div class="form-group">
+								<label class="font-weight-bold">Avatar Photo</label>
+								<div v-if="group.metadata && group.metadata.hasOwnProperty('avatar')" class="d-flex justify-content-between align-items-center">
+									<img :src="group.metadata.avatar.url" width="100" height="100" class="rounded-circle border" style="object-fit: cover;">
+									<p class="mb-0 mt-2 text-lighter">
+										<a href="" class="text-muted font-weight-bold">
+											Preview
+										</a>
+										<span class="mx-1">·</span>
+										<a href="" class="text-muted font-weight-bold">
+											Update
+										</a>
+										<span class="mx-1">·</span>
+										<a href="" class="text-danger font-weight-bold">
+											Delete
+										</a>
+									</p>
+								</div>
+								<div v-else>
+									<div class="custom-file">
+										<input type="file" class="custom-file-input" ref="avatarInput">
+										<label class="custom-file-label" for="avatarInput">Choose file</label>
+									</div>
+									<p class="form-text small text-muted">Must be jpeg or png format, up to 2MB</p>
+								</div>
+							</div>
+							<hr>
+							<div class="form-group">
+								<label class="font-weight-bold">Header Photo</label>
+
+								<div v-if="group.metadata && group.metadata.hasOwnProperty('header')" class="d-flex justify-content-between align-items-center">
+									<img :src="group.metadata.header.url" width="200" height="100" class="rounded border" style="object-fit: cover;">
+									<p class="mb-0 mt-2 text-lighter">
+										<a href="" class="text-muted font-weight-bold">
+											Preview
+										</a>
+										<span class="mx-1">·</span>
+										<a href="" class="text-muted font-weight-bold">
+											Update
+										</a>
+										<span class="mx-1">·</span>
+										<a href="" class="text-danger font-weight-bold">
+											Delete
+										</a>
+									</p>
+								</div>
+								<div v-else>
+									<div class="custom-file">
+										<input type="file" class="custom-file-input" ref="headerInput">
+										<label class="custom-file-label" for="headerInput">Choose file</label>
+									</div>
+									<p class="form-text small text-muted">Must be jpeg or png format, up to 10MB</p>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+
+				<div v-if="tab == 'interactions'" class="row">
+					<div class="col-12 col-md-3">
+						<p class="lead">The <strong>Interaction Log</strong> displays all member activities relating to this group.</p>
+						<p class="lead">You may see logs from blocked, deleted and remote accounts.</p>
+					</div>
+					<div class="col-12 col-md-6">
+						<div class="list-group">
+							<div v-for="(log, index) in interactionLog" class="list-group-item">
+								<div class="media align-items-center">
+									<img :src="log.profile.avatar" width="32" height="32" class="rounded-circle border mr-3" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'">
+									<div class="media-body">
+										<span class="font-weight-bold">{{log.profile.username}}</span>
+
+										<span v-if="log.type == 'group:comment:created'">
+											commented on a <a :href="sidToUrl(log.metadata.status_id)" class="font-weight-bold">post</a>
+										</span>
+
+										<span v-else-if="log.type == 'group:joined'">
+											joined the group
+										</span>
+
+										<span v-else-if="log.type == 'group:like'">
+											liked a <a :href="sidToUrl(log.metadata.status_id)" class="font-weight-bold">post</a>
+										</span>
+
+										<span v-else-if="log.type == 'group:settings:updated'">
+											updated the <a href="" class="font-weight-bold">group settings</a>
+										</span>
+
+										<span v-else-if="log.type == 'group:status:created'">
+											created a <a :href="sidToUrl(log.metadata.status_id)" class="font-weight-bold">post</a>
+										</span>
+
+										<span v-else-if="log.type == 'group:status:deleted'">
+											deleted a <a :href="sidToUrl(log.metadata.status_id)" class="font-weight-bold">post</a>
+										</span>
+
+										<span v-else-if="log.type == 'group:unlike'">
+											unliked a <a :href="sidToUrl(log.metadata.status_id)" class="font-weight-bold">post</a>
+										</span>
+
+										<span v-else-if="log.type == 'group:admin:block:instance'">
+											blocked <span class="font-weight-bold text-primary">{{ log.metadata.domain }}</span>
+										</span>
+
+										<span v-else-if="log.type == 'group:admin:block:user'">
+											blocked <a class="font-weight-bold text-primary" :href="'/' + log.metadata.username">{{ log.metadata.username }}</a>
+										</span>
+
+										<span v-else-if="log.type == 'group:report:create'">
+											created a <a :href="reportUrl(log.metadata.report_id)" class="font-weight-bold">report</a> about <a :href="'/' + log.metadata.username" class="font-weight-bold">{{ log.metadata.username}}</a>'s <a :href="log.metadata.url" class="font-weight-bold">post</a>
+										</span>
+
+										<span v-else-if="log.type == 'group:moderation:action'">
+											handled a <a :href="reportUrl(log.metadata.report_id)" class="font-weight-bold">mod report</a> regarding <a :href="log.metadata.status_url" class="font-weight-bold">this post</a>
+										</span>
+
+										<span v-else-if="log.type =='group:member-limits:updated'">
+											updated <a :href="memberInteractionUrl(log.metadata.profile_id)" class="font-weight-bold">interaction limits</a> for <a :href="'/' + log.metadata.username" class="font-weight-bold">{{ log.metadata.username }}</a>
+										</span>
+
+										<span v-else>{{log.type}}</span>
+
+										<div class="float-right text-muted small font-weight-bold">{{timeago(log.created_at)}}</div>
+									</div>
+								</div>
+							</div>
+							<div v-if="interactionLogShowMore" class="list-group-item">
+								<button class="btn btn-light font-weight-bold btn-block" @click="loadMoreInteractions">Load more</button>
+							</div>
+						</div>
+					</div>
+					<div class="col-12 col-md-3">
+						<p class="font-weight-bold small">SEARCH</p>
+						<div class="form-group">
+							<input class="form-control rounded-pill" placeholder="Search username, type or url"/>
+						</div>
+						<hr>
+
+						<p class="font-weight-bold small">ACTIVITIES</p>
+
+						<div class="form-check">
+							<input class="form-check-input" type="checkbox" checked id="filter1">
+							<label class="form-check-label font-weight-bold" for="filter1">
+								Joined Group
+							</label>
+						</div>
+
+						<div class="form-check">
+							<input class="form-check-input" type="checkbox" checked id="filter1">
+							<label class="form-check-label font-weight-bold" for="filter1">
+								Left Group
+							</label>
+						</div>
+
+						<div class="form-check">
+							<input class="form-check-input" type="checkbox" checked id="filter1">
+							<label class="form-check-label font-weight-bold" for="filter1">
+								Posts
+							</label>
+						</div>
+
+						<div class="form-check">
+							<input class="form-check-input" type="checkbox" checked id="filter1">
+							<label class="form-check-label font-weight-bold" for="filter1">
+								Comments
+							</label>
+						</div>
+
+						<div class="form-check">
+							<input class="form-check-input" type="checkbox" checked id="filter1">
+							<label class="form-check-label font-weight-bold" for="filter1">
+								Likes
+							</label>
+						</div>
+
+						<hr>
+
+						<p class="font-weight-bold small">FILTERS</p>
+
+						<div class="form-check">
+							<input class="form-check-input" type="checkbox" value="" id="filter1">
+							<label class="form-check-label font-weight-bold" for="filter1">
+								Local members only
+							</label>
+						</div>
+
+						<div class="form-check">
+							<input class="form-check-input" type="checkbox" value="" id="filter1">
+							<label class="form-check-label font-weight-bold" for="filter1">
+								Remote members only
+							</label>
+						</div>
+
+						<div class="form-check">
+							<input class="form-check-input" type="checkbox" value="" id="filter1">
+							<label class="form-check-label font-weight-bold" for="filter1">
+								Blocked members only
+							</label>
+						</div>
+					</div>
+				</div>
+
+				<div v-if="tab == 'blocked'" class="row">
+					<div class="col-12 col-md-3">
+						<p class="h5">Blocked Instances &amp; Users</p>
+						<p>Fine-grained control over who can join and interact with your group</p>
+						<p>Blocking an instance will revoke membership from users on that instance and prevent other users on that instance from joining</p>
+						<p>Blocking a user will revoke membership and remove all interactions from that user</p>
+						<p>Moderating an instance will require all new membership requests from that instance to be approved by a group admin before the specific user can join</p>
+					</div>
+					<div class="col-12 col-md-6">
+						<div class="card mb-3">
+							<div class="card-header text-muted font-weight-bold small">Blocked Instances</div>
+							<div class="list-group list-group-flush">
+								<div v-for="instance in blockedInstances" class="list-group-item d-flex justify-content-between align-items-center">
+									<div>
+										{{instance}}
+									</div>
+									<button class="btn btn-light" @click.prevent="undoBlock('instance', instance)">
+										<i class="far fa-trash-alt text-lighter"></i>
+									</button>
+								</div>
+								<div v-if="blockedInstances.length == 3" class="list-group-item">
+									<p class="mb-0 small font-weight-bold text-lighter text-center">View All</p>
+								</div>
+							</div>
+						</div>
+
+						<div class="card mb-3">
+							<div class="card-header text-muted font-weight-bold small">Blocked Users</div>
+							<div class="list-group list-group-flush">
+								<div v-for="instance in blockedUsers" class="list-group-item d-flex justify-content-between align-items-center">
+									<div>
+										<img src="/storage/avatars/default.jpg" width="32" height="32" class="rounded-circle border mr-3">{{instance}}
+									</div>
+									<button class="btn btn-light" @click.prevent="undoBlock('user', instance)">
+										<i class="far fa-trash-alt text-lighter"></i>
+									</button>
+								</div>
+								<div v-if="blockedUsers.length == 3" class="list-group-item">
+									<p class="mb-0 small font-weight-bold text-lighter text-center">View All</p>
+								</div>
+							</div>
+						</div>
+
+						<div class="card mb-3">
+							<div class="card-header text-muted font-weight-bold small">Moderated Join Requests</div>
+							<div class="list-group list-group-flush">
+								<div v-for="instance in moderatedInstances" class="list-group-item d-flex justify-content-between align-items-center">
+									<div>
+										{{instance}}
+									</div>
+									<button class="btn btn-light" @click.prevent="undoBlock('moderate', instance)">
+										<i class="far fa-trash-alt text-lighter"></i>
+									</button>
+								</div>
+							</div>
+						</div>
+					</div>
+					<div class="col-12 col-md-3">
+						<button class="btn btn-light border btn-block font-weight-bold" @click.prevent="blockAction('instance')">Block Instance</button>
+						<button class="btn btn-light border btn-block font-weight-bold" @click.prevent="blockAction('user')">Block User</button>
+						<button class="btn btn-light border btn-block font-weight-bold" @click.prevent="blockAction('moderate')">Moderate Join Requests</button>
+						<hr>
+						<button class="btn btn-light border btn-block font-weight-bold">Import</button>
+						<button class="btn btn-light border btn-block font-weight-bold" @click.prevent="exportBlocks()">Export</button>
+					</div>
+				</div>
+
+				<div v-if="tab == 'advanced'" class="row">
+					<div class="col-12 col-md-6 offset-md-3">
+
+						<div class="mt-3">
+							<div class="form-group">
+								<label class="font-weight-bold">Membership</label>
+								<select class="form-control rounded-pill" v-model="group.membership">
+									<option value="all">Public</option>
+									<option value="private">Private</option>
+									<option value="local">Local</option>
+								</select>
+
+								<p class="help-text mt-1">
+									{{ membershipDescription[group.membership] }}
+								</p>
+							</div>
+							<!-- <hr>
+							<div class="form-group">
+								<label class="font-weight-bold">Post Types</label>
+								<div class="custom-control custom-checkbox mb-2">
+									<input type="checkbox" class="custom-control-input" id="textType" checked disabled>
+									<label class="custom-control-label" for="textType">Text</label>
+								</div>
+								<div class="custom-control custom-checkbox mb-2">
+									<input type="checkbox" class="custom-control-input" id="photoType" checked>
+									<label class="custom-control-label" for="photoType">Photos</label>
+								</div>
+								<div class="custom-control custom-checkbox mb-2">
+									<input type="checkbox" class="custom-control-input" id="videoType" checked>
+									<label class="custom-control-label" for="videoType">Videos</label>
+								</div>
+								<div class="custom-control custom-checkbox mb-2">
+									<input type="checkbox" class="custom-control-input" id="pollType" checked>
+									<label class="custom-control-label" for="pollType">Polls</label>
+								</div>
+								<div class="custom-control custom-checkbox">
+									<input type="checkbox" class="custom-control-input" id="eventType" disabled>
+									<label class="custom-control-label" for="eventType">Events</label>
+								</div>
+							</div> -->
+						</div>
+
+						<hr>
+
+						<div v-if="group.membership !== 'local'" class="form-group row">
+							<div class="col-sm-12">
+								<div class="mb-1">
+									<div class="form-check">
+										<input class="form-check-input" type="checkbox" v-model="advanced.activitypub">
+										<label class="form-check-label font-weight-bold text-dark text-capitalize ml-1">Enable ActivityPub</label>
+									</div>
+								</div>
+
+								<transition name="fade">
+									<div v-if="!advanced.activitypub" class="alert alert-info mt-2">
+										<div class="media align-items-center">
+											<i class="far fa-exclamation-circle fa-2x mr-3"></i>
+											<div class="media-body">
+												<p class="font-weight-bold mb-0">Federation Warning</p>
+												<p class="small mb-0" style="font-weight:600;">Groups that choose to disable federation later will lose remote content and members and cannot re-enable federation for 24 hours. You can change this later</p>
+											</div>
+										</div>
+									</div>
+								</transition>
+							</div>
+						</div>
+
+						<hr v-if="group.membership !== 'local'">
+
+						<div class="form-group row">
+							<div class="col-sm-12">
+								<div class="mb-1">
+									<div class="form-check">
+										<input class="form-check-input" type="checkbox" v-model="advanced.is_nsfw">
+										<label class="form-check-label font-weight-bold text-dark text-capitalize ml-1">Allow adult content (18+)</label>
+									</div>
+								</div>
+
+								<transition name="fade">
+									<div v-if="!advanced.is_nsfw" class="alert alert-info mt-2">
+										<div class="media align-items-center">
+											<i class="far fa-exclamation-circle fa-2x mr-3"></i>
+											<div class="media-body">
+												<p class="font-weight-bold mb-0">Adult Content Warning</p>
+												<p class="small mb-0" style="font-weight:600;">Groups that allow adult content should enable this or risk suspension or deletion by instance admins. Illegal content is prohibited. You can change this later</p>
+											</div>
+										</div>
+									</div>
+								</transition>
+							</div>
+						</div>
+
+						<hr>
+
+						<div class="form-group row">
+							<div class="col-sm-12">
+								<div class="mb-1">
+									<div class="form-check">
+										<input class="form-check-input" type="checkbox" v-model="advanced.discoverable">
+										<label class="form-check-label font-weight-bold text-dark text-capitalize ml-1">Make group discoverable</label>
+									</div>
+
+									<p class="help-text small text-muted">
+										<span>
+											Being discoverable means that your group appears in search results, on the discover page and can be used in group recommendations
+										</span>
+									</p>
+								</div>
+							</div>
+							<hr>
+						</div>
+
+
+						<div v-if="group.member_count >= 25" class="form-group row">
+							<div class="col-sm-12">
+								<div class="mb-1">
+									<div class="form-check">
+										<input class="form-check-input" type="checkbox">
+										<label class="form-check-label font-weight-bold text-dark text-capitalize ml-1">Enable spam detection</label>
+									</div>
+
+									<p class="help-text small text-muted">
+										<span>
+											Detect and temporarily remove content classified as spam from new members until it can be reviewed by a group admin. <strong>We do not recommend enabling this unless you have or expect periodic spam as it may produce false-positives and reduce member experience &amp; retention.</strong>
+										</span>
+									</p>
+								</div>
+							</div>
+							<hr>
+						</div>
+
+
+						<div v-if="group.member_count >= 25"  class="form-group row">
+							<div class="col-sm-12">
+								<div class="mb-1">
+									<div class="form-check">
+										<input class="form-check-input" type="checkbox">
+										<label class="form-check-label font-weight-bold text-dark text-capitalize ml-1">Enable admin direct messages</label>
+									</div>
+
+									<p class="help-text small text-muted">
+										<span>
+											Allow {{ group.membership == 'local' ? 'local users' : group.membership == 'private' ? 'members' : 'anyone'}} to <a href="#">direct message</a> group admins. The direct message inbox is separate from your own account.
+										</span>
+									</p>
+								</div>
+							</div>
+							<hr>
+						</div>
+
+
+						<h4 class="font-weight-bold pt-3">Danger Zone</h4>
+						<div class="mb-4 border rounded border-danger">
+							<ul class="list-group mb-0 pb-0">
+								<li class="list-group-item border-left-0 border-right-0 py-3 d-flex justify-content-between disabled">
+									<div>
+										<p class="font-weight-bold mb-1">Temporarily Disable Group</p>
+										<p class="mb-0 small">Not available</p>
+									</div>
+									<div>
+										<a class="btn btn-outline-danger font-weight-bold py-1" href="#">Disable</a>
+									</div>
+								</li>
+								<li class="list-group-item border-left-0 border-right-0 py-3 d-flex justify-content-between">
+									<div>
+										<p class="font-weight-bold mb-1">Delete Group</p>
+										<p class="mb-0 small">Once you delete your group, there is no going back.</p>
+									</div>
+									<div>
+										<button class="btn btn-outline-danger font-weight-bold py-1" @click="deleteGroup">Delete Group</button>
+									</div>
+								</li>
+							</ul>
+						</div>
+					</div>
+				</div>
+
+				<div v-if="tab == 'limits'" class="row">
+					<div class="col-12 col-md-6 offset-md-3">
+						<div class="mt-3">
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script type="text/javascript">
+	export default {
+		props: {
+			groupId: {
+				type: String
+			}
+		},
+
+		data() {
+			return {
+				initalLoad: false,
+				profile: undefined,
+				group: {},
+				isMember: false,
+				isAdmin: false,
+				changed: false,
+				savingChanges: false,
+				categories: [],
+				category: 'General',
+				tab: 'home',
+				tabs: [
+					'home',
+					'customize',
+					'interactions',
+					'blocked',
+					'advanced',
+					'limits',
+					'blocked:import'
+				],
+				interactionLog: [],
+				interactionLogPage: 1,
+				interactionLogInitialLoad: false,
+				interactionLogShowMore: true,
+				blockedInitialLoad: false,
+				blockedInstances: [
+					'facebook.com',
+					'instagram.com'
+				],
+				blockedUsers: [
+					'mark@facebook.com',
+					'user@example.org',
+					'troll'
+				],
+				moderatedInstances: [
+					'pawoo.net',
+					'pixelfed.com'
+				],
+				importBlocksData: {},
+				importBlocksUploaded: false,
+				membershipDescription: {
+					all: 'Anyone can join your group',
+					local: 'Only local users can join your group',
+					private: 'Only users you approve can join your group'
+				},
+				advanced: {}
+			};
+		},
+
+		beforeMount() {
+			axios.get('/api/v0/groups/categories/list')
+				.then(res => {
+					this.categories = res.data;
+				})
+		},
+
+		mounted() {
+			let u = new URLSearchParams(window.location.search);
+
+			if(u.has('tab') && this.tabs.includes(u.get('tab'))) {
+				this.tab = u.get('tab');
+				this.toggleTab(this.tab);
+			}
+
+			axios.get('/api/pixelfed/v1/accounts/verify_credentials')
+			.then(res => {
+				this.profile = res.data;
+
+				axios.get('/api/v0/groups/' + this.groupId)
+				.then(res => {
+					this.group = res.data;
+					this.initalLoad = true;
+					this.isMember = res.data.self.is_member;
+					this.isAdmin = ['founder', 'admin'].includes(res.data.self.role);
+					this.advanced = res.data.config;
+					this.category = res.data.category.name;
+				})
+			});
+		},
+
+		methods: {
+			timestampFormat(date, showTime = false) {
+				let ts = new Date(date);
+				return showTime ? ts.toDateString() + ' · ' + ts.toLocaleTimeString() : ts.toDateString();
+			},
+
+			timeago(ts) {
+				return window.App.util.format.timeAgo(ts);
+			},
+
+			sidToUrl(sid) {
+				return `/groups/${this.groupId}/p/${sid}`;
+			},
+
+			submit() {
+				this.savingChanges = true;
+
+				let formData = new FormData();
+				formData.append('category', this.category);
+				formData.append('membership', this.group.membership);
+				formData.append('discoverable', this.advanced.discoverable);
+				formData.append('activitypub', this.advanced.activitypub);
+				formData.append('is_nsfw', this.advanced.is_nsfw);
+
+				if(this.group.description) {
+					formData.append('description', this.group.description);
+				}
+
+				if(this.$refs.avatarInput) {
+					formData.append('avatar', this.$refs.avatarInput.files[0]);
+				}
+
+				if(this.$refs.headerInput) {
+					formData.append('header', this.$refs.headerInput.files[0]);
+				}
+
+				axios.post('/api/v0/groups/' + this.group.id + '/settings', formData)
+				.then(res => {
+					this.savingChanges = false;
+					this.group = res.data;
+					swal('Updated!', 'Successfully updated group settings.', 'success');
+				}).catch(err => {
+					this.savingChanges = false;
+					console.log(err.response);
+					swal('Oops!', 'An error occured while attempting to save changes. Please try again later.', 'error');
+				});
+			},
+
+			toggleTab(tab) {
+				if(event) {
+					event.currentTarget.blur();
+				}
+
+				switch(tab) {
+					case 'home':
+						this.tab = 'home';
+						history.pushState(null, null, `/groups/${this.groupId}/settings`);
+					break;
+
+					case 'customize':
+						this.tab = 'customize';
+						history.pushState(null, null, `/groups/${this.groupId}/settings?tab=customize`);
+					break;
+
+					case 'limits':
+						this.tab = 'limits';
+						history.pushState(null, null, `/groups/${this.groupId}/settings?tab=limits`);
+					break;
+
+					case 'interactions':
+						if(!this.interactionLogInitialLoad) {
+							this.loadInteractions();
+						}
+						this.tab = 'interactions';
+						history.pushState(null, null, `/groups/${this.groupId}/settings?tab=interactions`);
+					break;
+
+					case 'blocked':
+						if(!this.blockedInitialLoad) {
+							this.loadBlocks();
+						}
+						this.tab = 'blocked';
+						history.pushState(null, null, `/groups/${this.groupId}/settings?tab=blocked`);
+					break;
+
+					case 'advanced':
+						this.tab = 'advanced';
+						history.pushState(null, null, `/groups/${this.groupId}/settings?tab=advanced`);
+					break;
+
+					default:
+						this.tab = 'home';
+						history.pushState(null, null, `/groups/${this.groupId}/settings`);
+					break;
+				}
+			},
+
+			loadInteractions() {
+				axios.get('/api/v0/groups/' + this.groupId + '/admin/interactions')
+				.then(res => {
+					this.interactionLog = res.data;
+					this.interactionLogPage++;
+					this.interactionLogInitialLoad = true;
+				});
+			},
+
+			loadMoreInteractions() {
+				axios.get('/api/v0/groups/' + this.groupId + '/admin/interactions', {
+					params: {
+						page: this.interactionLogPage
+					}
+				}).then(res => {
+					if(res.data.length == 0) {
+						this.interactionLogShowMore = false;
+						return;
+					}
+					this.interactionLog.push(...res.data);
+					this.interactionLogPage++;
+				})
+			},
+
+			loadBlocks() {
+				axios.get(`/api/v0/groups/${this.groupId}/admin/blocks`)
+				.then(res => {
+					this.blockedInstances = res.data.instances;
+					this.blockedUsers = res.data.users;
+					this.moderatedInstances = res.data.moderated;
+					this.blockedInitialLoad = true;
+				})
+			},
+
+			blockAction(action) {
+				let type = action == 'user' ? 'user' : 'instance domain';
+
+				swal({
+					text: `Which ${type}?`,
+					content: {
+						element: 'input',
+						attributes: {
+      						placeholder: type == 'user' ? 'pixelfed' : 'pixelfed.org'
+      					}
+					},
+					button: {
+						text: "Next",
+						closeModal: false,
+					},
+				})
+				.then(name => {
+					if (!name) throw null;
+					if(action !== 'user' && name.startsWith('http')) {
+						swal('Oops!', 'Please enter the instance domain (eg: pixelfed.social)', 'error');
+						return null;
+					}
+					return name;
+				}).then(name => {
+					return axios.post('/api/v0/groups/' + this.groupId + '/admin/mbs', {
+						type: action == 'user' ? 'user' : 'instance',
+						item: name
+					}).then(res => {
+						if(res.data) {
+							return name;
+						} else {
+							swal.stopLoading();
+							swal.close();
+							return null;
+						}
+					}).catch(err => {
+						swal.stopLoading();
+						swal.close();
+						return null;
+					});
+				}).then(name => {
+					if(!name) {
+						this.$bvToast.toast(`Invalid ${action}, please try again`, {
+							title: 'Error',
+							variant: 'danger',
+							autoHideDelay: 5000
+						});
+						return;
+					}
+					swal({
+						title: "Are you sure?",
+						text: action === 'moderate' ? `Manually approve all membership requests from ${name}` : `Limiting ${name} will purge and reject all interactions with this group`,
+						icon: "warning",
+						buttons: true,
+						dangerMode: true,
+					})
+					.then((confirm) => {
+						if (confirm) {
+							axios.post('/api/v0/groups/' + this.groupId + '/admin/blocks/add', {
+								item: name,
+								type: action
+							}).then(res => {
+								switch(action) {
+									case 'instance':
+										this.blockedInstances.push(name);
+									break;
+
+									case 'user':
+										this.blockedUsers.push(name);
+									break;
+
+									case 'moderate':
+										this.moderatedInstances.push(name);
+									break;
+								}
+								// swal("Poof! Your imaginary file has been deleted!", {
+								// 	icon: "success",
+								// });
+							})
+						}
+					});
+				});
+			},
+
+			reportUrl(report) {
+				return `/groups/${this.groupId}/moderation?tab=view&id=${report}`;
+			},
+
+			memberInteractionUrl(pid) {
+				return `/groups/${this.groupId}/members?a=il&pid=${pid}`;
+			},
+
+			undoBlock(type, val) {
+				let action = type == 'moderate' ? `unblock ${val}?` : `allow anyone to join without approval from ${val}?`;
+				swal({
+					'title': 'Confirm',
+					'text': `Are you sure you want to ${action}`,
+					'buttons': {
+						cancel: {
+							text: "Cancel",
+							value: null,
+							visible: true,
+							className: "",
+							closeModal: true,
+						},
+						confirm: {
+							text: "Proceed",
+							value: true,
+							visible: true,
+							className: "",
+							closeModal: true
+						}
+					}
+				}).then(res => {
+					if(res) {
+						axios.post(`/api/v0/groups/${this.groupId}/admin/blocks/undo`, {
+							item: val,
+							type: type
+						}).then(res => {
+							switch(type) {
+								case 'instance':
+									this.blockedInstances = this.blockedInstances.filter(i => {
+										return i != val;
+									})
+								break;
+
+								case 'user':
+									this.blockedUsers = this.blockedUsers.filter(i => {
+										return i != val;
+									})
+								break;
+
+								case 'moderate':
+									this.moderatedInstances = this.moderatedInstances.filter(i => {
+										return i != val;
+									})
+								break;
+							}
+						})
+					}
+				});
+			},
+
+			exportBlocks() {
+				event.currentTarget.blur();
+				axios({
+					url: '/api/v0/groups/'+this.groupId+'/admin/blocks/export',
+					method: 'POST',
+					responseType: 'blob',
+				}).then((response) => {
+					const url = window.URL.createObjectURL(new Blob([response.data]));
+					const link = document.createElement('a');
+					link.href = url;
+					link.setAttribute('download', `pixelfed-group-blocks-${Date.now()}.json`);
+					document.body.appendChild(link);
+					link.click();
+				});
+			},
+
+			deleteGroup() {
+				axios.post('/api/v0/groups/delete', {
+					gid: this.groupId
+				})
+				.then(res => {
+					location.href = `/groups/${this.groupId}`;
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.group-settings-component {
+		&-header {
+			display: flex;
+			justify-content: space-between;
+			align-items: flex-end;
+			padding: 2rem 1rem 1rem 1rem;
+			background-color: #fff;
+
+			.cta-btn {
+				min-width: 140px;
+			}
+		}
+	}
+</style>
diff --git a/resources/assets/components/groups/GroupTopicFeed.vue b/resources/assets/components/groups/GroupTopicFeed.vue
new file mode 100644
index 000000000..ee7f57433
--- /dev/null
+++ b/resources/assets/components/groups/GroupTopicFeed.vue
@@ -0,0 +1,170 @@
+<template>
+	<div class="group-topic-feed-component">
+		<div v-if="isLoaded" class="bg-white py-5 border-bottom">
+			<div class="container">
+				<div class="d-flex justify-content-between align-items-center">
+					<div>
+						<h3 class="font-weight-bold mb-1">#{{ name }}</h3>
+						<p class="mb-0 lead text-muted">
+							<span>
+								Posts in <a :href="group.url" class="text-muted font-weight-bold">{{ group.name }}</a>
+							</span>
+							<span>·</span>
+							<span><i class="fas fa-globe"></i></span>
+							<span>·</span>
+							<span>{{ group.membership != 'all' ? 'Private' : 'Public'}} Group</span>
+						</p>
+					</div>
+					<!-- <div>
+						<button class="btn btn-light border btn-lg text-muted">
+							<i class="fas fa-ellipsis-h"></i>
+						</button>
+					</div> -->
+				</div>
+			</div>
+		</div>
+		<div v-if="isLoaded" class="row justify-content-center mt-3">
+			<div v-if="feed.length" class="col-12 col-md-5">
+				<group-status
+					v-for="(status, index) in feed"
+					:key="'gs:' + status.id + index"
+					:prestatus="status"
+					:profile="profile"
+					:group="group"
+					:show-group-chevron="true"
+					:group-id="gid" />
+
+				<div v-if="feed.length > 2">
+					<infinite-loading @infinite="infiniteFeed">
+						<div slot="no-more"></div>
+						<div slot="no-results"></div>
+					</infinite-loading>
+				</div>
+			</div>
+			<div v-else class="col-12 col-md-5 d-flex justify-content-center">
+				<div class="mt-5">
+					<p class="text-lighter text-center">
+						<i class="fal fa-exclamation-circle fa-4x"></i>
+					</p>
+
+					<p class="font-weight-bold text-muted">Cannot load any posts containg the <span class="font-weight-normal">#{{ name }}</span> hashtag</p>
+
+					<p class="text-left">
+						This can happen for a few reasons:
+					</p>
+
+					<ul class="text-left">
+						<li>There is a typo in the url</li>
+						<li>No posts exist that contain this hashtag</li>
+						<li>This hashtag has been banned by group admins</li>
+						<li>The hashtag is new or used infrequently</li>
+						<li>A technical issue has occured</li>
+					</ul>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script type="text/javascript">
+	import GroupStatus from '@/groups/partials/GroupStatus.vue';
+
+	export default {
+		props: {
+			gid: {
+				type: String
+			},
+
+			name: {
+				type: String
+			}
+		},
+
+		components: {
+			GroupStatus
+		},
+
+		data() {
+			return {
+				isLoaded: false,
+				group: false,
+				profile: false,
+				feed: [],
+				page: 1,
+				ids: []
+			}
+		},
+
+		mounted() {
+			this.fetchProfile();
+		},
+
+		methods: {
+			fetchProfile() {
+				axios.get('/api/pixelfed/v1/accounts/verify_credentials')
+				.then(res => {
+					this.profile = res.data;
+					this.fetchGroup();
+				});
+			},
+
+			fetchGroup() {
+				axios.get('/api/v0/groups/' + this.gid)
+				.then(res => {
+					this.group = res.data;
+					this.fetchFeed();
+				});
+			},
+
+			fetchFeed() {
+				axios.get('/api/v0/groups/topics/tag', {
+					params: {
+						gid: this.gid,
+						name: this.name
+					}
+				}).then(res => {
+					this.feed = res.data;
+					this.isLoaded = true;
+					let self = this;
+					res.data.forEach(d => {
+						if(self.ids.indexOf(d.id) == -1) {
+							self.ids.push(d.id);
+						}
+					});
+					this.page++;
+				})
+			},
+
+			infiniteFeed($state) {
+				if(this.feed.length < 2) {
+					$state.complete();
+					return;
+				}
+
+				axios.get('/api/v0/groups/topics/tag', {
+					params: {
+						gid: this.gid,
+						name: this.name,
+						limit: 1,
+						page: this.page
+					},
+				}).then(res => {
+					if (res.data.length) {
+						let data = res.data;
+						let self = this;
+						data.forEach(d => {
+							if(self.ids.indexOf(d.id) == -1) {
+								self.ids.push(d.id);
+								self.feed.push(d);
+							}
+						});
+						$state.loaded();
+						this.page++;
+					} else {
+						$state.complete();
+					}
+				});
+			}
+		}
+	}
+</script>
diff --git a/resources/assets/components/groups/GroupsHome.vue b/resources/assets/components/groups/GroupsHome.vue
new file mode 100644
index 000000000..3a3d6dde8
--- /dev/null
+++ b/resources/assets/components/groups/GroupsHome.vue
@@ -0,0 +1,473 @@
+<template>
+	<div class="groups-home-component w-100 h-100">
+		<div v-if="initialLoad" class="row border-bottom m-0 p-0">
+			<div class="col-2 shadow" style="height: 100vh;background:#fff;top:51px;overflow: hidden;z-index: 1;position: sticky;">
+				<div class="p-1">
+					<div class="d-flex justify-content-between align-items-center py-3">
+						<p class="h2 font-weight-bold mb-0">Groups</p>
+						<a class="btn btn-light px-2 rounded-circle" href="/settings/home">
+							<i class="fas fa-cog fa-lg"></i>
+						</a>
+					</div>
+
+					<div class="mb-3">
+						<autocomplete
+							:search="autocompleteSearch"
+							placeholder="Search groups by name"
+							aria-label="Search groups by name"
+							:get-result-value="getSearchResultValue"
+							:debounceTime="700"
+							@submit="onSearchSubmit"
+							ref="autocomplete"
+							>
+							<template #result="{ result, props }">
+								<li
+								v-bind="props"
+								class="autocomplete-result"
+								>
+
+									<div class="media align-items-center">
+										<img v-if="result.local && result.metadata && result.metadata.hasOwnProperty('header') && result.metadata.header.hasOwnProperty('url')" :src="result.metadata.header.url" width="32" height="32">
+										<div v-else class="icon-placeholder">
+											<i class="fal fa-user-friends"></i>
+										</div>
+										<div class="media-body text-truncate mr-3">
+											<p class="result-name mb-n1 font-weight-bold">
+												{{ truncateName(result.name) }}
+												<span v-if="result.verified" class="fa-stack ml-n2" title="Verified Group" data-toggle="tooltip">
+													<i class="fas fa-circle fa-stack-1x fa-lg" style="color: #22a7f0cc;font-size:18px"></i>
+													<i class="fas fa-check fa-stack-1x text-white" style="font-size:10px"></i>
+												</span>
+											</p>
+											<p class="mb-0 text-muted" style="font-size: 10px;">
+												<span v-if="!result.local" title="Remote Group">
+													<i class="far fa-globe"></i>
+												</span>
+												<span v-if="!result.local">·</span>
+												<span class="font-weight-bold">{{ result.member_count }} members</span>
+											</p>
+										</div>
+									</div>
+								</li>
+							</template>
+						</autocomplete>
+					</div>
+
+					<button
+						class="btn btn-light group-nav-btn"
+						:class="{ active: tab == 'feed' }"
+						@click="switchTab('feed')">
+						<div class="group-nav-btn-icon">
+							<i class="fas fa-list"></i>
+						</div>
+						<div class="group-nav-btn-name">
+							Your Feed
+						</div>
+					</button>
+
+					<button
+						class="btn btn-light group-nav-btn"
+						:class="{ active: tab == 'discover' }"
+						@click="switchTab('discover')">
+						<div class="group-nav-btn-icon">
+							<i class="fas fa-compass"></i>
+						</div>
+						<div class="group-nav-btn-name">
+							Discover
+						</div>
+					</button>
+
+					<button
+						class="btn btn-light group-nav-btn"
+						:class="{ active: tab == 'mygroups' }"
+						@click="switchTab('mygroups')">
+						<div class="group-nav-btn-icon">
+							<i class="fas fa-list"></i>
+						</div>
+						<div class="group-nav-btn-name">
+							My Groups
+						</div>
+					</button>
+
+					<button
+						class="btn btn-light group-nav-btn"
+						:class="{ active: tab == 'notifications' }"
+						@click="switchTab('notifications')">
+						<div class="group-nav-btn-icon">
+							<i class="far fa-bell"></i>
+						</div>
+						<div class="group-nav-btn-name">
+							Your Notifications
+						</div>
+					</button>
+
+					<!-- <button
+						class="btn btn-light group-nav-btn"
+						:class="{ active: tab == 'invitations' }"
+						@click="switchTab('invitations')">
+						<div class="group-nav-btn-icon">
+							<i class="fas fa-user-plus"></i>
+						</div>
+						<div class="group-nav-btn-name">
+							Group Invitations
+						</div>
+					</button> -->
+
+					<button
+						class="btn btn-light group-nav-btn"
+						:class="{ active: tab == 'remotesearch' }"
+						@click="switchTab('remotesearch')">
+						<div class="group-nav-btn-icon">
+							<i class="fas fa-search-plus"></i>
+						</div>
+						<div class="group-nav-btn-name">
+							Find a remote group
+						</div>
+					</button>
+
+					<button
+						v-if="config && config.limits.user.create.new"
+						class="btn btn-primary btn-block rounded-pill font-weight-bold mt-3"
+						@click="switchTab('creategroup')"
+						:disabled="tab == 'creategroup'">
+						<i class="fas fa-plus mr-2"></i> Create New Group
+					</button>
+
+					<hr>
+					<div v-for="group in groups" class="ml-2">
+						<div class="card shadow-sm border text-decoration-none text-dark">
+							<img v-if="group.metadata && group.metadata.hasOwnProperty('header')" :src="group.metadata.header.url" class="card-img-top" style="width: 100%; height: auto;object-fit: cover;max-height: 160px;">
+							<div v-else class="bg-primary" style="width:100%;height:160px;"></div>
+							<div class="card-body">
+								<div class="lead font-weight-bold d-flex align-items-top" style="height: 60px;">
+									{{ group.name }}
+									<span v-if="group.verified" class="fa-stack ml-n2 mt-n2">
+										<i class="fas fa-circle fa-stack-1x fa-lg" style="color: #22a7f0cc;font-size:18px"></i>
+										<i class="fas fa-check fa-stack-1x text-white" style="font-size:10px"></i>
+									</span>
+								</div>
+								<div class="text-muted font-weight-light d-flex justify-content-between">
+									<span>{{group.member_count}} Members</span>
+									<span style="font-size: 12px;padding: 2px 5px;color: rgba(75, 119, 190, 1);background:rgba(137, 196, 244, 0.2);border:1px solid rgba(137, 196, 244, 0.3);font-weight:400;text-transform: capitalize;" class="rounded">{{ group.self.role }}</span>
+								</div>
+								<hr>
+								<p class="mb-0">
+									<a class="btn btn-light btn-block border rounded-lg font-weight-bold" :href="group.url">View Group</a>
+								</p>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+
+			<keep-alive>
+				<transition name="fade">
+					<self-feed v-if="tab == 'feed'" :profile="profile" v-on:switchtab="switchTab" />
+					<self-discover v-if="tab == 'discover'" :profile="profile" />
+					<self-notifications v-if="tab == 'notifications'" :profile="profile" />
+					<self-invitations v-if="tab == 'invitations'" :profile="profile" />
+					<self-remote-search v-if="tab == 'remotesearch'" :profile="profile" />
+					<self-groups v-if="tab == 'mygroups'" :profile="profile" />
+					<create-group v-if="tab == 'creategroup'" :profile="profile" />
+					<div v-if="tab == 'gsearch'">
+						<div class="col-12 px-5">
+							<div class="my-4">
+		                        <p class="h1 font-weight-bold mb-1">Group Search</p>
+		                        <p class="lead text-muted mb-0">Search and explore groups.</p>
+		                    </div>
+		                    <div class="media align-items-center text-lighter">
+		                    	<i class="far fa-chevron-left fa-lg mr-3"></i>
+		                    	<div class="media-body">
+		                    		<p class="lead mb-0">Use the search bar on the side menu</p>
+		                    	</div>
+		                    </div>
+						</div>
+					</div>
+				</transition>
+			</keep-alive>
+		</div>
+		<div v-else class="row justify-content-center mt-5">
+			<b-spinner />
+		</div>
+	</div>
+</template>
+
+<script type="text/javascript">
+	import GroupStatus from './partials/GroupStatus.vue';
+	import SelfFeed from './partials/SelfFeed.vue';
+	import SelfDiscover from './partials/SelfDiscover.vue';
+	import SelfGroups from './partials/SelfGroups.vue';
+	import SelfNotifications from './partials/SelfNotifications.vue';
+	import SelfInvitations from './partials/SelfInvitations.vue';
+	import SelfRemoteSearch from './partials/SelfRemoteSearch.vue';
+	import CreateGroup from './CreateGroup.vue';
+	import Autocomplete from '@trevoreyre/autocomplete-vue'
+	import '@trevoreyre/autocomplete-vue/dist/style.css'
+
+	export default {
+		data() {
+			return {
+				initialLoad: false,
+				config: {},
+				groups: [],
+				profile: {},
+				tab: null,
+				searchQuery: undefined,
+			};
+		},
+
+		components: {
+			'autocomplete-input': Autocomplete,
+			'group-status': GroupStatus,
+			'self-discover': SelfDiscover,
+			'self-groups': SelfGroups,
+			'self-feed': SelfFeed,
+			'self-notifications': SelfNotifications,
+			'self-invitations': SelfInvitations,
+			'self-remote-search': SelfRemoteSearch,
+			"create-group": CreateGroup
+		},
+
+		mounted() {
+			this.fetchConfig();
+		},
+
+		methods: {
+			init() {
+				document.querySelectorAll("footer").forEach(e => e.parentNode.removeChild(e));
+				document.querySelectorAll(".mobile-footer-spacer").forEach(e => e.parentNode.removeChild(e));
+				document.querySelectorAll(".mobile-footer").forEach(e => e.parentNode.removeChild(e));
+				// let u = new URLSearchParams(window.location.search);
+				// if(u.has('ct')) {
+				// 	if(['mygroups', 'notifications', 'discover', 'remotesearch', 'creategroup', 'gsearch'].includes(u.get('ct'))) {
+				// 		if(u.get('ct') == 'creategroup' && this.config.limits.user.create.new == false) {
+				// 			this.tab = 'feed';
+				// 			history.pushState(null, null, '/groups/feed');
+				// 		} else {
+				// 			this.tab = u.get('ct');
+				// 		}
+				// 	} else {
+				// 		this.tab = 'feed';
+				// 		history.pushState(null, null, '/groups/feed');
+				// 	}
+				// } else {
+				// 	this.tab = 'feed';
+				// }
+				this.initialLoad = true;
+			},
+
+			fetchConfig() {
+				axios.get('/api/v0/groups/config')
+				.then(res => {
+					this.config = res.data;
+					this.fetchProfile();
+				});
+			},
+
+			fetchProfile() {
+				axios.get('/api/pixelfed/v1/accounts/verify_credentials')
+				.then(res => {
+					this.profile = res.data;
+					this.init();
+					window._sharedData.curUser = res.data;
+					window.App.util.navatar();
+				})
+			},
+
+			fetchSelfGroups() {
+				axios.get('/api/v0/groups/self/list')
+				.then(res => {
+					this.groups = res.data;
+				});
+			},
+
+			switchTab(tab) {
+				event.currentTarget.blur();
+				window.scrollTo(0,0);
+				this.tab = tab;
+
+				if(tab != 'feed') {
+					history.pushState(null, null, '/groups/home?ct=' + tab);
+				} else {
+					history.pushState(null, null, '/groups/home');
+				}
+			},
+
+			autocompleteSearch(input) {
+				if (!input || input.length < 2) {
+					if(this.tab = 'searchresults') {
+						this.tab = 'feed';
+					}
+					return [];
+				};
+
+				this.searchQuery = input;
+				// this.tab = 'searchresults';
+
+				if(input.startsWith('http')) {
+					let url = new URL(input);
+					if(url.hostname == location.hostname) {
+						location.href = input;
+						return [];
+					}
+					return [];
+				}
+
+				if(input.startsWith('#')) {
+					this.$bvToast.toast(input, {
+						title: 'Hashtag detected',
+						variant: 'info',
+						autoHideDelay: 5000
+					});
+					return [];
+				}
+
+				return axios.post('/api/v0/groups/search/global', {
+					q: input,
+					v: '0.2'
+				})
+				.then(res => {
+					this.searchLoading = false;
+					return res.data;
+				}).catch(err => {
+
+					if(err.response.status === 422) {
+						this.$bvToast.toast(err.response.data.error.message, {
+							title: 'Cannot display search results',
+							variant: 'danger',
+							autoHideDelay: 5000
+						});
+					}
+
+					return [];
+				})
+			},
+
+			getSearchResultValue(result) {
+				return result.name;
+			},
+
+			onSearchSubmit(result) {
+				if (result.length < 1) {
+					return [];
+				}
+
+				location.href = result.url;
+			},
+
+			truncateName(val) {
+				if(val.length < 24) {
+					return val;
+				}
+
+				return val.substr(0, 23) + '...';
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.groups-home-component {
+        font-family: var(--font-family-sans-serif);
+
+		.group-nav-btn {
+			display: block;
+			width: 100%;
+			padding-left: 0;
+			padding-top: 0.3rem;
+			padding-bottom: 0.3rem;
+			margin-bottom: 0.3rem;
+			border-radius: 1.5rem;
+			text-align: left;
+			color: #6c757d;
+			background-color: transparent;
+			border-color: transparent;
+			justify-content: flex-start;
+
+			&.active {
+				background-color: #EFF6FF !important;
+				border:1px solid #DBEAFE !important;
+				color: #212529;
+
+				.group-nav-btn-icon {
+					background-color: #2c78bf !important;
+					color: #fff !important;
+				}
+			}
+
+			&-icon {
+				display: inline-flex;
+				width: 35px;
+				height: 35px;
+				padding: 12px;
+				background-color: #E5E7EB;
+				border-radius: 17px;
+				margin: auto 0.3rem;
+				align-items: center;
+				justify-content: center;
+			}
+
+			&-name {
+				display: inline-block;
+				margin-left: 0.3rem;
+				font-weight: 700;
+			}
+		}
+
+		.autocomplete-input {
+			height: 2.375rem;
+			background-color: #f8f9fa !important;
+			font-size: 0.9rem;
+			color: #495057;
+			border-radius: 50rem;
+			border-color: transparent;
+
+			&:focus,
+			&[aria-expanded=true] {
+				box-shadow: none;
+			}
+		}
+
+		.autocomplete-result {
+			background: none;
+			padding: 12px;
+
+			&:hover,
+			&:focus {
+				background-color: #EFF6FF !important;
+			}
+
+			.media {
+				img {
+					object-fit: cover;
+					border-radius: 4px;
+					margin-right: 0.6rem;
+				}
+
+				.icon-placeholder {
+					display: flex;
+					width: 32px;
+					height: 32px;
+					background-color: #2c78bf;
+					border-radius: 4px;
+					justify-content: center;
+					align-items: center;
+					color: #fff;
+					margin-right: 0.6rem;
+				}
+			}
+		}
+
+		.autocomplete-result-list {
+			padding-bottom: 0;
+		}
+
+		.fade-enter-active, .fade-leave-active {
+			transition: opacity 200ms;
+		}
+
+		.fade-enter, .fade-leave-to {
+			opacity: 0;
+		}
+	}
+</style>
diff --git a/resources/assets/components/groups/Page/GroupAbout.vue b/resources/assets/components/groups/Page/GroupAbout.vue
new file mode 100644
index 000000000..8285a3db2
--- /dev/null
+++ b/resources/assets/components/groups/Page/GroupAbout.vue
@@ -0,0 +1,168 @@
+<template>
+    <div class="group-feed-component">
+        <div class="row border-bottom m-0 p-0">
+            <sidebar />
+
+            <div class="col-12 col-md-9 px-md-0">
+                <div class="bg-white mb-3 border-bottom">
+                    <div>
+                        <group-banner :group="group" />
+                        <group-header-details
+                            :group="group"
+                            :isAdmin="isAdmin"
+                            :isMember="isMember"
+                            @refresh="handleRefresh"
+                        />
+                        <group-nav-tabs
+                            :group="group"
+                            :isAdmin="isAdmin"
+                            :isMember="isMember"
+                            :atabs="atabs"
+                        />
+                    </div>
+                </div>
+
+                <div v-if="!initialLoad">
+                    <p class="text-center mt-5 pt-5 font-weight-bold">Loading...</p>
+                </div>
+
+                <template v-else>
+                    <div class="container-xl group-feed-component-body">
+                        <template v-if="initialLoad && group.self.is_member">
+                            <group-about :key="renderIdx" :group="group" :profile="profile" />
+                        </template>
+
+                        <member-only-warning v-else />
+                    </div>
+                </template>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script type="text/javascript">
+    import StatusCard from '~/partials/StatusCard.vue';
+    import GroupMembers from '@/groups/partials/GroupMembers.vue';
+    import GroupCompose from '@/groups/partials/GroupCompose.vue';
+    import GroupStatus from '@/groups/partials/GroupStatus.vue';
+    import GroupAbout from '@/groups/partials/GroupAbout.vue';
+    import GroupMedia from '@/groups/partials/GroupMedia.vue';
+    import GroupModeration from '@/groups/partials/GroupModeration.vue';
+    import GroupTopics from '@/groups/partials/GroupTopics.vue';
+    import GroupInfoCard from '@/groups/partials/GroupInfoCard.vue';
+    import LeaveGroup from '@/groups/partials/LeaveGroup.vue';
+    import GroupInsights from '@/groups/partials/GroupInsights.vue';
+    import SearchModal from '@/groups/partials/GroupSearchModal.vue';
+    import InviteModal from '@/groups/partials/GroupInviteModal.vue';
+    import SidebarComponent from '@/groups/sections/Sidebar.vue';
+    import GroupBanner from '@/groups/partials/Page/GroupBanner.vue';
+    import GroupHeaderDetails from '@/groups/partials/Page/GroupHeaderDetails.vue';
+    import GroupNavTabs from '@/groups/partials/Page/GroupNavTabs.vue';
+    import MemberOnlyWarning from '@/groups/partials/Membership/MemberOnlyWarning.vue';
+
+    export default {
+        props: {
+            groupId: {
+                type: String
+            },
+
+            path: {
+                type: String
+            }
+        },
+
+        components: {
+            'status-card': StatusCard,
+            'group-about': GroupAbout,
+            'group-status': GroupStatus,
+            'group-members': GroupMembers,
+            'group-compose': GroupCompose,
+            'group-topics': GroupTopics,
+            'group-info-card': GroupInfoCard,
+            'group-media': GroupMedia,
+            'group-moderation': GroupModeration,
+            'leave-group': LeaveGroup,
+            'group-insights': GroupInsights,
+            'search-modal': SearchModal,
+            'invite-modal': InviteModal,
+            'sidebar': SidebarComponent,
+            'group-banner': GroupBanner,
+            'group-header-details': GroupHeaderDetails,
+            'group-nav-tabs': GroupNavTabs,
+            'member-only-warning': MemberOnlyWarning
+        },
+
+        data() {
+            return {
+                initialLoad: false,
+                profile: undefined,
+                group: {},
+                isMember: false,
+                isAdmin: false,
+                renderIdx: 1,
+                atabs: {
+                    moderation_count: 0,
+                    request_count: 0
+                }
+            };
+        },
+
+        created() {
+            this.init();
+        },
+
+        methods: {
+            init() {
+                this.initialLoad = false;
+                axios.get('/api/pixelfed/v1/accounts/verify_credentials')
+                .then(res => {
+                    this.profile = res.data;
+                    this.fetchGroup();
+                })
+                .catch(err => {
+                    window.location.href = '/login?_next=' + encodeURIComponent(window.location.href);
+                });
+            },
+
+            handleRefresh() {
+                this.initialLoad = false;
+                this.init();
+                this.renderIdx++;
+            },
+
+            fetchGroup() {
+                axios.get('/api/v0/groups/' + this.groupId)
+                .then(res => {
+                    this.group = res.data;
+                    this.isMember = res.data.self.is_member;
+                    this.isAdmin = ['founder', 'admin'].includes(res.data.self.role);
+
+                    if(this.isAdmin) {
+                        this.fetchAdminTabs();
+                    }
+
+                    this.initialLoad = true;
+                })
+                .catch(err => {
+                    //window.location.href = '/groups/unavailable';
+                    alert('error');
+                });
+            },
+
+            fetchAdminTabs() {
+                axios.get('/api/v0/groups/' + this.groupId + '/atabs')
+                .then(res => {
+                    this.atabs = res.data;
+                })
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+    .group-feed-component {
+        &-body {
+            min-height: 40vh;
+        }
+    }
+</style>
diff --git a/resources/assets/components/groups/Page/GroupMedia.vue b/resources/assets/components/groups/Page/GroupMedia.vue
new file mode 100644
index 000000000..b2d098ac8
--- /dev/null
+++ b/resources/assets/components/groups/Page/GroupMedia.vue
@@ -0,0 +1,168 @@
+<template>
+    <div class="group-feed-component">
+        <div class="row border-bottom m-0 p-0">
+            <sidebar />
+
+            <div class="col-12 col-md-9 px-md-0">
+                <div class="bg-white mb-3 border-bottom">
+                    <div>
+                        <group-banner :group="group" />
+                        <group-header-details
+                            :group="group"
+                            :isAdmin="isAdmin"
+                            :isMember="isMember"
+                            @refresh="handleRefresh"
+                        />
+                        <group-nav-tabs
+                            :group="group"
+                            :isAdmin="isAdmin"
+                            :isMember="isMember"
+                            :atabs="atabs"
+                        />
+                    </div>
+                </div>
+
+                <div v-if="!initialLoad">
+                    <p class="text-center mt-5 pt-5 font-weight-bold">Loading...</p>
+                </div>
+
+                <template v-else>
+                    <div class="container-xl group-feed-component-body">
+                        <template v-if="initialLoad && group.self.is_member">
+                            <group-media :key="renderIdx" :group="group" :profile="profile" />
+                        </template>
+
+                        <member-only-warning v-else />
+                    </div>
+                </template>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script type="text/javascript">
+    import StatusCard from '~/partials/StatusCard.vue';
+    import GroupMembers from '@/groups/partials/GroupMembers.vue';
+    import GroupCompose from '@/groups/partials/GroupCompose.vue';
+    import GroupStatus from '@/groups/partials/GroupStatus.vue';
+    import GroupAbout from '@/groups/partials/GroupAbout.vue';
+    import GroupMedia from '@/groups/partials/GroupMedia.vue';
+    import GroupModeration from '@/groups/partials/GroupModeration.vue';
+    import GroupTopics from '@/groups/partials/GroupTopics.vue';
+    import GroupInfoCard from '@/groups/partials/GroupInfoCard.vue';
+    import LeaveGroup from '@/groups/partials/LeaveGroup.vue';
+    import GroupInsights from '@/groups/partials/GroupInsights.vue';
+    import SearchModal from '@/groups/partials/GroupSearchModal.vue';
+    import InviteModal from '@/groups/partials/GroupInviteModal.vue';
+    import SidebarComponent from '@/groups/sections/Sidebar.vue';
+    import GroupBanner from '@/groups/partials/Page/GroupBanner.vue';
+    import GroupHeaderDetails from '@/groups/partials/Page/GroupHeaderDetails.vue';
+    import GroupNavTabs from '@/groups/partials/Page/GroupNavTabs.vue';
+    import MemberOnlyWarning from '@/groups/partials/Membership/MemberOnlyWarning.vue';
+
+    export default {
+        props: {
+            groupId: {
+                type: String
+            },
+
+            path: {
+                type: String
+            }
+        },
+
+        components: {
+            'status-card': StatusCard,
+            'group-about': GroupAbout,
+            'group-status': GroupStatus,
+            'group-members': GroupMembers,
+            'group-compose': GroupCompose,
+            'group-topics': GroupTopics,
+            'group-info-card': GroupInfoCard,
+            'group-media': GroupMedia,
+            'group-moderation': GroupModeration,
+            'leave-group': LeaveGroup,
+            'group-insights': GroupInsights,
+            'search-modal': SearchModal,
+            'invite-modal': InviteModal,
+            'sidebar': SidebarComponent,
+            'group-banner': GroupBanner,
+            'group-header-details': GroupHeaderDetails,
+            'group-nav-tabs': GroupNavTabs,
+            'member-only-warning': MemberOnlyWarning
+        },
+
+        data() {
+            return {
+                initialLoad: false,
+                profile: undefined,
+                group: {},
+                isMember: false,
+                isAdmin: false,
+                renderIdx: 1,
+                atabs: {
+                    moderation_count: 0,
+                    request_count: 0
+                }
+            };
+        },
+
+        created() {
+            this.init();
+        },
+
+        methods: {
+            init() {
+                this.initialLoad = false;
+                axios.get('/api/pixelfed/v1/accounts/verify_credentials')
+                .then(res => {
+                    this.profile = res.data;
+                    this.fetchGroup();
+                })
+                .catch(err => {
+                    window.location.href = '/login?_next=' + encodeURIComponent(window.location.href);
+                });
+            },
+
+            handleRefresh() {
+                this.initialLoad = false;
+                this.init();
+                this.renderIdx++;
+            },
+
+            fetchGroup() {
+                axios.get('/api/v0/groups/' + this.groupId)
+                .then(res => {
+                    this.group = res.data;
+                    this.isMember = res.data.self.is_member;
+                    this.isAdmin = ['founder', 'admin'].includes(res.data.self.role);
+
+                    if(this.isAdmin) {
+                        this.fetchAdminTabs();
+                    }
+
+                    this.initialLoad = true;
+                })
+                .catch(err => {
+                    //window.location.href = '/groups/unavailable';
+                    alert('error');
+                });
+            },
+
+            fetchAdminTabs() {
+                axios.get('/api/v0/groups/' + this.groupId + '/atabs')
+                .then(res => {
+                    this.atabs = res.data;
+                })
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+    .group-feed-component {
+        &-body {
+            min-height: 40vh;
+        }
+    }
+</style>
diff --git a/resources/assets/components/groups/Page/GroupMembers.vue b/resources/assets/components/groups/Page/GroupMembers.vue
new file mode 100644
index 000000000..5b866fc17
--- /dev/null
+++ b/resources/assets/components/groups/Page/GroupMembers.vue
@@ -0,0 +1,168 @@
+<template>
+    <div class="group-feed-component">
+        <div class="row border-bottom m-0 p-0">
+            <sidebar />
+
+            <div class="col-12 col-md-9 px-md-0">
+                <div class="bg-white mb-3 border-bottom">
+                    <div>
+                        <group-banner :group="group" />
+                        <group-header-details
+                            :group="group"
+                            :isAdmin="isAdmin"
+                            :isMember="isMember"
+                            @refresh="handleRefresh"
+                        />
+                        <group-nav-tabs
+                            :group="group"
+                            :isAdmin="isAdmin"
+                            :isMember="isMember"
+                            :atabs="atabs"
+                        />
+                    </div>
+                </div>
+
+                <div v-if="!initialLoad">
+                    <p class="text-center mt-5 pt-5 font-weight-bold">Loading...</p>
+                </div>
+
+                <template v-else>
+                    <div class="container-xl group-feed-component-body">
+                        <template v-if="initialLoad && group.self.is_member">
+                            <group-members :key="renderIdx" :group="group" :profile="profile" />
+                        </template>
+
+                        <member-only-warning v-else />
+                    </div>
+                </template>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script type="text/javascript">
+    import StatusCard from '~/partials/StatusCard.vue';
+    import GroupMembers from '@/groups/partials/GroupMembers.vue';
+    import GroupCompose from '@/groups/partials/GroupCompose.vue';
+    import GroupStatus from '@/groups/partials/GroupStatus.vue';
+    import GroupAbout from '@/groups/partials/GroupAbout.vue';
+    import GroupMedia from '@/groups/partials/GroupMedia.vue';
+    import GroupModeration from '@/groups/partials/GroupModeration.vue';
+    import GroupTopics from '@/groups/partials/GroupTopics.vue';
+    import GroupInfoCard from '@/groups/partials/GroupInfoCard.vue';
+    import LeaveGroup from '@/groups/partials/LeaveGroup.vue';
+    import GroupInsights from '@/groups/partials/GroupInsights.vue';
+    import SearchModal from '@/groups/partials/GroupSearchModal.vue';
+    import InviteModal from '@/groups/partials/GroupInviteModal.vue';
+    import SidebarComponent from '@/groups/sections/Sidebar.vue';
+    import GroupBanner from '@/groups/partials/Page/GroupBanner.vue';
+    import GroupHeaderDetails from '@/groups/partials/Page/GroupHeaderDetails.vue';
+    import GroupNavTabs from '@/groups/partials/Page/GroupNavTabs.vue';
+    import MemberOnlyWarning from '@/groups/partials/Membership/MemberOnlyWarning.vue';
+
+    export default {
+        props: {
+            groupId: {
+                type: String
+            },
+
+            path: {
+                type: String
+            }
+        },
+
+        components: {
+            'status-card': StatusCard,
+            'group-about': GroupAbout,
+            'group-status': GroupStatus,
+            'group-members': GroupMembers,
+            'group-compose': GroupCompose,
+            'group-topics': GroupTopics,
+            'group-info-card': GroupInfoCard,
+            'group-media': GroupMedia,
+            'group-moderation': GroupModeration,
+            'leave-group': LeaveGroup,
+            'group-insights': GroupInsights,
+            'search-modal': SearchModal,
+            'invite-modal': InviteModal,
+            'sidebar': SidebarComponent,
+            'group-banner': GroupBanner,
+            'group-header-details': GroupHeaderDetails,
+            'group-nav-tabs': GroupNavTabs,
+            'member-only-warning': MemberOnlyWarning
+        },
+
+        data() {
+            return {
+                initialLoad: false,
+                profile: undefined,
+                group: {},
+                isMember: false,
+                isAdmin: false,
+                renderIdx: 1,
+                atabs: {
+                    moderation_count: 0,
+                    request_count: 0
+                }
+            };
+        },
+
+        created() {
+            this.init();
+        },
+
+        methods: {
+            init() {
+                this.initialLoad = false;
+                axios.get('/api/pixelfed/v1/accounts/verify_credentials')
+                .then(res => {
+                    this.profile = res.data;
+                    this.fetchGroup();
+                })
+                .catch(err => {
+                    window.location.href = '/login?_next=' + encodeURIComponent(window.location.href);
+                });
+            },
+
+            handleRefresh() {
+                this.initialLoad = false;
+                this.init();
+                this.renderIdx++;
+            },
+
+            fetchGroup() {
+                axios.get('/api/v0/groups/' + this.groupId)
+                .then(res => {
+                    this.group = res.data;
+                    this.isMember = res.data.self.is_member;
+                    this.isAdmin = ['founder', 'admin'].includes(res.data.self.role);
+
+                    if(this.isAdmin) {
+                        this.fetchAdminTabs();
+                    }
+
+                    this.initialLoad = true;
+                })
+                .catch(err => {
+                    //window.location.href = '/groups/unavailable';
+                    alert('error');
+                });
+            },
+
+            fetchAdminTabs() {
+                axios.get('/api/v0/groups/' + this.groupId + '/atabs')
+                .then(res => {
+                    this.atabs = res.data;
+                })
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+    .group-feed-component {
+        &-body {
+            min-height: 40vh;
+        }
+    }
+</style>
diff --git a/resources/assets/components/groups/Page/GroupTopics.vue b/resources/assets/components/groups/Page/GroupTopics.vue
new file mode 100644
index 000000000..60f0fa496
--- /dev/null
+++ b/resources/assets/components/groups/Page/GroupTopics.vue
@@ -0,0 +1,168 @@
+<template>
+    <div class="group-feed-component">
+        <div class="row border-bottom m-0 p-0">
+            <sidebar />
+
+            <div class="col-12 col-md-9 px-md-0">
+                <div class="bg-white mb-3 border-bottom">
+                    <div>
+                        <group-banner :group="group" />
+                        <group-header-details
+                            :group="group"
+                            :isAdmin="isAdmin"
+                            :isMember="isMember"
+                            @refresh="handleRefresh"
+                        />
+                        <group-nav-tabs
+                            :group="group"
+                            :isAdmin="isAdmin"
+                            :isMember="isMember"
+                            :atabs="atabs"
+                        />
+                    </div>
+                </div>
+
+                <div v-if="!initialLoad">
+                    <p class="text-center mt-5 pt-5 font-weight-bold">Loading...</p>
+                </div>
+
+                <template v-else>
+                    <div class="container-xl group-feed-component-body">
+                        <template v-if="initialLoad && group.self.is_member">
+                            <group-topics :key="renderIdx" :group="group" :profile="profile" />
+                        </template>
+
+                        <member-only-warning v-else />
+                    </div>
+                </template>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script type="text/javascript">
+    import StatusCard from '~/partials/StatusCard.vue';
+    import GroupMembers from '@/groups/partials/GroupMembers.vue';
+    import GroupCompose from '@/groups/partials/GroupCompose.vue';
+    import GroupStatus from '@/groups/partials/GroupStatus.vue';
+    import GroupAbout from '@/groups/partials/GroupAbout.vue';
+    import GroupMedia from '@/groups/partials/GroupMedia.vue';
+    import GroupModeration from '@/groups/partials/GroupModeration.vue';
+    import GroupTopics from '@/groups/partials/GroupTopics.vue';
+    import GroupInfoCard from '@/groups/partials/GroupInfoCard.vue';
+    import LeaveGroup from '@/groups/partials/LeaveGroup.vue';
+    import GroupInsights from '@/groups/partials/GroupInsights.vue';
+    import SearchModal from '@/groups/partials/GroupSearchModal.vue';
+    import InviteModal from '@/groups/partials/GroupInviteModal.vue';
+    import SidebarComponent from '@/groups/sections/Sidebar.vue';
+    import GroupBanner from '@/groups/partials/Page/GroupBanner.vue';
+    import GroupHeaderDetails from '@/groups/partials/Page/GroupHeaderDetails.vue';
+    import GroupNavTabs from '@/groups/partials/Page/GroupNavTabs.vue';
+    import MemberOnlyWarning from '@/groups/partials/Membership/MemberOnlyWarning.vue';
+
+    export default {
+        props: {
+            groupId: {
+                type: String
+            },
+
+            path: {
+                type: String
+            }
+        },
+
+        components: {
+            'status-card': StatusCard,
+            'group-about': GroupAbout,
+            'group-status': GroupStatus,
+            'group-members': GroupMembers,
+            'group-compose': GroupCompose,
+            'group-topics': GroupTopics,
+            'group-info-card': GroupInfoCard,
+            'group-media': GroupMedia,
+            'group-moderation': GroupModeration,
+            'leave-group': LeaveGroup,
+            'group-insights': GroupInsights,
+            'search-modal': SearchModal,
+            'invite-modal': InviteModal,
+            'sidebar': SidebarComponent,
+            'group-banner': GroupBanner,
+            'group-header-details': GroupHeaderDetails,
+            'group-nav-tabs': GroupNavTabs,
+            'member-only-warning': MemberOnlyWarning
+        },
+
+        data() {
+            return {
+                initialLoad: false,
+                profile: undefined,
+                group: {},
+                isMember: false,
+                isAdmin: false,
+                renderIdx: 1,
+                atabs: {
+                    moderation_count: 0,
+                    request_count: 0
+                }
+            };
+        },
+
+        created() {
+            this.init();
+        },
+
+        methods: {
+            init() {
+                this.initialLoad = false;
+                axios.get('/api/pixelfed/v1/accounts/verify_credentials')
+                .then(res => {
+                    this.profile = res.data;
+                    this.fetchGroup();
+                })
+                .catch(err => {
+                    window.location.href = '/login?_next=' + encodeURIComponent(window.location.href);
+                });
+            },
+
+            handleRefresh() {
+                this.initialLoad = false;
+                this.init();
+                this.renderIdx++;
+            },
+
+            fetchGroup() {
+                axios.get('/api/v0/groups/' + this.groupId)
+                .then(res => {
+                    this.group = res.data;
+                    this.isMember = res.data.self.is_member;
+                    this.isAdmin = ['founder', 'admin'].includes(res.data.self.role);
+
+                    if(this.isAdmin) {
+                        this.fetchAdminTabs();
+                    }
+
+                    this.initialLoad = true;
+                })
+                .catch(err => {
+                    //window.location.href = '/groups/unavailable';
+                    alert('error');
+                });
+            },
+
+            fetchAdminTabs() {
+                axios.get('/api/v0/groups/' + this.groupId + '/atabs')
+                .then(res => {
+                    this.atabs = res.data;
+                })
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+    .group-feed-component {
+        &-body {
+            min-height: 40vh;
+        }
+    }
+</style>
diff --git a/resources/assets/components/groups/partials/CommentDrawer.vue b/resources/assets/components/groups/partials/CommentDrawer.vue
new file mode 100644
index 000000000..e7df4a6eb
--- /dev/null
+++ b/resources/assets/components/groups/partials/CommentDrawer.vue
@@ -0,0 +1,845 @@
+<template>
+	<div class="comment-drawer-component">
+		<input type="file" ref="fileInput" class="d-none" accept="image/jpeg,image/png" @change="handleImageUpload">
+		<div v-if="hide"></div>
+		<div v-else-if="!isLoaded" class="border-top d-flex justify-content-center py-3">
+			<div class="text-center">
+				<div
+					class="spinner-border text-lighter"
+					role="status">
+					<span class="sr-only">Loading...</span>
+				</div>
+				<p class="text-muted">Loading Comments ...</p>
+			</div>
+		</div>
+		<div v-else class="border-top">
+			<!-- <div v-if="profile && canReply" class="my-3">
+				<div class="d-flex align-items-top reply-form">
+					<img class="rounded-circle mr-2 border" :src="avatar" width="38" height="38">
+					<div v-if="isUploading" class="w-100">
+						<p class="font-weight-light mb-1">Uploading image ...</p>
+						<div class="progress rounded-pill" style="height:4px">
+							<div class="progress-bar" role="progressbar" :aria-valuenow="uploadProgress" aria-valuemin="0" aria-valuemax="100" :style="{ width: uploadProgress + '%'}"></div>
+						</div>
+					</div>
+					<div v-else class="reply-form-input">
+						<input
+							class="form-control bg-light border-lighter rounded-pill"
+							placeholder="Write a comment...."
+							v-model="replyContent"
+							v-on:keyup.enter="storeComment">
+
+						<div class="reply-form-input-actions">
+							<button
+								class="btn btn-link text-muted px-1 mr-2"
+								@click="uploadImage">
+								<i class="far fa-image fa-lg"></i>
+							</button>
+							<button class="btn btn-link text-muted px-1 small font-weight-bold border py-0 rounded-pill text-decoration-none">
+								GIF
+							</button>
+						</div>
+					</div>
+				</div>
+			</div> -->
+			<div class="my-3">
+				<div
+					v-for="(status, index) in feed"
+					:key="'cdf' + index + status.id"
+					class="media media-status align-items-top">
+
+					<a
+						v-if="replyChildId == status.id"
+						href="#comment-1"
+						class="comment-border-link"
+						@click.prevent="replyToChild(status)">
+						<span class="sr-only">Jump to comment-{{ index }}</span>
+					</a>
+
+					<a :href="status.account.url">
+						<img class="rounded-circle media-avatar border" :src="status.account.avatar" width="32" height="32" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'" />
+					</a>
+
+					<div class="media-body">
+						<div v-if="!status.media_attachments.length" class="media-body-comment">
+							<p class="media-body-comment-username">
+								<a :href="status.account.url">
+									{{status.account.acct}}
+								</a>
+							</p>
+							<read-more :status="status" />
+						</div>
+						<div v-else>
+							<p class="media-body-comment-username">
+								<a :href="status.account.url">
+									{{status.account.acct}}
+								</a>
+							</p>
+							<div class="bh-comment" @click="lightbox(status)">
+								<blur-hash-image
+									:width="blurhashWidth(status)"
+									:height="blurhashHeight(status)"
+									:punch="1"
+									class="img-fluid rounded-lg border shadow"
+									:hash="status.media_attachments[0].blurhash"
+									:src="getMediaSource(status)" />
+							</div>
+						</div>
+						<p class="media-body-reactions">
+							<a
+								v-if="profile"
+								href="#"
+								class="font-weight-bold"
+								:class="[ status.favourited ? 'text-primary' : 'text-muted' ]"
+								@click.prevent="likeComment(status, index, $event)">
+									{{ status.favourited ? 'Liked' : 'Like' }}
+								</a>
+							<span class="mx-1">·</span>
+							<a href="#" class="text-muted font-weight-bold" @click.prevent="replyToChild(status, index)">Reply</a>
+							<span v-if="profile" class="mx-1">·</span>
+							<a
+								class="font-weight-bold text-muted"
+								:href="status.url"
+								v-once>
+								{{ shortTimestamp(status.created_at) }}
+							</a>
+							<span v-if="profile && status.account.id === profile.id">
+								<span class="mx-1">·</span>
+								<a
+									class="font-weight-bold text-lighter"
+									href="#"
+									@click.prevent="deleteComment(index)">
+										Delete
+									</a>
+							</span>
+						</p>
+
+						<!-- <div v-if="replyChildId == status.id && status.reply_count" class="media media-status align-items-top mt-3">
+							<div class="comment-border-arrow"></div>
+							<a href="https://pixelfed.test/groups/328821658771132416/user/321493203255693312"><img src="https://pixelfed.test/storage/avatars/321493203255693312/5a6nqo.jpg?v=2" width="32" height="32" class="rounded-circle media-avatar border"></a>
+							<div class="media-body"><div class="media-body-comment"><p class="media-body-comment-username"><a href="https://pixelfed.test/groups/328821658771132416/user/321493203255693312">
+								dansup
+							</a></p> <div class="read-more-component" style="word-break: break-all;"><div>test</div></div></div> <p class="media-body-reactions"><a href="#" class="font-weight-bold text-muted">
+								Like
+							</a> <span class="mx-1">·</span> <a href="https://pixelfed.test/groups/328821658771132416/p/358529382599041029" class="font-weight-bold text-muted">
+							1h
+						</a> <span><span class="mx-1">·</span> <a href="#" class="font-weight-bold text-lighter">
+									Delete
+								</a></span></p>
+							</div>
+						</div> -->
+
+						<div v-if="replyChildIndex == index && status.hasOwnProperty('children') && status.children.hasOwnProperty('feed') && status.children.feed.length">
+							<comment-post
+								v-for="(s, index) in status.children.feed"
+								:status="s"
+								:profile="profile"
+								:commentBorderArrow="true"
+								:key="'scp_'+index+'_'+s.id"
+								/>
+						</div>
+
+						<a
+							v-if="replyChildIndex == index &&
+								status.hasOwnProperty('children') &&
+								status.children.hasOwnProperty('can_load_more') &&
+								status.children.can_load_more == true"
+							class="text-muted font-weight-bold mt-1 mb-0"
+							style="font-size: 13px;"
+							href="#"
+							:disabled="loadingChildComments"
+							@click.prevent="loadMoreChildComments(status, index)">
+							<div class="comment-border-arrow"></div>
+							<i class="far fa-long-arrow-right mr-1"></i>
+							{{ loadingChildComments ? 'Loading' : 'Load' }} more comments
+						</a>
+
+						<a
+							v-else-if="replyChildIndex !== index &&
+								status.hasOwnProperty('children') &&
+								status.children.hasOwnProperty('can_load_more') &&
+								status.children.can_load_more == true &&
+								status.reply_count > 0 &&
+								!loadingChildComments"
+							class="text-muted font-weight-bold mt-1 mb-0"
+							style="font-size: 13px;"
+							href="#"
+							:disabled="loadingChildComments"
+							@click.prevent="replyToChild(status, index)">
+							<i class="far fa-long-arrow-right mr-1"></i>
+							{{ loadingChildComments ? 'Loading' : 'Load' }} more comments
+						</a>
+
+						<div v-if="replyChildId == status.id" class="mt-3 mb-3 d-flex align-items-top reply-form child-reply-form">
+							<div class="comment-border-arrow"></div>
+							<img class="rounded-circle mr-2 border" :src="avatar" width="38" height="38" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'">
+							<div v-if="isUploading" class="w-100">
+								<p class="font-weight-light mb-1">Uploading image ...</p>
+								<div class="progress rounded-pill" style="height:10px">
+									<div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" :aria-valuenow="uploadProgress" aria-valuemin="0" aria-valuemax="100" :style="{ width: uploadProgress + '%'}"></div>
+								</div>
+							</div>
+							<div v-else class="reply-form-input">
+								<input
+									class="form-control bg-light border-lighter rounded-pill"
+									placeholder="Write a comment...."
+									v-model="childReplyContent"
+									:disabled="postingChildComment"
+									v-on:keyup.enter="storeChildComment(index)">
+
+								<!-- <div class="reply-form-input-actions">
+									<button
+										class="btn btn-link text-muted px-1 mr-2"
+										@click="uploadImage">
+										<i class="far fa-image fa-lg"></i>
+									</button>
+									<button class="btn btn-link text-muted px-1 small font-weight-bold border py-0 rounded-pill text-decoration-none">
+										GIF
+									</button>
+								</div> -->
+							</div>
+						</div>
+					</div>
+
+				</div>
+				<!-- <a v-if="permalinkMode && canLoadMore" class="text-muted mb-n1" style="font-size: 13px;font-weight: 600;" href="#">Load more comments ...</a> -->
+			</div>
+			<button
+				v-if="canLoadMore"
+				class="btn btn-link btn-sm text-muted mb-2"
+				@click="loadMoreComments"
+				:disabled="isLoadingMore">
+
+				<span v-if="!isLoadingMore">
+					Load more comments ...
+				</span>
+				<div
+					v-else
+					class="spinner-border spinner-border-sm text-muted"
+					role="status">
+					<span class="sr-only">Loading...</span>
+				</div>
+			</button>
+
+			<div v-if="profile && canReply" class="mt-3 mb-n3">
+				<div class="d-flex align-items-top reply-form cdrawer-reply-form">
+					<img class="rounded-circle mr-2 border" :src="avatar" width="38" height="38" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'">
+					<div v-if="isUploading" class="w-100">
+						<p class="font-weight-light small text-muted mb-1">Uploading image ...</p>
+						<div class="progress rounded-pill" style="height:10px">
+							<div class="progress-bar progress-bar-striped progress-bar-animated" role="progressbar" :aria-valuenow="uploadProgress" aria-valuemin="0" aria-valuemax="100" :style="{ width: uploadProgress + '%'}"></div>
+						</div>
+					</div>
+					<div v-else class="w-100">
+                        <div class="reply-form-input">
+                            <textarea
+                                class="form-control bg-light border-lighter"
+                                placeholder="Write a comment...."
+                                :rows="replyContent && replyContent.length > 40 ? 4 : 1"
+                                v-model="replyContent"></textarea>
+
+    						<div class="reply-form-input-actions">
+    							<button
+    								class="btn btn-link text-muted px-1 mr-2"
+    								@click="uploadImage">
+    								<i class="far fa-image fa-lg"></i>
+    							</button>
+    							<!-- <button class="btn btn-link text-muted px-1 small font-weight-bold border py-0 rounded-pill text-decoration-none">
+    								GIF
+    							</button> -->
+    						</div>
+                        </div>
+                        <div class="d-flex justify-content-between reply-form-menu">
+                            <div class="char-counter">
+                                <span>{{ replyContent?.length ?? 0 }}</span>
+                                <span>/</span>
+                                <span>500</span>
+                            </div>
+
+                        </div>
+					</div>
+                    <button
+                        class="btn btn-link btn-sm font-weight-bold align-self-center ml-3 mb-3"
+                        @click="storeComment">Post</button>
+				</div>
+			</div>
+		</div>
+
+		<b-modal ref="lightboxModal"
+			id="lightbox"
+			:hide-header="true"
+			:hide-footer="true"
+			centered
+			size="lg"
+			body-class="p-0"
+			content-class="bg-transparent border-0"
+			>
+			<div v-if="lightboxStatus" @click="hideLightbox">
+				<img :src="lightboxStatus.url" style="width: 100%;max-height: 90vh;object-fit: contain;">
+			</div>
+		</b-modal>
+	</div>
+</template>
+
+<script type="text/javascript">
+	import ReadMore from './ReadMore.vue';
+	import CommentPost from './CommentPost.vue';
+
+	export default {
+		props: {
+			groupId: {
+				type: String
+			},
+
+			profile: {
+				type: Object
+			},
+
+			status: {
+				type: Object
+			},
+
+			show: {
+				type: Boolean,
+				default: false
+			},
+
+			permalinkMode: {
+				type: Boolean,
+				default: false
+			},
+
+			permalinkStatus: {
+				type: Object
+			},
+
+			canReply: {
+				type: Boolean,
+				default: true
+			}
+		},
+
+		components: {
+			"read-more": ReadMore,
+			"comment-post": CommentPost
+		},
+
+		data() {
+			return {
+				isLoaded: false,
+				hide: false,
+				feed: [],
+				canLoadMore: false,
+				isLoadingMore: false,
+				replyContent: null,
+				maxReplyId: null,
+				readMoreCursor: 200,
+				avatar: '/storage/avatars/default.png',
+				isUploading: false,
+				uploadProgress: 0,
+				lightboxStatus: null,
+				replyChildId: undefined,
+				replyChildIndex: undefined,
+				childReplyContent: null,
+				postingChildComment: false,
+				loadingChildComments: false,
+				replyChildMinId: undefined,
+                replyCursorId: null
+			}
+		},
+
+		mounted() {
+			if(this.permalinkMode && this.permalinkStatus) {
+				let status = this.permalinkStatus;
+				if(status.reply_count) {
+					status.children = {
+						feed: [],
+						can_load_more: true
+					}
+				}
+				this.feed.push(status);
+				this.isLoaded = true;
+				this.canLoadMore = false;
+			} else {
+				this.fetchComments();
+			}
+
+			if(this.profile && this.profile.hasOwnProperty('avatar')) {
+				this.avatar = this.profile.avatar;
+			}
+		},
+
+		methods: {
+			fetchComments() {
+				axios.get('/api/v0/groups/comments', {
+					params: {
+						gid: this.groupId,
+						sid: this.status.id,
+						limit: 3
+					}
+				}).then(res => {
+					let data = res.data.map(function(c) {
+						if(c.reply_count && c.reply_count > 0) {
+							c.children = {
+								feed: [],
+								can_load_more: true
+							}
+						}
+						return c;
+					})
+					this.feed = data;
+					this.isLoaded = true;
+					this.maxReplyId = res.data[(res.data.length - 1)].id;
+					if(this.feed.length == 3) {
+						this.canLoadMore = true;
+					} else {
+					}
+				}).catch(err => {
+					this.isLoaded = true;
+				})
+			},
+
+			loadMoreComments() {
+				this.isLoadingMore = true;
+
+				axios.get('/api/v0/groups/comments', {
+					params: {
+						gid: this.groupId,
+						sid: this.status.id,
+						limit: 3,
+						max_id: this.maxReplyId
+					}
+				}).then(res => {
+					if(res.data[res.data.length - 1].id == this.maxReplyId) {
+						this.isLoadingMore = false;
+						this.canLoadMore = false;
+						return;
+					}
+					this.feed.push(...res.data);
+                    setTimeout(() => {
+					   this.isLoadingMore = false;
+                    }, 500);
+					this.maxReplyId = res.data[res.data.length - 1].id;
+					if(res.data.length > 0) {
+						this.canLoadMore = true;
+					} else {
+						this.canLoadMore = false;
+					}
+				}).catch(err => {
+					this.isLoadingMore = false;
+					this.canLoadMore = false;
+				})
+			},
+
+			storeComment($event) {
+                $event.currentTarget?.blur();
+				axios.post('/api/v0/groups/comment', {
+					gid: this.groupId,
+					sid: this.status.id,
+					content: this.replyContent
+				})
+				.then(res => {
+					this.replyContent = null;
+					this.feed.unshift(res.data);
+				}).catch(err => {
+					if(err.response.status == 422) {
+						this.isUploading = false;
+						this.uploadProgress = 0;
+						swal('Oops!', err.response.data.error, 'error');
+					} else {
+						this.isUploading = false;
+						this.uploadProgress = 0;
+						swal('Oops!', 'An error occured while processing your request, please try again later', 'error');
+					}
+				})
+			},
+
+			shortTimestamp(ts) {
+				return window.App.util.format.timeAgo(ts);
+			},
+
+			readMore() {
+				this.readMoreCursor = this.readMoreCursor + 200;
+			},
+
+			likeComment(status, index, $event) {
+				$event.target.blur();
+				let l = status.favourited ? false : true;
+				this.feed[index].favourited = l;
+				status.favourited = l;
+				axios.post(`/api/v0/groups/comment/${l ? 'like' : 'unlike'}`, {
+					sid: status.id,
+					gid: this.groupId
+				});
+			},
+
+			deleteComment(index) {
+				if(window.confirm('Are you sure you want to delete this post?') == false) {
+					return;
+				}
+
+				axios.post('/api/v0/groups/comment/delete', {
+					gid: this.groupId,
+					id: this.feed[index].id
+				}).then(res => {
+					this.feed.splice(index, 1);
+				}).catch(err => {
+					console.log(err.response);
+					swal('Error', 'Something went wrong. Please try again later.', 'error');
+				});
+			},
+
+			uploadImage() {
+				this.$refs.fileInput.click();
+			},
+
+			handleImageUpload() {
+				if(!this.$refs.fileInput.files.length) {
+					return;
+				}
+				this.isUploading = true;
+				let self = this;
+				let data = new FormData();
+				data.append('gid', this.groupId);
+				data.append('sid', this.status.id);
+				data.append('photo', this.$refs.fileInput.files[0]);
+
+				axios.post('/api/v0/groups/comment/photo', data, {
+					onUploadProgress: function(progressEvent) {
+						self.uploadProgress = Math.floor(progressEvent.loaded / progressEvent.total * 100);
+					}
+				})
+				.then(res => {
+					this.isUploading = false;
+					this.uploadProgress = 0;
+					this.feed.unshift(res.data);
+				}).catch(err => {
+					if(err.response.status == 422) {
+						this.isUploading = false;
+						this.uploadProgress = 0;
+						swal('Oops!', err.response.data.error, 'error');
+					} else {
+						this.isUploading = false;
+						this.uploadProgress = 0;
+						swal('Oops!', 'An error occured while processing your request, please try again later', 'error');
+					}
+				});
+			},
+
+			lightbox(status) {
+				this.lightboxStatus = status.media_attachments[0];
+				this.$refs.lightboxModal.show();
+			},
+
+			hideLightbox() {
+				this.lightboxStatus = null;
+				this.$refs.lightboxModal.hide();
+			},
+
+			blurhashWidth(status) {
+				if(!status.media_attachments[0].meta) {
+					return 25;
+				}
+				let aspect = status.media_attachments[0].meta.original.aspect;
+				if(aspect == 1) {
+					return 25;
+				} else if(aspect > 1) {
+					return 30;
+				} else {
+					return 20;
+				}
+			},
+
+			blurhashHeight(status) {
+				if(!status.media_attachments[0].meta) {
+					return 25;
+				}
+				let aspect = status.media_attachments[0].meta.original.aspect;
+				if(aspect == 1) {
+					return 25;
+				} else if(aspect > 1) {
+					return 20;
+				} else {
+					return 30;
+				}
+			},
+
+			getMediaSource(status) {
+				let media = status.media_attachments[0];
+
+				if(media.preview_url.endsWith('storage/no-preview.png')) {
+					return media.url;
+				}
+
+				return media.preview_url;
+			},
+
+			replyToChild(status, index) {
+
+				if(this.replyChildId == status.id) {
+					this.replyChildId = null;
+					this.replyChildIndex = null;
+					return;
+				} else {
+					this.childReplyContent = null;
+				}
+
+				this.replyChildId = status.id;
+                this.replyCursorId = status.id
+				this.replyChildIndex = index;
+
+				if(!status.hasOwnProperty('replies_loaded') || !status.replies_loaded) {
+					this.$nextTick(() => {
+						this.fetchChildReplies(status, index);
+					});
+				} else {
+                    this.$nextTick(() => {
+                        this.fetchChildReplies(status, index);
+                    });
+				}
+			},
+
+			fetchChildReplies(status, index) {
+				axios.get('/api/v0/groups/comments', {
+					params: {
+						gid: this.groupId,
+						sid: status.id,
+						cid: this.replyCursorId,
+						limit: 3
+					}
+				}).then(res => {
+					if(this.feed[index].hasOwnProperty('children')) {
+						this.feed[index].children.feed.push(res.data);
+						this.feed[index].children.can_load_more = res.data.length == 3;
+					} else {
+						this.feed[index].children = {
+							feed: res.data,
+							can_load_more: res.data.length == 3
+						}
+					}
+					this.replyChildMinId = res.data[res.data.length - 1].id;
+					this.$nextTick(() => {
+						this.feed[index].replies_loaded = true;
+					});
+				}).catch(err => {
+					this.feed[index].children.can_load_more = false;
+				})
+			},
+
+			storeChildComment(index) {
+				this.postingChildComment = true;
+
+				axios.post('/api/v0/groups/comment', {
+					gid: this.groupId,
+					sid: this.status.id,
+					cid: this.replyChildId,
+					content: this.childReplyContent
+				})
+				.then(res => {
+					this.childReplyContent = null;
+					this.postingChildComment = false;
+					this.feed[index].children.feed.push(res.data);
+					// this.feed.unshift(res.data);
+				}).catch(err => {
+					if(err.response.status == 422) {
+						// this.isUploading = false;
+						// this.uploadProgress = 0;
+						swal('Oops!', err.response.data.error, 'error');
+					} else {
+						// this.isUploading = false;
+						// this.uploadProgress = 0;
+						swal('Oops!', 'An error occured while processing your request, please try again later', 'error');
+					}
+				});
+			},
+
+			loadMoreChildComments(status, index) {
+				this.loadingChildComments = true;
+
+				axios.get('/api/v0/groups/comments', {
+					params: {
+						gid: this.groupId,
+						sid: status.id,
+						max_id: this.replyChildMinId,
+						cid: 1,
+						limit: 3
+					}
+				}).then(res => {
+					if(this.feed[index].hasOwnProperty('children')) {
+						this.feed[index].children.feed.push(...res.data);
+						this.feed[index].children.can_load_more = res.data.length == 3;
+					} else {
+						this.feed[index].children = {
+							feed: res.data,
+							can_load_more: res.data.length == 3
+						}
+					}
+					this.replyChildMinId = res.data[res.data.length - 1].id;
+					this.feed[index].replies_loaded = true;
+					this.loadingChildComments = false;
+				}).catch(err => {
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.comment-drawer-component {
+		.media {
+			position: relative;
+
+			.comment-border-link {
+				display: block;
+				position: absolute;
+				top: 40px;
+				left: 11px;
+				width: 10px;
+				height: calc(100% - 100px);
+				border-left: 4px solid transparent;
+				border-right: 4px solid transparent;
+				background-color: #E5E7EB;
+				background-clip: padding-box;
+
+				&:hover {
+					background-color: #BFDBFE;
+				}
+			}
+
+			.child-reply-form {
+				position: relative;
+			}
+
+			.comment-border-arrow {
+				display: block;
+				position: absolute;
+				top: -6px;
+				left: -33px;
+				width: 10px;
+				height: 29px;
+				border-left: 4px solid transparent;
+				border-right: 4px solid transparent;
+				background-color: #E5E7EB;
+				background-clip: padding-box;
+				border-bottom: 2px solid transparent;
+
+				&:after {
+					content: '';
+					display: block;
+					position: absolute;
+					top: 25px;
+					left: 2px;
+					width: 15px;
+					height: 2px;
+					background-color: #E5E7EB;
+				}
+			}
+
+			&-status {
+				margin-bottom: 1.3rem;
+			}
+
+			&-avatar {
+				margin-right: 12px;
+			}
+
+			&-body {
+				&-comment {
+					width: fit-content;
+					padding: 0.4rem 0.7rem;
+					background-color: var(--comment-bg);
+					border-radius: 0.9rem;
+
+					&-username {
+						margin-bottom: 0.25rem !important;
+						font-size: 14px;
+						font-weight: 700 !important;
+						color: #000;
+
+						a {
+							color: #000;
+							text-decoration: none;
+						}
+					}
+
+					&-content {
+						margin-bottom: 0;
+						font-size: 16px;
+					}
+				}
+
+				&-reactions {
+					margin-top: 0.25rem !important;
+					margin-bottom: 0 !important;
+					color: #B8C2CC !important;
+					font-size: 12px;
+				}
+			}
+		}
+
+		.load-more-comments {
+			font-weight: 500;
+		}
+
+		.reply-form {
+			margin-bottom: 2rem;
+
+			&-input {
+				flex: 1;
+				position: relative;
+
+                textarea {
+                    border-radius: 10px;
+                }
+
+                .form-control {
+                    resize: none;
+                    padding-right: 100px;
+                }
+
+				&-actions {
+					position: absolute;
+					right: 10px;
+					top: 50%;
+					transform: translateY(-50%);
+				}
+			}
+
+            .btn {
+                text-decoration: none;
+            }
+
+            &-menu {
+                margin-top: 5px;
+
+                .char-counter {
+                    color: var(--muted);
+                    font-size: 10px;
+                }
+            }
+
+		}
+
+		.bh-comment {
+			width: 100%;
+			height: auto;
+			max-width: 160px !important;
+			max-height: 260px !important;
+
+			span {
+				width: 100%;
+				height: auto;
+				max-width: 160px !important;
+				max-height: 260px !important;
+			}
+
+			img {
+				width: 100%;
+				height: auto;
+				max-width: 160px !important;
+				max-height: 260px !important;
+				object-fit: cover;
+			}
+		}
+	}
+</style>
diff --git a/resources/assets/components/groups/partials/CommentPost.vue b/resources/assets/components/groups/partials/CommentPost.vue
new file mode 100644
index 000000000..4b448f913
--- /dev/null
+++ b/resources/assets/components/groups/partials/CommentPost.vue
@@ -0,0 +1,405 @@
+<template>
+	<div class="comment-post-component">
+		<div class="media media-status align-items-top mt-3">
+			<div v-if="commentBorderArrow" class="comment-border-arrow"></div>
+			<!-- <a
+				v-if="replyChildId == status.id"
+				href="#comment-1"
+				class="comment-border-link"
+				@click.prevent="replyToChild(status)">
+				<span class="sr-only">Jump to comment-{{ index }}</span>
+			</a> -->
+
+			<a :href="status.account.url">
+				<img class="rounded-circle media-avatar border" :src="status.account.avatar" width="32" height="32" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'">
+			</a>
+
+			<div class="media-body">
+				<div v-if="!status.media_attachments.length" class="media-body-comment">
+					<p class="media-body-comment-username">
+						<a :href="status.account.url">
+							{{status.account.acct}}
+						</a>
+					</p>
+					<read-more :status="status" />
+				</div>
+				<div v-else>
+					<p class="media-body-comment-username">
+						<a :href="status.account.url">
+							{{status.account.acct}}
+						</a>
+					</p>
+					<div class="bh-comment" @click="lightbox(status)">
+						<blur-hash-image
+							:width="blurhashWidth(status)"
+							:height="blurhashHeight(status)"
+							:punch="1"
+							class="img-fluid rounded-lg border shadow"
+							:hash="status.media_attachments[0].blurhash"
+							:src="getMediaSource(status)" />
+					</div>
+				</div>
+				<p class="media-body-reactions">
+					<a
+						v-if="profile"
+						href="#"
+						class="font-weight-bold"
+						:class="[ status.favourited ? 'text-primary' : 'text-muted' ]"
+						@click.prevent="likeComment(status, index, $event)">
+							{{ status.favourited ? 'Liked' : 'Like' }}
+						</a>
+					<!-- <span class="mx-1">·</span> -->
+					<!-- <a href="#" class="text-muted font-weight-bold" @click.prevent="replyToChild(status, index)">Reply</a> -->
+					<span v-if="profile" class="mx-1">·</span>
+					<a
+						class="font-weight-bold text-muted"
+						:href="status.url"
+						v-once>
+						{{ shortTimestamp(status.created_at) }}
+					</a>
+					<span v-if="profile && status.account.id === profile.id">
+						<span class="mx-1">·</span>
+						<a
+							class="font-weight-bold text-lighter"
+							href="#"
+							@click.prevent="deleteComment(index)">
+								Delete
+							</a>
+					</span>
+				</p>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script type="text/javascript">
+	import ReadMore from './ReadMore.vue';
+
+	export default {
+		props: {
+			groupId: {
+				type: String
+			},
+
+			profile: {
+				type: Object
+			},
+
+			status: {
+				type: Object,
+			},
+
+			commentBorderArrow: {
+				type: Boolean,
+				default: false
+			}
+		},
+
+
+		components: {
+			"read-more": ReadMore
+		},
+
+		data() {
+			return {
+				isLoaded: false,
+				hide: false,
+				feed: [],
+				canLoadMore: false,
+				isLoadingMore: false,
+				replyContent: null,
+				maxReplyId: null,
+				readMoreCursor: 200,
+				avatar: '/storage/avatars/default.png',
+				isUploading: false,
+				uploadProgress: 0,
+				lightboxStatus: null,
+				replyChildId: undefined,
+				childReplyContent: null,
+				postingChildComment: false
+			}
+		},
+
+		mounted() {
+			console.log(this.status);
+			// if(this.permalinkMode && this.permalinkStatus) {
+			// 	this.feed.push(this.permalinkStatus);
+			// 	this.isLoaded = true;
+			// 	this.canLoadMore = false;
+			// } else {
+			// 	this.fetchComments();
+			// }
+
+			// if(this.profile && this.profile.hasOwnProperty('avatar')) {
+			// 	this.avatar = this.profile.avatar;
+			// }
+		},
+
+		methods: {
+			fetchComments() {
+				axios.get('/api/v0/groups/comments', {
+					params: {
+						gid: this.groupId,
+						sid: this.status.id,
+						limit: 3
+					}
+				}).then(res => {
+					this.feed = res.data;
+					this.isLoaded = true;
+					this.maxReplyId = res.data[(res.data.length - 1)].id;
+					if(this.feed.length == 3) {
+						this.canLoadMore = true;
+					}
+				}).catch(err => {
+					this.isLoaded = true;
+				})
+			},
+
+			loadMoreComments() {
+				this.isLoadingMore = true;
+
+				axios.get('/api/v0/groups/comments', {
+					params: {
+						gid: this.groupId,
+						sid: this.status.id,
+						limit: 3,
+						max_id: this.maxReplyId
+					}
+				}).then(res => {
+					if(res.data[res.data.length - 1].id == this.maxReplyId) {
+						this.isLoadingMore = false;
+						this.canLoadMore = false;
+						return;
+					}
+					this.feed.push(...res.data);
+					this.isLoadingMore = false;
+					this.maxReplyId = res.data[res.data.length - 1].id;
+					if(res.data.length > 0) {
+						this.canLoadMore = true;
+					} else {
+						this.canLoadMore = false;
+					}
+				}).catch(err => {
+					this.isLoadingMore = false;
+					this.canLoadMore = false;
+				})
+			},
+
+			storeComment() {
+				axios.post('/api/v0/groups/comment', {
+					gid: this.groupId,
+					sid: this.status.id,
+					content: this.replyContent
+				})
+				.then(res => {
+					this.replyContent = null;
+					this.feed.unshift(res.data);
+				}).catch(err => {
+					if(err.response.status == 422) {
+						this.isUploading = false;
+						this.uploadProgress = 0;
+						swal('Oops!', err.response.data.error, 'error');
+					} else {
+						this.isUploading = false;
+						this.uploadProgress = 0;
+						swal('Oops!', 'An error occured while processing your request, please try again later', 'error');
+					}
+				})
+			},
+
+			shortTimestamp(ts) {
+				return window.App.util.format.timeAgo(ts);
+			},
+
+			readMore() {
+				this.readMoreCursor = this.readMoreCursor + 200;
+			},
+
+			likeComment(status, index, $event) {
+				$event.target.blur();
+				let l = status.favourited ? false : true;
+				this.feed[index].favourited = l;
+				status.favourited = l;
+				axios.post('/api/v0/groups/like', {
+					sid: status.id,
+					gid: this.groupId
+				});
+			},
+
+			deleteComment(index) {
+				if(window.confirm('Are you sure you want to delete this post?') == false) {
+					return;
+				}
+
+				axios.post('/api/v0/groups/status/delete', {
+					gid: this.groupId,
+					id: this.feed[index].id
+				}).then(res => {
+					this.feed.splice(index, 1);
+				}).catch(err => {
+					console.log(err.response);
+					swal('Error', 'Something went wrong. Please try again later.', 'error');
+				});
+			},
+
+			uploadImage() {
+				this.$refs.fileInput.click();
+			},
+
+			handleImageUpload() {
+				if(!this.$refs.fileInput.files.length) {
+					return;
+				}
+				this.isUploading = true;
+				let self = this;
+				let data = new FormData();
+				data.append('gid', this.groupId);
+				data.append('sid', this.status.id);
+				data.append('photo', this.$refs.fileInput.files[0]);
+
+				axios.post('/api/v0/groups/comment/photo', data, {
+					onUploadProgress: function(progressEvent) {
+						self.uploadProgress = Math.floor(progressEvent.loaded / progressEvent.total * 100);
+					}
+				})
+				.then(res => {
+					this.isUploading = false;
+					this.uploadProgress = 0;
+					this.feed.unshift(res.data);
+				}).catch(err => {
+					if(err.response.status == 422) {
+						this.isUploading = false;
+						this.uploadProgress = 0;
+						swal('Oops!', err.response.data.error, 'error');
+					} else {
+						this.isUploading = false;
+						this.uploadProgress = 0;
+						swal('Oops!', 'An error occured while processing your request, please try again later', 'error');
+					}
+				});
+			},
+
+			lightbox(status) {
+				this.lightboxStatus = status.media_attachments[0];
+				this.$refs.lightboxModal.show();
+			},
+
+			hideLightbox() {
+				this.lightboxStatus = null;
+				this.$refs.lightboxModal.hide();
+			},
+
+			blurhashWidth(status) {
+				if(!status.media_attachments[0].meta) {
+					return 25;
+				}
+				let aspect = status.media_attachments[0].meta.original.aspect;
+				if(aspect == 1) {
+					return 25;
+				} else if(aspect > 1) {
+					return 30;
+				} else {
+					return 20;
+				}
+			},
+
+			blurhashHeight(status) {
+				if(!status.media_attachments[0].meta) {
+					return 25;
+				}
+				let aspect = status.media_attachments[0].meta.original.aspect;
+				if(aspect == 1) {
+					return 25;
+				} else if(aspect > 1) {
+					return 20;
+				} else {
+					return 30;
+				}
+			},
+
+			getMediaSource(status) {
+				let media = status.media_attachments[0];
+
+				if(media.preview_url.endsWith('storage/no-preview.png')) {
+					return media.url;
+				}
+
+				return media.preview_url;
+			},
+
+			replyToChild(status, index) {
+				if(this.replyChildId == status.id) {
+					this.replyChildId = null;
+					return;
+				} else {
+					this.childReplyContent = null;
+				}
+
+				this.replyChildId = status.id;
+
+				if(!status.hasOwnProperty('replies_loaded') || !status.replies_loaded) {
+					this.fetchChildReplies(status, index);
+				} else {
+
+				}
+			},
+
+			fetchChildReplies(status, index) {
+				axios.get('/api/v0/groups/comments', {
+					params: {
+						gid: this.groupId,
+						sid: status.id,
+						cid: 1,
+						limit: 3
+					}
+				}).then(res => {
+					if(this.feed[index].hasOwnProperty('children')) {
+						this.feed[index].children.feed.push(...res.data);
+						this.feed[index].children.can_load_more = res.data.length == 3;
+					} else {
+						this.feed[index].children = {
+							feed: res.data,
+							can_load_more: res.data.length == 3
+						}
+					}
+					this.feed[index].replies_loaded = true;
+				}).catch(err => {
+				})
+			},
+
+			storeChildComment() {
+				this.postingChildComment = true;
+
+				axios.post('/api/v0/groups/comment', {
+					gid: this.groupId,
+					sid: this.status.id,
+					cid: this.replyChildId,
+					content: this.childReplyContent
+				})
+				.then(res => {
+					this.childReplyContent = null;
+					this.postingChildComment = false;
+					// this.feed.unshift(res.data);
+				}).catch(err => {
+					if(err.response.status == 422) {
+						// this.isUploading = false;
+						// this.uploadProgress = 0;
+						swal('Oops!', err.response.data.error, 'error');
+					} else {
+						// this.isUploading = false;
+						// this.uploadProgress = 0;
+						swal('Oops!', 'An error occured while processing your request, please try again later', 'error');
+					}
+				});
+
+				console.log(this.replyChildId);
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.comment-post-component {
+
+	}
+</style>
diff --git a/resources/assets/components/groups/partials/ContextMenu.vue b/resources/assets/components/groups/partials/ContextMenu.vue
new file mode 100644
index 000000000..52fad0e74
--- /dev/null
+++ b/resources/assets/components/groups/partials/ContextMenu.vue
@@ -0,0 +1,692 @@
+<template>
+	<div class="context-menu-component modal-stack">
+		<b-modal ref="ctxModal"
+			id="ctx-modal"
+			hide-header
+			hide-footer
+			centered
+			rounded
+			size="sm"
+			body-class="list-group-flush p-0 rounded">
+			<div class="list-group text-center">
+				<!-- <div v-if="status && status.account.id != profile.id && ctxMenuRelationship && ctxMenuRelationship.following" class="list-group-item rounded cursor-pointer font-weight-bold text-danger" @click="ctxMenuUnfollow()">Unfollow</div>
+				<div v-if="status && status.account.id != profile.id && ctxMenuRelationship && !ctxMenuRelationship.following" class="list-group-item rounded cursor-pointer font-weight-bold text-primary" @click="ctxMenuFollow()">Follow</div> -->
+				<div v-if="status.visibility !== 'archived'" class="list-group-item rounded cursor-pointer" @click="ctxMenuGoToPost()">View Post</div>
+				<!-- <div v-if="status.visibility !== 'archived'" class="list-group-item rounded cursor-pointer" @click="ctxMenuGoToProfile()">View Profile</div> -->
+				<!-- <div v-if="status && status.local == true && !status.in_reply_to_id" class="list-group-item rounded cursor-pointer" @click="ctxMenuEmbed()">Embed</div> -->
+				<div class="list-group-item rounded cursor-pointer" @click="ctxMenuCopyLink()">Copy Link</div>
+				<!-- <div v-if="status.visibility !== 'archived'" class="list-group-item rounded cursor-pointer" @click="ctxMenuShare()">Share</div> -->
+				<!-- <div v-if="status && profile && profile.is_admin == true && status.visibility !== 'archived'" class="list-group-item rounded cursor-pointer" @click="ctxModMenuShow()">Moderation Tools</div> -->
+				<div v-if="status && status.account.id != profile.id" class="list-group-item rounded cursor-pointer text-danger" @click="ctxMenuReportPost()">Report</div>
+				<div v-if="status && (profile.is_admin || profile.id == status.account.id) && status.visibility !== 'archived'" class="list-group-item rounded cursor-pointer text-danger" @click="deletePost(status)">Delete</div>
+				<div class="list-group-item rounded cursor-pointer text-lighter" @click="closeCtxMenu()">Cancel</div>
+			</div>
+		</b-modal>
+		<b-modal ref="ctxModModal"
+			id="ctx-mod-modal"
+			hide-header
+			hide-footer
+			centered
+			rounded
+			size="sm"
+			body-class="list-group-flush p-0 rounded">
+			<div class="list-group text-center">
+				<p class="py-2 px-3 mb-0">
+					<div class="text-center font-weight-bold text-danger">Moderation Tools</div>
+					<div class="small text-center text-muted">Select one of the following options</div>
+				</p>
+				<div class="list-group-item rounded cursor-pointer" @click="moderatePost(status, 'unlist')">Unlist from Timelines</div>
+				<div v-if="status.sensitive" class="list-group-item rounded cursor-pointer" @click="moderatePost(status, 'remcw')">Remove Content Warning</div>
+				<div v-else class="list-group-item rounded cursor-pointer" @click="moderatePost(status, 'addcw')">Add Content Warning</div>
+				<div class="list-group-item rounded cursor-pointer" @click="moderatePost(status, 'spammer')">
+					Mark as Spammer<br />
+					<span class="small">Unlist + CW existing and future posts</span>
+				</div>
+				<!-- <div class="list-group-item rounded cursor-pointer" @click="ctxModOtherMenuShow()">Other</div> -->
+				<div class="list-group-item rounded cursor-pointer text-lighter" @click="ctxModMenuClose()">Cancel</div>
+			</div>
+		</b-modal>
+		<b-modal ref="ctxModOtherModal"
+			id="ctx-mod-other-modal"
+			hide-header
+			hide-footer
+			centered
+			rounded
+			size="sm"
+			body-class="list-group-flush p-0 rounded">
+			<div class="list-group text-center">
+				<p class="py-2 px-3 mb-0">
+					<div class="text-center font-weight-bold text-danger">Moderation Tools</div>
+					<div class="small text-center text-muted">Select one of the following options</div>
+				</p>
+				<div class="list-group-item rounded cursor-pointer font-weight-bold" @click="confirmModal()">Unlist Posts</div>
+				<div class="list-group-item rounded cursor-pointer font-weight-bold" @click="confirmModal()">Moderation Log</div>
+				<div class="list-group-item rounded cursor-pointer text-lighter" @click="ctxModOtherMenuClose()">Cancel</div>
+			</div>
+		</b-modal>
+		<b-modal ref="ctxShareModal"
+			id="ctx-share-modal"
+			title="Share"
+			hide-footer
+			hide-header
+			centered
+			rounded
+			size="sm"
+			body-class="list-group-flush p-0 rounded text-center">
+			<div class="list-group-item rounded cursor-pointer" @click="ctxMenuCopyLink()">Copy Link</div>
+			<div class="list-group-item rounded cursor-pointer text-lighter" @click="closeCtxShareMenu()">Cancel</div>
+		</b-modal>
+		<b-modal ref="ctxEmbedModal"
+			id="ctx-embed-modal"
+			hide-header
+			hide-footer
+			centered
+			rounded
+			size="md"
+			body-class="p-2 rounded">
+			<div>
+				<div class="form-group">
+					<textarea class="form-control disabled text-monospace" rows="8" style="overflow-y:hidden;border: 1px solid #efefef; font-size: 12px; line-height: 18px; margin: 0 0 7px;resize:none;" v-model="ctxEmbedPayload" disabled=""></textarea>
+				</div>
+				<div class="form-group pl-2 d-flex justify-content-center">
+					<div class="form-check mr-3">
+						<input class="form-check-input" type="checkbox" v-model="ctxEmbedShowCaption" :disabled="ctxEmbedCompactMode == true">
+						<label class="form-check-label font-weight-light">
+							Show Caption
+						</label>
+					</div>
+					<div class="form-check mr-3">
+						<input class="form-check-input" type="checkbox" v-model="ctxEmbedShowLikes" :disabled="ctxEmbedCompactMode == true">
+						<label class="form-check-label font-weight-light">
+							Show Likes
+						</label>
+					</div>
+					<div class="form-check">
+						<input class="form-check-input" type="checkbox" v-model="ctxEmbedCompactMode">
+						<label class="form-check-label font-weight-light">
+							Compact Mode
+						</label>
+					</div>
+				</div>
+				<hr>
+				<button :class="copiedEmbed ? 'btn btn-primary btn-block btn-sm py-1 font-weight-bold disabed': 'btn btn-primary btn-block btn-sm py-1 font-weight-bold'" @click="ctxCopyEmbed" :disabled="copiedEmbed">{{copiedEmbed ? 'Embed Code Copied!' : 'Copy Embed Code'}}</button>
+				<p class="mb-0 px-2 small text-muted">By using this embed, you agree to our <a href="/site/terms">Terms of Use</a></p>
+			</div>
+		</b-modal>
+		<b-modal ref="ctxReport"
+			id="ctx-report"
+			hide-header
+			hide-footer
+			centered
+			rounded
+			size="sm"
+			body-class="list-group-flush p-0 rounded">
+			<p class="py-2 px-3 mb-0">
+				<div class="text-center font-weight-bold text-danger">Report</div>
+				<div class="small text-center text-muted">Select one of the following options</div>
+			</p>
+			<div class="list-group text-center">
+				<div class="list-group-item rounded cursor-pointer font-weight-bold" @click="sendReport('spam')">Spam</div>
+				<div class="list-group-item rounded cursor-pointer font-weight-bold" @click="sendReport('sensitive')">Sensitive Content</div>
+				<div class="list-group-item rounded cursor-pointer font-weight-bold" @click="sendReport('abusive')">Abusive or Harmful</div>
+				<div class="list-group-item rounded cursor-pointer font-weight-bold" @click="openCtxReportOtherMenu()">Other</div>
+				<!-- <div class="list-group-item rounded cursor-pointer" @click="ctxReportMenuGoBack()">Go Back</div> -->
+				<div class="list-group-item rounded cursor-pointer text-lighter" @click="ctxReportMenuGoBack()">Cancel</div>
+			</div>
+		</b-modal>
+		<b-modal ref="ctxReportOther"
+			id="ctx-report-other"
+			hide-header
+			hide-footer
+			centered
+			rounded
+			size="sm"
+			body-class="list-group-flush p-0 rounded">
+			<p class="py-2 px-3 mb-0">
+				<div class="text-center font-weight-bold text-danger">Report</div>
+				<div class="small text-center text-muted">Select one of the following options</div>
+			</p>
+			<div class="list-group text-center">
+				<div class="list-group-item rounded cursor-pointer font-weight-bold" @click="sendReport('underage')">Underage Account</div>
+				<div class="list-group-item rounded cursor-pointer font-weight-bold" @click="sendReport('copyright')">Copyright Infringement</div>
+				<div class="list-group-item rounded cursor-pointer font-weight-bold" @click="sendReport('impersonation')">Impersonation</div>
+				<div class="list-group-item rounded cursor-pointer font-weight-bold" @click="sendReport('scam')">Scam or Fraud</div>
+				<!-- <div class="list-group-item rounded cursor-pointer font-weight-bold" @click="sendReport('terrorism')">Terrorism Related</div> -->
+				<!-- <div class="list-group-item rounded cursor-pointer font-weight-bold" @click="sendReport('other')">Other or Not listed</div> -->
+				<!-- <div class="list-group-item rounded cursor-pointer" @click="ctxReportOtherMenuGoBack()">Go Back</div> -->
+				<div class="list-group-item rounded cursor-pointer text-lighter" @click="ctxReportOtherMenuGoBack()">Cancel</div>
+			</div>
+		</b-modal>
+		<b-modal ref="ctxConfirm"
+			id="ctx-confirm"
+			hide-header
+			hide-footer
+			centered
+			rounded
+			size="sm"
+			body-class="list-group-flush p-0 rounded">
+			<div class="d-flex align-items-center justify-content-center py-3">
+				<div>{{ this.confirmModalTitle }}</div>
+			</div>
+			<div class="d-flex border-top btn-group btn-group-block rounded-0" role="group">
+				<button type="button" class="btn btn-outline-lighter border-left-0 border-top-0 border-bottom-0 border-right py-2" style="color: rgb(0,122,255) !important;" @click.prevent="confirmModalCancel()">Cancel</button>
+				<button type="button" class="btn btn-outline-lighter border-0" style="color: rgb(0,122,255) !important;" @click.prevent="confirmModalConfirm()">Confirm</button>
+			</div>
+		</b-modal>
+	</div>
+</template>
+
+<script type="text/javascript">
+	export default {
+		props: {
+			status: {
+				type: Object
+			},
+
+			profile: {
+				type: Object
+			},
+
+			type: {
+				type: String,
+				default: 'status',
+				validator: (val) => ['status', 'comment', 'profile'].includes(val)
+			},
+
+			groupId: {
+				type: String
+			}
+		},
+
+		data() {
+			return {
+				ctxMenuStatus: false,
+				ctxMenuRelationship: false,
+				ctxEmbedPayload: false,
+				copiedEmbed: false,
+				replySending: false,
+				ctxEmbedShowCaption: true,
+				ctxEmbedShowLikes: false,
+				ctxEmbedCompactMode: false,
+				confirmModalTitle: 'Are you sure?',
+				confirmModalIdentifer: null,
+				confirmModalType: false,
+			}
+		},
+
+		methods: {
+			open() {
+				this.ctxMenu();
+			},
+
+			ctxMenu() {
+				this.ctxMenuStatus = this.status;
+				this.ctxEmbedPayload = window.App.util.embed.post(this.status.url);
+				if(this.status.account.id == this.profile.id) {
+					this.ctxMenuRelationship = false;
+					this.$refs.ctxModal.show();
+				} else {
+					axios.get('/api/pixelfed/v1/accounts/relationships', {
+						params: {
+							'id[]': this.status.account.id
+						}
+					}).then(res => {
+						this.ctxMenuRelationship = res.data[0];
+						this.$refs.ctxModal.show();
+					});
+				}
+			},
+
+			closeCtxMenu() {
+				this.copiedEmbed = false;
+				this.ctxMenuStatus = false;
+				this.ctxMenuRelationship = false;
+				this.$refs.ctxModal.hide();
+				this.$refs.ctxReport.hide();
+				this.$refs.ctxReportOther.hide();
+				this.closeModals();
+			},
+
+			ctxMenuCopyLink() {
+				let status = this.ctxMenuStatus;
+				navigator.clipboard.writeText(status.url);
+				this.closeModals();
+				return;
+			},
+
+			ctxMenuGoToPost() {
+				let status = this.ctxMenuStatus;
+				window.location.href = this.statusUrl(status);
+				this.closeCtxMenu();
+				return;
+			},
+
+			ctxMenuGoToProfile() {
+				let status = this.ctxMenuStatus;
+				window.location.href = this.profileUrl(status);
+				this.closeCtxMenu();
+				return;
+			},
+
+			ctxMenuFollow() {
+				let id = this.ctxMenuStatus.account.id;
+				axios.post('/i/follow', {
+					item: id
+				}).then(res => {
+					let username = this.ctxMenuStatus.account.acct;
+					this.closeCtxMenu();
+					setTimeout(function() {
+						swal('Follow successful!', 'You are now following ' + username, 'success');
+					}, 500);
+				});
+			},
+
+			ctxMenuUnfollow() {
+				let id = this.ctxMenuStatus.account.id;
+				axios.post('/i/follow', {
+					item: id
+				}).then(res => {
+					let username = this.ctxMenuStatus.account.acct;
+					if(this.scope == 'home') {
+						this.feed = this.feed.filter(s => {
+							return s.account.id != this.ctxMenuStatus.account.id;
+						});
+					}
+					this.closeCtxMenu();
+					setTimeout(function() {
+						swal('Unfollow successful!', 'You are no longer following ' + username, 'success');
+					}, 500);
+				});
+			},
+
+			ctxMenuReportPost() {
+				this.$refs.ctxModal.hide();
+				this.$refs.ctxReport.show();
+				return;
+			},
+
+			ctxMenuEmbed() {
+				this.closeModals();
+				this.$refs.ctxEmbedModal.show();
+			},
+
+			ctxMenuShare() {
+				this.$refs.ctxModal.hide();
+				this.$refs.ctxShareModal.show();
+			},
+
+			closeCtxShareMenu() {
+				this.$refs.ctxShareModal.hide();
+				this.$refs.ctxModal.show();
+			},
+
+			ctxCopyEmbed() {
+				navigator.clipboard.writeText(this.ctxEmbedPayload);
+				this.ctxEmbedShowCaption = true;
+				this.ctxEmbedShowLikes = false;
+				this.ctxEmbedCompactMode = false;
+				this.$refs.ctxEmbedModal.hide();
+			},
+
+			ctxModMenuShow() {
+				this.$refs.ctxModal.hide();
+				this.$refs.ctxModModal.show();
+			},
+
+			ctxModOtherMenuShow() {
+				this.$refs.ctxModal.hide();
+				this.$refs.ctxModModal.hide();
+				this.$refs.ctxModOtherModal.show();
+			},
+
+			ctxModMenu() {
+				this.$refs.ctxModal.hide();
+			},
+
+			ctxModMenuClose() {
+				this.closeModals();
+			},
+
+			ctxModOtherMenuClose() {
+				this.closeModals();
+				this.$refs.ctxModModal.show();
+			},
+
+			formatCount(count) {
+				return App.util.format.count(count);
+			},
+
+			openCtxReportOtherMenu() {
+				let s = this.ctxMenuStatus;
+				this.closeCtxMenu();
+				this.ctxMenuStatus = s;
+				this.$refs.ctxReportOther.show();
+			},
+
+			ctxReportMenuGoBack() {
+				this.$refs.ctxReportOther.hide();
+				this.$refs.ctxReport.hide();
+				this.$refs.ctxModal.show();
+			},
+
+			ctxReportOtherMenuGoBack() {
+				this.$refs.ctxReportOther.hide();
+				this.$refs.ctxModal.hide();
+				this.$refs.ctxReport.show();
+			},
+
+			sendReport(type) {
+				let id = this.ctxMenuStatus.id;
+
+				swal({
+					'title': 'Confirm Report',
+					'text': 'Are you sure you want to report this post?',
+					'icon': 'warning',
+					'buttons': true,
+					'dangerMode': true
+				}).then((res) => {
+					if(res) {
+						axios.post(`/api/v0/groups/${this.groupId}/report/create`, {
+							'type': type,
+							'id': id,
+						}).then(res => {
+							this.closeCtxMenu();
+							swal('Report Sent!', 'We have successfully received your report.', 'success');
+						}).catch(err => {
+							if(err.response.status == 422) {
+								swal('Oops!', err.response.data.error, 'error');
+							} else {
+								swal('Oops!', 'There was an issue reporting this post.', 'error');
+							}
+						})
+					} else {
+						this.closeCtxMenu();
+					}
+				});
+			},
+
+			closeModals() {
+				this.$refs.ctxModal.hide();
+				this.$refs.ctxModModal.hide();
+				this.$refs.ctxModOtherModal.hide();
+				this.$refs.ctxShareModal.hide();
+				this.$refs.ctxEmbedModal.hide();
+				this.$refs.ctxReport.hide();
+				this.$refs.ctxReportOther.hide();
+				this.$refs.ctxConfirm.hide();
+			},
+
+			openCtxStatusModal() {
+				this.closeModals();
+				this.$refs.ctxStatusModal.show();
+			},
+
+			openConfirmModal() {
+				this.closeModals();
+				this.$refs.ctxConfirm.show();
+			},
+
+			closeConfirmModal() {
+				this.closeModals();
+				this.confirmModalTitle = 'Are you sure?';
+				this.confirmModalType = false;
+				this.confirmModalIdentifer = null;
+			},
+
+			confirmModalConfirm() {
+				switch(this.confirmModalType) {
+					case 'post.delete':
+						axios.post('/i/delete', {
+							type: 'status',
+							item: this.confirmModalIdentifer
+						}).then(res => {
+							this.feed = this.feed.filter(s => {
+								return s.id != this.confirmModalIdentifer;
+							});
+							this.closeConfirmModal();
+						}).catch(err => {
+							this.closeConfirmModal();
+							swal('Error', 'Something went wrong. Please try again later.', 'error');
+						});
+					break;
+				}
+
+				this.closeConfirmModal();
+			},
+
+			confirmModalCancel() {
+				this.closeConfirmModal();
+			},
+
+			moderatePost(status, action, $event) {
+				let username = status.account.username;
+				let pid = status.id;
+				let msg = '';
+				let self = this;
+				switch(action) {
+					case 'addcw':
+						msg = 'Are you sure you want to add a content warning to this post?';
+						swal({
+							title: 'Confirm',
+							text: msg,
+							icon: 'warning',
+							buttons: true,
+							dangerMode: true
+						}).then(res =>  {
+							if(res) {
+								axios.post('/api/v2/moderator/action', {
+									action: action,
+									item_id: status.id,
+									item_type: 'status'
+								}).then(res => {
+									swal('Success', 'Successfully added content warning', 'success');
+									status.sensitive = true;
+									self.closeModals();
+									self.ctxModMenuClose();
+								}).catch(err => {
+									swal(
+										'Error',
+										'Something went wrong, please try again later.',
+										'error'
+										);
+									self.closeModals();
+									self.ctxModMenuClose();
+								});
+							}
+						});
+					break;
+
+					case 'remcw':
+						msg = 'Are you sure you want to remove the content warning on this post?';
+						swal({
+							title: 'Confirm',
+							text: msg,
+							icon: 'warning',
+							buttons: true,
+							dangerMode: true
+						}).then(res =>  {
+							if(res) {
+								axios.post('/api/v2/moderator/action', {
+									action: action,
+									item_id: status.id,
+									item_type: 'status'
+								}).then(res => {
+									swal('Success', 'Successfully added content warning', 'success');
+									status.sensitive = false;
+									self.closeModals();
+									self.ctxModMenuClose();
+								}).catch(err => {
+									swal(
+										'Error',
+										'Something went wrong, please try again later.',
+										'error'
+										);
+									self.closeModals();
+									self.ctxModMenuClose();
+								});
+							}
+						});
+					break;
+
+					case 'unlist':
+						msg = 'Are you sure you want to unlist this post?';
+						swal({
+							title: 'Confirm',
+							text: msg,
+							icon: 'warning',
+							buttons: true,
+							dangerMode: true
+						}).then(res =>  {
+							if(res) {
+								axios.post('/api/v2/moderator/action', {
+									action: action,
+									item_id: status.id,
+									item_type: 'status'
+								}).then(res => {
+									this.feed = this.feed.filter(f => {
+										return f.id != status.id;
+									});
+									swal('Success', 'Successfully unlisted post', 'success');
+									self.closeModals();
+									self.ctxModMenuClose();
+								}).catch(err => {
+									self.closeModals();
+									self.ctxModMenuClose();
+									swal(
+										'Error',
+										'Something went wrong, please try again later.',
+										'error'
+										);
+								});
+							}
+						});
+					break;
+
+					case 'spammer':
+						msg = 'Are you sure you want to mark this user as a spammer? All existing and future posts will be unlisted on timelines and a content warning will be applied.';
+						swal({
+							title: 'Confirm',
+							text: msg,
+							icon: 'warning',
+							buttons: true,
+							dangerMode: true
+						}).then(res =>  {
+							if(res) {
+								axios.post('/api/v2/moderator/action', {
+									action: action,
+									item_id: status.id,
+									item_type: 'status'
+								}).then(res => {
+									swal('Success', 'Successfully marked account as spammer', 'success');
+									self.closeModals();
+									self.ctxModMenuClose();
+								}).catch(err => {
+									self.closeModals();
+									self.ctxModMenuClose();
+									swal(
+										'Error',
+										'Something went wrong, please try again later.',
+										'error'
+										);
+								});
+							}
+						});
+					break;
+				}
+			},
+
+			shareStatus(status, $event) {
+				if($('body').hasClass('loggedIn') == false) {
+					return;
+				}
+
+				this.closeModals();
+
+				axios.post('/i/share', {
+					item: status.id
+				}).then(res => {
+					status.reblogs_count = res.data.count;
+					status.reblogged = !status.reblogged;
+					if(status.reblogged) {
+						swal('Success', 'You shared this post', 'success');
+					} else {
+						swal('Success', 'You unshared this post', 'success');
+					}
+				}).catch(err => {
+					swal('Error', 'Something went wrong, please try again later.', 'error');
+				});
+			},
+
+			statusUrl(status) {
+				if(status.local == true) {
+					return status.url;
+				}
+
+				return '/i/web/post/_/' + status.account.id + '/' + status.id;
+			},
+
+			profileUrl(status) {
+				if(status.local == true) {
+					return status.account.url;
+				}
+
+				return '/i/web/profile/_/' + status.account.id;
+			},
+
+			deletePost(status) {
+				if($('body').hasClass('loggedIn') == false || this.ownerOrAdmin(status) == false) {
+					return;
+				}
+
+				if(window.confirm('Are you sure you want to delete this post?') == false) {
+					return;
+				}
+
+				axios.post('/i/delete', {
+					type: 'status',
+					item: status.id
+				}).then(res => {
+					this.$emit('status-delete', status.id);
+					this.closeModals();
+				}).catch(err => {
+					swal('Error', 'Something went wrong. Please try again later.', 'error');
+				});
+			},
+
+			owner(status) {
+				return this.profile.id === status.account.id;
+			},
+
+			admin() {
+				return this.profile.is_admin == true;
+			},
+
+			ownerOrAdmin(status) {
+				return this.owner(status) || this.admin();
+			},
+
+			archivePost(status) {
+				if(window.confirm('Are you sure you want to archive this post?') == false) {
+					return;
+				}
+
+				axios.post('/api/pixelfed/v2/status/' + status.id + '/archive')
+				.then(res => {
+					this.$emit('status-delete', status.id);
+					this.closeModals();
+				});
+			},
+
+			unarchivePost(status) {
+				if(window.confirm('Are you sure you want to unarchive this post?') == false) {
+					return;
+				}
+
+				axios.post('/api/pixelfed/v2/status/' + status.id + '/unarchive')
+				.then(res => {
+					this.closeModals();
+				});
+			}
+		}
+	}
+</script>
diff --git a/resources/assets/components/groups/partials/CreateForm/CheckboxInput.vue b/resources/assets/components/groups/partials/CreateForm/CheckboxInput.vue
new file mode 100644
index 000000000..03fa8727a
--- /dev/null
+++ b/resources/assets/components/groups/partials/CreateForm/CheckboxInput.vue
@@ -0,0 +1,59 @@
+<template>
+    <div class="form-group row">
+        <div class="col-sm-3">
+            <label class="col-form-label text-left">{{ label }}</label>
+        </div>
+        <div class="col-sm-9">
+            <div class="form-check">
+                <input class="form-check-input" type="checkbox" v-model="value">
+                <label
+                    class="form-check-label ml-1"
+                    :class="[ strongText ? 'font-weight-bold text-capitalize text-dark' : 'small text-muted' ]"
+                >
+                {{ inputText }}
+                </label>
+            </div>
+
+            <div
+                v-if="helpText"
+                class="help-text small text-muted d-flex flex-row justify-content-between gap-3">
+                <div v-if="helpText">{{ helpText }}</div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            label: {
+                type: String
+            },
+            inputText: {
+                type: String
+            },
+            val: {
+                type: String
+            },
+            helpText: {
+                type: String
+            },
+            strongText: {
+                type: Boolean,
+                default: true
+            }
+        },
+
+        data() {
+            return {
+                value: this.val
+            }
+        },
+
+        watch: {
+            value: function(newVal, oldVal) {
+                this.$emit('update', newVal);
+            }
+        }
+    }
+</script>
diff --git a/resources/assets/components/groups/partials/CreateForm/SelectInput.vue b/resources/assets/components/groups/partials/CreateForm/SelectInput.vue
new file mode 100644
index 000000000..304ce0c7d
--- /dev/null
+++ b/resources/assets/components/groups/partials/CreateForm/SelectInput.vue
@@ -0,0 +1,70 @@
+<template>
+    <div class="form-group row">
+        <div class="col-sm-3">
+            <label class="col-form-label text-left">{{ label }}</label>
+        </div>
+        <div class="col-sm-9">
+            <select class="custom-select" v-model="value">
+                <option value="" selected="" disabled="">{{ placeholder }}</option>
+                <option v-for="c in categories" :value="c.value">{{ c.key }}</option>
+            </select>
+
+            <div
+                v-if="helpText || hasLimit"
+                class="help-text small text-muted d-flex flex-row justify-content-between gap-3">
+                <div v-if="helpText">{{ helpText }}</div>
+                <div
+                    v-if="hasLimit"
+                    class="font-weight-bold text-dark">
+                    {{ value ? value.length : 0 }}/{{ maxLimit }}
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            label: {
+                type: String
+            },
+            placeholder: {
+                type: String
+            },
+            categories: {
+                type: Array
+            },
+            val: {
+                type: String
+            },
+            helpText: {
+                type: String
+            },
+            hasLimit: {
+                type: Boolean,
+                default: false
+            },
+            maxLimit: {
+                type: Number,
+                default: 40
+            },
+            largeInput: {
+                type: Boolean,
+                default: false
+            }
+        },
+
+        data() {
+            return {
+                value: this.val ? this.val : ""
+            }
+        },
+
+        watch: {
+            value: function(newVal, oldVal) {
+                this.$emit('update', newVal);
+            }
+        }
+    }
+</script>
diff --git a/resources/assets/components/groups/partials/CreateForm/TextAreaInput.vue b/resources/assets/components/groups/partials/CreateForm/TextAreaInput.vue
new file mode 100644
index 000000000..e8977db3f
--- /dev/null
+++ b/resources/assets/components/groups/partials/CreateForm/TextAreaInput.vue
@@ -0,0 +1,86 @@
+<template>
+    <div class="form-group row">
+        <div class="col-sm-3">
+            <label class="col-form-label text-left">{{ label }}</label>
+        </div>
+        <div class="col-sm-9">
+            <textarea
+                v-if="hasLimit"
+                type="text"
+                class="form-control"
+                :class="{ 'form-control-lg': largeInput }"
+                style="resize:none;"
+                :placeholder="placeholder"
+                :maxlength="maxLimit"
+                :rows="rows"
+                v-model="value" />
+            <textarea
+                v-else
+                type="text"
+                class="form-control"
+                :class="{ 'form-control-lg': largeInput }"
+                style="resize:none;"
+                :placeholder="placeholder"
+                :rows="rows"
+                v-model="value" />
+
+            <div
+                v-if="helpText || hasLimit"
+                class="help-text small text-muted d-flex flex-row justify-content-between gap-3">
+                <div v-if="helpText">{{ helpText }}</div>
+                <div
+                    v-if="hasLimit"
+                    class="font-weight-bold text-dark">
+                    {{ value ? value.length : 0 }}/{{ maxLimit }}
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            label: {
+                type: String
+            },
+            placeholder: {
+                type: String
+            },
+            val: {
+                type: String
+            },
+            helpText: {
+                type: String
+            },
+            hasLimit: {
+                type: Boolean,
+                default: false
+            },
+            maxLimit: {
+                type: Number,
+                default: 40
+            },
+            largeInput: {
+                type: Boolean,
+                default: false
+            },
+            rows: {
+                type: Number,
+                default: 4
+            },
+        },
+
+        data() {
+            return {
+                value: this.val
+            }
+        },
+
+        watch: {
+            value: function(newVal, oldVal) {
+                this.$emit('update', newVal);
+            }
+        }
+    }
+</script>
diff --git a/resources/assets/components/groups/partials/CreateForm/TextInput.vue b/resources/assets/components/groups/partials/CreateForm/TextInput.vue
new file mode 100644
index 000000000..82c0b3c86
--- /dev/null
+++ b/resources/assets/components/groups/partials/CreateForm/TextInput.vue
@@ -0,0 +1,78 @@
+<template>
+    <div class="form-group row">
+        <div class="col-sm-3">
+            <label class="col-form-label text-left">{{ label }}</label>
+        </div>
+        <div class="col-sm-9">
+            <input
+                v-if="hasLimit"
+                type="text"
+                class="form-control"
+                :class="{ 'form-control-lg': largeInput }"
+                :placeholder="placeholder"
+                :maxlength="maxLimit"
+                v-model="value">
+            <input
+                v-else
+                type="text"
+                class="form-control"
+                :class="{ 'form-control-lg': largeInput }"
+                :placeholder="placeholder"
+                v-model="value">
+
+            <div
+                v-if="helpText || hasLimit"
+                class="help-text small text-muted d-flex flex-row justify-content-between gap-3">
+                <div v-if="helpText">{{ helpText }}</div>
+                <div
+                    v-if="hasLimit"
+                    class="font-weight-bold text-dark">
+                    {{ value ? value.length : 0 }}/{{ maxLimit }}
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            label: {
+                type: String
+            },
+            placeholder: {
+                type: String
+            },
+            val: {
+                type: String
+            },
+            helpText: {
+                type: String
+            },
+            hasLimit: {
+                type: Boolean,
+                default: false
+            },
+            maxLimit: {
+                type: Number,
+                default: 40
+            },
+            largeInput: {
+                type: Boolean,
+                default: false
+            }
+        },
+
+        data() {
+            return {
+                value: this.val
+            }
+        },
+
+        watch: {
+            value: function(newVal, oldVal) {
+                this.$emit('update', newVal);
+            }
+        }
+    }
+</script>
diff --git a/resources/assets/components/groups/partials/GroupAbout.vue b/resources/assets/components/groups/partials/GroupAbout.vue
new file mode 100644
index 000000000..7db87084e
--- /dev/null
+++ b/resources/assets/components/groups/partials/GroupAbout.vue
@@ -0,0 +1,134 @@
+<template>
+	<div class="group-about-component">
+		<div class="row justify-content-center">
+			<div class="col-12 col-md-7">
+				<div class="card shadow-none border mt-3 rounded-lg">
+					<div class="card-header bg-white">
+						<h5 class="mb-0">About This Group</h5>
+					</div>
+					<div class="card-body">
+						<p v-if="group.description && group.description.length > 1" class="description" v-html="group.description"></p>
+						<p v-else class="description">This group does not have a description.</p>
+						<p class="mb-0 font-weight-light text-lighter">Created: {{ timestampFormat(group.created_at) }}</p>
+					</div>
+				</div>
+			</div>
+			<div class="col-12 col-md-5">
+				<div class="card card-body mt-3 shadow-none border rounded-lg">
+					<div v-if="group.membership == 'all'" class="fact">
+						<div class="fact-icon">
+							<i class="fal fa-globe fa-lg"></i>
+						</div>
+						<div class="fact-body">
+							<p class="fact-title">Public</p>
+							<p class="fact-subtitle">Anyone can see who's in the group and what they post.</p>
+						</div>
+					</div>
+
+					<div v-if="group.membership == 'private'" class="fact">
+						<div class="fact-icon">
+							<i class="fal fa-lock fa-lg"></i>
+						</div>
+						<div class="fact-body">
+							<p class="fact-title">Private</p>
+							<p class="fact-subtitle">Only members can see who's in the group and what they post.</p>
+						</div>
+					</div>
+
+					<div class="fact">
+						<div class="fact-icon">
+							<i class="fal fa-eye fa-lg"></i>
+						</div>
+						<div class="fact-body">
+							<p class="fact-title">Visible</p>
+							<p class="fact-subtitle">Anyone can find this group.</p>
+						</div>
+					</div>
+
+					<div class="fact">
+						<div class="fact-icon">
+							<i class="fal fa-map-marker-alt fa-lg"></i>
+						</div>
+						<div class="fact-body">
+							<p class="fact-title">Fediverse</p>
+							<p class="fact-subtitle">This group has not specified a location.</p>
+						</div>
+					</div>
+
+					<div class="fact mb-0">
+						<div class="fact-icon">
+							<i class="fal fa-users fa-lg"></i>
+						</div>
+						<div class="fact-body">
+							<p class="fact-title"">General</p>
+							<p class="fact-subtitle">This group has not specified a category.</p>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script type="text/javascript">
+	export default {
+		props: {
+			group: {
+				type: Object
+			}
+		},
+
+		methods: {
+			timestampFormat(date, showTime = false) {
+				let ts = new Date(date);
+				return showTime ? ts.toDateString() + ' · ' + ts.toLocaleTimeString() : ts.toDateString();
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.group-about-component {
+		margin-bottom: 50vh;
+
+		.title {
+			font-size: 16px;
+			font-weight: bold;
+		}
+
+		.description {
+			font-size: 15px;
+			font-weight:400;
+			color: #6c757d;
+			margin-bottom: 30px;
+			white-space: break-spaces;
+		}
+
+		.fact {
+			display: flex;
+			align-items: center;
+			margin-bottom: 1.5rem;
+
+			&-body {
+				flex: 1;
+			}
+
+			&-icon {
+				width: 50px;
+				text-align: center;
+			}
+
+			&-title {
+				font-size: 17px;
+				font-weight: 500;
+				margin-bottom: 0;
+			}
+
+			&-subtitle {
+				font-size: 14px;
+				margin-bottom: 0;
+				color: #6c757d;
+			}
+		}
+	}
+</style>
diff --git a/resources/assets/components/groups/partials/GroupCard.vue b/resources/assets/components/groups/partials/GroupCard.vue
new file mode 100644
index 000000000..0a9dabfd6
--- /dev/null
+++ b/resources/assets/components/groups/partials/GroupCard.vue
@@ -0,0 +1,174 @@
+<template>
+    <div class="col-12 col-md-6 col-xl-4 group-card">
+        <div class="group-card-inner">
+            <img
+                v-if="group.metadata && group.metadata.hasOwnProperty('header')"
+                :src="group.metadata.header.url"
+                class="group-header-img" />
+
+            <div
+                v-else
+                class="group-header-img"
+                :class="{ compact: compact }">
+                <div
+                    class="bg-light d-flex align-items-center justify-content-center rounded"
+                    style="width: 100%; height:100%;">
+                </div>
+            </div>
+
+            <div class="group-card-inner-copy">
+                <p class="font-weight-bold mb-0 text-dark" style="font-size: 16px;">
+                    {{ truncate(group.name || 'Untitled Group', titleLength) }}
+                </p>
+
+                <p class="text-muted mb-1" style="font-size: 12px;">
+                    {{ truncate(group.short_description, descriptionLength) }}
+                </p>
+                <p v-if="showStats" class="mb-0 small text-lighter">
+                    <span>
+                        <i class="fal fa-users"></i>
+                        <span class="small font-weight-bold">{{ prettyCount(group.member_count) }}</span>
+                    </span>
+
+                    <span v-if="!group.local" class="remote-label ml-3">
+                        <i class="fal fa-globe"></i> Remote
+                    </span>
+                </p>
+            </div>
+
+            <div class="group-card-inner-foaf">
+            </div>
+
+            <div class="group-card-inner-cta">
+                <router-link :to="`/groups/${group.id}`" class="btn btn-light btn-block font-weight-bold">
+                    Join Group
+                </router-link>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            group: {
+                type: Object
+            },
+
+            compact: {
+                type: Boolean,
+                default: false
+            },
+
+            showStats: {
+                type: Boolean,
+                default: true
+            },
+
+            truncateTitleLength: {
+                type: Number,
+                default: 19
+            },
+
+            truncateDescriptionLength: {
+                type: Number,
+                default: 22
+            }
+        },
+
+        data() {
+            return {
+                titleLength: 40,
+                descriptionLength: 60
+            }
+        },
+
+        mounted() {
+            if(this.compact) {
+                this.titleLength = 19;
+                this.descriptionLength = 22;
+            }
+
+            if(this.truncateTitleLength != 19) {
+                this.titleLength = this.truncateTitleLength;
+            }
+
+            if(this.truncateDescriptionLength != 22) {
+                this.descriptionLength = this.truncateDescriptionLength;
+            }
+        },
+
+        methods: {
+            prettyCount(val) {
+                return App.util.format.count(val);
+            },
+
+            truncate(str, limit = 140) {
+                if(str.length <= limit) {
+                    return str;
+                }
+
+                return str.substr(0, limit) + ' ...';
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .group-card {
+        margin-bottom: 15px;
+
+        &-inner {
+            display: flex;
+            flex-direction: column;
+            border: 1px solid var(--border-color);
+            border-radius: 10px;
+            overflow: hidden;
+
+            &-copy {
+                background-color: var(--light);
+                padding: 1rem;
+            }
+
+            &-foaf {
+                background-color: var(--light);
+                height: 30px;
+            }
+
+            &-cta {
+                background-color: var(--light);
+                padding: 1rem;
+            }
+        }
+
+        .member-label {
+            padding: 2px 5px;
+            font-size: 9px;
+            color: rgba(75, 119, 190, 1);
+            background: rgba(137, 196, 244, 0.2);
+            border: 1px solid rgba(137, 196, 244, 0.3);
+            font-weight: 500;
+            text-transform: capitalize;
+            border-radius: 3px;
+        }
+
+        .remote-label {
+            padding: 2px 5px;
+            font-size: 9px;
+            color: #B45309;
+            background: #FEF3C7;
+            border: 1px solid #FCD34D;
+            font-weight: 500;
+            text-transform: capitalize;
+            border-radius: 3px;
+        }
+
+        .group-header-img {
+            width: 100%;
+            height: 150px;
+            object-fit: cover;
+            padding: 0px;
+            overflow: hidden;
+        }
+    }
+</style>
diff --git a/resources/assets/components/groups/partials/GroupCompose.vue b/resources/assets/components/groups/partials/GroupCompose.vue
new file mode 100644
index 000000000..e40fda11a
--- /dev/null
+++ b/resources/assets/components/groups/partials/GroupCompose.vue
@@ -0,0 +1,345 @@
+<template>
+	<div class="group-compose-form">
+		<input ref="photoInput" id="photoInput" type="file" class="d-none file-input" accept="image/jpeg,image/png" @change="handlePhotoChange">
+		<input ref="videoInput" id="videoInput" type="file" class="d-none file-input" accept="video/mp4" @change="handleVideoChange">
+		<div class="card card-body border mb-3 shadow-sm rounded-lg">
+			<div class="media align-items-top">
+				<img v-if="profile" :src="profile.avatar" class="rounded-circle border mr-3" width="42px" height="42px" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'">
+				<div class="media-body">
+					<div class="d-block" style="min-height: 80px;">
+						<div v-if="isUploading" class="w-100">
+							<p class="font-weight-light mb-1">Uploading media ...</p>
+							<div class="progress rounded-pill" style="height:4px">
+								<div class="progress-bar" role="progressbar" :aria-valuenow="uploadProgress" aria-valuemin="0" aria-valuemax="100" :style="{ width: uploadProgress + '%'}"></div>
+							</div>
+						</div>
+						<div v-else class="form-group mb-3">
+							<textarea
+								class="form-control"
+								:class="{
+									'form-control-lg': !composeText || composeText.length < 40,
+									'rounded-pill': !composeText || composeText.length < 40,
+									'bg-light': !composeText || composeText.length < 40,
+									'border-0': !composeText || composeText.length < 40
+								}"
+								:rows="!composeText || composeText.length < 40 ? 1 : 5"
+								:placeholder="placeholder"
+								style="resize: none;"
+								v-model="composeText"
+								></textarea>
+
+							<div v-if="composeText" class="small text-muted mt-1" style="min-height: 20px;">
+								<span class="float-right font-weight-bold">
+									{{ composeText ? composeText.length : 0 }}/500
+								</span>
+							</div>
+						</div>
+					</div>
+					<div v-if="tab" class="tab">
+						<div v-if="tab === 'poll'">
+							<p class="font-weight-bold text-muted small">
+								Poll Options
+							</p>
+
+							<div v-if="pollOptions.length < 4" class="form-group mb-4">
+								<input type="text" class="form-control rounded-pill" placeholder="Add a poll option, press enter to save" v-model="pollOptionModel" @keyup.enter="savePollOption">
+							</div>
+
+							<div v-for="(option, index) in pollOptions" class="form-group mb-4 d-flex align-items-center" style="max-width:400px;position: relative;">
+								<span class="font-weight-bold mr-2" style="position: absolute;left: 10px;">{{ index + 1 }}.</span>
+								<input v-if="pollOptions[index].length < 50" type="text" class="form-control rounded-pill" placeholder="Add a poll option, press enter to save" v-model="pollOptions[index]" style="padding-left: 30px;padding-right: 90px;">
+								<textarea v-else class="form-control" v-model="pollOptions[index]" placeholder="Add a poll option, press enter to save" rows="3" style="padding-left: 30px;padding-right:90px;"></textarea>
+								<button class="btn btn-danger btn-sm rounded-pill font-weight-bold" style="position: absolute;right: 5px;" @click="deletePollOption(index)">
+									<i class="fas fa-trash"></i> Delete
+								</button>
+							</div>
+
+							<hr>
+
+							<div class="d-flex justify-content-between">
+								<div>
+									<p class="font-weight-bold text-muted small">
+										Poll Expiry
+									</p>
+
+									<div class="form-group">
+										<select class="form-control rounded-pill" style="width: 200px;" v-model="pollExpiry">
+											<option value="60">1 hour</option>
+											<option value="360">6 hours</option>
+											<option value="1440" selected>24 hours</option>
+											<option value="10080">7 days</option>
+										</select>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+					<div v-if="!isUploading" class="">
+						<div>
+							<div v-if="photoName && photoName.length" class="bg-light rounded-pill mb-4 py-2">
+								<div class="media align-items-center">
+									<span style="width: 40px;height: 40px;border-radius:50px;opacity: 0.6;" class="d-flex align-items-center justify-content-center bg-primary mx-3">
+										<i class="fal fa-image fa-lg text-white"></i>
+									</span>
+									<div class="media-body">
+										<p class="mb-0 font-weight-bold text-muted">
+											{{ photoName }}
+										</p>
+									</div>
+									<button class="btn btn-link font-weight-bold text-decoration-none" @click.prevent="clearFileInputs">
+										Delete
+									</button>
+								</div>
+							</div>
+							<div v-if="videoName && videoName.length" class="bg-light rounded-pill mb-4 py-2">
+								<div class="media align-items-center">
+									<span style="width: 40px;height: 40px;border-radius:50px;opacity: 0.6;" class="d-flex align-items-center justify-content-center bg-primary mx-3">
+										<i class="fal fa-video fa-lg text-white"></i>
+									</span>
+									<div class="media-body">
+										<p class="mb-0 font-weight-bold text-muted">
+											{{ videoName }}
+										</p>
+									</div>
+									<button class="btn btn-link font-weight-bold text-decoration-none" @click.prevent="clearFileInputs">
+										Delete
+									</button>
+								</div>
+							</div>
+						</div>
+
+						<div>
+							<button
+								class="btn btn-light border font-weight-bold py-1 px-2 rounded-lg mr-3"
+								@click="switchTab('photo')"
+								:disabled="photoName || videoName">
+								<i class="fal fa-image mr-2"></i>
+								<span>Add Photo</span>
+							</button>
+							<!-- <button
+								class="btn btn-light border font-weight-bold py-1 px-2 rounded-lg mr-3"
+								@click="switchTab('video')"
+								:disabled="photoName || videoName">
+								<i class="fal fa-video mr-2"></i>
+								<span>Add Video</span>
+							</button>
+							<button
+								v-if="allowPolls"
+								:class="[ tab == 'poll' ? 'btn-primary' : 'btn-light' ]"
+								class="btn border font-weight-bold py-1 px-2 rounded-lg mr-3"
+								@click="switchTab('poll')"
+								:disabled="photoName || videoName">
+
+								<i class="fal fa-poll-h mr-2"></i>
+								<span>Add Poll</span>
+							</button> -->
+							<!-- <button v-if="allowEvent" class="btn btn-light border font-weight-bold py-1 px-2 rounded-lg">
+								<i class="fal fa-calendar-alt mr-1"></i>
+								<span>Create Event</span>
+							</button> -->
+						</div>
+					</div>
+				</div>
+			</div>
+			<p v-if="!isUploading && composeText && composeText.length > 1 || !isUploading && ['photo', 'video'].includes(tab)" class="mb-0">
+				<button class="btn btn-primary font-weight-bold float-right px-5 rounded-pill mt-3" @click="newPost()" :disabled="isPosting">
+					<span v-if="isPosting">
+						<div class="spinner-border text-white spinner-border-sm" role="status">
+							<span class="sr-only">Loading...</span>
+						</div>
+					</span>
+					<span v-else>Post</span>
+				</button>
+			</p>
+		</div>
+	</div>
+</template>
+
+<script type="text/javascript">
+	export default {
+		props: {
+			profile: {
+				type: Object
+			},
+
+			groupId: {
+				type: String
+			}
+		},
+
+		data() {
+			return {
+				config: window.App.config,
+				composeText: undefined,
+				tab: null,
+				placeholder: 'Write something...',
+				allowPhoto: true,
+				allowVideo: true,
+				allowPolls: true,
+				allowEvent: true,
+				pollOptionModel: null,
+				pollOptions: [],
+				pollExpiry: 1440,
+				uploadProgress: 0,
+				isUploading: false,
+				isPosting: false,
+				photoName: undefined,
+				videoName: undefined
+			}
+		},
+
+		methods: {
+			newPost() {
+				if(this.isPosting) {
+					return;
+				}
+
+				this.isPosting = true;
+				let self = this;
+				let type = 'text';
+				let data = new FormData();
+				data.append('group_id', this.groupId);
+				if(this.composeText && this.composeText.length) {
+					data.append('caption', this.composeText);
+				}
+
+				switch(this.tab) {
+					case 'poll':
+						if(!this.pollOptions || this.pollOptions.length < 2 || this.pollOptions.length > 4) {
+							swal('Oops!', 'A poll must have 2-4 choices.', 'error');
+							return;
+						}
+
+						if(!this.composeText || this.composeText.length < 5) {
+							swal('Oops!', 'A poll question must be at least 5 characters.', 'error');
+							return;
+						}
+
+						for (var i = 0; i < this.pollOptions.length; i++) {
+							data.append('pollOptions[]', this.pollOptions[i]);
+						}
+
+						data.append('expiry', this.pollExpiry);
+						type = 'poll';
+					break;
+
+					case 'photo':
+						data.append('photo', this.$refs.photoInput.files[0]);
+						type = 'photo';
+						this.isUploading = true;
+					break;
+
+					case 'video':
+						data.append('video', this.$refs.videoInput.files[0]);
+						type = 'video';
+						this.isUploading = true;
+					break;
+				}
+
+				data.append('type', type);
+
+				axios.post('/api/v0/groups/status/new', data, {
+					onUploadProgress: function(progressEvent) {
+						self.uploadProgress = Math.floor(progressEvent.loaded / progressEvent.total * 100);
+					}
+				})
+				.then(res => {
+					this.isPosting = false;
+					this.isUploading = false;
+					this.uploadProgress = 0;
+					this.composeText = null;
+					this.photo = null;
+					this.tab = null;
+					this.clearFileInputs(false);
+					this.$emit('new-status', res.data);
+				}).catch(err => {
+					if(err.response.status == 422) {
+						this.isPosting = false;
+						this.isUploading = false;
+						this.uploadProgress = 0;
+						this.photo = null;
+						this.tab = null;
+						this.clearFileInputs(false);
+						swal('Oops!', err.response.data.error, 'error');
+					} else {
+						this.isPosting = false;
+						this.isUploading = false;
+						this.uploadProgress = 0;
+						this.photo = null;
+						this.tab = null;
+						this.clearFileInputs(false);
+						swal('Oops!', 'An error occured while processing your request, please try again later', 'error');
+					}
+				});
+			},
+
+			switchTab(newTab) {
+				if(newTab == this.tab) {
+					this.tab = null;
+					this.placeholder = 'Write something...';
+					return;
+				}
+
+				switch(newTab) {
+					case 'poll':
+						this.placeholder = 'Write poll question here...'
+					break;
+
+					case 'photo':
+						this.$refs.photoInput.click();
+					break;
+
+					case 'video':
+						this.$refs.videoInput.click();
+					break;
+
+					default:
+						this.placeholder = 'Write something...';
+				}
+
+				this.tab = newTab;
+			},
+
+			savePollOption() {
+				if(this.pollOptions.indexOf(this.pollOptionModel) != -1) {
+					this.pollOptionModel = null;
+					return;
+				}
+				this.pollOptions.push(this.pollOptionModel);
+				this.pollOptionModel = null;
+			},
+
+			deletePollOption(index) {
+				this.pollOptions.splice(index, 1);
+			},
+
+			handlePhotoChange() {
+				event.currentTarget.blur();
+				this.tab = 'photo';
+				this.photoName = event.target.files[0].name;
+			},
+
+			handleVideoChange() {
+				event.currentTarget.blur();
+				this.tab = 'video';
+				this.videoName = event.target.files[0].name;
+			},
+
+			clearFileInputs(blur = true) {
+				if(blur) {
+ 					event.currentTarget.blur();
+				}
+				this.tab = null;
+				this.$refs.photoInput.value = null;
+				this.photoName = null;
+				this.$refs.videoInput.value = null;
+				this.videoName = null;
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.group-compose-form {
+	}
+</style>
diff --git a/resources/assets/components/groups/partials/GroupEvents.vue b/resources/assets/components/groups/partials/GroupEvents.vue
new file mode 100644
index 000000000..e69de29bb
diff --git a/resources/assets/components/groups/partials/GroupInfoCard.vue b/resources/assets/components/groups/partials/GroupInfoCard.vue
new file mode 100644
index 000000000..455954b8f
--- /dev/null
+++ b/resources/assets/components/groups/partials/GroupInfoCard.vue
@@ -0,0 +1,135 @@
+<template>
+	<div class="group-info-card">
+		<div class="card card-body mt-3 shadow-none border rounded-lg">
+			<p class="title">About</p>
+
+			<p v-if="group.description && group.description.length > 1" class="description" v-html="group.description"></p>
+			<p v-else class="description">This group does not have a description.</p>
+
+		</div>
+		<div class="card card-body mt-3 shadow-none border rounded-lg">
+			<div v-if="group.membership == 'all'" class="fact">
+				<div class="fact-icon">
+					<i class="fal fa-globe fa-lg"></i>
+				</div>
+				<div class="fact-body">
+					<p class="fact-title">Public</p>
+					<p class="fact-subtitle">Anyone can see who's in the group and what they post.</p>
+				</div>
+			</div>
+
+			<div v-if="group.membership == 'private'" class="fact">
+				<div class="fact-icon">
+					<i class="fal fa-lock fa-lg"></i>
+				</div>
+				<div class="fact-body">
+					<p class="fact-title">Private</p>
+					<p class="fact-subtitle">Only members can see who's in the group and what they post.</p>
+				</div>
+			</div>
+
+			<div v-if="group.config.discoverable == true" class="fact">
+				<div class="fact-icon">
+					<i class="fal fa-eye fa-lg"></i>
+				</div>
+				<div class="fact-body">
+					<p class="fact-title">Visible</p>
+					<p class="fact-subtitle">Anyone can find this group.</p>
+				</div>
+			</div>
+
+			<div v-if="group.config.discoverable == false" class="fact">
+				<div class="fact-icon">
+					<i class="fal fa-eye-slash fa-lg"></i>
+				</div>
+				<div class="fact-body">
+					<p class="fact-title">Hidden</p>
+					<p class="fact-subtitle">Only members can find this group.</p>
+				</div>
+			</div>
+
+			<!-- <div class="fact">
+				<div class="fact-icon">
+					<i class="fal fa-map-marker-alt fa-lg"></i>
+				</div>
+				<div class="fact-body">
+					<p class="fact-title">Fediverse</p>
+					<p class="fact-subtitle">This group has not specified a location.</p>
+				</div>
+			</div> -->
+
+			<div class="fact">
+				<div class="fact-icon">
+					<i class="fal fa-users fa-lg"></i>
+				</div>
+				<div class="fact-body">
+					<p class="fact-title"">{{ group.category.name }}</p>
+					<p class="fact-subtitle">Category</p>
+				</div>
+			</div>
+
+			<p class="mb-0 font-weight-light text-lighter">Created: {{ timestampFormat(group.created_at) }}</p>
+		</div>
+	</div>
+</template>
+
+<script type="text/javascript">
+	export default {
+		props: {
+			group: {
+				type: Object
+			}
+		},
+
+		methods: {
+			timestampFormat(date, showTime = false) {
+				let ts = new Date(date);
+				return showTime ? ts.toDateString() + ' · ' + ts.toLocaleTimeString() : ts.toDateString();
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.group-info-card {
+		.title {
+			font-size: 16px;
+			font-weight: bold;
+		}
+
+		.description {
+			font-size: 15px;
+			font-weight:400;
+			color: #6c757d;
+			margin-bottom: 0;
+			white-space: break-spaces;
+		}
+
+		.fact {
+			display: flex;
+			align-items: center;
+			margin-bottom: 1.5rem;
+
+			&-body {
+				flex: 1;
+			}
+
+			&-icon {
+				width: 50px;
+				text-align: center;
+			}
+
+			&-title {
+				font-size: 17px;
+				font-weight: 500;
+				margin-bottom: 0;
+			}
+
+			&-subtitle {
+				font-size: 14px;
+				margin-bottom: 0;
+				color: #6c757d;
+			}
+		}
+	}
+</style>
diff --git a/resources/assets/components/groups/partials/GroupInsights.vue b/resources/assets/components/groups/partials/GroupInsights.vue
new file mode 100644
index 000000000..9909508cb
--- /dev/null
+++ b/resources/assets/components/groups/partials/GroupInsights.vue
@@ -0,0 +1,60 @@
+<template>
+	<div class="group-insights-component">
+		<div class="row justify-content-center">
+			<div class="col-12 col-md-3 mb-3">
+				<div class="bg-light p-3 border rounded d-flex justify-content-between align-items-center">
+					<p class="h3 font-weight-bold mb-0">124K</p>
+					<p class="font-weight-bold text-uppercase text-lighter mb-0">Posts</p>
+				</div>
+			</div>
+
+			<div class="col-12 col-md-3 mb-3">
+				<div class="bg-light p-3 border rounded d-flex justify-content-between align-items-center">
+					<p class="h3 font-weight-bold mb-0">9K</p>
+					<p class="font-weight-bold text-uppercase text-lighter mb-0">Users</p>
+				</div>
+			</div>
+
+			<div class="col-12 col-md-3 mb-3">
+				<div class="bg-light p-3 border rounded d-flex justify-content-between align-items-center">
+					<p class="h3 font-weight-bold mb-0">1.7M</p>
+					<p class="font-weight-bold text-uppercase text-lighter mb-0">Interactions</p>
+				</div>
+			</div>
+		</div>
+		<div class="row justify-content-center">
+			<div class="col-12 col-md-3 mb-3">
+				<div class="bg-light p-3 border rounded d-flex justify-content-between align-items-center">
+					<p class="h3 font-weight-bold mb-0">50</p>
+					<p class="font-weight-bold text-uppercase text-lighter mb-0">Mod Reports</p>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script type="text/javascript">
+	export default {
+		props: {
+			group: {
+				type: Object
+			}
+		},
+
+		data() {
+			return {
+
+			};
+		},
+
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.group-insights-component {
+
+	}
+</style>
diff --git a/resources/assets/components/groups/partials/GroupInviteModal.vue b/resources/assets/components/groups/partials/GroupInviteModal.vue
new file mode 100644
index 000000000..75e5f9f68
--- /dev/null
+++ b/resources/assets/components/groups/partials/GroupInviteModal.vue
@@ -0,0 +1,190 @@
+<template>
+	<div class="group-invite-modal">
+		<b-modal
+			ref="modal"
+			hide-header
+			hide-footer
+			centered
+			rounded
+			body-class="rounded group-invite-modal-wrapper">
+
+			<div class="text-center py-3 d-flex align-items-center flex-column">
+				<div class="bg-light rounded-circle d-flex justify-content-center align-items-center mb-3" style="width: 100px;height: 100px;">
+					<i class="far fa-user-plus fa-2x text-lighter"></i>
+				</div>
+				<p class="h4 font-weight-bold mb-0">Invite Friends</p>
+				<!-- <p class="mb-0">Search {{ group.name }} for posts, comments or members.</p> -->
+			</div>
+
+			<transition name="fade">
+				<div v-if="usernames.length < 5" class="d-flex justify-content-between mt-1">
+					<autocomplete
+						:search="autocompleteSearch"
+						placeholder="Search friends by username"
+						aria-label="Search this group"
+						:get-result-value="getSearchResultValue"
+						:debounceTime="700"
+						@submit="onSearchSubmit"
+						style="width: 100%;"
+						ref="autocomplete"
+						>
+							<template #result="{ result, props }">
+							<li
+							v-bind="props"
+							class="autocomplete-result"
+							>
+								<div class="text-truncate">
+									<p class="result-name mb-0 font-weight-bold">
+										{{ result.username }}
+									</p>
+								</div>
+							</li>
+						</template>
+					</autocomplete>
+
+					<button class="btn btn-light border rounded-circle text-lighter ml-3" style="width: 52px;height:50px;" @click="close">
+						<i class="fal fa-times fa-lg"></i>
+					</button>
+				</div>
+			</transition>
+
+			<transition name="fade">
+				<div v-if="usernames.length" class="pt-3">
+					<div v-for="(result, index) in usernames" class="py-1">
+						<div class="media align-items-center">
+							<img src="/storage/avatars/default.jpg" class="rounded-circle border mr-3" width="45" height="45">
+							<div class="media-body">
+								<p class="lead mb-0">{{ result.username }}</p>
+							</div>
+							<button class="btn btn-link text-lighter btn-sm" @click="removeUsername(index)"><i class="far fa-times-circle fa-lg"></i></button>
+						</div>
+					</div>
+				</div>
+			</transition>
+
+			<transition name="fade">
+				<button v-if="usernames && usernames.length" class="btn btn-primary btn-lg btn-block font-weight-bold rounded font-weight-bold mt-3" @click="submitInvites">Invite</button>
+			</transition>
+
+			<div class="text-center pt-3 small">
+				<p class="mb-0">You can invite up to 5 friends at a time, and 20 friends in total.</p>
+			</div>
+		</b-modal>
+	</div>
+</template>
+
+<script type="text/javascript">
+	import Autocomplete from '@trevoreyre/autocomplete-vue'
+	import '@trevoreyre/autocomplete-vue/dist/style.css'
+
+	export default {
+		props: {
+			group: {
+				type: Object
+			},
+
+			profile: {
+				type: Object
+			}
+		},
+
+		components: {
+			'autocomplete-input': Autocomplete,
+		},
+
+		data() {
+			return {
+				query: '',
+				recent: [],
+				loaded: false,
+				usernames: [],
+				isSubmitting: false
+			}
+		},
+
+		methods: {
+			open() {
+				this.$refs.modal.show();
+			},
+
+			close() {
+				this.$refs.modal.hide();
+			},
+
+			autocompleteSearch(q) {
+				if (!q || q.length == 0) {
+					return [];
+				}
+
+				return axios.post(`/api/v0/groups/search/invite/friends`, {
+					q: q,
+					g: this.group.id,
+					v: '0.2'
+				}).then(res => {
+					let data = res.data.filter(r => {
+						return this.usernames.map(u => u.username).indexOf(r.username) == -1;
+					});
+					return data;
+				});
+				return [];
+			},
+
+			getSearchResultValue(result) {
+				return result.username;
+			},
+
+			onSearchSubmit(result) {
+				this.usernames.push(result);
+				this.$refs.autocomplete.value = '';
+				//
+			},
+
+			removeUsername(index) {
+				event.currentTarget.blur();
+				this.usernames.splice(index, 1);
+			},
+
+			submitInvites() {
+				this.isSubmitting = true;
+				event.currentTarget.blur();
+				axios.post('/api/v0/groups/search/invite/friends/send', {
+					g: this.group.id,
+					uids: this.usernames.map(u => u.id)
+				}).then(res => {
+					this.usernames = [];
+					this.isSubmitting = false;
+					this.close();
+					swal('Success', 'Successfully sent invite(s)', 'success');
+				}).catch(err => {
+					this.usernames = [];
+					this.isSubmitting = false;
+					if(err.response.status === 422) {
+						swal('Error', err.response.data.error, 'error');
+					} else {
+						swal('Oops!', 'An error occured, please try again later', 'error');
+					}
+					this.close();
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.group-invite-modal {
+
+		&-wrapper {
+			.media {
+				height: 60px;
+				padding: 10px;
+				border-radius: 10px;
+				user-select: none;
+				cursor: pointer;
+
+				&:hover {
+					background-color: #E5E7EB;
+				}
+			}
+		}
+	}
+</style>
diff --git a/resources/assets/components/groups/partials/GroupListCard.vue b/resources/assets/components/groups/partials/GroupListCard.vue
new file mode 100644
index 000000000..64300160e
--- /dev/null
+++ b/resources/assets/components/groups/partials/GroupListCard.vue
@@ -0,0 +1,156 @@
+<template>
+	<div class="group-list-card">
+		<div class="media">
+			<div class="media align-items-center">
+				<img
+					v-if="group.metadata && group.metadata.hasOwnProperty('header')"
+					:src="group.metadata.header.url"
+					class="mr-3 border rounded group-header-img"
+					:class="{ compact: compact }">
+
+				<div
+					v-else
+					class="mr-3 border rounded group-header-img"
+					:class="{ compact: compact }">
+					<div
+						class="bg-primary d-flex align-items-center justify-content-center rounded"
+						style="width: 100%; height:100%;">
+						<i class="fal fa-users text-white fa-lg"></i>
+					</div>
+				</div>
+
+				<div class="media-body">
+					<p class="font-weight-bold mb-0 text-dark" style="font-size: 16px;">
+						{{ truncate(group.name || 'Untitled Group', titleLength) }}
+					</p>
+
+					<p class="text-muted mb-1" style="font-size: 12px;">
+						{{ truncate(group.short_description, descriptionLength) }}
+					</p>
+
+					<p v-if="showStats" class="mb-0 small text-lighter">
+						<span>
+							<i class="far fa-users"></i>
+							<span class="small font-weight-bold">{{ prettyCount(group.member_count) }}</span>
+						</span>
+
+						<span v-if="!group.local" class="remote-label ml-3">
+							<i class="fal fa-globe"></i> Remote
+						</span>
+
+						<span v-if="group.hasOwnProperty('admin') && group.admin.hasOwnProperty('username')" class="ml-3">
+							<i class="fal fa-user-crown"></i>
+							<span class="small font-weight-bold">
+								&commat;{{ group.admin.username }}
+							</span>
+						</span>
+					</p>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script type="text/javascript">
+	export default {
+		props: {
+			group: {
+				type: Object
+			},
+
+			compact: {
+				type: Boolean,
+				default: false
+			},
+
+			showStats: {
+				type: Boolean,
+				default: false
+			},
+
+			truncateTitleLength: {
+				type: Number,
+				default: 19
+			},
+
+			truncateDescriptionLength: {
+				type: Number,
+				default: 22
+			}
+		},
+
+		data() {
+			return {
+				titleLength: 40,
+				descriptionLength: 60
+			}
+		},
+
+		mounted() {
+			if(this.compact) {
+				this.titleLength = 19;
+				this.descriptionLength = 22;
+			}
+
+			if(this.truncateTitleLength != 19) {
+				this.titleLength = this.truncateTitleLength;
+			}
+
+			if(this.truncateDescriptionLength != 22) {
+				this.descriptionLength = this.truncateDescriptionLength;
+			}
+		},
+
+		methods: {
+			prettyCount(val) {
+				return App.util.format.count(val);
+			},
+
+			truncate(str, limit = 140) {
+				if(str.length <= limit) {
+					return str;
+				}
+
+				return str.substr(0, limit) + ' ...';
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.group-list-card {
+		.member-label {
+			padding: 2px 5px;
+			font-size: 9px;
+			color: rgba(75, 119, 190, 1);
+			background: rgba(137, 196, 244, 0.2);
+			border: 1px solid rgba(137, 196, 244, 0.3);
+			font-weight: 500;
+			text-transform: capitalize;
+			border-radius: 3px;
+		}
+
+		.remote-label {
+			padding: 2px 5px;
+			font-size: 9px;
+			color: #B45309;
+			background: #FEF3C7;
+			border: 1px solid #FCD34D;
+			font-weight: 500;
+			text-transform: capitalize;
+			border-radius: 3px;
+		}
+
+		.group-header-img {
+			width: 60px;
+			height: 60px;
+			object-fit: cover;
+			padding:0px;
+
+			&.compact {
+				width: 42.5px;
+				height: 42.5px;
+			}
+		}
+	}
+</style>
diff --git a/resources/assets/components/groups/partials/GroupMedia.vue b/resources/assets/components/groups/partials/GroupMedia.vue
new file mode 100644
index 000000000..65a96001d
--- /dev/null
+++ b/resources/assets/components/groups/partials/GroupMedia.vue
@@ -0,0 +1,262 @@
+<template>
+	<div class="group-media-component">
+		<div class="row justify-content-center">
+			<div class="col-12">
+				<div class="card card-body border shadow-sm">
+					<div class="d-flex justify-content-between align-items-center mb-3">
+						<p class="h4 font-weight-bold mb-0">Media</p>
+						<!-- <div>
+							<a href="#" class="font-weight-bold mr-3"><i class="fas fa-plus fa-sm"></i> Create Album</a>
+							<a href="#" class="font-weight-bold">Add Photos/Video</a>
+						</div> -->
+					</div>
+
+					<div v-if="isLoaded">
+						<div class="mb-5">
+							<button
+								:class="[ tab == 'photo' ? 'text-primary font-weight-bold' : 'text-lighter' ]"
+								class="btn btn-light mr-2"
+								@click="switchTab('photo')">
+								Photos
+							</button>
+							<button
+								:class="[ tab == 'video' ? 'text-primary font-weight-bold' : 'text-lighter' ]"
+								class="btn btn-light mr-2"
+								@click="switchTab('video')">
+								Videos
+							</button>
+							<button
+								:class="[ tab == 'album' ? 'text-primary font-weight-bold' : 'text-lighter' ]"
+								class="btn btn-light mr-2"
+								@click="switchTab('album')">
+								Albums
+							</button>
+						</div>
+
+						<div v-if="tab == 'photo'" class="row px-3">
+							<div v-for="(status, index) in photos" class="m-1">
+								<a :href="status.url" class="bh-content">
+									<img :src="getMediaSource(status)" width="205" height="205" style="object-fit: cover;">
+								</a>
+							</div>
+
+							<div v-if="photos.length == 0" class="col-12 py-5 text-center">
+								<p class="lead font-weight-bold mb-0">No photos found</p>
+							</div>
+						</div>
+
+						<div v-if="tab == 'video'" class="row px-3">
+							<div v-for="(status, index) in videos" class="m-1">
+								<a :href="status.url" class="bh-content text-decoration-none">
+									<img v-if="!status.media_attachments[0].preview_url.endsWith('no-preview.png')" :src="getMediaSource(status)" width="205" height="205" style="object-fit: cover;">
+									<div v-else class="bg-light text-dark d-flex align-items-center justify-content-center border" style="width:205px;height:205px;">
+										<p class="font-weight-bold mb-0">No preview available</p>
+									</div>
+								</a>
+							</div>
+
+							<div v-if="videos.length == 0" class="col-12 py-5 text-center">
+								<p class="lead font-weight-bold mb-0">No videos found</p>
+							</div>
+						</div>
+
+						<div v-if="tab == 'album'" class="row px-3">
+							<div v-for="(status, index) in albums" class="m-1">
+								<a :href="status.url" class="bh-content">
+									<img :src="getMediaSource(status)" width="205" height="205" style="object-fit: cover;">
+								</a>
+							</div>
+
+							<div v-if="albums.length == 0" class="col-12 py-5 text-center">
+								<p class="lead font-weight-bold mb-0">No albums found</p>
+							</div>
+						</div>
+
+						<div v-if="hasNextPage[tab]" class="mt-3">
+							<button class="btn btn-light font-weight-bold btn-block border" @click="loadNextPage">Load more</button>
+						</div>
+					</div>
+					<div v-else class="d-flex align-items-center justify-content-center" style="height:500px">
+						<div class="spinner-border text-primary" role="status">
+							<span class="sr-only">Loading...</span>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script type="text/javascript">
+	export default {
+		props: {
+			group: {
+				type: Object
+			}
+		},
+
+		data() {
+			return {
+				isLoaded: false,
+				feed: [],
+				photos: [],
+				videos: [],
+				albums: [],
+				tab: 'photo',
+				tabs: [
+					'photo',
+					'video',
+					'album'
+				],
+				page: {
+					'photo': 1,
+					'video': 1,
+					'album': 1
+				},
+				hasNextPage: {
+					'photo': false,
+					'video': false,
+					'album': false
+				}
+			}
+		},
+
+		mounted() {
+			this.fetchMedia();
+		},
+
+		methods: {
+			fetchMedia() {
+				axios.get('/api/v0/groups/media/list', {
+					params: {
+						gid: this.group.id,
+						page: this.page[this.tab],
+						type: this.tab
+					}
+				}).then(res => {
+					if(res.data.length > 0) {
+						this.hasNextPage[this.tab] = true;
+					}
+
+					this.isLoaded = true;
+
+					res.data.forEach(status => {
+						if(status.pf_type == 'photo') {
+							this.photos.push(status);
+						}
+
+						if(status.pf_type == 'video') {
+							this.videos.push(status);
+						}
+
+						if(status.pf_type == 'photo:album') {
+							this.albums.push(status);
+						}
+					})
+					this.page[this.tab] = this.page[this.tab] + 1;
+				}).catch(err => {
+					this.hasNextPage[this.tab] = false;
+					console.log(err.response);
+				})
+			},
+
+			loadNextPage() {
+				axios.get('/api/v0/groups/media/list', {
+					params: {
+						gid: this.group.id,
+						page: this.page[this.tab],
+						type: this.tab,
+					}
+				}).then(res => {
+					if(res.data.length == 0) {
+						this.hasNextPage[this.tab] = false;
+						return;
+					}
+					res.data.forEach(status => {
+						if(status.pf_type == 'photo') {
+							this.photos.push(status);
+						}
+
+						if(status.pf_type == 'video') {
+							this.videos.push(status);
+						}
+
+						if(status.pf_type == 'photo:album') {
+							this.albums.push(status);
+						}
+					})
+					this.page[this.tab] = this.page[this.tab] + 1;
+				}).catch(err => {
+					this.hasNextPage[this.tab] = false;
+				})
+			},
+
+			formatDate(ts) {
+				return new Date(ts).toDateString();
+			},
+
+			switchTab(tab) {
+				this.tab = tab;
+				this.fetchMedia();
+			},
+
+			lightbox(status) {
+				this.lightboxStatus = status.media_attachments[0];
+				this.$refs.lightboxModal.show();
+			},
+
+			hideLightbox() {
+				this.lightboxStatus = null;
+				this.$refs.lightboxModal.hide();
+			},
+
+			blurhashWidth(status) {
+				if(!status.media_attachments[0].meta) {
+					return 25;
+				}
+				let aspect = status.media_attachments[0].meta.original.aspect;
+				if(aspect == 1) {
+					return 25;
+				} else if(aspect > 1) {
+					return 30;
+				} else {
+					return 20;
+				}
+			},
+
+			blurhashHeight(status) {
+				if(!status.media_attachments[0].meta) {
+					return 25;
+				}
+				let aspect = status.media_attachments[0].meta.original.aspect;
+				if(aspect == 1) {
+					return 25;
+				} else if(aspect > 1) {
+					return 20;
+				} else {
+					return 30;
+				}
+			},
+
+			getMediaSource(status) {
+				let media = status.media_attachments[0];
+
+				if(media.preview_url && media.preview_url.endsWith('storage/no-preview.png')) {
+					return media.url;
+				}
+
+                if(media.preview_url && media.preview_url.length) {
+                    return media.url;
+                }
+
+				return media.url;
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.group-members-component {
+
+	}
+</style>
diff --git a/resources/assets/components/groups/partials/GroupMembers.vue b/resources/assets/components/groups/partials/GroupMembers.vue
new file mode 100644
index 000000000..3913aa93d
--- /dev/null
+++ b/resources/assets/components/groups/partials/GroupMembers.vue
@@ -0,0 +1,684 @@
+<template>
+	<div class="group-members-component">
+		<div class="row justify-content-center">
+			<div class="col-12 col-md-8 mb-5">
+				<div v-if="isAdmin && requestCount && !hideHeader" class="card card-body border shadow-sm bg-dark text-light mb-4 rounded-pill p-2 pl-3">
+					<div class="d-flex align-items-center justify-content-between">
+						<span class="lead mb-0 text-lighter">
+							<i class="fal fa-exclamation-triangle mr-2 text-warning"></i>
+							You have <strong class="text-white">{{ requestCount }}</strong> member applications to review
+						</span>
+						<span>
+							<button class="btn btn-primary font-weight-bold rounded-pill btn-sm px-3" @click="reviewApplicants()">Review</button>
+						</span>
+					</div>
+				</div>
+
+				<div class="card card-body border shadow-sm">
+					<div v-if="!hideHeader">
+						<p class="d-flex align-items-center mb-0">
+							<span class="lead font-weight-bold">Members</span>
+							<span class="mx-2">·</span>
+							<span class="text-muted">{{group.member_count}}</span>
+						</p>
+						<!-- <p class="text-muted mb-0">
+							New people who join this group will appear here. <a class="font-weight-bold text-dark" href="#">Learn More</a>
+						</p> -->
+						<div class="form-group mt-3" style="position: relative;">
+							<i class="fas fa-search fa-lg text-lighter" style="position: absolute;left:20px; top:50%;transform:translateY(-50%);"></i>
+							<input class="form-control form-control-lg bg-light border rounded-pill" style="padding-left: 50px;padding-right: 50px;" placeholder="Find a member" v-model="memberSearchModel">
+							<button class="btn btn-primary font-weight-bold rounded-pill px-3" style="position: absolute;right: 6px; top: 50%;transform: translateY(-50%);">Search</button>
+						</div>
+
+						<hr>
+					</div>
+
+					<div v-if="tab == 'list'">
+						<div class="group-members-component-paginated-list py-3">
+							<div class="media align-items-center">
+								<a :href="profile.url" class="text-dark text-decoration-none">
+									<img
+                                        :src="profile?.avatar"
+                                        width="56"
+                                        height="56"
+                                        class="rounded-circle border mr-2"
+                                        onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'"
+                                    />
+								</a>
+								<div class="media-body">
+									<p class="lead font-weight-bold mb-0">
+										{{profile.username}}
+										<span class="member-label rounded ml-1">Me</span>
+									</p>
+									<p class="text-muted mb-0">Founded group {{formatDate(group.created_at)}}</p>
+								</div>
+								<!-- <button class="btn btn-light border">
+									<i class="fas fa-ellipsis-h text-muted"></i>
+								</button> -->
+							</div>
+						</div>
+
+						<hr v-if="mutual.length > 0">
+
+						<div v-if="mutual.length > 0" class="group-members-component-paginated-list">
+							<p class="font-weight-bold mb-1">Mutual Friends</p>
+
+							<div v-for="(member, index) in mutual" class="media align-items-center py-3">
+								<a :href="member.url" class="text-dark text-decoration-none">
+                                    <img
+                                        :src="member?.avatar"
+                                        width="56"
+                                        height="56"
+                                        class="rounded-circle border mr-2"
+                                        onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'"
+                                    />
+								</a>
+
+								<div class="media-body">
+									<p class="lead font-weight-bold mb-0">
+										<a :href="member.url" class="text-dark text-decoration-none" :title="member.acct" data-toggle="tooltip">{{member.username}}</a>
+										<span v-if="member.role == 'founder'" class="member-label rounded ml-1">Admin</span>
+										<span v-if="!member.local" class="remote-label rounded ml-1">Remote</span>
+									</p>
+									<p class="text-muted mb-0">Member since {{formatDate(member.joined)}}</p>
+								</div>
+								<a
+									class="btn btn-light lead font-weight-bolder px-3 border"
+									:href="'/account/direct/t/' + member.id">
+									<i class="far fa-comment-dots mr-1"></i> Message
+								</a>
+								<b-dropdown
+									v-if="isAdmin"
+									toggle-class="btn btn-light font-weight-bold px-3 border ml-2"
+									toggle-tag="a"
+									:lazy="true"
+									right
+									no-caret>
+									<template #button-content>
+										<i class="fas fa-ellipsis-h"></i>
+									</template>
+									<b-dropdown-item :href="member.url">View Profile</b-dropdown-item>
+									<b-dropdown-item :href="'/account/direct/t/'+member.id">Send Message</b-dropdown-item>
+									<b-dropdown-item>View Activity</b-dropdown-item>
+									<b-dropdown-divider></b-dropdown-divider>
+									<b-dropdown-item link-class="font-weight-bold" @click.prevent="openInteractionLimitModal(member)">Limit interactions</b-dropdown-item>
+									<b-dropdown-item link-class="font-weight-bold text-danger">Remove from group</b-dropdown-item>
+								</b-dropdown>
+							</div>
+						</div>
+
+						<hr v-if="members.length > 0">
+
+						<div v-if="members.length > 0" class="group-members-component-paginated-list">
+							<p class="font-weight-bold mb-1">Other Members</p>
+
+							<div v-for="(member, index) in members" class="media align-items-center py-3">
+								<a :href="member.url" class="text-dark text-decoration-none">
+                                    <img
+                                        :src="member?.avatar"
+                                        width="56"
+                                        height="56"
+                                        class="rounded-circle border mr-2"
+                                        onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'"
+                                    />
+								</a>
+
+								<div class="media-body">
+									<p class="lead font-weight-bold mb-0">
+										<a :href="member.url" class="text-dark text-decoration-none" :title="member.acct" data-toggle="tooltip">{{member.username}}</a>
+										<span v-if="member.is_admin" class="member-label rounded ml-1">Admin</span>
+										<span v-if="!member.local" class="remote-label rounded ml-1">Remote</span>
+									</p>
+									<p class="text-muted mb-0">Member since {{formatDate(member.joined)}}</p>
+								</div>
+								<button
+									:class="[ member.following ? 'btn-primary' : 'btn-light']"
+									class="btn lead font-weight-bolder px-4 border"
+									@click="follow(index)">
+									<span v-if="member.following">
+										Following
+									</span>
+									<span v-else>
+										<i class="fas fa-user-plus mr-2"></i> Follow
+									</span>
+								</button>
+								<b-dropdown
+									v-if="isAdmin"
+									toggle-class="btn btn-light font-weight-bold px-3 border ml-2"
+									toggle-tag="a"
+									:lazy="true"
+									right
+									no-caret>
+									<template #button-content>
+										<i class="fas fa-ellipsis-h"></i>
+									</template>
+									<b-dropdown-item :href="member.url" link-class="font-weight-bold">View Profile</b-dropdown-item>
+									<b-dropdown-item :href="'/account/direct/t/'+member.id" link-class="font-weight-bold">Send Message</b-dropdown-item>
+									<b-dropdown-item link-class="font-weight-bold">View Activity</b-dropdown-item>
+									<b-dropdown-divider></b-dropdown-divider>
+									<b-dropdown-item link-class="font-weight-bold" @click.prevent="openInteractionLimitModal(member)">Limit interactions</b-dropdown-item>
+									<b-dropdown-item link-class="font-weight-bold text-danger">Remove from group</b-dropdown-item>
+								</b-dropdown>
+							</div>
+						</div>
+
+						<p v-if="members.length > 0 && hasNextPage" class="mt-4">
+							<button class="btn btn-light btn-block border font-weight-bold" @click="loadNextPage">Load more</button>
+						</p>
+					</div>
+
+					<div v-if="tab == 'search'" class="d-flex justify-content-center align-items-center" style="min-height: 100px;">
+						<div class="text-center text-muted">
+							<div class="spinner-border" role="status">
+								<span class="sr-only">Loading...</span>
+							</div>
+							<p class="lead mb-0 mt-2">Loading results ...</p>
+						</div>
+					</div>
+
+					<div v-if="tab == 'results'">
+						<div v-if="results.length > 0" class="group-members-component-paginated-list">
+							<p class="font-weight-bold mb-1">Results</p>
+
+							<div v-for="(member, index) in results" class="media align-items-center py-3">
+								<a :href="member.url" class="text-dark text-decoration-none">
+                                    <img
+                                        :src="member?.avatar"
+                                        width="56"
+                                        height="56"
+                                        class="rounded-circle border mr-2"
+                                        onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'"
+                                    />
+								</a>
+
+								<div class="media-body">
+									<p class="lead font-weight-bold mb-0">
+										<a :href="member.url" class="text-dark text-decoration-none" :title="member.acct" data-toggle="tooltip">{{member.username}}</a>
+										<span v-if="member.role == 'founder'" class="member-label rounded ml-1">Admin</span>
+										<span v-if="!member.local" class="remote-label rounded ml-1">Remote</span>
+									</p>
+									<p class="text-muted mb-0">Member since {{formatDate(member.joined)}}</p>
+								</div>
+								<a
+									class="btn btn-light lead font-weight-bolder px-3 border"
+									:href="'/account/direct/t/' + member.id">
+									<i class="far fa-comment-dots mr-1"></i> Message
+								</a>
+								<b-dropdown
+									v-if="isAdmin"
+									toggle-class="btn btn-light font-weight-bold px-3 border ml-2"
+									toggle-tag="a"
+									:lazy="true"
+									right
+									no-caret>
+									<template #button-content>
+										<i class="fas fa-ellipsis-h"></i>
+									</template>
+									<b-dropdown-item :href="member.url">View Profile</b-dropdown-item>
+									<b-dropdown-item :href="'/account/direct/t/'+member.id">Send Message</b-dropdown-item>
+									<b-dropdown-item>View Activity</b-dropdown-item>
+									<b-dropdown-divider></b-dropdown-divider>
+									<b-dropdown-item link-class="font-weight-bold" @click.prevent="openInteractionLimitModal(member)">Limit interactions</b-dropdown-item>
+									<b-dropdown-item link-class="font-weight-bold text-danger">Remove from group</b-dropdown-item>
+								</b-dropdown>
+							</div>
+							<p class="text-center mt-5">
+								<a href="#" class="font-weight-bold" @click="backFromSearch">Go back</a>
+							</p>
+						</div>
+						<div v-else class="text-center text-muted mt-3">
+							<p class="lead">No results found.</p>
+							<p>
+								<a href="#" class="font-weight-bold" @click="backFromSearch">Go back</a>
+							</p>
+						</div>
+					</div>
+
+					<div v-if="tab == 'memberInteractionLimits'">
+						<div v-if="results.length > 0" class="group-members-component-paginated-list">
+							<p class="font-weight-bold mb-1">Interaction Limits</p>
+
+							<div v-for="(member, index) in results" class="media align-items-center py-3">
+								<a :href="member.url" class="text-dark text-decoration-none">
+                                    <img
+                                        :src="member?.avatar"
+                                        width="56"
+                                        height="56"
+                                        class="rounded-circle border mr-2"
+                                        onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'"
+                                    />
+								</a>
+
+								<div class="media-body">
+									<p class="lead font-weight-bold mb-0">
+										<a :href="member.url" class="text-dark text-decoration-none">{{member.username}}</a>
+										<span v-if="member.role == 'founder'" class="member-label rounded ml-1">Admin</span>
+									</p>
+									<p class="text-muted mb-0">Member since {{formatDate(member.joined)}}</p>
+								</div>
+								<a
+									class="btn btn-light lead font-weight-bolder px-3 border"
+									:href="'/account/direct/t/' + member.id">
+									<i class="far fa-comment-dots mr-1"></i> Message
+								</a>
+								<b-dropdown
+									v-if="isAdmin"
+									toggle-class="btn btn-light font-weight-bold px-3 border ml-2"
+									toggle-tag="a"
+									:lazy="true"
+									right
+									no-caret>
+									<template #button-content>
+										<i class="fas fa-ellipsis-h"></i>
+									</template>
+									<b-dropdown-item :href="member.url">View Profile</b-dropdown-item>
+									<b-dropdown-item :href="'/account/direct/t/'+member.id">Send Message</b-dropdown-item>
+									<b-dropdown-item>View Activity</b-dropdown-item>
+									<b-dropdown-divider></b-dropdown-divider>
+									<b-dropdown-item link-class="font-weight-bold" @click.prevent="openInteractionLimitModal(member)">Limit interactions</b-dropdown-item>
+									<b-dropdown-item link-class="font-weight-bold text-danger">Remove from group</b-dropdown-item>
+								</b-dropdown>
+							</div>
+							<p class="text-center mt-5">
+								<a href="#" class="font-weight-bold" @click.prevent="backFromSearch">Go back</a>
+							</p>
+						</div>
+						<div v-else class="text-center text-muted mt-3">
+							<p class="lead">No results found.</p>
+							<p>
+								<a href="#" class="font-weight-bold" @click.prevent="backFromSearch">Go back</a>
+							</p>
+						</div>
+					</div>
+
+					<div v-if="tab == 'review'">
+						<div v-if="reviewsLoaded">
+
+							<div class="group-members-component-paginated-list">
+								<div class="d-flex justify-content-between align-items-center">
+									<div class="d-flex">
+										<button class="btn btn-link btn-sm mr-2" @click="backFromReview">
+											<i class="far fa-chevron-left fa-lg"></i>
+										</button>
+
+										<p class="font-weight-bold mb-0">Review Membership Applicants</p>
+									</div>
+								</div>
+								<hr>
+
+								<div v-for="(member, index) in applicants" class="media align-items-center py-3">
+									<a :href="member.url" class="text-dark text-decoration-none">
+                                        <img
+                                            :src="member?.avatar"
+                                            width="56"
+                                            height="56"
+                                            class="rounded-circle border mr-2"
+                                            onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'"
+                                        />
+									</a>
+
+									<div class="media-body">
+										<p class="lead font-weight-bold mb-0">
+											<a :href="member.url" class="text-dark text-decoration-none" :title="member.acct" data-toggle="tooltip">{{member.username}}</a>
+											<span v-if="!member.local" class="remote-label rounded ml-1">Remote</span>
+										</p>
+										<p class="text-muted mb-0 small">
+											<span>
+												{{ member.followers_count }} Followers
+											</span>
+
+											<span class="mx-1">·</span>
+
+											<span>
+												Joined {{formatDate(member.created_at)}}
+											</span>
+										</p>
+									</div>
+
+									<button
+										type="button"
+										class="btn btn-light lead font-weight-bolder px-3 border"
+										@click="handleApplicant(index, 'ignore')">
+										<i class="far fa-times mr-1"></i> Ignore
+									</button>
+
+									<button
+										type="button"
+										class="btn btn-danger lead font-weight-bolder px-3 border"
+										@click="handleApplicant(index, 'reject')">
+										<i class="far fa-times mr-1"></i> Reject
+									</button>
+
+									<button
+										type="button"
+										class="btn btn-primary lead font-weight-bolder px-3 border"
+										@click="handleApplicant(index, 'approve')">
+										<i class="far fa-check mr-1"></i> Approve
+									</button>
+								</div>
+
+								<button
+									v-if="applicantsCanLoadMore"
+									class="btn btn-light font-weight-bold btn-block"
+									@click="loadMoreApplicants"
+									:disabled="loadingMoreApplicants">
+									Load More
+								</button>
+
+								<div v-if="!applicants || !applicants.length">
+									<p class="text-center lead mb-0">No content found</p>
+									<p class="text-center mb-0">
+										<a class="font-weight-bold" href="#" @click.prevent="backFromReview">Go back</a>
+									</p>
+								</div>
+							</div>
+
+						</div>
+
+						<div v-else class="d-flex align-items-center justify-content-center" style="min-height: 100px;">
+							<b-spinner variant="muted"  />
+						</div>
+					</div>
+
+					<div v-if="tab == 'loading'" class="d-flex align-items-center justify-content-center" style="min-height: 100px;">
+						<b-spinner variant="muted"  />
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<group-interaction-limits-modal
+			ref="interactionModal"
+			:group="group"
+			:profile="activeProfile"
+			/>
+
+	</div>
+</template>
+
+<script type="text/javascript">
+	import InteractionModal from './MemberLimitInteractionsModal.vue';
+
+	export default {
+		props: {
+			group: {
+				type: Object
+			},
+
+			profile: {
+				type: Object
+			},
+
+			requestCount: {
+				type: Number
+			},
+
+			isAdmin: {
+				type: Boolean
+			}
+		},
+
+		components: {
+			'group-interaction-limits-modal': InteractionModal
+		},
+
+		data() {
+			return {
+				members: [],
+				mutual: [],
+				results: [],
+				page: 1,
+				hasNextPage: true,
+				tab: 'list',
+				memberSearchModel: null,
+				activeProfile: undefined,
+				hideHeader: false,
+				reviewsLoaded: false,
+				applicants: [],
+				applicantsPage: 1,
+				applicantsCanLoadMore: false,
+				loadingMoreApplicants: false
+			}
+		},
+
+		mounted() {
+			this.fetchMembers();
+			let u = new URLSearchParams(window.location.search);
+
+			if(this.group.self.role == 'founder') {
+				this.isAdmin = true;
+
+				if(u.has('a')) {
+					if(u.get('a') == 'il') {
+						this.tab = 'loading';
+						let pid = u.get('pid');
+						axios.get('/api/v0/groups/members/get', {
+							params: {
+								gid: this.group.id,
+								pid: pid
+							}
+						})
+						.then(res => {
+							this.results.push(res.data);
+							this.tab = 'memberInteractionLimits';
+							this.openInteractionLimitModal(res.data);
+						});
+					}
+
+					if(u.get('a') == 'review') {
+						this.reviewApplicants();
+					}
+				}
+			} else if (u.has('a')) {
+				history.pushState(null, null, `/groups/${this.group.id}/members`);
+			}
+
+		},
+
+		watch: {
+			memberSearchModel: function(val) {
+				this.handleSearch();
+			}
+		},
+
+		methods: {
+			fetchMembers() {
+				axios.get('/api/v0/groups/members/list', {
+					params: {
+						gid: this.group.id,
+						page: this.page
+					}
+				}).then(res => {
+					let data = res.data.filter(m => {
+						return m.id != this.profile.id;
+					});
+					this.members = data.filter(m => {
+						return !m.following
+					});
+					this.mutual = data.filter(m => {
+						return m.following
+					});
+					this.page++;
+					this.$nextTick(() => {
+						$('[data-toggle="tooltip"]').tooltip()
+					});
+				}).catch(err => {
+					console.log(res.response);
+				})
+			},
+
+			loadNextPage() {
+				axios.get('/api/v0/groups/members/list', {
+					params: {
+						gid: this.group.id,
+						page: this.page
+					}
+				}).then(res => {
+					if(res.data.length == 0) {
+						this.hasNextPage = false;
+						return;
+					}
+
+					let data = res.data.filter(m => {
+						return m.id != this.profile.id;
+					});
+					this.members.push(...data.filter(m => {
+						return !m.following
+					}));
+					this.mutual.push(...data.filter(m => {
+						return m.following
+					}));
+					this.page++;
+					this.$nextTick(() => {
+						$('[data-toggle="tooltip"]').tooltip()
+					});
+				}).catch(err => {
+					console.log(err.response);
+				})
+			},
+
+			follow(index) {
+				axios.post('/i/follow', {
+					item: this.members[index].id
+				}).then(res => {
+					this.members[index].following = !this.members[index].following;
+				}).catch(err => {
+					console.log(err.response);
+				})
+			},
+
+			formatDate(ts) {
+				return new Date(ts).toDateString();
+			},
+
+			handleSearch() {
+				if(!this.memberSearchModel || this.memberSearchModel == "" || this.memberSearchModel.length == 0) {
+					this.tab == 'list';
+					this.memberSearchModel = null;
+					return;
+				}
+
+				this.tab = 'search';
+				this.results = this.members.concat(this.mutual).filter(profile => {
+					return profile.username.includes(this.memberSearchModel);
+				});
+
+				// if(this.results.length) {
+					this.tab = 'results';
+				// }
+			},
+
+			backFromSearch() {
+				event.currentTarget.blur();
+				this.memberSearchModel = null;
+				this.tab = 'list';
+				history.pushState(null, null, `/groups/${this.group.id}/members`);
+			},
+
+			openInteractionLimitModal(member) {
+				this.activeProfile = member;
+				setTimeout(() => {
+					this.$refs.interactionModal.open();
+				}, 500);
+			},
+
+			reviewApplicants() {
+				this.hideHeader = true;
+				this.tab = 'review';
+				history.pushState(null, null, `/groups/${this.group.id}/members?a=review`);
+
+				axios.get('/api/v0/groups/members/requests', {
+					params: {
+						gid: this.group.id
+					}
+				})
+				.then(res => {
+					this.applicants = res.data;
+					this.reviewsLoaded = true;
+					this.applicantsPage = 2;
+					this.applicantsCanLoadMore = res.data.length == 10;
+				})
+			},
+
+			handleApplicant(index, action) {
+				event.currentTarget.blur();
+
+				if(action == 'ignore') {
+					this.applicants.splice(index, 1);
+					return;
+				}
+
+				this.tab = 'loading';
+
+				if(!window.confirm('Are you sure you want to perform this action?')) {
+					return;
+				}
+
+				axios.post('/api/v0/groups/members/request', {
+					gid: this.group.id,
+					pid: this.applicants[index].id,
+					action: action
+				})
+				.then(res => {
+					this.applicants.splice(index, 1);
+					this.tab = 'review';
+					this.$emit('decrementrc');
+					if(action == 'approve') {
+						this.$emit('incrementMemberCount');
+					}
+				})
+			},
+
+			backFromReview() {
+				event.currentTarget.blur();
+				this.memberSearchModel = null;
+				this.tab = 'list';
+				this.hideHeader = false;
+				history.pushState(null, null, `/groups/${this.group.id}/members`);
+			},
+
+			loadMoreApplicants() {
+				this.loadingMoreApplicants = true;
+
+				axios.get('/api/v0/groups/members/requests', {
+					params: {
+						gid: this.group.id,
+						page: this.applicantsPage
+					}
+				})
+				.then(res => {
+					this.applicants.push(...res.data);
+					this.applicantsCanLoadMore = res.data.length == 10;
+					this.applicantsPage++;
+					this.loadingMoreApplicants = false;
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.group-members-component {
+		min-height: 100vh;
+
+		.member-label {
+			padding: 2px 5px;
+			font-size: 12px;
+			color: rgba(75, 119, 190, 1);
+			background: rgba(137, 196, 244, 0.2);
+			border: 1px solid rgba(137, 196, 244, 0.3);
+			font-weight: 400;
+			text-transform: capitalize;
+		}
+
+		.remote-label {
+			padding: 2px 5px;
+			font-size: 12px;
+			color: #B45309;
+			background: #FEF3C7;
+			border: 1px solid #FCD34D;
+			font-weight: 400;
+			text-transform: capitalize;
+		}
+	}
+</style>
diff --git a/resources/assets/components/groups/partials/GroupModeration.vue b/resources/assets/components/groups/partials/GroupModeration.vue
new file mode 100644
index 000000000..54d114391
--- /dev/null
+++ b/resources/assets/components/groups/partials/GroupModeration.vue
@@ -0,0 +1,231 @@
+<template>
+	<div class="group-moderation-component">
+		<div v-if="initalLoad">
+			<div v-if="tab === 'home'">
+				<div class="row justify-content-center">
+					<div class="col-12 col-md-6 pt-4">
+						<div class="d-flex justify-content-between align-items-center mb-3">
+							<p class="lead mb-0">Latest Mod Reports</p>
+							<button class="btn btn-light border font-weight-bold btn-sm rounded shadow-sm">
+								<i class="far fa-redo"></i>
+							</button>
+						</div>
+
+						<div v-if="reports.length" class="list-group">
+							<div v-for="(report, index) in reports" class="list-group-item">
+								<div class="media align-items-center">
+									<img :src="report.profile.avatar" width="40" height="40" class="rounded-circle mr-3">
+									<div class="media-body">
+										<p class="mb-0">
+											<a v-if="report.total_count == 1" class="font-weight-bold" :href="report.profile.url">{{ report.profile.username }}</a>
+											<span v-else>
+												<a class="font-weight-bold" :href="report.profile.url">{{ report.profile.username }}</a> and <a class="font-weight-bold" href="#">{{ report.total_count - 1}} others</a>
+											</span>
+											reported
+											<a href="#" class="font-weight-bold" :id="`report_post:${index}`">this post</a>
+											as {{ report.type }}
+										</p>
+										<p class="mb-0 small">
+											<span class="text-muted font-weight-bold">
+												{{ timeago(report.created_at) }}
+											</span>
+											<!-- <span>·</span>
+											<a class="text-muted font-weight-bold" href="#">
+												View Full Report
+											</a> -->
+											<span>·</span>
+											<a class="text-danger font-weight-bold" href="#" @click.prevent="actionMenu(index)">
+												Actions
+											</a>
+										</p>
+									</div>
+
+									<!-- <div class="text-muted">
+										<button class="btn btn-light btn-sm shadow-sm" @click.prevent="actionMenu(index)">
+											<i class="far fa-cog fa-lg text-lighter"></i>
+										</button>
+									</div> -->
+
+									<b-popover :target="`report_post:${index}`" triggers="hover" placement="bottom" custom-class="popover-wide">
+										<template #title>
+											<div class="d-flex justify-content-between">
+												<span>
+													&commat;{{ report.status.account.username }}
+												</span>
+												<span>
+													{{ timeago(report.status.created_at) }}
+												</span>
+											</div>
+										</template>
+
+										<div v-if="report.status.pf_type == 'group:post'">
+											<div v-if="report.status.media_attachments.length">
+												<img :src="report.status.media_attachments[0].url" width="100%" height="300" style="object-fit:cover;">
+											</div>
+											<div v-else>
+												<p v-html="report.status.content"></p>
+											</div>
+										</div>
+										<div v-else-if="report.status.pf_type == 'reply-text'">
+											<p v-html="report.status.content"></p>
+										</div>
+										<div v-else>
+											<p>Cannot generate preview.</p>
+										</div>
+
+										<p class="mb-1 mt-3">
+											<a class="btn btn-primary btn-block font-weight-bold" :href="report.status.url">View Post</a>
+										</p>
+									</b-popover>
+								</div>
+							</div>
+
+							<div v-if="canLoadMore" class="list-group-item">
+								<button class="btn btn-light font-weight-bold btn-block" @click.prevent="loadMoreReports()">Load more</button>
+							</div>
+						</div>
+						<div v-else class="card card-body shadow-none border rounded-pill">
+							<p class="lead font-weight-bold text-center mb-0">No moderation reports found!</p>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div v-else class="col-12 col-md-6 pt-4 d-flex align-items-center justify-content-center">
+			<div class="spinner-border" role="status">
+				<span class="sr-only">Loading...</span>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script type="text/javascript">
+	export default {
+		props: {
+			group: {
+				type: Object
+			}
+		},
+
+		data() {
+			return {
+				initalLoad: false,
+				reports: [],
+				page: 1,
+				canLoadMore: false,
+				tab: 'home'
+			}
+		},
+
+		mounted() {
+			this.getReports();
+		},
+
+		methods: {
+			getReports() {
+				axios.get(`/api/v0/groups/${this.group.id}/reports/list`)
+				.then(res => {
+					this.reports = res.data;
+					this.initalLoad = true;
+					this.page++;
+					this.canLoadMore = res.data.length == 10;
+				})
+			},
+
+			loadMoreReports() {
+				axios.get(`/api/v0/groups/${this.group.id}/reports/list`, {
+					params: {
+						page: this.page
+					}
+				})
+				.then(res => {
+					this.reports.push(...res.data);
+					this.page++;
+					this.canLoadMore = res.data.length == 10;
+				})
+			},
+
+			timeago(ts) {
+				return App.util.format.timeAgo(ts);
+			},
+
+			actionMenu(index) {
+				event.currentTarget.blur();
+
+				swal({
+					title: "Moderator Action",
+					dangerMode: true,
+					text: "Please select an action to take, press ESC to close",
+					buttons: {
+						ignore: {
+							text: "Ignore",
+							className: "btn-warning",
+							value: "ignore"
+						},
+						cw: {
+							text: "NSFW",
+							className: "btn-warning",
+							value: "cw",
+						},
+						delete: {
+							text: "Delete",
+							className: "btn-danger",
+							value: "delete",
+						},
+					},
+				})
+				.then((value) => {
+					switch (value) {
+
+						case "ignore":
+							axios.post(`/api/v0/groups/${this.group.id}/report/action`, {
+								action: 'ignore',
+								id: this.reports[index].id
+							}).then(res => {
+								let report = this.reports[index];
+								this.$emit('decrement', report.total_count);
+								this.reports.splice(index, 1);
+								this.$bvToast.toast(`Ignored and closed moderation report`, {
+									title: 'Moderation Action',
+									autoHideDelay: 5000,
+									appendToast: true
+								});
+							})
+						break;
+
+						case "cw":
+							axios.post(`/api/v0/groups/${this.group.id}/report/action`, {
+								action: 'cw',
+								id: this.reports[index].id
+							}).then(res => {
+								let report = this.reports[index];
+								this.$emit('decrement', report.total_count);
+								this.reports.splice(index, 1);
+								this.$bvToast.toast(`Succesfully applied content warning and closed moderation report`, {
+									title: 'Moderation Action',
+									autoHideDelay: 5000,
+									appendToast: true
+								});
+							})
+						break;
+
+						case "delete":
+							swal('Oops, this is embarassing!', 'We have not implemented this moderation action yet.', 'error');
+						break;
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.group-moderation-component {
+		min-height: 80vh;
+		margin-bottom: 100px;
+	}
+
+	.popover-wide {
+		min-width: 200px !important;
+	}
+</style>
diff --git a/resources/assets/components/groups/partials/GroupPolls.vue b/resources/assets/components/groups/partials/GroupPolls.vue
new file mode 100644
index 000000000..e69de29bb
diff --git a/resources/assets/components/groups/partials/GroupPostModal.vue b/resources/assets/components/groups/partials/GroupPostModal.vue
new file mode 100644
index 000000000..094d98a26
--- /dev/null
+++ b/resources/assets/components/groups/partials/GroupPostModal.vue
@@ -0,0 +1,152 @@
+<template>
+	<div class="group-post-modal">
+		<b-modal
+			ref="modal"
+			size="xl"
+			hide-footer
+			hide-header
+			centered
+			body-class="gpm p-0">
+			<div class="d-flex">
+				<div class="gpm-media">
+					<img :src="status.media_attachments[0].preview_url">
+				</div>
+				<div class="p-3" style="width: 30%;">
+					<div class="media align-items-center mb-2">
+						<a :href="status.account.url">
+							<img class="rounded-circle media-avatar border mr-2" :src="status.account.avatar" width="32" height="32">
+						</a>
+						<div class="media-body">
+							<div class="media-body-comment">
+								<p class="media-body-comment-username mb-n1">
+									<a :href="status.account.url" class="text-dark text-decoration-none font-weight-bold">
+										{{status.account.acct}}
+									</a>
+								</p>
+								<p class="media-body-comment-timestamp mb-0">
+									<a class="font-weight-light text-muted small" :href="status.url">
+										{{shortTimestamp(status.created_at)}}
+									</a>
+									<span class="text-lighter" style="padding-left:2px;padding-right:2px;">·</span>
+									<span class="text-muted small"><i class="fas fa-globe"></i></span>
+								</p>
+							</div>
+						</div>
+						<div class="text-right" style="flex-grow:1;">
+							<button class="btn btn-link text-dark py-0" type="button">
+								<span class="fas fa-ellipsis-h text-lighter"></span>
+								<span class="sr-only">Post Menu</span>
+							</button>
+						</div>
+					</div>
+
+					<read-more :status="status" />
+
+					<div class="border-top border-bottom mt-3">
+						<div class="d-flex justify-content-between" style="padding: 8px 5px">
+							<button class="btn btn-link py-0 text-decoration-none btn-sm" :class="{ 'font-weight-bold': status.favourited, 'text-primary': status.favourited, 'text-muted': !status.favourited }">
+								<i class="far fa-heart mr-1"></i>
+								{{ status.favourited ? 'Liked' : 'Like' }}
+							</button>
+
+							<button class="btn btn-link py-0 text-decoration-none btn-sm text-muted">
+								<i class="far fa-comment cursor-pointer text-muted mr-1"></i>
+								Comment
+							</button>
+
+							<button class="btn btn-link py-0 text-decoration-none btn-sm" disabled>
+								<i class="fas fa-external-link-alt cursor-pointer text-muted mr-1"></i>
+								Share
+							</button>
+						</div>
+					</div>
+
+					<!-- <comment-drawer
+						:profile="profile"
+						:status="status"
+						:group-id="groupId" /> -->
+				</div>
+			</div>
+		</b-modal>
+	</div>
+</template>
+
+<script type="text/javascript">
+	import ReadMore from './ReadMore.vue';
+	import CommentDrawer from './CommentDrawer.vue';
+
+	export default {
+		props: {
+			groupId: {
+				type: String
+			},
+
+			status: {
+				type: Object
+			},
+
+			profile: {
+				type: Object
+			}
+		},
+
+		components: {
+			"read-more": ReadMore,
+			"comment-drawer": CommentDrawer
+		},
+
+		data() {
+			return {
+				loaded: false
+			}
+		},
+
+		mounted() {
+			this.init();
+		},
+
+		methods: {
+			init() {
+				this.loaded = true;
+				this.$refs.modal.show();
+			},
+
+			shortTimestamp(ts) {
+				return window.App.util.format.timeAgo(ts);
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.gpm {
+		&-media {
+			display: flex;
+			width: 70%;
+
+			img {
+				width: 100%;
+				height: auto;
+				max-height: 70vh;
+				object-fit: contain;
+				background-color: #000;
+			}
+
+		}
+
+		.comment-drawer-component {
+			.my-3 {
+				max-height: 46vh;
+				overflow: auto;
+			}
+		}
+
+		.cdrawer-reply-form {
+			position: absolute;
+			bottom: 0;
+			margin-bottom: 1rem !important;
+			min-width: 310px;
+		}
+	}
+
+</style>
diff --git a/resources/assets/components/groups/partials/GroupSearchModal.vue b/resources/assets/components/groups/partials/GroupSearchModal.vue
new file mode 100644
index 000000000..8cc70039d
--- /dev/null
+++ b/resources/assets/components/groups/partials/GroupSearchModal.vue
@@ -0,0 +1,199 @@
+<template>
+	<div class="group-search-modal">
+		<b-modal
+			ref="modal"
+			hide-header
+			hide-footer
+			centered
+			rounded
+			body-class="rounded group-search-modal-wrapper">
+			<div class="d-flex justify-content-between">
+				<autocomplete
+					:search="autocompleteSearch"
+					placeholder="Search this group"
+					aria-label="Search this group"
+					:get-result-value="getSearchResultValue"
+					:debounceTime="700"
+					@submit="onSearchSubmit"
+					style="width: 100%;"
+					ref="autocomplete"
+					>
+						<template #result="{ result, props }">
+						<li
+						v-bind="props"
+						class="autocomplete-result"
+						>
+							<div class="text-truncate">
+								<p class="result-name mb-0 font-weight-bold">
+									{{ result.username }}
+								</p>
+							</div>
+						</li>
+					</template>
+				</autocomplete>
+
+				<button class="btn btn-light border rounded-circle text-lighter ml-3" style="width: 52px;height:50px;" @click="close">
+					<i class="fal fa-times fa-lg"></i>
+				</button>
+			</div>
+
+			<div v-if="recent && recent.length" class="pt-5">
+				<h5 class="mb-2">Recent Searches</h5>
+				<a v-for="(result, index) in recent" class="media align-items-center text-decoration-none text-dark" :href="result.action">
+					<div class="bg-light rounded-circle mr-3 border d-flex justify-content-center align-items-center" style="width: 40px;height:40px">
+						<i class="far fa-search"></i>
+					</div>
+					<div class="media-body">
+						<p class="mb-0">{{ result.value }}</p>
+					</div>
+				</a>
+			</div>
+
+			<div class="pt-5">
+				<h5 class="mb-2">Explore This Group</h5>
+				<div class="media align-items-center" @click="viewMyActivity">
+					<img
+                        :src="profile?.avatar"
+                        width="40"
+                        height="40"
+                        class="mr-3 border rounded-circle"
+                        onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'"
+                    />
+					<div class="media-body">
+						<p class="mb-0">{{ profile?.display_name || profile?.username }}</p>
+						<p class="mb-0 small text-muted">See your group activity.</p>
+					</div>
+				</div>
+				<div class="media align-items-center" @click="viewGroupSearch">
+					<div class="bg-light rounded-circle mr-3 border d-flex justify-content-center align-items-center" style="width: 40px;height:40px">
+						<i class="far fa-search"></i>
+					</div>
+					<div class="media-body">
+						<p class="mb-0">Search all groups</p>
+					</div>
+				</div>
+			</div>
+
+			<!-- <div class="text-center py-3 small">
+				<p class="lead font-weight-normal mb-0">Looking for something?</p>
+				<p class="mb-0">Search {{ group.name }} for posts, comments or members.</p>
+			</div> -->
+		</b-modal>
+	</div>
+</template>
+
+<script type="text/javascript">
+	import Autocomplete from '@trevoreyre/autocomplete-vue'
+	import '@trevoreyre/autocomplete-vue/dist/style.css'
+
+	export default {
+		props: {
+			group: {
+				type: Object
+			},
+
+			profile: {
+				type: Object
+			}
+		},
+
+		components: {
+			'autocomplete': Autocomplete,
+		},
+
+		data() {
+			return {
+				query: '',
+				recent: [],
+				loaded: false
+			}
+		},
+
+		methods: {
+			open() {
+				this.fetchRecent();
+				this.$refs.modal.show();
+			},
+
+			close() {
+				this.$refs.modal.hide();
+			},
+
+			fetchRecent() {
+				axios.get('/api/v0/groups/search/getrec', {
+					params: {
+						g: this.group.id
+					}
+				}).then(res => {
+					this.recent = res.data;
+				})
+			},
+
+			autocompleteSearch(q) {
+				if (!q || q.length < 2) {
+					return [];
+				}
+
+				return axios.post(`/api/v0/groups/search/lac`, {
+					q: q,
+					g: this.group.id,
+					v: '0.2'
+				}).then(res => {
+					return res.data;
+				});
+				return [];
+			},
+
+			getSearchResultValue(result) {
+				return result.username;
+			},
+
+			onSearchSubmit(result) {
+				if (result.length < 1) {
+					return [];
+				}
+
+				axios.post('/api/v0/groups/search/addrec', {
+					g: this.group.id,
+					q: {
+						value: result.username,
+						action: result.url
+					}
+				}).then(res => {
+					location.href = result.url;
+				});
+			},
+
+			viewMyActivity() {
+				location.href = `/groups/${this.group.id}/user/${this.profile.id}?rf=group_search`;
+			},
+
+			viewGroupSearch() {
+				location.href = `/groups/home?ct=gsearch&rf=group_search&rfid=${this.group.id}`;
+			},
+
+			addToRecentSearches() {
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.group-search-modal {
+
+		&-wrapper {
+			.media {
+				height: 60px;
+				padding: 10px;
+				border-radius: 10px;
+				user-select: none;
+				cursor: pointer;
+
+				&:hover {
+					background-color: #E5E7EB;
+				}
+			}
+		}
+	}
+</style>
diff --git a/resources/assets/components/groups/partials/GroupStatus.vue b/resources/assets/components/groups/partials/GroupStatus.vue
new file mode 100644
index 000000000..fe61c892e
--- /dev/null
+++ b/resources/assets/components/groups/partials/GroupStatus.vue
@@ -0,0 +1,874 @@
+<template>
+	<div class="status-card-component" :class="{ 'status-card-sm': loaded && size === 'small' }">
+		 <div v-if="loaded" class="shadow-none mb-3">
+			<div v-if="status.pf_type !== 'poll'" :class="{ 'border-top-0': !hasTopBorder }" class="card shadow-sm" style="border-radius: 18px !important;">
+                <parent-unavailable
+                    v-if="parentUnavailable == true"
+                    :permalink-mode="permalinkMode"
+                    :permalink-status="childContext"
+                    :status="status"
+                    :profile="profile"
+                    :group-id="groupId"
+                />
+				<div v-else class="card-body pb-0">
+                    <group-post-header
+                        :group="group"
+                        :status="status"
+                        :profile="profile"
+                        :showGroupHeader="showGroupHeader"
+                        :showGroupChevron="showGroupChevron"
+                        v-on:delete="statusDeleted"
+                    />
+
+					<div>
+						<div>
+							<div class="pl-2">
+
+								<div v-if="status.sensitive && status.content.length" class="card card-body shadow-none border bg-light py-2 my-2 text-center user-select-none cursor-pointer" @click="status.sensitive = false">
+									<div class="media justify-content-center align-items-center">
+										<div class="mx-3">
+											<i class="far fa-exclamation-triangle fa-2x text-lighter"></i>
+										</div>
+										<div class="media-body">
+											<p class="font-weight-bold mb-0">Warning, may contain sensitive content. </p>
+											<p class="mb-0 text-lighter small text-center font-weight-bold">Click to view</p>
+										</div>
+									</div>
+								</div>
+
+                                <template v-else>
+								    <p v-html="renderedCaption" class="pt-2 text-break" style="font-size:15px;"></p>
+                                </template>
+
+								<photo-presenter
+									v-if="status.pf_type === 'photo'"
+									class="col px-0 border mb-4 rounded"
+									:status="status"
+									v-on:lightbox="showPostModal"
+									v-on:togglecw="status.sensitive = false"
+									@click="showPostModal"/>
+
+								<video-presenter
+									v-else-if="status.pf_type === 'video'"
+									class="col px-0 border mb-4 rounded"
+									:status="status"
+									v-on:togglecw="status.sensitive = false" />
+
+								<photo-album-presenter
+									v-else-if="status.pf_type === 'photo:album'"
+									class="col px-0 border mb-4 rounded"
+									:status="status" v-on:lightbox="lightbox"
+									v-on:togglecw="status.sensitive = false" />
+
+								<video-album-presenter
+									v-else-if="status.pf_type === 'video:album'"
+									class="col px-0 border mb-4 rounded"
+									:status="status"
+									v-on:togglecw="status.sensitive = false" />
+
+								<mixed-album-presenter
+									v-else-if="status.pf_type === 'photo:video:album'"
+									:status="status"
+									class="col px-0 border mb-4 rounded"
+									v-on:lightbox="lightbox"
+									v-on:togglecw="status.sensitive = false" />
+
+								<div v-if="status.favourites_count || status.reply_count" class="border-top my-0">
+									<div class="d-flex justify-content-between py-2" style="font-size: 14px;">
+										<button v-if="status.favourites_count" class="btn btn-light py-0 text-decoration-none text-dark" style="font-size: 12px; font-weight: 600;" @click="showLikesModal($event)">
+											{{ status.favourites_count }} {{ status.favourites_count == 1 ? 'Like' : 'Likes' }}
+										</button>
+
+										<button v-if="status.reply_count" class="btn btn-light py-0 text-decoration-none text-dark" style="font-size: 12px; font-weight: 600;" @click="commentFocus($event)">
+											{{ status.reply_count }} {{ status.reply_count == 1 ? 'Comment' : 'Comments' }}
+										</button>
+									</div>
+								</div>
+
+								<div v-if="profile" class="border-top my-0">
+									<div class="d-flex justify-content-between py-2 px-4">
+										<!-- <button class="btn btn-link py-0 text-decoration-none" :class="{ 'font-weight-bold': status.favourited, 'text-primary': status.favourited, 'text-muted': !status.favourited }"
+												@click="likeStatus(status, $event);">
+											<i class="far fa-heart mr-1">
+											</i>
+											{{ status.favourited ? 'Liked' : 'Like' }}
+										</button> -->
+										<div>
+											<button :id="'lr__'+status.id" class="btn btn-link py-0 text-decoration-none" :class="{ 'font-weight-bold': status.favourited, 'text-primary': status.favourited, 'text-muted': !status.favourited }" @click="likeStatus(status, $event);">
+												<i class="far fa-heart mr-1"></i>
+												{{ status.favourited ? 'Liked' : 'Like' }}
+											</button>
+										</div>
+
+										<button class="btn btn-link py-0 text-decoration-none text-muted" @click="commentFocus($event)">
+											<i class="far fa-comment cursor-pointer text-muted mr-1">
+											</i>
+											Comment
+										</button>
+
+										<button class="btn btn-link py-0 text-decoration-none" disabled>
+											<i class="fas fa-external-link-alt cursor-pointer text-muted mr-1">
+											</i>
+											Share
+										</button>
+									</div>
+								</div>
+
+								<comment-drawer
+									v-if="showCommentDrawer"
+									:permalink-mode="permalinkMode"
+									:permalink-status="childContext"
+									:status="status"
+									:profile="profile"
+									:group-id="groupId" />
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+
+			<div v-else class="border">
+				<poll-card :status="status" :profile="profile" v-on:status-delete="statusDeleted" :showBorder="false" />
+
+				<div class="bg-white" style="padding: 0 1.25rem">
+					<div v-if="profile" class="border-top my-0">
+						<div class="d-flex justify-content-between py-2 px-4">
+							<!-- <button class="btn btn-link py-0 text-decoration-none" :class="{ 'font-weight-bold': status.favourited, 'text-primary': status.favourited, 'text-muted': !status.favourited }" @click="likeStatus(status, $event);"> -->
+							<div>
+								<button :id="'lr__'+status.id" class="btn btn-link py-0 text-decoration-none" :class="{ 'font-weight-bold': status.favourited, 'text-primary': status.favourited, 'text-muted': !status.favourited }" @click="likeStatus(status, $event);">
+									<i class="far fa-heart mr-1"></i>
+									{{ status.favourited ? 'Liked' : 'Like' }}
+								</button>
+
+								<b-popover :target="'lr__'+status.id" triggers="hover" placement="top">
+									<template #title>Popover Title</template>
+									I am popover <b>component</b> content!
+								</b-popover>
+							</div>
+
+							<button class="btn btn-link py-0 text-decoration-none text-muted" @click="commentFocus($event)">
+								<i class="far fa-comment cursor-pointer text-muted mr-1"></i>
+								Comment
+							</button>
+
+							<button class="btn btn-link py-0 text-decoration-none" disabled>
+								<i class="fas fa-external-link-alt cursor-pointer text-muted mr-1">
+								</i>
+								Share
+							</button>
+						</div>
+					</div>
+
+					<comment-drawer
+						v-if="showCommentDrawer"
+						:permalink-mode="permalinkMode"
+						:permalink-status="childContext"
+						:profile="profile"
+						:status="status"
+						:group-id="groupId" />
+				</div>
+			</div>
+
+			<!-- <div v-else class="card rounded-0 border-top-0 status-card card-md-rounded-0 shadow-none border">
+				<div v-if="status" class="card-header d-inline-flex align-items-center bg-white">
+					<div>
+						<img class="rounded-circle box-shadow" :src="status.account.avatar" width="32px" height="32px" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'" alt="avatar">
+					</div>
+					<div class="pl-2">
+						<a class="username font-weight-bold text-dark text-decoration-none text-break" v-bind:href="profileUrl(status)" v-html="statusCardUsernameFormat(status)">
+							Loading...
+						</a>
+						<span v-if="status.account.is_admin" class="fa-stack" title="Admin Account" data-toggle="tooltip" style="height:1em; line-height:1em; max-width:19px;">
+							<i class="fas fa-certificate text-danger fa-stack-1x"></i>
+							<i class="fas fa-crown text-white fa-sm fa-stack-1x" style="font-size:7px;"></i>
+						</span>
+						<div class="d-flex align-items-center">
+							<a v-if="status.place" class="small text-decoration-none text-muted" :href="'/discover/places/'+status.place.id+'/'+status.place.slug" title="Location" data-toggle="tooltip"><i class="fas fa-map-marked-alt"></i> {{status.place.name}}, {{status.place.country}}</a>
+						</div>
+					</div>
+					<div class="text-right" style="flex-grow:1;">
+						<button class="btn btn-link text-dark py-0" type="button" @click="ctxMenu()">
+							<span class="fas fa-ellipsis-h text-lighter"></span>
+							<span class="sr-only">Post Menu</span>
+						</button>
+					</div>
+				</div>
+
+				<div class="postPresenterContainer" style="background: #000;">
+
+					<div v-if="status.pf_type === 'photo'" class="w-100">
+						<photo-presenter
+							:status="status"
+							v-on:lightbox="lightbox"
+							v-on:togglecw="status.sensitive = false"/>
+					</div>
+
+					<div v-else-if="status.pf_type === 'video'" class="w-100">
+						<video-presenter :status="status" v-on:togglecw="status.sensitive = false"></video-presenter>
+					</div>
+
+					<div v-else-if="status.pf_type === 'photo:album'" class="w-100">
+						<photo-album-presenter :status="status" v-on:lightbox="lightbox" v-on:togglecw="status.sensitive = false"></photo-album-presenter>
+					</div>
+
+					<div v-else-if="status.pf_type === 'video:album'" class="w-100">
+						<video-album-presenter :status="status" v-on:togglecw="status.sensitive = false"></video-album-presenter>
+					</div>
+
+					<div v-else-if="status.pf_type === 'photo:video:album'" class="w-100">
+						<mixed-album-presenter :status="status" v-on:lightbox="lightbox" v-on:togglecw="status.sensitive = false"></mixed-album-presenter>
+					</div>
+
+					<div v-else class="w-100">
+						<p class="text-center p-0 font-weight-bold text-white">Error: Problem rendering preview.</p>
+					</div>
+
+				</div>
+
+				<div v-if="config.features.label.covid.enabled && status.label && status.label.covid == true" class="card-body border-top border-bottom py-2 cursor-pointer pr-2" @click="labelRedirect()">
+					<p class="font-weight-bold d-flex justify-content-between align-items-center mb-0">
+						<span>
+							<i class="fas fa-info-circle mr-2"></i>
+							For information about COVID-19, {{config.features.label.covid.org}}
+						</span>
+						<span>
+							<i class="fas fa-chevron-right text-lighter"></i>
+						</span>
+					</p>
+				</div>
+
+				<div class="card-body">
+					<div v-if="reactionBar" class="reactions my-1 pb-2">
+						<h3 v-if="status.favourited" class="fas fa-heart text-danger pr-3 m-0 cursor-pointer" title="Like" v-on:click="likeStatus(status, $event);"></h3>
+						<h3 v-else class="far fa-heart pr-3 m-0 like-btn text-dark cursor-pointer" title="Like" v-on:click="likeStatus(status, $event);"></h3>
+						<h3 v-if="!status.comments_disabled" class="far fa-comment text-dark pr-3 m-0 cursor-pointer" title="Comment" v-on:click="commentFocus(status, $event)"></h3>
+						<span v-if="status.taggedPeople.length" class="float-right">
+							<span class="font-weight-light small" style="color:#718096">
+								<i class="far fa-user" data-toggle="tooltip" title="Tagged People"></i>
+								<span v-for="(tag, index) in status.taggedPeople" class="mr-n2">
+									<a :href="'/'+tag.username">
+										<img :src="tag.avatar" width="20px" height="20px" class="border rounded-circle" data-toggle="tooltip" :title="'@'+tag.username" alt="Avatar">
+									</a>
+								</span>
+							</span>
+						</span>
+					</div>
+
+					<div v-if="status.liked_by.username && status.liked_by.username !== profile.username" class="likes mb-1">
+						<span class="like-count">Liked by
+							<a class="font-weight-bold text-dark" :href="status.liked_by.url">{{status.liked_by.username}}</a>
+							<span v-if="status.liked_by.others == true">
+								and <span class="font-weight-bold" v-if="status.liked_by.total_count_pretty">{{status.liked_by.total_count_pretty}}</span> <span class="font-weight-bold">others</span>
+							</span>
+						</span>
+					</div>
+					<div v-if="status.pf_type != 'text'" class="caption">
+						<p v-if="!status.sensitive" class="mb-2 read-more" style="overflow: hidden;">
+							<span class="username font-weight-bold">
+								<bdi><a class="text-dark" :href="profileUrl(status)">{{status.account.username}}</a></bdi>
+							</span>
+							<span class="status-content" v-html="status.content"></span>
+						</p>
+					</div>
+					<div class="timestamp mt-2">
+						<p class="small mb-0">
+							<a v-if="status.visibility != 'archived'" :href="statusUrl(status)" class="text-muted text-uppercase">
+								<timeago :datetime="status.created_at" :auto-update="60" :converter-options="{includeSeconds:true}" :title="timestampFormat(status.created_at)" v-b-tooltip.hover.bottom></timeago>
+							</a>
+							<span v-else class="text-muted text-uppercase">
+								Posted <timeago :datetime="status.created_at" :auto-update="60" :converter-options="{includeSeconds:true}" :title="timestampFormat(status.created_at)" v-b-tooltip.hover.bottom></timeago>
+							</span>
+
+							<span v-if="recommended">
+								<span class="px-1">&middot;</span>
+								<span class="text-muted">Based on popular and trending content</span>
+							</span>
+						</p>
+					</div>
+				</div>
+			</div> -->
+
+			<!-- <div v-else :class="{ 'border-top-0': !hasTopBorder }" class="card shadow-none border rounded-0">
+				<div class="card-body pb-0">
+					<div class="media">
+						<img class="rounded-circle box-shadow mr-2" :src="status.account.avatar" width="42px" height="42px" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'" alt="avatar">
+						<div class="media-body">
+							<div class="pl-2 d-flex align-items-top">
+								<div>
+									<p class="mb-0">
+										<a class="username font-weight-bold text-dark text-decoration-none text-break" v-bind:href="profileUrl(status)" v-html="statusCardUsernameFormat(status)">
+											Loading...
+										</a>
+									</p>
+									<p class="mb-0">
+										<a class="font-weight-light text-muted small"
+										   :href="statusUrl(status)">{{shortTimestamp(status.created_at)}}</a>
+										<span class="text-lighter" style="padding-left:2px;padding-right:2px;">·</span>
+										<span class="text-muted small"><i class="fas fa-globe"></i></span>
+									</p>
+								</div>
+								<span class="text-right" style="flex-grow:1;">
+									<button class="btn btn-link text-dark py-0" type="button" @click="ctxMenu()">
+										<span class="fas fa-ellipsis-h text-lighter"></span>
+										<span class="sr-only">Post Menu</span>
+									</button>
+								</span>
+							</div>
+						</div>
+					</div>
+					<div>
+						<div>
+							<div class="pl-2">
+
+								<details v-if="status.sensitive">
+									<summary class="mb-2 font-weight-bold text-muted">Content Warning</summary>
+									<p v-html="status.content" class="pt-2 text-break status-content"></p>
+								</details>
+
+								<p v-else v-html="status.content" class="pt-2 text-break" style="font-size:15px;"></p>
+
+								<div class="mb-1 row px-3">
+									<photo-presenter
+										v-if="status.pf_type === 'photo'"
+										class="col px-0 border mb-4 rounded"
+										:status="status"
+										v-on:lightbox="lightbox"
+										v-on:togglecw="status.sensitive = false"/>
+
+									<video-presenter
+										v-else-if="status.pf_type === 'video'"
+										class="col px-0 border mb-4 rounded"
+										:status="status"
+										v-on:togglecw="status.sensitive = false" />
+
+									<photo-album-presenter
+										v-else-if="status.pf_type === 'photo:album'"
+										class="col px-0 border mb-4 rounded"
+										:status="status" v-on:lightbox="lightbox"
+										v-on:togglecw="status.sensitive = false" />
+
+									<video-album-presenter
+										v-else-if="status.pf_type === 'video:album'"
+										class="col px-0 border mb-4 rounded"
+										:status="status"
+										v-on:togglecw="status.sensitive = false" />
+
+									<mixed-album-presenter
+										v-else-if="status.pf_type === 'photo:video:album'"
+										:status="status"
+										class="col px-0 border mb-4 rounded"
+										v-on:lightbox="lightbox"
+										v-on:togglecw="status.sensitive = false" />
+								</div>
+
+								<div>
+									<div class="pl-2">
+
+										<div v-if="status.favourites_count || status.reply_count" class="border-top my-0">
+											<div class="d-flex justify-content-between py-2" style="font-size: 14px;font-weight: 400;">
+												<div v-if="status.favourites_count">
+													{{ status.favourites_count }} Likes
+												</div>
+
+												<button v-if="status.reply_count" class="btn btn-link py-0 text-decoration-none text-dark" @click="commentFocus($event)">
+													{{ status.reply_count }} Comments
+												</button>
+											</div>
+										</div>
+
+										<div class="border-top my-0">
+											<div class="d-flex justify-content-between py-2 px-4">
+												<button class="btn btn-link py-0 text-decoration-none" :class="{ 'font-weight-bold': status.favourited, 'text-primary': status.favourited, 'text-muted': !status.favourited }"
+														@click="likeStatus(status, $event);">
+													<i class="far fa-heart mr-1">
+													</i>
+													{{ status.favourited ? 'Liked' : 'Like' }}
+												</button>
+
+												<button class="btn btn-link py-0 text-decoration-none text-muted" @click="commentFocus($event)">
+													<i class="far fa-comment cursor-pointer text-muted mr-1">
+													</i>
+													Comment
+												</button>
+
+												<button class="btn btn-link py-0 text-decoration-none" disabled>
+													<i class="fas fa-external-link-alt cursor-pointer text-muted mr-1">
+													</i>
+													Share
+												</button>
+											</div>
+										</div>
+
+										<comment-drawer
+											v-if="showCommentDrawer"
+											:status="permalinkMode ? parentContext : status"
+											:profile="profile"
+											:permalink-mode="permalinkMode"
+											:permalink-status="childContext"
+											:group-id="groupId" />
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div> -->
+
+			<context-menu
+				v-if="profile"
+				ref="contextMenu"
+				:status="status"
+				:profile="profile"
+				:group-id="groupId"
+				v-on:status-delete="statusDeleted"
+			/>
+
+			<post-modal
+				v-if="showModal"
+				ref="modal"
+				:status="status"
+				:profile="profile"
+				:groupId="groupId"
+				/>
+
+		</div>
+
+		<div v-else class="card card-body shadow-none border mb-3" style="height: 200px;">
+			<div class="w-100 h-100 d-flex justify-content-center align-items-center">
+				<div class="spinner-border text-primary" role="status">
+					<span class="sr-only">Loading...</span>
+				</div>
+			</div>
+		</div>
+
+		<!-- <b-modal
+			v-if="likes && likes.length"
+			ref="likeBox"
+			title="Liked by"
+			size="sm"
+			centered
+			hide-footer
+			title="Likes"
+			body-class="list-group-flush py-3 px-0">
+			<div class="list-group">
+				<div class="list-group-item border-0 py-1" v-for="(user, index) in likes" :key="'modal_likes_'+index+status.id">
+					<div class="media">
+						<a :href="user.url">
+							<img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '’s avatar'" width="30px" onerror="this.onerror=null;this.src='/storage/avatars/default.jpg';">
+						</a>
+						<div class="media-body">
+							<p class="mb-0" style="font-size: 14px">
+								<a :href="user.url" class="font-weight-bold text-dark">
+									{{user.username}}
+								</a>
+							</p>
+							<p v-if="!user.local" class="text-muted mb-0 text-truncate mr-3" style="font-size: 14px" :title="user.acct" data-toggle="dropdown" data-placement="bottom">
+								<span class="font-weight-bold">{{user.acct.split('@')[0]}}</span><span class="text-lighter">&commat;{{user.acct.split('@')[1]}}</span>
+							</p>
+							<p v-else class="text-muted mb-0 text-truncate" style="font-size: 14px">
+								{{user.display_name}}
+							</p>
+						</div>
+					</div>
+				</div>
+				<infinite-loading v-if="likes && likes.length" @infinite="infiniteLikesHandler" spinner="spiral">
+					<div slot="no-more"></div>
+					<div slot="no-results"></div>
+				</infinite-loading>
+			</div>
+		</b-modal> -->
+	</div>
+</template>
+
+<script type="text/javascript">
+	import CommentDrawer from './CommentDrawer.vue';
+	import ContextMenu from './ContextMenu.vue';
+	import PollCard from '~/partials/PollCard.vue';
+	import MixedAlbumPresenter from '@/presenter/MixedAlbumPresenter.vue';
+	import PhotoAlbumPresenter from '@/presenter/PhotoAlbumPresenter.vue';
+	import PhotoPresenter from '@/presenter/PhotoPresenter.vue';
+	import VideoAlbumPresenter from '@/presenter/VideoAlbumPresenter.vue';
+	import VideoPresenter from '@/presenter/VideoPresenter.vue';
+	import GroupPostModal from './GroupPostModal.vue';
+    import { autoLink } from 'twitter-text';
+    import ParentUnavailable from '@/groups/partials/Status/ParentUnavailable.vue';
+    import GroupPostHeader from '@/groups/partials/Status/GroupHeader.vue';
+
+	export default {
+		props: {
+			groupId: {
+				type: String
+			},
+
+			group: {
+				type: Object
+			},
+
+			profile: {
+				type: Object
+			},
+
+			prestatus: {
+				type: Object
+			},
+
+			recommended: {
+				type: Boolean,
+				default: false
+			},
+
+			reactionBar: {
+				type: Boolean,
+				default: true
+			},
+
+			hasTopBorder: {
+				type: Boolean,
+				default: true
+			},
+
+			size: {
+				type: String,
+				validator: (val) => ['regular', 'small'].includes(val),
+				default: 'regular'
+			},
+
+			permalinkMode: {
+				type: Boolean,
+				default: false
+			},
+
+			showGroupChevron: {
+				type: Boolean,
+				default: false
+			},
+
+			showGroupHeader: {
+				type: Boolean,
+				default: false
+			}
+		},
+
+		components: {
+			"comment-drawer": CommentDrawer,
+			"context-menu": ContextMenu,
+			"poll-card": PollCard,
+			"mixed-album-presenter": MixedAlbumPresenter,
+			"photo-album-presenter": PhotoAlbumPresenter,
+			"photo-presenter": PhotoPresenter,
+			"video-album-presenter": VideoAlbumPresenter,
+			"video-presenter": VideoPresenter,
+			"post-modal": GroupPostModal,
+            "parent-unavailable": ParentUnavailable,
+            "group-post-header": GroupPostHeader
+		},
+
+		data() {
+			return {
+				config: window.App.config,
+				status: {},
+				loaded: false,
+				replies: [],
+				replyId: null,
+				lightboxMedia: false,
+				showSuggestions: true,
+				showReadMore: true,
+				replyStatus: {},
+				replyText: '',
+				replyNsfw: false,
+				emoji: window.App.util.emoji,
+				commentDrawerKey: 0,
+				showCommentDrawer: false,
+				parentContext: undefined,
+				childContext: undefined,
+				parentUnavailable: undefined,
+				showModal: false,
+				likes: [],
+				likesPage: 1,
+				openLikesModal: false,
+			}
+		},
+
+        computed: {
+            renderedCaption: {
+                get() {
+                    if(this.prestatus) {
+                        const gid = this.prestatus.gid;
+                        if(this.prestatus.content == null) {
+                            return ""
+                        }
+                        return autoLink(
+                            this.prestatus.content,
+                            {
+                                hashtagUrlBase: App.config.site.url + `/groups/${gid}/topics/`,
+                                usernameUrlBase: App.config.site.url + `/groups/${gid}/username/`
+                            }
+                        )
+                    }
+
+                    return this.prestatus.content;
+                }
+            }
+        },
+
+		mounted() {
+			this.status = this.prestatus;
+			let self = this;
+			setTimeout(() => {
+				if(this.permalinkMode == true && this.prestatus.in_reply_to_id) {
+					self.childContext = self.status;
+					axios.get('/api/v0/groups/status', {
+						params: {
+							gid: self.groupId,
+							sid: self.status.in_reply_to_id
+						}
+					}).then(res => {
+						self.status = res.data;
+						self.parentUnavailable = false;
+						self.showCommentDrawer = true;
+						self.parentContext = res.data;
+						self.loaded = true;
+					}).catch(err => {
+						self.status = this.prestatus;
+						self.parentUnavailable = true;
+						self.showCommentDrawer = true;
+						self.parentContext = this.prestatus;
+						self.loaded = true;
+					});
+				} else {
+					self.parentUnavailable = false;
+					self.showCommentDrawer = false;
+					self.loaded = true;
+				}
+			}, 100);
+		},
+
+		methods: {
+			formatCount(count) {
+				return App.util.format.count(count);
+			},
+
+			statusUrl(status) {
+				if(status.local == true) {
+					return status.url;
+				}
+
+				return '/i/web/post/_/' + status.account.id + '/' + status.id;
+			},
+
+			profileUrl(status) {
+				if(status.local == true) {
+					return status.account.url;
+				}
+
+				return '/i/web/profile/_/' + status.account.id;
+			},
+
+			timestampFormat(timestamp) {
+				let ts = new Date(timestamp);
+				return ts.toDateString() + ' ' + ts.toLocaleTimeString();
+			},
+
+			shortTimestamp(ts) {
+				return window.App.util.format.timeAgo(ts);
+			},
+
+			statusCardUsernameFormat(status) {
+				if(status.account.local == true) {
+					return status.account.username;
+				}
+
+				let fmt = window.App.config.username.remote.format;
+				let txt = window.App.config.username.remote.custom;
+				let usr = status.account.username;
+				let dom = document.createElement('a');
+				dom.href = status.account.url;
+				dom = dom.hostname;
+
+				switch(fmt) {
+					case '@':
+					return usr + '<span class="text-lighter font-weight-bold">@' + dom + '</span>';
+					break;
+
+					case 'from':
+					return usr + '<span class="text-lighter font-weight-bold"> <span class="font-weight-normal">from</span> ' + dom + '</span>';
+					break;
+
+					case 'custom':
+					return usr + '<span class="text-lighter font-weight-bold"> ' + txt + ' ' + dom + '</span>';
+					break;
+
+					default:
+					return usr + '<span class="text-lighter font-weight-bold">@' + dom + '</span>';
+					break;
+				}
+			},
+
+			lightbox(status) {
+				window.location.href = status.media_attachments[0].url;
+			},
+
+			labelRedirect(type) {
+				let url = '/i/redirect?url=' + encodeURI(this.config.features.label.covid.url);
+				window.location.href = url;
+			},
+
+			likeStatus(status, event) {
+				event.currentTarget.blur();
+				let count = status.favourites_count;
+                let state = status.favourited ? 'unlike' : 'like';
+				axios.post('/api/v0/groups/status/' + state, {
+					sid: status.id,
+					gid: this.groupId
+				}).then(res => {
+					status.favourited = state;
+					status.favourites_count = state? count + 1 : count - 1;
+					status.favourited = state;
+					if(status.favourited) {
+						setTimeout(function() {
+							event.target.classList.add('animate__animated', 'animate__bounce');
+						},100);
+					}
+				}).catch(err => {
+					if(err.response.status == 422) {
+						swal('Error', err.response.data.error, 'error');
+					} else {
+						swal('Error', 'Something went wrong, please try again later.', 'error');
+					}
+				});
+				window.navigator.vibrate(200);
+			},
+
+			commentFocus($event) {
+				$event.target.blur();
+				this.showCommentDrawer = !this.showCommentDrawer;
+			},
+
+			commentSubmit(status, $event) {
+				this.replySending = true;
+				let id = status.id;
+				let comment = this.replyText;
+				let limit = this.config.uploader.max_caption_length;
+				if(comment.length > limit) {
+					this.replySending = false;
+					swal('Comment Too Long', 'Please make sure your comment is '+limit+' characters or less.', 'error');
+					return;
+				}
+				axios.post('/i/comment', {
+					item: id,
+					comment: comment,
+					sensitive: this.replyNsfw
+				}).then(res => {
+					this.replyText = '';
+					this.replies.push(res.data.entity);
+					this.$refs.replyModal.hide();
+				});
+				this.replySending = false;
+			},
+
+			owner(status) {
+				return this.profile.id === status.account.id;
+			},
+
+			admin() {
+				return this.profile.is_admin == true;
+			},
+
+			ownerOrAdmin(status) {
+				return this.owner(status) || this.admin();
+			},
+
+			ctxMenu() {
+				this.$refs.contextMenu.open();
+			},
+
+			timeAgo(ts) {
+				return App.util.format.timeAgo(ts);
+			},
+
+			statusDeleted(status) {
+				this.$emit('status-delete');
+			},
+
+			showPostModal() {
+				this.showModal = true;
+				this.$refs.modal.init();
+			},
+
+			showLikesModal(event) {
+				if(event && event.hasOwnProperty('currentTarget')) {
+					event.currentTarget().blur();
+				}
+
+				this.$emit('likes-modal');
+				return;
+
+				if(this.likes.length) {
+					this.$refs.likeBox.show();
+					return;
+				}
+
+				axios.get('/api/v0/groups/'+this.groupId+'/likes/'+this.status.id)
+				.then(res => {
+					this.likes = res.data.data;
+					this.$refs.likeBox.show();
+				});
+			},
+
+			infiniteLikesHandler($state) {
+				axios.get('/api/v0/groups/'+this.groupId+'/likes/'+this.status.id, {
+					params: {
+						page: this.likesPage,
+					},
+				}).then(({ data }) => {
+					if (data.data.length > 0) {
+						this.likes.push(...data.data);
+						this.likesPage++;
+						$state.loaded();
+					} else {
+						$state.complete();
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.status-card-component {
+		.status-content {
+			font-size: 17px;
+		}
+
+		&.status-card-sm {
+			.status-content {
+				font-size: 14px;
+			}
+
+			.fa-lg {
+				font-size: unset;
+				line-height: unset;
+				vertical-align: unset;
+			}
+		}
+	}
+
+	.reaction-bar {
+		width: auto;
+		max-width: unset;
+		left: -50px !important;
+		border: 1px solid #F3F4F6 !important;
+
+		.popover-body {
+			padding: 2px;
+		}
+
+		.arrow {
+			display: none;
+		}
+
+		img {
+			width: 48px;
+		}
+	}
+</style>
diff --git a/resources/assets/components/groups/partials/GroupTopics.vue b/resources/assets/components/groups/partials/GroupTopics.vue
new file mode 100644
index 000000000..ed4885b1e
--- /dev/null
+++ b/resources/assets/components/groups/partials/GroupTopics.vue
@@ -0,0 +1,73 @@
+<template>
+	<div class="group-topics-component">
+		<div class="row justify-content-center">
+			<div class="col-12 col-md-8">
+				<div class="card card-body border shadow-sm">
+					<div class="d-flex justify-content-between align-items-center mb-3">
+						<p class="h4 font-weight-bold mb-0">Group Topics</p>
+						<select class="form-control bg-light rounded-lg border font-weight-bold py-2" style="width:95px;" disabled>
+							<option>All</option>
+							<option>Pinned</option>
+						</select>
+					</div>
+
+					<div v-if="feed.length">
+						<div v-for="(tag, index) in feed" class="">
+							<div class="media py-2">
+								<i class="fas fa-hashtag fa-lg text-lighter mr-3 mt-2"></i>
+								<div :class="{ 'border-bottom': index != feed.length - 1 }" class="media-body">
+									<a :href="tag.url" class="font-weight-bold mb-1 text-dark" style="font-size: 16px;">
+										{{ tag.name }}
+									</a>
+									<p style="font-size: 13px;" class="text-muted">{{ tag.count }} posts in this group</p>
+								</div>
+							</div>
+						</div>
+					</div>
+
+					<div v-else class="py-5">
+						<p class="lead text-center font-weight-bold">No topics found</p>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script type="text/javascript">
+	export default {
+		props: {
+			group: {
+				type: Object
+			}
+		},
+
+		data() {
+			return {
+				feed: []
+			}
+		},
+
+		mounted() {
+			this.fetchTopics();
+		},
+
+		methods: {
+			fetchTopics() {
+				axios.get('/api/v0/groups/topics/list', {
+					params: {
+						gid: this.group.id
+					}
+				}).then(res => {
+					this.feed = res.data;
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.group-topics-component {
+		margin-bottom: 50vh;
+	}
+</style>
diff --git a/resources/assets/components/groups/partials/LeaveGroup.vue b/resources/assets/components/groups/partials/LeaveGroup.vue
new file mode 100644
index 000000000..417c29347
--- /dev/null
+++ b/resources/assets/components/groups/partials/LeaveGroup.vue
@@ -0,0 +1,9 @@
+<template>
+	
+</template>
+
+<script type="text/javascript">
+	export default {
+		
+	}
+</script>
diff --git a/resources/assets/components/groups/partials/MemberLimitInteractionsModal.vue b/resources/assets/components/groups/partials/MemberLimitInteractionsModal.vue
new file mode 100644
index 000000000..143b47575
--- /dev/null
+++ b/resources/assets/components/groups/partials/MemberLimitInteractionsModal.vue
@@ -0,0 +1,172 @@
+<template>
+	<div>
+		<b-modal
+			v-if="profile && profile.hasOwnProperty('avatar')"
+			ref="home"
+			hide-footer
+			centered
+			rounded
+			title="Limit Interactions"
+			body-class="rounded">
+
+			<div class="media mb-3">
+				<a :href="profile.url" class="text-dark text-decoration-none">
+					<img :src="profile.avatar" width="56" height="56" class="rounded-circle border mr-2" />
+				</a>
+
+				<div class="media-body">
+					<p class="lead font-weight-bold mb-0">
+						<a :href="profile.url" class="text-dark text-decoration-none">{{profile.username}}</a>
+						<span v-if="profile.role == 'founder'" class="member-label rounded ml-1">Admin</span>
+					</p>
+					<p class="text-muted mb-0">Member since {{formatDate(profile.joined)}}</p>
+				</div>
+			</div>
+
+			<div class="w-100 bg-light mb-1 font-weight-bold d-flex justify-content-center align-items-center border rounded" style="min-height:240px;">
+				<div v-if="limitsLoaded" class="py-3">
+					<p class="lead mb-0">Interaction Permissions</p>
+					<p class="small text-muted">Last updated: {{ updated ? formatDate(updated) : 'Never' }}</p>
+
+					<div class="form-check">
+						<input class="form-check-input" type="checkbox" v-model="limits.can_post" :disabled="savingChanges">
+						<label class="form-check-label">
+							Can create posts
+						</label>
+					</div>
+
+					<div class="form-check">
+						<input class="form-check-input" type="checkbox" v-model="limits.can_comment" :disabled="savingChanges">
+						<label class="form-check-label">
+							Can create comments
+						</label>
+					</div>
+
+					<div class="form-check">
+						<input class="form-check-input" type="checkbox" v-model="limits.can_like" :disabled="savingChanges">
+						<label class="form-check-label">
+							Can like posts and comments
+						</label>
+					</div>
+
+					<hr>
+
+					<button class="btn btn-primary font-weight-bold float-right" @click.prevent="saveChanges" :disabled="savingChanges" style="width:130px;">
+						<b-spinner v-if="savingChanges" variant="light" small />
+						<span v-else>Save changes</span>
+					</button>
+				</div>
+				<div v-else class="d-flex align-items-center flex-column">
+					 <b-spinner variant="muted"  />
+					 <p class="pt-3 small text-muted font-weight-bold">Loading interaction limits...</p>
+				</div>
+			</div>
+		</b-modal>
+	</div>
+</template>
+
+<script type="text/javascript">
+	export default {
+		props: {
+			group: {
+				type: Object
+			},
+			profile: {
+				type: Object
+			}
+		},
+
+		data() {
+			return {
+				limitsLoaded: false,
+				limits: {
+					can_post: true,
+					can_comment: true,
+					can_like: true
+				},
+				updated: null,
+				savingChanges: false
+			}
+		},
+
+		methods: {
+			fetchInteractionLimits() {
+				axios.get(`/api/v0/groups/${this.group.id}/members/interaction-limits`, {
+					params: {
+						profile_id: this.profile.id
+					}
+				})
+				.then(res => {
+					this.limits = res.data.limits;
+					this.updated = res.data.updated_at;
+					this.limitsLoaded = true;
+				}).catch(err => {
+					this.$refs.home.hide();
+					swal('Oops!', 'Cannot fetch interaction limits at this time, please try again later.', 'error');
+				})
+			},
+
+			open(profile) {
+				this.loaded = true;
+				this.$refs.home.show();
+				this.fetchInteractionLimits();
+			},
+
+			formatDate(ts) {
+				return new Date(ts).toDateString();
+			},
+
+			saveChanges() {
+				event.currentTarget.blur();
+				this.savingChanges = true;
+
+				axios.post(`/api/v0/groups/${this.group.id}/members/interaction-limits`, {
+					profile_id: this.profile.id,
+					can_post: this.limits.can_post,
+					can_comment: this.limits.can_comment,
+					can_like: this.limits.can_like,
+				})
+				.then(res => {
+					this.savingChanges = false;
+					this.$refs.home.hide();
+
+					this.$bvToast.toast(`Updated interaction limits for ${this.profile.username}`, {
+						title: 'Success',
+						variant: 'success',
+						autoHideDelay: 5000
+					});
+				}).catch(err => {
+					this.savingChanges = false;
+					this.$refs.home.hide();
+
+					if(err.response.status == 422 && err.response.data.error == 'limit_reached') {
+							swal('Limit Reached', 'You cannot add any more member limitations', 'info');
+							// swal({
+							// 	title: 'Limit Reached',
+							// 	text: 'You cannot add any more member limitations',
+							// 	icon: 'info',
+							// 	buttons: {
+							// 		info: {
+							// 			className: 'btn-light border',
+							// 			text: 'More info',
+							// 			value: 'more-info'
+							// 		},
+
+							// 		ok: {
+							// 			text: 'Ok',
+							// 			value: null
+							// 		},
+							// 	}
+							// }).then(value => {
+							// 	if(value == 'more-info') {
+							// 		location.href = '/site/kb/groups/interaction-limits';
+							// 	}
+							// });
+					} else {
+						swal('Oops!', 'An error occured while processing this request, please try again later.', 'error');
+					}
+				});
+			}
+		}
+	}
+</script>
diff --git a/resources/assets/components/groups/partials/Membership/MemberOnlyWarning.vue b/resources/assets/components/groups/partials/Membership/MemberOnlyWarning.vue
new file mode 100644
index 000000000..cea224a5f
--- /dev/null
+++ b/resources/assets/components/groups/partials/Membership/MemberOnlyWarning.vue
@@ -0,0 +1,38 @@
+<template>
+    <div class="member-only-warning">
+        <div class="member-only-warning-wrapper">
+            <h3>Content unavailable</h3>
+            <p>You need to join this Group before you can access this content.</p>
+        </div>
+    </div>
+</template>
+
+<style lang="scss" scoped>
+    .member-only-warning {
+        display: flex;
+        justify-content: center;
+
+        &-wrapper {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            flex-direction: column;
+            width: 100%;
+            max-width: 550px;
+            border-radius: 10px;
+            border: 1px solid var(--border-color);
+            padding: 4rem 1rem;
+
+
+            h3 {
+                font-weight: bold;
+                letter-spacing: -1px;
+            }
+
+            p {
+                font-size: 1.2em;
+                margin-bottom: 0px;
+            }
+        }
+    }
+</style>
diff --git a/resources/assets/components/groups/partials/Page/GroupBanner.vue b/resources/assets/components/groups/partials/Page/GroupBanner.vue
new file mode 100644
index 000000000..8038cdce5
--- /dev/null
+++ b/resources/assets/components/groups/partials/Page/GroupBanner.vue
@@ -0,0 +1,44 @@
+<template>
+    <div class="px-md-5" style="background-color: #fff;">
+        <img
+            v-if="group.metadata && group.metadata.hasOwnProperty('header')"
+            :src="group.metadata.header.url"
+            class="header-image">
+        <div v-else class="header-jumbotron"></div>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            group: {
+                type: Object
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .header-image {
+        width: 100%;
+        height: auto;
+        object-fit: cover;
+        max-height: 220px;
+        border-bottom-left-radius: 5px;
+        border-bottom-right-radius: 5px;
+        margin-top:-1px;
+        border: 1px solid var(--light);
+        margin-bottom: 0px;
+
+        @media(min-width: 768px) {
+            max-height: 420px;
+        }
+    }
+
+    .header-jumbotron {
+        background-color: #F3F4F6;
+        height: 320px;
+        border-bottom-left-radius: 20px;
+        border-bottom-right-radius: 20px;
+    }
+</style>
diff --git a/resources/assets/components/groups/partials/Page/GroupHeaderDetails.vue b/resources/assets/components/groups/partials/Page/GroupHeaderDetails.vue
new file mode 100644
index 000000000..baeb2dfd5
--- /dev/null
+++ b/resources/assets/components/groups/partials/Page/GroupHeaderDetails.vue
@@ -0,0 +1,199 @@
+<template>
+    <div class="col-12 group-feed-component-header px-3 px-md-5">
+        <div class="media align-items-end">
+            <img
+                v-if="group.metadata && group.metadata.hasOwnProperty('avatar')"
+                :src="group.metadata.avatar.url"
+                width="169"
+                height="169"
+                class="bg-white mx-4 rounded-circle border shadow p-1"
+                style="object-fit: cover;"
+                :style="{ 'margin-top': group.metadata && group.metadata.hasOwnProperty('header') && group.metadata.header.url ? '-100px' : '0' }"
+            />
+
+            <div v-if="!group || !group.name" class="media-body">
+                <h3 class="d-flex align-items-start">
+                    <span>Loading...</span>
+                </h3>
+            </div>
+            <div v-else class="media-body px-3">
+                <h3 class="d-flex align-items-start">
+                    <span>{{ group.name.slice(0,118) }}</span>
+                    <sup v-if="group.verified" class="fa-stack ml-n2" title="Verified Group" data-toggle="tooltip">
+                        <i class="fas fa-circle fa-stack-1x fa-lg" style="color: #22a7f0cc;font-size:18px"></i>
+                        <i class="fas fa-check fa-stack-1x text-white" style="font-size:10px"></i>
+                    </sup>
+                </h3>
+                <p class="text-muted mb-0" style="font-weight: 300;">
+                    <span>
+                        <i class="fas fa-globe mr-1"></i>
+                        {{ group.membership == 'all' ? 'Public Group' : 'Private Group'}}
+                    </span>
+                    <span class="mx-2">
+                        ·
+                    </span>
+                    <span>{{ group.member_count == 1 ? group.member_count + ' Member' : group.member_count + ' Members' }}</span>
+                    <span class="mx-2">
+                        ·
+                    </span>
+                    <span v-if="group.local" class="rounded member-label">Local</span>
+                    <span v-else class="rounded remote-label">Remote</span>
+                    <span v-if="group.self && group.self.hasOwnProperty('role') && group.self.role">
+                        <span class="mx-2">
+                            ·
+                        </span>
+                        <span class="rounded member-label">{{ group.self.role }}</span>
+                    </span>
+                </p>
+            </div>
+        </div>
+        <div v-if="group && group.self">
+            <button v-if="!isMember && !group.self.is_requested" class="btn btn-primary cta-btn font-weight-bold" @click="joinGroup" :disabled="requestingMembership">
+                <span v-if="!requestingMembership">
+                    {{ group.membership == 'all' ? 'Join' : 'Request Membership' }}
+                </span>
+                <div
+                    v-else
+                    class="spinner-border spinner-border-sm"
+                    role="status">
+                    <span class="sr-only">Loading...</span>
+                </div>
+            </button>
+
+            <button
+                v-else-if="!isMember && group.self.is_requested"
+                class="btn btn-light border cta-btn font-weight-bold"
+                @click.prevent="cancelJoinRequest">
+                <i class="fas fa-user-clock mr-1"></i> Requested to Join
+            </button>
+
+            <button
+                v-else-if="!isAdmin && isMember && !group.self.is_requested"
+                type="button"
+                class="btn btn-light border cta-btn font-weight-bold"
+                @click.prevent="leaveGroup">
+                <i class="fas sign-out-alt mr-1"></i> Leave Group
+            </button>
+
+            <!-- <div v-if="isAdmin">
+                <a
+                    class="btn btn-light border cta-btn font-weight-bold"
+                    :href="group.url + '/settings'">
+                    Settings
+                </a>
+            </div> -->
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            group: {
+                type: Object
+            },
+            isAdmin: {
+                type: Boolean,
+                default: false
+            },
+            isMember: {
+                type: Boolean,
+                default: false
+            }
+        },
+
+        data() {
+            return {
+                requestingMembership: false,
+            }
+        },
+
+        methods: {
+            joinGroup() {
+                this.requestingMembership = true;
+
+                axios.post('/api/v0/groups/'+this.group.id+'/join')
+                .then(res => {
+                    this.requestingMembership = false;
+                    this.$emit('refresh');
+                }).catch(err => {
+                    let body = err.response;
+
+                    if(body.status == 422) {
+                        this.requestingMembership = false;
+                        swal('Oops!', body.data.error, 'error');
+                    }
+                });
+            },
+
+            cancelJoinRequest() {
+                if(!window.confirm('Are you sure you want to cancel your request to join this group?')) {
+                    return;
+                }
+
+                axios.post('/api/v0/groups/'+this.group.id+'/cjr')
+                .then(res => {
+                    this.requestingMembership = false;
+                    this.$emit('refresh');
+                }).catch(err => {
+                    let body = err.response;
+
+                    if(body.status == 422) {
+                        swal('Oops!', body.data.error, 'error');
+                    }
+                });
+            },
+
+            leaveGroup() {
+                if(!window.confirm('Are you sure you want to leave this group? Any content you shared will remain accessible. You won\'t be able to rejoin for 24 hours.')) {
+                    return;
+                }
+
+                axios.post('/api/v0/groups/'+this.group.id+'/leave')
+                .then(res => {
+                    this.$emit('refresh');
+                });
+            },
+        }
+    }
+</script>
+
+<style lang="scss">
+    .group-feed-component {
+        &-header {
+            display: flex;
+            justify-content: space-between;
+            align-items: flex-end;
+            padding: 1rem 0;
+            background-color: transparent;
+
+            .cta-btn {
+                width: 190px;
+            }
+        }
+
+        .member-label {
+            padding: 2px 5px;
+            font-size: 12px;
+            color: rgba(75, 119, 190, 1);
+            background:rgba(137, 196, 244, 0.2);
+            border:1px solid rgba(137, 196, 244, 0.3);
+            font-weight:400;
+            text-transform: capitalize;
+        }
+
+        .dropdown-item {
+            font-weight: 600;
+        }
+
+        .remote-label {
+            padding: 2px 5px;
+            font-size: 12px;
+            color: #B45309;
+            background: #FEF3C7;
+            border: 1px solid #FCD34D;
+            font-weight: 400;
+            text-transform: capitalize;
+        }
+    }
+</style>
diff --git a/resources/assets/components/groups/partials/Page/GroupNavTabs.vue b/resources/assets/components/groups/partials/Page/GroupNavTabs.vue
new file mode 100644
index 000000000..c0a8827ea
--- /dev/null
+++ b/resources/assets/components/groups/partials/Page/GroupNavTabs.vue
@@ -0,0 +1,167 @@
+<template>
+    <div>
+    <div class="col-12 border-top group-feed-component-menu px-5">
+        <ul class="nav font-weight-bold group-feed-component-menu-nav">
+            <li class="nav-item">
+                <router-link :to="`/groups/${group.id}/about`" class="nav-link">About</router-link>
+            </li>
+            <li class="nav-item">
+                <router-link :to="`/groups/${group.id}`" class="nav-link" exact>Feed</router-link>
+            </li>
+            <li v-if="group?.self && group.self.is_member" class="nav-item">
+                <router-link :to="`/groups/${group.id}/topics`" class="nav-link">Topics</router-link>
+            </li>
+            <li v-if="group?.self && group.self.is_member" class="nav-item">
+                <router-link :to="`/groups/${group.id}/members`" class="nav-link">
+                    Members
+                    <span v-if="group.self.is_member && isAdmin && atabs.request_count" class="badge badge-danger rounded-pill ml-2" style="height: 20px;padding:4px 8px;font-size: 11px;">{{atabs.request_count}}</span>
+                </router-link>
+            </li>
+            <!-- <li v-if="group.self.is_member" class="nav-item">
+                <a :class="{active: tab == 'events'}" class="nav-link" href="#" @click.prevent="switchTab('events')">Events</a>
+            </li> -->
+            <li v-if="group?.self && group.self.is_member" class="nav-item">
+                <router-link :to="`/groups/${group.id}/media`" class="nav-link">Media</router-link>
+            </li>
+            <!-- <li v-if="group.self.is_member" class="nav-item">
+                <a class="nav-link" href="#">Popular</a>
+            </li> -->
+            <!-- <li v-if="group.self.is_member" class="nav-item">
+                <a :class="{active: tab == 'polls'}" class="nav-link" href="#" @click.prevent="switchTab('polls')">Polls</a>
+            </li> -->
+
+            <!-- <li v-if="group.self.is_member && isAdmin" class="nav-item">
+                <a class="nav-link" href="#">Messages</a>
+            </li> -->
+
+            <!-- <li v-if="group.self.is_member && isAdmin" class="nav-item">
+                <a :class="{active: tab == 'insights'}" class="nav-link" href="#" @click.prevent="switchTab('insights')">Insights</a>
+            </li> -->
+            <!-- <li v-if="group.self.is_member && isAdmin && group.membership != 'all'" class="nav-item">
+                <a :class="{active: tab == 'requests'}" class="nav-link" href="#" @click.prevent="switchTab('requests')">
+                    <span class="mr-2">
+                        <i class="far fa-user-plus mr-1"></i>
+                        Requests
+                    </span>
+                    <span v-if="atabs.request_count" class="badge badge-danger rounded-pill" style="height: 20px;padding:4px 8px;font-size: 11px;">{{atabs.request_count}}</span>
+                    <span v-if="atabs.request_count" class="badge badge-danger rounded-pill" style="height: 20px;padding:4px 8px;font-size: 11px;">99+</span>
+                </a>
+            </li> -->
+            <li v-if="group?.self && group.self.is_member && isAdmin" class="nav-item">
+                <router-link :to="`/groups/${group.id}/moderation`" class="nav-link d-flex align-items-top">
+                    <span class="mr-2">Moderation</span>
+                    <span v-if="atabs.moderation_count" class="badge badge-danger rounded-pill" style="height: 20px;padding:4px 8px;font-size: 11px;">{{atabs.moderation_count}}</span>
+                </router-link>
+            </li>
+        </ul>
+        <div>
+            <button
+                v-if="group?.self && group.self.is_member"
+                class="btn btn-light btn-sm border px-3 rounded-pill mr-2"
+                @click="showSearchModal">
+                <i class="far fa-search"></i>
+            </button>
+            <div class="dropdown d-inline">
+                <button class="btn btn-light btn-sm border px-3 rounded-pill dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    <i class="far fa-cog"></i>
+                </button>
+                <div class="dropdown-menu dropdown-menu-right">
+                    <a class="dropdown-item" href="#" @click.prevent="copyLink">
+                        Copy Group Link
+                    </a>
+
+                    <a class="dropdown-item" href="#" @click.prevent="showInviteModal">
+                        Invite friends
+                    </a>
+
+                    <a v-if="!isAdmin" class="dropdown-item" href="#" @click.prevent="reportGroup">
+                        Report Group
+                    </a>
+
+                    <a v-if="isAdmin" class="dropdown-item" :href="group.url + '/settings'">
+                        Settings
+                    </a>
+                </div>
+            </div>
+        </div>
+
+    </div>
+        <search-modal
+            ref="searchModal"
+            :group="group"
+            :profile="profile"
+        />
+    </div>
+</template>
+
+<script>
+    import SearchModal from '@/groups/partials/GroupSearchModal.vue';
+    export default {
+        props: {
+            group: {
+                type: Object
+            },
+            isAdmin: {
+                type: Boolean,
+                default: false
+            },
+            isMember: {
+                type: Boolean,
+                default: false
+            },
+            atabs: {
+                type: Object
+            },
+            profile: {
+                type: Object
+            }
+        },
+
+        components: {
+            'search-modal': SearchModal,
+        },
+
+        methods: {
+            showSearchModal() {
+                event.currentTarget.blur();
+                this.$refs.searchModal.open();
+            },
+
+            // showInviteModal() {
+            //     event.currentTarget.blur();
+            //     this.$refs.inviteModal.open();
+            // },
+        }
+    }
+</script>
+<style lang="scss">
+    .group-feed-component {
+        &-menu {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            padding: 0;
+
+            &-nav {
+                .nav-item {
+                    .nav-link {
+                        padding-top: 1rem;
+                        padding-bottom: 1rem;
+                        color: #6c757d;
+
+                        &.active {
+                            color: #2c78bf;
+                            border-bottom: 2px solid #2c78bf;
+                        }
+                    }
+                }
+
+                &:not(last-child) {
+                    .nav-item {
+                        margin-right: 14px;
+                    }
+                }
+            }
+        }
+    }
+</style>
diff --git a/resources/assets/components/groups/partials/ReadMore.vue b/resources/assets/components/groups/partials/ReadMore.vue
new file mode 100644
index 000000000..9dabf199d
--- /dev/null
+++ b/resources/assets/components/groups/partials/ReadMore.vue
@@ -0,0 +1,51 @@
+<template>
+	<div class="read-more-component" style="word-break: break-all;">
+		<div v-if="status.content.length < 200" v-html="content"></div>
+		<div v-else>
+			<span v-html="content"></span>
+			<a
+				v-if="cursor == 200 || fullContent.length > cursor"
+				class="font-weight-bold text-muted" href="#"
+				style="display: block;white-space: nowrap;"
+				@click.prevent="readMore">
+				<i class="d-none fas fa-caret-down"></i> Read more...
+			</a>
+		</div>
+	</div>
+</template>
+
+<script type="text/javascript">
+	export default {
+		props: {
+			status: {
+				type: Object
+			},
+
+			cursorLimit: {
+				type: Number,
+				default: 200
+			}
+		},
+
+		data() {
+			return {
+				fullContent: null,
+				content: null,
+				cursor: 200
+			}
+		},
+
+		mounted() {
+			this.cursor = this.cursorLimit;
+			this.fullContent = this.status.content;
+			this.content = this.status.content.substr(0, this.cursor);
+		},
+
+		methods: {
+			readMore() {
+				this.cursor = this.cursor + 200;
+				this.content = this.fullContent.substr(0, this.cursor);
+			}
+		}
+	}
+</script>
diff --git a/resources/assets/components/groups/partials/SelfDiscover.vue b/resources/assets/components/groups/partials/SelfDiscover.vue
new file mode 100644
index 000000000..2fb15a39f
--- /dev/null
+++ b/resources/assets/components/groups/partials/SelfDiscover.vue
@@ -0,0 +1,465 @@
+<template>
+	<div class="self-discover-component col-12 col-md-9 bg-lighter border-left mb-4">
+		<div class="px-5">
+            <div class="jumbotron my-4 text-light bg-mantle">
+            	<div class="container">
+            		<h1 class="display-4">Discover</h1>
+                	<p class="lead mb-0">Explore group communities and topics</p>
+            		<!-- <p class="lead">
+            			<button class="btn btn-outline-light">Browse Categories</button>
+            		</p> -->
+            	</div>
+            </div>
+        </div>
+
+		<div v-if="tab === 'home'" class="px-5">
+            <div class="row mb-4 pt-5">
+				<div class="col-12 col-md-4">
+					<h4 class="font-weight-bold">Popular</h4>
+					<div class="list-group list-group-scroll">
+						<a v-for="(group, index) in popularGroups"
+							class="list-group-item p-1"
+							:href="group.url">
+							<group-list-card :group="group" :compact="true" />
+						</a>
+					</div>
+				</div>
+
+				<div class="col-12 col-md-4">
+					<div class="card card-body shadow-none bg-mantle text-light" style="margin-top: 33px;">
+						<h3 class="mb-4 font-weight-lighter">Discover communities and topics based on your interests</h3>
+						<p class="mb-0">
+							<button class="btn btn-outline-light font-weight-light btn-block" @click="toggleTab('categories')">Browse Categories</button>
+						</p>
+					</div>
+
+					<div class="card card-body shadow-none bg-light text-dark border" style="margin-top: 20px;">
+						<p class="lead mb-4 text-muted font-weight-lighter mb-1">Browse Public Groups</p>
+						<!-- <p class="lead mb-4 text-muted font-weight-lighter">Tips for growing your group membership</p> -->
+						<!-- <h5 class="mb-4 text-muted font-weight-lighter">Create and easily organize events</h5> -->
+						<p class="mb-0">
+							<button class="btn btn-light border font-weight-light btn-block">Group Directory</button>
+						</p>
+					</div>
+				</div>
+
+				<div class="col-12 col-md-4">
+					<h4 class="font-weight-bold">New</h4>
+					<div class="list-group list-group-scroll">
+						<a v-for="(group, index) in newGroups"
+							class="list-group-item p-1"
+							:href="group.url">
+							<group-list-card :group="group" :compact="true" />
+						</a>
+					</div>
+				</div>
+			</div>
+
+			<div class="jumbotron mb-4 text-light bg-black" style="margin-top: 5rem;">
+            	<div class="container">
+            		<h1 class="display-4">Across the Fediverse</h1>
+                	<p class="mb-0">
+                		<button
+                			class="btn btn-outline-light"
+                			@click="toggleTab('fediverseGroups')"
+                			>
+                			Explore fediverse groups <i class="fal fa-chevron-right ml-2"></i>
+                		</button>
+                	</p>
+                	<hr class="my-4">
+                	<p class="lead">We're in the early stages of Group federation, and working with other projects to support cross-platform compatibility. <a href="#">Learn more about group federation <i class="fal fa-chevron-right ml-2 fa-sm"></i></a></p>
+            	</div>
+            </div>
+
+            <div class="row my-4 py-5">
+            	<div class="col-12 col-md-4">
+            		<div class="card card-body shadow-none bg-light" style="border:1px solid #E5E7EB;">
+            			<p class="text-center text-lighter">
+            				<i class="fal fa-lightbulb fa-4x"></i>
+            			</p>
+            			<p class="text-center lead mb-0">What's New</p>
+            		</div>
+            	</div>
+
+            	<div class="col-12 col-md-4">
+            		<div class="card card-body shadow-none bg-light" style="border:1px solid #E5E7EB;">
+            			<p class="text-center text-lighter">
+            				<i class="fal fa-clipboard-list-check fa-4x"></i>
+            			</p>
+            			<p class="text-center lead mb-0">User Guide</p>
+            		</div>
+            	</div>
+
+            	<div class="col-12 col-md-4">
+            		<div class="card card-body shadow-none bg-light" style="border:1px solid #E5E7EB;">
+            			<p class="text-center text-lighter">
+            				<i class="fal fa-question-circle fa-4x"></i>
+            			</p>
+            			<p class="text-center lead mb-0">Groups Help</p>
+            		</div>
+            	</div>
+            </div>
+
+            <p class="text-lighter" style="font-size:9px">
+            	<span class="font-weight-bold mr-1">Groups v0.0.1</span>
+            </p>
+
+			<!-- <div class="my-4 pt-5">
+				<p class="h4 font-weight-bold mb-1">Suggested for You</p>
+				<p class="lead text-muted mb-0">Groups you might be interested in</p>
+			</div>
+
+			<div class="row mb-4">
+				<div v-for="(group, index) in recommended.slice(recommendedStart, recommendedEnd)" :key="'rec:'+group.id+':'+index" class="col-12 col-md-4 slide-fade">
+					<div class="card shadow-sm border text-decoration-none text-dark">
+						<img v-if="group.metadata && group.metadata.hasOwnProperty('header')" :src="group.metadata.header.url" class="card-img-top" style="width: 100%; height: auto;object-fit: cover;max-height: 160px;">
+						<div v-else class="bg-primary" style="width:100%;height:160px;"></div>
+						<div class="card-body">
+							<div class="lead font-weight-bold d-flex align-items-top" style="height: 60px;">
+								{{ group.name }}
+								<span v-if="group.verified" class="fa-stack ml-n2 mt-n2">
+									<i class="fas fa-circle fa-stack-1x fa-lg" style="color: #22a7f0cc;font-size:18px"></i>
+									<i class="fas fa-check fa-stack-1x text-white" style="font-size:10px"></i>
+								</span>
+							</div>
+							<div class="text-muted font-weight-light d-flex justify-content-between">
+								<span>{{group.member_count}} Members</span>
+							</div>
+							<hr>
+							<p class="mb-0">
+								<a class="btn btn-light btn-block border rounded-lg font-weight-bold" :href="group.url">View Group</a>
+							</p>
+						</div>
+					</div>
+					<div v-if="index == 0 && recommended.length > 3 && recommendedStart != 0" style="position: absolute; top: 45%; left: 0px;transform:translateY(-55%);">
+						<button class="btn btn-light shadow-lg btn-lg rounded-circle border d-flex align-items-center justify-content-center" style="width: 50px;height:50px;" @click="recommendedPrev()">
+							<i class="fas fa-chevron-left fa-lg"></i>
+						</button>
+					</div>
+					<div v-if="index == 2 && recommended.length > 3" style="position: absolute; top: 45%; right: 0px;transform:translateY(-55%);">
+						<button class="btn btn-light shadow-lg btn-lg rounded-circle border d-flex align-items-center justify-content-center" style="width: 50px;height:50px;" @click="recommendedNext()">
+							<i class="fas fa-chevron-right fa-lg"></i>
+						</button>
+					</div>
+				</div>
+			</div>
+
+			<div class="py-2 mb-2">
+				<hr>
+			</div> -->
+
+			<!-- <div class="px-4 pb-4">
+				<p class="h4 font-weight-bold mb-1">Friends' Groups</p>
+				<p class="lead text-muted mb-0">Groups your mutuals are in.</p>
+			</div> -->
+
+			<!-- <div class="px-4 py-2">
+				<hr>
+			</div> -->
+
+			<!-- <div class="pb-4">
+				<p class="h4 font-weight-bold mb-1">Categories</p>
+				<p class="lead text-muted mb-0">Find a group by browsing top categories</p>
+			</div>
+
+			<div class="row mb-4">
+				<div v-for="(group, index) in categories.slice(categoriesStart, categoriesEnd)" :key="'rec:'+group.id+':'+index" class="col-12 col-md-2 slide-fade">
+					<div class="card card-body rounded-lg shadow-sm border text-decoration-none bg-primary p-2 text-white d-flex justify-content-end" style="width: 150px; height:150px;  background: linear-gradient(45deg, #ff512f, #dd2476);">
+						<p class="mb-0 font-weight-bold" style="font-size:15px">{{group}}</p>
+					</div>
+					<div v-if="index == 0 && categories.length > 3 && categoriesStart != 0" style="position: absolute; top: 50%; left: -10px;transform:translateY(-50%);">
+						<button class="btn btn-light shadow-lg btn-lg rounded-circle border d-flex align-items-center justify-content-center" style="width: 50px;height:50px;" @click="categoriesPrev()">
+							<i class="fas fa-chevron-left fa-lg"></i>
+						</button>
+					</div>
+					<div v-if="index == 5 && categories.length > 3" style="position: absolute; top: 50%; right: -10px;transform:translateY(-50%);">
+						<button class="btn btn-light shadow-lg btn-lg rounded-circle border d-flex align-items-center justify-content-center" style="width: 50px;height:50px;" @click="categoriesNext()">
+							<i class="fas fa-chevron-right fa-lg"></i>
+						</button>
+					</div>
+				</div>
+			</div> -->
+
+			<!-- <div class="py-2 mb-2">
+				<hr>
+			</div> -->
+
+			<!-- <div class="pb-4 my-4">
+				<p class="h4 font-weight-bold mb-1">My Groups</p>
+				<p class="lead text-muted mb-0">Groups you are a member of</p>
+			</div>
+
+			<div class="row mb-4">
+				<div v-for="(group, index) in selfGroups.slice(selfGroupsStart, selfGroupsEnd)" :key="'rec:'+group.id+':'+index" class="col-12 col-md-4 slide-fade">
+					<div class="card shadow-sm border text-decoration-none text-dark">
+						<img v-if="group.metadata && group.metadata.hasOwnProperty('header')" :src="group.metadata.header.url" class="card-img-top" style="width: 100%; height: auto;object-fit: cover;max-height: 160px;">
+						<div v-else class="bg-primary" style="width:100%;height:160px;"></div>
+						<div class="card-body">
+							<div class="lead font-weight-bold d-flex align-items-top" style="height: 60px;">
+								{{ group.name }}
+								<span v-if="group.verified" class="fa-stack ml-n2 mt-n2">
+									<i class="fas fa-circle fa-stack-1x fa-lg" style="color: #22a7f0cc;font-size:18px"></i>
+									<i class="fas fa-check fa-stack-1x text-white" style="font-size:10px"></i>
+								</span>
+							</div>
+							<div class="text-muted font-weight-light d-flex justify-content-between">
+								<span>{{group.member_count}} Members</span>
+							</div>
+							<hr>
+							<p class="mb-0">
+								<a class="btn btn-light btn-block border rounded-lg font-weight-bold" :href="group.url">View Group</a>
+							</p>
+						</div>
+					</div>
+					<div v-if="index == 0 && selfGroups.length > 3 && selfGroupsStart != 0" style="position: absolute; top: 50%; left: -10px;transform:translateY(-50%);">
+						<button class="btn btn-light shadow-lg btn-lg rounded-circle border d-flex align-items-center justify-content-center" style="width: 50px;height:50px;" @click="selfGroupsPrev()">
+							<i class="fas fa-chevron-left fa-lg"></i>
+						</button>
+					</div>
+					<div v-if="index == 2 && selfGroups.length > 3" style="position: absolute; top: 50%; right: -10px;transform:translateY(-50%);">
+						<button class="btn btn-light shadow-lg btn-lg rounded-circle border d-flex align-items-center justify-content-center" style="width: 50px;height:50px;" @click="selfGroupsNext()">
+							<i class="fas fa-chevron-right fa-lg"></i>
+						</button>
+					</div>
+				</div>
+			</div> -->
+		</div>
+
+		<div v-if="tab === 'categories'" class="px-5">
+			<div class="row my-4 justify-content-center">
+				<div class="col-12 col-md-6">
+					<div class="title mb-4">
+						<span>Categories</span>
+						<button class="btn btn-light font-weight-bold" @click="toggleTab('home')">Go Back</button>
+					</div>
+
+					<div class="list-group">
+						<div
+							v-for="(group, index) in categories"
+							:key="'rec:'+group.id+':'+index"
+							class="list-group-item"
+							@click="selectCategory(index)">
+							<p class="mb-0 font-weight-bold">
+								{{group}}
+								<span class="float-right">
+									<i class="fal fa-chevron-right"></i>
+								</span>
+							</p>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<div v-if="tab === 'category'" class="px-5">
+			<div class="row my-4 justify-content-center">
+				<div class="col-12 col-md-6">
+					<div class="title mb-4">
+						<div>
+							<div class="mb-n2 small text-uppercase text-lighter">Categories</div>
+							<span>{{ categories[activeCategoryIndex] }}</span>
+						</div>
+						<button class="btn btn-light font-weight-bold" @click="toggleTab('categories')">Go Back</button>
+					</div>
+
+					<div v-if="categoryGroupsLoaded">
+						<div class="list-group">
+							<a v-for="(group, index) in categoryGroups"
+								class="list-group-item p-1"
+								:href="group.url">
+								<group-list-card :group="group" :showStats="true" />
+							</a>
+
+							<div
+								v-if="categoryGroupsCanLoadMore"
+								class="list-group-item">
+
+								<button
+									class="btn btn-light font-weight-bold btn-block"
+									@click="fetchCategoryGroups">
+									Load more
+								</button>
+							</div>
+						</div>
+
+						<div v-if="categoryGroups.length === 0" class="mt-3">
+							<div class="bg-white border text-center p-3">
+								<p class="font-weight-light mb-0">No groups found in this category</p>
+							</div>
+						</div>
+					</div>
+					<div v-else>
+						<div class="card card-body shadow-none border justify-content-center flex-row">
+							<b-spinner />
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+
+		<div v-if="tab === 'fediverseGroups'" class="px-5">
+			<div class="row my-4 justify-content-center">
+				<div class="col-12 col-md-6">
+					<div class="title mb-4">
+						<span>Fediverse Groups</span>
+						<button class="btn btn-light font-weight-bold" @click="toggleTab('home')">Go Back</button>
+					</div>
+					<div class="mt-3">
+						<div class="bg-white border text-center p-3">
+							<p class="font-weight-light mb-0">No fediverse groups found</p>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script type="text/javascript">
+	import GroupListCard from './GroupListCard.vue';
+
+	export default {
+		props: {
+			profile: {
+				type: Object
+			}
+		},
+
+		components: {
+			"group-list-card": GroupListCard
+		},
+
+		data() {
+			return {
+				isLoaded: false,
+				tab: 'home',
+				popularGroups: [],
+				newGroups: [],
+				activeCategoryIndex: undefined,
+				activeCategoryPage: 1,
+				categories: [],
+				categoriesStart: 0,
+				categoriesEnd: 6,
+				categoryGroups: [],
+				categoryGroupsLoaded: false,
+				categoryGroupsCanLoadMore: false,
+				// selfGroups: [],
+				// selfGroupsStart: 0,
+				// selfGroupsEnd: 3
+			}
+		},
+
+		mounted() {
+			this.fetchPopular();
+			this.fetchCategories();
+			// this.fetchSelf();
+		},
+
+		methods: {
+			fetchPopular() {
+				axios.get('/api/v0/groups/discover/popular')
+				.then(res => {
+					this.popularGroups = res.data;
+					this.fetchNew();
+				})
+			},
+
+			fetchNew() {
+				axios.get('/api/v0/groups/discover/new')
+				.then(res => {
+					this.newGroups = res.data;
+				})
+			},
+
+			fetchCategories() {
+				axios.get('/api/v0/groups/categories/list')
+				.then(res => {
+					this.categories = res.data;
+				})
+			},
+
+			toggleTab(tab) {
+				window.scrollTo(0, 0);
+				this.tab = tab;
+			},
+
+			selectCategory(index) {
+				window.scrollTo(0, 0);
+				if(index !== this.activeCategoryIndex) {
+					this.activeCategoryPage = 1;
+				}
+				this.activeCategoryIndex = index;
+				this.fetchCategoryGroups();
+			},
+
+			fetchCategoryGroups() {
+				if(this.activeCategoryPage == 1) {
+					this.categoryGroupsLoaded = false;
+				}
+
+				axios.get('/api/v0/groups/category/list', {
+					params: {
+						name: this.categories[this.activeCategoryIndex],
+						page: this.activeCategoryPage
+					}
+				})
+				.then(res => {
+					this.tab = 'category';
+					if(this.activeCategoryPage == 1) {
+						this.categoryGroups = res.data;
+					} else {
+						this.categoryGroups.push(...res.data);
+					}
+					if(res.data.length == 6) {
+						this.categoryGroupsCanLoadMore = true;
+						this.activeCategoryPage++;
+					} else {
+						this.categoryGroupsCanLoadMore = false;
+					}
+					setTimeout(() => {
+						this.categoryGroupsLoaded = true;
+					}, 600);
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.self-discover-component {
+		.list-group-item {
+			text-decoration: none;
+
+			&:hover {
+				background-color: #F3F4F6;
+			}
+		}
+
+		.bg-mantle {
+			background: linear-gradient(45deg, #24c6dc, #514a9d);
+		}
+
+		.bg-black {
+			background-color: #000;
+
+			hr {
+				border-top: 1px solid rgba(255, 255, 255, 0.12);
+			}
+		}
+
+		.title {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			span {
+				font-size: 24px;
+				font-weight: 600;
+			}
+
+			.btn {
+				border: 1px solid #E5E7EB;
+			}
+		}
+	}
+</style>
diff --git a/resources/assets/components/groups/partials/SelfFeed.vue b/resources/assets/components/groups/partials/SelfFeed.vue
new file mode 100644
index 000000000..2fff5298d
--- /dev/null
+++ b/resources/assets/components/groups/partials/SelfFeed.vue
@@ -0,0 +1,133 @@
+<template>
+	<div class="col-12 col-md-9" style="overflow:hidden">
+		<div class="row bg-light justify-content-center">
+			<div class="col-12 flex-shrink-1">
+                <div class="my-4 px-3">
+                    <p class="h1 font-weight-bold mb-1">Groups Feed</p>
+                    <p class="lead text-muted mb-0">Recent posts from your groups</p>
+                </div>
+            </div>
+        </div>
+        <div class="row h-100 bg-light justify-content-center">
+            <div class="col-12 col-md-10 col-lg-6">
+                <div v-if="emptyFeed" class="mt-5">
+                    <h1 class="font-weight-bold">Welcome to Pixelfed Groups!</h1>
+                    <p class="lead">Groups are a way to participate in like minded communities and topics.</p>
+                    <hr class="my-4">
+                    <p>Anyone can create and manage their own group as long as it abides by our <a href="/site/kb/community-guidelines" target="_blank">community guidelines</a>.</p>
+                    <p class="text-center mb-0">
+                        <router-link to="/groups/discover" class="btn btn-primary btn-lg rounded-pill">
+                            Discover Groups
+                        </router-link>
+                    </p>
+                </div>
+
+                <div v-else>
+                    <div class="my-3">
+                        <group-status
+                            v-for="(status, index) in feed"
+                            :key="'gs:' + status.id + index"
+                            :prestatus="status"
+                            :profile="profile"
+                            :show-group-header="true"
+                            :group="status.group"
+                            :group-id="status.group.id" />
+
+                        <div v-if="feed.length > 2">
+                            <infinite-loading @infinite="infiniteFeed" :distance="800">
+                                <div slot="no-more" class="my-3">
+                                    <p class="lead font-weight-bold pt-5">You have reached the end of this feed</p>
+                                    <div style="height: 10rem;"></div>
+                                </div>
+                                <div slot="no-results"></div>
+                            </infinite-loading>
+                        </div>
+                    </div>
+                </div>
+            </div>
+		</div>
+	</div>
+</template>
+
+<script type="text/javascript">
+	import GroupStatus from './GroupStatus.vue';
+
+	export default {
+		props: {
+			profile: {
+				type: Object
+			}
+		},
+
+		data() {
+			return {
+				feed: [],
+				ids: [],
+				page: 1,
+				tab: 'feed',
+				initalLoad: false,
+				emptyFeed: true
+			};
+		},
+
+		components: {
+			'group-status': GroupStatus
+		},
+
+		mounted() {
+			this.fetchFeed();
+		},
+
+		methods: {
+			fetchFeed() {
+				axios.get('/api/v0/groups/self/feed', {
+					params: {
+						initial: true
+					}
+				})
+				.then(res => {
+					this.page++;
+					this.feed = res.data;
+					this.emptyFeed = this.feed.length === 0;
+					this.initalLoad = true;
+				})
+			},
+
+			infiniteFeed($state) {
+				if(this.feed.length < 2 || this.page > 5) {
+					$state.complete();
+					return;
+				}
+
+				axios.get('/api/v0/groups/self/feed', {
+					params: {
+						page: this.page
+					},
+				}).then(res => {
+					if (res.data.length) {
+						let data = res.data;
+						let self = this;
+						data.forEach(d => {
+							if(self.ids.indexOf(d.id) == -1) {
+								self.ids.push(d.id);
+								self.feed.push(d);
+							}
+						});
+						$state.loaded();
+						this.page++;
+					} else {
+						$state.complete();
+					}
+				});
+			},
+
+			switchTab(tab) {
+				this.tab = tab;
+			},
+
+			gotoDiscover() {
+				this.$emit('switchtab', 'discover');
+			}
+		}
+	}
+</script>
diff --git a/resources/assets/components/groups/partials/SelfGroups.vue b/resources/assets/components/groups/partials/SelfGroups.vue
new file mode 100644
index 000000000..411ec67e4
--- /dev/null
+++ b/resources/assets/components/groups/partials/SelfGroups.vue
@@ -0,0 +1,171 @@
+<template>
+    <div class="my-groups-component">
+        <div class="list-container">
+            <div v-if="isLoaded">
+                <div class="list-group">
+                    <a
+                        v-for="(group, index) in groups" :key="'rec:'+group.id+':'+index"
+                        class="list-group-item text-decoration-none"
+                        :href="group.url">
+                        <group-list-card
+                        	:group="group"
+                        	:truncateDescriptionLength="140"
+                        	:showStats="true" />
+                        <!-- <div class="media align-items-center">
+                            <img v-if="group.metadata && group.metadata.hasOwnProperty('header')" :src="group.metadata.header.url" class="mr-3 border rounded" style="width: 100px; height: 60px;object-fit: cover;padding:5px;">
+
+                            <div v-else class="mr-3 border rounded" style="width: 100px; height: 60px;padding: 5px;">
+                            	<div class="bg-primary d-flex align-items-center justify-content-center" style="width: 100%; height:100%;">
+                            		<i class="fal fa-users text-white fa-lg"></i>
+                            	</div>
+                            </div>
+
+                            <div class="media-body">
+                            	<p class="h5 font-weight-bold mb-1 text-dark">
+                            		{{ group.name || 'Untitled Group' }}
+                            	</p>
+
+                            	<p class="text-muted small mb-1 read-more">
+                            		{{ truncate(group.description) }}
+                            	</p>
+
+                            	<p class="mb-0">
+                            		<span class="text-muted mr-2">
+                            			<i class="far fa-users"></i>
+                            			<strong class="small">{{ prettyCount(group.member_count) }}</strong>
+                            		</span>
+
+                            		<span class="member-label">
+                            			{{ group.self.role }}
+                            		</span>
+
+                            		<span v-if="!group.local" class="remote-label ml-2">
+                            			<i class="fal fa-globe"></i> Remote
+                            		</span>
+                            	</p>
+                            </div>
+                        </div> -->
+                    </a>
+                </div>
+
+                <p v-if="canLoadMore">
+                	<button
+                		class="btn btn-primary btn-block font-weight-bold mt-3"
+                		@click.prevent="loadMore"
+                		:disabled="loadingMore">
+                		Load more
+                	</button>
+                </p>
+            </div>
+
+            <div v-else class="d-flex justify-content-center">
+            	<b-spinner/>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script type="text/javascript">
+	import GroupListCard from './GroupListCard.vue';
+
+    export default {
+        props: {
+            profile: {
+                type: Object
+            }
+        },
+
+        components: {
+			"group-list-card": GroupListCard
+		},
+
+        data() {
+            return {
+                isLoaded: false,
+                groups: [],
+                canLoadMore: false,
+                loadingMore: false,
+                page: 1
+            }
+        },
+
+        mounted() {
+            this.fetchSelf();
+        },
+
+        methods: {
+            fetchSelf() {
+                axios.get('/api/v0/groups/self/list')
+                .then(res => {
+                	let data = res.data.filter(g => {
+                		return g.hasOwnProperty('id') && g.hasOwnProperty('url');
+                	})
+                    this.groups = data;
+                    this.canLoadMore = res.data.length == 4;
+                    this.page++;
+                    this.isLoaded = true;
+                });
+            },
+
+            loadMore() {
+            	this.loadingMore = true;
+            	axios.get('/api/v0/groups/self/list', {
+            		params: {
+            			page: this.page
+            		}
+            	})
+                .then(res => {
+                	let data = res.data.filter(g => {
+                		return g.hasOwnProperty('id') && g.hasOwnProperty('url');
+                	})
+                    this.groups.push(...data);
+                    this.canLoadMore = res.data.length == 4;
+                    this.page++;
+            		this.loadingMore = false;
+                });
+            },
+
+            prettyCount(val) {
+            	return App.util.format.count(val);
+            },
+
+            truncate(str) {
+            	if(str.length <= 140) {
+            		return str;
+            	}
+
+            	return str.substr(0, 140) + ' ...';
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .my-groups-component {
+    	.list-container {
+    		margin-bottom: 30vh;
+    	}
+
+		.member-label {
+			padding: 2px 5px;
+			font-size: 12px;
+			color: rgba(75, 119, 190, 1);
+			background:rgba(137, 196, 244, 0.2);
+			border:1px solid rgba(137, 196, 244, 0.3);
+			font-weight:400;
+			text-transform: capitalize;
+			border-radius: 3px;
+		}
+
+		.remote-label {
+			padding: 2px 5px;
+			font-size: 12px;
+			color: #4B5563;
+			background: #F3F4F6;
+			border:1px solid #E5E7EB;
+			font-weight:400;
+			text-transform: capitalize;
+			border-radius: 3px;
+		}
+    }
+</style>
diff --git a/resources/assets/components/groups/partials/SelfInvitations.vue b/resources/assets/components/groups/partials/SelfInvitations.vue
new file mode 100644
index 000000000..f9d4f1e64
--- /dev/null
+++ b/resources/assets/components/groups/partials/SelfInvitations.vue
@@ -0,0 +1,41 @@
+<template>
+	<div class="col-12 col-md-9" style="height: 100vh - 51px !important;overflow:hidden">
+		<div class="row h-100">
+			<div class="col-12 col-md-8 bg-lighter border-left">
+				<div class="p-4 mb-4">
+					<p class="h4 font-weight-bold mb-1 text-center">Group Invitations</p>
+				</div>
+				<div class="p-4 mb-4">
+					<p class="font-weight-bold text-center text-muted">You don't have any group invites</p>
+				</div>
+			</div>
+			<div class="col-12 col-md-4 bg-white border-left">
+				<div class="p-4">
+					<div class="bg-light rounded-lg border p-3">
+						<p class="lead font-weight-bold mb-0">Send Invite</p>
+						<p class="mb-3">Invite friends to your groups</p>
+						<div class="form-group" style="position: relative;">
+							<span style="position: absolute; top:50%;transform: translateY(-50%);left:15px;padding-right:5px;">
+								<i class="fas fa-search text-lighter"></i>
+							</span>
+							<input class="form-control bg-white rounded-pill" placeholder="Search username..." style="padding-left:40px">
+						</div>
+					</div>
+				</div>
+				<hr>
+				<div class="p-4 mb-2">
+					<p class="h4 font-weight-bold mb-1 text-center">Invitations Sent</p>
+				</div>
+				<div class="px-4 mb-4">
+					<p class="font-weight-bold text-center text-muted">You have not sent any group invites</p>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script type="text/javascript">
+	export default {
+
+	}
+</script>
diff --git a/resources/assets/components/groups/partials/SelfNotifications.vue b/resources/assets/components/groups/partials/SelfNotifications.vue
new file mode 100644
index 000000000..f591cfbd7
--- /dev/null
+++ b/resources/assets/components/groups/partials/SelfNotifications.vue
@@ -0,0 +1,309 @@
+<template>
+	<div class="group-notification-component col-12 col-md-9" style="height: 100vh - 51px !important;overflow:hidden">
+		<div class="row h-100 bg-white">
+			<div class="col-12 col-md-8 border-left">
+                <div class="px-5">
+					<div class="my-4">
+						<p class="h1 font-weight-bold mb-1">Group Notifications</p>
+						<!-- <p class="lead text-muted mb-0">Latest notifications from your groups</p> -->
+					</div>
+					<!-- <div class="p-4 mb-4">
+						<p class="font-weight-bold text-center text-muted">You don't have any notifications</p>
+					</div> -->
+
+					<div v-if="notifications.length > 0" v-for="(n, index) in notifications" class="nitem card card-body shadow-none mb-3 py-2 px-0 rounded-pill" style="background-color: #F3F4F6">
+						<div class="media align-items-center px-3">
+							<img class="mr-3 rounded-circle" style="border:1px solid #ccc" :src="n.account.avatar" alt="" width="32px" height="32px">
+							<div class="media-body">
+								<div v-if="n.type == 'group:like'">
+									<p class="my-0">
+										<a :href="getProfileUrl(n.account)" data-placement="bottom" data-toggle="tooltip" :title="n.account.username">{{n.account.local == false ? '@':''}}{{truncate(n.account.username)}}</a> liked your <a v-bind:href="getPostUrl(n.status)">post</a> in <a :href="n.group.url">{{n.group.name}}</a>
+									</p>
+								</div>
+
+								<div v-else-if="n.type == 'group:comment'">
+									<p class="my-0">
+										<a :href="getProfileUrl(n.account)" class="font-weight-bold text-dark word-break" :title="n.account.username">{{n.account.local == false ? '@':''}}{{truncate(n.account.username)}}</a> commented on your <a class="font-weight-bold" v-bind:href="n.status.url">post</a> in <a :href="n.group.url">{{n.group.name}}</a>
+									</p>
+								</div>
+
+								<div v-else-if="n.type == 'mention'">
+									<p class="my-0">
+										<a :href="getProfileUrl(n.account)" data-placement="bottom" data-toggle="tooltip" :title="n.account.username">{{n.account.local == false ? '@':''}}{{truncate(n.account.username)}}</a> <a v-bind:href="mentionUrl(n.status)">mentioned</a> you.
+									</p>
+								</div>
+
+								<div v-else-if="n.type == 'group.join.approved'">
+									<p class="my-0">
+										Your application to join <a :href="n.group.url" class="font-weight-bold text-dark word-break" :title="n.group.name">{{truncate(n.group.name)}}</a> was approved!
+									</p>
+								</div>
+
+								<div v-else-if="n.type == 'group.join.rejected'">
+									<p class="my-0">
+										Your application to join <a :href="n.group.url" class="font-weight-bold text-dark word-break" :title="n.group.name">{{truncate(n.group.name)}}</a> was rejected. You can re-apply to join in 6 months.
+									</p>
+								</div>
+
+								<div v-else>
+									<p class="my-0">Cannot display notification</p>
+								</div>
+
+								<!-- <div class="align-items-center">
+									<span class="small text-muted" data-toggle="tooltip" data-placement="bottom" :title="n.created_at">{{timeAgo(n.created_at)}}</span>
+								</div> -->
+							</div>
+							<div>
+								<!-- <div v-if="n.status && n.status && n.status.media_attachments && n.status.media_attachments.length">
+									<a :href="getPostUrl(n.status)">
+										<img :src="n.status.media_attachments[0].preview_url" width="32px" height="32px">
+									</a>
+								</div>
+								<div v-else-if="n.status && n.status.parent && n.status.parent.media_attachments && n.status.parent.media_attachments.length">
+									<a :href="n.status.parent.url">
+										<img :src="n.status.parent.media_attachments[0].preview_url" width="32px" height="32px">
+									</a>
+								</div>
+
+								<div v-else>
+									<a v-if="viewContext(n) != '/'" class="btn btn-outline-primary py-0 font-weight-bold" :href="viewContext(n)">View</a>
+								</div> -->
+
+								<div class="align-items-center text-muted">
+									<span class="small" data-toggle="tooltip" data-placement="bottom" :title="n.created_at">{{timeAgo(n.created_at)}}</span>
+									<span>·</span>
+									<div class="dropdown d-inline">
+										<a class="dropdown-toggle text-lighter" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+											<i class="far fa-cog fa-sm"></i>
+										</a>
+
+										<div class="dropdown-menu dropdown-menu-right">
+											<a class="dropdown-item font-weight-bold" href="#">Dismiss</a>
+											<div class="dropdown-divider"></div>
+											<a class="dropdown-item font-weight-bold" href="#">Help</a>
+											<!-- <a class="dropdown-item font-weight-bold" href="#">Ignore</a> -->
+											<a class="dropdown-item font-weight-bold" href="#">Report</a>
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="col-12 col-md-4 border-left bg-light">
+			</div>
+		</div>
+	</div>
+</template>
+
+<script type="text/javascript">
+	export default {
+		data() {
+			return {
+				notifications: [],
+				initialLoad: false,
+				loading: true,
+				page: 1
+			}
+		},
+
+		mounted() {
+			this.fetchNotifications();
+		},
+
+		methods: {
+			fetchNotifications() {
+				axios.get('/api/pixelfed/v1/accounts/verify_credentials').then(res => {
+						window._sharedData.curUser = res.data;
+						window.App.util.navatar();
+				});
+				axios.get('/api/v0/groups/self/notifications')
+				.then(res => {
+					let data = res.data.filter(n => {
+						if(n.type == 'share' && !n.status) {
+							return false;
+						}
+						if(n.type == 'comment' && !n.status) {
+							return false;
+						}
+						if(n.type == 'mention' && !n.status) {
+							return false;
+						}
+						if(n.type == 'favourite' && !n.status) {
+							return false;
+						}
+						if(n.type == 'follow' && !n.account) {
+							return false;
+						}
+						return true;
+					});
+					// let ids = res.data.map(n => n.id);
+					// this.notificationMaxId = Math.max(...ids);
+					this.notifications = data;
+					// $('.notification-card .loader').addClass('d-none');
+					// $('.notification-card .contents').removeClass('d-none');
+				});
+			},
+
+			// infiniteNotifications($state) {
+			// 	if(this.notificationCursor > 10) {
+			// 		$state.complete();
+			// 		return;
+			// 	}
+			// 	axios.get('/api/pixelfed/v1/notifications', {
+			// 		params: {
+			// 			max_id: this.notificationMaxId
+			// 		}
+			// 	}).then(res => {
+			// 		if(res.data.length) {
+			// 			let data = res.data.filter(n => {
+			// 				if(n.type == 'share' && !n.status) {
+			// 					return false;
+			// 				}
+			// 				if(n.type == 'comment' && !n.status) {
+			// 					return false;
+			// 				}
+			// 				if(n.type == 'mention' && !n.status) {
+			// 					return false;
+			// 				}
+			// 				if(n.type == 'favourite' && !n.status) {
+			// 					return false;
+			// 				}
+			// 				if(n.type == 'follow' && !n.account) {
+			// 					return false;
+			// 				}
+			// 				if(_.find(this.notifications, {id: n.id})) {
+			// 					return false;
+			// 				}
+			// 				return true;
+			// 			});
+			// 			this.notifications.push(...data);
+			// 			this.notificationCursor++;
+			// 			$state.loaded();
+			// 		} else {
+			// 			$state.complete();
+			// 		}
+			// 	});
+			// },
+
+			truncate(text) {
+				if(text.length <= 15) {
+					return text;
+				}
+
+				return text.slice(0,15) + '...'
+			},
+
+			timeAgo(ts) {
+				let date = Date.parse(ts);
+				let seconds = Math.floor((new Date() - date) / 1000);
+				let interval = Math.floor(seconds / 31536000);
+				if (interval >= 1) {
+					return interval + "y";
+				}
+				interval = Math.floor(seconds / 604800);
+				if (interval >= 1) {
+					return interval + "w";
+				}
+				interval = Math.floor(seconds / 86400);
+				if (interval >= 1) {
+					return interval + "d";
+				}
+				interval = Math.floor(seconds / 3600);
+				if (interval >= 1) {
+					return interval + "h";
+				}
+				interval = Math.floor(seconds / 60);
+				if (interval >= 1) {
+					return interval + "m";
+				}
+				return Math.floor(seconds) + "s";
+			},
+
+			mentionUrl(status) {
+				let username = status.account.username;
+				let id = status.id;
+				return '/p/' + username + '/' + id;
+			},
+
+			followProfile(n) {
+				let self = this;
+				let id = n.account.id;
+				axios.post('/i/follow', {
+						item: id
+				}).then(res => {
+					self.notifications.map(notification => {
+						if(notification.account.id === id) {
+							notification.relationship.following = true;
+						}
+					});
+				}).catch(err => {
+					if(err.response.data.message) {
+						swal('Error', err.response.data.message, 'error');
+					}
+				});
+			},
+
+			viewContext(n) {
+				switch(n.type) {
+					case 'follow':
+						return n.account.url;
+					break;
+					case 'mention':
+						return n.status.url;
+					break;
+					case 'like':
+					case 'favourite':
+					case 'comment':
+						return n.status.url;
+					break;
+					case 'tagged':
+						return n.tagged.post_url;
+					break;
+					case 'direct':
+						return '/account/direct/t/'+n.account.id;
+					break
+				}
+				return '/';
+			},
+
+			getProfileUrl(account) {
+				if(account.local == true) {
+					return account.url;
+				}
+
+				return '/i/web/profile/_/' + account.id;
+			},
+
+			getPostUrl(status) {
+				if(status.local == true) {
+					return status.url;
+				}
+
+				return '/i/web/post/_/' + status.account.id + '/' + status.id;
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.group-notification-component {
+		.dropdown-toggle::after {
+			content: '';
+			display: none;
+		}
+
+		.nitem {
+			a {
+				color: #000;
+				font-weight: 700 !important;
+
+				&:hover,
+				&:focus {
+    				color: #121416 !important;
+    			}
+			}
+		}
+	}
+</style>
diff --git a/resources/assets/components/groups/partials/SelfRemoteSearch.vue b/resources/assets/components/groups/partials/SelfRemoteSearch.vue
new file mode 100644
index 000000000..9c3443960
--- /dev/null
+++ b/resources/assets/components/groups/partials/SelfRemoteSearch.vue
@@ -0,0 +1,47 @@
+<template>
+	<div class="col-12 col-md-9" style="height: 100vh - 51px !important;overflow:hidden">
+		<div class="row h-100 bg-lighter">
+			<div class="col-12 col-md-8 border-left">
+				<div class="d-flex justify-content-center">
+					<div class="p-4 mb-4">
+						<p class="h4 font-weight-bold mb-1">Find a Remote Group</p>
+						<p class="lead text-muted">Search and explore remote federated groups.</p>
+					</div>
+				</div>
+				<div class="mb-5">
+					<div class="p-4 mb-4">
+						<div class="form-group">
+							<label>Group URL</label>
+							<input type="text" class="form-control form-control-lg rounded-pill bg-white border" placeholder="https://pixelfed.social/groups/328323406233735168" v-model="q">
+						</div>
+						<button class="btn btn-primary btn-block btn-lg rounded-pill font-weight-bold">Search</button>
+					</div>
+				</div>
+			</div>
+			<div class="col-12 col-md-4 bg-white border-left">
+				<div class="my-4">
+					<h4 class="font-weight-bold">Tips</h4>
+					<ul class="pl-3">
+						<li class="font-weight-bold">Some remote groups are not supported*</li>
+						<li>Read and comply with group rules defined by group admins</li>
+						<li>Use the full <span class="font-weight-bold">Group URL</span> including <code>https://</code></li>
+						<li>Joining private groups requires manual approval from group admins, you will recieve a notification when your membership is approved</li>
+						<li>Inviting people to remote groups is not supported yet</li>
+						<li>Your group membership may be terminated at any time by group admins</li>
+					</ul>
+					<p class="small">* Some remote groups may not be compatible, we are working to support other group implementations</p>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script type="text/javascript">
+	export default {
+		data() {
+			return {
+				q: undefined
+			}
+		}
+	}
+</script>
diff --git a/resources/assets/components/groups/partials/ShareMenu.vue b/resources/assets/components/groups/partials/ShareMenu.vue
new file mode 100644
index 000000000..3f4141486
--- /dev/null
+++ b/resources/assets/components/groups/partials/ShareMenu.vue
@@ -0,0 +1,11 @@
+<template>
+	<div class="share-menu-component">
+
+	</div>
+</template>
+
+<script type="text/javascript">
+	export default {
+
+	}
+</script>
diff --git a/resources/assets/components/groups/partials/Status/GroupHeader.vue b/resources/assets/components/groups/partials/Status/GroupHeader.vue
new file mode 100644
index 000000000..966b16b92
--- /dev/null
+++ b/resources/assets/components/groups/partials/Status/GroupHeader.vue
@@ -0,0 +1,326 @@
+<template>
+    <div class="group-post-header media">
+        <div v-if="showGroupHeader" style="position: relative;" class="mb-1">
+            <img
+                v-if="group.hasOwnProperty('metadata') && (group.metadata.hasOwnProperty('avatar') || group.metadata.hasOwnProperty('header'))"
+                class="rounded-lg box-shadow mr-2"
+                :src="group.metadata.hasOwnProperty('header') ? group.metadata.header.url : group.metadata.avatar.url"
+                width="52"
+                height="52"
+                onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'"
+                alt="avatar"
+                style="object-fit:cover;"
+            />
+            <span
+                v-else
+                class="d-block rounded-lg box-shadow mr-2 bg-primary"
+                style="width: 52px;height:52px;"
+            ></span>
+            <img
+                class="rounded-circle box-shadow border mr-2"
+                :src="status.account.avatar"
+                width="36"
+                height="36"
+                onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'"
+                alt="avatar"
+                style="position: absolute; bottom:-4px; right:-4px;"
+            />
+        </div>
+        <img
+            v-else
+            class="rounded-circle box-shadow mr-2"
+            :src="status.account.avatar"
+            width="42"
+            height="42"
+            onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'"
+            alt="avatar"
+        />
+        <div class="media-body">
+            <div class="pl-2 d-flex align-items-top">
+                <div>
+                    <p class="mb-0">
+                        <router-link
+                            v-if="showGroupHeader && group"
+                            :to="`/groups/${status.gid}`"
+                            class="group-name-link username"
+                        >
+                            {{ group.name }}
+                        </router-link>
+
+                        <router-link
+                            v-else
+                            :to="`/groups/${status.gid}/user/${status?.account.id}`"
+                            class="group-name-link username"
+                            v-html="statusCardUsernameFormat(status)"
+                        >
+                            Loading...
+                        </router-link>
+
+                        <span v-if="showGroupChevron">
+                            <span class="text-muted" style="padding-left:2px;padding-right:2px;">
+                                <i class="fas fa-caret-right"></i>
+                            </span>
+                            <span>
+                                <router-link
+                                    :to="`/groups/${status.gid}`"
+                                    class="group-name-link"
+                                >
+                                    {{ group.name }}
+                                </router-link>
+                            </span>
+                        </span>
+                    </p>
+                    <p class="mb-0 mt-n1">
+                        <span
+                            v-if="showGroupHeader && group"
+                            style="font-size:13px"
+                        >
+                            <router-link
+                                :to="`/groups/${status.gid}/user/${status?.account.id}`"
+                                class="group-name-link-small username"
+                                v-html="statusCardUsernameFormat(status)"
+                            >
+                                Loading...
+                            </router-link>
+                            <span class="text-lighter" style="padding-left:2px;padding-right:2px;">·</span>
+                            <router-link
+                                :to="`/groups/${status.gid}/p/${status.id}`"
+                                class="font-weight-light text-muted"
+                            >
+                                {{shortTimestamp(status.created_at)}}
+                            </router-link>
+                            <span class="text-lighter" style="padding-left:2px;padding-right:2px;">·</span>
+                            <span class="text-muted"><i class="fas fa-globe"></i></span>
+                        </span>
+                        <span v-else>
+                            <router-link
+                                :to="`/groups/${status.gid}/p/${status.id}`"
+                                class="font-weight-light text-muted small"
+                            >
+                                {{shortTimestamp(status.created_at)}}
+                            </router-link>
+                            <span class="text-lighter" style="padding-left:2px;padding-right:2px;">·</span>
+                            <span class="text-muted small"><i class="fas fa-globe"></i></span>
+                        </span>
+                    </p>
+                </div>
+                <div v-if="profile" class="text-right" style="flex-grow:1;">
+                    <div class="dropdown">
+                      <button class="btn btn-link dropdown-toggle" type="button" data-toggle="dropdown" aria-expanded="false">
+                        <span class="fas fa-ellipsis-h text-lighter"></span>
+                      </button>
+                      <div class="dropdown-menu  dropdown-menu-right">
+                        <a class="dropdown-item" :href="statusUrl()">View Post</a>
+                        <a class="dropdown-item" :href="profileUrl()">View Profile</a>
+                        <!-- <a class="dropdown-item" href="#">Copy Link</a> -->
+                        <a class="dropdown-item" href="#" @click.prevent="sendReport()">Report</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item text-danger" href="#" @click.prevent="onDelete()">Delete</a>
+                      </div>
+                    </div>
+                    <!-- <button class="btn btn-link text-dark py-0" type="button" @click="ctxMenu()">
+                        <span class="fas fa-ellipsis-h text-lighter"></span>
+                        <span class="sr-only">Post Menu</span>
+                    </button> -->
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            group: {
+                type: Object
+            },
+            status: {
+                type: Object
+            },
+            profile: {
+                type: Object
+            },
+            showGroupHeader: {
+                type: Boolean,
+                default: false
+            },
+            showGroupChevron: {
+                type: Boolean,
+                default: false
+            }
+        },
+
+        data() {
+            return {
+                reportTypes: [
+                    { key: "spam", title: "It's spam" },
+                    { key: "sensitive", title: "Nudity or sexual activity" },
+                    { key: "abusive", title: "Bullying or harassment" },
+                    { key: "underage", title: "I think this account is underage" },
+                    { key: "violence", title: "Violence or dangerous organizations" },
+                    { key: "copyright", title: "Copyright infringement" },
+                    { key: "impersonation", title: "Impersonation" },
+                    { key: "scam", title: "Scam or fraud" },
+                    { key: "terrorism", title: "Terrorism or terrorism-related content" }
+                ]
+            }
+        },
+
+        methods: {
+            formatCount(count) {
+                return App.util.format.count(count);
+            },
+
+            statusUrl() {
+                return '/groups/' + this.status.gid + '/p/' + this.status.id;
+            },
+
+            profileUrl() {
+                return '/groups/' + this.status.gid + '/user/' + this.status.account.id;
+            },
+
+            timestampFormat(timestamp) {
+                let ts = new Date(timestamp);
+                return ts.toDateString() + ' ' + ts.toLocaleTimeString();
+            },
+
+            shortTimestamp(ts) {
+                return window.App.util.format.timeAgo(ts);
+            },
+
+            statusCardUsernameFormat(status) {
+                if(status.account.local == true) {
+                    return status.account.username;
+                }
+
+                let fmt = window.App.config.username.remote.format;
+                let txt = window.App.config.username.remote.custom;
+                let usr = status.account.username;
+                let dom = document.createElement('a');
+                dom.href = status.account.url;
+                dom = dom.hostname;
+
+                switch(fmt) {
+                    case '@':
+                    return usr + '<span class="text-lighter font-weight-bold">@' + dom + '</span>';
+                    break;
+
+                    case 'from':
+                    return usr + '<span class="text-lighter font-weight-bold"> <span class="font-weight-normal">from</span> ' + dom + '</span>';
+                    break;
+
+                    case 'custom':
+                    return usr + '<span class="text-lighter font-weight-bold"> ' + txt + ' ' + dom + '</span>';
+                    break;
+
+                    default:
+                    return usr + '<span class="text-lighter font-weight-bold">@' + dom + '</span>';
+                    break;
+                }
+            },
+
+            sendReport(type) {
+                let el = document.createElement('div');
+                el.classList.add('list-group');
+                this.reportTypes.forEach(rt => {
+                    let button = document.createElement('button');
+                    button.classList.add('list-group-item', 'small');
+                    button.innerHTML = rt.title;
+                    button.onclick = () => {
+                        document.dispatchEvent(new CustomEvent('reportOption', {
+                            detail: { key: rt.key, title: rt.title }
+                        }));
+                    };
+                    el.appendChild(button);
+                });
+
+                let wrapper = document.createElement('div');
+                wrapper.appendChild(el);
+
+                swal({
+                    title: "Report Content",
+                    icon: "warning",
+                    content: wrapper,
+                    buttons: false
+                });
+
+                document.addEventListener('reportOption', (event) => {
+                    console.log(event.detail);
+                    this.showConfirmation(event.detail);
+                }, { once: true });
+            },
+            showConfirmation(option) {
+                console.log(option)
+              swal({
+                title: "Confirmation",
+                text: `You selected ${option.title}. Do you want to proceed?`,
+                icon: "info",
+                buttons: true
+              }).then((confirm) => {
+                if (confirm) {
+                     axios.post(`/api/v0/groups/${this.status.gid}/report/create`, {
+                        'type': option.key,
+                        'id': this.status.id,
+                    }).then(res => {
+                        swal("Confirmed!", "Your report has been submitted.", "success");
+                    })
+                } else {
+                  swal("Cancelled", "Your report was not submitted.", "error");
+                }
+              });
+            },
+            onDelete() {
+              swal({
+                title: "Delete Post Confirmation",
+                text: 'Are you sure you want to delete this post?',
+                icon: "warning",
+                dangerMode: true,
+                buttons: true
+              }).then((confirm) => {
+                if(confirm) {
+                    axios.post('/api/v0/groups/status/delete', {
+                        id: this.status.id,
+                        gid: this.status.gid,
+                    })
+                    .then(res => {
+                        this.$emit('delete', this.status)
+                    })
+                    .catch(err => {
+                        console.log(err)
+                    })
+                }
+              });
+            }
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+.group-post-header {
+    .btn::focus {
+        box-shadow: none;
+    }
+
+    .dropdown-toggle::after {
+        display: none;
+    }
+
+    .group-name-link {
+        color: var(--body-color) !important;
+        word-break: break-word !important;
+        word-wrap: break-word !important;
+        text-decoration: none;
+        font-size: 16px;
+        font-weight: 600;
+    }
+
+    .group-name-link-small {
+        color: var(--body-color) !important;
+        word-break: break-word !important;
+        word-wrap: break-word !important;
+        text-decoration: none;
+        font-size: 14px;
+        font-weight: 600;
+    }
+}
+</style>
diff --git a/resources/assets/components/groups/partials/Status/ParentUnavailable.vue b/resources/assets/components/groups/partials/Status/ParentUnavailable.vue
new file mode 100644
index 000000000..edb0f5062
--- /dev/null
+++ b/resources/assets/components/groups/partials/Status/ParentUnavailable.vue
@@ -0,0 +1,58 @@
+<template>
+    <div class="card shadow-sm" style="border-radius: 18px !important;">
+        <div class="card-body pb-0">
+            <div class="card card-body border shadow-none mb-3" style="background-color: #E5E7EB;">
+                <div class="media p-md-4">
+                    <div class="mr-4 pt-2">
+                        <i class="fas fa-lock fa-2x"></i>
+                    </div>
+                    <div class="media-body" style="max-width: 320px">
+                        <p class="lead font-weight-bold mb-1">This content isn't available right now</p>
+                        <p class="mb-0" style="font-size: 12px;letter-spacing:-0.3px;">When this happens, it's usually because the owner only shared it with a small group of people, changed who can see it, or it's been deleted.</p>
+                    </div>
+                </div>
+            </div>
+            <div>
+                <comment-drawer
+                    v-if="showCommentDrawer"
+                    :permalink-mode="permalinkMode"
+                    :permalink-status="childContext"
+                    :status="status"
+                    :profile="profile"
+                    :group-id="groupId"
+                    :can-reply="false" />
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import CommentDrawer from '@/groups/partials/CommentDrawer.vue';
+
+    export default {
+        props: {
+            showCommentDrawer: {
+                type: Boolean,
+            },
+            permalinkMode: {
+                type: Boolean,
+            },
+            childContext: {
+                type: Object
+            },
+            status: {
+                type: Object
+            },
+            profile: {
+                type: Object
+            },
+            groupId: {
+                type: String
+            },
+        },
+
+        components: {
+            "comment-drawer": CommentDrawer,
+        }
+    }
+</script>
diff --git a/resources/assets/components/groups/sections/Loader.vue b/resources/assets/components/groups/sections/Loader.vue
new file mode 100644
index 000000000..e0dc053d0
--- /dev/null
+++ b/resources/assets/components/groups/sections/Loader.vue
@@ -0,0 +1,23 @@
+<template>
+    <div class="w-100 h-100">
+        <div v-if="!loaded" class="d-flex w-100 h-100 py-5 justify-content-center align-items-center">
+            <div class="text-center">
+                <div class="spinner-border" role="status">
+                    <span class="sr-only">Loading...</span>
+                </div>
+                <p class="text-center font-weight-bold mt-1">Loading...</p>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            loaded: {
+                type: Boolean,
+                default: false
+            }
+        }
+    }
+</script>
diff --git a/resources/assets/components/groups/sections/Sidebar.vue b/resources/assets/components/groups/sections/Sidebar.vue
new file mode 100644
index 000000000..7b6326b52
--- /dev/null
+++ b/resources/assets/components/groups/sections/Sidebar.vue
@@ -0,0 +1,307 @@
+<template>
+    <div class="col-3 shadow groups-sidenav">
+        <div class="p-1">
+            <div class="d-flex justify-content-between align-items-center py-3">
+                <p class="h2 font-weight-bold mb-0">Groups</p>
+                <a class="btn btn-light px-2 rounded-circle" href="/settings/home">
+                    <i class="fas fa-cog fa-lg"></i>
+                </a>
+            </div>
+
+            <div class="mb-3">
+                <autocomplete
+                    :search="autocompleteSearch"
+                    placeholder="Search groups by name"
+                    aria-label="Search groups by name"
+                    :get-result-value="getSearchResultValue"
+                    :debounceTime="700"
+                    @submit="onSearchSubmit"
+                    ref="autocomplete"
+                    >
+                    <template #result="{ result, props }">
+                        <li
+                        v-bind="props"
+                        class="autocomplete-result"
+                        >
+
+                            <div class="media align-items-center">
+                                <img v-if="result.local && result.metadata && result.metadata.hasOwnProperty('header') && result.metadata.header.hasOwnProperty('url')" :src="result.metadata.header.url" width="32" height="32">
+                                <div v-else class="icon-placeholder">
+                                    <i class="fal fa-user-friends"></i>
+                                </div>
+                                <div class="media-body text-truncate mr-3">
+                                    <p class="result-name mb-n1 font-weight-bold">
+                                        {{ truncateName(result.name) }}
+                                        <span v-if="result.verified" class="fa-stack ml-n2" title="Verified Group" data-toggle="tooltip">
+                                            <i class="fas fa-circle fa-stack-1x fa-lg" style="color: #22a7f0cc;font-size:18px"></i>
+                                            <i class="fas fa-check fa-stack-1x text-white" style="font-size:10px"></i>
+                                        </span>
+                                    </p>
+                                    <p class="mb-0 text-muted" style="font-size: 10px;">
+                                        <span v-if="!result.local" title="Remote Group">
+                                            <i class="far fa-globe"></i>
+                                        </span>
+                                        <span v-if="!result.local">·</span>
+                                        <span class="font-weight-bold">{{ result.member_count }} members</span>
+                                    </p>
+                                </div>
+                            </div>
+                        </li>
+                    </template>
+                </autocomplete>
+            </div>
+
+            <!-- <button
+                class="btn btn-light group-nav-btn"
+                :class="{ active: tab == 'feed' }"
+                @click="switchTab('feed')">
+                <div class="group-nav-btn-icon">
+                    <i class="fas fa-list"></i>
+                </div>
+                <div class="group-nav-btn-name">
+                    Your Feed
+                </div>
+            </button> -->
+
+            <template v-for="tab in tabs">
+                <router-link
+                    class="btn btn-light group-nav-btn"
+                    :to="tab.path">
+                        <div class="group-nav-btn-icon">
+                            <i :class="tab.icon"></i>
+                        </div>
+                        <div class="group-nav-btn-name">
+                            {{ tab.name }}
+                        </div>
+                    </router-link>
+            </template>
+
+            <router-link
+                to="/groups/create"
+                class="btn btn-primary btn-block rounded-pill font-weight-bold mt-3">
+                <i class="fas fa-plus mr-2"></i> Create New Group
+            </router-link>
+
+            <hr>
+            <!-- <div v-for="group in groups" class="ml-2">
+                <div class="card shadow-sm border text-decoration-none text-dark">
+                    <img v-if="group.metadata && group.metadata.hasOwnProperty('header')" :src="group.metadata.header.url" class="card-img-top" style="width: 100%; height: auto;object-fit: cover;max-height: 160px;">
+                    <div v-else class="bg-primary" style="width:100%;height:160px;"></div>
+                    <div class="card-body">
+                        <div class="lead font-weight-bold d-flex align-items-top" style="height: 60px;">
+                            {{ group.name }}
+                            <span v-if="group.verified" class="fa-stack ml-n2 mt-n2">
+                                <i class="fas fa-circle fa-stack-1x fa-lg" style="color: #22a7f0cc;font-size:18px"></i>
+                                <i class="fas fa-check fa-stack-1x text-white" style="font-size:10px"></i>
+                            </span>
+                        </div>
+                        <div class="text-muted font-weight-light d-flex justify-content-between">
+                            <span>{{group.member_count}} Members</span>
+                            <span style="font-size: 12px;padding: 2px 5px;color: rgba(75, 119, 190, 1);background:rgba(137, 196, 244, 0.2);border:1px solid rgba(137, 196, 244, 0.3);font-weight:400;text-transform: capitalize;" class="rounded">{{ group.self.role }}</span>
+                        </div>
+                        <hr>
+                        <p class="mb-0">
+                            <a class="btn btn-light btn-block border rounded-lg font-weight-bold" :href="group.url">View Group</a>
+                        </p>
+                    </div>
+                </div>
+            </div> -->
+        </div>
+    </div>
+</template>
+
+<script>
+    import Autocomplete from '@trevoreyre/autocomplete-vue'
+    import '@trevoreyre/autocomplete-vue/dist/style.css'
+
+    export default {
+        data() {
+            return {
+                initialLoad: false,
+                tabs: [
+                    { name: 'Your Feed', icon: 'fas fa-list', path: '/groups/feed' },
+                    { name: 'Discover', icon: 'fas fa-compass', path: '/groups/discover' },
+                    { name: 'Your Groups', icon: 'fas fa-list', path: '/groups/joins' },
+                    // { name: 'Notifications', icon: 'far fa-bell', path: '/groups/notifications' },
+                    // { name: 'Find Remote Group', icon: 'far fa-search-plus', path: '/groups/search' },
+                ],
+                config: {},
+                groups: [],
+                profile: {},
+                tab: null,
+                searchQuery: undefined,
+            };
+        },
+
+        components: {
+            'autocomplete': Autocomplete,
+        },
+
+        methods: {
+            autocompleteSearch(input) {
+                if (!input || input.length < 2) {
+                    return [];
+                };
+
+                this.searchQuery = input;
+                // this.tab = 'searchresults';
+
+                if(input.startsWith('#')) {
+                    this.$bvToast.toast(input, {
+                        title: 'Hashtag detected',
+                        variant: 'info',
+                        autoHideDelay: 5000
+                    });
+                    return [];
+                }
+
+                return axios.post('/api/v0/groups/search/global', {
+                    q: input,
+                    v: '0.2'
+                })
+                .then(res => {
+                    this.searchLoading = false;
+                    return res.data;
+                }).catch(err => {
+
+                    if(err.response.status === 422) {
+                        this.$bvToast.toast(err.response.data.error.message, {
+                            title: 'Cannot display search results',
+                            variant: 'danger',
+                            autoHideDelay: 5000
+                        });
+                    }
+
+                    return [];
+                })
+            },
+
+            getSearchResultValue(result) {
+                return result.name;
+            },
+
+            onSearchSubmit(result) {
+                if (result.length < 1) {
+                    return [];
+                }
+
+                location.href = result.url;
+            },
+
+            truncateName(val) {
+                if(val.length < 24) {
+                    return val;
+                }
+
+                return val.substr(0, 23) + '...';
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+    .groups-sidenav {
+        display: none;
+        font-family: var(--font-family-sans-serif);
+
+        @media(min-width: 768px) {
+            display: block;
+            width: 100%;
+            height: 100vh;
+            background: #fff;
+            top: 74px;
+            border: none;
+            overflow: hidden;
+            z-index: 1;
+            position: sticky;
+        }
+
+        .group-nav-btn {
+            display: block;
+            width: 100%;
+            padding-left: 0;
+            padding-top: 0.3rem;
+            padding-bottom: 0.3rem;
+            margin-bottom: 0.3rem;
+            border-radius: 1.5rem;
+            text-align: left;
+            color: #6c757d;
+            background-color: transparent;
+            border-color: transparent;
+            justify-content: flex-start;
+
+            &.active {
+                background-color: #EFF6FF !important;
+                border:1px solid #DBEAFE !important;
+                color: #212529;
+
+                .group-nav-btn-icon {
+                    background-color: #2c78bf !important;
+                    color: #fff !important;
+                }
+            }
+
+            &-icon {
+                display: inline-flex;
+                width: 35px;
+                height: 35px;
+                padding: 12px;
+                background-color: #E5E7EB;
+                border-radius: 17px;
+                margin: auto 0.3rem;
+                align-items: center;
+                justify-content: center;
+            }
+
+            &-name {
+                display: inline-block;
+                margin-left: 0.3rem;
+                font-weight: 700;
+            }
+        }
+
+        .autocomplete-input {
+            height: 2.375rem;
+            background-color: #f8f9fa !important;
+            font-size: 0.9rem;
+            color: #495057;
+            border-radius: 50rem;
+            border-color: transparent;
+
+            &:focus,
+            &[aria-expanded=true] {
+                box-shadow: none;
+            }
+        }
+
+        .autocomplete-result {
+            background: none;
+            padding: 12px;
+
+            &:hover,
+            &:focus {
+                background-color: #EFF6FF !important;
+            }
+
+            .media {
+                img {
+                    object-fit: cover;
+                    border-radius: 4px;
+                    margin-right: 0.6rem;
+                }
+
+                .icon-placeholder {
+                    display: flex;
+                    width: 32px;
+                    height: 32px;
+                    background-color: #2c78bf;
+                    border-radius: 4px;
+                    justify-content: center;
+                    align-items: center;
+                    color: #fff;
+                    margin-right: 0.6rem;
+                }
+            }
+        }
+    }
+</style>
diff --git a/resources/assets/components/landing/sections/nav.vue b/resources/assets/components/landing/sections/nav.vue
index 38fde6ef2..16dbfef1e 100644
--- a/resources/assets/components/landing/sections/nav.vue
+++ b/resources/assets/components/landing/sections/nav.vue
@@ -1,33 +1,46 @@
 <template>
-	<nav class="navbar navbar-expand-lg navbar-dark fixed-top">
-		<div class="container" style="max-width: 600px;">
-			<router-link to="/" class="navbar-brand">
-				<img src="/img/pixelfed-icon-color.svg" width="40" height="40" alt="Logo">
-				<span class="mr-3">{{ name }}</span>
-			</router-link>
-			<ul class="navbar-nav mr-auto">
-			</ul>
-			<div class="my-2 my-lg-0">
-				<a class="btn btn-outline-light btn-sm rounded-pill font-weight-bold px-4" href="/login">Login</a>
+    <nav class="navbar navbar-expand-lg navbar-dark fixed-top">
+        <div class="container" style="max-width: 600px;">
+            <router-link to="/" class="navbar-brand">
+                <img src="/img/pixelfed-icon-color.svg" width="40" height="40" alt="Logo">
+                <span class="mr-3">{{ name }}</span>
+            </router-link>
+            <ul class="navbar-nav mr-auto">
+            </ul>
+            <div class="my-2 my-lg-0">
+                <a class="btn btn-outline-light btn-sm rounded-pill font-weight-bold px-4" href="/login">Login</a>
 
-				<a v-if="config.open_registration" class="ml-2 btn btn-primary btn-primary-alt btn-sm rounded-pill font-weight-bold px-4" href="/register">Sign up</a>
-			</div>
-		</div>
-	</nav>
+                <a v-if="config.open_registration || config.curated_onboarding" class="ml-2 btn btn-primary btn-primary-alt btn-sm rounded-pill font-weight-bold px-4" :href="regLink">Sign up</a>
+            </div>
+        </div>
+    </nav>
 </template>
 
 <script type="text/javascript">
-	export default {
-		data() {
-			return {
-				config: window.pfl,
-				name: window.pfl.name,
-			}
-		},
-		mounted() {
-			$(window).scroll(function(){
-				$('nav').toggleClass('bg-black', $(this).scrollTop() > 20);
-			});
-		}
-	}
+    export default {
+        data() {
+            return {
+                config: window.pfl,
+                name: window.pfl.name,
+            }
+        },
+        computed: {
+            regLink: {
+                get() {
+                    if(this.config.open_registration) {
+                        return '/register';
+                    }
+
+                    if(this.config.curated_onboarding) {
+                        return '/auth/sign_up';
+                    }
+                }
+            }
+        },
+        mounted() {
+            $(window).scroll(function(){
+                $('nav').toggleClass('bg-black', $(this).scrollTop() > 20);
+            });
+        }
+    }
 </script>
diff --git a/resources/assets/components/partials/navbar.vue b/resources/assets/components/partials/navbar.vue
index c3c21243e..21f59e0ec 100644
--- a/resources/assets/components/partials/navbar.vue
+++ b/resources/assets/components/partials/navbar.vue
@@ -1,7 +1,7 @@
 <template>
 	<nav class="metro-nav navbar navbar-expand navbar-light navbar-laravel sticky-top shadow-none py-1">
 		<div class="container-fluid">
-				<a class="navbar-brand d-flex align-items-center" href="/i/web" title="Logo" style="width:50px">
+				<a class="navbar-brand d-flex align-items-center" href="/i/web" title="Logo">
 					<img src="/img/pixelfed-icon-color.svg" height="30px" class="px-2" loading="eager" alt="Pixelfed logo">
 					<span class="font-weight-bold mb-0 d-none d-sm-block" style="font-size:20px;">
 						{{ brandName }}
diff --git a/resources/assets/components/partials/post/ContextMenu.vue b/resources/assets/components/partials/post/ContextMenu.vue
index 655499d33..ad94da335 100644
--- a/resources/assets/components/partials/post/ContextMenu.vue
+++ b/resources/assets/components/partials/post/ContextMenu.vue
@@ -1,803 +1,1021 @@
 <template>
-	<div class="modal-stack">
-		<b-modal ref="ctxModal"
-			id="ctx-modal"
-			hide-header
-			hide-footer
-			centered
-			rounded
-			size="sm"
-			body-class="list-group-flush p-0 rounded">
+    <div class="modal-stack">
+        <b-modal ref="ctxModal"
+            id="ctx-modal"
+            hide-header
+            hide-footer
+            centered
+            rounded
+            size="sm"
+            body-class="list-group-flush p-0 rounded">
 
-			<div class="list-group text-center">
-				<div
-					v-if="status.visibility !== 'archived'"
-					class="list-group-item rounded cursor-pointer font-weight-bold"
-					@click="ctxMenuGoToPost()">
-					{{ $t('menu.viewPost') }}
-				</div>
+            <div class="list-group text-center">
+                <div v-if="status.visibility !== 'archived'" class="list-group-item d-flex p-0 m-0">
+                    <div class="border-right p-2 w-50">
+                        <a
+                            v-if="status"
+                            class="menu-option"
+                            :href="status.url"
+                            @click.prevent="ctxMenuGoToPost()">
+                            <div class="action-icon-link">
+                                <div class="icon"><i class="fal fa-images fa-lg"></i></div>
+                                <p class="mb-0">{{ $t('menu.viewPost') }}</p>
+                            </div>
+                        </a>
+                    </div>
 
-				<div
-					v-if="status.visibility !== 'archived'"
-					class="list-group-item rounded cursor-pointer font-weight-bold"
-					@click="ctxMenuGoToProfile()">
-					{{ $t('menu.viewProfile') }}
-				</div>
+                    <div class="p-2 flex-grow-1">
+                        <a
+                            v-if="status"
+                            class="menu-option"
+                            :href="status.account.url"
+                            @click.prevent="ctxMenuGoToProfile()">
+                            <div class="action-icon-link">
+                                <div class="icon"><i class="fal fa-user fa-lg"></i></div>
+                                <p class="mb-0">{{ $t('menu.viewProfile') }}</p>
+                            </div>
+                        </a>
+                    </div>
+                </div>
 
-				<div
-					v-if="status.visibility !== 'archived'"
-					class="list-group-item rounded cursor-pointer font-weight-bold"
-					@click="ctxMenuShare()">
-					{{ $t('common.share') }}
-				</div>
+                <template v-if="ctxMenuRelationship">
+                    <a
+                        v-if="ctxMenuRelationship.following"
+                        class="list-group-item menu-option text-danger"
+                        href="#"
+                        @click.prevent="handleUnfollow">
+                        {{ $t('profile.unfollow') }}
+                    </a>
 
-				<div
-					v-if="status && profile && profile.is_admin == true && status.visibility !== 'archived'"
-					class="list-group-item rounded cursor-pointer font-weight-bold"
-					@click="ctxModMenuShow()">
-					{{ $t('menu.moderationTools') }}
-				</div>
+                    <div v-else class="d-flex">
+                        <div class="p-3 border-right w-50 text-center">
+                            <a
+                                class="small menu-option text-muted"
+                                href="#"
+                                @click.prevent="handleMute">
+                                <div class="action-icon-link-inline">
+                                    <div class="icon"><i class="far" :class="[ ctxMenuRelationship.muting ? 'fa-eye' : 'fa-eye-slash' ]"></i></div>
+                                    <p class="text-muted mb-0">{{ ctxMenuRelationship.muting ? 'Unmute' : 'Mute' }}</p>
+                                </div>
+                            </a>
+                        </div>
+                        <div class="p-3 w-50">
+                            <a
+                                class="small menu-option text-danger"
+                                href="#"
+                                @click.prevent="handleBlock">
+                                <div class="action-icon-link-inline">
+                                    <div class="icon"><i class="far fa-shield-alt"></i></div>
+                                    <p class="text-danger mb-0">Block</p>
+                                </div>
+                            </a>
+                        </div>
+                    </div>
+                </template>
 
-				<div
-					v-if="status && status.account.id != profile.id"
-					class="list-group-item rounded cursor-pointer text-danger font-weight-bold"
-					@click="ctxMenuReportPost()">
-					{{ $t('menu.report') }}
-				</div>
+                <a
+                    v-if="status.visibility !== 'archived'"
+                    class="list-group-item menu-option"
+                    href="#"
+                    @click.prevent="ctxMenuShare()">
+                    {{ $t('common.share') }}
+                </a>
 
-				<div
-					v-if="status && profile.id == status.account.id && status.visibility !== 'archived'"
-					class="list-group-item rounded cursor-pointer text-danger font-weight-bold"
-					@click="archivePost(status)">
-					{{ $t('menu.archive') }}
-				</div>
+                <a
+                    v-if="status && profile && profile.is_admin == true && status.visibility !== 'archived'"
+                    class="list-group-item menu-option"
+                    href="#"
+                    @click.prevent="ctxModMenuShow()">
+                    {{ $t('menu.moderationTools') }}
+                </a>
 
-				<div
-					v-if="status && profile.id == status.account.id && status.visibility == 'archived'"
-					class="list-group-item rounded cursor-pointer text-danger font-weight-bold"
-					@click="unarchivePost(status)">
-					{{ $t('menu.unarchive') }}
-				</div>
+                <a
+                    v-if="status && status.account.id != profile.id"
+                    class="list-group-item menu-option text-danger"
+                    href="#"
+                    @click.prevent="ctxMenuReportPost()">
+                    {{ $t('menu.report') }}
+                </a>
 
-				<div
-					v-if="config.ab.pue && status && profile.id == status.account.id && status.visibility !== 'archived'"
-					class="list-group-item rounded cursor-pointer text-danger font-weight-bold"
-					@click="editPost(status)">
-					Edit
-				</div>
+                <a
+                    v-if="status && profile.id == status.account.id && status.visibility !== 'archived'"
+                    class="list-group-item menu-option text-danger"
+                    href="#"
+                    @click.prevent="archivePost(status)">
+                    {{ $t('menu.archive') }}
+                </a>
 
-				<div
-					v-if="status && (profile.is_admin || profile.id == status.account.id) && status.visibility !== 'archived'"
-					class="list-group-item rounded cursor-pointer text-danger font-weight-bold"
-					@click="deletePost(status)">
+                <a
+                    v-if="status && profile.id == status.account.id && status.visibility == 'archived'"
+                    class="list-group-item menu-option text-danger"
+                    href="#"
+                    @click.prevent="unarchivePost(status)">
+                    {{ $t('menu.unarchive') }}
+                </a>
+
+                <a
+                    v-if="config.ab.pue && status && profile.id == status.account.id && status.visibility !== 'archived'"
+                    class="list-group-item menu-option text-danger"
+                    href="#"
+                    @click.prevent="editPost(status)">
+                    Edit
+                </a>
+
+                <a
+                    v-if="status && (profile.is_admin || profile.id == status.account.id) && status.visibility !== 'archived'"
+                    class="list-group-item menu-option text-danger"
+                    href="#"
+                    @click.prevent="deletePost(status)">
                     <div v-if="isDeleting" class="spinner-border spinner-border-sm" role="status">
                         <span class="sr-only">Loading...</span>
                     </div>
                     <div v-else>
-					   {{ $t('common.delete') }}
+                       {{ $t('common.delete') }}
                     </div>
-				</div>
+                </a>
 
-				<div
-					class="list-group-item rounded cursor-pointer text-lighter font-weight-bold"
-					@click="closeCtxMenu()">
-					{{ $t('common.cancel') }}
-				</div>
-			</div>
-		</b-modal>
+                <a
+                    class="list-group-item menu-option text-lighter"
+                    href="#"
+                    @click.prevent="closeCtxMenu()">
+                    {{ $t('common.cancel') }}
+                </a>
+            </div>
+        </b-modal>
 
-		<b-modal ref="ctxModModal"
-			id="ctx-mod-modal"
-			hide-header
-			hide-footer
-			centered
-			rounded
-			size="sm"
-			body-class="list-group-flush p-0 rounded">
+        <b-modal ref="ctxModModal"
+            id="ctx-mod-modal"
+            hide-header
+            hide-footer
+            centered
+            rounded
+            size="sm"
+            body-class="list-group-flush p-0 rounded">
 
-			<div class="list-group text-center">
-				<p class="py-2 px-3 mb-0">
-					<div
-						class="text-center font-weight-bold text-danger">
-						{{ $t('menu.moderationTools') }}
-					</div>
+            <div class="list-group text-center">
+                <p class="py-2 px-3 mb-0">
+                    <div
+                        class="text-center menu-option text-danger">
+                        {{ $t('menu.moderationTools') }}
+                    </div>
 
-					<div class="small text-center text-muted">
-						{{ $t('menu.selectOneOption') }}
-					</div>
-				</p>
+                    <div class="small text-center text-muted">
+                        {{ $t('menu.selectOneOption') }}
+                    </div>
+                </p>
 
-				<div
-					class="list-group-item rounded cursor-pointer"
-					@click="moderatePost(status, 'unlist')">
-					{{ $t('menu.unlistFromTimelines') }}
-				</div>
+                <a
+                    class="list-group-item menu-option"
+                    href="#"
+                    @click.prevent="moderatePost(status, 'unlist')">
+                    {{ $t('menu.unlistFromTimelines') }}
+                </a>
 
-				<div
-					v-if="status.sensitive"
-					class="list-group-item rounded cursor-pointer"
-					@click="moderatePost(status, 'remcw')">
-					{{ $t('menu.removeCW') }}
-				</div>
+                <a
+                    v-if="status.sensitive"
+                    class="list-group-item menu-option"
+                    href="#"
+                    @click.prevent="moderatePost(status, 'remcw')">
+                    {{ $t('menu.removeCW') }}
+                </a>
 
-				<div
-					v-else
-					class="list-group-item rounded cursor-pointer"
-					@click="moderatePost(status, 'addcw')">
-					{{ $t('menu.addCW') }}
-				</div>
+                <a
+                    v-else
+                    class="list-group-item menu-option"
+                    href="#"
+                    @click.prevent="moderatePost(status, 'addcw')">
+                    {{ $t('menu.addCW') }}
+                </a>
 
-				<div
-					class="list-group-item rounded cursor-pointer"
-					@click="moderatePost(status, 'spammer')">
-					{{ $t('menu.markAsSpammer') }}<br />
-					<span class="small">{{ $t('menu.markAsSpammerText') }}</span>
-				</div>
+                <a
+                    class="list-group-item menu-option"
+                    href="#"
+                    @click.prevent="moderatePost(status, 'spammer')">
+                    {{ $t('menu.markAsSpammer') }}<br />
+                    <span class="small">{{ $t('menu.markAsSpammerText') }}</span>
+                </a>
 
-				<div
-					class="list-group-item rounded cursor-pointer text-lighter"
-					@click="ctxModMenuClose()">
-					{{ $t('common.cancel') }}
-				</div>
-			</div>
-		</b-modal>
+                <a
+                    class="list-group-item menu-option text-lighter"
+                    href="#"
+                    @click.prevent="ctxModMenuClose()">
+                    {{ $t('common.cancel') }}
+                </a>
+            </div>
+        </b-modal>
 
-		<b-modal ref="ctxModOtherModal"
-			id="ctx-mod-other-modal"
-			hide-header
-			hide-footer
-			centered
-			rounded
-			size="sm"
-			body-class="list-group-flush p-0 rounded">
-			<div class="list-group text-center">
-				<p class="py-2 px-3 mb-0">
-					<div class="text-center font-weight-bold text-danger">{{ $t('menu.moderationTools') }}</div>
-					<div class="small text-center text-muted">{{ $t('menu.selectOneOption') }}</div>
-				</p>
-				<div class="list-group-item rounded cursor-pointer font-weight-bold" @click="confirmModal()">Unlist Posts</div>
-				<div class="list-group-item rounded cursor-pointer font-weight-bold" @click="confirmModal()">Moderation Log</div>
-				<div class="list-group-item rounded cursor-pointer text-lighter" @click="ctxModOtherMenuClose()">{{ $t('common.cancel') }}</div>
-			</div>
-		</b-modal>
+        <b-modal ref="ctxModOtherModal"
+            id="ctx-mod-other-modal"
+            hide-header
+            hide-footer
+            centered
+            rounded
+            size="sm"
+            body-class="list-group-flush p-0 rounded">
+            <div class="list-group text-center">
+                <p class="py-2 px-3 mb-0">
+                    <div class="text-center font-weight-bold text-danger">{{ $t('menu.moderationTools') }}</div>
+                    <div class="small text-center text-muted">{{ $t('menu.selectOneOption') }}</div>
+                </p>
+                <div class="list-group-item rounded cursor-pointer font-weight-bold" @click="confirmModal()">Unlist Posts</div>
+                <div class="list-group-item rounded cursor-pointer font-weight-bold" @click="confirmModal()">Moderation Log</div>
+                <div class="list-group-item rounded cursor-pointer text-lighter" @click="ctxModOtherMenuClose()">{{ $t('common.cancel') }}</div>
+            </div>
+        </b-modal>
 
-		<b-modal ref="ctxShareModal"
-			id="ctx-share-modal"
-			title="Share"
-			hide-footer
-			hide-header
-			centered
-			rounded
-			size="sm"
-			body-class="list-group-flush p-0 rounded text-center">
-			<div class="list-group-item rounded cursor-pointer" @click="shareStatus(status, $event)">{{status.reblogged ? 'Unshare' : 'Share'}} {{ $t('menu.toFollowers') }}</div>
-			<div class="list-group-item rounded cursor-pointer" @click="ctxMenuCopyLink()">{{ $t('common.copyLink') }}</div>
-			<div v-if="status && status.local == true && !status.in_reply_to_id" class="list-group-item rounded cursor-pointer" @click="ctxMenuEmbed()">{{ $t('menu.embed') }}</div>
-			<div class="list-group-item rounded cursor-pointer text-lighter" @click="closeCtxShareMenu()">{{ $t('common.cancel') }}</div>
-		</b-modal>
+        <b-modal ref="ctxShareModal"
+            id="ctx-share-modal"
+            title="Share"
+            hide-footer
+            hide-header
+            centered
+            rounded
+            size="sm"
+            body-class="list-group-flush p-0 rounded text-center">
+            <a
+                class="list-group-item menu-option"
+                href="#"
+                @click.prevent="ctxMenuCopyLink()">
+                {{ $t('common.copyLink') }}
+            </a>
 
-		<b-modal ref="ctxEmbedModal"
-			id="ctx-embed-modal"
-			hide-header
-			hide-footer
-			centered
-			rounded
-			size="md"
-			body-class="p-2 rounded">
-			<div>
-				<div class="form-group">
-					<textarea class="form-control disabled text-monospace" rows="8" style="overflow-y:hidden;border: 1px solid #efefef; font-size: 12px; line-height: 18px; margin: 0 0 7px;resize:none;" v-model="ctxEmbedPayload" disabled=""></textarea>
-				</div>
-				<div class="form-group pl-2 d-flex justify-content-center">
-					<div class="form-check mr-3">
-						<input class="form-check-input" type="checkbox" v-model="ctxEmbedShowCaption" :disabled="ctxEmbedCompactMode == true">
-						<label class="form-check-label font-weight-light">
-							{{ $t('menu.showCaption') }}
-						</label>
-					</div>
-					<div class="form-check mr-3">
-						<input class="form-check-input" type="checkbox" v-model="ctxEmbedShowLikes" :disabled="ctxEmbedCompactMode == true">
-						<label class="form-check-label font-weight-light">
-							{{ $t('menu.showLikes') }}
-						</label>
-					</div>
-					<div class="form-check">
-						<input class="form-check-input" type="checkbox" v-model="ctxEmbedCompactMode">
-						<label class="form-check-label font-weight-light">
-							{{ $t('menu.compactMode') }}
-						</label>
-					</div>
-				</div>
-				<hr>
-				<button :class="copiedEmbed ? 'btn btn-primary btn-block btn-sm py-1 font-weight-bold disabed': 'btn btn-primary btn-block btn-sm py-1 font-weight-bold'" @click="ctxCopyEmbed" :disabled="copiedEmbed">{{copiedEmbed ? 'Embed Code Copied!' : 'Copy Embed Code'}}</button>
-				<p class="mb-0 px-2 small text-muted">{{ $t('menu.embedConfirmText') }} <a href="/site/terms">{{ $t('site.terms') }}</a></p>
-			</div>
-		</b-modal>
+            <a
+                v-if="status && status.local == true && !status.in_reply_to_id"
+                class="list-group-item menu-option"
+                @click.prevent="ctxMenuEmbed()">
+                {{ $t('menu.embed') }}
+            </a>
 
-		<b-modal ref="ctxReport"
-			id="ctx-report"
-			hide-header
-			hide-footer
-			centered
-			rounded
-			size="sm"
-			body-class="list-group-flush p-0 rounded">
-			<p class="py-2 px-3 mb-0">
-				<div class="text-center font-weight-bold text-danger">{{ $t('menu.report') }}</div>
-				<div class="small text-center text-muted">{{ $t('menu.selectOneOption') }}</div>
-			</p>
-			<div class="list-group text-center">
-				<div class="list-group-item rounded cursor-pointer font-weight-bold" @click="sendReport('spam')">{{ $t('menu.spam') }}</div>
-				<div class="list-group-item rounded cursor-pointer font-weight-bold" @click="sendReport('sensitive')">{{ $t('menu.sensitive') }}</div>
-				<div class="list-group-item rounded cursor-pointer font-weight-bold" @click="sendReport('abusive')">{{ $t('menu.abusive') }}</div>
-				<div class="list-group-item rounded cursor-pointer font-weight-bold" @click="openCtxReportOtherMenu()">{{ $t('common.other') }}</div>
-				<!-- <div class="list-group-item rounded cursor-pointer" @click="ctxReportMenuGoBack()">Go Back</div> -->
-				<div class="list-group-item rounded cursor-pointer text-lighter" @click="ctxReportMenuGoBack()">{{ $t('common.cancel') }}</div>
-			</div>
-		</b-modal>
+            <a
+                class="list-group-item menu-option text-lighter"
+                href="#"
+                @click.prevent="closeCtxShareMenu()">
+                {{ $t('common.cancel') }}
+            </a>
+        </b-modal>
 
-		<b-modal ref="ctxReportOther"
-			id="ctx-report-other"
-			hide-header
-			hide-footer
-			centered
-			rounded
-			size="sm"
-			body-class="list-group-flush p-0 rounded">
-			<p class="py-2 px-3 mb-0">
-				<div class="text-center font-weight-bold text-danger">{{ $t('menu.report') }}</div>
-				<div class="small text-center text-muted">{{ $t('menu.selectOneOption') }}</div>
-			</p>
-			<div class="list-group text-center">
-				<div class="list-group-item rounded cursor-pointer font-weight-bold" @click="sendReport('underage')">{{ $t('menu.underageAccount') }}</div>
-				<div class="list-group-item rounded cursor-pointer font-weight-bold" @click="sendReport('copyright')">{{ $t('menu.copyrightInfringement') }}</div>
-				<div class="list-group-item rounded cursor-pointer font-weight-bold" @click="sendReport('impersonation')">{{ $t('menu.impersonation') }}</div>
-				<div class="list-group-item rounded cursor-pointer font-weight-bold" @click="sendReport('scam')">{{ $t('menu.scamOrFraud') }}</div>
-				<div class="list-group-item rounded cursor-pointer text-lighter" @click="ctxReportOtherMenuGoBack()">{{ $t('common.cancel') }}</div>
-			</div>
-		</b-modal>
+        <b-modal ref="ctxEmbedModal"
+            id="ctx-embed-modal"
+            hide-header
+            hide-footer
+            centered
+            rounded
+            size="md"
+            body-class="p-2 rounded">
+            <div>
+                <div class="form-group">
+                    <textarea class="form-control disabled text-monospace" rows="8" style="overflow-y:hidden;border: 1px solid #efefef; font-size: 12px; line-height: 18px; margin: 0 0 7px;resize:none;" v-model="ctxEmbedPayload" disabled=""></textarea>
+                </div>
+                <div class="form-group pl-2 d-flex justify-content-center">
+                    <div class="form-check mr-3">
+                        <input class="form-check-input" type="checkbox" v-model="ctxEmbedShowCaption" :disabled="ctxEmbedCompactMode == true">
+                        <label class="form-check-label font-weight-light">
+                            {{ $t('menu.showCaption') }}
+                        </label>
+                    </div>
+                    <div class="form-check mr-3">
+                        <input class="form-check-input" type="checkbox" v-model="ctxEmbedShowLikes" :disabled="ctxEmbedCompactMode == true">
+                        <label class="form-check-label font-weight-light">
+                            {{ $t('menu.showLikes') }}
+                        </label>
+                    </div>
+                    <div class="form-check">
+                        <input class="form-check-input" type="checkbox" v-model="ctxEmbedCompactMode">
+                        <label class="form-check-label font-weight-light">
+                            {{ $t('menu.compactMode') }}
+                        </label>
+                    </div>
+                </div>
+                <hr>
+                <button :class="copiedEmbed ? 'btn btn-primary btn-block btn-sm py-1 font-weight-bold disabed': 'btn btn-primary btn-block btn-sm py-1 font-weight-bold'" @click="ctxCopyEmbed" :disabled="copiedEmbed">{{copiedEmbed ? 'Embed Code Copied!' : 'Copy Embed Code'}}</button>
+                <p class="mb-0 px-2 small text-muted">{{ $t('menu.embedConfirmText') }} <a href="/site/terms">{{ $t('site.terms') }}</a></p>
+            </div>
+        </b-modal>
 
-		<b-modal ref="ctxConfirm"
-			id="ctx-confirm"
-			hide-header
-			hide-footer
-			centered
-			rounded
-			size="sm"
-			body-class="list-group-flush p-0 rounded">
-			<div class="d-flex align-items-center justify-content-center py-3">
-				<div>{{ this.confirmModalTitle }}</div>
-			</div>
-			<div class="d-flex border-top btn-group btn-group-block rounded-0" role="group">
-				<button type="button" class="btn btn-outline-lighter border-left-0 border-top-0 border-bottom-0 border-right py-2" style="color: rgb(0,122,255) !important;" @click.prevent="confirmModalCancel()">{{ $t('common.cancel') }}</button>
-				<button type="button" class="btn btn-outline-lighter border-0" style="color: rgb(0,122,255) !important;" @click.prevent="confirmModalConfirm()">Confirm</button>
-			</div>
-		</b-modal>
+        <b-modal ref="ctxReport"
+            id="ctx-report"
+            hide-header
+            hide-footer
+            centered
+            rounded
+            size="sm"
+            body-class="list-group-flush p-0 rounded">
+            <p class="py-2 px-3 mb-0">
+                <div class="text-center font-weight-bold text-danger">{{ $t('menu.report') }}</div>
+                <div class="small text-center text-muted">{{ $t('menu.selectOneOption') }}</div>
+            </p>
+            <div class="list-group text-center">
+                <div class="list-group-item rounded cursor-pointer font-weight-bold" @click="sendReport('spam')">{{ $t('menu.spam') }}</div>
+                <div class="list-group-item rounded cursor-pointer font-weight-bold" @click="sendReport('sensitive')">{{ $t('menu.sensitive') }}</div>
+                <div class="list-group-item rounded cursor-pointer font-weight-bold" @click="sendReport('abusive')">{{ $t('menu.abusive') }}</div>
+                <div class="list-group-item rounded cursor-pointer font-weight-bold" @click="openCtxReportOtherMenu()">{{ $t('common.other') }}</div>
+                <!-- <div class="list-group-item rounded cursor-pointer" @click="ctxReportMenuGoBack()">Go Back</div> -->
+                <div class="list-group-item rounded cursor-pointer text-lighter" @click="ctxReportMenuGoBack()">{{ $t('common.cancel') }}</div>
+            </div>
+        </b-modal>
 
-	</div>
+        <b-modal ref="ctxReportOther"
+            id="ctx-report-other"
+            hide-header
+            hide-footer
+            centered
+            rounded
+            size="sm"
+            body-class="list-group-flush p-0 rounded">
+            <p class="py-2 px-3 mb-0">
+                <div class="text-center font-weight-bold text-danger">{{ $t('menu.report') }}</div>
+                <div class="small text-center text-muted">{{ $t('menu.selectOneOption') }}</div>
+            </p>
+            <div class="list-group text-center">
+                <div class="list-group-item rounded cursor-pointer font-weight-bold" @click="sendReport('underage')">{{ $t('menu.underageAccount') }}</div>
+                <div class="list-group-item rounded cursor-pointer font-weight-bold" @click="sendReport('copyright')">{{ $t('menu.copyrightInfringement') }}</div>
+                <div class="list-group-item rounded cursor-pointer font-weight-bold" @click="sendReport('impersonation')">{{ $t('menu.impersonation') }}</div>
+                <div class="list-group-item rounded cursor-pointer font-weight-bold" @click="sendReport('scam')">{{ $t('menu.scamOrFraud') }}</div>
+                <div class="list-group-item rounded cursor-pointer text-lighter" @click="ctxReportOtherMenuGoBack()">{{ $t('common.cancel') }}</div>
+            </div>
+        </b-modal>
+
+        <b-modal ref="ctxConfirm"
+            id="ctx-confirm"
+            hide-header
+            hide-footer
+            centered
+            rounded
+            size="sm"
+            body-class="list-group-flush p-0 rounded">
+            <div class="d-flex align-items-center justify-content-center py-3">
+                <div>{{ this.confirmModalTitle }}</div>
+            </div>
+            <div class="d-flex border-top btn-group btn-group-block rounded-0" role="group">
+                <button type="button" class="btn btn-outline-lighter border-left-0 border-top-0 border-bottom-0 border-right py-2" style="color: rgb(0,122,255) !important;" @click.prevent="confirmModalCancel()">{{ $t('common.cancel') }}</button>
+                <button type="button" class="btn btn-outline-lighter border-0" style="color: rgb(0,122,255) !important;" @click.prevent="confirmModalConfirm()">Confirm</button>
+            </div>
+        </b-modal>
+
+    </div>
 </template>
 
 <script type="text/javascript">
-	export default {
-		props: [
-			'status',
-			'profile'
-		],
+    export default {
+        props: [
+            'status',
+            'profile'
+        ],
 
-		data() {
-			return {
-				config: window.App.config,
-				ctxMenuStatus: false,
-				ctxMenuRelationship: false,
-				ctxEmbedPayload: false,
-				copiedEmbed: false,
-				replySending: false,
-				ctxEmbedShowCaption: true,
-				ctxEmbedShowLikes: false,
-				ctxEmbedCompactMode: false,
-				confirmModalTitle: 'Are you sure?',
-				confirmModalIdentifer: null,
-				confirmModalType: false,
+        data() {
+            return {
+                config: window.App.config,
+                ctxMenuStatus: false,
+                ctxMenuRelationship: false,
+                ctxEmbedPayload: false,
+                copiedEmbed: false,
+                replySending: false,
+                ctxEmbedShowCaption: true,
+                ctxEmbedShowLikes: false,
+                ctxEmbedCompactMode: false,
+                confirmModalTitle: 'Are you sure?',
+                confirmModalIdentifer: null,
+                confirmModalType: false,
                 isDeleting: false
-			}
-		},
+            }
+        },
 
-		watch: {
-			ctxEmbedShowCaption: function (n,o) {
-				if(n == true) {
-					this.ctxEmbedCompactMode = false;
-				}
-				let mode = this.ctxEmbedCompactMode ? 'compact' : 'full';
-				this.ctxEmbedPayload = window.App.util.embed.post(this.ctxMenuStatus.url, this.ctxEmbedShowCaption, this.ctxEmbedShowLikes, mode);
-			},
-			ctxEmbedShowLikes: function (n,o) {
-				if(n == true) {
-					this.ctxEmbedCompactMode = false;
-				}
-				let mode = this.ctxEmbedCompactMode ? 'compact' : 'full';
-				this.ctxEmbedPayload = window.App.util.embed.post(this.ctxMenuStatus.url, this.ctxEmbedShowCaption, this.ctxEmbedShowLikes, mode);
-			},
-			ctxEmbedCompactMode: function (n,o) {
-				if(n == true) {
-					this.ctxEmbedShowCaption = false;
-					this.ctxEmbedShowLikes = false;
-				}
-				let mode = this.ctxEmbedCompactMode ? 'compact' : 'full';
-				this.ctxEmbedPayload = window.App.util.embed.post(this.ctxMenuStatus.url, this.ctxEmbedShowCaption, this.ctxEmbedShowLikes, mode);
-			}
-		},
+        watch: {
+            ctxEmbedShowCaption: function (n,o) {
+                if(n == true) {
+                    this.ctxEmbedCompactMode = false;
+                }
+                let mode = this.ctxEmbedCompactMode ? 'compact' : 'full';
+                this.ctxEmbedPayload = window.App.util.embed.post(this.ctxMenuStatus.url, this.ctxEmbedShowCaption, this.ctxEmbedShowLikes, mode);
+            },
+            ctxEmbedShowLikes: function (n,o) {
+                if(n == true) {
+                    this.ctxEmbedCompactMode = false;
+                }
+                let mode = this.ctxEmbedCompactMode ? 'compact' : 'full';
+                this.ctxEmbedPayload = window.App.util.embed.post(this.ctxMenuStatus.url, this.ctxEmbedShowCaption, this.ctxEmbedShowLikes, mode);
+            },
+            ctxEmbedCompactMode: function (n,o) {
+                if(n == true) {
+                    this.ctxEmbedShowCaption = false;
+                    this.ctxEmbedShowLikes = false;
+                }
+                let mode = this.ctxEmbedCompactMode ? 'compact' : 'full';
+                this.ctxEmbedPayload = window.App.util.embed.post(this.ctxMenuStatus.url, this.ctxEmbedShowCaption, this.ctxEmbedShowLikes, mode);
+            }
+        },
 
-		methods: {
-			open() {
-				this.ctxMenu();
-			},
+        methods: {
+            open() {
+                this.ctxMenu();
+            },
 
-			openModMenu() {
-				this.$refs.ctxModModal.show();
-			},
+            openModMenu() {
+                this.$refs.ctxModModal.show();
+            },
 
-			ctxMenu() {
-				this.ctxMenuStatus = this.status;
-				this.ctxEmbedPayload = window.App.util.embed.post(this.status.url);
-				// if(this.status.account.id == this.profile.id) {
-					this.ctxMenuRelationship = false;
-					this.$refs.ctxModal.show();
-				// } else {
-				// 	axios.get('/api/pixelfed/v1/accounts/relationships', {
-				// 		params: {
-				// 			'id[]': this.status.account.id
-				// 		}
-				// 	}).then(res => {
-				// 		this.ctxMenuRelationship = res.data[0];
-				// 		this.$refs.ctxModal.show();
-				// 	});
-				// }
-			},
+            ctxMenu() {
+                this.ctxMenuStatus = this.status;
+                this.ctxEmbedPayload = window.App.util.embed.post(this.status.url);
+                if(this.status.account.id == this.profile.id) {
+                    this.ctxMenuRelationship = false;
+                    this.$refs.ctxModal.show();
+                } else {
+                 axios.get('/api/v1/accounts/relationships', {
+                     params: {
+                         'id[]': this.status.account.id
+                     }
+                 }).then(res => {
+                     this.ctxMenuRelationship = res.data[0];
+                     this.$refs.ctxModal.show();
+                 });
+                }
+            },
 
-			closeCtxMenu() {
-				this.copiedEmbed = false;
-				this.ctxMenuStatus = false;
-				this.ctxMenuRelationship = false;
-				this.$refs.ctxModal.hide();
-				this.$refs.ctxReport.hide();
-				this.$refs.ctxReportOther.hide();
-				this.closeModals();
-			},
+            closeCtxMenu() {
+                this.copiedEmbed = false;
+                this.ctxMenuStatus = false;
+                this.ctxMenuRelationship = false;
+                this.$refs.ctxModal.hide();
+                this.$refs.ctxReport.hide();
+                this.$refs.ctxReportOther.hide();
+                this.closeModals();
+            },
 
-			ctxMenuCopyLink() {
-				let status = this.ctxMenuStatus;
-				navigator.clipboard.writeText(status.url);
-				this.closeModals();
-				return;
-			},
+            ctxMenuCopyLink() {
+                let status = this.ctxMenuStatus;
+                navigator.clipboard.writeText(status.url);
+                this.closeModals();
+                return;
+            },
 
-			ctxMenuGoToPost() {
-				let status = this.ctxMenuStatus;
-				this.statusUrl(status);
-				this.closeCtxMenu();
-				return;
-			},
+            ctxMenuGoToPost() {
+                let status = this.ctxMenuStatus;
+                this.statusUrl(status);
+                this.closeCtxMenu();
+                return;
+            },
 
-			ctxMenuGoToProfile() {
-				let status = this.ctxMenuStatus;
-				this.profileUrl(status);
-				this.closeCtxMenu();
-				return;
-			},
+            ctxMenuGoToProfile() {
+                let status = this.ctxMenuStatus;
+                this.profileUrl(status);
+                this.closeCtxMenu();
+                return;
+            },
 
-			ctxMenuReportPost() {
-				this.$refs.ctxModal.hide();
-				// this.$refs.ctxReport.show();
-				this.$emit('report-modal', this.ctxMenuStatus);
-				return;
-			},
+            ctxMenuReportPost() {
+                this.$refs.ctxModal.hide();
+                // this.$refs.ctxReport.show();
+                this.$emit('report-modal', this.ctxMenuStatus);
+                return;
+            },
 
-			ctxMenuEmbed() {
-				this.closeModals();
-				this.$refs.ctxEmbedModal.show();
-			},
+            ctxMenuEmbed() {
+                this.closeModals();
+                this.$refs.ctxEmbedModal.show();
+            },
 
-			ctxMenuShare() {
-				this.$refs.ctxModal.hide();
-				this.$refs.ctxShareModal.show();
-			},
+            ctxMenuShare() {
+                this.$refs.ctxModal.hide();
+                this.$refs.ctxShareModal.show();
+            },
 
-			closeCtxShareMenu() {
-				this.$refs.ctxShareModal.hide();
-				this.$refs.ctxModal.show();
-			},
+            closeCtxShareMenu() {
+                this.$refs.ctxShareModal.hide();
+                this.$refs.ctxModal.show();
+            },
 
-			ctxCopyEmbed() {
-				navigator.clipboard.writeText(this.ctxEmbedPayload);
-				this.ctxEmbedShowCaption = true;
-				this.ctxEmbedShowLikes = false;
-				this.ctxEmbedCompactMode = false;
-				this.$refs.ctxEmbedModal.hide();
-			},
+            ctxCopyEmbed() {
+                navigator.clipboard.writeText(this.ctxEmbedPayload);
+                this.ctxEmbedShowCaption = true;
+                this.ctxEmbedShowLikes = false;
+                this.ctxEmbedCompactMode = false;
+                this.$refs.ctxEmbedModal.hide();
+            },
 
-			ctxModMenuShow() {
-				this.$refs.ctxModal.hide();
-				this.$refs.ctxModModal.show();
-			},
+            ctxModMenuShow() {
+                this.$refs.ctxModal.hide();
+                this.$refs.ctxModModal.show();
+            },
 
-			ctxModOtherMenuShow() {
-				this.$refs.ctxModal.hide();
-				this.$refs.ctxModModal.hide();
-				this.$refs.ctxModOtherModal.show();
-			},
+            ctxModOtherMenuShow() {
+                this.$refs.ctxModal.hide();
+                this.$refs.ctxModModal.hide();
+                this.$refs.ctxModOtherModal.show();
+            },
 
-			ctxModMenu() {
-				this.$refs.ctxModal.hide();
-			},
+            ctxModMenu() {
+                this.$refs.ctxModal.hide();
+            },
 
-			ctxModMenuClose() {
-				this.closeModals();
-			},
+            ctxModMenuClose() {
+                this.closeModals();
+            },
 
-			ctxModOtherMenuClose() {
-				this.closeModals();
-				this.$refs.ctxModModal.show();
-			},
+            ctxModOtherMenuClose() {
+                this.closeModals();
+                this.$refs.ctxModModal.show();
+            },
 
-			formatCount(count) {
-				return App.util.format.count(count);
-			},
+            formatCount(count) {
+                return App.util.format.count(count);
+            },
 
-			openCtxReportOtherMenu() {
-				let s = this.ctxMenuStatus;
-				this.closeCtxMenu();
-				this.ctxMenuStatus = s;
-				this.$refs.ctxReportOther.show();
-			},
+            openCtxReportOtherMenu() {
+                let s = this.ctxMenuStatus;
+                this.closeCtxMenu();
+                this.ctxMenuStatus = s;
+                this.$refs.ctxReportOther.show();
+            },
 
-			ctxReportMenuGoBack() {
-				this.$refs.ctxReportOther.hide();
-				this.$refs.ctxReport.hide();
-				this.$refs.ctxModal.show();
-			},
+            ctxReportMenuGoBack() {
+                this.$refs.ctxReportOther.hide();
+                this.$refs.ctxReport.hide();
+                this.$refs.ctxModal.show();
+            },
 
-			ctxReportOtherMenuGoBack() {
-				this.$refs.ctxReportOther.hide();
-				this.$refs.ctxModal.hide();
-				this.$refs.ctxReport.show();
-			},
+            ctxReportOtherMenuGoBack() {
+                this.$refs.ctxReportOther.hide();
+                this.$refs.ctxModal.hide();
+                this.$refs.ctxReport.show();
+            },
 
-			sendReport(type) {
-				let id = this.ctxMenuStatus.id;
+            sendReport(type) {
+                let id = this.ctxMenuStatus.id;
 
-				swal({
-					'title': this.$t('menu.confirmReport'),
-					'text': this.$t('menu.confirmReportText'),
-					'icon': 'warning',
-					'buttons': true,
-					'dangerMode': true
-				}).then((res) => {
-					if(res) {
-						axios.post('/i/report/', {
-							'report': type,
-							'type': 'post',
-							'id': id,
-						}).then(res => {
-							this.closeCtxMenu();
-							swal(this.$t('menu.reportSent'), this.$t('menu.reportSentText'), 'success');
-						}).catch(err => {
-							swal(this.$t('common.oops'), this.$t('menu.reportSentError'), 'error');
-						})
-					} else {
-						this.closeCtxMenu();
-					}
-				});
-			},
+                swal({
+                    'title': this.$t('menu.confirmReport'),
+                    'text': this.$t('menu.confirmReportText'),
+                    'icon': 'warning',
+                    'buttons': true,
+                    'dangerMode': true
+                }).then((res) => {
+                    if(res) {
+                        axios.post('/i/report/', {
+                            'report': type,
+                            'type': 'post',
+                            'id': id,
+                        }).then(res => {
+                            this.closeCtxMenu();
+                            swal(this.$t('menu.reportSent'), this.$t('menu.reportSentText'), 'success');
+                        }).catch(err => {
+                            swal(this.$t('common.oops'), this.$t('menu.reportSentError'), 'error');
+                        })
+                    } else {
+                        this.closeCtxMenu();
+                    }
+                });
+            },
 
-			closeModals() {
-				this.$refs.ctxModal.hide();
-				this.$refs.ctxModModal.hide();
-				this.$refs.ctxModOtherModal.hide();
-				this.$refs.ctxShareModal.hide();
-				this.$refs.ctxEmbedModal.hide();
-				this.$refs.ctxReport.hide();
-				this.$refs.ctxReportOther.hide();
-				this.$refs.ctxConfirm.hide();
-			},
+            closeModals() {
+                this.$refs.ctxModal.hide();
+                this.$refs.ctxModModal.hide();
+                this.$refs.ctxModOtherModal.hide();
+                this.$refs.ctxShareModal.hide();
+                this.$refs.ctxEmbedModal.hide();
+                this.$refs.ctxReport.hide();
+                this.$refs.ctxReportOther.hide();
+                this.$refs.ctxConfirm.hide();
+            },
 
-			openCtxStatusModal() {
-				this.closeModals();
-				this.$refs.ctxStatusModal.show();
-			},
+            openCtxStatusModal() {
+                this.closeModals();
+                this.$refs.ctxStatusModal.show();
+            },
 
-			openConfirmModal() {
-				this.closeModals();
-				this.$refs.ctxConfirm.show();
-			},
+            openConfirmModal() {
+                this.closeModals();
+                this.$refs.ctxConfirm.show();
+            },
 
-			closeConfirmModal() {
-				this.closeModals();
-				this.confirmModalTitle = 'Are you sure?';
-				this.confirmModalType = false;
-				this.confirmModalIdentifer = null;
-			},
+            closeConfirmModal() {
+                this.closeModals();
+                this.confirmModalTitle = 'Are you sure?';
+                this.confirmModalType = false;
+                this.confirmModalIdentifer = null;
+            },
 
-			confirmModalConfirm() {
-				switch(this.confirmModalType) {
-					case 'post.delete':
-						axios.post('/i/delete', {
-							type: 'status',
-							item: this.confirmModalIdentifer
-						}).then(res => {
-							this.feed = this.feed.filter(s => {
-								return s.id != this.confirmModalIdentifer;
-							});
-							this.closeConfirmModal();
-						}).catch(err => {
-							this.closeConfirmModal();
-							swal(this.$t('common.error'), this.$t('common.errorMsg'), 'error');
-						});
-					break;
-				}
+            confirmModalConfirm() {
+                switch(this.confirmModalType) {
+                    case 'post.delete':
+                        axios.post('/i/delete', {
+                            type: 'status',
+                            item: this.confirmModalIdentifer
+                        }).then(res => {
+                            this.feed = this.feed.filter(s => {
+                                return s.id != this.confirmModalIdentifer;
+                            });
+                            this.closeConfirmModal();
+                        }).catch(err => {
+                            this.closeConfirmModal();
+                            swal(this.$t('common.error'), this.$t('common.errorMsg'), 'error');
+                        });
+                    break;
+                }
 
-				this.closeConfirmModal();
-			},
+                this.closeConfirmModal();
+            },
 
-			confirmModalCancel() {
-				this.closeConfirmModal();
-			},
+            confirmModalCancel() {
+                this.closeConfirmModal();
+            },
 
-			moderatePost(status, action, $event) {
-				let username = status.account.username;
-				let pid = status.id;
-				let msg = '';
-				let self = this;
-				switch(action) {
-					case 'addcw':
-						msg = this.$t('menu.modAddCWConfirm');
-						swal({
-							title: 'Confirm',
-							text: msg,
-							icon: 'warning',
-							buttons: true,
-							dangerMode: true
-						}).then(res =>  {
-							if(res) {
-								axios.post('/api/v2/moderator/action', {
-									action: action,
-									item_id: status.id,
-									item_type: 'status'
-								}).then(res => {
-									swal(this.$t('common.success'), this.$t('menu.modCWSuccess'), 'success');
-									// status.sensitive = true;
-									this.$emit('moderate', 'addcw');
-									self.closeModals();
-									self.ctxModMenuClose();
-								}).catch(err => {
-									self.closeModals();
-									self.ctxModMenuClose();
-									swal(this.$t('common.error'), this.$t('common.errorMsg'), 'error');
-								});
-							}
-						});
-					break;
+            moderatePost(status, action, $event) {
+                let username = status.account.username;
+                let pid = status.id;
+                let msg = '';
+                let self = this;
+                switch(action) {
+                    case 'addcw':
+                        msg = this.$t('menu.modAddCWConfirm');
+                        swal({
+                            title: 'Confirm',
+                            text: msg,
+                            icon: 'warning',
+                            buttons: true,
+                            dangerMode: true
+                        }).then(res =>  {
+                            if(res) {
+                                axios.post('/api/v2/moderator/action', {
+                                    action: action,
+                                    item_id: status.id,
+                                    item_type: 'status'
+                                }).then(res => {
+                                    swal(this.$t('common.success'), this.$t('menu.modCWSuccess'), 'success');
+                                    // status.sensitive = true;
+                                    this.$emit('moderate', 'addcw');
+                                    self.closeModals();
+                                    self.ctxModMenuClose();
+                                }).catch(err => {
+                                    self.closeModals();
+                                    self.ctxModMenuClose();
+                                    swal(this.$t('common.error'), this.$t('common.errorMsg'), 'error');
+                                });
+                            }
+                        });
+                    break;
 
-					case 'remcw':
-						msg = this.$t('menu.modRemoveCWConfirm');
-						swal({
-							title: 'Confirm',
-							text: msg,
-							icon: 'warning',
-							buttons: true,
-							dangerMode: true
-						}).then(res =>  {
-							if(res) {
-								axios.post('/api/v2/moderator/action', {
-									action: action,
-									item_id: status.id,
-									item_type: 'status'
-								}).then(res => {
-									swal(this.$t('common.success'), this.$t('menu.modRemoveCWSuccess'), 'success');
-									// status.sensitive = false;
-									this.$emit('moderate', 'remcw');
-									self.closeModals();
-									self.ctxModMenuClose();
-								}).catch(err => {
-									self.closeModals();
-									self.ctxModMenuClose();
-									swal(this.$t('common.error'), this.$t('common.errorMsg'), 'error');
-								});
-							}
-						});
-					break;
+                    case 'remcw':
+                        msg = this.$t('menu.modRemoveCWConfirm');
+                        swal({
+                            title: 'Confirm',
+                            text: msg,
+                            icon: 'warning',
+                            buttons: true,
+                            dangerMode: true
+                        }).then(res =>  {
+                            if(res) {
+                                axios.post('/api/v2/moderator/action', {
+                                    action: action,
+                                    item_id: status.id,
+                                    item_type: 'status'
+                                }).then(res => {
+                                    swal(this.$t('common.success'), this.$t('menu.modRemoveCWSuccess'), 'success');
+                                    // status.sensitive = false;
+                                    this.$emit('moderate', 'remcw');
+                                    self.closeModals();
+                                    self.ctxModMenuClose();
+                                }).catch(err => {
+                                    self.closeModals();
+                                    self.ctxModMenuClose();
+                                    swal(this.$t('common.error'), this.$t('common.errorMsg'), 'error');
+                                });
+                            }
+                        });
+                    break;
 
-					case 'unlist':
-						msg = this.$t('menu.modUnlistConfirm');
-						swal({
-							title: 'Confirm',
-							text: msg,
-							icon: 'warning',
-							buttons: true,
-							dangerMode: true
-						}).then(res =>  {
-							if(res) {
-								axios.post('/api/v2/moderator/action', {
-									action: action,
-									item_id: status.id,
-									item_type: 'status'
-								}).then(res => {
-									// this.feed = this.feed.filter(f => {
-									// 	return f.id != status.id;
-									// });
-									this.$emit('moderate', 'unlist');
-									swal(this.$t('common.success'), this.$t('menu.modUnlistSuccess'), 'success');
-									self.closeModals();
-									self.ctxModMenuClose();
-								}).catch(err => {
-									self.closeModals();
-									self.ctxModMenuClose();
-									swal(this.$t('common.error'), this.$t('common.errorMsg'), 'error');
-								});
-							}
-						});
-					break;
+                    case 'unlist':
+                        msg = this.$t('menu.modUnlistConfirm');
+                        swal({
+                            title: 'Confirm',
+                            text: msg,
+                            icon: 'warning',
+                            buttons: true,
+                            dangerMode: true
+                        }).then(res =>  {
+                            if(res) {
+                                axios.post('/api/v2/moderator/action', {
+                                    action: action,
+                                    item_id: status.id,
+                                    item_type: 'status'
+                                }).then(res => {
+                                    // this.feed = this.feed.filter(f => {
+                                    //  return f.id != status.id;
+                                    // });
+                                    this.$emit('moderate', 'unlist');
+                                    swal(this.$t('common.success'), this.$t('menu.modUnlistSuccess'), 'success');
+                                    self.closeModals();
+                                    self.ctxModMenuClose();
+                                }).catch(err => {
+                                    self.closeModals();
+                                    self.ctxModMenuClose();
+                                    swal(this.$t('common.error'), this.$t('common.errorMsg'), 'error');
+                                });
+                            }
+                        });
+                    break;
 
-					case 'spammer':
-						msg = this.$t('menu.modMarkAsSpammerConfirm');
-						swal({
-							title: 'Confirm',
-							text: msg,
-							icon: 'warning',
-							buttons: true,
-							dangerMode: true
-						}).then(res =>  {
-							if(res) {
-								axios.post('/api/v2/moderator/action', {
-									action: action,
-									item_id: status.id,
-									item_type: 'status'
-								}).then(res => {
-									this.$emit('moderate', 'spammer');
-									swal(this.$t('common.success'), this.$t('menu.modMarkAsSpammerSuccess'), 'success');
-									self.closeModals();
-									self.ctxModMenuClose();
-								}).catch(err => {
-									self.closeModals();
-									self.ctxModMenuClose();
-									swal(this.$t('common.error'), this.$t('common.errorMsg'), 'error');
-								});
-							}
-						});
-					break;
-				}
-			},
+                    case 'spammer':
+                        msg = this.$t('menu.modMarkAsSpammerConfirm');
+                        swal({
+                            title: 'Confirm',
+                            text: msg,
+                            icon: 'warning',
+                            buttons: true,
+                            dangerMode: true
+                        }).then(res =>  {
+                            if(res) {
+                                axios.post('/api/v2/moderator/action', {
+                                    action: action,
+                                    item_id: status.id,
+                                    item_type: 'status'
+                                }).then(res => {
+                                    this.$emit('moderate', 'spammer');
+                                    swal(this.$t('common.success'), this.$t('menu.modMarkAsSpammerSuccess'), 'success');
+                                    self.closeModals();
+                                    self.ctxModMenuClose();
+                                }).catch(err => {
+                                    self.closeModals();
+                                    self.ctxModMenuClose();
+                                    swal(this.$t('common.error'), this.$t('common.errorMsg'), 'error');
+                                });
+                            }
+                        });
+                    break;
+                }
+            },
 
-			shareStatus(status, $event) {
-				if($('body').hasClass('loggedIn') == false) {
-					return;
-				}
+            statusUrl(status) {
+                if(status.account.local == true) {
+                    this.$router.push({
+                        name: 'post',
+                        path: `/i/web/post/${status.id}`,
+                        params: {
+                            id: status.id,
+                            cachedStatus: status,
+                            cachedProfile: this.profile
+                        }
+                    });
+                    return;
+                }
 
-				this.closeModals();
+                let permalink = this.$route.params.hasOwnProperty('id');
+                if(permalink) {
+                    location.href = status.url;
+                    return;
+                } else {
+                    this.$router.push({
+                        name: 'post',
+                        path: `/i/web/post/${status.id}`,
+                        params: {
+                            id: status.id,
+                            cachedStatus: status,
+                            cachedProfile: this.profile
+                        }
+                    });
+                    return;
+                }
+            },
 
-				axios.post('/i/share', {
-					item: status.id
-				}).then(res => {
-					status.reblogs_count = res.data.count;
-					status.reblogged = !status.reblogged;
-					// if(status.reblogged) {
-					// 	swal('Success', 'You shared this post', 'success');
-					// } else {
-					// 	swal('Success', 'You unshared this post', 'success');
-					// }
-				}).catch(err => {
-					swal(this.$t('common.error'), this.$t('common.errorMsg'), 'error');
-				});
-			},
+            profileUrl(status) {
+                this.$router.push({
+                    name: 'profile',
+                    path: `/i/web/profile/${status.account.id}`,
+                    params: {
+                        id: status.account.id,
+                        cachedProfile: status.account,
+                        cachedUser: this.profile
+                    }
+                });
+                return;
+            },
 
-			statusUrl(status) {
-				if(status.account.local == true) {
-					this.$router.push({
-						name: 'post',
-						path: `/i/web/post/${status.id}`,
-						params: {
-							id: status.id,
-							cachedStatus: status,
-							cachedProfile: this.profile
-						}
-					});
-					return;
-				}
-
-				let permalink = this.$route.params.hasOwnProperty('id');
-				if(permalink) {
-					location.href = status.url;
-					return;
-				} else {
-					this.$router.push({
-						name: 'post',
-						path: `/i/web/post/${status.id}`,
-						params: {
-							id: status.id,
-							cachedStatus: status,
-							cachedProfile: this.profile
-						}
-					});
-					return;
-				}
-			},
-
-			profileUrl(status) {
-				this.$router.push({
-					name: 'profile',
-					path: `/i/web/profile/${status.account.id}`,
-					params: {
-						id: status.account.id,
-						cachedProfile: status.account,
-						cachedUser: this.profile
-					}
-				});
-				return;
-			},
-
-			deletePost(status) {
+            deletePost(status) {
                 this.isDeleting = true;
 
-				if(this.ownerOrAdmin(status) == false) {
-					return;
-				}
+                if(this.ownerOrAdmin(status) == false) {
+                    return;
+                }
 
-				if(window.confirm(this.$t('menu.deletePostConfirm')) == false) {
-					return;
-				}
+                swal({
+                    title: 'Confirm Delete',
+                    text: 'Are you sure you want to delete this post?',
+                    icon: "warning",
+                    buttons: true,
+                    dangerMode: true,
+                })
+                .then(res => {
+                    if(!res) {
+                        this.closeModals();
+                        this.isDeleting = false;
+                    } else {
+                        axios.post('/i/delete', {
+                            type: 'status',
+                            item: status.id
+                        }).then(res => {
+                            this.$emit('delete');
+                            this.closeModals();
+                            this.isDeleting = false;
+                        }).catch(err => {
+                            this.closeModals();
+                            this.isDeleting = false;
+                            swal(this.$t('common.error'), this.$t('common.errorMsg'), 'error');
+                        });
+                    }
+                })
+            },
 
-				axios.post('/i/delete', {
-					type: 'status',
-					item: status.id
-				}).then(res => {
-					this.$emit('delete');
-					this.closeModals();
-                    this.isDeleting = false;
-				}).catch(err => {
-					swal(this.$t('common.error'), this.$t('common.errorMsg'), 'error');
-				});
-			},
+            owner(status) {
+                return this.profile.id === status.account.id;
+            },
 
-			owner(status) {
-				return this.profile.id === status.account.id;
-			},
+            admin() {
+                return this.profile.is_admin == true;
+            },
 
-			admin() {
-				return this.profile.is_admin == true;
-			},
+            ownerOrAdmin(status) {
+                return this.owner(status) || this.admin();
+            },
 
-			ownerOrAdmin(status) {
-				return this.owner(status) || this.admin();
-			},
+            archivePost(status) {
+                if(window.confirm(this.$t('menu.archivePostConfirm')) == false) {
+                    return;
+                }
 
-			archivePost(status) {
-				if(window.confirm(this.$t('menu.archivePostConfirm')) == false) {
-					return;
-				}
+                axios.post('/api/pixelfed/v2/status/' + status.id + '/archive')
+                .then(res => {
+                    this.$emit('delete', status.id);
+                    this.$emit('archived', status.id);
+                    this.closeModals();
+                });
+            },
 
-				axios.post('/api/pixelfed/v2/status/' + status.id + '/archive')
-				.then(res => {
-					this.$emit('status-delete', status.id);
-					this.$emit('archived', status.id);
-					this.closeModals();
-				});
-			},
+            unarchivePost(status) {
+                if(window.confirm(this.$t('menu.unarchivePostConfirm')) == false) {
+                    return;
+                }
 
-			unarchivePost(status) {
-				if(window.confirm(this.$t('menu.unarchivePostConfirm')) == false) {
-					return;
-				}
+                axios.post('/api/pixelfed/v2/status/' + status.id + '/unarchive')
+                .then(res => {
+                    this.$emit('unarchived', status.id);
+                    this.closeModals();
+                });
+            },
 
-				axios.post('/api/pixelfed/v2/status/' + status.id + '/unarchive')
-				.then(res => {
-					this.$emit('unarchived', status.id);
-					this.closeModals();
-				});
-			},
+            editPost(status) {
+                this.closeModals();
+                this.$emit('edit', status);
+            },
 
-			editPost(status) {
-				this.closeModals();
-				this.$emit('edit', status);
-			}
-		}
-	}
+            handleMute() {
+                if(!this.ctxMenuRelationship) {
+                    return;
+                }
+                let curState = this.ctxMenuRelationship.muting;
+
+                swal({
+                    title: curState ? 'Confirm Unmute' : 'Confirm Mute',
+                    text: curState ? 'Are you sure you want to unmute this account?' : 'Are you sure you want to mute this account?',
+                    icon: "warning",
+                    buttons: true,
+                    dangerMode: true,
+                })
+                .then(res => {
+                    if(!res) {
+                        this.closeModals();
+                    } else {
+                        let url = curState ?
+                            `/api/v1/accounts/${this.status.account.id}/unmute` :
+                            `/api/v1/accounts/${this.status.account.id}/mute`;
+                        axios.post(url)
+                        .then(res => {
+                            this.closeModals();
+                            this.$emit('muted', this.status);
+                            this.$store.commit('updateRelationship', [res.data]);
+                        })
+                        .catch(err => {
+                            this.closeModals();
+                            if(err && err.response && err.response.data && err.response.data.error) {
+                                swal('Error', err.response.data.error, 'error');
+                            } else {
+                                swal('Oops!', 'An error occured, please try again later.', 'error');
+                            }
+                        })
+                    }
+                })
+            },
+
+            handleBlock() {
+                if(!this.ctxMenuRelationship) {
+                    return;
+                }
+                let curState = this.ctxMenuRelationship.blocking;
+
+                swal({
+                    title: curState ? 'Confirm Unblock' : 'Confirm Block',
+                    text: curState ? 'Are you sure you want to unblock this account?' : 'Are you sure you want to block this account?',
+                    icon: "warning",
+                    buttons: true,
+                    dangerMode: true,
+                })
+                .then(res => {
+                    if(!res) {
+                        this.closeModals();
+                    } else {
+                        let url = curState ?
+                            `/api/v1/accounts/${this.status.account.id}/unblock` :
+                            `/api/v1/accounts/${this.status.account.id}/block`;
+                        axios.post(url)
+                        .then(res => {
+                            this.closeModals();
+                            this.$store.commit('updateRelationship', [res.data]);
+                            this.$emit('muted', this.status);
+                        })
+                        .catch(err => {
+                            this.closeModals();
+                            if(err && err.response && err.response.data && err.response.data.error) {
+                                swal('Error', err.response.data.error, 'error');
+                            } else {
+                                swal('Oops!', 'An error occured, please try again later.', 'error');
+                            }
+                        })
+                    }
+                })
+            },
+
+            handleUnfollow() {
+                if(!this.ctxMenuRelationship) {
+                    return;
+                }
+
+                swal({
+                    title: 'Unfollow',
+                    text: 'Are you sure you want to unfollow ' + this.status.account.username + '?',
+                    icon: "warning",
+                    buttons: true,
+                    dangerMode: true,
+                })
+                .then(res => {
+                    if(!res) {
+                        this.closeModals();
+                    } else {
+                        axios.post(`/api/v1/accounts/${this.status.account.id}/unfollow`)
+                        .then(res => {
+                            this.closeModals();
+                            this.$store.commit('updateRelationship', [res.data]);
+                            this.$emit('unfollow', this.status);
+                        })
+                        .catch(err => {
+                            this.closeModals();
+                            if(err && err.response && err.response.data && err.response.data.error) {
+                                swal('Error', err.response.data.error, 'error');
+                            } else {
+                                swal('Oops!', 'An error occured, please try again later.', 'error');
+                            }
+                        })
+                    }
+                })
+            },
+        }
+    }
 </script>
+
+<style lang="scss" scoped>
+    .menu-option {
+        font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
+        text-decoration: none;
+        font-weight: 500;
+        color: var(--dark);
+    }
+
+    .list-group-item {
+        border-color: var(--border-color);
+    }
+
+    .action-icon-link {
+        display: flex;
+        flex-direction: column;
+
+        .icon {
+            opacity: 0.5;
+            margin-bottom: 5px;
+        }
+
+        p {
+            font-weight: 600;
+            font-size: 11px;
+        }
+
+        &-inline {
+            display: flex;
+            flex-direction: row;
+            justify-content: center;
+            align-items: center;
+            gap: 8px;
+
+            p {
+                font-weight: bold;
+            }
+        }
+    }
+</style>
diff --git a/resources/assets/components/partials/post/PostContent.vue b/resources/assets/components/partials/post/PostContent.vue
index 0a88acb19..9672d52e9 100644
--- a/resources/assets/components/partials/post/PostContent.vue
+++ b/resources/assets/components/partials/post/PostContent.vue
@@ -169,7 +169,7 @@
 <script type="text/javascript">
 	import BigPicture from 'bigpicture';
 	import ReadMore from './ReadMore.vue';
-    import VideoPlayer from './../../presenter/VideoPlayer.vue';
+    import VideoPlayer from '@/presenter/VideoPlayer.vue';
 
 	export default {
 		props: ['status'],
diff --git a/resources/assets/components/partials/post/PostReactions.vue b/resources/assets/components/partials/post/PostReactions.vue
index 5456b7e63..da446e77e 100644
--- a/resources/assets/components/partials/post/PostReactions.vue
+++ b/resources/assets/components/partials/post/PostReactions.vue
@@ -5,7 +5,7 @@
 				Liked by
 				<span v-if="status.favourites_count == 1 && status.favourited == true" class="font-weight-bold">me</span>
 				<span v-else>
-					<router-link :to="'/i/web/profile/' + status.liked_by.id" class="primary font-weight-bold"">&commat;{{ status.liked_by.username}}</router-link>
+					<router-link :to="'/i/web/profile/' + status.liked_by.id" class="primary font-weight-bold">{{ status.liked_by.username}}</router-link>
 					<span v-if="status.liked_by.others || status.favourites_count > 1">
 						and <a href="#" class="primary font-weight-bold" @click.prevent="showLikes()">{{ count(status.favourites_count - 1) }} others</a>
 					</span>
diff --git a/resources/assets/components/partials/profile/ProfileFeed.vue b/resources/assets/components/partials/profile/ProfileFeed.vue
index 3be99ce38..92dd86b9b 100644
--- a/resources/assets/components/partials/profile/ProfileFeed.vue
+++ b/resources/assets/components/partials/profile/ProfileFeed.vue
@@ -275,6 +275,7 @@
 						v-on:likes-modal="openLikesModal(index)"
 						v-on:shares-modal="openSharesModal(index)"
 						v-on:comment-likes-modal="openCommentLikesModal"
+						v-on:bookmark="handleBookmark(index)"
 						v-on:handle-report="handleReport" />
 				</div>
 
@@ -845,6 +846,32 @@
 				})
 			},
 
+			handleBookmark(index) {
+				let p = this.feed[index];
+
+				if(p.reblog) {
+					p = p.reblog;
+				}
+
+				axios.post('/i/bookmark', {
+					item: p.id
+				})
+				.then(res => {
+					if(this.feed[index].reblog) {
+						this.feed[index].reblog.bookmarked = !p.bookmarked;
+					} else {
+						this.feed[index].bookmarked = !p.bookmarked;
+					}
+				})
+				.catch(err => {
+					this.$bvToast.toast('Cannot bookmark post at this time.', {
+						title: 'Bookmark Error',
+						variant: 'danger',
+						autoHideDelay: 5000
+					});
+				});
+			},
+
 			formatCount(val) {
 				return App.util.format.count(val);
 			},
diff --git a/resources/assets/components/partials/profile/ProfileHoverCard.vue b/resources/assets/components/partials/profile/ProfileHoverCard.vue
index edafe3af7..c1bbff7a2 100644
--- a/resources/assets/components/partials/profile/ProfileHoverCard.vue
+++ b/resources/assets/components/partials/profile/ProfileHoverCard.vue
@@ -45,7 +45,6 @@
 					:href="profile.url"
 					@click.prevent="goToProfile()"
 					v-html="getDisplayName()">
-					{{ profile.display_name ? profile.display_name : profile.username }}
 				</a>
 			</p>
 
diff --git a/resources/assets/components/partials/profile/ProfileSidebar.vue b/resources/assets/components/partials/profile/ProfileSidebar.vue
index baf1ca97f..7f263aec1 100644
--- a/resources/assets/components/partials/profile/ProfileSidebar.vue
+++ b/resources/assets/components/partials/profile/ProfileSidebar.vue
@@ -150,6 +150,19 @@
                     </a>
 				</div>
 
+                <div v-else-if="profile.hasOwnProperty('moved') && profile.moved.id" style="flex-grow: 1;">
+                    <div class="card shadow-none rounded-lg mb-3 bg-danger">
+                        <div class="card-body">
+                            <div class="d-flex align-items-center ft-std text-white mb-2">
+                                <i class="far fa-exclamation-triangle mr-2 text-white"></i>
+                                Account has moved to:
+                            </div>
+                            <p class="mb-0 lead ft-std text-white text-break">
+                                <router-link :to="`/i/web/profile/${profile.moved.id}`" class="btn btn-outline-light btn-block rounded-pill font-weight-bold">&commat;{{truncate(profile.moved.acct)}}</router-link>
+                            </p>
+                        </div>
+                    </div>
+                </div>
 				<div v-else-if="profile.locked" style="flex-grow: 1;">
 					<template v-if="!relationship.following && !relationship.requested">
 						<button
@@ -375,6 +388,16 @@
 				}
 			},
 
+            truncate(str) {
+                if(!str) {
+                    return;
+                }
+                if(str.length > 15) {
+                    return str.slice(0, 15) + '...';
+                }
+                return str;
+            },
+
 			formatCount(val) {
 				return App.util.format.count(val);
 			},
diff --git a/resources/assets/components/partials/sidebar.vue b/resources/assets/components/partials/sidebar.vue
index b7b2a061b..6e7933f0d 100644
--- a/resources/assets/components/partials/sidebar.vue
+++ b/resources/assets/components/partials/sidebar.vue
@@ -132,12 +132,12 @@
 					</router-link>
 				</li>
 
-				<!-- <li class="nav-item">
-					<router-link class="nav-link" to="/i/web/groups">
+				<li v-if="hasGroups" class="nav-item">
+					<router-link class="nav-link" to="/groups/feed">
 						<span class="icon text-lighter"><i class="far fa-layer-group"></i></span>
 						{{ $t('navmenu.groups') }}
 					</router-link>
-				</li> -->
+				</li>
 
 				<li v-if="hasLiveStreams" class="nav-item">
 					<router-link class="nav-link d-flex justify-content-between align-items-center" to="/i/web/livestreams">
@@ -426,25 +426,20 @@
 				hasNetworkTimeline: false,
 				hasLiveStreams: false,
                 hasStories: false,
+                hasGroups: false,
 			}
 		},
 
 		mounted() {
 			if(window.App.config.features.hasOwnProperty('timelines')) {
 				this.hasLocalTimeline = App.config.features.timelines.local;
-				this.hasNetworkTimeline = App.config.features.timelines.network;
+                this.hasNetworkTimeline = App.config.features.timelines.network;
+				this.hasGroups = App.config.features.groups;
 				//this.hasLiveStreams = App.config.ab.hls == true;
 			}
             if(window.App.config.features.hasOwnProperty('stories')) {
                 this.hasStories = App.config.features.stories;
             }
-			// if(!this.user.username) {
-			// 	this.user = window._sharedData.user;
-			// }
-			// setTimeout(() => {
-			// 	this.user = window._sharedData.curUser;
-			// 	this.loaded = true;
-			// }, 300);
 		},
 
 		methods: {
diff --git a/resources/assets/components/presenter/MixedAlbumPresenter.vue b/resources/assets/components/presenter/MixedAlbumPresenter.vue
new file mode 100644
index 000000000..5f12a09c4
--- /dev/null
+++ b/resources/assets/components/presenter/MixedAlbumPresenter.vue
@@ -0,0 +1,75 @@
+<template>
+	<div v-if="status.sensitive == true">
+		<details class="details-animated">
+			<summary>
+				<p class="mb-0 lead font-weight-bold">{{ status.spoiler_text ? status.spoiler_text : 'CW / NSFW / Hidden Media'}}</p>
+				<p class="font-weight-light">(click to show)</p>
+			</summary>
+			<b-carousel :id="status.id + '-carousel'"
+				style="text-shadow: 1px 1px 2px #333; background-color: #000;"
+				controls
+				img-blank
+				background="#ffffff"
+				:interval="0"
+			>
+				<b-carousel-slide v-for="(media, index) in status.media_attachments" :key="media.id + '-media'">
+
+					<video v-if="media.type == 'video'" slot="img" class="embed-responsive-item" preload="none" controls playsinline loop :alt="media.description" width="100%" height="100%">
+						<source :src="media.url" :type="media.mime">
+					</video>
+
+					<div v-else-if="media.type == 'image'" slot="img" :title="media.description">
+						<img :class="media.filter_class + ' d-block img-fluid w-100'" :src="media.url" :alt="media.description" loading="lazy" onerror="this.onerror=null;this.src='/storage/no-preview.png'">
+					</div>
+
+					<p v-else class="text-center p-0 font-weight-bold text-white">Error: Problem rendering preview.</p>
+
+				</b-carousel-slide>
+			</b-carousel>
+		</details>
+	</div>
+	<div v-else class="w-100 h-100 p-0">
+		<!-- <b-carousel :id="status.id + '-carousel'"
+					style="text-shadow: 1px 1px 2px #333; background-color: #000;"
+					controls
+					img-blank
+					background="#ffffff"
+					:interval="0"
+				>
+			<b-carousel-slide v-for="(media, index) in status.media_attachments" :key="media.id + '-media'">
+
+				<video v-if="media.type == 'Video'" slot="img" class="embed-responsive-item" preload="none" controls loop :title="media.description" width="100%" height="100%" :poster="media.preview_url">
+					<source :src="media.url" :type="media.mime">
+				</video>
+
+				<div v-else-if="media.type == 'Image'" slot="img" :title="media.description">
+					<img :class="media.filter_class + ' d-block img-fluid w-100'" :src="media.url" :alt="media.description" loading="lazy">
+				</div>
+
+				<p v-else class="text-center p-0 font-weight-bold text-white">Error: Problem rendering preview.</p>
+
+			</b-carousel-slide>
+		</b-carousel> -->
+		<carousel ref="carousel" :centerMode="true" :loop="false" :per-page="1" :paginationPosition="'bottom-overlay'" paginationActiveColor="#3897f0" paginationColor="#dbdbdb" class="p-0 m-0">
+			<slide v-for="(media, index) in status.media_attachments" :key="'px-carousel-'+media.id + '-' + index" class="w-100 h-100 d-block mx-auto text-center" style="background: #000; display: flex;align-items: center;">
+
+				<video v-if="media.type == 'video'" class="embed-responsive-item" preload="none" controls loop :title="media.description" width="100%" height="100%">
+					<source :src="media.url" :type="media.mime">
+				</video>
+
+				<div v-else-if="media.type == 'image'" :title="media.description">
+					<img :class="media.filter_class + ' img-fluid w-100'" :src="media.url" :alt="media.description" loading="lazy"  onerror="this.onerror=null;this.src='/storage/no-preview.png'">
+				</div>
+
+				<p v-else class="text-center p-0 font-weight-bold text-white">Error: Problem rendering preview.</p>
+
+			</slide>
+		</carousel>
+	</div>
+</template>
+
+<script type="text/javascript">
+	export default {
+		props: ['status']
+	}
+</script>
diff --git a/resources/assets/components/presenter/PhotoAlbumPresenter.vue b/resources/assets/components/presenter/PhotoAlbumPresenter.vue
new file mode 100644
index 000000000..3adda10df
--- /dev/null
+++ b/resources/assets/components/presenter/PhotoAlbumPresenter.vue
@@ -0,0 +1,188 @@
+<template>
+	<div v-if="status.sensitive == true" class="content-label-wrapper">
+		<div class="text-light content-label">
+			<p class="text-center">
+				<i class="far fa-eye-slash fa-2x"></i>
+			</p>
+			<p class="h4 font-weight-bold text-center">
+				Sensitive Content
+			</p>
+			<p class="text-center py-2 content-label-text">
+				{{ status.spoiler_text ? status.spoiler_text : 'This album may contain sensitive content.'}}
+			</p>
+			<p class="mb-0">
+				<button @click="toggleContentWarning()" class="btn btn-outline-light btn-block btn-sm font-weight-bold">See Post</button>
+			</p>
+		</div>
+		<blur-hash-image
+			width="32"
+			height="32"
+			:punch="1"
+			:hash="status.media_attachments[0].blurhash"
+			:alt="altText(status)"/>
+	</div>
+	<div v-else class="w-100 h-100 p-0 album-wrapper">
+		<carousel ref="carousel" :centerMode="true" :loop="false" :per-page="1" :paginationPosition="'bottom-overlay'" paginationActiveColor="#3897f0" paginationColor="#dbdbdb" class="p-0 m-0" :id="'carousel-' + status.id">
+			<slide v-for="(img, index) in status.media_attachments" :key="'px-carousel-'+img.id + '-' + index" class="" style="background: #000; display: flex;align-items: center;" :title="img.description">
+
+				<img
+					class="img-fluid w-100 p-0"
+					:src="img.url"
+					:alt="altText(img)"
+					loading="lazy"
+					:data-bp="img.url"
+					onerror="this.onerror=null;this.src='/storage/no-preview.png'">
+
+			</slide>
+		</carousel>
+		<div class="album-overlay">
+			<p v-if="!status.sensitive && sensitive"
+				@click="status.sensitive = true"
+				style="
+				margin-top: 0;
+				padding: 10px;
+				color: #fff;
+				font-size: 10px;
+				text-align: right;
+				position: absolute;
+				top: 0;
+				right: 0;
+				border-top-left-radius: 5px;
+				cursor: pointer;
+				background: linear-gradient(0deg, rgba(0,0,0,0.5), rgba(0,0,0,0.5));
+			">
+				<i class="fas fa-eye-slash fa-lg"></i>
+			</p>
+
+			<p @click.prevent="toggleLightbox"
+				style="
+				margin-top: 0;
+				padding: 10px;
+				color: #fff;
+				font-size: 10px;
+				text-align: right;
+				position: absolute;
+				left: 0;
+				top: 0;
+				border-bottom-right-radius: 5px;
+				cursor: pointer;
+				background: linear-gradient(0deg, rgba(0,0,0,0.5), rgba(0,0,0,0.5));
+			">
+				<i class="fas fa-expand fa-lg"></i>
+			</p>
+
+			<p
+				v-if="status.media_attachments[0].license"
+				style="
+				margin-bottom: 0;
+				padding: 0 5px;
+				color: #fff;
+				font-size: 10px;
+				text-align: right;
+				position: absolute;
+				bottom: 0;
+				right: 0;
+				border-top-left-radius: 5px;
+				background: linear-gradient(0deg, rgba(0,0,0,0.5), rgba(0,0,0,0.5));
+			">
+				<a :href="status.url" class="font-weight-bold text-light">Photo</a> by <a :href="status.account.url" class="font-weight-bold text-light">&commat;{{status.account.username}}</a> licensed under <a :href="status.media_attachments[0].license.url" class="font-weight-bold text-light">{{status.media_attachments[0].license.title}}</a>
+			</p>
+		</div>
+	</div>
+</template>
+
+
+<script type="text/javascript">
+	import BigPicture from 'bigpicture';
+
+	export default {
+		props: ['status'],
+
+		data() {
+			return {
+				sensitive: this.status.sensitive,
+				cursor: 0
+			}
+		},
+
+		created() {
+			// window.addEventListener("keydown", this.keypressNavigation);
+		},
+
+		beforeDestroy() {
+			// window.removeEventListener("keydown", this.keypressNavigation);
+		},
+
+		methods: {
+			toggleContentWarning(status) {
+				this.$emit('togglecw');
+			},
+
+			toggleLightbox(e) {
+				BigPicture({
+					el: e.target,
+					gallery: '#carousel-' + this.status.id,
+					position: this.$refs.carousel.currentPage
+				})
+			},
+
+			altText(img) {
+				let desc = img.description;
+				if(desc) {
+					return desc;
+				}
+
+				return 'Photo was not tagged with any alt text.';
+			},
+
+			keypressNavigation(e) {
+				let ref = this.$refs.carousel;
+				if (e.keyCode == "37") {
+					e.preventDefault();
+
+					let direction = "backward";
+
+					ref.advancePage(direction);
+					ref.$emit("navigation-click", direction);
+				}
+
+				if (e.keyCode == "39") {
+					e.preventDefault();
+
+					let direction = "forward";
+
+					ref.advancePage(direction);
+					ref.$emit("navigation-click", direction);
+				}
+			}
+		}
+	}
+</script>
+
+<style type="text/css" scoped>
+  .card-img-top {
+	border-top-left-radius: 0 !important;
+	border-top-right-radius: 0 !important;
+  }
+  .content-label-wrapper {
+	position: relative;
+  }
+  .content-label {
+	margin: 0;
+	position: absolute;
+	top:50%;
+	left:50%;
+	transform: translate(-50%, -50%);
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	width: 100%;
+	height: 100%;
+	z-index: 2;
+	background: rgba(0, 0, 0, 0.2)
+  }
+  .album-wrapper {
+	position: relative;
+  }
+</style>
diff --git a/resources/assets/components/presenter/PhotoPresenter.vue b/resources/assets/components/presenter/PhotoPresenter.vue
new file mode 100644
index 000000000..eca896b0f
--- /dev/null
+++ b/resources/assets/components/presenter/PhotoPresenter.vue
@@ -0,0 +1,160 @@
+<template>
+	<div v-if="status.sensitive == true" class="content-label-wrapper">
+		<div class="text-light content-label">
+			<p class="text-center">
+				<i class="far fa-eye-slash fa-2x"></i>
+			</p>
+			<p class="h4 font-weight-bold text-center">
+				Sensitive Content
+			</p>
+			<p class="text-center py-2 content-label-text">
+				{{ status.spoiler_text ? status.spoiler_text : 'This post may contain sensitive content.'}}
+			</p>
+			<p class="mb-0">
+				<button @click="toggleContentWarning()" class="btn btn-outline-light btn-block btn-sm font-weight-bold">See Post</button>
+			</p>
+		</div>
+		<blur-hash-image
+			width="32"
+			height="32"
+			:punch="1"
+			:hash="status.media_attachments[0].blurhash"
+			:alt="altText(status)"/>
+	</div>
+	<div v-else>
+		<div :title="status.media_attachments[0].description" style="position: relative;">
+			<img class="card-img-top"
+				:src="status.media_attachments[0].url"
+				loading="lazy"
+				:alt="altText(status)"
+				:width="width()"
+				:height="height()"
+				onerror="this.onerror=null;this.src='/storage/no-preview.png'"
+				@click.prevent="toggleLightbox">
+
+				<!-- <blur-hash-image
+					class="card-img-top"
+					width="32"
+					height="32"
+					:punch="1"
+					:hash="status.media_attachments[0].blurhash"
+					:src="status.media_attachments[0].url"
+					:alt="altText(status)"
+					@click.prevent="toggleLightbox"/> -->
+
+				<p v-if="!status.sensitive && sensitive"
+					@click="status.sensitive = true"
+					style="
+					margin-top: 0;
+					padding: 10px;
+					color: #fff;
+					font-size: 10px;
+					text-align: right;
+					position: absolute;
+					top: 0;
+					right: 0;
+					border-top-left-radius: 5px;
+					cursor: pointer;
+					background: linear-gradient(0deg, rgba(0,0,0,0.5), rgba(0,0,0,0.5));
+				">
+					<i class="fas fa-eye-slash fa-lg"></i>
+				</p>
+
+				<p
+					v-if="status.media_attachments[0].license"
+					style="
+					margin-bottom: 0;
+					padding: 0 5px;
+					color: #fff;
+					font-size: 10px;
+					text-align: right;
+					position: absolute;
+					bottom: 0;
+					right: 0;
+					border-top-left-radius: 5px;
+					background: linear-gradient(0deg, rgba(0,0,0,0.5), rgba(0,0,0,0.5));
+				"><a :href="status.url" class="font-weight-bold text-light">Photo</a> by <a :href="status.account.url" class="font-weight-bold text-light">&commat;{{status.account.username}}</a> licensed under <a :href="status.media_attachments[0].license.url" class="font-weight-bold text-light">{{status.media_attachments[0].license.title}}</a></p>
+		</div>
+	</div>
+</template>
+
+<style type="text/css" scoped>
+  .card-img-top {
+    border-top-left-radius: 0 !important;
+    border-top-right-radius: 0 !important;
+  }
+  .content-label-wrapper {
+  	position: relative;
+  }
+  .content-label {
+  	margin: 0;
+  	position: absolute;
+  	top:50%;
+  	left:50%;
+  	transform: translate(-50%, -50%);
+  	display: flex;
+  	flex-direction: column;
+  	align-items: center;
+  	justify-content: center;
+  	width: 100%;
+  	height: 100%;
+  	z-index: 2;
+  	background: rgba(0, 0, 0, 0.2)
+  }
+</style>
+
+<script type="text/javascript">
+	import BigPicture from 'bigpicture';
+
+	export default {
+		props: ['status'],
+
+		data() {
+			return {
+				sensitive: this.status.sensitive
+			}
+		},
+
+		mounted() {
+		},
+
+		methods: {
+			altText(status) {
+				let desc = status.media_attachments[0].description;
+				if(desc) {
+					return desc;
+				}
+
+				return 'Photo was not tagged with any alt text.';
+			},
+
+			toggleContentWarning(status) {
+				this.$emit('togglecw');
+			},
+
+			toggleLightbox(e) {
+				BigPicture({
+					el: e.target
+				})
+			},
+
+			width() {
+				if( !this.status.media_attachments[0].meta ||
+					!this.status.media_attachments[0].meta.original ||
+					!this.status.media_attachments[0].meta.original.width ) {
+					return;
+				}
+				return this.status.media_attachments[0].meta.original.width;
+			},
+
+			height() {
+				if( !this.status.media_attachments[0].meta ||
+					!this.status.media_attachments[0].meta.original ||
+					!this.status.media_attachments[0].meta.original.height ) {
+					return;
+				}
+				return this.status.media_attachments[0].meta.original.height;
+			}
+		}
+	}
+</script>
diff --git a/resources/assets/components/presenter/VideoAlbumPresenter.vue b/resources/assets/components/presenter/VideoAlbumPresenter.vue
new file mode 100644
index 000000000..97285b158
--- /dev/null
+++ b/resources/assets/components/presenter/VideoAlbumPresenter.vue
@@ -0,0 +1,44 @@
+<template>
+	<div v-if="status.sensitive == true">
+		<details class="details-animated">
+			<summary>
+				<p class="mb-0 lead font-weight-bold">{{ status.spoiler_text ? status.spoiler_text : 'CW / NSFW / Hidden Media'}}</p>
+				<p class="font-weight-light">(click to show)</p>
+			</summary>
+			<b-carousel :id="status.id + '-carousel'"
+				style="text-shadow: 1px 1px 2px #333; background-color: #000;"
+				controls
+				img-blank
+				background="#ffffff"
+				:interval="0"
+			>
+				<b-carousel-slide v-for="(vid, index) in status.media_attachments" :key="vid.id + '-media'">
+					<video slot="img" class="embed-responsive-item" preload="none" controls playsinline loop :alt="vid.description" width="100%" height="100%">
+						<source :src="vid.url" :type="vid.mime">
+					</video>
+				</b-carousel-slide>
+			</b-carousel>
+		</details>
+	</div>
+	<div v-else>
+		<b-carousel :id="status.id + '-carousel'"
+			style="text-shadow: 1px 1px 2px #333; background-color: #000;"
+			controls
+			img-blank
+			background="#ffffff"
+			:interval="0"
+		>
+			<b-carousel-slide v-for="(vid, index) in status.media_attachments" :key="vid.id + '-media'">
+				<video slot="img" class="embed-responsive-item" preload="none" controls playsinline loop :alt="vid.description" width="100%" height="100%">
+					<source :src="vid.url" :type="vid.mime">
+				</video>
+			</b-carousel-slide>
+		</b-carousel>
+	</div>
+</template>
+
+<script type="text/javascript">
+	export default {
+		props: ['status']
+	}
+</script>
diff --git a/resources/assets/components/presenter/VideoPlayer.vue b/resources/assets/components/presenter/VideoPlayer.vue
index 8f5ba0102..9824a9f1d 100644
--- a/resources/assets/components/presenter/VideoPlayer.vue
+++ b/resources/assets/components/presenter/VideoPlayer.vue
@@ -29,10 +29,10 @@
             </div>
 
             <template v-else>
-                <video v-if="hasHls" ref="video" :class="{ fixedHeight: fixedHeight }" style="margin:0" playsinline controls autoplay="false" :poster="getPoster(status)">
+                <video v-if="hasHls" ref="video" :class="{ fixedHeight: fixedHeight }" style="margin:0" playsinline webkit-playsinline controls autoplay="false" :poster="getPoster(status)">
                 </video>
 
-                <video v-else class="card-img-top shadow" :class="{ fixedHeight: fixedHeight }" style="border-radius:15px;object-fit: contain;background-color: #000;" autoplay="false" controls :poster="getPoster(status)">
+                <video v-else class="card-img-top shadow" :class="{ fixedHeight: fixedHeight }" style="border-radius:15px;object-fit: contain;background-color: #000;" autoplay="false" playsinline webkit-playsinline controls :poster="getPoster(status)">
                     <source :src="status.media_attachments[0].url" :type="status.media_attachments[0].mime">
                 </video>
             </template>
@@ -45,8 +45,6 @@
     import Hls from 'hls.js';
     import "plyr/dist/plyr.css";
     import Plyr from 'plyr';
-    import { p2pml } from '@peertube/p2p-media-loader-core'
-    import { Engine, initHlsJsPlayer } from '@peertube/p2p-media-loader-hlsjs'
 
     export default {
         props: ['status', 'fixedHeight'],
@@ -72,8 +70,8 @@
         methods: {
             handleShouldPlay(){
                 this.shouldPlay = true;
-                this.isHlsSupported = this.hlsConfig.enabled && Hls.isSupported();
-                this.isP2PSupported = this.hlsConfig.enabled && this.hlsConfig.p2p && Engine.isSupported();
+                this.isHlsSupported = false;
+                this.isP2PSupported = false;
                 this.$nextTick(() => {
                     this.init();
                 })
diff --git a/resources/assets/components/presenter/VideoPresenter.vue b/resources/assets/components/presenter/VideoPresenter.vue
new file mode 100644
index 000000000..217dbb3de
--- /dev/null
+++ b/resources/assets/components/presenter/VideoPresenter.vue
@@ -0,0 +1,90 @@
+<template>
+	<div v-if="status.sensitive == true" class="content-label-wrapper">
+		<div class="text-light content-label">
+			<p class="text-center">
+				<i class="far fa-eye-slash fa-2x"></i>
+			</p>
+			<p class="h4 font-weight-bold text-center">
+				Sensitive Content
+			</p>
+			<p class="text-center py-2 content-label-text">
+				{{ status.spoiler_text ? status.spoiler_text : 'This post may contain sensitive content.'}}
+			</p>
+			<p class="mb-0">
+				<button @click="toggleContentWarning()" class="btn btn-outline-light btn-block btn-sm font-weight-bold">See Post</button>
+			</p>
+		</div>
+		<blur-hash-image
+			width="32"
+			height="32"
+			:punch="1"
+			:hash="status.media_attachments[0].blurhash"
+			:alt="altText(status)"/>
+	</div>
+	<div v-else class="embed-responsive embed-responsive-16by9">
+		<video class="video" controls playsinline webkit-playsinline preload="metadata" loop :data-id="status.id" :poster="poster()">
+			<source :src="status.media_attachments[0].url" :type="status.media_attachments[0].mime">
+		</video>
+	</div>
+</template>
+
+<style type="text/css" scoped>
+  .content-label-wrapper {
+  	position: relative;
+  }
+  .content-label {
+  	margin: 0;
+  	position: absolute;
+  	top:50%;
+  	left:50%;
+  	transform: translate(-50%, -50%);
+  	display: flex;
+  	flex-direction: column;
+  	align-items: center;
+  	justify-content: center;
+  	width: 100%;
+  	height: 100%;
+  	z-index: 2;
+  	background: rgba(0, 0, 0, 0.2)
+  }
+</style>
+
+<script type="text/javascript">
+	export default {
+		props: ['status'],
+
+		methods: {
+			altText(status) {
+				let desc = status.media_attachments[0].description;
+				if(desc) {
+					return desc;
+				}
+
+				return 'Video was not tagged with any alt text.';
+			},
+
+			playOrPause(e) {
+				let el = e.target;
+				if(el.getAttribute('playing') == 1) {
+					el.removeAttribute('playing');
+					el.pause();
+				} else {
+					el.setAttribute('playing', 1);
+					el.play();
+				}
+			},
+
+			toggleContentWarning(status) {
+				this.$emit('togglecw');
+			},
+
+            poster() {
+                let url = this.status.media_attachments[0].preview_url;
+                if(url.endsWith('no-preview.jpg') || url.endsWith('no-preview.png')) {
+                    return;
+                }
+                return url;
+            }
+		}
+	}
+</script>
diff --git a/resources/assets/components/sections/DiscoverFeed.vue b/resources/assets/components/sections/DiscoverFeed.vue
index ab62ca33d..9019a77d5 100644
--- a/resources/assets/components/sections/DiscoverFeed.vue
+++ b/resources/assets/components/sections/DiscoverFeed.vue
@@ -1,12 +1,10 @@
 <template>
     <div class="discover-feed-component">
         <section class="mt-3 mb-5 section-explore">
-            <b-breadcrumb class="font-default" :items="breadcrumbItems"></b-breadcrumb>
-
             <div class="profile-timeline">
                 <div class="row p-0 mt-5">
-                    <div class="col-12 mb-4 d-flex justify-content-between align-items-center">
-                        <p class="d-block d-md-none h1 font-weight-bold mb-0 font-default">Trending</p>
+                    <div class="col-12 mb-4 d-flex justify-content-between align-items-center flex-column flex-lg-row">
+                        <p class="d-block d-md-none h1 font-weight-bold mb-3 font-default">Trending</p>
                         <p class="d-none d-md-block display-4 font-weight-bold mb-0 font-default">Trending</p>
 
                         <div>
diff --git a/resources/assets/components/sections/Notifications.vue b/resources/assets/components/sections/Notifications.vue
index b2c904184..1ddf522fc 100644
--- a/resources/assets/components/sections/Notifications.vue
+++ b/resources/assets/components/sections/Notifications.vue
@@ -87,12 +87,12 @@
 									</div>
 									<div v-else-if="n.type == 'story:react'">
 										<p class="my-0">
-											<a :href="getProfileUrl(n.account)" class="font-weight-bold text-dark word-break" :title="n.account.acct">{{n.account.local == false ? '@':''}}{{truncate(n.account.username)}}</a> reacted to your <a class="font-weight-bold" v-bind:href="'/account/direct/t/'+n.account.id">story</a>.
+											<a :href="getProfileUrl(n.account)" class="font-weight-bold text-dark word-break" :title="n.account.acct">{{n.account.local == false ? '@':''}}{{truncate(n.account.username)}}</a> reacted to your <a class="font-weight-bold" v-bind:href="'/i/web/direct/thread/'+n.account.id">story</a>.
 										</p>
 									</div>
 									<div v-else-if="n.type == 'story:comment'">
 										<p class="my-0">
-											<a :href="getProfileUrl(n.account)" class="font-weight-bold text-dark word-break" :title="n.account.acct">{{n.account.local == false ? '@':''}}{{truncate(n.account.username)}}</a> commented on your <a class="font-weight-bold" v-bind:href="'/account/direct/t/'+n.account.id">story</a>.
+											<a :href="getProfileUrl(n.account)" class="font-weight-bold text-dark word-break" :title="n.account.acct">{{n.account.local == false ? '@':''}}{{truncate(n.account.username)}}</a> commented on your <a class="font-weight-bold" v-bind:href="'/i/web/direct/thread/'+n.account.id">story</a>.
 										</p>
 									</div>
 									<div v-else-if="n.type == 'mention'">
@@ -216,7 +216,7 @@
 
 		methods: {
 			init() {
-				if(this.retryAttempts == 3) {
+				if(this.retryAttempts == 1) {
 					this.hasLoaded = true;
 					this.isEmpty = true;
 					clearTimeout(this.retryTimeout);
diff --git a/resources/assets/components/sections/Timeline.vue b/resources/assets/components/sections/Timeline.vue
index dd2c7d2f0..2d23d5909 100644
--- a/resources/assets/components/sections/Timeline.vue
+++ b/resources/assets/components/sections/Timeline.vue
@@ -91,6 +91,8 @@
             v-on:delete="deletePost"
             v-on:report-modal="handleReport"
             v-on:edit="handleEdit"
+            v-on:muted="handleMuted"
+            v-on:unfollow="handleUnfollow"
         />
 
         <likes-modal
@@ -186,7 +188,8 @@
                 sharesModalPost: {},
                 forceUpdateIdx: 0,
                 showReblogBanner: false,
-                enablingReblogs: false
+                enablingReblogs: false,
+                baseApi: '/api/v1/timelines/',
             }
         },
 
@@ -201,6 +204,10 @@
                     return;
                 };
             }
+            if(window.App.config.ab.hasOwnProperty('cached_home_timeline')) {
+                const cht = window.App.config.ab.cached_home_timeline == true;
+                this.baseApi = cht ? '/api/v1/timelines/' : '/api/v1/timelines/';
+            }
             this.fetchSettings();
         },
 
@@ -247,7 +254,7 @@
             fetchTimeline(scrollToTop = false) {
                 let url, params;
                 if(this.getScope() === 'home' && this.settings && this.settings.hasOwnProperty('enable_reblogs') && this.settings.enable_reblogs) {
-                    url = `/api/v1/timelines/home`;
+                    url = this.baseApi + `home`;
                     params = {
                         '_pe': 1,
                         max_id: this.max_id,
@@ -255,12 +262,26 @@
                         include_reblogs: true,
                     }
                 } else {
-                    url = `/api/pixelfed/v1/timelines/${this.getScope()}`;
-                    params = {
-                        max_id: this.max_id,
-                        limit: 6,
+                    url = this.baseApi + this.getScope();
+
+                    if(this.max_id === 0) {
+                        params = {
+                            min_id: 1,
+                            limit: 6,
+                            '_pe': 1,
+                        }
+                    } else {
+                        params = {
+                            max_id: this.max_id,
+                            limit: 6,
+                            '_pe': 1,
+                        }
                     }
                 }
+                if(this.getScope() === 'network') {
+                    params.remote = true;
+                    url = this.baseApi + `public`;
+                }
                 axios.get(url, {
                     params: params
                 }).then(res => {
@@ -278,7 +299,7 @@
                     this.max_id = Math.min(...ids);
                     this.feed = res.data;
 
-                    if(res.data.length !== 6) {
+                    if(res.data.length < 4) {
                         this.canLoadMore = false;
                         this.showLoadMore = true;
                     }
@@ -306,7 +327,8 @@
 
                 let url, params;
                 if(this.getScope() === 'home' && this.settings && this.settings.hasOwnProperty('enable_reblogs') && this.settings.enable_reblogs) {
-                    url = `/api/v1/timelines/home`;
+                    url = this.baseApi + `home`;
+
                     params = {
                         '_pe': 1,
                         max_id: this.max_id,
@@ -314,12 +336,18 @@
                         include_reblogs: true,
                     }
                 } else {
-                    url = `/api/pixelfed/v1/timelines/${this.getScope()}`;
+                    url = this.baseApi + this.getScope();
                     params = {
                         max_id: this.max_id,
                         limit: 6,
+                        '_pe': 1,
                     }
                 }
+                if(this.getScope() === 'network') {
+                    params.remote = true;
+                    url = this.baseApi + `public`;
+
+                }
                 axios.get(url, {
                     params: params
                 }).then(res => {
@@ -517,6 +545,7 @@
 
             deletePost() {
                 this.feed.splice(this.postIndex, 1);
+                this.forceUpdateIdx++;
             },
 
             counterChange(index, type) {
@@ -762,6 +791,21 @@
                 .then(res => {
                 })
             },
+
+            handleMuted(post) {
+                this.feed = this.feed.filter(p => {
+                   return p.account.id !== post.account.id;
+                });
+            },
+
+            handleUnfollow(post) {
+                if(this.scope === 'home') {
+                    this.feed = this.feed.filter(p => {
+                       return p.account.id !== post.account.id;
+                    });
+                }
+                this.updateProfile({ following_count: this.profile.following_count - 1 });
+            },
         },
 
         watch: {
diff --git a/resources/assets/js/admin.js b/resources/assets/js/admin.js
index 8d2b82ca1..e5a74d8e6 100644
--- a/resources/assets/js/admin.js
+++ b/resources/assets/js/admin.js
@@ -36,11 +36,21 @@ Vue.component(
     require('./../components/admin/AdminReports.vue').default
 );
 
+Vue.component(
+    'admin-settings',
+    require('./../components/admin/AdminSettings.vue').default
+);
+
 Vue.component(
     'instances-component',
     require('./../components/admin/AdminInstances.vue').default
 );
 
+// Vue.component(
+//     'instance-details-component',
+//     require('./../components/admin/AdminInstanceDetails.vue').default
+// );
+
 Vue.component(
     'hashtag-component',
     require('./../components/admin/AdminHashtags.vue').default
diff --git a/resources/assets/js/components/CollectionComponent.vue b/resources/assets/js/components/CollectionComponent.vue
index 3f77cfc13..ea5e21525 100644
--- a/resources/assets/js/components/CollectionComponent.vue
+++ b/resources/assets/js/components/CollectionComponent.vue
@@ -460,7 +460,7 @@ export default {
 				})
 				.then(res => {
 					self.postsList = res.data.filter(l => {
-						return self.ids.indexOf(l.id) == -1;
+						return  (l.visibility == 'public' || l.visibility == 'unlisted') && l.sensitive == false && self.ids.indexOf(l.id) == -1; 
 					});
 					self.loadingPostList = false;
 					self.$refs.addPhotoModal.show();
@@ -619,6 +619,9 @@ export default {
 			this.posts = this.posts.filter(post => {
 				return post.id != id;
 			});
+			this.ids = this.ids.filter(post_id => {
+				return post_id != id;
+			});
 		},
 
 		addRecentId(post) {
@@ -630,6 +633,7 @@ export default {
 				// window.location.reload();
 				this.closeModals();
 				this.posts.push(res.data);
+				this.ids.push(post.id);
 				this.collection.post_count++;
 			}).catch(err => {
 				swal('Oops!', 'An error occured, please try selecting another post.', 'error');
diff --git a/resources/assets/js/components/CollectionCompose.vue b/resources/assets/js/components/CollectionCompose.vue
index 84444cf1d..2920e1f76 100644
--- a/resources/assets/js/components/CollectionCompose.vue
+++ b/resources/assets/js/components/CollectionCompose.vue
@@ -194,7 +194,6 @@ export default {
 				swal('Invalid URL', 'You can only add posts from this instance', 'error');
 				this.id = '';
 			}
-
             if(url.includes('/i/web/post/') || url.includes('/p/')) {
             	let id = split[split.length - 1];
             	console.log('adding ' + id);
@@ -228,7 +227,7 @@ export default {
 					let ids = this.posts.map(s => {
 						return s.id;
 					});
-					return s.visibility == 'public' && s.sensitive == false && ids.indexOf(s.id) == -1;
+					return (s.visibility == 'public' || s.visibility == 'unlisted') && s.sensitive == false && ids.indexOf(s.id) == -1;
 				});
 			});
 		},
diff --git a/resources/assets/js/components/ComposeModal.vue b/resources/assets/js/components/ComposeModal.vue
index fd18b0fc9..1ec98c64f 100644
--- a/resources/assets/js/components/ComposeModal.vue
+++ b/resources/assets/js/components/ComposeModal.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="compose-modal-component">
-	<input type="file" id="pf-dz" name="media" class="w-100 h-100 d-none file-input" multiple="" v-bind:accept="config.uploader.media_types">
+	<input type="file" id="pf-dz" name="media" class="w-100 h-100 d-none file-input" multiple="" v-bind:accept="config.uploader.media_types" @input="onInputFile">
 	<canvas class="d-none" id="pr_canvas"></canvas>
 	<img class="d-none" id="pr_img">
 	<div class="timeline">
@@ -29,7 +29,7 @@
 						<div v-for="(m, index) in cameraRollMedia" :class="[index == 0 ? 'col-12 p-0' : 'col-3 p-0']">
 							<div class="card info-overlay p-0 rounded-0 shadow-none border">
 								<div class="square">
-									<img class="square-content" :src="m.preview_url"></img>
+									<img class="square-content" :src="m.preview_url" />
 								</div>
 							</div>
 						</div>
@@ -184,7 +184,6 @@
                             </template>
 							<a v-if="!pageLoading && page == 'addText'" class="font-weight-bold text-decoration-none" href="#" @click.prevent="composeTextPost()">Post</a>
                             <a v-if="!pageLoading && page == 'video-2'" class="font-weight-bold text-decoration-none" href="#" @click.prevent="compose()">Post</a>
-							<span v-if="!pageLoading && page == 'filteringMedia'" class="font-weight-bold text-decoration-none text-muted">Next</span>
 						</span>
 					</div>
 				</div>
@@ -342,8 +341,8 @@
 					</div>
 
 					<div v-else-if="page == 'cropPhoto'" class="w-100 h-100">
-						<div v-if="ids.length > 0">
-							<vue-cropper
+						<div v-if="media.length > 0">
+                            <vue-cropper
 								ref="cropper"
 								:relativeZoom="cropper.zoom"
 								:aspectRatio="cropper.aspectRatio"
@@ -358,37 +357,22 @@
 
 					<div v-else-if="page == 2" class="w-100 h-100">
 						<div v-if="media.length == 1">
-							<div slot="img" style="display:flex;min-height: 420px;align-items: center;">
-								<img :class="'d-block img-fluid w-100 ' + [media[carouselCursor].filter_class?media[carouselCursor].filter_class:'']" :src="media[carouselCursor].url" :alt="media[carouselCursor].description" :title="media[carouselCursor].description">
-							</div>
-							<hr>
-							<div v-if="ids.length > 0 && media[carouselCursor].type == 'image'" class="align-items-center px-2 pt-2">
-								<ul class="nav media-drawer-filters text-center">
-									<li class="nav-item">
-										<div class="p-1 pt-3">
-											<img :src="media[carouselCursor].url" width="100px" height="60px" v-on:click.prevent="toggleFilter($event, null)" class="cursor-pointer">
-										</div>
-										<a :class="[media[carouselCursor].filter_class == null ? 'nav-link text-primary active' : 'nav-link text-muted']" href="#" v-on:click.prevent="toggleFilter($event, null)">No Filter</a>
-									</li>
-									<li class="nav-item" v-for="(filter, index) in filters">
-										<div class="p-1 pt-3">
-                                            <div class="rounded" :class="filter[1]">
-											 <img :src="media[carouselCursor].url" width="100px" height="60px" v-on:click.prevent="toggleFilter($event, filter[1])">
-                                            </div>
-										</div>
-										<a :class="[media[carouselCursor].filter_class == filter[1] ? 'nav-link text-primary active' : 'nav-link text-muted']" href="#" v-on:click.prevent="toggleFilter($event, filter[1])">{{filter[0]}}</a>
-									</li>
-								</ul>
-							</div>
+                            <template v-if="media[0].type === 'image'">
+							    <media-editor-preview class="media-editor" :editor="editor" :sourceIndex="0" />
+							    <hr>
+                                <media-editor-filter-menu class="media-editor" :editor="editor" :sourceIndex="0" />
+                            </template>
+                            <img v-else class="d-block img-fluid w-100" src="/storage/no-preview.png" :alt="media[carouselCursor].description" :title="media[carouselCursor].description">
 						</div>
 						<div v-else-if="media.length > 1" class="d-flex-inline px-2 pt-2">
 							<ul class="nav media-drawer-filters text-center pb-3">
 								<li class="nav-item mx-md-4">&nbsp;</li>
-								<li v-for="(m, i) in media" :key="m.id + ':' + carouselCursor" class="nav-item mx-md-4">
+								<li v-for="(m, i) in media" :key="i + (ids[i] || m.url || '')" class="nav-item mx-md-4">
 										<div class="nav-link" style="display:block;width:300px;height:300px;" @click="carouselCursor = i">
 											<!-- <img :class="'d-block img-fluid w-100 ' + [m.filter_class?m.filter_class:'']" :src="m.url" :alt="m.description" :title="m.description"> -->
 											<div :class="[m.filter_class?m.filter_class:'']" style="width:100%;height:100%;display:block;">
-												<div :class="'rounded ' +  [i == carouselCursor ? ' border border-primary shadow':'']" :style="'display:block;width:100%;height:100%;background-image: url(' + m.url + ');background-size:cover;'"></div>
+												<media-editor-preview v-if="m.type === 'image'" class="media-editor" :editor="editor" :sourceIndex="i" :class="'rounded ' +  [i == carouselCursor ? ' border border-primary shadow':'']" style="width:100%;height:100%;" />
+                                                <img v-else class="d-block img-fluid w-100" src="/storage/no-preview.png" :alt="media[carouselCursor].description" :title="media[carouselCursor].description">
 											</div>
 										</div>
 										<div v-if="i == carouselCursor" class="text-center mb-0 small text-lighter font-weight-bold pt-2">
@@ -402,21 +386,8 @@
 								<li class="nav-item mx-md-4">&nbsp;</li>
 							</ul>
 							<hr>
-							<div v-if="ids.length > 0 && media[carouselCursor].type == 'image'" class="align-items-center px-2 pt-2">
-								<ul class="nav media-drawer-filters text-center">
-									<li class="nav-item">
-										<div class="p-1 pt-3">
-											<img :src="media[carouselCursor].url" width="100px" height="60px" v-on:click.prevent="toggleFilter($event, null)" class="cursor-pointer">
-										</div>
-										<a :class="[media[carouselCursor].filter_class == null ? 'nav-link text-primary active' : 'nav-link text-muted']" href="#" v-on:click.prevent="toggleFilter($event, null)">No Filter</a>
-									</li>
-									<li class="nav-item" v-for="(filter, index) in filters">
-										<div class="p-1 pt-3">
-											<img :src="media[carouselCursor].url" width="100px" height="60px" :class="filter[1]" v-on:click.prevent="toggleFilter($event, filter[1])">
-										</div>
-										<a :class="[media[carouselCursor].filter_class == filter[1] ? 'nav-link text-primary active' : 'nav-link text-muted']" href="#" v-on:click.prevent="toggleFilter($event, filter[1])">{{filter[0]}}</a>
-									</li>
-								</ul>
+							<div v-if="media[carouselCursor].type == 'image'" class="align-items-center px-2 pt-2">
+								<media-editor-filter-menu class="media-editor" :editor="editor" :sourceIndex="carouselCursor" />
 							</div>
 						</div>
 						<div v-else>
@@ -427,7 +398,7 @@
 					<div v-else-if="page == 3" class="w-100 h-100">
 						<div class="border-bottom mt-2">
 							<div class="media px-3">
-								<img :src="media[0].url" width="42px" height="42px" :class="[media[0].filter_class?'mr-2 ' + media[0].filter_class:'mr-2']">
+								<img :src="media[0].preview_url" width="42px" height="42px" class="mr-2">
 								<div class="media-body">
 									<div class="form-group">
 										<label class="font-weight-bold text-muted small d-none">Caption</label>
@@ -780,7 +751,7 @@
 					<div v-else-if="page == 'video-2'" class="w-100 h-100">
 						<div v-if="video.title.length" class="border-bottom">
 							<div class="media p-3">
-								<img :src="media[0].url" width="100px" height="70px" :class="[media[0].filter_class?'mr-2 ' + media[0].filter_class:'mr-2']">
+								<img :src="media[0].preview_url" width="100px" height="70px" class="mr-2">
 								<div class="media-body">
 									<p class="font-weight-bold mb-1">{{video.title ? video.title.slice(0,70) : 'Untitled'}}</p>
 									<p class="mb-0 text-muted small">{{video.description ? video.description.slice(0,90) : 'No description'}}</p>
@@ -839,13 +810,6 @@
 							</div>
 						</div>
 					</div>
-
-                    <div v-else-if="page == 'filteringMedia'" class="w-100 h-100 py-5">
-                        <div class="d-flex flex-column align-items-center justify-content-center py-5">
-                            <b-spinner small />
-                            <p class="font-weight-bold mt-3">Applying filters...</p>
-                        </div>
-                    </div>
 				</div>
 
 				<!-- card-footers -->
@@ -875,13 +839,17 @@ import 'cropperjs/dist/cropper.css';
 import Autocomplete from '@trevoreyre/autocomplete-vue'
 import '@trevoreyre/autocomplete-vue/dist/style.css'
 import VueTribute from 'vue-tribute'
+import { MediaEditor, MediaEditorPreview, MediaEditorFilterMenu } from 'webgl-media-editor/vue2'
+import { filterEffects } from './filters';
 
 export default {
 
 	components: {
 		VueCropper,
 		Autocomplete,
-		VueTribute
+		VueTribute,
+        MediaEditorPreview,
+        MediaEditorFilterMenu
 	},
 
 	data() {
@@ -892,10 +860,9 @@ export default {
 			composeText: '',
 			composeTextLength: 0,
 			nsfw: false,
-			filters: [],
-			currentFilter: false,
 			ids: [],
 			media: [],
+			files: [],
 			carouselCursor: 0,
 			uploading: false,
 			uploadProgress: 100,
@@ -923,7 +890,6 @@ export default {
 			},
 
 			namedPages: [
-                'filteringMedia',
 				'cropPhoto',
 				'tagPeople',
 				'addLocation',
@@ -1044,13 +1010,26 @@ export default {
 			collectionsPage: 1,
 			collectionsCanLoadMore: false,
 			spoilerText: undefined,
-            isFilteringMedia: false,
-            filteringMediaTimeout: undefined,
-            filteringRemainingCount: 0,
             isPosting: false,
 		}
 	},
 
+    created() {
+        this.editor = new MediaEditor({
+            effects: filterEffects,
+		    onEdit: (index, {effect, intensity, crop}) => {
+			    if (index >= this.files.length) return
+			    const file = this.files[index]
+
+			    this.$set(file, 'editState', { effect, intensity, crop })
+		    },
+		    onRenderPreview: (sourceIndex, previewUrl) => {
+				const media = this.media[sourceIndex]
+				if (media) media.preview_url = previewUrl
+		    },
+        })
+    },
+
 	computed: {
 		spoilerTextLength: function() {
 			return this.spoilerText ? this.spoilerText.length : 0;
@@ -1058,7 +1037,6 @@ export default {
 	},
 
 	beforeMount() {
-		this.filters = window.App.util.filters.sort();
 		axios.get('/api/compose/v0/settings')
 		.then(res => {
 			this.composeSettings = res.data;
@@ -1075,8 +1053,12 @@ export default {
 		});
 	},
 
-	mounted() {
-		this.mediaWatcher();
+	destroyed() {
+		this.files.forEach(fileInfo => {
+            URL.revokeObjectURL(fileInfo.url);
+        })
+		this.files.length = this.media.length = 0
+		this.editor = undefined
 	},
 
 	methods: {
@@ -1094,6 +1076,17 @@ export default {
 			return `${parseFloat((bytes / Math.pow(1024, quotient)).toFixed(dec))} ${units[quotient]}`
 		},
 
+		defineErrorMessage(errObject) {
+			let msg;
+			if (errObject.response) {
+				msg = errObject.response.data.message ? errObject.response.data.message : 'An unexpected error occured.';
+			}
+			else {
+				msg = errObject.message;
+			}
+			return swal('Oops, something went wrong!', msg, 'error');
+		},
+
 		fetchProfile() {
 			let tags = {
 				public: 'Public',
@@ -1145,39 +1138,55 @@ export default {
 			this.mode = 'text';
 		},
 
-		mediaWatcher() {
-			let self = this;
-			$(document).on('change', '#pf-dz', function(e) {
-				self.mediaUpload();
-			});
-		},
+		onInputFile(event) {
+			const input = event.target
+			const files = Array.from(input.files)
+			input.value = null;
 
-		mediaUpload() {
 			let self = this;
-			self.uploading = true;
-			let io = document.querySelector('#pf-dz');
-			if(!io.files.length) {
-				self.uploading = false;
-			}
-			Array.prototype.forEach.call(io.files, function(io, i) {
-				if(self.media && self.media.length + i >= self.config.uploader.album_limit) {
+
+			files.forEach((file, i) => {
+				if(self.media && self.media.length >= self.config.uploader.album_limit) {
 					swal('Error', 'You can only upload ' + self.config.uploader.album_limit + ' photos per album', 'error');
-					self.uploading = false;
 					self.page = 2;
 					return;
 				}
-				let type = io.type;
 				let acceptedMimes = self.config.uploader.media_types.split(',');
-				let validated = $.inArray(type, acceptedMimes);
+				let validated = $.inArray(file.type, acceptedMimes);
 				if(validated == -1) {
 					swal('Invalid File Type', 'The file you are trying to add is not a valid mime type. Please upload a '+self.config.uploader.media_types+' only.', 'error');
-					self.uploading = false;
 					self.page = 2;
 					return;
 				}
 
+                const type = file.type.replace(/\/.*/, '')
+				const url = URL.createObjectURL(file)
+                const preview_url = type === 'image' ? url : '/storage/no-preview.png'
+
+				this.files.push({ file, editState: undefined })
+				this.media.push({ url, preview_url, type })
+			})
+
+			if (this.media.length) {
+				this.page = 3
+			} else {
+				this.page = 2
+			}
+		},
+
+		async mediaUpload() {
+			this.uploading = true;
+
+			const uploadPromises = this.files.map(async (fileInfo, i) => {
+				let file = fileInfo.file
+				const media = this.media[i]
+
+				if (media.type === 'image' && fileInfo.editState) {
+					file = await this.editor.toBlob(i)
+				}
+
 				let form = new FormData();
-				form.append('file', io);
+				form.append('file', file);
 
 				let xhrConfig = {
 					onUploadProgress: function(e) {
@@ -1186,12 +1195,13 @@ export default {
 					}
 				};
 
-				axios.post('/api/compose/v0/media/upload', form, xhrConfig)
+                const self = this
+
+				await axios.post('/api/compose/v0/media/upload', form, xhrConfig)
 				.then(function(e) {
 					self.uploadProgress = 100;
 					self.ids.push(e.data.id);
-					self.media.push(e.data);
-					self.uploading = false;
+					Object.assign(media, e.data)
 					setTimeout(function() {
 						// if(type === 'video/mp4') {
 						// 	self.pageTitle = 'Edit Video Details';
@@ -1204,125 +1214,101 @@ export default {
 					}, 300);
 				}).catch(function(e) {
 					switch(e.response.status) {
-						case 413:
-							self.uploading = false;
-							io.value = null;
-							swal('File is too large', 'The file you uploaded has the size of ' + self.formatBytes(io.size) + '. Unfortunately, only images up to ' + self.formatBytes(self.config.uploader.max_photo_size  * 1024) + ' are supported.\nPlease resize the file and try again.', 'error');
+						case 403:
+							swal('Account size limit reached', 'Contact your admin for assistance.', 'error');
 							self.page = 2;
-							break;
+						break;
+
+						case 413:
+							swal('File is too large', 'The file you uploaded has the size of ' + self.formatBytes(file.size) + '. Unfortunately, only images up to ' + self.formatBytes(self.config.uploader.max_photo_size  * 1024) + ' are supported.\nPlease resize the file and try again.', 'error');
+							self.page = 2;
+						break;
 
 						case 451:
-							self.uploading = false;
-							io.value = null;
 							swal('Banned Content', 'This content has been banned and cannot be uploaded.', 'error');
 							self.page = 2;
 						break;
 
 						case 429:
-							self.uploading = false;
-							io.value = null;
 							swal('Limit Reached', 'You can upload up to 250 photos or videos per day and you\'ve reached that limit. Please try again later.', 'error');
 							self.page = 2;
 						break;
 
 						case 500:
-							self.uploading = false;
-							io.value = null;
 							swal('Error', e.response.data.message, 'error');
 							self.page = 2;
 						break;
 
 						default:
-							self.uploading = false;
-							io.value = null;
 							swal('Oops, something went wrong!', 'An unexpected error occurred.', 'error');
 							self.page = 2;
 						break;
 					}
+
+                    throw e
 				});
-				io.value = null;
-				self.uploadProgress = 0;
 			});
+
+            await Promise.all(uploadPromises).finally(() => {
+				this.uploadProgress = 0;
+			    this.uploading = false;
+            });
 		},
 
-		toggleFilter(e, filter) {
-			this.media[this.carouselCursor].filter_class = filter;
-			this.currentFilter = filter;
-		},
-
-		deleteMedia() {
+		async deleteMedia() {
 			if(window.confirm('Are you sure you want to delete this media?') == false) {
 				return;
 			}
 			let id = this.media[this.carouselCursor].id;
 
-			axios.delete('/api/compose/v0/media/delete', {
-				params: {
-					id: id
-				}
-			}).then(res => {
-				this.ids.splice(this.carouselCursor, 1);
-				this.media.splice(this.carouselCursor, 1);
-				if(this.media.length == 0) {
-					this.ids = [];
-					this.media = [];
-					this.carouselCursor = 0;
-				} else {
-					this.carouselCursor = 0;
-				}
-			}).catch(err => {
-				swal('Whoops!', 'An error occured when attempting to delete this, please try again', 'error');
-			});
+            if (id) {
+                try {
+			        await axios.delete('/api/compose/v0/media/delete', {
+				        params: {
+					        id: id
+				        }
+			        })
+                }
+                catch(err) {
+				    swal('Whoops!', 'An error occured when attempting to delete this, please try again', 'error');
+                    return
+			    }
+            }
+            this.ids.splice(this.carouselCursor, 1);
+			this.media.splice(this.carouselCursor, 1);
+
+            URL.revokeObjectURL(this.files[this.carouselCursor]?.url)
+            this.files.splice(this.carouselCursor, 1)
+
+			if(this.media.length == 0) {
+				this.ids = [];
+				this.media = [];
+				this.carouselCursor = 0;
+			} else {
+				this.carouselCursor = 0;
+			}
 		},
 
         mediaReorder(dir) {
-            const m = this.media;
-            const cur = this.carouselCursor;
-            const pla = m[cur];
-            let res = [];
-            let cursor = 0;
+            const prevIndex = this.carouselCursor
+            const newIndex = prevIndex + (dir === 'prev' ? -1 : 1)
 
-            if(dir == 'prev') {
-                if(cur == 0) {
-                    for (let i = cursor; i < m.length - 1; i++) {
-                        res[i] = m[i+1];
-                    }
-                    res[m.length - 1] = pla;
-                    cursor = 0;
-                } else {
-                    res = this.handleSwap(m, cur, cur - 1);
-                    cursor = cur - 1;
-                }
-            } else {
-                if(cur == m.length - 1) {
-                    res = m;
-                    let lastItem = res.pop();
-                    res.unshift(lastItem);
-                    cursor = m.length - 1;
-                } else {
-                    res = this.handleSwap(m, cur, cur + 1);
-                    cursor = cur + 1;
-                }
-            }
-            this.$nextTick(() => {
-                this.media = res;
-                this.carouselCursor = cursor;
-            })
+            if (newIndex < 0 || newIndex >= this.media.length) return
+
+            const [removedFile] = this.files.splice(prevIndex, 1)
+            const [removedMedia] = this.media.splice(prevIndex, 1)
+            const [removedId] = this.ids.splice(prevIndex, 1)
+
+            this.files.splice(newIndex, 0, removedFile)
+            this.media.splice(newIndex, 0, removedMedia)
+            this.ids.splice(newIndex, 0, removedId)
+            this.carouselCursor = newIndex
         },
 
-        handleSwap(arr, index1, index2) {
-            if (index1 >= 0 && index1 < arr.length && index2 >= 0 && index2 < arr.length) {
-                const temp = arr[index1];
-                arr[index1] = arr[index2];
-                arr[index2] = temp;
-                return arr;
-            }
-        },
-
-		compose() {
+		async compose() {
 			let state = this.composeState;
 
-			if(this.uploadProgress != 100 || this.ids.length == 0) {
+			if(this.files.length == 0) {
 				return;
 			}
 
@@ -1335,11 +1321,14 @@ export default {
 			switch(state) {
 				case 'publish':
                     this.isPosting = true;
-                    let count = this.media.filter(m => m.filter_class && !m.hasOwnProperty('is_filtered')).length;
-                    if(count) {
-                        this.applyFilterToMedia();
-                        return;
+
+                    try {
+                        await this.mediaUpload().finally(() => this.isPosting = false)
+                    } catch {
+                        this.isPosting = false;
+                        return
                     }
+
 					if(this.composeSettings.media_descriptions === true) {
 						let count = this.media.filter(m => {
 							return !m.hasOwnProperty('alt') || m.alt.length < 2;
@@ -1347,6 +1336,7 @@ export default {
 
 						if(count.length) {
 							swal('Missing media descriptions', 'You have enabled mandatory media descriptions. Please add media descriptions under Advanced settings to proceed. For more information, please see the media settings page.', 'warning');
+							this.isPosting = false;
 							return;
 						}
 					}
@@ -1387,15 +1377,25 @@ export default {
 							location.href = res.data;
 						}
 					}).catch(err => {
-						if(err.response) {
-							let msg = err.response.data.message ? err.response.data.message : 'An unexpected error occured.'
-							swal('Oops, something went wrong!', msg, 'error');
-						} else {
-							swal('Oops, something went wrong!', err.message, 'error');
-						}
-					});
-					return;
-				break;
+                        switch(err.response.status) {
+                            case 400:
+                                if (err.response.data.error == "Must contain a single photo or video or multiple photos.") {
+                                    swal("Wrong types of mixed media", "The album must contain a single photo or video or multiple photos.", 'error');
+                                }
+								else {
+									this.defineErrorMessage(err);
+								}
+                            break;
+
+                            default:
+								this.defineErrorMessage(err);
+                            break;
+                        }
+                    }).finally(() => {
+                        this.isPosting = false;
+                    });
+                    return;
+                break;
 
 				case 'delete' :
 					this.ids = [];
@@ -1461,10 +1461,6 @@ export default {
 			switch(this.mode) {
 				case 'photo':
 					switch(this.page) {
-                        case 'filteringMedia':
-                            this.page = 2;
-                        break;
-
 						case 'addText':
 							this.page = 1;
 						break;
@@ -1499,10 +1495,6 @@ export default {
 
 				case 'video':
 					switch(this.page) {
-                        case 'filteringMedia':
-                            this.page = 2;
-                        break;
-
 						case 'licensePicker':
 							this.page = 'video-2';
 						break;
@@ -1523,10 +1515,6 @@ export default {
 							this.page = 1;
 						break;
 
-                        case 'filteringMedia':
-                            this.page = 2;
-                        break;
-
 						case 'textOptions':
 							this.page = 'addText';
 						break;
@@ -1566,31 +1554,14 @@ export default {
 					this.page = 2;
 				break;
 
-                case 'filteringMedia':
-                break;
-
 				case 'cropPhoto':
-					this.pageLoading = true;
-					let self = this;
-					this.$refs.cropper.getCroppedCanvas({
-							maxWidth: 4096,
-							maxHeight: 4096,
-							fillColor: '#fff',
-							imageSmoothingEnabled: false,
-							imageSmoothingQuality: 'high',
-						}).toBlob(function(blob) {
-						self.mediaCropped = true;
-						let data = new FormData();
-						data.append('file', blob);
-						data.append('id', self.ids[self.carouselCursor]);
-						let url = '/api/compose/v0/media/update';
-						axios.post(url, data).then(res => {
-							self.media[self.carouselCursor].url = res.data.url;
-							self.pageLoading = false;
-							self.page = 2;
-						}).catch(err => {
-						});
-					});
+                    const { editState } = this.files[this.carouselCursor]
+                    const croppedState = {
+                        ...editState,
+                        crop: this.$refs.cropper.getData()
+                    }
+                    this.editor.setEditState(this.carouselCursor, croppedState)
+					this.page = 2;
 				break;
 
 				case 2:
@@ -1737,77 +1708,6 @@ export default {
 			});
 		},
 
-		applyFilterToMedia() {
-			// this is where the magic happens
-			var ua = navigator.userAgent.toLowerCase();
-			if(ua.indexOf('firefox') == -1 && ua.indexOf('chrome') == -1) {
-                this.isPosting = false;
-			 	swal('Oops!', 'Your browser does not support the filter feature.', 'error');
-                this.page = 3;
-			 	return;
-			}
-
-            let count = this.media.filter(m => m.filter_class).length;
-            if(count) {
-                this.page = 'filteringMedia';
-                this.filteringRemainingCount = count;
-                this.$nextTick(() => {
-                    this.isFilteringMedia = true;
-                    this.media.forEach((media, idx) => this.applyFilterToMediaSave(media, idx));
-                })
-            } else {
-                this.page = 3;
-            }
-		},
-
-        applyFilterToMediaSave(media, idx) {
-            if(!media.filter_class) {
-                return;
-            }
-
-            let self = this;
-            let data = null;
-            const canvas = document.createElement('canvas');
-            const ctx = canvas.getContext('2d');
-            let image = document.createElement('img');
-            image.src = media.url;
-            image.addEventListener('load', e => {
-                canvas.width = image.width;
-                canvas.height = image.height;
-                ctx.filter = App.util.filterCss[media.filter_class];
-                ctx.drawImage(image, 0, 0, image.width, image.height);
-                ctx.save();
-                canvas.toBlob(function(blob) {
-                    data = new FormData();
-                    data.append('file', blob);
-                    data.append('id', media.id);
-                    axios.post('/api/compose/v0/media/update', data)
-                    .then(res => {
-                        self.media[idx].is_filtered = true;
-                        self.updateFilteringMedia();
-                    }).catch(err => {
-                    });
-                });
-            }, media.mime, 0.9);
-            ctx.clearRect(0, 0, image.width, image.height);
-        },
-
-        updateFilteringMedia() {
-            this.filteringRemainingCount--;
-            this.filteringMediaTimeout = setTimeout(() => this.filteringMediaTimeoutJob(), 500);
-        },
-
-        filteringMediaTimeoutJob() {
-            if(this.filteringRemainingCount === 0) {
-                this.isFilteringMedia = false;
-                clearTimeout(this.filteringMediaTimeout);
-                setTimeout(() => this.compose(), 500);
-            } else {
-                clearTimeout(this.filteringMediaTimeout);
-                this.filteringMediaTimeout = setTimeout(() => this.filteringMediaTimeoutJob(), 1000);
-            }
-        },
-
 		tagSearch(input) {
 			if (input.length < 1) { return []; }
 			let self = this;
@@ -1998,6 +1898,11 @@ export default {
 				this.collectionsCanLoadMore = true;
 			});
 		}
+	},
+    watch: {
+        files(value) {
+			this.editor.setSources(value.map(f => f.file))
+		},
 	}
 }
 </script>
@@ -2050,5 +1955,34 @@ export default {
 				}
 			}
 		}
+        .media-editor {
+            background-color: transparent;
+            border: none !important;
+            box-shadow: none !important;
+            font-size: 12px;
+
+            --height-menu-row: 5rem;
+            --gap-preview: 0rem;
+            --height-menu-row-scroll: 10rem;
+
+            --color-bg-button: transparent; /*var(--light);*/
+            --color-bg-preview: transparent; /*var(--light-gray);*/
+            --color-bg-button-hover: var(--light-gray);
+            --color-bg-acc: var(--card-bg);
+
+            --color-fnt-default: var(--body-color);
+            --color-fnt-acc: var(--text-lighter);
+
+            --color-scrollbar-thumb: var(--light-gray);
+            --color-scrollbar-both: var(--light-gray) transparent;
+
+            --color-slider-thumb: var(--text-lighter);
+            --color-slider-progress: var(--light-gray);
+            --color-slider-track: var(--light);
+
+            --color-crop-outline: var(--light-gray);
+            --color-crop-dashed: #ffffffde;
+            --color-crop-overlay: #00000082;
+        }
 	}
 </style>
diff --git a/resources/assets/js/components/GroupStatusPermalink.vue b/resources/assets/js/components/GroupStatusPermalink.vue
new file mode 100644
index 000000000..14f827e99
--- /dev/null
+++ b/resources/assets/js/components/GroupStatusPermalink.vue
@@ -0,0 +1,25 @@
+<template>
+	<div class="group-status-permalink-component">
+		<group-feed :group-id="gid" :permalinkMode="true" :permalinkId="sid" />
+	</div>
+</template>
+
+<script type="text/javascript">
+	import GroupFeed from '@/groups/GroupFeed.vue';
+
+	export default {
+		props: {
+			gid: {
+				type: String
+			},
+
+			sid: {
+				type: String
+			}
+		},
+
+		components: {
+			"group-feed": GroupFeed
+		}
+	}
+</script>
diff --git a/resources/assets/js/components/NotificationCard.vue b/resources/assets/js/components/NotificationCard.vue
index b2230cbca..5c6eb6da5 100644
--- a/resources/assets/js/components/NotificationCard.vue
+++ b/resources/assets/js/components/NotificationCard.vue
@@ -34,7 +34,16 @@
 						</div>
 						<div v-else-if="n.type == 'comment'">
 							<p class="my-0">
-								<a :href="getProfileUrl(n.account)" class="font-weight-bold text-dark word-break" :title="n.account.username">{{n.account.local == false ? '@':''}}{{truncate(n.account.username)}}</a> commented on your <a class="font-weight-bold" v-bind:href="getPostUrl(n.status)">post</a>.
+								<a :href="getProfileUrl(n.account)" class="font-weight-bold text-dark word-break" :title="n.account.username">{{n.account.local == false ? '@':''}}{{truncate(n.account.username)}}</a> commented on your
+								<span v-if="n.status && n.status.hasOwnProperty('media_attachments')">
+									<a class="font-weight-bold" v-bind:href="getPostUrl(n.status)" :id="'fvn-' + n.id">post</a>.
+									<b-popover :target="'fvn-' + n.id" title="" triggers="hover" placement="top" boundary="window">
+										<img :src="notificationPreview(n)" width="100px" height="100px" style="object-fit: cover;">
+									</b-popover>
+								</span>
+								<span v-else>
+									<a class="font-weight-bold" v-bind:href="getPostUrl(n.status)">post</a>.
+								</span>
 							</p>
 						</div>
 						<div v-else-if="n.type == 'group:comment'">
@@ -64,7 +73,16 @@
 						</div>
 						<div v-else-if="n.type == 'share'">
 							<p class="my-0">
-								<a :href="getProfileUrl(n.account)" class="font-weight-bold text-dark word-break" :title="n.account.username">{{n.account.local == false ? '@':''}}{{truncate(n.account.username)}}</a> shared your <a class="font-weight-bold" v-bind:href="getPostUrl(n.status)">post</a>.
+								<a :href="getProfileUrl(n.account)" class="font-weight-bold text-dark word-break" :title="n.account.username">{{n.account.local == false ? '@':''}}{{truncate(n.account.username)}}</a> shared your
+								<span v-if="n.status && n.status.hasOwnProperty('media_attachments')">
+									<a class="font-weight-bold" v-bind:href="getPostUrl(n.status)" :id="'fvn-' + n.id">post</a>.
+									<b-popover :target="'fvn-' + n.id" title="" triggers="hover" placement="top" boundary="window">
+										<img :src="notificationPreview(n)" width="100px" height="100px" style="object-fit: cover;">
+									</b-popover>
+								</span>
+								<span v-else>
+									<a class="font-weight-bold" v-bind:href="getPostUrl(n.status)">post</a>.
+								</span>
 							</p>
 						</div>
 						<div v-else-if="n.type == 'modlog'">
diff --git a/resources/assets/js/components/PortfolioSettings.vue b/resources/assets/js/components/PortfolioSettings.vue
index 6b1fbde8a..cd36cd072 100644
--- a/resources/assets/js/components/PortfolioSettings.vue
+++ b/resources/assets/js/components/PortfolioSettings.vue
@@ -238,7 +238,7 @@
                 	</div>
                 </div>
 
-                <div v-else-if="tabIndex === 'Share'" class="col-12 col-md-8 bg-dark mt-3 py-2 rounded" key="0">
+                <div v-else-if="tabIndex === 'Share'" class="col-12 col-md-8 bg-dark mt-3 py-2 rounded" key="3">
                     <div class="py-2">
                         <p class="text-muted">Portfolio URL</p>
                         <p class="lead mb-0"><a :href="settings.url">{{ settings.url }}</a></p>
diff --git a/resources/assets/js/components/PostComponent.vue b/resources/assets/js/components/PostComponent.vue
index 4fc5984a9..4702cc9f1 100644
--- a/resources/assets/js/components/PostComponent.vue
+++ b/resources/assets/js/components/PostComponent.vue
@@ -302,53 +302,6 @@
 								v-on:likeStatus="likeStatus" />
 
 						<comment-feed :status="status" class="mt-3" />
-						<!-- <div v-if="user.hasOwnProperty('id')" class="card card-body shadow-none border border-top-0 bg-light">
-								<div class="media">
-									<img src="/storage/avatars/default.png" class="rounded-circle mr-2" width="40" height="40">
-									<div class="media-body">
-											<div class="form-group mb-0" style="position:relative;">
-												  <input class="form-control rounded-pill" placeholder="Add a comment..." style="padding-right: 90px;">
-												  <div class="btn btn-primary btn-sm rounded-pill font-weight-bold px-3" style="position:absolute;top: 5px;right:6px;">Post</div>
-											</div>
-									</div>
-								</div>
-						</div>
-
-						<div v-if="user.hasOwnProperty('id')" v-for="(reply, index) in results" :key="'replies:'+index" class="card card-body shadow-none border border-top-0">
-							<div class="media">
-								<img :src="reply.account.avatar" class="rounded-circle border mr-3" width="32px" height="32px">
-									<div class="media-body">
-										<div v-if="reply.sensitive == true">
-											<span class="py-3">
-												<a class="text-dark font-weight-bold mr-3"  style="font-size: 13px;" :href="profileUrl(reply)" v-bind:title="reply.account.username">{{trimCaption(reply.account.username,15)}}</a>
-												<span class="text-break" style="font-size: 13px;">
-													<span class="font-italic text-muted">This comment may contain sensitive material</span>
-													<span class="text-primary cursor-pointer pl-1" @click="reply.sensitive = false;">Show</span>
-												</span>
-											</span>
-										</div>
-										<div v-else>
-											<p class="d-flex justify-content-between align-items-top read-more mb-0" style="overflow-y: hidden;">
-												<span class="mr-3" style="font-size: 13px;">
-													<a class="text-dark font-weight-bold mr-1 text-break" :href="profileUrl(reply)" v-bind:title="reply.account.username">{{trimCaption(reply.account.username,15)}}</a>
-													<span class="text-break comment-body" style="word-break: break-all;" v-html="reply.content"></span>
-												</span>
-												<span class="text-right" style="min-width: 30px;">
-													<span v-on:click="likeReply(reply, $event)"><i v-bind:class="[reply.favourited ? 'fas fa-heart fa-sm text-danger':'far fa-heart fa-sm text-lighter']"></i></span>
-													<span class="pl-2 text-lighter cursor-pointer" @click="ctxMenu(reply)">
-														<span class="fas fa-ellipsis-v text-lighter"></span>
-													</span>
-												</span>
-											</p>
-											<p class="mb-0">
-												<a v-once class="text-muted mr-3 text-decoration-none small" style="width: 20px;" v-text="timeAgo(reply.created_at)" :href="getStatusUrl(reply)"></a>
-												<span v-if="reply.favourites_count" class="text-muted comment-reaction font-weight-bold mr-3 small">{{reply.favourites_count == 1 ? '1 like' : reply.favourites_count + ' likes'}}</span>
-												<span class="small text-muted comment-reaction font-weight-bold cursor-pointer" v-on:click="replyFocus(reply, index, true)">Reply</span>
-											</p>
-										</div>
-									</div>
-							</div>
-						</div> -->
 					</div>
 				</div>
 			</div>
@@ -660,85 +613,85 @@ export default {
 		},
 
 		data() {
-				return {
-						config: window.App.config,
-						status: false,
-						media: {},
-						user: false,
-						reactions: {
-							liked: false,
-							shared: false
-						},
-						likes: [],
-						likesCursor: null,
-						likesCanLoadMore: true,
-						likedLoaded: false,
-						shares: [],
-						lightboxMedia: false,
-						replyText: '',
-						replyStatus: {},
-						replySensitive: false,
-						relationship: {},
-						results: [],
-						pagination: {},
-						min_id: 0,
-						max_id: 0,
-						reply_to_profile_id: 0,
-						thread: false,
-						showComments: false,
-						warning: false,
-						loaded: false,
-						loading: null,
-						replyingToId: this.statusId,
-						replyingToUsername: this.statusUsername,
-						replyToIndex: 0,
-						replySending: false,
-						emoji: window.App.util.emoji,
-						showReadMore: true,
-						showCaption: true,
-						ctxEmbedPayload: false,
-						copiedEmbed: false,
-						ctxEmbedShowCaption: true,
-						ctxEmbedShowLikes: false,
-						ctxEmbedCompactMode: false,
-						layout: this.profileLayout,
-						showProfileMorePosts: false,
-						profileMorePosts: [],
-						reactionBarLoading: true,
-						tributeSettings: {
-							collection: [
-								{
-									trigger: '@',
-									menuShowMinLength: 2,
-									values: (function (text, cb) {
-										let url = '/api/compose/v0/search/mention';
-										axios.get(url, { params: { q: text }})
-										.then(res => {
-											cb(res.data);
-										})
-										.catch(err => {
-											console.log(err);
-										})
+			return {
+					config: window.App.config,
+					status: false,
+					media: {},
+					user: false,
+					reactions: {
+						liked: false,
+						shared: false
+					},
+					likes: [],
+					likesCursor: null,
+					likesCanLoadMore: true,
+					likedLoaded: false,
+					shares: [],
+					lightboxMedia: false,
+					replyText: '',
+					replyStatus: {},
+					replySensitive: false,
+					relationship: {},
+					results: [],
+					pagination: {},
+					min_id: 0,
+					max_id: 0,
+					reply_to_profile_id: 0,
+					thread: false,
+					showComments: false,
+					warning: false,
+					loaded: false,
+					loading: null,
+					replyingToId: this.statusId,
+					replyingToUsername: this.statusUsername,
+					replyToIndex: 0,
+					replySending: false,
+					emoji: window.App.util.emoji,
+					showReadMore: true,
+					showCaption: true,
+					ctxEmbedPayload: false,
+					copiedEmbed: false,
+					ctxEmbedShowCaption: true,
+					ctxEmbedShowLikes: false,
+					ctxEmbedCompactMode: false,
+					layout: this.profileLayout,
+					showProfileMorePosts: false,
+					profileMorePosts: [],
+					reactionBarLoading: true,
+					tributeSettings: {
+						collection: [
+							{
+								trigger: '@',
+								menuShowMinLength: 2,
+								values: (function (text, cb) {
+									let url = '/api/compose/v0/search/mention';
+									axios.get(url, { params: { q: text }})
+									.then(res => {
+										cb(res.data);
 									})
-								},
-								{
-									trigger: '#',
-									menuShowMinLength: 2,
-									values: (function (text, cb) {
-										let url = '/api/compose/v0/search/hashtag';
-										axios.get(url, { params: { q: text }})
-										.then(res => {
-											cb(res.data);
-										})
-										.catch(err => {
-											console.log(err);
-										})
+									.catch(err => {
+										console.log(err);
 									})
-								}
-							]
-						},
-						content: undefined
-					}
+								})
+							},
+							{
+								trigger: '#',
+								menuShowMinLength: 2,
+								values: (function (text, cb) {
+									let url = '/api/compose/v0/search/hashtag';
+									axios.get(url, { params: { q: text }})
+									.then(res => {
+										cb(res.data);
+									})
+									.catch(err => {
+										console.log(err);
+									})
+								})
+							}
+						]
+					},
+					content: undefined
+			}
 		},
 		watch: {
 			ctxEmbedShowCaption: function (n,o) {
@@ -1424,7 +1377,15 @@ export default {
 			},
 
 			previewUrl(status) {
-				return status.sensitive ? '/storage/no-preview.png?v=' + new Date().getTime() : status.media_attachments[0].preview_url;
+                if(status.sensitive) {
+                    return '/storage/no-preview.png';
+                }
+
+                if(status.media_attachments[0]?.optimized_url) {
+                    return status.media_attachments[0]?.optimized_url;
+                }
+
+				return status.media_attachments[0].preview_url;
 			},
 
 			previewBackground(status) {
diff --git a/resources/assets/js/components/filters.js b/resources/assets/js/components/filters.js
new file mode 100644
index 000000000..59579c809
--- /dev/null
+++ b/resources/assets/js/components/filters.js
@@ -0,0 +1,290 @@
+export const filterEffects = [
+    {
+      name: '1984',
+      ops: [
+        { type: 'sepia', intensity: 0.5 },
+        { type: 'hue_rotate', angle: -30 },
+        { type: 'adjust_color', brightness: 0, contrast: 0, saturation: 0.4 },
+      ],
+    },
+    {
+      name: 'Azen',
+      ops: [
+        { type: 'sepia', intensity: 0.2 },
+        { type: 'adjust_color', brightness: 0.15, contrast: 0, saturation: 0.4 },
+      ],
+    },
+    {
+      name: 'Astairo',
+      ops: [
+        { type: 'sepia', intensity: 0.35 },
+        { type: 'adjust_color', brightness: 0.2, contrast: 0.1, saturation: 0.3 },
+      ],
+    },
+    {
+      name: 'Grasbee',
+      ops: [
+        { type: 'sepia', intensity: 0.5 },
+        { type: 'adjust_color', brightness: 0, contrast: 0.2, saturation: 0.8 },
+      ],
+    },
+    {
+      name: 'Bookrun',
+      ops: [
+        { type: 'sepia', intensity: 0.4 },
+        { type: 'adjust_color', brightness: 0.1, contrast: 0.25, saturation: -0.1 },
+        { type: 'hue_rotate', angle: -2 },
+      ],
+    },
+    {
+      name: 'Borough',
+      ops: [
+        { type: 'sepia', intensity: 0.25 },
+        { type: 'adjust_color', brightness: 0.25, contrast: 0.25, saturation: 0 },
+        { type: 'hue_rotate', angle: 5 },
+      ],
+    },
+    {
+      name: 'Farms',
+      ops: [
+        { type: 'sepia', intensity: 0.25 },
+        { type: 'adjust_color', brightness: 0.25, contrast: 0.25, saturation: 0.35 },
+        { type: 'hue_rotate', angle: -5 },
+      ],
+    },
+    {
+      name: 'Hairsadone',
+      ops: [
+        { type: 'sepia', intensity: 0.15 },
+        { type: 'adjust_color', brightness: 0.25, contrast: 0.25, saturation: 0 },
+        { type: 'hue_rotate', angle: 5 },
+      ],
+    },
+    {
+      name: 'Cleana',
+      ops: [
+        { type: 'sepia', intensity: 0.5 },
+        { type: 'adjust_color', brightness: 0.25, contrast: 0.15, saturation: -0.1 },
+        { type: 'hue_rotate', angle: -2 },
+      ],
+    },
+    {
+      name: 'Catpatch',
+      ops: [
+        { type: 'sepia', intensity: 0.35 },
+        { type: 'adjust_color', brightness: 0, contrast: .5, saturation: 0.1 },
+      ],
+    },
+    {
+      name: 'Earlyworm',
+      ops: [
+        { type: 'sepia', intensity: 0.25 },
+        { type: 'adjust_color', brightness: 0.25, contrast: 0.15, saturation: -0.1 },
+        { type: 'hue_rotate', angle: -5 },
+      ],
+    },
+    {
+      name: 'Plaid',
+      ops: [{ type: 'adjust_color', brightness: 0.1, contrast: 0.1, saturation: 0 }],
+    },
+    {
+      name: 'Kyo',
+      ops: [
+        { type: 'sepia', intensity: 0.25 },
+        { type: 'adjust_color', brightness: 0.2, contrast: 0.15, saturation: 0.35 },
+        { type: 'hue_rotate', angle: -5 },
+      ],
+    },
+    {
+      name: 'Yefe',
+      ops: [
+        { type: 'sepia', intensity: 0.4 },
+        { type: 'adjust_color', brightness: 0.2, contrast: 0.5, saturation: 0.4 },
+        { type: 'hue_rotate', angle: -10 },
+      ],
+    },
+    {
+      name: 'Godess',
+      ops: [
+        { type: 'sepia', intensity: 0.5 },
+        { type: 'adjust_color', brightness: 0.05, contrast: 0.05, saturation: 0.35 },
+      ],
+    },
+    {
+      name: 'Yards',
+      ops: [
+        { type: 'sepia', intensity: 0.25 },
+        { type: 'adjust_color', brightness: 0.2, contrast: 0.2, saturation: 0.05 },
+        { type: 'hue_rotate', angle: -15 },
+      ],
+    },
+    {
+      name: 'Quill',
+      ops: [{ type: 'adjust_color', brightness: 0.25, contrast: -0.15, saturation: -1 }],
+    },
+    {
+      name: 'Juno',
+      ops: [
+        { type: 'sepia', intensity: 0.35 },
+        { type: 'adjust_color', brightness: 0.15, contrast: 0.15, saturation: 0.8 },
+      ],
+    },
+    {
+      name: 'Rankine',
+      ops: [
+        { type: 'sepia', intensity: 0.15 },
+        { type: 'adjust_color', brightness: 0.1, contrast: 0.5, saturation: 0 },
+        { type: 'hue_rotate', angle: -10 },
+      ],
+    },
+    {
+      name: 'Mark',
+      ops: [
+        { type: 'sepia', intensity: 0.25 },
+        { type: 'adjust_color', brightness: 0.3, contrast: 0.2, saturation: 0.25 },
+      ],
+    },
+    {
+      name: 'Chill',
+      ops: [{ type: 'adjust_color', brightness: 0, contrast: 0.5, saturation: 0.1 }],
+    },
+    {
+      name: 'Van',
+      ops: [
+        { type: 'sepia', intensity: 0.25 },
+        { type: 'adjust_color', brightness: 0.05, contrast: 0.05, saturation: 1 },
+      ],
+    },
+    {
+      name: 'Apache',
+      ops: [
+        { type: 'sepia', intensity: 0.35 },
+        { type: 'adjust_color', brightness: 0.05, contrast: 0.05, saturation: 0.75 },
+      ],
+    },
+    {
+      name: 'May',
+      ops: [{ type: 'adjust_color', brightness: 0.15, contrast: 0.1, saturation: 0.1 }],
+    },
+    {
+      name: 'Ceres',
+      ops: [
+        { type: 'adjust_color', brightness: 0.4, contrast: -0.05, saturation: -1 },
+        { type: 'sepia', intensity: 0.35 },
+      ],
+    },
+    {
+      name: 'Knoxville',
+      ops: [
+        { type: 'sepia', intensity: 0.25 },
+        { type: 'adjust_color', brightness: -0.1, contrast: 0.5, saturation: 0 },
+        { type: 'hue_rotate', angle: -15 },
+      ],
+    },
+    {
+      name: 'Felicity',
+      ops: [{ type: 'adjust_color', brightness: 0.25, contrast: 0.1, saturation: 0.1 }],
+    },
+    {
+      name: 'Sandblast',
+      ops: [
+        { type: 'sepia', intensity: 0.15 },
+        { type: 'adjust_color', brightness: 0.2, contrast: 0, saturation: 0 },
+      ],
+    },
+    {
+      name: 'Daisy',
+      ops: [
+        { type: 'sepia', intensity: 0.75 },
+        { type: 'adjust_color', brightness: 0.25, contrast: -0.25, saturation: 0.4 },
+      ],
+    },
+    {
+      name: 'Elevate',
+      ops: [
+        { type: 'sepia', intensity: 0.25 },
+        { type: 'adjust_color', brightness: 0.2, contrast: 0.25, saturation: -0.1 },
+      ],
+    },
+    {
+      name: 'Nevada',
+      ops: [
+        { type: 'sepia', intensity: 0.25 },
+        { type: 'adjust_color', brightness: -0.1, contrast: 0.5, saturation: 0 },
+        { type: 'hue_rotate', angle: -15 },
+      ],
+    },
+    {
+      name: 'Futura',
+      ops: [
+        { type: 'sepia', intensity: 0.15 },
+        { type: 'adjust_color', brightness: 0.25, contrast: 0.25, saturation: 0.2 },
+      ],
+    },
+    {
+      name: 'Sleepy',
+      ops: [
+        { type: 'sepia', intensity: 0.15 },
+        { type: 'adjust_color', brightness: 0.25, contrast: 0.25, saturation: 0.2 },
+      ],
+    },
+    {
+      name: 'Steward',
+      ops: [
+        { type: 'sepia', intensity: 0.35 },
+        { type: 'adjust_color', brightness: 0.25, contrast: 0.1, saturation: 0.25 },
+      ],
+    },
+    {
+      name: 'Savoy',
+      ops: [
+        { type: 'sepia', intensity: 0.4 },
+        { type: 'adjust_color', brightness: 0.2, contrast: -0.1, saturation: 0.4 },
+        { type: 'hue_rotate', angle: -10 },
+      ],
+    },
+    {
+      name: 'Blaze',
+      ops: [
+        { type: 'sepia', intensity: 0.25 },
+        { type: 'adjust_color', brightness: -0.05, contrast: 0.5, saturation: 0 },
+        { type: 'hue_rotate', angle: -15 },
+      ],
+    },
+    {
+      name: 'Apricot',
+      ops: [
+        { type: 'sepia', intensity: 0.25 },
+        { type: 'adjust_color', brightness: 0.1, contrast: 0.1, saturation: 0 },
+      ],
+    },
+    {
+      name: 'Gloming',
+      ops: [
+        { type: 'sepia', intensity: 0.35 },
+        { type: 'adjust_color', brightness: 0.15, contrast: 0.2, saturation: 0.3 },
+      ],
+    },
+    {
+      name: 'Walter',
+      ops: [
+        { type: 'sepia', intensity: 0.35 },
+        { type: 'adjust_color', brightness: 0.25, contrast: -0.2, saturation: 0.4 },
+      ],
+    },
+    {
+      name: 'Poplar',
+      ops: [
+        { type: 'adjust_color', brightness: 0.2, contrast: -0.15, saturation: -0.95 },
+        { type: 'sepia', intensity: 0.5 },
+      ],
+    },
+    {
+      name: 'Xenon',
+      ops: [
+        { type: 'sepia', intensity: 0.45 },
+        { type: 'adjust_color', brightness: 0.75, contrast: 0.25, saturation: 0.3 },
+        { type: 'hue_rotate', angle: -5 },
+      ],
+    },
+  ]
diff --git a/resources/assets/js/components/partials/CommentFeed.vue b/resources/assets/js/components/partials/CommentFeed.vue
index ee29e7c69..f471228e8 100644
--- a/resources/assets/js/components/partials/CommentFeed.vue
+++ b/resources/assets/js/components/partials/CommentFeed.vue
@@ -18,8 +18,8 @@
 							</div>
 						</div>
 
-						<div v-if="composeText" class="reply-options" v-model="visibility">
-							<select class="form-control form-control-sm rounded-pill font-weight-bold">
+						<div v-if="composeText" class="reply-options">
+							<select class="form-control form-control-sm rounded-pill font-weight-bold" v-model="visibility">
 								<option value="public">Public</option>
 								<option value="private">Followers Only</option>
 							</select>
diff --git a/resources/assets/js/components/partials/StatusCard.vue b/resources/assets/js/components/partials/StatusCard.vue
index 7bb2f6697..1efa6e2eb 100644
--- a/resources/assets/js/components/partials/StatusCard.vue
+++ b/resources/assets/js/components/partials/StatusCard.vue
@@ -8,7 +8,6 @@
 					<div class="media-body">
 						<div class="pl-2 d-flex align-items-top">
 							<a class="username font-weight-bold text-dark text-decoration-none text-break" v-bind:href="profileUrl(status)" v-html="statusCardUsernameFormat(status)">
-								Loading...
 							</a>
 							<span class="px-1 text-lighter">
 								·
@@ -61,7 +60,6 @@
 				</div>
 				<div class="pl-2">
 					<a class="username font-weight-bold text-dark text-decoration-none text-break" v-bind:href="profileUrl(status)" v-html="statusCardUsernameFormat(status)">
-						Loading...
 					</a>
 					<span v-if="status.account.is_admin" class="fa-stack" title="Admin Account" data-toggle="tooltip" style="height:1em; line-height:1em; max-width:19px;">
 						<i class="fas fa-certificate text-danger fa-stack-1x"></i>
diff --git a/resources/assets/js/components/presenter/PhotoAlbumPresenter.vue b/resources/assets/js/components/presenter/PhotoAlbumPresenter.vue
index c83f11e20..3adda10df 100644
--- a/resources/assets/js/components/presenter/PhotoAlbumPresenter.vue
+++ b/resources/assets/js/components/presenter/PhotoAlbumPresenter.vue
@@ -26,8 +26,7 @@
 			<slide v-for="(img, index) in status.media_attachments" :key="'px-carousel-'+img.id + '-' + index" class="" style="background: #000; display: flex;align-items: center;" :title="img.description">
 
 				<img
-					:class="img.filter_class + ' img-fluid w-100 p-0'"
-					style=""
+					class="img-fluid w-100 p-0"
 					:src="img.url"
 					:alt="altText(img)"
 					loading="lazy"
@@ -162,28 +161,28 @@
 
 <style type="text/css" scoped>
   .card-img-top {
-    border-top-left-radius: 0 !important;
-    border-top-right-radius: 0 !important;
+	border-top-left-radius: 0 !important;
+	border-top-right-radius: 0 !important;
   }
   .content-label-wrapper {
-  	position: relative;
+	position: relative;
   }
   .content-label {
-  	margin: 0;
-  	position: absolute;
-  	top:50%;
-  	left:50%;
-  	transform: translate(-50%, -50%);
-  	display: flex;
-  	flex-direction: column;
-  	align-items: center;
-  	justify-content: center;
-  	width: 100%;
-  	height: 100%;
-  	z-index: 2;
-  	background: rgba(0, 0, 0, 0.2)
+	margin: 0;
+	position: absolute;
+	top:50%;
+	left:50%;
+	transform: translate(-50%, -50%);
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	width: 100%;
+	height: 100%;
+	z-index: 2;
+	background: rgba(0, 0, 0, 0.2)
   }
   .album-wrapper {
-  	position: relative;
+	position: relative;
   }
 </style>
diff --git a/resources/assets/js/components/presenter/VideoPresenter.vue b/resources/assets/js/components/presenter/VideoPresenter.vue
index 333a482f2..217dbb3de 100644
--- a/resources/assets/js/components/presenter/VideoPresenter.vue
+++ b/resources/assets/js/components/presenter/VideoPresenter.vue
@@ -22,7 +22,7 @@
 			:alt="altText(status)"/>
 	</div>
 	<div v-else class="embed-responsive embed-responsive-16by9">
-		<video class="video" controls playsinline preload="metadata" loop :data-id="status.id" :poster="poster()">
+		<video class="video" controls playsinline webkit-playsinline preload="metadata" loop :data-id="status.id" :poster="poster()">
 			<source :src="status.media_attachments[0].url" :type="status.media_attachments[0].mime">
 		</video>
 	</div>
diff --git a/resources/assets/js/group-status.js b/resources/assets/js/group-status.js
new file mode 100644
index 000000000..a95ac270f
--- /dev/null
+++ b/resources/assets/js/group-status.js
@@ -0,0 +1,4 @@
+Vue.component(
+	'gs-permalink',
+	require('./components/GroupStatusPermalink.vue').default
+);
diff --git a/resources/assets/js/group-topic-feed.js b/resources/assets/js/group-topic-feed.js
new file mode 100644
index 000000000..d913336bd
--- /dev/null
+++ b/resources/assets/js/group-topic-feed.js
@@ -0,0 +1,4 @@
+Vue.component(
+	'group-topic-feed',
+	require('./../components/groups/GroupTopicFeed.vue').default
+);
diff --git a/resources/assets/js/groups.js b/resources/assets/js/groups.js
new file mode 100644
index 000000000..94d20cbb2
--- /dev/null
+++ b/resources/assets/js/groups.js
@@ -0,0 +1,29 @@
+Vue.component(
+	'group-component',
+	require('./../components/Groups.vue').default
+);
+
+Vue.component(
+	'groups-home',
+	require('./../components/groups/GroupsHome.vue').default
+);
+
+Vue.component(
+	'group-feed',
+	require('./../components/groups/GroupFeed.vue').default
+);
+
+Vue.component(
+	'group-settings',
+	require('./../components/groups/GroupSettings.vue').default
+);
+
+Vue.component(
+	'group-profile',
+	require('./../components/groups/GroupProfile.vue').default
+);
+
+Vue.component(
+	'groups-invite',
+	require('./../components/groups/GroupInvite.vue').default
+);
diff --git a/resources/assets/js/landing.js b/resources/assets/js/landing.js
index 6d903bcb5..cdaf0233b 100644
--- a/resources/assets/js/landing.js
+++ b/resources/assets/js/landing.js
@@ -48,27 +48,27 @@ Vue.use(VueTimeago, {
 
 Vue.component(
 	'photo-presenter',
-	require('./components/presenter/PhotoPresenter.vue').default
+	require('./../components/presenter/PhotoPresenter.vue').default
 );
 
 Vue.component(
 	'video-presenter',
-	require('./components/presenter/VideoPresenter.vue').default
+	require('./../components/presenter/VideoPresenter.vue').default
 );
 
 Vue.component(
 	'photo-album-presenter',
-	require('./components/presenter/PhotoAlbumPresenter.vue').default
+	require('./../components/presenter/PhotoAlbumPresenter.vue').default
 );
 
 Vue.component(
 	'video-album-presenter',
-	require('./components/presenter/VideoAlbumPresenter.vue').default
+	require('./../components/presenter/VideoAlbumPresenter.vue').default
 );
 
 Vue.component(
 	'mixed-album-presenter',
-	require('./components/presenter/MixedAlbumPresenter.vue').default
+	require('./../components/presenter/MixedAlbumPresenter.vue').default
 );
 
 Vue.component(
diff --git a/resources/assets/js/profile.js b/resources/assets/js/profile.js
index 452445ed6..783626116 100644
--- a/resources/assets/js/profile.js
+++ b/resources/assets/js/profile.js
@@ -1,26 +1,26 @@
 Vue.component(
     'photo-presenter',
-    require('./components/presenter/PhotoPresenter.vue').default
+    require('./../components/presenter/PhotoPresenter.vue').default
 );
 
 Vue.component(
     'video-presenter',
-    require('./components/presenter/VideoPresenter.vue').default
+    require('./../components/presenter/VideoPresenter.vue').default
 );
 
 Vue.component(
     'photo-album-presenter',
-    require('./components/presenter/PhotoAlbumPresenter.vue').default
+    require('./../components/presenter/PhotoAlbumPresenter.vue').default
 );
 
 Vue.component(
     'video-album-presenter',
-    require('./components/presenter/VideoAlbumPresenter.vue').default
+    require('./../components/presenter/VideoAlbumPresenter.vue').default
 );
 
 Vue.component(
     'mixed-album-presenter',
-    require('./components/presenter/MixedAlbumPresenter.vue').default
+    require('./../components/presenter/MixedAlbumPresenter.vue').default
 );
 
 Vue.component(
@@ -28,6 +28,11 @@ Vue.component(
     require('./components/PostMenu.vue').default
 );
 
+Vue.component(
+    'profile-carousel',
+    require('./../components/ProfileCarousel.vue').default
+);
+
 Vue.component(
     'profile',
     require('./components/Profile.vue').default
diff --git a/resources/assets/js/spa.js b/resources/assets/js/spa.js
index be31b5371..c06a3793e 100644
--- a/resources/assets/js/spa.js
+++ b/resources/assets/js/spa.js
@@ -60,27 +60,27 @@ Vue.component(
 
 Vue.component(
 	'photo-presenter',
-	require('./components/presenter/PhotoPresenter.vue').default
+	require('./../components/presenter/PhotoPresenter.vue').default
 );
 
 Vue.component(
 	'video-presenter',
-	require('./components/presenter/VideoPresenter.vue').default
+	require('./../components/presenter/VideoPresenter.vue').default
 );
 
 Vue.component(
 	'photo-album-presenter',
-	require('./components/presenter/PhotoAlbumPresenter.vue').default
+	require('./../components/presenter/PhotoAlbumPresenter.vue').default
 );
 
 Vue.component(
 	'video-album-presenter',
-	require('./components/presenter/VideoAlbumPresenter.vue').default
+	require('./../components/presenter/VideoAlbumPresenter.vue').default
 );
 
 Vue.component(
 	'mixed-album-presenter',
-	require('./components/presenter/MixedAlbumPresenter.vue').default
+	require('./../components/presenter/MixedAlbumPresenter.vue').default
 );
 
 Vue.component(
@@ -134,7 +134,13 @@ const ChangelogComponent = () => import(/* webpackChunkName: "changelog.bundle"
 // import SettingsComponent from "./../components/Settings.vue";
 // import ProfileComponent from "./components/ProfileNext.vue";
 // import VideosComponent from "./../components/Videos.vue";
-// import GroupsComponent from "./../components/Groups.vue";
+import GroupsComponent from "./../components/Groups.vue";
+import GroupFeedComponent from "./../components/GroupFeed.vue";
+import GroupDiscoverComponent from "./../components/GroupDiscover.vue";
+import GroupJoinsComponent from "./../components/GroupJoins.vue";
+import GroupNotificationsComponent from "./../components/GroupNotifications.vue";
+import GroupSearchComponent from "./../components/GroupSearch.vue";
+const CreateGroupComponent = () => import(/* webpackChunkName: "group.create" */ "./../components/GroupCreate.vue");
 
 const router = new VueRouter({
 	mode: "history",
@@ -161,12 +167,78 @@ const router = new VueRouter({
 		// 	component: DriveComponent,
 		// 	props: true
 		// },
+		{
+			path: "/groups/feed",
+			name: 'groups',
+			component: GroupFeedComponent,
+		},
+		{
+			path: "/groups/joins",
+			name: 'groupjoins',
+			component: GroupJoinsComponent,
+		},
+		{
+			path: "/groups/discover",
+			name: 'groupdiscover',
+			component: GroupDiscoverComponent,
+			props: true
+		},
+		{
+			path: "/groups/notifications",
+			name: 'groupnotify',
+			component: GroupNotificationsComponent,
+		},
+		{
+			path: "/groups/search",
+			name: 'groupsearch',
+			component: GroupSearchComponent,
+		},
+		{
+			path: "/groups/create",
+			name: 'groupscreate',
+			component: CreateGroupComponent,
+		},
 		// {
 		// 	path: "/i/web/groups",
 		// 	name: 'groups',
 		// 	component: GroupsComponent,
 		// 	props: true
 		// },
+		{
+			path: "/groups/:gid/p/:sid",
+			component: () => import(/* webpackChunkName: "groups-post" */ './../components/GroupPost.vue'),
+			props: true
+		},
+		{
+			path: "/groups/:gid/user/:pid",
+			component: () => import(/* webpackChunkName: "groups-profile" */ './../components/GroupProfile.vue'),
+			props: true
+		},
+		{
+			path: "/groups/:groupId/about",
+			component: () => import(/* webpackChunkName: "groups-page-about" */ './../components/groups/Page/GroupAbout.vue'),
+			props: true
+		},
+		{
+			path: "/groups/:groupId/topics",
+			component: () => import(/* webpackChunkName: "groups-page-topics" */ './../components/groups/Page/GroupTopics.vue'),
+			props: true
+		},
+		{
+			path: "/groups/:groupId/members",
+			component: () => import(/* webpackChunkName: "groups-page-members" */ './../components/groups/Page/GroupMembers.vue'),
+			props: true
+		},
+		{
+			path: "/groups/:groupId/media",
+			component: () => import(/* webpackChunkName: "groups-page-media" */ './../components/groups/Page/GroupMedia.vue'),
+			props: true
+		},
+		{
+			path: "/groups/:groupId",
+			component: () => import(/* webpackChunkName: "groups-page" */ './../components/GroupPage.vue'),
+			props: true
+		},
 		{
 			path: "/i/web/post/:id",
 			name: 'post',
@@ -178,18 +250,18 @@ const router = new VueRouter({
 		// 	component: LivePlayerComponent,
 		// 	props: true
 		// },
-        {
-            path: "/i/web/profile/:id/followers",
-            name: 'profile-followers',
-            component: ProfileFollowersComponent,
-            props: true
-        },
-        {
-            path: "/i/web/profile/:id/following",
-            name: 'profile-following',
-            component: ProfileFollowingComponent,
-            props: true
-        },
+		{
+			path: "/i/web/profile/:id/followers",
+			name: 'profile-followers',
+			component: ProfileFollowersComponent,
+			props: true
+		},
+		{
+			path: "/i/web/profile/:id/following",
+			name: 'profile-following',
+			component: ProfileFollowingComponent,
+			props: true
+		},
 		{
 			path: "/i/web/profile/:id",
 			name: 'profile',
diff --git a/resources/assets/js/status.js b/resources/assets/js/status.js
index ddd29a4ef..43a1a76ae 100644
--- a/resources/assets/js/status.js
+++ b/resources/assets/js/status.js
@@ -1,26 +1,26 @@
 Vue.component(
 	'photo-presenter',
-	require('./components/presenter/PhotoPresenter.vue').default
+	require('./../components/presenter/PhotoPresenter.vue').default
 );
 
 Vue.component(
 	'video-presenter',
-	require('./components/presenter/VideoPresenter.vue').default
+	require('./../components/presenter/VideoPresenter.vue').default
 );
 
 Vue.component(
 	'photo-album-presenter',
-	require('./components/presenter/PhotoAlbumPresenter.vue').default
+	require('./../components/presenter/PhotoAlbumPresenter.vue').default
 );
 
 Vue.component(
 	'video-album-presenter',
-	require('./components/presenter/VideoAlbumPresenter.vue').default
+	require('./../components/presenter/VideoAlbumPresenter.vue').default
 );
 
 Vue.component(
 	'mixed-album-presenter',
-	require('./components/presenter/MixedAlbumPresenter.vue').default
+	require('./../components/presenter/MixedAlbumPresenter.vue').default
 );
 
 Vue.component(
@@ -32,3 +32,13 @@ Vue.component(
 	'post-component',
 	require('./components/PostComponent.vue').default
 );
+
+// Vue.component(
+// 	'post-next',
+// 	require('./components/PostNext.vue').default
+// );
+
+// Vue.component(
+// 	'video-component',
+// 	require('./components/VideoComponent.vue').default
+// );
diff --git a/resources/assets/js/timeline.js b/resources/assets/js/timeline.js
index 5858ac8e3..8858c3691 100644
--- a/resources/assets/js/timeline.js
+++ b/resources/assets/js/timeline.js
@@ -5,27 +5,27 @@ Vue.component(
 
 Vue.component(
     'photo-presenter',
-    require('./components/presenter/PhotoPresenter.vue').default
+    require('./../components/presenter/PhotoPresenter.vue').default
 );
 
 Vue.component(
     'video-presenter',
-    require('./components/presenter/VideoPresenter.vue').default
+    require('./../components/presenter/VideoPresenter.vue').default
 );
 
 Vue.component(
     'photo-album-presenter',
-    require('./components/presenter/PhotoAlbumPresenter.vue').default
+    require('./../components/presenter/PhotoAlbumPresenter.vue').default
 );
 
 Vue.component(
     'video-album-presenter',
-    require('./components/presenter/VideoAlbumPresenter.vue').default
+    require('./../components/presenter/VideoAlbumPresenter.vue').default
 );
 
 Vue.component(
     'mixed-album-presenter',
-    require('./components/presenter/MixedAlbumPresenter.vue').default
+    require('./../components/presenter/MixedAlbumPresenter.vue').default
 );
 
 Vue.component(
@@ -46,4 +46,4 @@ Vue.component(
 Vue.component(
     'story-component',
     require('./components/StoryTimelineComponent.vue').default
-);
\ No newline at end of file
+);
diff --git a/resources/assets/sass/lib/fontawesome.scss b/resources/assets/sass/lib/fontawesome.scss
index 2a70ab85e..f41e42adc 100644
--- a/resources/assets/sass/lib/fontawesome.scss
+++ b/resources/assets/sass/lib/fontawesome.scss
@@ -2,6 +2,7 @@
 .fas,
 .far,
 .fal,
+.fad,
 .fab {
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
@@ -187,12 +188,18 @@ readers do not read off random characters that represent icons */
 .fa-500px:before {
   content: "\f26e"; }
 
+.fa-abacus:before {
+  content: "\f640"; }
+
 .fa-accessible-icon:before {
   content: "\f368"; }
 
 .fa-accusoft:before {
   content: "\f369"; }
 
+.fa-acorn:before {
+  content: "\f6ae"; }
+
 .fa-acquisitions-incorporated:before {
   content: "\f6af"; }
 
@@ -211,21 +218,51 @@ readers do not read off random characters that represent icons */
 .fa-adn:before {
   content: "\f170"; }
 
-.fa-adobe:before {
-  content: "\f778"; }
-
 .fa-adversal:before {
   content: "\f36a"; }
 
 .fa-affiliatetheme:before {
   content: "\f36b"; }
 
+.fa-air-conditioner:before {
+  content: "\f8f4"; }
+
 .fa-air-freshener:before {
   content: "\f5d0"; }
 
+.fa-airbnb:before {
+  content: "\f834"; }
+
+.fa-alarm-clock:before {
+  content: "\f34e"; }
+
+.fa-alarm-exclamation:before {
+  content: "\f843"; }
+
+.fa-alarm-plus:before {
+  content: "\f844"; }
+
+.fa-alarm-snooze:before {
+  content: "\f845"; }
+
+.fa-album:before {
+  content: "\f89f"; }
+
+.fa-album-collection:before {
+  content: "\f8a0"; }
+
 .fa-algolia:before {
   content: "\f36c"; }
 
+.fa-alicorn:before {
+  content: "\f6b0"; }
+
+.fa-alien:before {
+  content: "\f8f5"; }
+
+.fa-alien-monster:before {
+  content: "\f8f6"; }
+
 .fa-align-center:before {
   content: "\f037"; }
 
@@ -238,6 +275,9 @@ readers do not read off random characters that represent icons */
 .fa-align-right:before {
   content: "\f038"; }
 
+.fa-align-slash:before {
+  content: "\f846"; }
+
 .fa-alipay:before {
   content: "\f642"; }
 
@@ -259,12 +299,21 @@ readers do not read off random characters that represent icons */
 .fa-amilia:before {
   content: "\f36d"; }
 
+.fa-amp-guitar:before {
+  content: "\f8a1"; }
+
+.fa-analytics:before {
+  content: "\f643"; }
+
 .fa-anchor:before {
   content: "\f13d"; }
 
 .fa-android:before {
   content: "\f17b"; }
 
+.fa-angel:before {
+  content: "\f779"; }
+
 .fa-angellist:before {
   content: "\f209"; }
 
@@ -319,6 +368,9 @@ readers do not read off random characters that represent icons */
 .fa-apple-alt:before {
   content: "\f5d1"; }
 
+.fa-apple-crate:before {
+  content: "\f6b1"; }
+
 .fa-apple-pay:before {
   content: "\f415"; }
 
@@ -340,6 +392,54 @@ readers do not read off random characters that represent icons */
 .fa-arrow-alt-circle-up:before {
   content: "\f35b"; }
 
+.fa-arrow-alt-down:before {
+  content: "\f354"; }
+
+.fa-arrow-alt-from-bottom:before {
+  content: "\f346"; }
+
+.fa-arrow-alt-from-left:before {
+  content: "\f347"; }
+
+.fa-arrow-alt-from-right:before {
+  content: "\f348"; }
+
+.fa-arrow-alt-from-top:before {
+  content: "\f349"; }
+
+.fa-arrow-alt-left:before {
+  content: "\f355"; }
+
+.fa-arrow-alt-right:before {
+  content: "\f356"; }
+
+.fa-arrow-alt-square-down:before {
+  content: "\f350"; }
+
+.fa-arrow-alt-square-left:before {
+  content: "\f351"; }
+
+.fa-arrow-alt-square-right:before {
+  content: "\f352"; }
+
+.fa-arrow-alt-square-up:before {
+  content: "\f353"; }
+
+.fa-arrow-alt-to-bottom:before {
+  content: "\f34a"; }
+
+.fa-arrow-alt-to-left:before {
+  content: "\f34b"; }
+
+.fa-arrow-alt-to-right:before {
+  content: "\f34c"; }
+
+.fa-arrow-alt-to-top:before {
+  content: "\f34d"; }
+
+.fa-arrow-alt-up:before {
+  content: "\f357"; }
+
 .fa-arrow-circle-down:before {
   content: "\f0ab"; }
 
@@ -355,15 +455,54 @@ readers do not read off random characters that represent icons */
 .fa-arrow-down:before {
   content: "\f063"; }
 
+.fa-arrow-from-bottom:before {
+  content: "\f342"; }
+
+.fa-arrow-from-left:before {
+  content: "\f343"; }
+
+.fa-arrow-from-right:before {
+  content: "\f344"; }
+
+.fa-arrow-from-top:before {
+  content: "\f345"; }
+
 .fa-arrow-left:before {
   content: "\f060"; }
 
 .fa-arrow-right:before {
   content: "\f061"; }
 
+.fa-arrow-square-down:before {
+  content: "\f339"; }
+
+.fa-arrow-square-left:before {
+  content: "\f33a"; }
+
+.fa-arrow-square-right:before {
+  content: "\f33b"; }
+
+.fa-arrow-square-up:before {
+  content: "\f33c"; }
+
+.fa-arrow-to-bottom:before {
+  content: "\f33d"; }
+
+.fa-arrow-to-left:before {
+  content: "\f33e"; }
+
+.fa-arrow-to-right:before {
+  content: "\f340"; }
+
+.fa-arrow-to-top:before {
+  content: "\f341"; }
+
 .fa-arrow-up:before {
   content: "\f062"; }
 
+.fa-arrows:before {
+  content: "\f047"; }
+
 .fa-arrows-alt:before {
   content: "\f0b2"; }
 
@@ -373,6 +512,12 @@ readers do not read off random characters that represent icons */
 .fa-arrows-alt-v:before {
   content: "\f338"; }
 
+.fa-arrows-h:before {
+  content: "\f07e"; }
+
+.fa-arrows-v:before {
+  content: "\f07d"; }
+
 .fa-artstation:before {
   content: "\f77a"; }
 
@@ -397,6 +542,9 @@ readers do not read off random characters that represent icons */
 .fa-atom:before {
   content: "\f5d2"; }
 
+.fa-atom-alt:before {
+  content: "\f5d3"; }
+
 .fa-audible:before {
   content: "\f373"; }
 
@@ -418,12 +566,21 @@ readers do not read off random characters that represent icons */
 .fa-aws:before {
   content: "\f375"; }
 
+.fa-axe:before {
+  content: "\f6b2"; }
+
+.fa-axe-battle:before {
+  content: "\f6b3"; }
+
 .fa-baby:before {
   content: "\f77c"; }
 
 .fa-baby-carriage:before {
   content: "\f77d"; }
 
+.fa-backpack:before {
+  content: "\f5d4"; }
+
 .fa-backspace:before {
   content: "\f55a"; }
 
@@ -433,9 +590,54 @@ readers do not read off random characters that represent icons */
 .fa-bacon:before {
   content: "\f7e5"; }
 
+.fa-bacteria:before {
+  content: "\e059"; }
+
+.fa-bacterium:before {
+  content: "\e05a"; }
+
+.fa-badge:before {
+  content: "\f335"; }
+
+.fa-badge-check:before {
+  content: "\f336"; }
+
+.fa-badge-dollar:before {
+  content: "\f645"; }
+
+.fa-badge-percent:before {
+  content: "\f646"; }
+
+.fa-badge-sheriff:before {
+  content: "\f8a2"; }
+
+.fa-badger-honey:before {
+  content: "\f6b4"; }
+
+.fa-bags-shopping:before {
+  content: "\f847"; }
+
+.fa-bahai:before {
+  content: "\f666"; }
+
 .fa-balance-scale:before {
   content: "\f24e"; }
 
+.fa-balance-scale-left:before {
+  content: "\f515"; }
+
+.fa-balance-scale-right:before {
+  content: "\f516"; }
+
+.fa-ball-pile:before {
+  content: "\f77e"; }
+
+.fa-ballot:before {
+  content: "\f732"; }
+
+.fa-ballot-check:before {
+  content: "\f733"; }
+
 .fa-ban:before {
   content: "\f05e"; }
 
@@ -445,21 +647,45 @@ readers do not read off random characters that represent icons */
 .fa-bandcamp:before {
   content: "\f2d5"; }
 
+.fa-banjo:before {
+  content: "\f8a3"; }
+
 .fa-barcode:before {
   content: "\f02a"; }
 
+.fa-barcode-alt:before {
+  content: "\f463"; }
+
+.fa-barcode-read:before {
+  content: "\f464"; }
+
+.fa-barcode-scan:before {
+  content: "\f465"; }
+
 .fa-bars:before {
   content: "\f0c9"; }
 
+.fa-baseball:before {
+  content: "\f432"; }
+
 .fa-baseball-ball:before {
   content: "\f433"; }
 
 .fa-basketball-ball:before {
   content: "\f434"; }
 
+.fa-basketball-hoop:before {
+  content: "\f435"; }
+
+.fa-bat:before {
+  content: "\f6b5"; }
+
 .fa-bath:before {
   content: "\f2cd"; }
 
+.fa-battery-bolt:before {
+  content: "\f376"; }
+
 .fa-battery-empty:before {
   content: "\f244"; }
 
@@ -472,12 +698,27 @@ readers do not read off random characters that represent icons */
 .fa-battery-quarter:before {
   content: "\f243"; }
 
+.fa-battery-slash:before {
+  content: "\f377"; }
+
 .fa-battery-three-quarters:before {
   content: "\f241"; }
 
+.fa-battle-net:before {
+  content: "\f835"; }
+
 .fa-bed:before {
   content: "\f236"; }
 
+.fa-bed-alt:before {
+  content: "\f8f7"; }
+
+.fa-bed-bunk:before {
+  content: "\f8f8"; }
+
+.fa-bed-empty:before {
+  content: "\f8f9"; }
+
 .fa-beer:before {
   content: "\f0fc"; }
 
@@ -490,9 +731,30 @@ readers do not read off random characters that represent icons */
 .fa-bell:before {
   content: "\f0f3"; }
 
+.fa-bell-exclamation:before {
+  content: "\f848"; }
+
+.fa-bell-on:before {
+  content: "\f8fa"; }
+
+.fa-bell-plus:before {
+  content: "\f849"; }
+
+.fa-bell-school:before {
+  content: "\f5d5"; }
+
+.fa-bell-school-slash:before {
+  content: "\f5d6"; }
+
 .fa-bell-slash:before {
   content: "\f1f6"; }
 
+.fa-bells:before {
+  content: "\f77f"; }
+
+.fa-betamax:before {
+  content: "\f8a4"; }
+
 .fa-bezier-curve:before {
   content: "\f55b"; }
 
@@ -502,6 +764,12 @@ readers do not read off random characters that represent icons */
 .fa-bicycle:before {
   content: "\f206"; }
 
+.fa-biking:before {
+  content: "\f84a"; }
+
+.fa-biking-mountain:before {
+  content: "\f84b"; }
+
 .fa-bimobject:before {
   content: "\f378"; }
 
@@ -529,6 +797,9 @@ readers do not read off random characters that represent icons */
 .fa-blackberry:before {
   content: "\f37b"; }
 
+.fa-blanket:before {
+  content: "\f498"; }
+
 .fa-blender:before {
   content: "\f517"; }
 
@@ -538,6 +809,15 @@ readers do not read off random characters that represent icons */
 .fa-blind:before {
   content: "\f29d"; }
 
+.fa-blinds:before {
+  content: "\f8fb"; }
+
+.fa-blinds-open:before {
+  content: "\f8fc"; }
+
+.fa-blinds-raised:before {
+  content: "\f8fd"; }
+
 .fa-blog:before {
   content: "\f781"; }
 
@@ -565,15 +845,24 @@ readers do not read off random characters that represent icons */
 .fa-bone:before {
   content: "\f5d7"; }
 
+.fa-bone-break:before {
+  content: "\f5d8"; }
+
 .fa-bong:before {
   content: "\f55c"; }
 
 .fa-book:before {
   content: "\f02d"; }
 
+.fa-book-alt:before {
+  content: "\f5d9"; }
+
 .fa-book-dead:before {
   content: "\f6b7"; }
 
+.fa-book-heart:before {
+  content: "\f499"; }
+
 .fa-book-medical:before {
   content: "\f7e6"; }
 
@@ -583,27 +872,135 @@ readers do not read off random characters that represent icons */
 .fa-book-reader:before {
   content: "\f5da"; }
 
+.fa-book-spells:before {
+  content: "\f6b8"; }
+
+.fa-book-user:before {
+  content: "\f7e7"; }
+
 .fa-bookmark:before {
   content: "\f02e"; }
 
+.fa-books:before {
+  content: "\f5db"; }
+
+.fa-books-medical:before {
+  content: "\f7e8"; }
+
+.fa-boombox:before {
+  content: "\f8a5"; }
+
+.fa-boot:before {
+  content: "\f782"; }
+
+.fa-booth-curtain:before {
+  content: "\f734"; }
+
+.fa-bootstrap:before {
+  content: "\f836"; }
+
+.fa-border-all:before {
+  content: "\f84c"; }
+
+.fa-border-bottom:before {
+  content: "\f84d"; }
+
+.fa-border-center-h:before {
+  content: "\f89c"; }
+
+.fa-border-center-v:before {
+  content: "\f89d"; }
+
+.fa-border-inner:before {
+  content: "\f84e"; }
+
+.fa-border-left:before {
+  content: "\f84f"; }
+
+.fa-border-none:before {
+  content: "\f850"; }
+
+.fa-border-outer:before {
+  content: "\f851"; }
+
+.fa-border-right:before {
+  content: "\f852"; }
+
+.fa-border-style:before {
+  content: "\f853"; }
+
+.fa-border-style-alt:before {
+  content: "\f854"; }
+
+.fa-border-top:before {
+  content: "\f855"; }
+
+.fa-bow-arrow:before {
+  content: "\f6b9"; }
+
 .fa-bowling-ball:before {
   content: "\f436"; }
 
+.fa-bowling-pins:before {
+  content: "\f437"; }
+
 .fa-box:before {
   content: "\f466"; }
 
+.fa-box-alt:before {
+  content: "\f49a"; }
+
+.fa-box-ballot:before {
+  content: "\f735"; }
+
+.fa-box-check:before {
+  content: "\f467"; }
+
+.fa-box-fragile:before {
+  content: "\f49b"; }
+
+.fa-box-full:before {
+  content: "\f49c"; }
+
+.fa-box-heart:before {
+  content: "\f49d"; }
+
 .fa-box-open:before {
   content: "\f49e"; }
 
+.fa-box-tissue:before {
+  content: "\e05b"; }
+
+.fa-box-up:before {
+  content: "\f49f"; }
+
+.fa-box-usd:before {
+  content: "\f4a0"; }
+
 .fa-boxes:before {
   content: "\f468"; }
 
+.fa-boxes-alt:before {
+  content: "\f4a1"; }
+
+.fa-boxing-glove:before {
+  content: "\f438"; }
+
+.fa-brackets:before {
+  content: "\f7e9"; }
+
+.fa-brackets-curly:before {
+  content: "\f7ea"; }
+
 .fa-braille:before {
   content: "\f2a1"; }
 
 .fa-brain:before {
   content: "\f5dc"; }
 
+.fa-bread-loaf:before {
+  content: "\f7eb"; }
+
 .fa-bread-slice:before {
   content: "\f7ec"; }
 
@@ -613,18 +1010,30 @@ readers do not read off random characters that represent icons */
 .fa-briefcase-medical:before {
   content: "\f469"; }
 
+.fa-bring-forward:before {
+  content: "\f856"; }
+
+.fa-bring-front:before {
+  content: "\f857"; }
+
 .fa-broadcast-tower:before {
   content: "\f519"; }
 
 .fa-broom:before {
   content: "\f51a"; }
 
+.fa-browser:before {
+  content: "\f37e"; }
+
 .fa-brush:before {
   content: "\f55d"; }
 
 .fa-btc:before {
   content: "\f15a"; }
 
+.fa-buffer:before {
+  content: "\f837"; }
+
 .fa-bug:before {
   content: "\f188"; }
 
@@ -637,27 +1046,54 @@ readers do not read off random characters that represent icons */
 .fa-bullseye:before {
   content: "\f140"; }
 
+.fa-bullseye-arrow:before {
+  content: "\f648"; }
+
+.fa-bullseye-pointer:before {
+  content: "\f649"; }
+
+.fa-burger-soda:before {
+  content: "\f858"; }
+
 .fa-burn:before {
   content: "\f46a"; }
 
 .fa-buromobelexperte:before {
   content: "\f37f"; }
 
+.fa-burrito:before {
+  content: "\f7ed"; }
+
 .fa-bus:before {
   content: "\f207"; }
 
 .fa-bus-alt:before {
   content: "\f55e"; }
 
+.fa-bus-school:before {
+  content: "\f5dd"; }
+
 .fa-business-time:before {
   content: "\f64a"; }
 
+.fa-buy-n-large:before {
+  content: "\f8a6"; }
+
 .fa-buysellads:before {
   content: "\f20d"; }
 
+.fa-cabinet-filing:before {
+  content: "\f64b"; }
+
+.fa-cactus:before {
+  content: "\f8a7"; }
+
 .fa-calculator:before {
   content: "\f1ec"; }
 
+.fa-calculator-alt:before {
+  content: "\f64c"; }
+
 .fa-calendar:before {
   content: "\f133"; }
 
@@ -670,33 +1106,66 @@ readers do not read off random characters that represent icons */
 .fa-calendar-day:before {
   content: "\f783"; }
 
+.fa-calendar-edit:before {
+  content: "\f333"; }
+
+.fa-calendar-exclamation:before {
+  content: "\f334"; }
+
 .fa-calendar-minus:before {
   content: "\f272"; }
 
 .fa-calendar-plus:before {
   content: "\f271"; }
 
+.fa-calendar-star:before {
+  content: "\f736"; }
+
 .fa-calendar-times:before {
   content: "\f273"; }
 
 .fa-calendar-week:before {
   content: "\f784"; }
 
+.fa-camcorder:before {
+  content: "\f8a8"; }
+
 .fa-camera:before {
   content: "\f030"; }
 
+.fa-camera-alt:before {
+  content: "\f332"; }
+
+.fa-camera-home:before {
+  content: "\f8fe"; }
+
+.fa-camera-movie:before {
+  content: "\f8a9"; }
+
+.fa-camera-polaroid:before {
+  content: "\f8aa"; }
+
 .fa-camera-retro:before {
   content: "\f083"; }
 
+.fa-campfire:before {
+  content: "\f6ba"; }
+
 .fa-campground:before {
   content: "\f6bb"; }
 
 .fa-canadian-maple-leaf:before {
   content: "\f785"; }
 
+.fa-candle-holder:before {
+  content: "\f6bc"; }
+
 .fa-candy-cane:before {
   content: "\f786"; }
 
+.fa-candy-corn:before {
+  content: "\f6bd"; }
+
 .fa-cannabis:before {
   content: "\f55f"; }
 
@@ -712,12 +1181,51 @@ readers do not read off random characters that represent icons */
 .fa-car-battery:before {
   content: "\f5df"; }
 
+.fa-car-building:before {
+  content: "\f859"; }
+
+.fa-car-bump:before {
+  content: "\f5e0"; }
+
+.fa-car-bus:before {
+  content: "\f85a"; }
+
 .fa-car-crash:before {
   content: "\f5e1"; }
 
+.fa-car-garage:before {
+  content: "\f5e2"; }
+
+.fa-car-mechanic:before {
+  content: "\f5e3"; }
+
 .fa-car-side:before {
   content: "\f5e4"; }
 
+.fa-car-tilt:before {
+  content: "\f5e5"; }
+
+.fa-car-wash:before {
+  content: "\f5e6"; }
+
+.fa-caravan:before {
+  content: "\f8ff"; }
+
+.fa-caravan-alt:before {
+  content: "\e000"; }
+
+.fa-caret-circle-down:before {
+  content: "\f32d"; }
+
+.fa-caret-circle-left:before {
+  content: "\f32e"; }
+
+.fa-caret-circle-right:before {
+  content: "\f330"; }
+
+.fa-caret-circle-up:before {
+  content: "\f331"; }
+
 .fa-caret-down:before {
   content: "\f0d7"; }
 
@@ -745,6 +1253,9 @@ readers do not read off random characters that represent icons */
 .fa-carrot:before {
   content: "\f787"; }
 
+.fa-cars:before {
+  content: "\f85b"; }
+
 .fa-cart-arrow-down:before {
   content: "\f218"; }
 
@@ -754,9 +1265,18 @@ readers do not read off random characters that represent icons */
 .fa-cash-register:before {
   content: "\f788"; }
 
+.fa-cassette-tape:before {
+  content: "\f8ab"; }
+
 .fa-cat:before {
   content: "\f6be"; }
 
+.fa-cat-space:before {
+  content: "\e001"; }
+
+.fa-cauldron:before {
+  content: "\f6bf"; }
+
 .fa-cc-amazon-pay:before {
   content: "\f42d"; }
 
@@ -787,6 +1307,9 @@ readers do not read off random characters that represent icons */
 .fa-cc-visa:before {
   content: "\f1f0"; }
 
+.fa-cctv:before {
+  content: "\f8ac"; }
+
 .fa-centercode:before {
   content: "\f380"; }
 
@@ -799,6 +1322,9 @@ readers do not read off random characters that represent icons */
 .fa-chair:before {
   content: "\f6c0"; }
 
+.fa-chair-office:before {
+  content: "\f6c1"; }
+
 .fa-chalkboard:before {
   content: "\f51b"; }
 
@@ -817,9 +1343,21 @@ readers do not read off random characters that represent icons */
 .fa-chart-line:before {
   content: "\f201"; }
 
+.fa-chart-line-down:before {
+  content: "\f64d"; }
+
+.fa-chart-network:before {
+  content: "\f78a"; }
+
 .fa-chart-pie:before {
   content: "\f200"; }
 
+.fa-chart-pie-alt:before {
+  content: "\f64e"; }
+
+.fa-chart-scatter:before {
+  content: "\f7ee"; }
+
 .fa-check:before {
   content: "\f00c"; }
 
@@ -835,30 +1373,60 @@ readers do not read off random characters that represent icons */
 .fa-cheese:before {
   content: "\f7ef"; }
 
+.fa-cheese-swiss:before {
+  content: "\f7f0"; }
+
+.fa-cheeseburger:before {
+  content: "\f7f1"; }
+
 .fa-chess:before {
   content: "\f439"; }
 
 .fa-chess-bishop:before {
   content: "\f43a"; }
 
+.fa-chess-bishop-alt:before {
+  content: "\f43b"; }
+
 .fa-chess-board:before {
   content: "\f43c"; }
 
+.fa-chess-clock:before {
+  content: "\f43d"; }
+
+.fa-chess-clock-alt:before {
+  content: "\f43e"; }
+
 .fa-chess-king:before {
   content: "\f43f"; }
 
+.fa-chess-king-alt:before {
+  content: "\f440"; }
+
 .fa-chess-knight:before {
   content: "\f441"; }
 
+.fa-chess-knight-alt:before {
+  content: "\f442"; }
+
 .fa-chess-pawn:before {
   content: "\f443"; }
 
+.fa-chess-pawn-alt:before {
+  content: "\f444"; }
+
 .fa-chess-queen:before {
   content: "\f445"; }
 
+.fa-chess-queen-alt:before {
+  content: "\f446"; }
+
 .fa-chess-rook:before {
   content: "\f447"; }
 
+.fa-chess-rook-alt:before {
+  content: "\f448"; }
+
 .fa-chevron-circle-down:before {
   content: "\f13a"; }
 
@@ -871,6 +1439,18 @@ readers do not read off random characters that represent icons */
 .fa-chevron-circle-up:before {
   content: "\f139"; }
 
+.fa-chevron-double-down:before {
+  content: "\f322"; }
+
+.fa-chevron-double-left:before {
+  content: "\f323"; }
+
+.fa-chevron-double-right:before {
+  content: "\f324"; }
+
+.fa-chevron-double-up:before {
+  content: "\f325"; }
+
 .fa-chevron-down:before {
   content: "\f078"; }
 
@@ -880,15 +1460,33 @@ readers do not read off random characters that represent icons */
 .fa-chevron-right:before {
   content: "\f054"; }
 
+.fa-chevron-square-down:before {
+  content: "\f329"; }
+
+.fa-chevron-square-left:before {
+  content: "\f32a"; }
+
+.fa-chevron-square-right:before {
+  content: "\f32b"; }
+
+.fa-chevron-square-up:before {
+  content: "\f32c"; }
+
 .fa-chevron-up:before {
   content: "\f077"; }
 
 .fa-child:before {
   content: "\f1ae"; }
 
+.fa-chimney:before {
+  content: "\f78b"; }
+
 .fa-chrome:before {
   content: "\f268"; }
 
+.fa-chromecast:before {
+  content: "\f838"; }
+
 .fa-church:before {
   content: "\f51d"; }
 
@@ -901,6 +1499,12 @@ readers do not read off random characters that represent icons */
 .fa-city:before {
   content: "\f64f"; }
 
+.fa-clarinet:before {
+  content: "\f8ad"; }
+
+.fa-claw-marks:before {
+  content: "\f6c2"; }
+
 .fa-clinic-medical:before {
   content: "\f7f2"; }
 
@@ -913,6 +1517,15 @@ readers do not read off random characters that represent icons */
 .fa-clipboard-list:before {
   content: "\f46d"; }
 
+.fa-clipboard-list-check:before {
+  content: "\f737"; }
+
+.fa-clipboard-prescription:before {
+  content: "\f5e8"; }
+
+.fa-clipboard-user:before {
+  content: "\f7f3"; }
+
 .fa-clock:before {
   content: "\f017"; }
 
@@ -925,9 +1538,21 @@ readers do not read off random characters that represent icons */
 .fa-cloud:before {
   content: "\f0c2"; }
 
+.fa-cloud-download:before {
+  content: "\f0ed"; }
+
 .fa-cloud-download-alt:before {
   content: "\f381"; }
 
+.fa-cloud-drizzle:before {
+  content: "\f738"; }
+
+.fa-cloud-hail:before {
+  content: "\f739"; }
+
+.fa-cloud-hail-mixed:before {
+  content: "\f73a"; }
+
 .fa-cloud-meatball:before {
   content: "\f73b"; }
 
@@ -937,21 +1562,51 @@ readers do not read off random characters that represent icons */
 .fa-cloud-moon-rain:before {
   content: "\f73c"; }
 
+.fa-cloud-music:before {
+  content: "\f8ae"; }
+
 .fa-cloud-rain:before {
   content: "\f73d"; }
 
+.fa-cloud-rainbow:before {
+  content: "\f73e"; }
+
+.fa-cloud-showers:before {
+  content: "\f73f"; }
+
 .fa-cloud-showers-heavy:before {
   content: "\f740"; }
 
+.fa-cloud-sleet:before {
+  content: "\f741"; }
+
+.fa-cloud-snow:before {
+  content: "\f742"; }
+
 .fa-cloud-sun:before {
   content: "\f6c4"; }
 
 .fa-cloud-sun-rain:before {
   content: "\f743"; }
 
+.fa-cloud-upload:before {
+  content: "\f0ee"; }
+
 .fa-cloud-upload-alt:before {
   content: "\f382"; }
 
+.fa-cloudflare:before {
+  content: "\e07d"; }
+
+.fa-clouds:before {
+  content: "\f744"; }
+
+.fa-clouds-moon:before {
+  content: "\f745"; }
+
+.fa-clouds-sun:before {
+  content: "\f746"; }
+
 .fa-cloudscale:before {
   content: "\f383"; }
 
@@ -961,6 +1616,9 @@ readers do not read off random characters that represent icons */
 .fa-cloudversify:before {
   content: "\f385"; }
 
+.fa-club:before {
+  content: "\f327"; }
+
 .fa-cocktail:before {
   content: "\f561"; }
 
@@ -970,6 +1628,12 @@ readers do not read off random characters that represent icons */
 .fa-code-branch:before {
   content: "\f126"; }
 
+.fa-code-commit:before {
+  content: "\f386"; }
+
+.fa-code-merge:before {
+  content: "\f387"; }
+
 .fa-codepen:before {
   content: "\f1cb"; }
 
@@ -979,39 +1643,129 @@ readers do not read off random characters that represent icons */
 .fa-coffee:before {
   content: "\f0f4"; }
 
+.fa-coffee-pot:before {
+  content: "\e002"; }
+
+.fa-coffee-togo:before {
+  content: "\f6c5"; }
+
+.fa-coffin:before {
+  content: "\f6c6"; }
+
+.fa-coffin-cross:before {
+  content: "\e051"; }
+
 .fa-cog:before {
   content: "\f013"; }
 
 .fa-cogs:before {
   content: "\f085"; }
 
+.fa-coin:before {
+  content: "\f85c"; }
+
 .fa-coins:before {
   content: "\f51e"; }
 
 .fa-columns:before {
   content: "\f0db"; }
 
+.fa-comet:before {
+  content: "\e003"; }
+
 .fa-comment:before {
   content: "\f075"; }
 
 .fa-comment-alt:before {
   content: "\f27a"; }
 
+.fa-comment-alt-check:before {
+  content: "\f4a2"; }
+
+.fa-comment-alt-dollar:before {
+  content: "\f650"; }
+
+.fa-comment-alt-dots:before {
+  content: "\f4a3"; }
+
+.fa-comment-alt-edit:before {
+  content: "\f4a4"; }
+
+.fa-comment-alt-exclamation:before {
+  content: "\f4a5"; }
+
+.fa-comment-alt-lines:before {
+  content: "\f4a6"; }
+
+.fa-comment-alt-medical:before {
+  content: "\f7f4"; }
+
+.fa-comment-alt-minus:before {
+  content: "\f4a7"; }
+
+.fa-comment-alt-music:before {
+  content: "\f8af"; }
+
+.fa-comment-alt-plus:before {
+  content: "\f4a8"; }
+
+.fa-comment-alt-slash:before {
+  content: "\f4a9"; }
+
+.fa-comment-alt-smile:before {
+  content: "\f4aa"; }
+
+.fa-comment-alt-times:before {
+  content: "\f4ab"; }
+
+.fa-comment-check:before {
+  content: "\f4ac"; }
+
 .fa-comment-dollar:before {
   content: "\f651"; }
 
 .fa-comment-dots:before {
   content: "\f4ad"; }
 
+.fa-comment-edit:before {
+  content: "\f4ae"; }
+
+.fa-comment-exclamation:before {
+  content: "\f4af"; }
+
+.fa-comment-lines:before {
+  content: "\f4b0"; }
+
 .fa-comment-medical:before {
   content: "\f7f5"; }
 
+.fa-comment-minus:before {
+  content: "\f4b1"; }
+
+.fa-comment-music:before {
+  content: "\f8b0"; }
+
+.fa-comment-plus:before {
+  content: "\f4b2"; }
+
 .fa-comment-slash:before {
   content: "\f4b3"; }
 
+.fa-comment-smile:before {
+  content: "\f4b4"; }
+
+.fa-comment-times:before {
+  content: "\f4b5"; }
+
 .fa-comments:before {
   content: "\f086"; }
 
+.fa-comments-alt:before {
+  content: "\f4b6"; }
+
+.fa-comments-alt-dollar:before {
+  content: "\f652"; }
+
 .fa-comments-dollar:before {
   content: "\f653"; }
 
@@ -1021,12 +1775,27 @@ readers do not read off random characters that represent icons */
 .fa-compass:before {
   content: "\f14e"; }
 
+.fa-compass-slash:before {
+  content: "\f5e9"; }
+
 .fa-compress:before {
   content: "\f066"; }
 
+.fa-compress-alt:before {
+  content: "\f422"; }
+
 .fa-compress-arrows-alt:before {
   content: "\f78c"; }
 
+.fa-compress-wide:before {
+  content: "\f326"; }
+
+.fa-computer-classic:before {
+  content: "\f8b1"; }
+
+.fa-computer-speaker:before {
+  content: "\f8b2"; }
+
 .fa-concierge-bell:before {
   content: "\f562"; }
 
@@ -1036,9 +1805,21 @@ readers do not read off random characters that represent icons */
 .fa-connectdevelop:before {
   content: "\f20e"; }
 
+.fa-construction:before {
+  content: "\f85d"; }
+
+.fa-container-storage:before {
+  content: "\f4b7"; }
+
 .fa-contao:before {
   content: "\f26d"; }
 
+.fa-conveyor-belt:before {
+  content: "\f46e"; }
+
+.fa-conveyor-belt-alt:before {
+  content: "\f46f"; }
+
 .fa-cookie:before {
   content: "\f563"; }
 
@@ -1051,9 +1832,24 @@ readers do not read off random characters that represent icons */
 .fa-copyright:before {
   content: "\f1f9"; }
 
+.fa-corn:before {
+  content: "\f6c7"; }
+
+.fa-cotton-bureau:before {
+  content: "\f89e"; }
+
 .fa-couch:before {
   content: "\f4b8"; }
 
+.fa-cow:before {
+  content: "\f6c8"; }
+
+.fa-cowbell:before {
+  content: "\f8b3"; }
+
+.fa-cowbell-more:before {
+  content: "\f8b4"; }
+
 .fa-cpanel:before {
   content: "\f388"; }
 
@@ -1102,9 +1898,21 @@ readers do not read off random characters that represent icons */
 .fa-credit-card:before {
   content: "\f09d"; }
 
+.fa-credit-card-blank:before {
+  content: "\f389"; }
+
+.fa-credit-card-front:before {
+  content: "\f38a"; }
+
+.fa-cricket:before {
+  content: "\f449"; }
+
 .fa-critical-role:before {
   content: "\f6c9"; }
 
+.fa-croissant:before {
+  content: "\f7f6"; }
+
 .fa-crop:before {
   content: "\f125"; }
 
@@ -1126,6 +1934,9 @@ readers do not read off random characters that represent icons */
 .fa-crutch:before {
   content: "\f7f7"; }
 
+.fa-crutches:before {
+  content: "\f7f8"; }
+
 .fa-css3:before {
   content: "\f13c"; }
 
@@ -1138,6 +1949,9 @@ readers do not read off random characters that represent icons */
 .fa-cubes:before {
   content: "\f1b3"; }
 
+.fa-curling:before {
+  content: "\f44a"; }
+
 .fa-cut:before {
   content: "\f0c4"; }
 
@@ -1150,6 +1964,12 @@ readers do not read off random characters that represent icons */
 .fa-d-and-d-beyond:before {
   content: "\f6ca"; }
 
+.fa-dagger:before {
+  content: "\f6cb"; }
+
+.fa-dailymotion:before {
+  content: "\e052"; }
+
 .fa-dashcube:before {
   content: "\f210"; }
 
@@ -1159,6 +1979,18 @@ readers do not read off random characters that represent icons */
 .fa-deaf:before {
   content: "\f2a4"; }
 
+.fa-debug:before {
+  content: "\f7f9"; }
+
+.fa-deer:before {
+  content: "\f78e"; }
+
+.fa-deer-rudolph:before {
+  content: "\f78f"; }
+
+.fa-deezer:before {
+  content: "\e077"; }
+
 .fa-delicious:before {
   content: "\f1a5"; }
 
@@ -1174,12 +2006,18 @@ readers do not read off random characters that represent icons */
 .fa-desktop:before {
   content: "\f108"; }
 
+.fa-desktop-alt:before {
+  content: "\f390"; }
+
 .fa-dev:before {
   content: "\f6cc"; }
 
 .fa-deviantart:before {
   content: "\f1bd"; }
 
+.fa-dewpoint:before {
+  content: "\f748"; }
+
 .fa-dharmachakra:before {
   content: "\f655"; }
 
@@ -1189,18 +2027,33 @@ readers do not read off random characters that represent icons */
 .fa-diagnoses:before {
   content: "\f470"; }
 
+.fa-diamond:before {
+  content: "\f219"; }
+
 .fa-diaspora:before {
   content: "\f791"; }
 
 .fa-dice:before {
   content: "\f522"; }
 
+.fa-dice-d10:before {
+  content: "\f6cd"; }
+
+.fa-dice-d12:before {
+  content: "\f6ce"; }
+
 .fa-dice-d20:before {
   content: "\f6cf"; }
 
+.fa-dice-d4:before {
+  content: "\f6d0"; }
+
 .fa-dice-d6:before {
   content: "\f6d1"; }
 
+.fa-dice-d8:before {
+  content: "\f6d2"; }
+
 .fa-dice-five:before {
   content: "\f523"; }
 
@@ -1222,21 +2075,33 @@ readers do not read off random characters that represent icons */
 .fa-digg:before {
   content: "\f1a6"; }
 
+.fa-digging:before {
+  content: "\f85e"; }
+
 .fa-digital-ocean:before {
   content: "\f391"; }
 
 .fa-digital-tachograph:before {
   content: "\f566"; }
 
+.fa-diploma:before {
+  content: "\f5ea"; }
+
 .fa-directions:before {
   content: "\f5eb"; }
 
+.fa-disc-drive:before {
+  content: "\f8b5"; }
+
 .fa-discord:before {
   content: "\f392"; }
 
 .fa-discourse:before {
   content: "\f393"; }
 
+.fa-disease:before {
+  content: "\f7fa"; }
+
 .fa-divide:before {
   content: "\f529"; }
 
@@ -1246,6 +2111,9 @@ readers do not read off random characters that represent icons */
 .fa-dna:before {
   content: "\f471"; }
 
+.fa-do-not-enter:before {
+  content: "\f5ec"; }
+
 .fa-dochub:before {
   content: "\f394"; }
 
@@ -1255,15 +2123,27 @@ readers do not read off random characters that represent icons */
 .fa-dog:before {
   content: "\f6d3"; }
 
+.fa-dog-leashed:before {
+  content: "\f6d4"; }
+
 .fa-dollar-sign:before {
   content: "\f155"; }
 
 .fa-dolly:before {
   content: "\f472"; }
 
+.fa-dolly-empty:before {
+  content: "\f473"; }
+
 .fa-dolly-flatbed:before {
   content: "\f474"; }
 
+.fa-dolly-flatbed-alt:before {
+  content: "\f475"; }
+
+.fa-dolly-flatbed-empty:before {
+  content: "\f476"; }
+
 .fa-donate:before {
   content: "\f4b9"; }
 
@@ -1291,15 +2171,30 @@ readers do not read off random characters that represent icons */
 .fa-dragon:before {
   content: "\f6d5"; }
 
+.fa-draw-circle:before {
+  content: "\f5ed"; }
+
 .fa-draw-polygon:before {
   content: "\f5ee"; }
 
+.fa-draw-square:before {
+  content: "\f5ef"; }
+
+.fa-dreidel:before {
+  content: "\f792"; }
+
 .fa-dribbble:before {
   content: "\f17d"; }
 
 .fa-dribbble-square:before {
   content: "\f397"; }
 
+.fa-drone:before {
+  content: "\f85f"; }
+
+.fa-drone-alt:before {
+  content: "\f860"; }
+
 .fa-dropbox:before {
   content: "\f16b"; }
 
@@ -1309,12 +2204,24 @@ readers do not read off random characters that represent icons */
 .fa-drum-steelpan:before {
   content: "\f56a"; }
 
+.fa-drumstick:before {
+  content: "\f6d6"; }
+
 .fa-drumstick-bite:before {
   content: "\f6d7"; }
 
 .fa-drupal:before {
   content: "\f1a9"; }
 
+.fa-dryer:before {
+  content: "\f861"; }
+
+.fa-dryer-alt:before {
+  content: "\f862"; }
+
+.fa-duck:before {
+  content: "\f6d8"; }
+
 .fa-dumbbell:before {
   content: "\f44b"; }
 
@@ -1330,33 +2237,60 @@ readers do not read off random characters that represent icons */
 .fa-dyalog:before {
   content: "\f399"; }
 
+.fa-ear:before {
+  content: "\f5f0"; }
+
+.fa-ear-muffs:before {
+  content: "\f795"; }
+
 .fa-earlybirds:before {
   content: "\f39a"; }
 
 .fa-ebay:before {
   content: "\f4f4"; }
 
+.fa-eclipse:before {
+  content: "\f749"; }
+
+.fa-eclipse-alt:before {
+  content: "\f74a"; }
+
 .fa-edge:before {
   content: "\f282"; }
 
+.fa-edge-legacy:before {
+  content: "\e078"; }
+
 .fa-edit:before {
   content: "\f044"; }
 
 .fa-egg:before {
   content: "\f7fb"; }
 
+.fa-egg-fried:before {
+  content: "\f7fc"; }
+
 .fa-eject:before {
   content: "\f052"; }
 
 .fa-elementor:before {
   content: "\f430"; }
 
+.fa-elephant:before {
+  content: "\f6da"; }
+
 .fa-ellipsis-h:before {
   content: "\f141"; }
 
+.fa-ellipsis-h-alt:before {
+  content: "\f39b"; }
+
 .fa-ellipsis-v:before {
   content: "\f142"; }
 
+.fa-ellipsis-v-alt:before {
+  content: "\f39c"; }
+
 .fa-ello:before {
   content: "\f5f1"; }
 
@@ -1366,12 +2300,21 @@ readers do not read off random characters that represent icons */
 .fa-empire:before {
   content: "\f1d1"; }
 
+.fa-empty-set:before {
+  content: "\f656"; }
+
+.fa-engine-warning:before {
+  content: "\f5f2"; }
+
 .fa-envelope:before {
   content: "\f0e0"; }
 
 .fa-envelope-open:before {
   content: "\f2b6"; }
 
+.fa-envelope-open-dollar:before {
+  content: "\f657"; }
+
 .fa-envelope-open-text:before {
   content: "\f658"; }
 
@@ -1402,6 +2345,12 @@ readers do not read off random characters that represent icons */
 .fa-euro-sign:before {
   content: "\f153"; }
 
+.fa-evernote:before {
+  content: "\f839"; }
+
+.fa-exchange:before {
+  content: "\f0ec"; }
+
 .fa-exchange-alt:before {
   content: "\f362"; }
 
@@ -1411,21 +2360,39 @@ readers do not read off random characters that represent icons */
 .fa-exclamation-circle:before {
   content: "\f06a"; }
 
+.fa-exclamation-square:before {
+  content: "\f321"; }
+
 .fa-exclamation-triangle:before {
   content: "\f071"; }
 
 .fa-expand:before {
   content: "\f065"; }
 
+.fa-expand-alt:before {
+  content: "\f424"; }
+
+.fa-expand-arrows:before {
+  content: "\f31d"; }
+
 .fa-expand-arrows-alt:before {
   content: "\f31e"; }
 
+.fa-expand-wide:before {
+  content: "\f320"; }
+
 .fa-expeditedssl:before {
   content: "\f23e"; }
 
+.fa-external-link:before {
+  content: "\f08e"; }
+
 .fa-external-link-alt:before {
   content: "\f35d"; }
 
+.fa-external-link-square:before {
+  content: "\f14c"; }
+
 .fa-external-link-square-alt:before {
   content: "\f360"; }
 
@@ -1435,6 +2402,9 @@ readers do not read off random characters that represent icons */
 .fa-eye-dropper:before {
   content: "\f1fb"; }
 
+.fa-eye-evil:before {
+  content: "\f6db"; }
+
 .fa-eye-slash:before {
   content: "\f070"; }
 
@@ -1450,15 +2420,30 @@ readers do not read off random characters that represent icons */
 .fa-facebook-square:before {
   content: "\f082"; }
 
+.fa-fan:before {
+  content: "\f863"; }
+
+.fa-fan-table:before {
+  content: "\e004"; }
+
 .fa-fantasy-flight-games:before {
   content: "\f6dc"; }
 
+.fa-farm:before {
+  content: "\f864"; }
+
 .fa-fast-backward:before {
   content: "\f049"; }
 
 .fa-fast-forward:before {
   content: "\f050"; }
 
+.fa-faucet:before {
+  content: "\e005"; }
+
+.fa-faucet-drip:before {
+  content: "\e006"; }
+
 .fa-fax:before {
   content: "\f1ac"; }
 
@@ -1477,6 +2462,9 @@ readers do not read off random characters that represent icons */
 .fa-female:before {
   content: "\f182"; }
 
+.fa-field-hockey:before {
+  content: "\f44c"; }
+
 .fa-fighter-jet:before {
   content: "\f0fb"; }
 
@@ -1495,6 +2483,18 @@ readers do not read off random characters that represent icons */
 .fa-file-audio:before {
   content: "\f1c7"; }
 
+.fa-file-certificate:before {
+  content: "\f5f3"; }
+
+.fa-file-chart-line:before {
+  content: "\f659"; }
+
+.fa-file-chart-pie:before {
+  content: "\f65a"; }
+
+.fa-file-check:before {
+  content: "\f316"; }
+
 .fa-file-code:before {
   content: "\f1c9"; }
 
@@ -1507,9 +2507,15 @@ readers do not read off random characters that represent icons */
 .fa-file-download:before {
   content: "\f56d"; }
 
+.fa-file-edit:before {
+  content: "\f31c"; }
+
 .fa-file-excel:before {
   content: "\f1c3"; }
 
+.fa-file-exclamation:before {
+  content: "\f31a"; }
+
 .fa-file-export:before {
   content: "\f56e"; }
 
@@ -1531,27 +2537,51 @@ readers do not read off random characters that represent icons */
 .fa-file-medical-alt:before {
   content: "\f478"; }
 
+.fa-file-minus:before {
+  content: "\f318"; }
+
+.fa-file-music:before {
+  content: "\f8b6"; }
+
 .fa-file-pdf:before {
   content: "\f1c1"; }
 
+.fa-file-plus:before {
+  content: "\f319"; }
+
 .fa-file-powerpoint:before {
   content: "\f1c4"; }
 
 .fa-file-prescription:before {
   content: "\f572"; }
 
+.fa-file-search:before {
+  content: "\f865"; }
+
 .fa-file-signature:before {
   content: "\f573"; }
 
+.fa-file-spreadsheet:before {
+  content: "\f65b"; }
+
+.fa-file-times:before {
+  content: "\f317"; }
+
 .fa-file-upload:before {
   content: "\f574"; }
 
+.fa-file-user:before {
+  content: "\f65c"; }
+
 .fa-file-video:before {
   content: "\f1c8"; }
 
 .fa-file-word:before {
   content: "\f1c2"; }
 
+.fa-files-medical:before {
+  content: "\f7fd"; }
+
 .fa-fill:before {
   content: "\f575"; }
 
@@ -1561,6 +2591,12 @@ readers do not read off random characters that represent icons */
 .fa-film:before {
   content: "\f008"; }
 
+.fa-film-alt:before {
+  content: "\f3a0"; }
+
+.fa-film-canister:before {
+  content: "\f8b7"; }
+
 .fa-filter:before {
   content: "\f0b0"; }
 
@@ -1576,9 +2612,18 @@ readers do not read off random characters that represent icons */
 .fa-fire-extinguisher:before {
   content: "\f134"; }
 
+.fa-fire-smoke:before {
+  content: "\f74b"; }
+
 .fa-firefox:before {
   content: "\f269"; }
 
+.fa-firefox-browser:before {
+  content: "\e007"; }
+
+.fa-fireplace:before {
+  content: "\f79a"; }
+
 .fa-first-aid:before {
   content: "\f479"; }
 
@@ -1594,36 +2639,75 @@ readers do not read off random characters that represent icons */
 .fa-fish:before {
   content: "\f578"; }
 
+.fa-fish-cooked:before {
+  content: "\f7fe"; }
+
 .fa-fist-raised:before {
   content: "\f6de"; }
 
 .fa-flag:before {
   content: "\f024"; }
 
+.fa-flag-alt:before {
+  content: "\f74c"; }
+
 .fa-flag-checkered:before {
   content: "\f11e"; }
 
 .fa-flag-usa:before {
   content: "\f74d"; }
 
+.fa-flame:before {
+  content: "\f6df"; }
+
+.fa-flashlight:before {
+  content: "\f8b8"; }
+
 .fa-flask:before {
   content: "\f0c3"; }
 
+.fa-flask-poison:before {
+  content: "\f6e0"; }
+
+.fa-flask-potion:before {
+  content: "\f6e1"; }
+
 .fa-flickr:before {
   content: "\f16e"; }
 
 .fa-flipboard:before {
   content: "\f44d"; }
 
+.fa-flower:before {
+  content: "\f7ff"; }
+
+.fa-flower-daffodil:before {
+  content: "\f800"; }
+
+.fa-flower-tulip:before {
+  content: "\f801"; }
+
 .fa-flushed:before {
   content: "\f579"; }
 
+.fa-flute:before {
+  content: "\f8b9"; }
+
+.fa-flux-capacitor:before {
+  content: "\f8ba"; }
+
 .fa-fly:before {
   content: "\f417"; }
 
+.fa-fog:before {
+  content: "\f74e"; }
+
 .fa-folder:before {
   content: "\f07b"; }
 
+.fa-folder-download:before {
+  content: "\e053"; }
+
 .fa-folder-minus:before {
   content: "\f65d"; }
 
@@ -1633,6 +2717,18 @@ readers do not read off random characters that represent icons */
 .fa-folder-plus:before {
   content: "\f65e"; }
 
+.fa-folder-times:before {
+  content: "\f65f"; }
+
+.fa-folder-tree:before {
+  content: "\f802"; }
+
+.fa-folder-upload:before {
+  content: "\e054"; }
+
+.fa-folders:before {
+  content: "\f660"; }
+
 .fa-font:before {
   content: "\f031"; }
 
@@ -1648,6 +2744,9 @@ readers do not read off random characters that represent icons */
 .fa-font-awesome-logo-full:before {
   content: "\f4e6"; }
 
+.fa-font-case:before {
+  content: "\f866"; }
+
 .fa-fonticons:before {
   content: "\f280"; }
 
@@ -1657,6 +2756,12 @@ readers do not read off random characters that represent icons */
 .fa-football-ball:before {
   content: "\f44e"; }
 
+.fa-football-helmet:before {
+  content: "\f44f"; }
+
+.fa-forklift:before {
+  content: "\f47a"; }
+
 .fa-fort-awesome:before {
   content: "\f286"; }
 
@@ -1672,15 +2777,24 @@ readers do not read off random characters that represent icons */
 .fa-foursquare:before {
   content: "\f180"; }
 
+.fa-fragile:before {
+  content: "\f4bb"; }
+
 .fa-free-code-camp:before {
   content: "\f2c5"; }
 
 .fa-freebsd:before {
   content: "\f3a4"; }
 
+.fa-french-fries:before {
+  content: "\f803"; }
+
 .fa-frog:before {
   content: "\f52e"; }
 
+.fa-frosty-head:before {
+  content: "\f79b"; }
+
 .fa-frown:before {
   content: "\f119"; }
 
@@ -1690,6 +2804,9 @@ readers do not read off random characters that represent icons */
 .fa-fulcrum:before {
   content: "\f50b"; }
 
+.fa-function:before {
+  content: "\f661"; }
+
 .fa-funnel-dollar:before {
   content: "\f662"; }
 
@@ -1702,12 +2819,39 @@ readers do not read off random characters that represent icons */
 .fa-galactic-senate:before {
   content: "\f50d"; }
 
+.fa-galaxy:before {
+  content: "\e008"; }
+
+.fa-game-board:before {
+  content: "\f867"; }
+
+.fa-game-board-alt:before {
+  content: "\f868"; }
+
+.fa-game-console-handheld:before {
+  content: "\f8bb"; }
+
 .fa-gamepad:before {
   content: "\f11b"; }
 
+.fa-gamepad-alt:before {
+  content: "\f8bc"; }
+
+.fa-garage:before {
+  content: "\e009"; }
+
+.fa-garage-car:before {
+  content: "\e00a"; }
+
+.fa-garage-open:before {
+  content: "\e00b"; }
+
 .fa-gas-pump:before {
   content: "\f52f"; }
 
+.fa-gas-pump-slash:before {
+  content: "\f5f4"; }
+
 .fa-gavel:before {
   content: "\f0e3"; }
 
@@ -1732,12 +2876,21 @@ readers do not read off random characters that represent icons */
 .fa-gift:before {
   content: "\f06b"; }
 
+.fa-gift-card:before {
+  content: "\f663"; }
+
 .fa-gifts:before {
   content: "\f79c"; }
 
+.fa-gingerbread-man:before {
+  content: "\f79d"; }
+
 .fa-git:before {
   content: "\f1d3"; }
 
+.fa-git-alt:before {
+  content: "\f841"; }
+
 .fa-git-square:before {
   content: "\f1d2"; }
 
@@ -1759,9 +2912,18 @@ readers do not read off random characters that represent icons */
 .fa-gitter:before {
   content: "\f426"; }
 
+.fa-glass:before {
+  content: "\f804"; }
+
+.fa-glass-champagne:before {
+  content: "\f79e"; }
+
 .fa-glass-cheers:before {
   content: "\f79f"; }
 
+.fa-glass-citrus:before {
+  content: "\f869"; }
+
 .fa-glass-martini:before {
   content: "\f000"; }
 
@@ -1771,9 +2933,15 @@ readers do not read off random characters that represent icons */
 .fa-glass-whiskey:before {
   content: "\f7a0"; }
 
+.fa-glass-whiskey-rocks:before {
+  content: "\f7a1"; }
+
 .fa-glasses:before {
   content: "\f530"; }
 
+.fa-glasses-alt:before {
+  content: "\f5f5"; }
+
 .fa-glide:before {
   content: "\f2a5"; }
 
@@ -1795,12 +2963,21 @@ readers do not read off random characters that represent icons */
 .fa-globe-europe:before {
   content: "\f7a2"; }
 
+.fa-globe-snow:before {
+  content: "\f7a3"; }
+
+.fa-globe-stand:before {
+  content: "\f5f6"; }
+
 .fa-gofore:before {
   content: "\f3a7"; }
 
 .fa-golf-ball:before {
   content: "\f450"; }
 
+.fa-golf-club:before {
+  content: "\f451"; }
+
 .fa-goodreads:before {
   content: "\f3a8"; }
 
@@ -1813,6 +2990,9 @@ readers do not read off random characters that represent icons */
 .fa-google-drive:before {
   content: "\f3aa"; }
 
+.fa-google-pay:before {
+  content: "\e079"; }
+
 .fa-google-play:before {
   content: "\f3ab"; }
 
@@ -1834,6 +3014,9 @@ readers do not read off random characters that represent icons */
 .fa-graduation-cap:before {
   content: "\f19d"; }
 
+.fa-gramophone:before {
+  content: "\f8bd"; }
+
 .fa-gratipay:before {
   content: "\f184"; }
 
@@ -1906,15 +3089,36 @@ readers do not read off random characters that represent icons */
 .fa-grunt:before {
   content: "\f3ad"; }
 
+.fa-guilded:before {
+  content: "\e07e"; }
+
 .fa-guitar:before {
   content: "\f7a6"; }
 
+.fa-guitar-electric:before {
+  content: "\f8be"; }
+
+.fa-guitars:before {
+  content: "\f8bf"; }
+
 .fa-gulp:before {
   content: "\f3ae"; }
 
 .fa-h-square:before {
   content: "\f0fd"; }
 
+.fa-h1:before {
+  content: "\f313"; }
+
+.fa-h2:before {
+  content: "\f314"; }
+
+.fa-h3:before {
+  content: "\f315"; }
+
+.fa-h4:before {
+  content: "\f86a"; }
+
 .fa-hacker-news:before {
   content: "\f1d4"; }
 
@@ -1930,18 +3134,39 @@ readers do not read off random characters that represent icons */
 .fa-hammer:before {
   content: "\f6e3"; }
 
+.fa-hammer-war:before {
+  content: "\f6e4"; }
+
 .fa-hamsa:before {
   content: "\f665"; }
 
+.fa-hand-heart:before {
+  content: "\f4bc"; }
+
 .fa-hand-holding:before {
   content: "\f4bd"; }
 
+.fa-hand-holding-box:before {
+  content: "\f47b"; }
+
 .fa-hand-holding-heart:before {
   content: "\f4be"; }
 
+.fa-hand-holding-magic:before {
+  content: "\f6e5"; }
+
+.fa-hand-holding-medical:before {
+  content: "\e05c"; }
+
+.fa-hand-holding-seedling:before {
+  content: "\f4bf"; }
+
 .fa-hand-holding-usd:before {
   content: "\f4c0"; }
 
+.fa-hand-holding-water:before {
+  content: "\f4c1"; }
+
 .fa-hand-lizard:before {
   content: "\f258"; }
 
@@ -1969,24 +3194,48 @@ readers do not read off random characters that represent icons */
 .fa-hand-pointer:before {
   content: "\f25a"; }
 
+.fa-hand-receiving:before {
+  content: "\f47c"; }
+
 .fa-hand-rock:before {
   content: "\f255"; }
 
 .fa-hand-scissors:before {
   content: "\f257"; }
 
+.fa-hand-sparkles:before {
+  content: "\e05d"; }
+
 .fa-hand-spock:before {
   content: "\f259"; }
 
 .fa-hands:before {
   content: "\f4c2"; }
 
+.fa-hands-heart:before {
+  content: "\f4c3"; }
+
 .fa-hands-helping:before {
   content: "\f4c4"; }
 
+.fa-hands-usd:before {
+  content: "\f4c5"; }
+
+.fa-hands-wash:before {
+  content: "\e05e"; }
+
 .fa-handshake:before {
   content: "\f2b5"; }
 
+.fa-handshake-alt:before {
+  content: "\f4c6"; }
+
+.fa-handshake-alt-slash:before {
+  content: "\e05f"; }
+
+.fa-handshake-slash:before {
+  content: "\e060"; }
+
 .fa-hanukiah:before {
   content: "\f6e6"; }
 
@@ -1996,15 +3245,57 @@ readers do not read off random characters that represent icons */
 .fa-hashtag:before {
   content: "\f292"; }
 
+.fa-hat-chef:before {
+  content: "\f86b"; }
+
+.fa-hat-cowboy:before {
+  content: "\f8c0"; }
+
+.fa-hat-cowboy-side:before {
+  content: "\f8c1"; }
+
+.fa-hat-santa:before {
+  content: "\f7a7"; }
+
+.fa-hat-winter:before {
+  content: "\f7a8"; }
+
+.fa-hat-witch:before {
+  content: "\f6e7"; }
+
 .fa-hat-wizard:before {
   content: "\f6e8"; }
 
-.fa-haykal:before {
-  content: "\f666"; }
-
 .fa-hdd:before {
   content: "\f0a0"; }
 
+.fa-head-side:before {
+  content: "\f6e9"; }
+
+.fa-head-side-brain:before {
+  content: "\f808"; }
+
+.fa-head-side-cough:before {
+  content: "\e061"; }
+
+.fa-head-side-cough-slash:before {
+  content: "\e062"; }
+
+.fa-head-side-headphones:before {
+  content: "\f8c2"; }
+
+.fa-head-side-mask:before {
+  content: "\e063"; }
+
+.fa-head-side-medical:before {
+  content: "\f809"; }
+
+.fa-head-side-virus:before {
+  content: "\e064"; }
+
+.fa-head-vr:before {
+  content: "\f6ea"; }
+
 .fa-heading:before {
   content: "\f1dc"; }
 
@@ -2023,12 +3314,30 @@ readers do not read off random characters that represent icons */
 .fa-heart-broken:before {
   content: "\f7a9"; }
 
+.fa-heart-circle:before {
+  content: "\f4c7"; }
+
+.fa-heart-rate:before {
+  content: "\f5f8"; }
+
+.fa-heart-square:before {
+  content: "\f4c8"; }
+
 .fa-heartbeat:before {
   content: "\f21e"; }
 
+.fa-heat:before {
+  content: "\e00c"; }
+
 .fa-helicopter:before {
   content: "\f533"; }
 
+.fa-helmet-battle:before {
+  content: "\f6eb"; }
+
+.fa-hexagon:before {
+  content: "\f312"; }
+
 .fa-highlighter:before {
   content: "\f591"; }
 
@@ -2047,18 +3356,45 @@ readers do not read off random characters that represent icons */
 .fa-history:before {
   content: "\f1da"; }
 
+.fa-hive:before {
+  content: "\e07f"; }
+
+.fa-hockey-mask:before {
+  content: "\f6ee"; }
+
 .fa-hockey-puck:before {
   content: "\f453"; }
 
+.fa-hockey-sticks:before {
+  content: "\f454"; }
+
 .fa-holly-berry:before {
   content: "\f7aa"; }
 
 .fa-home:before {
   content: "\f015"; }
 
+.fa-home-alt:before {
+  content: "\f80a"; }
+
+.fa-home-heart:before {
+  content: "\f4c9"; }
+
+.fa-home-lg:before {
+  content: "\f80b"; }
+
+.fa-home-lg-alt:before {
+  content: "\f80c"; }
+
+.fa-hood-cloak:before {
+  content: "\f6ef"; }
+
 .fa-hooli:before {
   content: "\f427"; }
 
+.fa-horizontal-rule:before {
+  content: "\f86c"; }
+
 .fa-hornbill:before {
   content: "\f592"; }
 
@@ -2068,6 +3404,9 @@ readers do not read off random characters that represent icons */
 .fa-horse-head:before {
   content: "\f7ab"; }
 
+.fa-horse-saddle:before {
+  content: "\f8c3"; }
+
 .fa-hospital:before {
   content: "\f0f8"; }
 
@@ -2077,6 +3416,12 @@ readers do not read off random characters that represent icons */
 .fa-hospital-symbol:before {
   content: "\f47e"; }
 
+.fa-hospital-user:before {
+  content: "\f80d"; }
+
+.fa-hospitals:before {
+  content: "\f80e"; }
+
 .fa-hot-tub:before {
   content: "\f593"; }
 
@@ -2101,9 +3446,33 @@ readers do not read off random characters that represent icons */
 .fa-hourglass-start:before {
   content: "\f251"; }
 
+.fa-house:before {
+  content: "\e00d"; }
+
 .fa-house-damage:before {
   content: "\f6f1"; }
 
+.fa-house-day:before {
+  content: "\e00e"; }
+
+.fa-house-flood:before {
+  content: "\f74f"; }
+
+.fa-house-leave:before {
+  content: "\e00f"; }
+
+.fa-house-night:before {
+  content: "\e010"; }
+
+.fa-house-return:before {
+  content: "\e011"; }
+
+.fa-house-signal:before {
+  content: "\e012"; }
+
+.fa-house-user:before {
+  content: "\e065"; }
+
 .fa-houzz:before {
   content: "\f27c"; }
 
@@ -2116,15 +3485,30 @@ readers do not read off random characters that represent icons */
 .fa-hubspot:before {
   content: "\f3b2"; }
 
+.fa-humidity:before {
+  content: "\f750"; }
+
+.fa-hurricane:before {
+  content: "\f751"; }
+
 .fa-i-cursor:before {
   content: "\f246"; }
 
 .fa-ice-cream:before {
   content: "\f810"; }
 
+.fa-ice-skate:before {
+  content: "\f7ac"; }
+
 .fa-icicles:before {
   content: "\f7ad"; }
 
+.fa-icons:before {
+  content: "\f86d"; }
+
+.fa-icons-alt:before {
+  content: "\f86e"; }
+
 .fa-id-badge:before {
   content: "\f2c1"; }
 
@@ -2134,12 +3518,18 @@ readers do not read off random characters that represent icons */
 .fa-id-card-alt:before {
   content: "\f47f"; }
 
+.fa-ideal:before {
+  content: "\e013"; }
+
 .fa-igloo:before {
   content: "\f7ae"; }
 
 .fa-image:before {
   content: "\f03e"; }
 
+.fa-image-polaroid:before {
+  content: "\f8c4"; }
+
 .fa-images:before {
   content: "\f302"; }
 
@@ -2149,12 +3539,21 @@ readers do not read off random characters that represent icons */
 .fa-inbox:before {
   content: "\f01c"; }
 
+.fa-inbox-in:before {
+  content: "\f310"; }
+
+.fa-inbox-out:before {
+  content: "\f311"; }
+
 .fa-indent:before {
   content: "\f03c"; }
 
 .fa-industry:before {
   content: "\f275"; }
 
+.fa-industry-alt:before {
+  content: "\f3b3"; }
+
 .fa-infinity:before {
   content: "\f534"; }
 
@@ -2164,30 +3563,63 @@ readers do not read off random characters that represent icons */
 .fa-info-circle:before {
   content: "\f05a"; }
 
+.fa-info-square:before {
+  content: "\f30f"; }
+
+.fa-inhaler:before {
+  content: "\f5f9"; }
+
+.fa-innosoft:before {
+  content: "\e080"; }
+
 .fa-instagram:before {
   content: "\f16d"; }
 
+.fa-instagram-square:before {
+  content: "\e055"; }
+
+.fa-instalod:before {
+  content: "\e081"; }
+
+.fa-integral:before {
+  content: "\f667"; }
+
 .fa-intercom:before {
   content: "\f7af"; }
 
 .fa-internet-explorer:before {
   content: "\f26b"; }
 
+.fa-intersection:before {
+  content: "\f668"; }
+
+.fa-inventory:before {
+  content: "\f480"; }
+
 .fa-invision:before {
   content: "\f7b0"; }
 
 .fa-ioxhost:before {
   content: "\f208"; }
 
+.fa-island-tropical:before {
+  content: "\f811"; }
+
 .fa-italic:before {
   content: "\f033"; }
 
+.fa-itch-io:before {
+  content: "\f83a"; }
+
 .fa-itunes:before {
   content: "\f3b4"; }
 
 .fa-itunes-note:before {
   content: "\f3b5"; }
 
+.fa-jack-o-lantern:before {
+  content: "\f30e"; }
+
 .fa-java:before {
   content: "\f4e4"; }
 
@@ -2215,6 +3647,9 @@ readers do not read off random characters that represent icons */
 .fa-journal-whills:before {
   content: "\f66a"; }
 
+.fa-joystick:before {
+  content: "\f8c5"; }
+
 .fa-js:before {
   content: "\f3b8"; }
 
@@ -2224,15 +3659,27 @@ readers do not read off random characters that represent icons */
 .fa-jsfiddle:before {
   content: "\f1cc"; }
 
+.fa-jug:before {
+  content: "\f8c6"; }
+
 .fa-kaaba:before {
   content: "\f66b"; }
 
 .fa-kaggle:before {
   content: "\f5fa"; }
 
+.fa-kazoo:before {
+  content: "\f8c7"; }
+
+.fa-kerning:before {
+  content: "\f86f"; }
+
 .fa-key:before {
   content: "\f084"; }
 
+.fa-key-skeleton:before {
+  content: "\f6f3"; }
+
 .fa-keybase:before {
   content: "\f4f5"; }
 
@@ -2242,6 +3689,9 @@ readers do not read off random characters that represent icons */
 .fa-keycdn:before {
   content: "\f3ba"; }
 
+.fa-keynote:before {
+  content: "\f66c"; }
+
 .fa-khanda:before {
   content: "\f66d"; }
 
@@ -2251,6 +3701,9 @@ readers do not read off random characters that represent icons */
 .fa-kickstarter-k:before {
   content: "\f3bc"; }
 
+.fa-kidneys:before {
+  content: "\f5fb"; }
+
 .fa-kiss:before {
   content: "\f596"; }
 
@@ -2260,15 +3713,36 @@ readers do not read off random characters that represent icons */
 .fa-kiss-wink-heart:before {
   content: "\f598"; }
 
+.fa-kite:before {
+  content: "\f6f4"; }
+
 .fa-kiwi-bird:before {
   content: "\f535"; }
 
+.fa-knife-kitchen:before {
+  content: "\f6f5"; }
+
 .fa-korvue:before {
   content: "\f42f"; }
 
+.fa-lambda:before {
+  content: "\f66e"; }
+
+.fa-lamp:before {
+  content: "\f4ca"; }
+
+.fa-lamp-desk:before {
+  content: "\e014"; }
+
+.fa-lamp-floor:before {
+  content: "\e015"; }
+
 .fa-landmark:before {
   content: "\f66f"; }
 
+.fa-landmark-alt:before {
+  content: "\f752"; }
+
 .fa-language:before {
   content: "\f1ab"; }
 
@@ -2278,12 +3752,18 @@ readers do not read off random characters that represent icons */
 .fa-laptop-code:before {
   content: "\f5fc"; }
 
+.fa-laptop-house:before {
+  content: "\e066"; }
+
 .fa-laptop-medical:before {
   content: "\f812"; }
 
 .fa-laravel:before {
   content: "\f3bd"; }
 
+.fa-lasso:before {
+  content: "\f8c8"; }
+
 .fa-lastfm:before {
   content: "\f202"; }
 
@@ -2305,9 +3785,24 @@ readers do not read off random characters that represent icons */
 .fa-layer-group:before {
   content: "\f5fd"; }
 
+.fa-layer-minus:before {
+  content: "\f5fe"; }
+
+.fa-layer-plus:before {
+  content: "\f5ff"; }
+
 .fa-leaf:before {
   content: "\f06c"; }
 
+.fa-leaf-heart:before {
+  content: "\f4cb"; }
+
+.fa-leaf-maple:before {
+  content: "\f6f6"; }
+
+.fa-leaf-oak:before {
+  content: "\f6f7"; }
+
 .fa-leanpub:before {
   content: "\f212"; }
 
@@ -2323,21 +3818,60 @@ readers do not read off random characters that represent icons */
 .fa-less-than-equal:before {
   content: "\f537"; }
 
+.fa-level-down:before {
+  content: "\f149"; }
+
 .fa-level-down-alt:before {
   content: "\f3be"; }
 
+.fa-level-up:before {
+  content: "\f148"; }
+
 .fa-level-up-alt:before {
   content: "\f3bf"; }
 
 .fa-life-ring:before {
   content: "\f1cd"; }
 
+.fa-light-ceiling:before {
+  content: "\e016"; }
+
+.fa-light-switch:before {
+  content: "\e017"; }
+
+.fa-light-switch-off:before {
+  content: "\e018"; }
+
+.fa-light-switch-on:before {
+  content: "\e019"; }
+
 .fa-lightbulb:before {
   content: "\f0eb"; }
 
+.fa-lightbulb-dollar:before {
+  content: "\f670"; }
+
+.fa-lightbulb-exclamation:before {
+  content: "\f671"; }
+
+.fa-lightbulb-on:before {
+  content: "\f672"; }
+
+.fa-lightbulb-slash:before {
+  content: "\f673"; }
+
+.fa-lights-holiday:before {
+  content: "\f7b2"; }
+
 .fa-line:before {
   content: "\f3c0"; }
 
+.fa-line-columns:before {
+  content: "\f870"; }
+
+.fa-line-height:before {
+  content: "\f871"; }
+
 .fa-link:before {
   content: "\f0c1"; }
 
@@ -2353,6 +3887,9 @@ readers do not read off random characters that represent icons */
 .fa-linux:before {
   content: "\f17c"; }
 
+.fa-lips:before {
+  content: "\f600"; }
+
 .fa-lira-sign:before {
   content: "\f195"; }
 
@@ -2362,21 +3899,39 @@ readers do not read off random characters that represent icons */
 .fa-list-alt:before {
   content: "\f022"; }
 
+.fa-list-music:before {
+  content: "\f8c9"; }
+
 .fa-list-ol:before {
   content: "\f0cb"; }
 
 .fa-list-ul:before {
   content: "\f0ca"; }
 
+.fa-location:before {
+  content: "\f601"; }
+
 .fa-location-arrow:before {
   content: "\f124"; }
 
+.fa-location-circle:before {
+  content: "\f602"; }
+
+.fa-location-slash:before {
+  content: "\f603"; }
+
 .fa-lock:before {
   content: "\f023"; }
 
+.fa-lock-alt:before {
+  content: "\f30d"; }
+
 .fa-lock-open:before {
   content: "\f3c1"; }
 
+.fa-lock-open-alt:before {
+  content: "\f3c2"; }
+
 .fa-long-arrow-alt-down:before {
   content: "\f309"; }
 
@@ -2389,15 +3944,42 @@ readers do not read off random characters that represent icons */
 .fa-long-arrow-alt-up:before {
   content: "\f30c"; }
 
+.fa-long-arrow-down:before {
+  content: "\f175"; }
+
+.fa-long-arrow-left:before {
+  content: "\f177"; }
+
+.fa-long-arrow-right:before {
+  content: "\f178"; }
+
+.fa-long-arrow-up:before {
+  content: "\f176"; }
+
+.fa-loveseat:before {
+  content: "\f4cc"; }
+
 .fa-low-vision:before {
   content: "\f2a8"; }
 
+.fa-luchador:before {
+  content: "\f455"; }
+
 .fa-luggage-cart:before {
   content: "\f59d"; }
 
+.fa-lungs:before {
+  content: "\f604"; }
+
+.fa-lungs-virus:before {
+  content: "\e067"; }
+
 .fa-lyft:before {
   content: "\f3c3"; }
 
+.fa-mace:before {
+  content: "\f6f8"; }
+
 .fa-magento:before {
   content: "\f3c4"; }
 
@@ -2410,6 +3992,9 @@ readers do not read off random characters that represent icons */
 .fa-mail-bulk:before {
   content: "\f674"; }
 
+.fa-mailbox:before {
+  content: "\f813"; }
+
 .fa-mailchimp:before {
   content: "\f59e"; }
 
@@ -2419,6 +4004,9 @@ readers do not read off random characters that represent icons */
 .fa-mandalorian:before {
   content: "\f50f"; }
 
+.fa-mandolin:before {
+  content: "\f6f9"; }
+
 .fa-map:before {
   content: "\f279"; }
 
@@ -2434,6 +4022,36 @@ readers do not read off random characters that represent icons */
 .fa-map-marker-alt:before {
   content: "\f3c5"; }
 
+.fa-map-marker-alt-slash:before {
+  content: "\f605"; }
+
+.fa-map-marker-check:before {
+  content: "\f606"; }
+
+.fa-map-marker-edit:before {
+  content: "\f607"; }
+
+.fa-map-marker-exclamation:before {
+  content: "\f608"; }
+
+.fa-map-marker-minus:before {
+  content: "\f609"; }
+
+.fa-map-marker-plus:before {
+  content: "\f60a"; }
+
+.fa-map-marker-question:before {
+  content: "\f60b"; }
+
+.fa-map-marker-slash:before {
+  content: "\f60c"; }
+
+.fa-map-marker-smile:before {
+  content: "\f60d"; }
+
+.fa-map-marker-times:before {
+  content: "\f60e"; }
+
 .fa-map-pin:before {
   content: "\f276"; }
 
@@ -2470,6 +4088,12 @@ readers do not read off random characters that represent icons */
 .fa-maxcdn:before {
   content: "\f136"; }
 
+.fa-mdb:before {
+  content: "\f8ca"; }
+
+.fa-meat:before {
+  content: "\f814"; }
+
 .fa-medal:before {
   content: "\f5a2"; }
 
@@ -2491,6 +4115,9 @@ readers do not read off random characters that represent icons */
 .fa-meetup:before {
   content: "\f2e0"; }
 
+.fa-megaphone:before {
+  content: "\f675"; }
+
 .fa-megaport:before {
   content: "\f5a3"; }
 
@@ -2518,6 +4145,9 @@ readers do not read off random characters that represent icons */
 .fa-meteor:before {
   content: "\f753"; }
 
+.fa-microblog:before {
+  content: "\e01a"; }
+
 .fa-microchip:before {
   content: "\f2db"; }
 
@@ -2533,21 +4163,39 @@ readers do not read off random characters that represent icons */
 .fa-microphone-slash:before {
   content: "\f131"; }
 
+.fa-microphone-stand:before {
+  content: "\f8cb"; }
+
 .fa-microscope:before {
   content: "\f610"; }
 
 .fa-microsoft:before {
   content: "\f3ca"; }
 
+.fa-microwave:before {
+  content: "\e01b"; }
+
+.fa-mind-share:before {
+  content: "\f677"; }
+
 .fa-minus:before {
   content: "\f068"; }
 
 .fa-minus-circle:before {
   content: "\f056"; }
 
+.fa-minus-hexagon:before {
+  content: "\f307"; }
+
+.fa-minus-octagon:before {
+  content: "\f308"; }
+
 .fa-minus-square:before {
   content: "\f146"; }
 
+.fa-mistletoe:before {
+  content: "\f7b4"; }
+
 .fa-mitten:before {
   content: "\f7b5"; }
 
@@ -2557,6 +4205,9 @@ readers do not read off random characters that represent icons */
 .fa-mixcloud:before {
   content: "\f289"; }
 
+.fa-mixer:before {
+  content: "\e056"; }
+
 .fa-mizuni:before {
   content: "\f3cc"; }
 
@@ -2566,6 +4217,12 @@ readers do not read off random characters that represent icons */
 .fa-mobile-alt:before {
   content: "\f3cd"; }
 
+.fa-mobile-android:before {
+  content: "\f3ce"; }
+
+.fa-mobile-android-alt:before {
+  content: "\f3cf"; }
+
 .fa-modx:before {
   content: "\f285"; }
 
@@ -2590,12 +4247,30 @@ readers do not read off random characters that represent icons */
 .fa-money-check-alt:before {
   content: "\f53d"; }
 
+.fa-money-check-edit:before {
+  content: "\f872"; }
+
+.fa-money-check-edit-alt:before {
+  content: "\f873"; }
+
+.fa-monitor-heart-rate:before {
+  content: "\f611"; }
+
+.fa-monkey:before {
+  content: "\f6fb"; }
+
 .fa-monument:before {
   content: "\f5a6"; }
 
 .fa-moon:before {
   content: "\f186"; }
 
+.fa-moon-cloud:before {
+  content: "\f754"; }
+
+.fa-moon-stars:before {
+  content: "\f755"; }
+
 .fa-mortar-pestle:before {
   content: "\f5a7"; }
 
@@ -2608,18 +4283,51 @@ readers do not read off random characters that represent icons */
 .fa-mountain:before {
   content: "\f6fc"; }
 
+.fa-mountains:before {
+  content: "\f6fd"; }
+
+.fa-mouse:before {
+  content: "\f8cc"; }
+
+.fa-mouse-alt:before {
+  content: "\f8cd"; }
+
 .fa-mouse-pointer:before {
   content: "\f245"; }
 
+.fa-mp3-player:before {
+  content: "\f8ce"; }
+
+.fa-mug:before {
+  content: "\f874"; }
+
 .fa-mug-hot:before {
   content: "\f7b6"; }
 
+.fa-mug-marshmallows:before {
+  content: "\f7b7"; }
+
+.fa-mug-tea:before {
+  content: "\f875"; }
+
 .fa-music:before {
   content: "\f001"; }
 
+.fa-music-alt:before {
+  content: "\f8cf"; }
+
+.fa-music-alt-slash:before {
+  content: "\f8d0"; }
+
+.fa-music-slash:before {
+  content: "\f8d1"; }
+
 .fa-napster:before {
   content: "\f3d2"; }
 
+.fa-narwhal:before {
+  content: "\f6fe"; }
+
 .fa-neos:before {
   content: "\f612"; }
 
@@ -2635,9 +4343,6 @@ readers do not read off random characters that represent icons */
 .fa-nimblr:before {
   content: "\f5a8"; }
 
-.fa-nintendo-switch:before {
-  content: "\f418"; }
-
 .fa-node:before {
   content: "\f419"; }
 
@@ -2665,6 +4370,12 @@ readers do not read off random characters that represent icons */
 .fa-object-ungroup:before {
   content: "\f248"; }
 
+.fa-octagon:before {
+  content: "\f306"; }
+
+.fa-octopus-deploy:before {
+  content: "\e082"; }
+
 .fa-odnoklassniki:before {
   content: "\f263"; }
 
@@ -2674,12 +4385,18 @@ readers do not read off random characters that represent icons */
 .fa-oil-can:before {
   content: "\f613"; }
 
+.fa-oil-temp:before {
+  content: "\f614"; }
+
 .fa-old-republic:before {
   content: "\f510"; }
 
 .fa-om:before {
   content: "\f679"; }
 
+.fa-omega:before {
+  content: "\f67a"; }
+
 .fa-opencart:before {
   content: "\f23d"; }
 
@@ -2692,6 +4409,12 @@ readers do not read off random characters that represent icons */
 .fa-optin-monster:before {
   content: "\f23c"; }
 
+.fa-orcid:before {
+  content: "\f8d2"; }
+
+.fa-ornament:before {
+  content: "\f7b8"; }
+
 .fa-osi:before {
   content: "\f41a"; }
 
@@ -2701,6 +4424,18 @@ readers do not read off random characters that represent icons */
 .fa-outdent:before {
   content: "\f03b"; }
 
+.fa-outlet:before {
+  content: "\e01c"; }
+
+.fa-oven:before {
+  content: "\e01d"; }
+
+.fa-overline:before {
+  content: "\f876"; }
+
+.fa-page-break:before {
+  content: "\f877"; }
+
 .fa-page4:before {
   content: "\f3d7"; }
 
@@ -2713,6 +4448,9 @@ readers do not read off random characters that represent icons */
 .fa-paint-brush:before {
   content: "\f1fc"; }
 
+.fa-paint-brush-alt:before {
+  content: "\f5a9"; }
+
 .fa-paint-roller:before {
   content: "\f5aa"; }
 
@@ -2725,6 +4463,9 @@ readers do not read off random characters that represent icons */
 .fa-pallet:before {
   content: "\f482"; }
 
+.fa-pallet-alt:before {
+  content: "\f483"; }
+
 .fa-paper-plane:before {
   content: "\f1d8"; }
 
@@ -2737,9 +4478,21 @@ readers do not read off random characters that represent icons */
 .fa-paragraph:before {
   content: "\f1dd"; }
 
+.fa-paragraph-rtl:before {
+  content: "\f878"; }
+
 .fa-parking:before {
   content: "\f540"; }
 
+.fa-parking-circle:before {
+  content: "\f615"; }
+
+.fa-parking-circle-slash:before {
+  content: "\f616"; }
+
+.fa-parking-slash:before {
+  content: "\f617"; }
+
 .fa-passport:before {
   content: "\f5ab"; }
 
@@ -2761,12 +4514,21 @@ readers do not read off random characters that represent icons */
 .fa-paw:before {
   content: "\f1b0"; }
 
+.fa-paw-alt:before {
+  content: "\f701"; }
+
+.fa-paw-claws:before {
+  content: "\f702"; }
+
 .fa-paypal:before {
   content: "\f1ed"; }
 
 .fa-peace:before {
   content: "\f67c"; }
 
+.fa-pegasus:before {
+  content: "\f703"; }
+
 .fa-pen:before {
   content: "\f304"; }
 
@@ -2782,21 +4544,36 @@ readers do not read off random characters that represent icons */
 .fa-pen-square:before {
   content: "\f14b"; }
 
+.fa-pencil:before {
+  content: "\f040"; }
+
 .fa-pencil-alt:before {
   content: "\f303"; }
 
+.fa-pencil-paintbrush:before {
+  content: "\f618"; }
+
 .fa-pencil-ruler:before {
   content: "\f5ae"; }
 
+.fa-pennant:before {
+  content: "\f456"; }
+
 .fa-penny-arcade:before {
   content: "\f704"; }
 
+.fa-people-arrows:before {
+  content: "\e068"; }
+
 .fa-people-carry:before {
   content: "\f4ce"; }
 
 .fa-pepper-hot:before {
   content: "\f816"; }
 
+.fa-perbyte:before {
+  content: "\e083"; }
+
 .fa-percent:before {
   content: "\f295"; }
 
@@ -2809,6 +4586,18 @@ readers do not read off random characters that represent icons */
 .fa-person-booth:before {
   content: "\f756"; }
 
+.fa-person-carry:before {
+  content: "\f4cf"; }
+
+.fa-person-dolly:before {
+  content: "\f4d0"; }
+
+.fa-person-dolly-empty:before {
+  content: "\f4d1"; }
+
+.fa-person-sign:before {
+  content: "\f757"; }
+
 .fa-phabricator:before {
   content: "\f3db"; }
 
@@ -2821,18 +4610,51 @@ readers do not read off random characters that represent icons */
 .fa-phone:before {
   content: "\f095"; }
 
+.fa-phone-alt:before {
+  content: "\f879"; }
+
+.fa-phone-laptop:before {
+  content: "\f87a"; }
+
+.fa-phone-office:before {
+  content: "\f67d"; }
+
+.fa-phone-plus:before {
+  content: "\f4d2"; }
+
+.fa-phone-rotary:before {
+  content: "\f8d3"; }
+
 .fa-phone-slash:before {
   content: "\f3dd"; }
 
 .fa-phone-square:before {
   content: "\f098"; }
 
+.fa-phone-square-alt:before {
+  content: "\f87b"; }
+
 .fa-phone-volume:before {
   content: "\f2a0"; }
 
+.fa-photo-video:before {
+  content: "\f87c"; }
+
 .fa-php:before {
   content: "\f457"; }
 
+.fa-pi:before {
+  content: "\f67e"; }
+
+.fa-piano:before {
+  content: "\f8d4"; }
+
+.fa-piano-keyboard:before {
+  content: "\f8d5"; }
+
+.fa-pie:before {
+  content: "\f705"; }
+
 .fa-pied-piper:before {
   content: "\f2ae"; }
 
@@ -2845,6 +4667,12 @@ readers do not read off random characters that represent icons */
 .fa-pied-piper-pp:before {
   content: "\f1a7"; }
 
+.fa-pied-piper-square:before {
+  content: "\e01e"; }
+
+.fa-pig:before {
+  content: "\f706"; }
+
 .fa-piggy-bank:before {
   content: "\f4d3"; }
 
@@ -2860,6 +4688,9 @@ readers do not read off random characters that represent icons */
 .fa-pinterest-square:before {
   content: "\f0d3"; }
 
+.fa-pizza:before {
+  content: "\f817"; }
+
 .fa-pizza-slice:before {
   content: "\f818"; }
 
@@ -2869,12 +4700,24 @@ readers do not read off random characters that represent icons */
 .fa-plane:before {
   content: "\f072"; }
 
+.fa-plane-alt:before {
+  content: "\f3de"; }
+
 .fa-plane-arrival:before {
   content: "\f5af"; }
 
 .fa-plane-departure:before {
   content: "\f5b0"; }
 
+.fa-plane-slash:before {
+  content: "\e069"; }
+
+.fa-planet-moon:before {
+  content: "\e01f"; }
+
+.fa-planet-ringed:before {
+  content: "\e020"; }
+
 .fa-play:before {
   content: "\f04b"; }
 
@@ -2893,18 +4736,36 @@ readers do not read off random characters that represent icons */
 .fa-plus-circle:before {
   content: "\f055"; }
 
+.fa-plus-hexagon:before {
+  content: "\f300"; }
+
+.fa-plus-octagon:before {
+  content: "\f301"; }
+
 .fa-plus-square:before {
   content: "\f0fe"; }
 
 .fa-podcast:before {
   content: "\f2ce"; }
 
+.fa-podium:before {
+  content: "\f680"; }
+
+.fa-podium-star:before {
+  content: "\f758"; }
+
+.fa-police-box:before {
+  content: "\e021"; }
+
 .fa-poll:before {
   content: "\f681"; }
 
 .fa-poll-h:before {
   content: "\f682"; }
 
+.fa-poll-people:before {
+  content: "\f759"; }
+
 .fa-poo:before {
   content: "\f2fe"; }
 
@@ -2914,6 +4775,15 @@ readers do not read off random characters that represent icons */
 .fa-poop:before {
   content: "\f619"; }
 
+.fa-popcorn:before {
+  content: "\f819"; }
+
+.fa-portal-enter:before {
+  content: "\e022"; }
+
+.fa-portal-exit:before {
+  content: "\e023"; }
+
 .fa-portrait:before {
   content: "\f3e0"; }
 
@@ -2938,9 +4808,18 @@ readers do not read off random characters that represent icons */
 .fa-prescription-bottle-alt:before {
   content: "\f486"; }
 
+.fa-presentation:before {
+  content: "\f685"; }
+
 .fa-print:before {
   content: "\f02f"; }
 
+.fa-print-search:before {
+  content: "\f81a"; }
+
+.fa-print-slash:before {
+  content: "\f686"; }
+
 .fa-procedures:before {
   content: "\f487"; }
 
@@ -2950,6 +4829,18 @@ readers do not read off random characters that represent icons */
 .fa-project-diagram:before {
   content: "\f542"; }
 
+.fa-projector:before {
+  content: "\f8d6"; }
+
+.fa-pump-medical:before {
+  content: "\e06a"; }
+
+.fa-pump-soap:before {
+  content: "\e06b"; }
+
+.fa-pumpkin:before {
+  content: "\f707"; }
+
 .fa-pushed:before {
   content: "\f3e1"; }
 
@@ -2971,6 +4862,9 @@ readers do not read off random characters that represent icons */
 .fa-question-circle:before {
   content: "\f059"; }
 
+.fa-question-square:before {
+  content: "\f2fd"; }
+
 .fa-quidditch:before {
   content: "\f458"; }
 
@@ -2992,15 +4886,42 @@ readers do not read off random characters that represent icons */
 .fa-r-project:before {
   content: "\f4f7"; }
 
+.fa-rabbit:before {
+  content: "\f708"; }
+
+.fa-rabbit-fast:before {
+  content: "\f709"; }
+
+.fa-racquet:before {
+  content: "\f45a"; }
+
+.fa-radar:before {
+  content: "\e024"; }
+
 .fa-radiation:before {
   content: "\f7b9"; }
 
 .fa-radiation-alt:before {
   content: "\f7ba"; }
 
+.fa-radio:before {
+  content: "\f8d7"; }
+
+.fa-radio-alt:before {
+  content: "\f8d8"; }
+
 .fa-rainbow:before {
   content: "\f75b"; }
 
+.fa-raindrops:before {
+  content: "\f75c"; }
+
+.fa-ram:before {
+  content: "\f70a"; }
+
+.fa-ramp-loading:before {
+  content: "\f4d4"; }
+
 .fa-random:before {
   content: "\f074"; }
 
@@ -3010,6 +4931,9 @@ readers do not read off random characters that represent icons */
 .fa-ravelry:before {
   content: "\f2d9"; }
 
+.fa-raygun:before {
+  content: "\e025"; }
+
 .fa-react:before {
   content: "\f41b"; }
 
@@ -3025,6 +4949,18 @@ readers do not read off random characters that represent icons */
 .fa-receipt:before {
   content: "\f543"; }
 
+.fa-record-vinyl:before {
+  content: "\f8d9"; }
+
+.fa-rectangle-landscape:before {
+  content: "\f2fa"; }
+
+.fa-rectangle-portrait:before {
+  content: "\f2fb"; }
+
+.fa-rectangle-wide:before {
+  content: "\f2fc"; }
+
 .fa-recycle:before {
   content: "\f1b8"; }
 
@@ -3049,12 +4985,30 @@ readers do not read off random characters that represent icons */
 .fa-redo-alt:before {
   content: "\f2f9"; }
 
+.fa-refrigerator:before {
+  content: "\e026"; }
+
 .fa-registered:before {
   content: "\f25d"; }
 
+.fa-remove-format:before {
+  content: "\f87d"; }
+
 .fa-renren:before {
   content: "\f18b"; }
 
+.fa-repeat:before {
+  content: "\f363"; }
+
+.fa-repeat-1:before {
+  content: "\f365"; }
+
+.fa-repeat-1-alt:before {
+  content: "\f366"; }
+
+.fa-repeat-alt:before {
+  content: "\f364"; }
+
 .fa-reply:before {
   content: "\f3e5"; }
 
@@ -3079,6 +5033,9 @@ readers do not read off random characters that represent icons */
 .fa-retweet:before {
   content: "\f079"; }
 
+.fa-retweet-alt:before {
+  content: "\f361"; }
+
 .fa-rev:before {
   content: "\f5b2"; }
 
@@ -3088,6 +5045,9 @@ readers do not read off random characters that represent icons */
 .fa-ring:before {
   content: "\f70b"; }
 
+.fa-rings-wedding:before {
+  content: "\f81b"; }
+
 .fa-road:before {
   content: "\f018"; }
 
@@ -3097,6 +5057,9 @@ readers do not read off random characters that represent icons */
 .fa-rocket:before {
   content: "\f135"; }
 
+.fa-rocket-launch:before {
+  content: "\e027"; }
+
 .fa-rocketchat:before {
   content: "\f3e8"; }
 
@@ -3106,6 +5069,15 @@ readers do not read off random characters that represent icons */
 .fa-route:before {
   content: "\f4d7"; }
 
+.fa-route-highway:before {
+  content: "\f61a"; }
+
+.fa-route-interstate:before {
+  content: "\f61b"; }
+
+.fa-router:before {
+  content: "\f8da"; }
+
 .fa-rss:before {
   content: "\f09e"; }
 
@@ -3124,6 +5096,9 @@ readers do not read off random characters that represent icons */
 .fa-ruler-horizontal:before {
   content: "\f547"; }
 
+.fa-ruler-triangle:before {
+  content: "\f61c"; }
+
 .fa-ruler-vertical:before {
   content: "\f548"; }
 
@@ -3133,6 +5108,18 @@ readers do not read off random characters that represent icons */
 .fa-rupee-sign:before {
   content: "\f156"; }
 
+.fa-rust:before {
+  content: "\e07a"; }
+
+.fa-rv:before {
+  content: "\f7be"; }
+
+.fa-sack:before {
+  content: "\f81c"; }
+
+.fa-sack-dollar:before {
+  content: "\f81d"; }
+
 .fa-sad-cry:before {
   content: "\f5b3"; }
 
@@ -3142,6 +5129,15 @@ readers do not read off random characters that represent icons */
 .fa-safari:before {
   content: "\f267"; }
 
+.fa-salad:before {
+  content: "\f81e"; }
+
+.fa-salesforce:before {
+  content: "\f83b"; }
+
+.fa-sandwich:before {
+  content: "\f81f"; }
+
 .fa-sass:before {
   content: "\f41e"; }
 
@@ -3151,9 +5147,42 @@ readers do not read off random characters that represent icons */
 .fa-satellite-dish:before {
   content: "\f7c0"; }
 
+.fa-sausage:before {
+  content: "\f820"; }
+
 .fa-save:before {
   content: "\f0c7"; }
 
+.fa-sax-hot:before {
+  content: "\f8db"; }
+
+.fa-saxophone:before {
+  content: "\f8dc"; }
+
+.fa-scalpel:before {
+  content: "\f61d"; }
+
+.fa-scalpel-path:before {
+  content: "\f61e"; }
+
+.fa-scanner:before {
+  content: "\f488"; }
+
+.fa-scanner-image:before {
+  content: "\f8f3"; }
+
+.fa-scanner-keyboard:before {
+  content: "\f489"; }
+
+.fa-scanner-touchscreen:before {
+  content: "\f48a"; }
+
+.fa-scarecrow:before {
+  content: "\f70d"; }
+
+.fa-scarf:before {
+  content: "\f7c1"; }
+
 .fa-schlix:before {
   content: "\f3ea"; }
 
@@ -3169,6 +5198,15 @@ readers do not read off random characters that represent icons */
 .fa-scroll:before {
   content: "\f70e"; }
 
+.fa-scroll-old:before {
+  content: "\f70f"; }
+
+.fa-scrubber:before {
+  content: "\f2f8"; }
+
+.fa-scythe:before {
+  content: "\f710"; }
+
 .fa-sd-card:before {
   content: "\f7c2"; }
 
@@ -3199,6 +5237,27 @@ readers do not read off random characters that represent icons */
 .fa-sellsy:before {
   content: "\f213"; }
 
+.fa-send-back:before {
+  content: "\f87e"; }
+
+.fa-send-backward:before {
+  content: "\f87f"; }
+
+.fa-sensor:before {
+  content: "\e028"; }
+
+.fa-sensor-alert:before {
+  content: "\e029"; }
+
+.fa-sensor-fire:before {
+  content: "\e02a"; }
+
+.fa-sensor-on:before {
+  content: "\e02b"; }
+
+.fa-sensor-smoke:before {
+  content: "\e02c"; }
+
 .fa-server:before {
   content: "\f233"; }
 
@@ -3211,6 +5270,9 @@ readers do not read off random characters that represent icons */
 .fa-share:before {
   content: "\f064"; }
 
+.fa-share-all:before {
+  content: "\f367"; }
+
 .fa-share-alt:before {
   content: "\f1e0"; }
 
@@ -3220,24 +5282,48 @@ readers do not read off random characters that represent icons */
 .fa-share-square:before {
   content: "\f14d"; }
 
+.fa-sheep:before {
+  content: "\f711"; }
+
 .fa-shekel-sign:before {
   content: "\f20b"; }
 
+.fa-shield:before {
+  content: "\f132"; }
+
 .fa-shield-alt:before {
   content: "\f3ed"; }
 
+.fa-shield-check:before {
+  content: "\f2f7"; }
+
+.fa-shield-cross:before {
+  content: "\f712"; }
+
+.fa-shield-virus:before {
+  content: "\e06c"; }
+
 .fa-ship:before {
   content: "\f21a"; }
 
 .fa-shipping-fast:before {
   content: "\f48b"; }
 
+.fa-shipping-timed:before {
+  content: "\f48c"; }
+
 .fa-shirtsinbulk:before {
   content: "\f214"; }
 
+.fa-shish-kebab:before {
+  content: "\f821"; }
+
 .fa-shoe-prints:before {
   content: "\f54b"; }
 
+.fa-shopify:before {
+  content: "\e057"; }
+
 .fa-shopping-bag:before {
   content: "\f290"; }
 
@@ -3250,27 +5336,84 @@ readers do not read off random characters that represent icons */
 .fa-shopware:before {
   content: "\f5b5"; }
 
+.fa-shovel:before {
+  content: "\f713"; }
+
+.fa-shovel-snow:before {
+  content: "\f7c3"; }
+
 .fa-shower:before {
   content: "\f2cc"; }
 
+.fa-shredder:before {
+  content: "\f68a"; }
+
 .fa-shuttle-van:before {
   content: "\f5b6"; }
 
+.fa-shuttlecock:before {
+  content: "\f45b"; }
+
+.fa-sickle:before {
+  content: "\f822"; }
+
+.fa-sigma:before {
+  content: "\f68b"; }
+
 .fa-sign:before {
   content: "\f4d9"; }
 
+.fa-sign-in:before {
+  content: "\f090"; }
+
 .fa-sign-in-alt:before {
   content: "\f2f6"; }
 
 .fa-sign-language:before {
   content: "\f2a7"; }
 
+.fa-sign-out:before {
+  content: "\f08b"; }
+
 .fa-sign-out-alt:before {
   content: "\f2f5"; }
 
 .fa-signal:before {
   content: "\f012"; }
 
+.fa-signal-1:before {
+  content: "\f68c"; }
+
+.fa-signal-2:before {
+  content: "\f68d"; }
+
+.fa-signal-3:before {
+  content: "\f68e"; }
+
+.fa-signal-4:before {
+  content: "\f68f"; }
+
+.fa-signal-alt:before {
+  content: "\f690"; }
+
+.fa-signal-alt-1:before {
+  content: "\f691"; }
+
+.fa-signal-alt-2:before {
+  content: "\f692"; }
+
+.fa-signal-alt-3:before {
+  content: "\f693"; }
+
+.fa-signal-alt-slash:before {
+  content: "\f694"; }
+
+.fa-signal-slash:before {
+  content: "\f695"; }
+
+.fa-signal-stream:before {
+  content: "\f8dd"; }
+
 .fa-signature:before {
   content: "\f5b7"; }
 
@@ -3280,6 +5423,15 @@ readers do not read off random characters that represent icons */
 .fa-simplybuilt:before {
   content: "\f215"; }
 
+.fa-sink:before {
+  content: "\e06d"; }
+
+.fa-siren:before {
+  content: "\e02d"; }
+
+.fa-siren-on:before {
+  content: "\e02e"; }
+
 .fa-sistrix:before {
   content: "\f3ee"; }
 
@@ -3292,9 +5444,18 @@ readers do not read off random characters that represent icons */
 .fa-skating:before {
   content: "\f7c5"; }
 
+.fa-skeleton:before {
+  content: "\f620"; }
+
 .fa-sketch:before {
   content: "\f7c6"; }
 
+.fa-ski-jump:before {
+  content: "\f7c7"; }
+
+.fa-ski-lift:before {
+  content: "\f7c8"; }
+
 .fa-skiing:before {
   content: "\f7c9"; }
 
@@ -3304,6 +5465,9 @@ readers do not read off random characters that represent icons */
 .fa-skull:before {
   content: "\f54c"; }
 
+.fa-skull-cow:before {
+  content: "\f8de"; }
+
 .fa-skull-crossbones:before {
   content: "\f714"; }
 
@@ -3322,12 +5486,24 @@ readers do not read off random characters that represent icons */
 .fa-slash:before {
   content: "\f715"; }
 
+.fa-sledding:before {
+  content: "\f7cb"; }
+
 .fa-sleigh:before {
   content: "\f7cc"; }
 
 .fa-sliders-h:before {
   content: "\f1de"; }
 
+.fa-sliders-h-square:before {
+  content: "\f3f0"; }
+
+.fa-sliders-v:before {
+  content: "\f3f1"; }
+
+.fa-sliders-v-square:before {
+  content: "\f3f2"; }
+
 .fa-slideshare:before {
   content: "\f1e7"; }
 
@@ -3337,12 +5513,18 @@ readers do not read off random characters that represent icons */
 .fa-smile-beam:before {
   content: "\f5b8"; }
 
+.fa-smile-plus:before {
+  content: "\f5b9"; }
+
 .fa-smile-wink:before {
   content: "\f4da"; }
 
 .fa-smog:before {
   content: "\f75f"; }
 
+.fa-smoke:before {
+  content: "\f760"; }
+
 .fa-smoking:before {
   content: "\f48d"; }
 
@@ -3352,6 +5534,9 @@ readers do not read off random characters that represent icons */
 .fa-sms:before {
   content: "\f7cd"; }
 
+.fa-snake:before {
+  content: "\f716"; }
+
 .fa-snapchat:before {
   content: "\f2ab"; }
 
@@ -3361,54 +5546,129 @@ readers do not read off random characters that represent icons */
 .fa-snapchat-square:before {
   content: "\f2ad"; }
 
+.fa-snooze:before {
+  content: "\f880"; }
+
+.fa-snow-blowing:before {
+  content: "\f761"; }
+
 .fa-snowboarding:before {
   content: "\f7ce"; }
 
 .fa-snowflake:before {
   content: "\f2dc"; }
 
+.fa-snowflakes:before {
+  content: "\f7cf"; }
+
 .fa-snowman:before {
   content: "\f7d0"; }
 
+.fa-snowmobile:before {
+  content: "\f7d1"; }
+
 .fa-snowplow:before {
   content: "\f7d2"; }
 
+.fa-soap:before {
+  content: "\e06e"; }
+
 .fa-socks:before {
   content: "\f696"; }
 
 .fa-solar-panel:before {
   content: "\f5ba"; }
 
+.fa-solar-system:before {
+  content: "\e02f"; }
+
 .fa-sort:before {
   content: "\f0dc"; }
 
 .fa-sort-alpha-down:before {
   content: "\f15d"; }
 
+.fa-sort-alpha-down-alt:before {
+  content: "\f881"; }
+
 .fa-sort-alpha-up:before {
   content: "\f15e"; }
 
+.fa-sort-alpha-up-alt:before {
+  content: "\f882"; }
+
+.fa-sort-alt:before {
+  content: "\f883"; }
+
 .fa-sort-amount-down:before {
   content: "\f160"; }
 
+.fa-sort-amount-down-alt:before {
+  content: "\f884"; }
+
 .fa-sort-amount-up:before {
   content: "\f161"; }
 
+.fa-sort-amount-up-alt:before {
+  content: "\f885"; }
+
+.fa-sort-circle:before {
+  content: "\e030"; }
+
+.fa-sort-circle-down:before {
+  content: "\e031"; }
+
+.fa-sort-circle-up:before {
+  content: "\e032"; }
+
 .fa-sort-down:before {
   content: "\f0dd"; }
 
 .fa-sort-numeric-down:before {
   content: "\f162"; }
 
+.fa-sort-numeric-down-alt:before {
+  content: "\f886"; }
+
 .fa-sort-numeric-up:before {
   content: "\f163"; }
 
+.fa-sort-numeric-up-alt:before {
+  content: "\f887"; }
+
+.fa-sort-shapes-down:before {
+  content: "\f888"; }
+
+.fa-sort-shapes-down-alt:before {
+  content: "\f889"; }
+
+.fa-sort-shapes-up:before {
+  content: "\f88a"; }
+
+.fa-sort-shapes-up-alt:before {
+  content: "\f88b"; }
+
+.fa-sort-size-down:before {
+  content: "\f88c"; }
+
+.fa-sort-size-down-alt:before {
+  content: "\f88d"; }
+
+.fa-sort-size-up:before {
+  content: "\f88e"; }
+
+.fa-sort-size-up-alt:before {
+  content: "\f88f"; }
+
 .fa-sort-up:before {
   content: "\f0de"; }
 
 .fa-soundcloud:before {
   content: "\f1be"; }
 
+.fa-soup:before {
+  content: "\f823"; }
+
 .fa-sourcetree:before {
   content: "\f7d3"; }
 
@@ -3418,15 +5678,48 @@ readers do not read off random characters that represent icons */
 .fa-space-shuttle:before {
   content: "\f197"; }
 
+.fa-space-station-moon:before {
+  content: "\e033"; }
+
+.fa-space-station-moon-alt:before {
+  content: "\e034"; }
+
+.fa-spade:before {
+  content: "\f2f4"; }
+
+.fa-sparkles:before {
+  content: "\f890"; }
+
 .fa-speakap:before {
   content: "\f3f3"; }
 
+.fa-speaker:before {
+  content: "\f8df"; }
+
+.fa-speaker-deck:before {
+  content: "\f83c"; }
+
+.fa-speakers:before {
+  content: "\f8e0"; }
+
+.fa-spell-check:before {
+  content: "\f891"; }
+
 .fa-spider:before {
   content: "\f717"; }
 
+.fa-spider-black-widow:before {
+  content: "\f718"; }
+
+.fa-spider-web:before {
+  content: "\f719"; }
+
 .fa-spinner:before {
   content: "\f110"; }
 
+.fa-spinner-third:before {
+  content: "\f3f4"; }
+
 .fa-splotch:before {
   content: "\f5bc"; }
 
@@ -3436,24 +5729,39 @@ readers do not read off random characters that represent icons */
 .fa-spray-can:before {
   content: "\f5bd"; }
 
+.fa-sprinkler:before {
+  content: "\e035"; }
+
 .fa-square:before {
   content: "\f0c8"; }
 
 .fa-square-full:before {
   content: "\f45c"; }
 
+.fa-square-root:before {
+  content: "\f697"; }
+
 .fa-square-root-alt:before {
   content: "\f698"; }
 
 .fa-squarespace:before {
   content: "\f5be"; }
 
+.fa-squirrel:before {
+  content: "\f71a"; }
+
 .fa-stack-exchange:before {
   content: "\f18d"; }
 
 .fa-stack-overflow:before {
   content: "\f16c"; }
 
+.fa-stackpath:before {
+  content: "\f842"; }
+
+.fa-staff:before {
+  content: "\f71b"; }
+
 .fa-stamp:before {
   content: "\f5bf"; }
 
@@ -3463,6 +5771,12 @@ readers do not read off random characters that represent icons */
 .fa-star-and-crescent:before {
   content: "\f699"; }
 
+.fa-star-christmas:before {
+  content: "\f7d4"; }
+
+.fa-star-exclamation:before {
+  content: "\f2f3"; }
+
 .fa-star-half:before {
   content: "\f089"; }
 
@@ -3475,9 +5789,30 @@ readers do not read off random characters that represent icons */
 .fa-star-of-life:before {
   content: "\f621"; }
 
+.fa-star-shooting:before {
+  content: "\e036"; }
+
+.fa-starfighter:before {
+  content: "\e037"; }
+
+.fa-starfighter-alt:before {
+  content: "\e038"; }
+
+.fa-stars:before {
+  content: "\f762"; }
+
+.fa-starship:before {
+  content: "\e039"; }
+
+.fa-starship-freighter:before {
+  content: "\e03a"; }
+
 .fa-staylinked:before {
   content: "\f3f5"; }
 
+.fa-steak:before {
+  content: "\f824"; }
+
 .fa-steam:before {
   content: "\f1b6"; }
 
@@ -3487,6 +5822,9 @@ readers do not read off random characters that represent icons */
 .fa-steam-symbol:before {
   content: "\f3f6"; }
 
+.fa-steering-wheel:before {
+  content: "\f622"; }
+
 .fa-step-backward:before {
   content: "\f048"; }
 
@@ -3502,6 +5840,12 @@ readers do not read off random characters that represent icons */
 .fa-sticky-note:before {
   content: "\f249"; }
 
+.fa-stocking:before {
+  content: "\f7d5"; }
+
+.fa-stomach:before {
+  content: "\f623"; }
+
 .fa-stop:before {
   content: "\f04d"; }
 
@@ -3511,12 +5855,21 @@ readers do not read off random characters that represent icons */
 .fa-stopwatch:before {
   content: "\f2f2"; }
 
+.fa-stopwatch-20:before {
+  content: "\e06f"; }
+
 .fa-store:before {
   content: "\f54e"; }
 
 .fa-store-alt:before {
   content: "\f54f"; }
 
+.fa-store-alt-slash:before {
+  content: "\e070"; }
+
+.fa-store-slash:before {
+  content: "\e071"; }
+
 .fa-strava:before {
   content: "\f428"; }
 
@@ -3526,6 +5879,9 @@ readers do not read off random characters that represent icons */
 .fa-street-view:before {
   content: "\f21d"; }
 
+.fa-stretcher:before {
+  content: "\f825"; }
+
 .fa-strikethrough:before {
   content: "\f0cc"; }
 
@@ -3562,6 +5918,24 @@ readers do not read off random characters that represent icons */
 .fa-sun:before {
   content: "\f185"; }
 
+.fa-sun-cloud:before {
+  content: "\f763"; }
+
+.fa-sun-dust:before {
+  content: "\f764"; }
+
+.fa-sun-haze:before {
+  content: "\f765"; }
+
+.fa-sunglasses:before {
+  content: "\f892"; }
+
+.fa-sunrise:before {
+  content: "\f766"; }
+
+.fa-sunset:before {
+  content: "\f767"; }
+
 .fa-superpowers:before {
   content: "\f2dd"; }
 
@@ -3580,12 +5954,33 @@ readers do not read off random characters that represent icons */
 .fa-swatchbook:before {
   content: "\f5c3"; }
 
+.fa-swift:before {
+  content: "\f8e1"; }
+
 .fa-swimmer:before {
   content: "\f5c4"; }
 
 .fa-swimming-pool:before {
   content: "\f5c5"; }
 
+.fa-sword:before {
+  content: "\f71c"; }
+
+.fa-sword-laser:before {
+  content: "\e03b"; }
+
+.fa-sword-laser-alt:before {
+  content: "\e03c"; }
+
+.fa-swords:before {
+  content: "\f71d"; }
+
+.fa-swords-laser:before {
+  content: "\e03d"; }
+
+.fa-symfony:before {
+  content: "\f83d"; }
+
 .fa-synagogue:before {
   content: "\f69b"; }
 
@@ -3610,24 +6005,78 @@ readers do not read off random characters that represent icons */
 .fa-tablet-alt:before {
   content: "\f3fa"; }
 
+.fa-tablet-android:before {
+  content: "\f3fb"; }
+
+.fa-tablet-android-alt:before {
+  content: "\f3fc"; }
+
+.fa-tablet-rugged:before {
+  content: "\f48f"; }
+
 .fa-tablets:before {
   content: "\f490"; }
 
+.fa-tachometer:before {
+  content: "\f0e4"; }
+
 .fa-tachometer-alt:before {
   content: "\f3fd"; }
 
+.fa-tachometer-alt-average:before {
+  content: "\f624"; }
+
+.fa-tachometer-alt-fast:before {
+  content: "\f625"; }
+
+.fa-tachometer-alt-fastest:before {
+  content: "\f626"; }
+
+.fa-tachometer-alt-slow:before {
+  content: "\f627"; }
+
+.fa-tachometer-alt-slowest:before {
+  content: "\f628"; }
+
+.fa-tachometer-average:before {
+  content: "\f629"; }
+
+.fa-tachometer-fast:before {
+  content: "\f62a"; }
+
+.fa-tachometer-fastest:before {
+  content: "\f62b"; }
+
+.fa-tachometer-slow:before {
+  content: "\f62c"; }
+
+.fa-tachometer-slowest:before {
+  content: "\f62d"; }
+
+.fa-taco:before {
+  content: "\f826"; }
+
 .fa-tag:before {
   content: "\f02b"; }
 
 .fa-tags:before {
   content: "\f02c"; }
 
+.fa-tally:before {
+  content: "\f69c"; }
+
+.fa-tanakh:before {
+  content: "\f827"; }
+
 .fa-tape:before {
   content: "\f4db"; }
 
 .fa-tasks:before {
   content: "\f0ae"; }
 
+.fa-tasks-alt:before {
+  content: "\f828"; }
+
 .fa-taxi:before {
   content: "\f1ba"; }
 
@@ -3646,24 +6095,48 @@ readers do not read off random characters that represent icons */
 .fa-telegram-plane:before {
   content: "\f3fe"; }
 
+.fa-telescope:before {
+  content: "\e03e"; }
+
+.fa-temperature-down:before {
+  content: "\e03f"; }
+
+.fa-temperature-frigid:before {
+  content: "\f768"; }
+
 .fa-temperature-high:before {
   content: "\f769"; }
 
+.fa-temperature-hot:before {
+  content: "\f76a"; }
+
 .fa-temperature-low:before {
   content: "\f76b"; }
 
+.fa-temperature-up:before {
+  content: "\e040"; }
+
 .fa-tencent-weibo:before {
   content: "\f1d5"; }
 
 .fa-tenge:before {
   content: "\f7d7"; }
 
+.fa-tennis-ball:before {
+  content: "\f45e"; }
+
 .fa-terminal:before {
   content: "\f120"; }
 
+.fa-text:before {
+  content: "\f893"; }
+
 .fa-text-height:before {
   content: "\f034"; }
 
+.fa-text-size:before {
+  content: "\f894"; }
+
 .fa-text-width:before {
   content: "\f035"; }
 
@@ -3706,6 +6179,9 @@ readers do not read off random characters that represent icons */
 .fa-thermometer-three-quarters:before {
   content: "\f2c8"; }
 
+.fa-theta:before {
+  content: "\f69e"; }
+
 .fa-think-peaks:before {
   content: "\f731"; }
 
@@ -3718,21 +6194,60 @@ readers do not read off random characters that represent icons */
 .fa-thumbtack:before {
   content: "\f08d"; }
 
+.fa-thunderstorm:before {
+  content: "\f76c"; }
+
+.fa-thunderstorm-moon:before {
+  content: "\f76d"; }
+
+.fa-thunderstorm-sun:before {
+  content: "\f76e"; }
+
+.fa-ticket:before {
+  content: "\f145"; }
+
 .fa-ticket-alt:before {
   content: "\f3ff"; }
 
+.fa-tiktok:before {
+  content: "\e07b"; }
+
+.fa-tilde:before {
+  content: "\f69f"; }
+
 .fa-times:before {
   content: "\f00d"; }
 
 .fa-times-circle:before {
   content: "\f057"; }
 
+.fa-times-hexagon:before {
+  content: "\f2ee"; }
+
+.fa-times-octagon:before {
+  content: "\f2f0"; }
+
+.fa-times-square:before {
+  content: "\f2d3"; }
+
 .fa-tint:before {
   content: "\f043"; }
 
 .fa-tint-slash:before {
   content: "\f5c7"; }
 
+.fa-tire:before {
+  content: "\f631"; }
+
+.fa-tire-flat:before {
+  content: "\f632"; }
+
+.fa-tire-pressure-warning:before {
+  content: "\f633"; }
+
+.fa-tire-rugged:before {
+  content: "\f634"; }
+
 .fa-tired:before {
   content: "\f5c8"; }
 
@@ -3748,6 +6263,18 @@ readers do not read off random characters that represent icons */
 .fa-toilet-paper:before {
   content: "\f71e"; }
 
+.fa-toilet-paper-alt:before {
+  content: "\f71f"; }
+
+.fa-toilet-paper-slash:before {
+  content: "\e072"; }
+
+.fa-tombstone:before {
+  content: "\f720"; }
+
+.fa-tombstone-alt:before {
+  content: "\f721"; }
+
 .fa-toolbox:before {
   content: "\f552"; }
 
@@ -3757,12 +6284,18 @@ readers do not read off random characters that represent icons */
 .fa-tooth:before {
   content: "\f5c9"; }
 
+.fa-toothbrush:before {
+  content: "\f635"; }
+
 .fa-torah:before {
   content: "\f6a0"; }
 
 .fa-torii-gate:before {
   content: "\f6a1"; }
 
+.fa-tornado:before {
+  content: "\f76f"; }
+
 .fa-tractor:before {
   content: "\f722"; }
 
@@ -3772,9 +6305,24 @@ readers do not read off random characters that represent icons */
 .fa-trademark:before {
   content: "\f25c"; }
 
+.fa-traffic-cone:before {
+  content: "\f636"; }
+
 .fa-traffic-light:before {
   content: "\f637"; }
 
+.fa-traffic-light-go:before {
+  content: "\f638"; }
+
+.fa-traffic-light-slow:before {
+  content: "\f639"; }
+
+.fa-traffic-light-stop:before {
+  content: "\f63a"; }
+
+.fa-trailer:before {
+  content: "\e041"; }
+
 .fa-train:before {
   content: "\f238"; }
 
@@ -3787,6 +6335,21 @@ readers do not read off random characters that represent icons */
 .fa-transgender-alt:before {
   content: "\f225"; }
 
+.fa-transporter:before {
+  content: "\e042"; }
+
+.fa-transporter-1:before {
+  content: "\e043"; }
+
+.fa-transporter-2:before {
+  content: "\e044"; }
+
+.fa-transporter-3:before {
+  content: "\e045"; }
+
+.fa-transporter-empty:before {
+  content: "\e046"; }
+
 .fa-trash:before {
   content: "\f1f8"; }
 
@@ -3799,21 +6362,60 @@ readers do not read off random characters that represent icons */
 .fa-trash-restore-alt:before {
   content: "\f82a"; }
 
+.fa-trash-undo:before {
+  content: "\f895"; }
+
+.fa-trash-undo-alt:before {
+  content: "\f896"; }
+
+.fa-treasure-chest:before {
+  content: "\f723"; }
+
 .fa-tree:before {
   content: "\f1bb"; }
 
+.fa-tree-alt:before {
+  content: "\f400"; }
+
+.fa-tree-christmas:before {
+  content: "\f7db"; }
+
+.fa-tree-decorated:before {
+  content: "\f7dc"; }
+
+.fa-tree-large:before {
+  content: "\f7dd"; }
+
+.fa-tree-palm:before {
+  content: "\f82b"; }
+
+.fa-trees:before {
+  content: "\f724"; }
+
 .fa-trello:before {
   content: "\f181"; }
 
-.fa-tripadvisor:before {
-  content: "\f262"; }
+.fa-triangle:before {
+  content: "\f2ec"; }
+
+.fa-triangle-music:before {
+  content: "\f8e2"; }
 
 .fa-trophy:before {
   content: "\f091"; }
 
+.fa-trophy-alt:before {
+  content: "\f2eb"; }
+
 .fa-truck:before {
   content: "\f0d1"; }
 
+.fa-truck-container:before {
+  content: "\f4dc"; }
+
+.fa-truck-couch:before {
+  content: "\f4dd"; }
+
 .fa-truck-loading:before {
   content: "\f4de"; }
 
@@ -3826,6 +6428,15 @@ readers do not read off random characters that represent icons */
 .fa-truck-pickup:before {
   content: "\f63c"; }
 
+.fa-truck-plow:before {
+  content: "\f7de"; }
+
+.fa-truck-ramp:before {
+  content: "\f4e0"; }
+
+.fa-trumpet:before {
+  content: "\f8e3"; }
+
 .fa-tshirt:before {
   content: "\f553"; }
 
@@ -3838,9 +6449,27 @@ readers do not read off random characters that represent icons */
 .fa-tumblr-square:before {
   content: "\f174"; }
 
+.fa-turkey:before {
+  content: "\f725"; }
+
+.fa-turntable:before {
+  content: "\f8e4"; }
+
+.fa-turtle:before {
+  content: "\f726"; }
+
 .fa-tv:before {
   content: "\f26c"; }
 
+.fa-tv-alt:before {
+  content: "\f8e5"; }
+
+.fa-tv-music:before {
+  content: "\f8e6"; }
+
+.fa-tv-retro:before {
+  content: "\f401"; }
+
 .fa-twitch:before {
   content: "\f1e8"; }
 
@@ -3850,6 +6479,9 @@ readers do not read off random characters that represent icons */
 .fa-twitter-square:before {
   content: "\f081"; }
 
+.fa-typewriter:before {
+  content: "\f8e7"; }
+
 .fa-typo3:before {
   content: "\f42b"; }
 
@@ -3859,15 +6491,27 @@ readers do not read off random characters that represent icons */
 .fa-ubuntu:before {
   content: "\f7df"; }
 
+.fa-ufo:before {
+  content: "\e047"; }
+
+.fa-ufo-beam:before {
+  content: "\e048"; }
+
 .fa-uikit:before {
   content: "\f403"; }
 
+.fa-umbraco:before {
+  content: "\f8e8"; }
+
 .fa-umbrella:before {
   content: "\f0e9"; }
 
 .fa-umbrella-beach:before {
   content: "\f5ca"; }
 
+.fa-uncharted:before {
+  content: "\e084"; }
+
 .fa-underline:before {
   content: "\f0cd"; }
 
@@ -3877,9 +6521,18 @@ readers do not read off random characters that represent icons */
 .fa-undo-alt:before {
   content: "\f2ea"; }
 
+.fa-unicorn:before {
+  content: "\f727"; }
+
+.fa-union:before {
+  content: "\f6a2"; }
+
 .fa-uniregistry:before {
   content: "\f404"; }
 
+.fa-unity:before {
+  content: "\e049"; }
+
 .fa-universal-access:before {
   content: "\f29a"; }
 
@@ -3895,6 +6548,9 @@ readers do not read off random characters that represent icons */
 .fa-unlock-alt:before {
   content: "\f13e"; }
 
+.fa-unsplash:before {
+  content: "\e07c"; }
+
 .fa-untappd:before {
   content: "\f405"; }
 
@@ -3907,9 +6563,21 @@ readers do not read off random characters that represent icons */
 .fa-usb:before {
   content: "\f287"; }
 
+.fa-usb-drive:before {
+  content: "\f8e9"; }
+
+.fa-usd-circle:before {
+  content: "\f2e8"; }
+
+.fa-usd-square:before {
+  content: "\f2e9"; }
+
 .fa-user:before {
   content: "\f007"; }
 
+.fa-user-alien:before {
+  content: "\e04a"; }
+
 .fa-user-alt:before {
   content: "\f406"; }
 
@@ -3919,6 +6587,9 @@ readers do not read off random characters that represent icons */
 .fa-user-astronaut:before {
   content: "\f4fb"; }
 
+.fa-user-chart:before {
+  content: "\f6a3"; }
+
 .fa-user-check:before {
   content: "\f4fc"; }
 
@@ -3931,6 +6602,12 @@ readers do not read off random characters that represent icons */
 .fa-user-cog:before {
   content: "\f4fe"; }
 
+.fa-user-cowboy:before {
+  content: "\f8ea"; }
+
+.fa-user-crown:before {
+  content: "\f6a4"; }
+
 .fa-user-edit:before {
   content: "\f4ff"; }
 
@@ -3940,6 +6617,12 @@ readers do not read off random characters that represent icons */
 .fa-user-graduate:before {
   content: "\f501"; }
 
+.fa-user-hard-hat:before {
+  content: "\f82c"; }
+
+.fa-user-headset:before {
+  content: "\f82d"; }
+
 .fa-user-injured:before {
   content: "\f728"; }
 
@@ -3949,9 +6632,15 @@ readers do not read off random characters that represent icons */
 .fa-user-md:before {
   content: "\f0f0"; }
 
+.fa-user-md-chat:before {
+  content: "\f82e"; }
+
 .fa-user-minus:before {
   content: "\f503"; }
 
+.fa-user-music:before {
+  content: "\f8eb"; }
+
 .fa-user-ninja:before {
   content: "\f504"; }
 
@@ -3961,6 +6650,9 @@ readers do not read off random characters that represent icons */
 .fa-user-plus:before {
   content: "\f234"; }
 
+.fa-user-robot:before {
+  content: "\e04b"; }
+
 .fa-user-secret:before {
   content: "\f21b"; }
 
@@ -3979,27 +6671,63 @@ readers do not read off random characters that represent icons */
 .fa-user-times:before {
   content: "\f235"; }
 
+.fa-user-unlock:before {
+  content: "\e058"; }
+
+.fa-user-visor:before {
+  content: "\e04c"; }
+
 .fa-users:before {
   content: "\f0c0"; }
 
+.fa-users-class:before {
+  content: "\f63d"; }
+
 .fa-users-cog:before {
   content: "\f509"; }
 
+.fa-users-crown:before {
+  content: "\f6a5"; }
+
+.fa-users-medical:before {
+  content: "\f830"; }
+
+.fa-users-slash:before {
+  content: "\e073"; }
+
 .fa-usps:before {
   content: "\f7e1"; }
 
 .fa-ussunnah:before {
   content: "\f407"; }
 
+.fa-utensil-fork:before {
+  content: "\f2e3"; }
+
+.fa-utensil-knife:before {
+  content: "\f2e4"; }
+
 .fa-utensil-spoon:before {
   content: "\f2e5"; }
 
 .fa-utensils:before {
   content: "\f2e7"; }
 
+.fa-utensils-alt:before {
+  content: "\f2e6"; }
+
 .fa-vaadin:before {
   content: "\f408"; }
 
+.fa-vacuum:before {
+  content: "\e04d"; }
+
+.fa-vacuum-robot:before {
+  content: "\e04e"; }
+
+.fa-value-absolute:before {
+  content: "\f6a6"; }
+
 .fa-vector-square:before {
   content: "\f5cb"; }
 
@@ -4012,6 +6740,15 @@ readers do not read off random characters that represent icons */
 .fa-venus-mars:before {
   content: "\f228"; }
 
+.fa-vest:before {
+  content: "\e085"; }
+
+.fa-vest-patches:before {
+  content: "\e086"; }
+
+.fa-vhs:before {
+  content: "\f8ec"; }
+
 .fa-viacoin:before {
   content: "\f237"; }
 
@@ -4033,6 +6770,9 @@ readers do not read off random characters that represent icons */
 .fa-video:before {
   content: "\f03d"; }
 
+.fa-video-plus:before {
+  content: "\f4e1"; }
+
 .fa-video-slash:before {
   content: "\f4e2"; }
 
@@ -4051,15 +6791,36 @@ readers do not read off random characters that represent icons */
 .fa-vine:before {
   content: "\f1ca"; }
 
+.fa-violin:before {
+  content: "\f8ed"; }
+
+.fa-virus:before {
+  content: "\e074"; }
+
+.fa-virus-slash:before {
+  content: "\e075"; }
+
+.fa-viruses:before {
+  content: "\e076"; }
+
 .fa-vk:before {
   content: "\f189"; }
 
 .fa-vnv:before {
   content: "\f40b"; }
 
+.fa-voicemail:before {
+  content: "\f897"; }
+
+.fa-volcano:before {
+  content: "\f770"; }
+
 .fa-volleyball-ball:before {
   content: "\f45f"; }
 
+.fa-volume:before {
+  content: "\f6a8"; }
+
 .fa-volume-down:before {
   content: "\f027"; }
 
@@ -4069,9 +6830,15 @@ readers do not read off random characters that represent icons */
 .fa-volume-off:before {
   content: "\f026"; }
 
+.fa-volume-slash:before {
+  content: "\f2e2"; }
+
 .fa-volume-up:before {
   content: "\f028"; }
 
+.fa-vote-nay:before {
+  content: "\f771"; }
+
 .fa-vote-yea:before {
   content: "\f772"; }
 
@@ -4081,18 +6848,81 @@ readers do not read off random characters that represent icons */
 .fa-vuejs:before {
   content: "\f41f"; }
 
+.fa-wagon-covered:before {
+  content: "\f8ee"; }
+
+.fa-walker:before {
+  content: "\f831"; }
+
+.fa-walkie-talkie:before {
+  content: "\f8ef"; }
+
 .fa-walking:before {
   content: "\f554"; }
 
 .fa-wallet:before {
   content: "\f555"; }
 
+.fa-wand:before {
+  content: "\f72a"; }
+
+.fa-wand-magic:before {
+  content: "\f72b"; }
+
 .fa-warehouse:before {
   content: "\f494"; }
 
+.fa-warehouse-alt:before {
+  content: "\f495"; }
+
+.fa-washer:before {
+  content: "\f898"; }
+
+.fa-watch:before {
+  content: "\f2e1"; }
+
+.fa-watch-calculator:before {
+  content: "\f8f0"; }
+
+.fa-watch-fitness:before {
+  content: "\f63e"; }
+
+.fa-watchman-monitoring:before {
+  content: "\e087"; }
+
 .fa-water:before {
   content: "\f773"; }
 
+.fa-water-lower:before {
+  content: "\f774"; }
+
+.fa-water-rise:before {
+  content: "\f775"; }
+
+.fa-wave-sine:before {
+  content: "\f899"; }
+
+.fa-wave-square:before {
+  content: "\f83e"; }
+
+.fa-wave-triangle:before {
+  content: "\f89a"; }
+
+.fa-waveform:before {
+  content: "\f8f1"; }
+
+.fa-waveform-path:before {
+  content: "\f8f2"; }
+
+.fa-waze:before {
+  content: "\f83f"; }
+
+.fa-webcam:before {
+  content: "\f832"; }
+
+.fa-webcam-slash:before {
+  content: "\f833"; }
+
 .fa-weebly:before {
   content: "\f5cc"; }
 
@@ -4108,30 +6938,66 @@ readers do not read off random characters that represent icons */
 .fa-weixin:before {
   content: "\f1d7"; }
 
+.fa-whale:before {
+  content: "\f72c"; }
+
 .fa-whatsapp:before {
   content: "\f232"; }
 
 .fa-whatsapp-square:before {
   content: "\f40c"; }
 
+.fa-wheat:before {
+  content: "\f72d"; }
+
 .fa-wheelchair:before {
   content: "\f193"; }
 
+.fa-whistle:before {
+  content: "\f460"; }
+
 .fa-whmcs:before {
   content: "\f40d"; }
 
 .fa-wifi:before {
   content: "\f1eb"; }
 
+.fa-wifi-1:before {
+  content: "\f6aa"; }
+
+.fa-wifi-2:before {
+  content: "\f6ab"; }
+
+.fa-wifi-slash:before {
+  content: "\f6ac"; }
+
 .fa-wikipedia-w:before {
   content: "\f266"; }
 
 .fa-wind:before {
   content: "\f72e"; }
 
+.fa-wind-turbine:before {
+  content: "\f89b"; }
+
+.fa-wind-warning:before {
+  content: "\f776"; }
+
+.fa-window:before {
+  content: "\f40e"; }
+
+.fa-window-alt:before {
+  content: "\f40f"; }
+
 .fa-window-close:before {
   content: "\f410"; }
 
+.fa-window-frame:before {
+  content: "\e04f"; }
+
+.fa-window-frame-open:before {
+  content: "\e050"; }
+
 .fa-window-maximize:before {
   content: "\f2d0"; }
 
@@ -4144,6 +7010,9 @@ readers do not read off random characters that represent icons */
 .fa-windows:before {
   content: "\f17a"; }
 
+.fa-windsock:before {
+  content: "\f777"; }
+
 .fa-wine-bottle:before {
   content: "\f72f"; }
 
@@ -4159,6 +7028,9 @@ readers do not read off random characters that represent icons */
 .fa-wizards-of-the-coast:before {
   content: "\f730"; }
 
+.fa-wodu:before {
+  content: "\e088"; }
+
 .fa-wolf-pack-battalion:before {
   content: "\f514"; }
 
@@ -4183,6 +7055,9 @@ readers do not read off random characters that represent icons */
 .fa-wpressr:before {
   content: "\f3e4"; }
 
+.fa-wreath:before {
+  content: "\f7e2"; }
+
 .fa-wrench:before {
   content: "\f0ad"; }
 
@@ -4204,6 +7079,9 @@ readers do not read off random characters that represent icons */
 .fa-yahoo:before {
   content: "\f19e"; }
 
+.fa-yammer:before {
+  content: "\f840"; }
+
 .fa-yandex:before {
   content: "\f413"; }
 
@@ -4254,18 +7132,5635 @@ readers do not read off random characters that represent icons */
 @font-face {
   font-family: 'Font Awesome 5 Brands';
   font-style: normal;
-  font-weight: normal;
-  font-display: swap;
+  font-weight: 400;
+  font-display: block;
   src: url("/fonts/fa-brands-400.eot");
   src: url("/fonts/fa-brands-400.eot?#iefix") format("embedded-opentype"), url("/fonts/fa-brands-400.woff2") format("woff2"), url("/fonts/fa-brands-400.woff") format("woff"), url("/fonts/fa-brands-400.ttf") format("truetype"), url("/fonts/fa-brands-400.svg#fontawesome") format("svg"); }
 
 .fab {
-  font-family: 'Font Awesome 5 Brands'; }
+  font-family: 'Font Awesome 5 Brands';
+  font-weight: 400; }
+@font-face {
+  font-family: 'Font Awesome 5 Duotone';
+  font-style: normal;
+  font-weight: 900;
+  font-display: block;
+  src: url("/fonts/fa-duotone-900.eot");
+  src: url("/fonts/fa-duotone-900.eot?#iefix") format("embedded-opentype"), url("/fonts/fa-duotone-900.woff2") format("woff2"), url("/fonts/fa-duotone-900.woff") format("woff"), url("/fonts/fa-duotone-900.ttf") format("truetype"), url("/fonts/fa-duotone-900.svg#fontawesome") format("svg"); }
+
+.fad {
+  position: relative;
+  font-family: 'Font Awesome 5 Duotone';
+  font-weight: 900; }
+
+.fad:before {
+  position: absolute;
+  color: var(--fa-primary-color, inherit);
+  opacity: 1;
+  opacity: var(--fa-primary-opacity, 1); }
+
+.fad:after {
+  color: var(--fa-secondary-color, inherit);
+  opacity: 0.4;
+  opacity: var(--fa-secondary-opacity, 0.4); }
+
+.fa-swap-opacity .fad:before,
+.fad.fa-swap-opacity:before {
+  opacity: 0.4;
+  opacity: var(--fa-secondary-opacity, 0.4); }
+
+.fa-swap-opacity .fad:after,
+.fad.fa-swap-opacity:after {
+  opacity: 1;
+  opacity: var(--fa-primary-opacity, 1); }
+
+.fad.fa-inverse {
+  color: #fff; }
+
+.fad.fa-stack-1x, .fad.fa-stack-2x {
+  position: absolute; }
+
+.fad.fa-stack-1x:before,
+.fad.fa-stack-2x:before,
+.fad.fa-fw:before {
+  left: 50%;
+  -webkit-transform: translateX(-50%);
+          transform: translateX(-50%); }
+
+.fad.fa-abacus:after {
+  content: "\10f640"; }
+
+.fad.fa-acorn:after {
+  content: "\10f6ae"; }
+
+.fad.fa-ad:after {
+  content: "\10f641"; }
+
+.fad.fa-address-book:after {
+  content: "\10f2b9"; }
+
+.fad.fa-address-card:after {
+  content: "\10f2bb"; }
+
+.fad.fa-adjust:after {
+  content: "\10f042"; }
+
+.fad.fa-air-conditioner:after {
+  content: "\10f8f4"; }
+
+.fad.fa-air-freshener:after {
+  content: "\10f5d0"; }
+
+.fad.fa-alarm-clock:after {
+  content: "\10f34e"; }
+
+.fad.fa-alarm-exclamation:after {
+  content: "\10f843"; }
+
+.fad.fa-alarm-plus:after {
+  content: "\10f844"; }
+
+.fad.fa-alarm-snooze:after {
+  content: "\10f845"; }
+
+.fad.fa-album:after {
+  content: "\10f89f"; }
+
+.fad.fa-album-collection:after {
+  content: "\10f8a0"; }
+
+.fad.fa-alicorn:after {
+  content: "\10f6b0"; }
+
+.fad.fa-alien:after {
+  content: "\10f8f5"; }
+
+.fad.fa-alien-monster:after {
+  content: "\10f8f6"; }
+
+.fad.fa-align-center:after {
+  content: "\10f037"; }
+
+.fad.fa-align-justify:after {
+  content: "\10f039"; }
+
+.fad.fa-align-left:after {
+  content: "\10f036"; }
+
+.fad.fa-align-right:after {
+  content: "\10f038"; }
+
+.fad.fa-align-slash:after {
+  content: "\10f846"; }
+
+.fad.fa-allergies:after {
+  content: "\10f461"; }
+
+.fad.fa-ambulance:after {
+  content: "\10f0f9"; }
+
+.fad.fa-american-sign-language-interpreting:after {
+  content: "\10f2a3"; }
+
+.fad.fa-amp-guitar:after {
+  content: "\10f8a1"; }
+
+.fad.fa-analytics:after {
+  content: "\10f643"; }
+
+.fad.fa-anchor:after {
+  content: "\10f13d"; }
+
+.fad.fa-angel:after {
+  content: "\10f779"; }
+
+.fad.fa-angle-double-down:after {
+  content: "\10f103"; }
+
+.fad.fa-angle-double-left:after {
+  content: "\10f100"; }
+
+.fad.fa-angle-double-right:after {
+  content: "\10f101"; }
+
+.fad.fa-angle-double-up:after {
+  content: "\10f102"; }
+
+.fad.fa-angle-down:after {
+  content: "\10f107"; }
+
+.fad.fa-angle-left:after {
+  content: "\10f104"; }
+
+.fad.fa-angle-right:after {
+  content: "\10f105"; }
+
+.fad.fa-angle-up:after {
+  content: "\10f106"; }
+
+.fad.fa-angry:after {
+  content: "\10f556"; }
+
+.fad.fa-ankh:after {
+  content: "\10f644"; }
+
+.fad.fa-apple-alt:after {
+  content: "\10f5d1"; }
+
+.fad.fa-apple-crate:after {
+  content: "\10f6b1"; }
+
+.fad.fa-archive:after {
+  content: "\10f187"; }
+
+.fad.fa-archway:after {
+  content: "\10f557"; }
+
+.fad.fa-arrow-alt-circle-down:after {
+  content: "\10f358"; }
+
+.fad.fa-arrow-alt-circle-left:after {
+  content: "\10f359"; }
+
+.fad.fa-arrow-alt-circle-right:after {
+  content: "\10f35a"; }
+
+.fad.fa-arrow-alt-circle-up:after {
+  content: "\10f35b"; }
+
+.fad.fa-arrow-alt-down:after {
+  content: "\10f354"; }
+
+.fad.fa-arrow-alt-from-bottom:after {
+  content: "\10f346"; }
+
+.fad.fa-arrow-alt-from-left:after {
+  content: "\10f347"; }
+
+.fad.fa-arrow-alt-from-right:after {
+  content: "\10f348"; }
+
+.fad.fa-arrow-alt-from-top:after {
+  content: "\10f349"; }
+
+.fad.fa-arrow-alt-left:after {
+  content: "\10f355"; }
+
+.fad.fa-arrow-alt-right:after {
+  content: "\10f356"; }
+
+.fad.fa-arrow-alt-square-down:after {
+  content: "\10f350"; }
+
+.fad.fa-arrow-alt-square-left:after {
+  content: "\10f351"; }
+
+.fad.fa-arrow-alt-square-right:after {
+  content: "\10f352"; }
+
+.fad.fa-arrow-alt-square-up:after {
+  content: "\10f353"; }
+
+.fad.fa-arrow-alt-to-bottom:after {
+  content: "\10f34a"; }
+
+.fad.fa-arrow-alt-to-left:after {
+  content: "\10f34b"; }
+
+.fad.fa-arrow-alt-to-right:after {
+  content: "\10f34c"; }
+
+.fad.fa-arrow-alt-to-top:after {
+  content: "\10f34d"; }
+
+.fad.fa-arrow-alt-up:after {
+  content: "\10f357"; }
+
+.fad.fa-arrow-circle-down:after {
+  content: "\10f0ab"; }
+
+.fad.fa-arrow-circle-left:after {
+  content: "\10f0a8"; }
+
+.fad.fa-arrow-circle-right:after {
+  content: "\10f0a9"; }
+
+.fad.fa-arrow-circle-up:after {
+  content: "\10f0aa"; }
+
+.fad.fa-arrow-down:after {
+  content: "\10f063"; }
+
+.fad.fa-arrow-from-bottom:after {
+  content: "\10f342"; }
+
+.fad.fa-arrow-from-left:after {
+  content: "\10f343"; }
+
+.fad.fa-arrow-from-right:after {
+  content: "\10f344"; }
+
+.fad.fa-arrow-from-top:after {
+  content: "\10f345"; }
+
+.fad.fa-arrow-left:after {
+  content: "\10f060"; }
+
+.fad.fa-arrow-right:after {
+  content: "\10f061"; }
+
+.fad.fa-arrow-square-down:after {
+  content: "\10f339"; }
+
+.fad.fa-arrow-square-left:after {
+  content: "\10f33a"; }
+
+.fad.fa-arrow-square-right:after {
+  content: "\10f33b"; }
+
+.fad.fa-arrow-square-up:after {
+  content: "\10f33c"; }
+
+.fad.fa-arrow-to-bottom:after {
+  content: "\10f33d"; }
+
+.fad.fa-arrow-to-left:after {
+  content: "\10f33e"; }
+
+.fad.fa-arrow-to-right:after {
+  content: "\10f340"; }
+
+.fad.fa-arrow-to-top:after {
+  content: "\10f341"; }
+
+.fad.fa-arrow-up:after {
+  content: "\10f062"; }
+
+.fad.fa-arrows:after {
+  content: "\10f047"; }
+
+.fad.fa-arrows-alt:after {
+  content: "\10f0b2"; }
+
+.fad.fa-arrows-alt-h:after {
+  content: "\10f337"; }
+
+.fad.fa-arrows-alt-v:after {
+  content: "\10f338"; }
+
+.fad.fa-arrows-h:after {
+  content: "\10f07e"; }
+
+.fad.fa-arrows-v:after {
+  content: "\10f07d"; }
+
+.fad.fa-assistive-listening-systems:after {
+  content: "\10f2a2"; }
+
+.fad.fa-asterisk:after {
+  content: "\10f069"; }
+
+.fad.fa-at:after {
+  content: "\10f1fa"; }
+
+.fad.fa-atlas:after {
+  content: "\10f558"; }
+
+.fad.fa-atom:after {
+  content: "\10f5d2"; }
+
+.fad.fa-atom-alt:after {
+  content: "\10f5d3"; }
+
+.fad.fa-audio-description:after {
+  content: "\10f29e"; }
+
+.fad.fa-award:after {
+  content: "\10f559"; }
+
+.fad.fa-axe:after {
+  content: "\10f6b2"; }
+
+.fad.fa-axe-battle:after {
+  content: "\10f6b3"; }
+
+.fad.fa-baby:after {
+  content: "\10f77c"; }
+
+.fad.fa-baby-carriage:after {
+  content: "\10f77d"; }
+
+.fad.fa-backpack:after {
+  content: "\10f5d4"; }
+
+.fad.fa-backspace:after {
+  content: "\10f55a"; }
+
+.fad.fa-backward:after {
+  content: "\10f04a"; }
+
+.fad.fa-bacon:after {
+  content: "\10f7e5"; }
+
+.fad.fa-bacteria:after {
+  content: "\10e059"; }
+
+.fad.fa-bacterium:after {
+  content: "\10e05a"; }
+
+.fad.fa-badge:after {
+  content: "\10f335"; }
+
+.fad.fa-badge-check:after {
+  content: "\10f336"; }
+
+.fad.fa-badge-dollar:after {
+  content: "\10f645"; }
+
+.fad.fa-badge-percent:after {
+  content: "\10f646"; }
+
+.fad.fa-badge-sheriff:after {
+  content: "\10f8a2"; }
+
+.fad.fa-badger-honey:after {
+  content: "\10f6b4"; }
+
+.fad.fa-bags-shopping:after {
+  content: "\10f847"; }
+
+.fad.fa-bahai:after {
+  content: "\10f666"; }
+
+.fad.fa-balance-scale:after {
+  content: "\10f24e"; }
+
+.fad.fa-balance-scale-left:after {
+  content: "\10f515"; }
+
+.fad.fa-balance-scale-right:after {
+  content: "\10f516"; }
+
+.fad.fa-ball-pile:after {
+  content: "\10f77e"; }
+
+.fad.fa-ballot:after {
+  content: "\10f732"; }
+
+.fad.fa-ballot-check:after {
+  content: "\10f733"; }
+
+.fad.fa-ban:after {
+  content: "\10f05e"; }
+
+.fad.fa-band-aid:after {
+  content: "\10f462"; }
+
+.fad.fa-banjo:after {
+  content: "\10f8a3"; }
+
+.fad.fa-barcode:after {
+  content: "\10f02a"; }
+
+.fad.fa-barcode-alt:after {
+  content: "\10f463"; }
+
+.fad.fa-barcode-read:after {
+  content: "\10f464"; }
+
+.fad.fa-barcode-scan:after {
+  content: "\10f465"; }
+
+.fad.fa-bars:after {
+  content: "\10f0c9"; }
+
+.fad.fa-baseball:after {
+  content: "\10f432"; }
+
+.fad.fa-baseball-ball:after {
+  content: "\10f433"; }
+
+.fad.fa-basketball-ball:after {
+  content: "\10f434"; }
+
+.fad.fa-basketball-hoop:after {
+  content: "\10f435"; }
+
+.fad.fa-bat:after {
+  content: "\10f6b5"; }
+
+.fad.fa-bath:after {
+  content: "\10f2cd"; }
+
+.fad.fa-battery-bolt:after {
+  content: "\10f376"; }
+
+.fad.fa-battery-empty:after {
+  content: "\10f244"; }
+
+.fad.fa-battery-full:after {
+  content: "\10f240"; }
+
+.fad.fa-battery-half:after {
+  content: "\10f242"; }
+
+.fad.fa-battery-quarter:after {
+  content: "\10f243"; }
+
+.fad.fa-battery-slash:after {
+  content: "\10f377"; }
+
+.fad.fa-battery-three-quarters:after {
+  content: "\10f241"; }
+
+.fad.fa-bed:after {
+  content: "\10f236"; }
+
+.fad.fa-bed-alt:after {
+  content: "\10f8f7"; }
+
+.fad.fa-bed-bunk:after {
+  content: "\10f8f8"; }
+
+.fad.fa-bed-empty:after {
+  content: "\10f8f9"; }
+
+.fad.fa-beer:after {
+  content: "\10f0fc"; }
+
+.fad.fa-bell:after {
+  content: "\10f0f3"; }
+
+.fad.fa-bell-exclamation:after {
+  content: "\10f848"; }
+
+.fad.fa-bell-on:after {
+  content: "\10f8fa"; }
+
+.fad.fa-bell-plus:after {
+  content: "\10f849"; }
+
+.fad.fa-bell-school:after {
+  content: "\10f5d5"; }
+
+.fad.fa-bell-school-slash:after {
+  content: "\10f5d6"; }
+
+.fad.fa-bell-slash:after {
+  content: "\10f1f6"; }
+
+.fad.fa-bells:after {
+  content: "\10f77f"; }
+
+.fad.fa-betamax:after {
+  content: "\10f8a4"; }
+
+.fad.fa-bezier-curve:after {
+  content: "\10f55b"; }
+
+.fad.fa-bible:after {
+  content: "\10f647"; }
+
+.fad.fa-bicycle:after {
+  content: "\10f206"; }
+
+.fad.fa-biking:after {
+  content: "\10f84a"; }
+
+.fad.fa-biking-mountain:after {
+  content: "\10f84b"; }
+
+.fad.fa-binoculars:after {
+  content: "\10f1e5"; }
+
+.fad.fa-biohazard:after {
+  content: "\10f780"; }
+
+.fad.fa-birthday-cake:after {
+  content: "\10f1fd"; }
+
+.fad.fa-blanket:after {
+  content: "\10f498"; }
+
+.fad.fa-blender:after {
+  content: "\10f517"; }
+
+.fad.fa-blender-phone:after {
+  content: "\10f6b6"; }
+
+.fad.fa-blind:after {
+  content: "\10f29d"; }
+
+.fad.fa-blinds:after {
+  content: "\10f8fb"; }
+
+.fad.fa-blinds-open:after {
+  content: "\10f8fc"; }
+
+.fad.fa-blinds-raised:after {
+  content: "\10f8fd"; }
+
+.fad.fa-blog:after {
+  content: "\10f781"; }
+
+.fad.fa-bold:after {
+  content: "\10f032"; }
+
+.fad.fa-bolt:after {
+  content: "\10f0e7"; }
+
+.fad.fa-bomb:after {
+  content: "\10f1e2"; }
+
+.fad.fa-bone:after {
+  content: "\10f5d7"; }
+
+.fad.fa-bone-break:after {
+  content: "\10f5d8"; }
+
+.fad.fa-bong:after {
+  content: "\10f55c"; }
+
+.fad.fa-book:after {
+  content: "\10f02d"; }
+
+.fad.fa-book-alt:after {
+  content: "\10f5d9"; }
+
+.fad.fa-book-dead:after {
+  content: "\10f6b7"; }
+
+.fad.fa-book-heart:after {
+  content: "\10f499"; }
+
+.fad.fa-book-medical:after {
+  content: "\10f7e6"; }
+
+.fad.fa-book-open:after {
+  content: "\10f518"; }
+
+.fad.fa-book-reader:after {
+  content: "\10f5da"; }
+
+.fad.fa-book-spells:after {
+  content: "\10f6b8"; }
+
+.fad.fa-book-user:after {
+  content: "\10f7e7"; }
+
+.fad.fa-bookmark:after {
+  content: "\10f02e"; }
+
+.fad.fa-books:after {
+  content: "\10f5db"; }
+
+.fad.fa-books-medical:after {
+  content: "\10f7e8"; }
+
+.fad.fa-boombox:after {
+  content: "\10f8a5"; }
+
+.fad.fa-boot:after {
+  content: "\10f782"; }
+
+.fad.fa-booth-curtain:after {
+  content: "\10f734"; }
+
+.fad.fa-border-all:after {
+  content: "\10f84c"; }
+
+.fad.fa-border-bottom:after {
+  content: "\10f84d"; }
+
+.fad.fa-border-center-h:after {
+  content: "\10f89c"; }
+
+.fad.fa-border-center-v:after {
+  content: "\10f89d"; }
+
+.fad.fa-border-inner:after {
+  content: "\10f84e"; }
+
+.fad.fa-border-left:after {
+  content: "\10f84f"; }
+
+.fad.fa-border-none:after {
+  content: "\10f850"; }
+
+.fad.fa-border-outer:after {
+  content: "\10f851"; }
+
+.fad.fa-border-right:after {
+  content: "\10f852"; }
+
+.fad.fa-border-style:after {
+  content: "\10f853"; }
+
+.fad.fa-border-style-alt:after {
+  content: "\10f854"; }
+
+.fad.fa-border-top:after {
+  content: "\10f855"; }
+
+.fad.fa-bow-arrow:after {
+  content: "\10f6b9"; }
+
+.fad.fa-bowling-ball:after {
+  content: "\10f436"; }
+
+.fad.fa-bowling-pins:after {
+  content: "\10f437"; }
+
+.fad.fa-box:after {
+  content: "\10f466"; }
+
+.fad.fa-box-alt:after {
+  content: "\10f49a"; }
+
+.fad.fa-box-ballot:after {
+  content: "\10f735"; }
+
+.fad.fa-box-check:after {
+  content: "\10f467"; }
+
+.fad.fa-box-fragile:after {
+  content: "\10f49b"; }
+
+.fad.fa-box-full:after {
+  content: "\10f49c"; }
+
+.fad.fa-box-heart:after {
+  content: "\10f49d"; }
+
+.fad.fa-box-open:after {
+  content: "\10f49e"; }
+
+.fad.fa-box-tissue:after {
+  content: "\10e05b"; }
+
+.fad.fa-box-up:after {
+  content: "\10f49f"; }
+
+.fad.fa-box-usd:after {
+  content: "\10f4a0"; }
+
+.fad.fa-boxes:after {
+  content: "\10f468"; }
+
+.fad.fa-boxes-alt:after {
+  content: "\10f4a1"; }
+
+.fad.fa-boxing-glove:after {
+  content: "\10f438"; }
+
+.fad.fa-brackets:after {
+  content: "\10f7e9"; }
+
+.fad.fa-brackets-curly:after {
+  content: "\10f7ea"; }
+
+.fad.fa-braille:after {
+  content: "\10f2a1"; }
+
+.fad.fa-brain:after {
+  content: "\10f5dc"; }
+
+.fad.fa-bread-loaf:after {
+  content: "\10f7eb"; }
+
+.fad.fa-bread-slice:after {
+  content: "\10f7ec"; }
+
+.fad.fa-briefcase:after {
+  content: "\10f0b1"; }
+
+.fad.fa-briefcase-medical:after {
+  content: "\10f469"; }
+
+.fad.fa-bring-forward:after {
+  content: "\10f856"; }
+
+.fad.fa-bring-front:after {
+  content: "\10f857"; }
+
+.fad.fa-broadcast-tower:after {
+  content: "\10f519"; }
+
+.fad.fa-broom:after {
+  content: "\10f51a"; }
+
+.fad.fa-browser:after {
+  content: "\10f37e"; }
+
+.fad.fa-brush:after {
+  content: "\10f55d"; }
+
+.fad.fa-bug:after {
+  content: "\10f188"; }
+
+.fad.fa-building:after {
+  content: "\10f1ad"; }
+
+.fad.fa-bullhorn:after {
+  content: "\10f0a1"; }
+
+.fad.fa-bullseye:after {
+  content: "\10f140"; }
+
+.fad.fa-bullseye-arrow:after {
+  content: "\10f648"; }
+
+.fad.fa-bullseye-pointer:after {
+  content: "\10f649"; }
+
+.fad.fa-burger-soda:after {
+  content: "\10f858"; }
+
+.fad.fa-burn:after {
+  content: "\10f46a"; }
+
+.fad.fa-burrito:after {
+  content: "\10f7ed"; }
+
+.fad.fa-bus:after {
+  content: "\10f207"; }
+
+.fad.fa-bus-alt:after {
+  content: "\10f55e"; }
+
+.fad.fa-bus-school:after {
+  content: "\10f5dd"; }
+
+.fad.fa-business-time:after {
+  content: "\10f64a"; }
+
+.fad.fa-cabinet-filing:after {
+  content: "\10f64b"; }
+
+.fad.fa-cactus:after {
+  content: "\10f8a7"; }
+
+.fad.fa-calculator:after {
+  content: "\10f1ec"; }
+
+.fad.fa-calculator-alt:after {
+  content: "\10f64c"; }
+
+.fad.fa-calendar:after {
+  content: "\10f133"; }
+
+.fad.fa-calendar-alt:after {
+  content: "\10f073"; }
+
+.fad.fa-calendar-check:after {
+  content: "\10f274"; }
+
+.fad.fa-calendar-day:after {
+  content: "\10f783"; }
+
+.fad.fa-calendar-edit:after {
+  content: "\10f333"; }
+
+.fad.fa-calendar-exclamation:after {
+  content: "\10f334"; }
+
+.fad.fa-calendar-minus:after {
+  content: "\10f272"; }
+
+.fad.fa-calendar-plus:after {
+  content: "\10f271"; }
+
+.fad.fa-calendar-star:after {
+  content: "\10f736"; }
+
+.fad.fa-calendar-times:after {
+  content: "\10f273"; }
+
+.fad.fa-calendar-week:after {
+  content: "\10f784"; }
+
+.fad.fa-camcorder:after {
+  content: "\10f8a8"; }
+
+.fad.fa-camera:after {
+  content: "\10f030"; }
+
+.fad.fa-camera-alt:after {
+  content: "\10f332"; }
+
+.fad.fa-camera-home:after {
+  content: "\10f8fe"; }
+
+.fad.fa-camera-movie:after {
+  content: "\10f8a9"; }
+
+.fad.fa-camera-polaroid:after {
+  content: "\10f8aa"; }
+
+.fad.fa-camera-retro:after {
+  content: "\10f083"; }
+
+.fad.fa-campfire:after {
+  content: "\10f6ba"; }
+
+.fad.fa-campground:after {
+  content: "\10f6bb"; }
+
+.fad.fa-candle-holder:after {
+  content: "\10f6bc"; }
+
+.fad.fa-candy-cane:after {
+  content: "\10f786"; }
+
+.fad.fa-candy-corn:after {
+  content: "\10f6bd"; }
+
+.fad.fa-cannabis:after {
+  content: "\10f55f"; }
+
+.fad.fa-capsules:after {
+  content: "\10f46b"; }
+
+.fad.fa-car:after {
+  content: "\10f1b9"; }
+
+.fad.fa-car-alt:after {
+  content: "\10f5de"; }
+
+.fad.fa-car-battery:after {
+  content: "\10f5df"; }
+
+.fad.fa-car-building:after {
+  content: "\10f859"; }
+
+.fad.fa-car-bump:after {
+  content: "\10f5e0"; }
+
+.fad.fa-car-bus:after {
+  content: "\10f85a"; }
+
+.fad.fa-car-crash:after {
+  content: "\10f5e1"; }
+
+.fad.fa-car-garage:after {
+  content: "\10f5e2"; }
+
+.fad.fa-car-mechanic:after {
+  content: "\10f5e3"; }
+
+.fad.fa-car-side:after {
+  content: "\10f5e4"; }
+
+.fad.fa-car-tilt:after {
+  content: "\10f5e5"; }
+
+.fad.fa-car-wash:after {
+  content: "\10f5e6"; }
+
+.fad.fa-caravan:after {
+  content: "\10f8ff"; }
+
+.fad.fa-caravan-alt:after {
+  content: "\10e000"; }
+
+.fad.fa-caret-circle-down:after {
+  content: "\10f32d"; }
+
+.fad.fa-caret-circle-left:after {
+  content: "\10f32e"; }
+
+.fad.fa-caret-circle-right:after {
+  content: "\10f330"; }
+
+.fad.fa-caret-circle-up:after {
+  content: "\10f331"; }
+
+.fad.fa-caret-down:after {
+  content: "\10f0d7"; }
+
+.fad.fa-caret-left:after {
+  content: "\10f0d9"; }
+
+.fad.fa-caret-right:after {
+  content: "\10f0da"; }
+
+.fad.fa-caret-square-down:after {
+  content: "\10f150"; }
+
+.fad.fa-caret-square-left:after {
+  content: "\10f191"; }
+
+.fad.fa-caret-square-right:after {
+  content: "\10f152"; }
+
+.fad.fa-caret-square-up:after {
+  content: "\10f151"; }
+
+.fad.fa-caret-up:after {
+  content: "\10f0d8"; }
+
+.fad.fa-carrot:after {
+  content: "\10f787"; }
+
+.fad.fa-cars:after {
+  content: "\10f85b"; }
+
+.fad.fa-cart-arrow-down:after {
+  content: "\10f218"; }
+
+.fad.fa-cart-plus:after {
+  content: "\10f217"; }
+
+.fad.fa-cash-register:after {
+  content: "\10f788"; }
+
+.fad.fa-cassette-tape:after {
+  content: "\10f8ab"; }
+
+.fad.fa-cat:after {
+  content: "\10f6be"; }
+
+.fad.fa-cat-space:after {
+  content: "\10e001"; }
+
+.fad.fa-cauldron:after {
+  content: "\10f6bf"; }
+
+.fad.fa-cctv:after {
+  content: "\10f8ac"; }
+
+.fad.fa-certificate:after {
+  content: "\10f0a3"; }
+
+.fad.fa-chair:after {
+  content: "\10f6c0"; }
+
+.fad.fa-chair-office:after {
+  content: "\10f6c1"; }
+
+.fad.fa-chalkboard:after {
+  content: "\10f51b"; }
+
+.fad.fa-chalkboard-teacher:after {
+  content: "\10f51c"; }
+
+.fad.fa-charging-station:after {
+  content: "\10f5e7"; }
+
+.fad.fa-chart-area:after {
+  content: "\10f1fe"; }
+
+.fad.fa-chart-bar:after {
+  content: "\10f080"; }
+
+.fad.fa-chart-line:after {
+  content: "\10f201"; }
+
+.fad.fa-chart-line-down:after {
+  content: "\10f64d"; }
+
+.fad.fa-chart-network:after {
+  content: "\10f78a"; }
+
+.fad.fa-chart-pie:after {
+  content: "\10f200"; }
+
+.fad.fa-chart-pie-alt:after {
+  content: "\10f64e"; }
+
+.fad.fa-chart-scatter:after {
+  content: "\10f7ee"; }
+
+.fad.fa-check:after {
+  content: "\10f00c"; }
+
+.fad.fa-check-circle:after {
+  content: "\10f058"; }
+
+.fad.fa-check-double:after {
+  content: "\10f560"; }
+
+.fad.fa-check-square:after {
+  content: "\10f14a"; }
+
+.fad.fa-cheese:after {
+  content: "\10f7ef"; }
+
+.fad.fa-cheese-swiss:after {
+  content: "\10f7f0"; }
+
+.fad.fa-cheeseburger:after {
+  content: "\10f7f1"; }
+
+.fad.fa-chess:after {
+  content: "\10f439"; }
+
+.fad.fa-chess-bishop:after {
+  content: "\10f43a"; }
+
+.fad.fa-chess-bishop-alt:after {
+  content: "\10f43b"; }
+
+.fad.fa-chess-board:after {
+  content: "\10f43c"; }
+
+.fad.fa-chess-clock:after {
+  content: "\10f43d"; }
+
+.fad.fa-chess-clock-alt:after {
+  content: "\10f43e"; }
+
+.fad.fa-chess-king:after {
+  content: "\10f43f"; }
+
+.fad.fa-chess-king-alt:after {
+  content: "\10f440"; }
+
+.fad.fa-chess-knight:after {
+  content: "\10f441"; }
+
+.fad.fa-chess-knight-alt:after {
+  content: "\10f442"; }
+
+.fad.fa-chess-pawn:after {
+  content: "\10f443"; }
+
+.fad.fa-chess-pawn-alt:after {
+  content: "\10f444"; }
+
+.fad.fa-chess-queen:after {
+  content: "\10f445"; }
+
+.fad.fa-chess-queen-alt:after {
+  content: "\10f446"; }
+
+.fad.fa-chess-rook:after {
+  content: "\10f447"; }
+
+.fad.fa-chess-rook-alt:after {
+  content: "\10f448"; }
+
+.fad.fa-chevron-circle-down:after {
+  content: "\10f13a"; }
+
+.fad.fa-chevron-circle-left:after {
+  content: "\10f137"; }
+
+.fad.fa-chevron-circle-right:after {
+  content: "\10f138"; }
+
+.fad.fa-chevron-circle-up:after {
+  content: "\10f139"; }
+
+.fad.fa-chevron-double-down:after {
+  content: "\10f322"; }
+
+.fad.fa-chevron-double-left:after {
+  content: "\10f323"; }
+
+.fad.fa-chevron-double-right:after {
+  content: "\10f324"; }
+
+.fad.fa-chevron-double-up:after {
+  content: "\10f325"; }
+
+.fad.fa-chevron-down:after {
+  content: "\10f078"; }
+
+.fad.fa-chevron-left:after {
+  content: "\10f053"; }
+
+.fad.fa-chevron-right:after {
+  content: "\10f054"; }
+
+.fad.fa-chevron-square-down:after {
+  content: "\10f329"; }
+
+.fad.fa-chevron-square-left:after {
+  content: "\10f32a"; }
+
+.fad.fa-chevron-square-right:after {
+  content: "\10f32b"; }
+
+.fad.fa-chevron-square-up:after {
+  content: "\10f32c"; }
+
+.fad.fa-chevron-up:after {
+  content: "\10f077"; }
+
+.fad.fa-child:after {
+  content: "\10f1ae"; }
+
+.fad.fa-chimney:after {
+  content: "\10f78b"; }
+
+.fad.fa-church:after {
+  content: "\10f51d"; }
+
+.fad.fa-circle:after {
+  content: "\10f111"; }
+
+.fad.fa-circle-notch:after {
+  content: "\10f1ce"; }
+
+.fad.fa-city:after {
+  content: "\10f64f"; }
+
+.fad.fa-clarinet:after {
+  content: "\10f8ad"; }
+
+.fad.fa-claw-marks:after {
+  content: "\10f6c2"; }
+
+.fad.fa-clinic-medical:after {
+  content: "\10f7f2"; }
+
+.fad.fa-clipboard:after {
+  content: "\10f328"; }
+
+.fad.fa-clipboard-check:after {
+  content: "\10f46c"; }
+
+.fad.fa-clipboard-list:after {
+  content: "\10f46d"; }
+
+.fad.fa-clipboard-list-check:after {
+  content: "\10f737"; }
+
+.fad.fa-clipboard-prescription:after {
+  content: "\10f5e8"; }
+
+.fad.fa-clipboard-user:after {
+  content: "\10f7f3"; }
+
+.fad.fa-clock:after {
+  content: "\10f017"; }
+
+.fad.fa-clone:after {
+  content: "\10f24d"; }
+
+.fad.fa-closed-captioning:after {
+  content: "\10f20a"; }
+
+.fad.fa-cloud:after {
+  content: "\10f0c2"; }
+
+.fad.fa-cloud-download:after {
+  content: "\10f0ed"; }
+
+.fad.fa-cloud-download-alt:after {
+  content: "\10f381"; }
+
+.fad.fa-cloud-drizzle:after {
+  content: "\10f738"; }
+
+.fad.fa-cloud-hail:after {
+  content: "\10f739"; }
+
+.fad.fa-cloud-hail-mixed:after {
+  content: "\10f73a"; }
+
+.fad.fa-cloud-meatball:after {
+  content: "\10f73b"; }
+
+.fad.fa-cloud-moon:after {
+  content: "\10f6c3"; }
+
+.fad.fa-cloud-moon-rain:after {
+  content: "\10f73c"; }
+
+.fad.fa-cloud-music:after {
+  content: "\10f8ae"; }
+
+.fad.fa-cloud-rain:after {
+  content: "\10f73d"; }
+
+.fad.fa-cloud-rainbow:after {
+  content: "\10f73e"; }
+
+.fad.fa-cloud-showers:after {
+  content: "\10f73f"; }
+
+.fad.fa-cloud-showers-heavy:after {
+  content: "\10f740"; }
+
+.fad.fa-cloud-sleet:after {
+  content: "\10f741"; }
+
+.fad.fa-cloud-snow:after {
+  content: "\10f742"; }
+
+.fad.fa-cloud-sun:after {
+  content: "\10f6c4"; }
+
+.fad.fa-cloud-sun-rain:after {
+  content: "\10f743"; }
+
+.fad.fa-cloud-upload:after {
+  content: "\10f0ee"; }
+
+.fad.fa-cloud-upload-alt:after {
+  content: "\10f382"; }
+
+.fad.fa-clouds:after {
+  content: "\10f744"; }
+
+.fad.fa-clouds-moon:after {
+  content: "\10f745"; }
+
+.fad.fa-clouds-sun:after {
+  content: "\10f746"; }
+
+.fad.fa-club:after {
+  content: "\10f327"; }
+
+.fad.fa-cocktail:after {
+  content: "\10f561"; }
+
+.fad.fa-code:after {
+  content: "\10f121"; }
+
+.fad.fa-code-branch:after {
+  content: "\10f126"; }
+
+.fad.fa-code-commit:after {
+  content: "\10f386"; }
+
+.fad.fa-code-merge:after {
+  content: "\10f387"; }
+
+.fad.fa-coffee:after {
+  content: "\10f0f4"; }
+
+.fad.fa-coffee-pot:after {
+  content: "\10e002"; }
+
+.fad.fa-coffee-togo:after {
+  content: "\10f6c5"; }
+
+.fad.fa-coffin:after {
+  content: "\10f6c6"; }
+
+.fad.fa-coffin-cross:after {
+  content: "\10e051"; }
+
+.fad.fa-cog:after {
+  content: "\10f013"; }
+
+.fad.fa-cogs:after {
+  content: "\10f085"; }
+
+.fad.fa-coin:after {
+  content: "\10f85c"; }
+
+.fad.fa-coins:after {
+  content: "\10f51e"; }
+
+.fad.fa-columns:after {
+  content: "\10f0db"; }
+
+.fad.fa-comet:after {
+  content: "\10e003"; }
+
+.fad.fa-comment:after {
+  content: "\10f075"; }
+
+.fad.fa-comment-alt:after {
+  content: "\10f27a"; }
+
+.fad.fa-comment-alt-check:after {
+  content: "\10f4a2"; }
+
+.fad.fa-comment-alt-dollar:after {
+  content: "\10f650"; }
+
+.fad.fa-comment-alt-dots:after {
+  content: "\10f4a3"; }
+
+.fad.fa-comment-alt-edit:after {
+  content: "\10f4a4"; }
+
+.fad.fa-comment-alt-exclamation:after {
+  content: "\10f4a5"; }
+
+.fad.fa-comment-alt-lines:after {
+  content: "\10f4a6"; }
+
+.fad.fa-comment-alt-medical:after {
+  content: "\10f7f4"; }
+
+.fad.fa-comment-alt-minus:after {
+  content: "\10f4a7"; }
+
+.fad.fa-comment-alt-music:after {
+  content: "\10f8af"; }
+
+.fad.fa-comment-alt-plus:after {
+  content: "\10f4a8"; }
+
+.fad.fa-comment-alt-slash:after {
+  content: "\10f4a9"; }
+
+.fad.fa-comment-alt-smile:after {
+  content: "\10f4aa"; }
+
+.fad.fa-comment-alt-times:after {
+  content: "\10f4ab"; }
+
+.fad.fa-comment-check:after {
+  content: "\10f4ac"; }
+
+.fad.fa-comment-dollar:after {
+  content: "\10f651"; }
+
+.fad.fa-comment-dots:after {
+  content: "\10f4ad"; }
+
+.fad.fa-comment-edit:after {
+  content: "\10f4ae"; }
+
+.fad.fa-comment-exclamation:after {
+  content: "\10f4af"; }
+
+.fad.fa-comment-lines:after {
+  content: "\10f4b0"; }
+
+.fad.fa-comment-medical:after {
+  content: "\10f7f5"; }
+
+.fad.fa-comment-minus:after {
+  content: "\10f4b1"; }
+
+.fad.fa-comment-music:after {
+  content: "\10f8b0"; }
+
+.fad.fa-comment-plus:after {
+  content: "\10f4b2"; }
+
+.fad.fa-comment-slash:after {
+  content: "\10f4b3"; }
+
+.fad.fa-comment-smile:after {
+  content: "\10f4b4"; }
+
+.fad.fa-comment-times:after {
+  content: "\10f4b5"; }
+
+.fad.fa-comments:after {
+  content: "\10f086"; }
+
+.fad.fa-comments-alt:after {
+  content: "\10f4b6"; }
+
+.fad.fa-comments-alt-dollar:after {
+  content: "\10f652"; }
+
+.fad.fa-comments-dollar:after {
+  content: "\10f653"; }
+
+.fad.fa-compact-disc:after {
+  content: "\10f51f"; }
+
+.fad.fa-compass:after {
+  content: "\10f14e"; }
+
+.fad.fa-compass-slash:after {
+  content: "\10f5e9"; }
+
+.fad.fa-compress:after {
+  content: "\10f066"; }
+
+.fad.fa-compress-alt:after {
+  content: "\10f422"; }
+
+.fad.fa-compress-arrows-alt:after {
+  content: "\10f78c"; }
+
+.fad.fa-compress-wide:after {
+  content: "\10f326"; }
+
+.fad.fa-computer-classic:after {
+  content: "\10f8b1"; }
+
+.fad.fa-computer-speaker:after {
+  content: "\10f8b2"; }
+
+.fad.fa-concierge-bell:after {
+  content: "\10f562"; }
+
+.fad.fa-construction:after {
+  content: "\10f85d"; }
+
+.fad.fa-container-storage:after {
+  content: "\10f4b7"; }
+
+.fad.fa-conveyor-belt:after {
+  content: "\10f46e"; }
+
+.fad.fa-conveyor-belt-alt:after {
+  content: "\10f46f"; }
+
+.fad.fa-cookie:after {
+  content: "\10f563"; }
+
+.fad.fa-cookie-bite:after {
+  content: "\10f564"; }
+
+.fad.fa-copy:after {
+  content: "\10f0c5"; }
+
+.fad.fa-copyright:after {
+  content: "\10f1f9"; }
+
+.fad.fa-corn:after {
+  content: "\10f6c7"; }
+
+.fad.fa-couch:after {
+  content: "\10f4b8"; }
+
+.fad.fa-cow:after {
+  content: "\10f6c8"; }
+
+.fad.fa-cowbell:after {
+  content: "\10f8b3"; }
+
+.fad.fa-cowbell-more:after {
+  content: "\10f8b4"; }
+
+.fad.fa-credit-card:after {
+  content: "\10f09d"; }
+
+.fad.fa-credit-card-blank:after {
+  content: "\10f389"; }
+
+.fad.fa-credit-card-front:after {
+  content: "\10f38a"; }
+
+.fad.fa-cricket:after {
+  content: "\10f449"; }
+
+.fad.fa-croissant:after {
+  content: "\10f7f6"; }
+
+.fad.fa-crop:after {
+  content: "\10f125"; }
+
+.fad.fa-crop-alt:after {
+  content: "\10f565"; }
+
+.fad.fa-cross:after {
+  content: "\10f654"; }
+
+.fad.fa-crosshairs:after {
+  content: "\10f05b"; }
+
+.fad.fa-crow:after {
+  content: "\10f520"; }
+
+.fad.fa-crown:after {
+  content: "\10f521"; }
+
+.fad.fa-crutch:after {
+  content: "\10f7f7"; }
+
+.fad.fa-crutches:after {
+  content: "\10f7f8"; }
+
+.fad.fa-cube:after {
+  content: "\10f1b2"; }
+
+.fad.fa-cubes:after {
+  content: "\10f1b3"; }
+
+.fad.fa-curling:after {
+  content: "\10f44a"; }
+
+.fad.fa-cut:after {
+  content: "\10f0c4"; }
+
+.fad.fa-dagger:after {
+  content: "\10f6cb"; }
+
+.fad.fa-database:after {
+  content: "\10f1c0"; }
+
+.fad.fa-deaf:after {
+  content: "\10f2a4"; }
+
+.fad.fa-debug:after {
+  content: "\10f7f9"; }
+
+.fad.fa-deer:after {
+  content: "\10f78e"; }
+
+.fad.fa-deer-rudolph:after {
+  content: "\10f78f"; }
+
+.fad.fa-democrat:after {
+  content: "\10f747"; }
+
+.fad.fa-desktop:after {
+  content: "\10f108"; }
+
+.fad.fa-desktop-alt:after {
+  content: "\10f390"; }
+
+.fad.fa-dewpoint:after {
+  content: "\10f748"; }
+
+.fad.fa-dharmachakra:after {
+  content: "\10f655"; }
+
+.fad.fa-diagnoses:after {
+  content: "\10f470"; }
+
+.fad.fa-diamond:after {
+  content: "\10f219"; }
+
+.fad.fa-dice:after {
+  content: "\10f522"; }
+
+.fad.fa-dice-d10:after {
+  content: "\10f6cd"; }
+
+.fad.fa-dice-d12:after {
+  content: "\10f6ce"; }
+
+.fad.fa-dice-d20:after {
+  content: "\10f6cf"; }
+
+.fad.fa-dice-d4:after {
+  content: "\10f6d0"; }
+
+.fad.fa-dice-d6:after {
+  content: "\10f6d1"; }
+
+.fad.fa-dice-d8:after {
+  content: "\10f6d2"; }
+
+.fad.fa-dice-five:after {
+  content: "\10f523"; }
+
+.fad.fa-dice-four:after {
+  content: "\10f524"; }
+
+.fad.fa-dice-one:after {
+  content: "\10f525"; }
+
+.fad.fa-dice-six:after {
+  content: "\10f526"; }
+
+.fad.fa-dice-three:after {
+  content: "\10f527"; }
+
+.fad.fa-dice-two:after {
+  content: "\10f528"; }
+
+.fad.fa-digging:after {
+  content: "\10f85e"; }
+
+.fad.fa-digital-tachograph:after {
+  content: "\10f566"; }
+
+.fad.fa-diploma:after {
+  content: "\10f5ea"; }
+
+.fad.fa-directions:after {
+  content: "\10f5eb"; }
+
+.fad.fa-disc-drive:after {
+  content: "\10f8b5"; }
+
+.fad.fa-disease:after {
+  content: "\10f7fa"; }
+
+.fad.fa-divide:after {
+  content: "\10f529"; }
+
+.fad.fa-dizzy:after {
+  content: "\10f567"; }
+
+.fad.fa-dna:after {
+  content: "\10f471"; }
+
+.fad.fa-do-not-enter:after {
+  content: "\10f5ec"; }
+
+.fad.fa-dog:after {
+  content: "\10f6d3"; }
+
+.fad.fa-dog-leashed:after {
+  content: "\10f6d4"; }
+
+.fad.fa-dollar-sign:after {
+  content: "\10f155"; }
+
+.fad.fa-dolly:after {
+  content: "\10f472"; }
+
+.fad.fa-dolly-empty:after {
+  content: "\10f473"; }
+
+.fad.fa-dolly-flatbed:after {
+  content: "\10f474"; }
+
+.fad.fa-dolly-flatbed-alt:after {
+  content: "\10f475"; }
+
+.fad.fa-dolly-flatbed-empty:after {
+  content: "\10f476"; }
+
+.fad.fa-donate:after {
+  content: "\10f4b9"; }
+
+.fad.fa-door-closed:after {
+  content: "\10f52a"; }
+
+.fad.fa-door-open:after {
+  content: "\10f52b"; }
+
+.fad.fa-dot-circle:after {
+  content: "\10f192"; }
+
+.fad.fa-dove:after {
+  content: "\10f4ba"; }
+
+.fad.fa-download:after {
+  content: "\10f019"; }
+
+.fad.fa-drafting-compass:after {
+  content: "\10f568"; }
+
+.fad.fa-dragon:after {
+  content: "\10f6d5"; }
+
+.fad.fa-draw-circle:after {
+  content: "\10f5ed"; }
+
+.fad.fa-draw-polygon:after {
+  content: "\10f5ee"; }
+
+.fad.fa-draw-square:after {
+  content: "\10f5ef"; }
+
+.fad.fa-dreidel:after {
+  content: "\10f792"; }
+
+.fad.fa-drone:after {
+  content: "\10f85f"; }
+
+.fad.fa-drone-alt:after {
+  content: "\10f860"; }
+
+.fad.fa-drum:after {
+  content: "\10f569"; }
+
+.fad.fa-drum-steelpan:after {
+  content: "\10f56a"; }
+
+.fad.fa-drumstick:after {
+  content: "\10f6d6"; }
+
+.fad.fa-drumstick-bite:after {
+  content: "\10f6d7"; }
+
+.fad.fa-dryer:after {
+  content: "\10f861"; }
+
+.fad.fa-dryer-alt:after {
+  content: "\10f862"; }
+
+.fad.fa-duck:after {
+  content: "\10f6d8"; }
+
+.fad.fa-dumbbell:after {
+  content: "\10f44b"; }
+
+.fad.fa-dumpster:after {
+  content: "\10f793"; }
+
+.fad.fa-dumpster-fire:after {
+  content: "\10f794"; }
+
+.fad.fa-dungeon:after {
+  content: "\10f6d9"; }
+
+.fad.fa-ear:after {
+  content: "\10f5f0"; }
+
+.fad.fa-ear-muffs:after {
+  content: "\10f795"; }
+
+.fad.fa-eclipse:after {
+  content: "\10f749"; }
+
+.fad.fa-eclipse-alt:after {
+  content: "\10f74a"; }
+
+.fad.fa-edit:after {
+  content: "\10f044"; }
+
+.fad.fa-egg:after {
+  content: "\10f7fb"; }
+
+.fad.fa-egg-fried:after {
+  content: "\10f7fc"; }
+
+.fad.fa-eject:after {
+  content: "\10f052"; }
+
+.fad.fa-elephant:after {
+  content: "\10f6da"; }
+
+.fad.fa-ellipsis-h:after {
+  content: "\10f141"; }
+
+.fad.fa-ellipsis-h-alt:after {
+  content: "\10f39b"; }
+
+.fad.fa-ellipsis-v:after {
+  content: "\10f142"; }
+
+.fad.fa-ellipsis-v-alt:after {
+  content: "\10f39c"; }
+
+.fad.fa-empty-set:after {
+  content: "\10f656"; }
+
+.fad.fa-engine-warning:after {
+  content: "\10f5f2"; }
+
+.fad.fa-envelope:after {
+  content: "\10f0e0"; }
+
+.fad.fa-envelope-open:after {
+  content: "\10f2b6"; }
+
+.fad.fa-envelope-open-dollar:after {
+  content: "\10f657"; }
+
+.fad.fa-envelope-open-text:after {
+  content: "\10f658"; }
+
+.fad.fa-envelope-square:after {
+  content: "\10f199"; }
+
+.fad.fa-equals:after {
+  content: "\10f52c"; }
+
+.fad.fa-eraser:after {
+  content: "\10f12d"; }
+
+.fad.fa-ethernet:after {
+  content: "\10f796"; }
+
+.fad.fa-euro-sign:after {
+  content: "\10f153"; }
+
+.fad.fa-exchange:after {
+  content: "\10f0ec"; }
+
+.fad.fa-exchange-alt:after {
+  content: "\10f362"; }
+
+.fad.fa-exclamation:after {
+  content: "\10f12a"; }
+
+.fad.fa-exclamation-circle:after {
+  content: "\10f06a"; }
+
+.fad.fa-exclamation-square:after {
+  content: "\10f321"; }
+
+.fad.fa-exclamation-triangle:after {
+  content: "\10f071"; }
+
+.fad.fa-expand:after {
+  content: "\10f065"; }
+
+.fad.fa-expand-alt:after {
+  content: "\10f424"; }
+
+.fad.fa-expand-arrows:after {
+  content: "\10f31d"; }
+
+.fad.fa-expand-arrows-alt:after {
+  content: "\10f31e"; }
+
+.fad.fa-expand-wide:after {
+  content: "\10f320"; }
+
+.fad.fa-external-link:after {
+  content: "\10f08e"; }
+
+.fad.fa-external-link-alt:after {
+  content: "\10f35d"; }
+
+.fad.fa-external-link-square:after {
+  content: "\10f14c"; }
+
+.fad.fa-external-link-square-alt:after {
+  content: "\10f360"; }
+
+.fad.fa-eye:after {
+  content: "\10f06e"; }
+
+.fad.fa-eye-dropper:after {
+  content: "\10f1fb"; }
+
+.fad.fa-eye-evil:after {
+  content: "\10f6db"; }
+
+.fad.fa-eye-slash:after {
+  content: "\10f070"; }
+
+.fad.fa-fan:after {
+  content: "\10f863"; }
+
+.fad.fa-fan-table:after {
+  content: "\10e004"; }
+
+.fad.fa-farm:after {
+  content: "\10f864"; }
+
+.fad.fa-fast-backward:after {
+  content: "\10f049"; }
+
+.fad.fa-fast-forward:after {
+  content: "\10f050"; }
+
+.fad.fa-faucet:after {
+  content: "\10e005"; }
+
+.fad.fa-faucet-drip:after {
+  content: "\10e006"; }
+
+.fad.fa-fax:after {
+  content: "\10f1ac"; }
+
+.fad.fa-feather:after {
+  content: "\10f52d"; }
+
+.fad.fa-feather-alt:after {
+  content: "\10f56b"; }
+
+.fad.fa-female:after {
+  content: "\10f182"; }
+
+.fad.fa-field-hockey:after {
+  content: "\10f44c"; }
+
+.fad.fa-fighter-jet:after {
+  content: "\10f0fb"; }
+
+.fad.fa-file:after {
+  content: "\10f15b"; }
+
+.fad.fa-file-alt:after {
+  content: "\10f15c"; }
+
+.fad.fa-file-archive:after {
+  content: "\10f1c6"; }
+
+.fad.fa-file-audio:after {
+  content: "\10f1c7"; }
+
+.fad.fa-file-certificate:after {
+  content: "\10f5f3"; }
+
+.fad.fa-file-chart-line:after {
+  content: "\10f659"; }
+
+.fad.fa-file-chart-pie:after {
+  content: "\10f65a"; }
+
+.fad.fa-file-check:after {
+  content: "\10f316"; }
+
+.fad.fa-file-code:after {
+  content: "\10f1c9"; }
+
+.fad.fa-file-contract:after {
+  content: "\10f56c"; }
+
+.fad.fa-file-csv:after {
+  content: "\10f6dd"; }
+
+.fad.fa-file-download:after {
+  content: "\10f56d"; }
+
+.fad.fa-file-edit:after {
+  content: "\10f31c"; }
+
+.fad.fa-file-excel:after {
+  content: "\10f1c3"; }
+
+.fad.fa-file-exclamation:after {
+  content: "\10f31a"; }
+
+.fad.fa-file-export:after {
+  content: "\10f56e"; }
+
+.fad.fa-file-image:after {
+  content: "\10f1c5"; }
+
+.fad.fa-file-import:after {
+  content: "\10f56f"; }
+
+.fad.fa-file-invoice:after {
+  content: "\10f570"; }
+
+.fad.fa-file-invoice-dollar:after {
+  content: "\10f571"; }
+
+.fad.fa-file-medical:after {
+  content: "\10f477"; }
+
+.fad.fa-file-medical-alt:after {
+  content: "\10f478"; }
+
+.fad.fa-file-minus:after {
+  content: "\10f318"; }
+
+.fad.fa-file-music:after {
+  content: "\10f8b6"; }
+
+.fad.fa-file-pdf:after {
+  content: "\10f1c1"; }
+
+.fad.fa-file-plus:after {
+  content: "\10f319"; }
+
+.fad.fa-file-powerpoint:after {
+  content: "\10f1c4"; }
+
+.fad.fa-file-prescription:after {
+  content: "\10f572"; }
+
+.fad.fa-file-search:after {
+  content: "\10f865"; }
+
+.fad.fa-file-signature:after {
+  content: "\10f573"; }
+
+.fad.fa-file-spreadsheet:after {
+  content: "\10f65b"; }
+
+.fad.fa-file-times:after {
+  content: "\10f317"; }
+
+.fad.fa-file-upload:after {
+  content: "\10f574"; }
+
+.fad.fa-file-user:after {
+  content: "\10f65c"; }
+
+.fad.fa-file-video:after {
+  content: "\10f1c8"; }
+
+.fad.fa-file-word:after {
+  content: "\10f1c2"; }
+
+.fad.fa-files-medical:after {
+  content: "\10f7fd"; }
+
+.fad.fa-fill:after {
+  content: "\10f575"; }
+
+.fad.fa-fill-drip:after {
+  content: "\10f576"; }
+
+.fad.fa-film:after {
+  content: "\10f008"; }
+
+.fad.fa-film-alt:after {
+  content: "\10f3a0"; }
+
+.fad.fa-film-canister:after {
+  content: "\10f8b7"; }
+
+.fad.fa-filter:after {
+  content: "\10f0b0"; }
+
+.fad.fa-fingerprint:after {
+  content: "\10f577"; }
+
+.fad.fa-fire:after {
+  content: "\10f06d"; }
+
+.fad.fa-fire-alt:after {
+  content: "\10f7e4"; }
+
+.fad.fa-fire-extinguisher:after {
+  content: "\10f134"; }
+
+.fad.fa-fire-smoke:after {
+  content: "\10f74b"; }
+
+.fad.fa-fireplace:after {
+  content: "\10f79a"; }
+
+.fad.fa-first-aid:after {
+  content: "\10f479"; }
+
+.fad.fa-fish:after {
+  content: "\10f578"; }
+
+.fad.fa-fish-cooked:after {
+  content: "\10f7fe"; }
+
+.fad.fa-fist-raised:after {
+  content: "\10f6de"; }
+
+.fad.fa-flag:after {
+  content: "\10f024"; }
+
+.fad.fa-flag-alt:after {
+  content: "\10f74c"; }
+
+.fad.fa-flag-checkered:after {
+  content: "\10f11e"; }
+
+.fad.fa-flag-usa:after {
+  content: "\10f74d"; }
+
+.fad.fa-flame:after {
+  content: "\10f6df"; }
+
+.fad.fa-flashlight:after {
+  content: "\10f8b8"; }
+
+.fad.fa-flask:after {
+  content: "\10f0c3"; }
+
+.fad.fa-flask-poison:after {
+  content: "\10f6e0"; }
+
+.fad.fa-flask-potion:after {
+  content: "\10f6e1"; }
+
+.fad.fa-flower:after {
+  content: "\10f7ff"; }
+
+.fad.fa-flower-daffodil:after {
+  content: "\10f800"; }
+
+.fad.fa-flower-tulip:after {
+  content: "\10f801"; }
+
+.fad.fa-flushed:after {
+  content: "\10f579"; }
+
+.fad.fa-flute:after {
+  content: "\10f8b9"; }
+
+.fad.fa-flux-capacitor:after {
+  content: "\10f8ba"; }
+
+.fad.fa-fog:after {
+  content: "\10f74e"; }
+
+.fad.fa-folder:after {
+  content: "\10f07b"; }
+
+.fad.fa-folder-download:after {
+  content: "\10e053"; }
+
+.fad.fa-folder-minus:after {
+  content: "\10f65d"; }
+
+.fad.fa-folder-open:after {
+  content: "\10f07c"; }
+
+.fad.fa-folder-plus:after {
+  content: "\10f65e"; }
+
+.fad.fa-folder-times:after {
+  content: "\10f65f"; }
+
+.fad.fa-folder-tree:after {
+  content: "\10f802"; }
+
+.fad.fa-folder-upload:after {
+  content: "\10e054"; }
+
+.fad.fa-folders:after {
+  content: "\10f660"; }
+
+.fad.fa-font:after {
+  content: "\10f031"; }
+
+.fad.fa-font-awesome-logo-full:after {
+  content: "\10f4e6"; }
+
+.fad.fa-font-case:after {
+  content: "\10f866"; }
+
+.fad.fa-football-ball:after {
+  content: "\10f44e"; }
+
+.fad.fa-football-helmet:after {
+  content: "\10f44f"; }
+
+.fad.fa-forklift:after {
+  content: "\10f47a"; }
+
+.fad.fa-forward:after {
+  content: "\10f04e"; }
+
+.fad.fa-fragile:after {
+  content: "\10f4bb"; }
+
+.fad.fa-french-fries:after {
+  content: "\10f803"; }
+
+.fad.fa-frog:after {
+  content: "\10f52e"; }
+
+.fad.fa-frosty-head:after {
+  content: "\10f79b"; }
+
+.fad.fa-frown:after {
+  content: "\10f119"; }
+
+.fad.fa-frown-open:after {
+  content: "\10f57a"; }
+
+.fad.fa-function:after {
+  content: "\10f661"; }
+
+.fad.fa-funnel-dollar:after {
+  content: "\10f662"; }
+
+.fad.fa-futbol:after {
+  content: "\10f1e3"; }
+
+.fad.fa-galaxy:after {
+  content: "\10e008"; }
+
+.fad.fa-game-board:after {
+  content: "\10f867"; }
+
+.fad.fa-game-board-alt:after {
+  content: "\10f868"; }
+
+.fad.fa-game-console-handheld:after {
+  content: "\10f8bb"; }
+
+.fad.fa-gamepad:after {
+  content: "\10f11b"; }
+
+.fad.fa-gamepad-alt:after {
+  content: "\10f8bc"; }
+
+.fad.fa-garage:after {
+  content: "\10e009"; }
+
+.fad.fa-garage-car:after {
+  content: "\10e00a"; }
+
+.fad.fa-garage-open:after {
+  content: "\10e00b"; }
+
+.fad.fa-gas-pump:after {
+  content: "\10f52f"; }
+
+.fad.fa-gas-pump-slash:after {
+  content: "\10f5f4"; }
+
+.fad.fa-gavel:after {
+  content: "\10f0e3"; }
+
+.fad.fa-gem:after {
+  content: "\10f3a5"; }
+
+.fad.fa-genderless:after {
+  content: "\10f22d"; }
+
+.fad.fa-ghost:after {
+  content: "\10f6e2"; }
+
+.fad.fa-gift:after {
+  content: "\10f06b"; }
+
+.fad.fa-gift-card:after {
+  content: "\10f663"; }
+
+.fad.fa-gifts:after {
+  content: "\10f79c"; }
+
+.fad.fa-gingerbread-man:after {
+  content: "\10f79d"; }
+
+.fad.fa-glass:after {
+  content: "\10f804"; }
+
+.fad.fa-glass-champagne:after {
+  content: "\10f79e"; }
+
+.fad.fa-glass-cheers:after {
+  content: "\10f79f"; }
+
+.fad.fa-glass-citrus:after {
+  content: "\10f869"; }
+
+.fad.fa-glass-martini:after {
+  content: "\10f000"; }
+
+.fad.fa-glass-martini-alt:after {
+  content: "\10f57b"; }
+
+.fad.fa-glass-whiskey:after {
+  content: "\10f7a0"; }
+
+.fad.fa-glass-whiskey-rocks:after {
+  content: "\10f7a1"; }
+
+.fad.fa-glasses:after {
+  content: "\10f530"; }
+
+.fad.fa-glasses-alt:after {
+  content: "\10f5f5"; }
+
+.fad.fa-globe:after {
+  content: "\10f0ac"; }
+
+.fad.fa-globe-africa:after {
+  content: "\10f57c"; }
+
+.fad.fa-globe-americas:after {
+  content: "\10f57d"; }
+
+.fad.fa-globe-asia:after {
+  content: "\10f57e"; }
+
+.fad.fa-globe-europe:after {
+  content: "\10f7a2"; }
+
+.fad.fa-globe-snow:after {
+  content: "\10f7a3"; }
+
+.fad.fa-globe-stand:after {
+  content: "\10f5f6"; }
+
+.fad.fa-golf-ball:after {
+  content: "\10f450"; }
+
+.fad.fa-golf-club:after {
+  content: "\10f451"; }
+
+.fad.fa-gopuram:after {
+  content: "\10f664"; }
+
+.fad.fa-graduation-cap:after {
+  content: "\10f19d"; }
+
+.fad.fa-gramophone:after {
+  content: "\10f8bd"; }
+
+.fad.fa-greater-than:after {
+  content: "\10f531"; }
+
+.fad.fa-greater-than-equal:after {
+  content: "\10f532"; }
+
+.fad.fa-grimace:after {
+  content: "\10f57f"; }
+
+.fad.fa-grin:after {
+  content: "\10f580"; }
+
+.fad.fa-grin-alt:after {
+  content: "\10f581"; }
+
+.fad.fa-grin-beam:after {
+  content: "\10f582"; }
+
+.fad.fa-grin-beam-sweat:after {
+  content: "\10f583"; }
+
+.fad.fa-grin-hearts:after {
+  content: "\10f584"; }
+
+.fad.fa-grin-squint:after {
+  content: "\10f585"; }
+
+.fad.fa-grin-squint-tears:after {
+  content: "\10f586"; }
+
+.fad.fa-grin-stars:after {
+  content: "\10f587"; }
+
+.fad.fa-grin-tears:after {
+  content: "\10f588"; }
+
+.fad.fa-grin-tongue:after {
+  content: "\10f589"; }
+
+.fad.fa-grin-tongue-squint:after {
+  content: "\10f58a"; }
+
+.fad.fa-grin-tongue-wink:after {
+  content: "\10f58b"; }
+
+.fad.fa-grin-wink:after {
+  content: "\10f58c"; }
+
+.fad.fa-grip-horizontal:after {
+  content: "\10f58d"; }
+
+.fad.fa-grip-lines:after {
+  content: "\10f7a4"; }
+
+.fad.fa-grip-lines-vertical:after {
+  content: "\10f7a5"; }
+
+.fad.fa-grip-vertical:after {
+  content: "\10f58e"; }
+
+.fad.fa-guitar:after {
+  content: "\10f7a6"; }
+
+.fad.fa-guitar-electric:after {
+  content: "\10f8be"; }
+
+.fad.fa-guitars:after {
+  content: "\10f8bf"; }
+
+.fad.fa-h-square:after {
+  content: "\10f0fd"; }
+
+.fad.fa-h1:after {
+  content: "\10f313"; }
+
+.fad.fa-h2:after {
+  content: "\10f314"; }
+
+.fad.fa-h3:after {
+  content: "\10f315"; }
+
+.fad.fa-h4:after {
+  content: "\10f86a"; }
+
+.fad.fa-hamburger:after {
+  content: "\10f805"; }
+
+.fad.fa-hammer:after {
+  content: "\10f6e3"; }
+
+.fad.fa-hammer-war:after {
+  content: "\10f6e4"; }
+
+.fad.fa-hamsa:after {
+  content: "\10f665"; }
+
+.fad.fa-hand-heart:after {
+  content: "\10f4bc"; }
+
+.fad.fa-hand-holding:after {
+  content: "\10f4bd"; }
+
+.fad.fa-hand-holding-box:after {
+  content: "\10f47b"; }
+
+.fad.fa-hand-holding-heart:after {
+  content: "\10f4be"; }
+
+.fad.fa-hand-holding-magic:after {
+  content: "\10f6e5"; }
+
+.fad.fa-hand-holding-medical:after {
+  content: "\10e05c"; }
+
+.fad.fa-hand-holding-seedling:after {
+  content: "\10f4bf"; }
+
+.fad.fa-hand-holding-usd:after {
+  content: "\10f4c0"; }
+
+.fad.fa-hand-holding-water:after {
+  content: "\10f4c1"; }
+
+.fad.fa-hand-lizard:after {
+  content: "\10f258"; }
+
+.fad.fa-hand-middle-finger:after {
+  content: "\10f806"; }
+
+.fad.fa-hand-paper:after {
+  content: "\10f256"; }
+
+.fad.fa-hand-peace:after {
+  content: "\10f25b"; }
+
+.fad.fa-hand-point-down:after {
+  content: "\10f0a7"; }
+
+.fad.fa-hand-point-left:after {
+  content: "\10f0a5"; }
+
+.fad.fa-hand-point-right:after {
+  content: "\10f0a4"; }
+
+.fad.fa-hand-point-up:after {
+  content: "\10f0a6"; }
+
+.fad.fa-hand-pointer:after {
+  content: "\10f25a"; }
+
+.fad.fa-hand-receiving:after {
+  content: "\10f47c"; }
+
+.fad.fa-hand-rock:after {
+  content: "\10f255"; }
+
+.fad.fa-hand-scissors:after {
+  content: "\10f257"; }
+
+.fad.fa-hand-sparkles:after {
+  content: "\10e05d"; }
+
+.fad.fa-hand-spock:after {
+  content: "\10f259"; }
+
+.fad.fa-hands:after {
+  content: "\10f4c2"; }
+
+.fad.fa-hands-heart:after {
+  content: "\10f4c3"; }
+
+.fad.fa-hands-helping:after {
+  content: "\10f4c4"; }
+
+.fad.fa-hands-usd:after {
+  content: "\10f4c5"; }
+
+.fad.fa-hands-wash:after {
+  content: "\10e05e"; }
+
+.fad.fa-handshake:after {
+  content: "\10f2b5"; }
+
+.fad.fa-handshake-alt:after {
+  content: "\10f4c6"; }
+
+.fad.fa-handshake-alt-slash:after {
+  content: "\10e05f"; }
+
+.fad.fa-handshake-slash:after {
+  content: "\10e060"; }
+
+.fad.fa-hanukiah:after {
+  content: "\10f6e6"; }
+
+.fad.fa-hard-hat:after {
+  content: "\10f807"; }
+
+.fad.fa-hashtag:after {
+  content: "\10f292"; }
+
+.fad.fa-hat-chef:after {
+  content: "\10f86b"; }
+
+.fad.fa-hat-cowboy:after {
+  content: "\10f8c0"; }
+
+.fad.fa-hat-cowboy-side:after {
+  content: "\10f8c1"; }
+
+.fad.fa-hat-santa:after {
+  content: "\10f7a7"; }
+
+.fad.fa-hat-winter:after {
+  content: "\10f7a8"; }
+
+.fad.fa-hat-witch:after {
+  content: "\10f6e7"; }
+
+.fad.fa-hat-wizard:after {
+  content: "\10f6e8"; }
+
+.fad.fa-hdd:after {
+  content: "\10f0a0"; }
+
+.fad.fa-head-side:after {
+  content: "\10f6e9"; }
+
+.fad.fa-head-side-brain:after {
+  content: "\10f808"; }
+
+.fad.fa-head-side-cough:after {
+  content: "\10e061"; }
+
+.fad.fa-head-side-cough-slash:after {
+  content: "\10e062"; }
+
+.fad.fa-head-side-headphones:after {
+  content: "\10f8c2"; }
+
+.fad.fa-head-side-mask:after {
+  content: "\10e063"; }
+
+.fad.fa-head-side-medical:after {
+  content: "\10f809"; }
+
+.fad.fa-head-side-virus:after {
+  content: "\10e064"; }
+
+.fad.fa-head-vr:after {
+  content: "\10f6ea"; }
+
+.fad.fa-heading:after {
+  content: "\10f1dc"; }
+
+.fad.fa-headphones:after {
+  content: "\10f025"; }
+
+.fad.fa-headphones-alt:after {
+  content: "\10f58f"; }
+
+.fad.fa-headset:after {
+  content: "\10f590"; }
+
+.fad.fa-heart:after {
+  content: "\10f004"; }
+
+.fad.fa-heart-broken:after {
+  content: "\10f7a9"; }
+
+.fad.fa-heart-circle:after {
+  content: "\10f4c7"; }
+
+.fad.fa-heart-rate:after {
+  content: "\10f5f8"; }
+
+.fad.fa-heart-square:after {
+  content: "\10f4c8"; }
+
+.fad.fa-heartbeat:after {
+  content: "\10f21e"; }
+
+.fad.fa-heat:after {
+  content: "\10e00c"; }
+
+.fad.fa-helicopter:after {
+  content: "\10f533"; }
+
+.fad.fa-helmet-battle:after {
+  content: "\10f6eb"; }
+
+.fad.fa-hexagon:after {
+  content: "\10f312"; }
+
+.fad.fa-highlighter:after {
+  content: "\10f591"; }
+
+.fad.fa-hiking:after {
+  content: "\10f6ec"; }
+
+.fad.fa-hippo:after {
+  content: "\10f6ed"; }
+
+.fad.fa-history:after {
+  content: "\10f1da"; }
+
+.fad.fa-hockey-mask:after {
+  content: "\10f6ee"; }
+
+.fad.fa-hockey-puck:after {
+  content: "\10f453"; }
+
+.fad.fa-hockey-sticks:after {
+  content: "\10f454"; }
+
+.fad.fa-holly-berry:after {
+  content: "\10f7aa"; }
+
+.fad.fa-home:after {
+  content: "\10f015"; }
+
+.fad.fa-home-alt:after {
+  content: "\10f80a"; }
+
+.fad.fa-home-heart:after {
+  content: "\10f4c9"; }
+
+.fad.fa-home-lg:after {
+  content: "\10f80b"; }
+
+.fad.fa-home-lg-alt:after {
+  content: "\10f80c"; }
+
+.fad.fa-hood-cloak:after {
+  content: "\10f6ef"; }
+
+.fad.fa-horizontal-rule:after {
+  content: "\10f86c"; }
+
+.fad.fa-horse:after {
+  content: "\10f6f0"; }
+
+.fad.fa-horse-head:after {
+  content: "\10f7ab"; }
+
+.fad.fa-horse-saddle:after {
+  content: "\10f8c3"; }
+
+.fad.fa-hospital:after {
+  content: "\10f0f8"; }
+
+.fad.fa-hospital-alt:after {
+  content: "\10f47d"; }
+
+.fad.fa-hospital-symbol:after {
+  content: "\10f47e"; }
+
+.fad.fa-hospital-user:after {
+  content: "\10f80d"; }
+
+.fad.fa-hospitals:after {
+  content: "\10f80e"; }
+
+.fad.fa-hot-tub:after {
+  content: "\10f593"; }
+
+.fad.fa-hotdog:after {
+  content: "\10f80f"; }
+
+.fad.fa-hotel:after {
+  content: "\10f594"; }
+
+.fad.fa-hourglass:after {
+  content: "\10f254"; }
+
+.fad.fa-hourglass-end:after {
+  content: "\10f253"; }
+
+.fad.fa-hourglass-half:after {
+  content: "\10f252"; }
+
+.fad.fa-hourglass-start:after {
+  content: "\10f251"; }
+
+.fad.fa-house:after {
+  content: "\10e00d"; }
+
+.fad.fa-house-damage:after {
+  content: "\10f6f1"; }
+
+.fad.fa-house-day:after {
+  content: "\10e00e"; }
+
+.fad.fa-house-flood:after {
+  content: "\10f74f"; }
+
+.fad.fa-house-leave:after {
+  content: "\10e00f"; }
+
+.fad.fa-house-night:after {
+  content: "\10e010"; }
+
+.fad.fa-house-return:after {
+  content: "\10e011"; }
+
+.fad.fa-house-signal:after {
+  content: "\10e012"; }
+
+.fad.fa-house-user:after {
+  content: "\10e065"; }
+
+.fad.fa-hryvnia:after {
+  content: "\10f6f2"; }
+
+.fad.fa-humidity:after {
+  content: "\10f750"; }
+
+.fad.fa-hurricane:after {
+  content: "\10f751"; }
+
+.fad.fa-i-cursor:after {
+  content: "\10f246"; }
+
+.fad.fa-ice-cream:after {
+  content: "\10f810"; }
+
+.fad.fa-ice-skate:after {
+  content: "\10f7ac"; }
+
+.fad.fa-icicles:after {
+  content: "\10f7ad"; }
+
+.fad.fa-icons:after {
+  content: "\10f86d"; }
+
+.fad.fa-icons-alt:after {
+  content: "\10f86e"; }
+
+.fad.fa-id-badge:after {
+  content: "\10f2c1"; }
+
+.fad.fa-id-card:after {
+  content: "\10f2c2"; }
+
+.fad.fa-id-card-alt:after {
+  content: "\10f47f"; }
+
+.fad.fa-igloo:after {
+  content: "\10f7ae"; }
+
+.fad.fa-image:after {
+  content: "\10f03e"; }
+
+.fad.fa-image-polaroid:after {
+  content: "\10f8c4"; }
+
+.fad.fa-images:after {
+  content: "\10f302"; }
+
+.fad.fa-inbox:after {
+  content: "\10f01c"; }
+
+.fad.fa-inbox-in:after {
+  content: "\10f310"; }
+
+.fad.fa-inbox-out:after {
+  content: "\10f311"; }
+
+.fad.fa-indent:after {
+  content: "\10f03c"; }
+
+.fad.fa-industry:after {
+  content: "\10f275"; }
+
+.fad.fa-industry-alt:after {
+  content: "\10f3b3"; }
+
+.fad.fa-infinity:after {
+  content: "\10f534"; }
+
+.fad.fa-info:after {
+  content: "\10f129"; }
+
+.fad.fa-info-circle:after {
+  content: "\10f05a"; }
+
+.fad.fa-info-square:after {
+  content: "\10f30f"; }
+
+.fad.fa-inhaler:after {
+  content: "\10f5f9"; }
+
+.fad.fa-integral:after {
+  content: "\10f667"; }
+
+.fad.fa-intersection:after {
+  content: "\10f668"; }
+
+.fad.fa-inventory:after {
+  content: "\10f480"; }
+
+.fad.fa-island-tropical:after {
+  content: "\10f811"; }
+
+.fad.fa-italic:after {
+  content: "\10f033"; }
+
+.fad.fa-jack-o-lantern:after {
+  content: "\10f30e"; }
+
+.fad.fa-jedi:after {
+  content: "\10f669"; }
+
+.fad.fa-joint:after {
+  content: "\10f595"; }
+
+.fad.fa-journal-whills:after {
+  content: "\10f66a"; }
+
+.fad.fa-joystick:after {
+  content: "\10f8c5"; }
+
+.fad.fa-jug:after {
+  content: "\10f8c6"; }
+
+.fad.fa-kaaba:after {
+  content: "\10f66b"; }
+
+.fad.fa-kazoo:after {
+  content: "\10f8c7"; }
+
+.fad.fa-kerning:after {
+  content: "\10f86f"; }
+
+.fad.fa-key:after {
+  content: "\10f084"; }
+
+.fad.fa-key-skeleton:after {
+  content: "\10f6f3"; }
+
+.fad.fa-keyboard:after {
+  content: "\10f11c"; }
+
+.fad.fa-keynote:after {
+  content: "\10f66c"; }
+
+.fad.fa-khanda:after {
+  content: "\10f66d"; }
+
+.fad.fa-kidneys:after {
+  content: "\10f5fb"; }
+
+.fad.fa-kiss:after {
+  content: "\10f596"; }
+
+.fad.fa-kiss-beam:after {
+  content: "\10f597"; }
+
+.fad.fa-kiss-wink-heart:after {
+  content: "\10f598"; }
+
+.fad.fa-kite:after {
+  content: "\10f6f4"; }
+
+.fad.fa-kiwi-bird:after {
+  content: "\10f535"; }
+
+.fad.fa-knife-kitchen:after {
+  content: "\10f6f5"; }
+
+.fad.fa-lambda:after {
+  content: "\10f66e"; }
+
+.fad.fa-lamp:after {
+  content: "\10f4ca"; }
+
+.fad.fa-lamp-desk:after {
+  content: "\10e014"; }
+
+.fad.fa-lamp-floor:after {
+  content: "\10e015"; }
+
+.fad.fa-landmark:after {
+  content: "\10f66f"; }
+
+.fad.fa-landmark-alt:after {
+  content: "\10f752"; }
+
+.fad.fa-language:after {
+  content: "\10f1ab"; }
+
+.fad.fa-laptop:after {
+  content: "\10f109"; }
+
+.fad.fa-laptop-code:after {
+  content: "\10f5fc"; }
+
+.fad.fa-laptop-house:after {
+  content: "\10e066"; }
+
+.fad.fa-laptop-medical:after {
+  content: "\10f812"; }
+
+.fad.fa-lasso:after {
+  content: "\10f8c8"; }
+
+.fad.fa-laugh:after {
+  content: "\10f599"; }
+
+.fad.fa-laugh-beam:after {
+  content: "\10f59a"; }
+
+.fad.fa-laugh-squint:after {
+  content: "\10f59b"; }
+
+.fad.fa-laugh-wink:after {
+  content: "\10f59c"; }
+
+.fad.fa-layer-group:after {
+  content: "\10f5fd"; }
+
+.fad.fa-layer-minus:after {
+  content: "\10f5fe"; }
+
+.fad.fa-layer-plus:after {
+  content: "\10f5ff"; }
+
+.fad.fa-leaf:after {
+  content: "\10f06c"; }
+
+.fad.fa-leaf-heart:after {
+  content: "\10f4cb"; }
+
+.fad.fa-leaf-maple:after {
+  content: "\10f6f6"; }
+
+.fad.fa-leaf-oak:after {
+  content: "\10f6f7"; }
+
+.fad.fa-lemon:after {
+  content: "\10f094"; }
+
+.fad.fa-less-than:after {
+  content: "\10f536"; }
+
+.fad.fa-less-than-equal:after {
+  content: "\10f537"; }
+
+.fad.fa-level-down:after {
+  content: "\10f149"; }
+
+.fad.fa-level-down-alt:after {
+  content: "\10f3be"; }
+
+.fad.fa-level-up:after {
+  content: "\10f148"; }
+
+.fad.fa-level-up-alt:after {
+  content: "\10f3bf"; }
+
+.fad.fa-life-ring:after {
+  content: "\10f1cd"; }
+
+.fad.fa-light-ceiling:after {
+  content: "\10e016"; }
+
+.fad.fa-light-switch:after {
+  content: "\10e017"; }
+
+.fad.fa-light-switch-off:after {
+  content: "\10e018"; }
+
+.fad.fa-light-switch-on:after {
+  content: "\10e019"; }
+
+.fad.fa-lightbulb:after {
+  content: "\10f0eb"; }
+
+.fad.fa-lightbulb-dollar:after {
+  content: "\10f670"; }
+
+.fad.fa-lightbulb-exclamation:after {
+  content: "\10f671"; }
+
+.fad.fa-lightbulb-on:after {
+  content: "\10f672"; }
+
+.fad.fa-lightbulb-slash:after {
+  content: "\10f673"; }
+
+.fad.fa-lights-holiday:after {
+  content: "\10f7b2"; }
+
+.fad.fa-line-columns:after {
+  content: "\10f870"; }
+
+.fad.fa-line-height:after {
+  content: "\10f871"; }
+
+.fad.fa-link:after {
+  content: "\10f0c1"; }
+
+.fad.fa-lips:after {
+  content: "\10f600"; }
+
+.fad.fa-lira-sign:after {
+  content: "\10f195"; }
+
+.fad.fa-list:after {
+  content: "\10f03a"; }
+
+.fad.fa-list-alt:after {
+  content: "\10f022"; }
+
+.fad.fa-list-music:after {
+  content: "\10f8c9"; }
+
+.fad.fa-list-ol:after {
+  content: "\10f0cb"; }
+
+.fad.fa-list-ul:after {
+  content: "\10f0ca"; }
+
+.fad.fa-location:after {
+  content: "\10f601"; }
+
+.fad.fa-location-arrow:after {
+  content: "\10f124"; }
+
+.fad.fa-location-circle:after {
+  content: "\10f602"; }
+
+.fad.fa-location-slash:after {
+  content: "\10f603"; }
+
+.fad.fa-lock:after {
+  content: "\10f023"; }
+
+.fad.fa-lock-alt:after {
+  content: "\10f30d"; }
+
+.fad.fa-lock-open:after {
+  content: "\10f3c1"; }
+
+.fad.fa-lock-open-alt:after {
+  content: "\10f3c2"; }
+
+.fad.fa-long-arrow-alt-down:after {
+  content: "\10f309"; }
+
+.fad.fa-long-arrow-alt-left:after {
+  content: "\10f30a"; }
+
+.fad.fa-long-arrow-alt-right:after {
+  content: "\10f30b"; }
+
+.fad.fa-long-arrow-alt-up:after {
+  content: "\10f30c"; }
+
+.fad.fa-long-arrow-down:after {
+  content: "\10f175"; }
+
+.fad.fa-long-arrow-left:after {
+  content: "\10f177"; }
+
+.fad.fa-long-arrow-right:after {
+  content: "\10f178"; }
+
+.fad.fa-long-arrow-up:after {
+  content: "\10f176"; }
+
+.fad.fa-loveseat:after {
+  content: "\10f4cc"; }
+
+.fad.fa-low-vision:after {
+  content: "\10f2a8"; }
+
+.fad.fa-luchador:after {
+  content: "\10f455"; }
+
+.fad.fa-luggage-cart:after {
+  content: "\10f59d"; }
+
+.fad.fa-lungs:after {
+  content: "\10f604"; }
+
+.fad.fa-lungs-virus:after {
+  content: "\10e067"; }
+
+.fad.fa-mace:after {
+  content: "\10f6f8"; }
+
+.fad.fa-magic:after {
+  content: "\10f0d0"; }
+
+.fad.fa-magnet:after {
+  content: "\10f076"; }
+
+.fad.fa-mail-bulk:after {
+  content: "\10f674"; }
+
+.fad.fa-mailbox:after {
+  content: "\10f813"; }
+
+.fad.fa-male:after {
+  content: "\10f183"; }
+
+.fad.fa-mandolin:after {
+  content: "\10f6f9"; }
+
+.fad.fa-map:after {
+  content: "\10f279"; }
+
+.fad.fa-map-marked:after {
+  content: "\10f59f"; }
+
+.fad.fa-map-marked-alt:after {
+  content: "\10f5a0"; }
+
+.fad.fa-map-marker:after {
+  content: "\10f041"; }
+
+.fad.fa-map-marker-alt:after {
+  content: "\10f3c5"; }
+
+.fad.fa-map-marker-alt-slash:after {
+  content: "\10f605"; }
+
+.fad.fa-map-marker-check:after {
+  content: "\10f606"; }
+
+.fad.fa-map-marker-edit:after {
+  content: "\10f607"; }
+
+.fad.fa-map-marker-exclamation:after {
+  content: "\10f608"; }
+
+.fad.fa-map-marker-minus:after {
+  content: "\10f609"; }
+
+.fad.fa-map-marker-plus:after {
+  content: "\10f60a"; }
+
+.fad.fa-map-marker-question:after {
+  content: "\10f60b"; }
+
+.fad.fa-map-marker-slash:after {
+  content: "\10f60c"; }
+
+.fad.fa-map-marker-smile:after {
+  content: "\10f60d"; }
+
+.fad.fa-map-marker-times:after {
+  content: "\10f60e"; }
+
+.fad.fa-map-pin:after {
+  content: "\10f276"; }
+
+.fad.fa-map-signs:after {
+  content: "\10f277"; }
+
+.fad.fa-marker:after {
+  content: "\10f5a1"; }
+
+.fad.fa-mars:after {
+  content: "\10f222"; }
+
+.fad.fa-mars-double:after {
+  content: "\10f227"; }
+
+.fad.fa-mars-stroke:after {
+  content: "\10f229"; }
+
+.fad.fa-mars-stroke-h:after {
+  content: "\10f22b"; }
+
+.fad.fa-mars-stroke-v:after {
+  content: "\10f22a"; }
+
+.fad.fa-mask:after {
+  content: "\10f6fa"; }
+
+.fad.fa-meat:after {
+  content: "\10f814"; }
+
+.fad.fa-medal:after {
+  content: "\10f5a2"; }
+
+.fad.fa-medkit:after {
+  content: "\10f0fa"; }
+
+.fad.fa-megaphone:after {
+  content: "\10f675"; }
+
+.fad.fa-meh:after {
+  content: "\10f11a"; }
+
+.fad.fa-meh-blank:after {
+  content: "\10f5a4"; }
+
+.fad.fa-meh-rolling-eyes:after {
+  content: "\10f5a5"; }
+
+.fad.fa-memory:after {
+  content: "\10f538"; }
+
+.fad.fa-menorah:after {
+  content: "\10f676"; }
+
+.fad.fa-mercury:after {
+  content: "\10f223"; }
+
+.fad.fa-meteor:after {
+  content: "\10f753"; }
+
+.fad.fa-microchip:after {
+  content: "\10f2db"; }
+
+.fad.fa-microphone:after {
+  content: "\10f130"; }
+
+.fad.fa-microphone-alt:after {
+  content: "\10f3c9"; }
+
+.fad.fa-microphone-alt-slash:after {
+  content: "\10f539"; }
+
+.fad.fa-microphone-slash:after {
+  content: "\10f131"; }
+
+.fad.fa-microphone-stand:after {
+  content: "\10f8cb"; }
+
+.fad.fa-microscope:after {
+  content: "\10f610"; }
+
+.fad.fa-microwave:after {
+  content: "\10e01b"; }
+
+.fad.fa-mind-share:after {
+  content: "\10f677"; }
+
+.fad.fa-minus:after {
+  content: "\10f068"; }
+
+.fad.fa-minus-circle:after {
+  content: "\10f056"; }
+
+.fad.fa-minus-hexagon:after {
+  content: "\10f307"; }
+
+.fad.fa-minus-octagon:after {
+  content: "\10f308"; }
+
+.fad.fa-minus-square:after {
+  content: "\10f146"; }
+
+.fad.fa-mistletoe:after {
+  content: "\10f7b4"; }
+
+.fad.fa-mitten:after {
+  content: "\10f7b5"; }
+
+.fad.fa-mobile:after {
+  content: "\10f10b"; }
+
+.fad.fa-mobile-alt:after {
+  content: "\10f3cd"; }
+
+.fad.fa-mobile-android:after {
+  content: "\10f3ce"; }
+
+.fad.fa-mobile-android-alt:after {
+  content: "\10f3cf"; }
+
+.fad.fa-money-bill:after {
+  content: "\10f0d6"; }
+
+.fad.fa-money-bill-alt:after {
+  content: "\10f3d1"; }
+
+.fad.fa-money-bill-wave:after {
+  content: "\10f53a"; }
+
+.fad.fa-money-bill-wave-alt:after {
+  content: "\10f53b"; }
+
+.fad.fa-money-check:after {
+  content: "\10f53c"; }
+
+.fad.fa-money-check-alt:after {
+  content: "\10f53d"; }
+
+.fad.fa-money-check-edit:after {
+  content: "\10f872"; }
+
+.fad.fa-money-check-edit-alt:after {
+  content: "\10f873"; }
+
+.fad.fa-monitor-heart-rate:after {
+  content: "\10f611"; }
+
+.fad.fa-monkey:after {
+  content: "\10f6fb"; }
+
+.fad.fa-monument:after {
+  content: "\10f5a6"; }
+
+.fad.fa-moon:after {
+  content: "\10f186"; }
+
+.fad.fa-moon-cloud:after {
+  content: "\10f754"; }
+
+.fad.fa-moon-stars:after {
+  content: "\10f755"; }
+
+.fad.fa-mortar-pestle:after {
+  content: "\10f5a7"; }
+
+.fad.fa-mosque:after {
+  content: "\10f678"; }
+
+.fad.fa-motorcycle:after {
+  content: "\10f21c"; }
+
+.fad.fa-mountain:after {
+  content: "\10f6fc"; }
+
+.fad.fa-mountains:after {
+  content: "\10f6fd"; }
+
+.fad.fa-mouse:after {
+  content: "\10f8cc"; }
+
+.fad.fa-mouse-alt:after {
+  content: "\10f8cd"; }
+
+.fad.fa-mouse-pointer:after {
+  content: "\10f245"; }
+
+.fad.fa-mp3-player:after {
+  content: "\10f8ce"; }
+
+.fad.fa-mug:after {
+  content: "\10f874"; }
+
+.fad.fa-mug-hot:after {
+  content: "\10f7b6"; }
+
+.fad.fa-mug-marshmallows:after {
+  content: "\10f7b7"; }
+
+.fad.fa-mug-tea:after {
+  content: "\10f875"; }
+
+.fad.fa-music:after {
+  content: "\10f001"; }
+
+.fad.fa-music-alt:after {
+  content: "\10f8cf"; }
+
+.fad.fa-music-alt-slash:after {
+  content: "\10f8d0"; }
+
+.fad.fa-music-slash:after {
+  content: "\10f8d1"; }
+
+.fad.fa-narwhal:after {
+  content: "\10f6fe"; }
+
+.fad.fa-network-wired:after {
+  content: "\10f6ff"; }
+
+.fad.fa-neuter:after {
+  content: "\10f22c"; }
+
+.fad.fa-newspaper:after {
+  content: "\10f1ea"; }
+
+.fad.fa-not-equal:after {
+  content: "\10f53e"; }
+
+.fad.fa-notes-medical:after {
+  content: "\10f481"; }
+
+.fad.fa-object-group:after {
+  content: "\10f247"; }
+
+.fad.fa-object-ungroup:after {
+  content: "\10f248"; }
+
+.fad.fa-octagon:after {
+  content: "\10f306"; }
+
+.fad.fa-oil-can:after {
+  content: "\10f613"; }
+
+.fad.fa-oil-temp:after {
+  content: "\10f614"; }
+
+.fad.fa-om:after {
+  content: "\10f679"; }
+
+.fad.fa-omega:after {
+  content: "\10f67a"; }
+
+.fad.fa-ornament:after {
+  content: "\10f7b8"; }
+
+.fad.fa-otter:after {
+  content: "\10f700"; }
+
+.fad.fa-outdent:after {
+  content: "\10f03b"; }
+
+.fad.fa-outlet:after {
+  content: "\10e01c"; }
+
+.fad.fa-oven:after {
+  content: "\10e01d"; }
+
+.fad.fa-overline:after {
+  content: "\10f876"; }
+
+.fad.fa-page-break:after {
+  content: "\10f877"; }
+
+.fad.fa-pager:after {
+  content: "\10f815"; }
+
+.fad.fa-paint-brush:after {
+  content: "\10f1fc"; }
+
+.fad.fa-paint-brush-alt:after {
+  content: "\10f5a9"; }
+
+.fad.fa-paint-roller:after {
+  content: "\10f5aa"; }
+
+.fad.fa-palette:after {
+  content: "\10f53f"; }
+
+.fad.fa-pallet:after {
+  content: "\10f482"; }
+
+.fad.fa-pallet-alt:after {
+  content: "\10f483"; }
+
+.fad.fa-paper-plane:after {
+  content: "\10f1d8"; }
+
+.fad.fa-paperclip:after {
+  content: "\10f0c6"; }
+
+.fad.fa-parachute-box:after {
+  content: "\10f4cd"; }
+
+.fad.fa-paragraph:after {
+  content: "\10f1dd"; }
+
+.fad.fa-paragraph-rtl:after {
+  content: "\10f878"; }
+
+.fad.fa-parking:after {
+  content: "\10f540"; }
+
+.fad.fa-parking-circle:after {
+  content: "\10f615"; }
+
+.fad.fa-parking-circle-slash:after {
+  content: "\10f616"; }
+
+.fad.fa-parking-slash:after {
+  content: "\10f617"; }
+
+.fad.fa-passport:after {
+  content: "\10f5ab"; }
+
+.fad.fa-pastafarianism:after {
+  content: "\10f67b"; }
+
+.fad.fa-paste:after {
+  content: "\10f0ea"; }
+
+.fad.fa-pause:after {
+  content: "\10f04c"; }
+
+.fad.fa-pause-circle:after {
+  content: "\10f28b"; }
+
+.fad.fa-paw:after {
+  content: "\10f1b0"; }
+
+.fad.fa-paw-alt:after {
+  content: "\10f701"; }
+
+.fad.fa-paw-claws:after {
+  content: "\10f702"; }
+
+.fad.fa-peace:after {
+  content: "\10f67c"; }
+
+.fad.fa-pegasus:after {
+  content: "\10f703"; }
+
+.fad.fa-pen:after {
+  content: "\10f304"; }
+
+.fad.fa-pen-alt:after {
+  content: "\10f305"; }
+
+.fad.fa-pen-fancy:after {
+  content: "\10f5ac"; }
+
+.fad.fa-pen-nib:after {
+  content: "\10f5ad"; }
+
+.fad.fa-pen-square:after {
+  content: "\10f14b"; }
+
+.fad.fa-pencil:after {
+  content: "\10f040"; }
+
+.fad.fa-pencil-alt:after {
+  content: "\10f303"; }
+
+.fad.fa-pencil-paintbrush:after {
+  content: "\10f618"; }
+
+.fad.fa-pencil-ruler:after {
+  content: "\10f5ae"; }
+
+.fad.fa-pennant:after {
+  content: "\10f456"; }
+
+.fad.fa-people-arrows:after {
+  content: "\10e068"; }
+
+.fad.fa-people-carry:after {
+  content: "\10f4ce"; }
+
+.fad.fa-pepper-hot:after {
+  content: "\10f816"; }
+
+.fad.fa-percent:after {
+  content: "\10f295"; }
+
+.fad.fa-percentage:after {
+  content: "\10f541"; }
+
+.fad.fa-person-booth:after {
+  content: "\10f756"; }
+
+.fad.fa-person-carry:after {
+  content: "\10f4cf"; }
+
+.fad.fa-person-dolly:after {
+  content: "\10f4d0"; }
+
+.fad.fa-person-dolly-empty:after {
+  content: "\10f4d1"; }
+
+.fad.fa-person-sign:after {
+  content: "\10f757"; }
+
+.fad.fa-phone:after {
+  content: "\10f095"; }
+
+.fad.fa-phone-alt:after {
+  content: "\10f879"; }
+
+.fad.fa-phone-laptop:after {
+  content: "\10f87a"; }
+
+.fad.fa-phone-office:after {
+  content: "\10f67d"; }
+
+.fad.fa-phone-plus:after {
+  content: "\10f4d2"; }
+
+.fad.fa-phone-rotary:after {
+  content: "\10f8d3"; }
+
+.fad.fa-phone-slash:after {
+  content: "\10f3dd"; }
+
+.fad.fa-phone-square:after {
+  content: "\10f098"; }
+
+.fad.fa-phone-square-alt:after {
+  content: "\10f87b"; }
+
+.fad.fa-phone-volume:after {
+  content: "\10f2a0"; }
+
+.fad.fa-photo-video:after {
+  content: "\10f87c"; }
+
+.fad.fa-pi:after {
+  content: "\10f67e"; }
+
+.fad.fa-piano:after {
+  content: "\10f8d4"; }
+
+.fad.fa-piano-keyboard:after {
+  content: "\10f8d5"; }
+
+.fad.fa-pie:after {
+  content: "\10f705"; }
+
+.fad.fa-pig:after {
+  content: "\10f706"; }
+
+.fad.fa-piggy-bank:after {
+  content: "\10f4d3"; }
+
+.fad.fa-pills:after {
+  content: "\10f484"; }
+
+.fad.fa-pizza:after {
+  content: "\10f817"; }
+
+.fad.fa-pizza-slice:after {
+  content: "\10f818"; }
+
+.fad.fa-place-of-worship:after {
+  content: "\10f67f"; }
+
+.fad.fa-plane:after {
+  content: "\10f072"; }
+
+.fad.fa-plane-alt:after {
+  content: "\10f3de"; }
+
+.fad.fa-plane-arrival:after {
+  content: "\10f5af"; }
+
+.fad.fa-plane-departure:after {
+  content: "\10f5b0"; }
+
+.fad.fa-plane-slash:after {
+  content: "\10e069"; }
+
+.fad.fa-planet-moon:after {
+  content: "\10e01f"; }
+
+.fad.fa-planet-ringed:after {
+  content: "\10e020"; }
+
+.fad.fa-play:after {
+  content: "\10f04b"; }
+
+.fad.fa-play-circle:after {
+  content: "\10f144"; }
+
+.fad.fa-plug:after {
+  content: "\10f1e6"; }
+
+.fad.fa-plus:after {
+  content: "\10f067"; }
+
+.fad.fa-plus-circle:after {
+  content: "\10f055"; }
+
+.fad.fa-plus-hexagon:after {
+  content: "\10f300"; }
+
+.fad.fa-plus-octagon:after {
+  content: "\10f301"; }
+
+.fad.fa-plus-square:after {
+  content: "\10f0fe"; }
+
+.fad.fa-podcast:after {
+  content: "\10f2ce"; }
+
+.fad.fa-podium:after {
+  content: "\10f680"; }
+
+.fad.fa-podium-star:after {
+  content: "\10f758"; }
+
+.fad.fa-police-box:after {
+  content: "\10e021"; }
+
+.fad.fa-poll:after {
+  content: "\10f681"; }
+
+.fad.fa-poll-h:after {
+  content: "\10f682"; }
+
+.fad.fa-poll-people:after {
+  content: "\10f759"; }
+
+.fad.fa-poo:after {
+  content: "\10f2fe"; }
+
+.fad.fa-poo-storm:after {
+  content: "\10f75a"; }
+
+.fad.fa-poop:after {
+  content: "\10f619"; }
+
+.fad.fa-popcorn:after {
+  content: "\10f819"; }
+
+.fad.fa-portal-enter:after {
+  content: "\10e022"; }
+
+.fad.fa-portal-exit:after {
+  content: "\10e023"; }
+
+.fad.fa-portrait:after {
+  content: "\10f3e0"; }
+
+.fad.fa-pound-sign:after {
+  content: "\10f154"; }
+
+.fad.fa-power-off:after {
+  content: "\10f011"; }
+
+.fad.fa-pray:after {
+  content: "\10f683"; }
+
+.fad.fa-praying-hands:after {
+  content: "\10f684"; }
+
+.fad.fa-prescription:after {
+  content: "\10f5b1"; }
+
+.fad.fa-prescription-bottle:after {
+  content: "\10f485"; }
+
+.fad.fa-prescription-bottle-alt:after {
+  content: "\10f486"; }
+
+.fad.fa-presentation:after {
+  content: "\10f685"; }
+
+.fad.fa-print:after {
+  content: "\10f02f"; }
+
+.fad.fa-print-search:after {
+  content: "\10f81a"; }
+
+.fad.fa-print-slash:after {
+  content: "\10f686"; }
+
+.fad.fa-procedures:after {
+  content: "\10f487"; }
+
+.fad.fa-project-diagram:after {
+  content: "\10f542"; }
+
+.fad.fa-projector:after {
+  content: "\10f8d6"; }
+
+.fad.fa-pump-medical:after {
+  content: "\10e06a"; }
+
+.fad.fa-pump-soap:after {
+  content: "\10e06b"; }
+
+.fad.fa-pumpkin:after {
+  content: "\10f707"; }
+
+.fad.fa-puzzle-piece:after {
+  content: "\10f12e"; }
+
+.fad.fa-qrcode:after {
+  content: "\10f029"; }
+
+.fad.fa-question:after {
+  content: "\10f128"; }
+
+.fad.fa-question-circle:after {
+  content: "\10f059"; }
+
+.fad.fa-question-square:after {
+  content: "\10f2fd"; }
+
+.fad.fa-quidditch:after {
+  content: "\10f458"; }
+
+.fad.fa-quote-left:after {
+  content: "\10f10d"; }
+
+.fad.fa-quote-right:after {
+  content: "\10f10e"; }
+
+.fad.fa-quran:after {
+  content: "\10f687"; }
+
+.fad.fa-rabbit:after {
+  content: "\10f708"; }
+
+.fad.fa-rabbit-fast:after {
+  content: "\10f709"; }
+
+.fad.fa-racquet:after {
+  content: "\10f45a"; }
+
+.fad.fa-radar:after {
+  content: "\10e024"; }
+
+.fad.fa-radiation:after {
+  content: "\10f7b9"; }
+
+.fad.fa-radiation-alt:after {
+  content: "\10f7ba"; }
+
+.fad.fa-radio:after {
+  content: "\10f8d7"; }
+
+.fad.fa-radio-alt:after {
+  content: "\10f8d8"; }
+
+.fad.fa-rainbow:after {
+  content: "\10f75b"; }
+
+.fad.fa-raindrops:after {
+  content: "\10f75c"; }
+
+.fad.fa-ram:after {
+  content: "\10f70a"; }
+
+.fad.fa-ramp-loading:after {
+  content: "\10f4d4"; }
+
+.fad.fa-random:after {
+  content: "\10f074"; }
+
+.fad.fa-raygun:after {
+  content: "\10e025"; }
+
+.fad.fa-receipt:after {
+  content: "\10f543"; }
+
+.fad.fa-record-vinyl:after {
+  content: "\10f8d9"; }
+
+.fad.fa-rectangle-landscape:after {
+  content: "\10f2fa"; }
+
+.fad.fa-rectangle-portrait:after {
+  content: "\10f2fb"; }
+
+.fad.fa-rectangle-wide:after {
+  content: "\10f2fc"; }
+
+.fad.fa-recycle:after {
+  content: "\10f1b8"; }
+
+.fad.fa-redo:after {
+  content: "\10f01e"; }
+
+.fad.fa-redo-alt:after {
+  content: "\10f2f9"; }
+
+.fad.fa-refrigerator:after {
+  content: "\10e026"; }
+
+.fad.fa-registered:after {
+  content: "\10f25d"; }
+
+.fad.fa-remove-format:after {
+  content: "\10f87d"; }
+
+.fad.fa-repeat:after {
+  content: "\10f363"; }
+
+.fad.fa-repeat-1:after {
+  content: "\10f365"; }
+
+.fad.fa-repeat-1-alt:after {
+  content: "\10f366"; }
+
+.fad.fa-repeat-alt:after {
+  content: "\10f364"; }
+
+.fad.fa-reply:after {
+  content: "\10f3e5"; }
+
+.fad.fa-reply-all:after {
+  content: "\10f122"; }
+
+.fad.fa-republican:after {
+  content: "\10f75e"; }
+
+.fad.fa-restroom:after {
+  content: "\10f7bd"; }
+
+.fad.fa-retweet:after {
+  content: "\10f079"; }
+
+.fad.fa-retweet-alt:after {
+  content: "\10f361"; }
+
+.fad.fa-ribbon:after {
+  content: "\10f4d6"; }
+
+.fad.fa-ring:after {
+  content: "\10f70b"; }
+
+.fad.fa-rings-wedding:after {
+  content: "\10f81b"; }
+
+.fad.fa-road:after {
+  content: "\10f018"; }
+
+.fad.fa-robot:after {
+  content: "\10f544"; }
+
+.fad.fa-rocket:after {
+  content: "\10f135"; }
+
+.fad.fa-rocket-launch:after {
+  content: "\10e027"; }
+
+.fad.fa-route:after {
+  content: "\10f4d7"; }
+
+.fad.fa-route-highway:after {
+  content: "\10f61a"; }
+
+.fad.fa-route-interstate:after {
+  content: "\10f61b"; }
+
+.fad.fa-router:after {
+  content: "\10f8da"; }
+
+.fad.fa-rss:after {
+  content: "\10f09e"; }
+
+.fad.fa-rss-square:after {
+  content: "\10f143"; }
+
+.fad.fa-ruble-sign:after {
+  content: "\10f158"; }
+
+.fad.fa-ruler:after {
+  content: "\10f545"; }
+
+.fad.fa-ruler-combined:after {
+  content: "\10f546"; }
+
+.fad.fa-ruler-horizontal:after {
+  content: "\10f547"; }
+
+.fad.fa-ruler-triangle:after {
+  content: "\10f61c"; }
+
+.fad.fa-ruler-vertical:after {
+  content: "\10f548"; }
+
+.fad.fa-running:after {
+  content: "\10f70c"; }
+
+.fad.fa-rupee-sign:after {
+  content: "\10f156"; }
+
+.fad.fa-rv:after {
+  content: "\10f7be"; }
+
+.fad.fa-sack:after {
+  content: "\10f81c"; }
+
+.fad.fa-sack-dollar:after {
+  content: "\10f81d"; }
+
+.fad.fa-sad-cry:after {
+  content: "\10f5b3"; }
+
+.fad.fa-sad-tear:after {
+  content: "\10f5b4"; }
+
+.fad.fa-salad:after {
+  content: "\10f81e"; }
+
+.fad.fa-sandwich:after {
+  content: "\10f81f"; }
+
+.fad.fa-satellite:after {
+  content: "\10f7bf"; }
+
+.fad.fa-satellite-dish:after {
+  content: "\10f7c0"; }
+
+.fad.fa-sausage:after {
+  content: "\10f820"; }
+
+.fad.fa-save:after {
+  content: "\10f0c7"; }
+
+.fad.fa-sax-hot:after {
+  content: "\10f8db"; }
+
+.fad.fa-saxophone:after {
+  content: "\10f8dc"; }
+
+.fad.fa-scalpel:after {
+  content: "\10f61d"; }
+
+.fad.fa-scalpel-path:after {
+  content: "\10f61e"; }
+
+.fad.fa-scanner:after {
+  content: "\10f488"; }
+
+.fad.fa-scanner-image:after {
+  content: "\10f8f3"; }
+
+.fad.fa-scanner-keyboard:after {
+  content: "\10f489"; }
+
+.fad.fa-scanner-touchscreen:after {
+  content: "\10f48a"; }
+
+.fad.fa-scarecrow:after {
+  content: "\10f70d"; }
+
+.fad.fa-scarf:after {
+  content: "\10f7c1"; }
+
+.fad.fa-school:after {
+  content: "\10f549"; }
+
+.fad.fa-screwdriver:after {
+  content: "\10f54a"; }
+
+.fad.fa-scroll:after {
+  content: "\10f70e"; }
+
+.fad.fa-scroll-old:after {
+  content: "\10f70f"; }
+
+.fad.fa-scrubber:after {
+  content: "\10f2f8"; }
+
+.fad.fa-scythe:after {
+  content: "\10f710"; }
+
+.fad.fa-sd-card:after {
+  content: "\10f7c2"; }
+
+.fad.fa-search:after {
+  content: "\10f002"; }
+
+.fad.fa-search-dollar:after {
+  content: "\10f688"; }
+
+.fad.fa-search-location:after {
+  content: "\10f689"; }
+
+.fad.fa-search-minus:after {
+  content: "\10f010"; }
+
+.fad.fa-search-plus:after {
+  content: "\10f00e"; }
+
+.fad.fa-seedling:after {
+  content: "\10f4d8"; }
+
+.fad.fa-send-back:after {
+  content: "\10f87e"; }
+
+.fad.fa-send-backward:after {
+  content: "\10f87f"; }
+
+.fad.fa-sensor:after {
+  content: "\10e028"; }
+
+.fad.fa-sensor-alert:after {
+  content: "\10e029"; }
+
+.fad.fa-sensor-fire:after {
+  content: "\10e02a"; }
+
+.fad.fa-sensor-on:after {
+  content: "\10e02b"; }
+
+.fad.fa-sensor-smoke:after {
+  content: "\10e02c"; }
+
+.fad.fa-server:after {
+  content: "\10f233"; }
+
+.fad.fa-shapes:after {
+  content: "\10f61f"; }
+
+.fad.fa-share:after {
+  content: "\10f064"; }
+
+.fad.fa-share-all:after {
+  content: "\10f367"; }
+
+.fad.fa-share-alt:after {
+  content: "\10f1e0"; }
+
+.fad.fa-share-alt-square:after {
+  content: "\10f1e1"; }
+
+.fad.fa-share-square:after {
+  content: "\10f14d"; }
+
+.fad.fa-sheep:after {
+  content: "\10f711"; }
+
+.fad.fa-shekel-sign:after {
+  content: "\10f20b"; }
+
+.fad.fa-shield:after {
+  content: "\10f132"; }
+
+.fad.fa-shield-alt:after {
+  content: "\10f3ed"; }
+
+.fad.fa-shield-check:after {
+  content: "\10f2f7"; }
+
+.fad.fa-shield-cross:after {
+  content: "\10f712"; }
+
+.fad.fa-shield-virus:after {
+  content: "\10e06c"; }
+
+.fad.fa-ship:after {
+  content: "\10f21a"; }
+
+.fad.fa-shipping-fast:after {
+  content: "\10f48b"; }
+
+.fad.fa-shipping-timed:after {
+  content: "\10f48c"; }
+
+.fad.fa-shish-kebab:after {
+  content: "\10f821"; }
+
+.fad.fa-shoe-prints:after {
+  content: "\10f54b"; }
+
+.fad.fa-shopping-bag:after {
+  content: "\10f290"; }
+
+.fad.fa-shopping-basket:after {
+  content: "\10f291"; }
+
+.fad.fa-shopping-cart:after {
+  content: "\10f07a"; }
+
+.fad.fa-shovel:after {
+  content: "\10f713"; }
+
+.fad.fa-shovel-snow:after {
+  content: "\10f7c3"; }
+
+.fad.fa-shower:after {
+  content: "\10f2cc"; }
+
+.fad.fa-shredder:after {
+  content: "\10f68a"; }
+
+.fad.fa-shuttle-van:after {
+  content: "\10f5b6"; }
+
+.fad.fa-shuttlecock:after {
+  content: "\10f45b"; }
+
+.fad.fa-sickle:after {
+  content: "\10f822"; }
+
+.fad.fa-sigma:after {
+  content: "\10f68b"; }
+
+.fad.fa-sign:after {
+  content: "\10f4d9"; }
+
+.fad.fa-sign-in:after {
+  content: "\10f090"; }
+
+.fad.fa-sign-in-alt:after {
+  content: "\10f2f6"; }
+
+.fad.fa-sign-language:after {
+  content: "\10f2a7"; }
+
+.fad.fa-sign-out:after {
+  content: "\10f08b"; }
+
+.fad.fa-sign-out-alt:after {
+  content: "\10f2f5"; }
+
+.fad.fa-signal:after {
+  content: "\10f012"; }
+
+.fad.fa-signal-1:after {
+  content: "\10f68c"; }
+
+.fad.fa-signal-2:after {
+  content: "\10f68d"; }
+
+.fad.fa-signal-3:after {
+  content: "\10f68e"; }
+
+.fad.fa-signal-4:after {
+  content: "\10f68f"; }
+
+.fad.fa-signal-alt:after {
+  content: "\10f690"; }
+
+.fad.fa-signal-alt-1:after {
+  content: "\10f691"; }
+
+.fad.fa-signal-alt-2:after {
+  content: "\10f692"; }
+
+.fad.fa-signal-alt-3:after {
+  content: "\10f693"; }
+
+.fad.fa-signal-alt-slash:after {
+  content: "\10f694"; }
+
+.fad.fa-signal-slash:after {
+  content: "\10f695"; }
+
+.fad.fa-signal-stream:after {
+  content: "\10f8dd"; }
+
+.fad.fa-signature:after {
+  content: "\10f5b7"; }
+
+.fad.fa-sim-card:after {
+  content: "\10f7c4"; }
+
+.fad.fa-sink:after {
+  content: "\10e06d"; }
+
+.fad.fa-siren:after {
+  content: "\10e02d"; }
+
+.fad.fa-siren-on:after {
+  content: "\10e02e"; }
+
+.fad.fa-sitemap:after {
+  content: "\10f0e8"; }
+
+.fad.fa-skating:after {
+  content: "\10f7c5"; }
+
+.fad.fa-skeleton:after {
+  content: "\10f620"; }
+
+.fad.fa-ski-jump:after {
+  content: "\10f7c7"; }
+
+.fad.fa-ski-lift:after {
+  content: "\10f7c8"; }
+
+.fad.fa-skiing:after {
+  content: "\10f7c9"; }
+
+.fad.fa-skiing-nordic:after {
+  content: "\10f7ca"; }
+
+.fad.fa-skull:after {
+  content: "\10f54c"; }
+
+.fad.fa-skull-cow:after {
+  content: "\10f8de"; }
+
+.fad.fa-skull-crossbones:after {
+  content: "\10f714"; }
+
+.fad.fa-slash:after {
+  content: "\10f715"; }
+
+.fad.fa-sledding:after {
+  content: "\10f7cb"; }
+
+.fad.fa-sleigh:after {
+  content: "\10f7cc"; }
+
+.fad.fa-sliders-h:after {
+  content: "\10f1de"; }
+
+.fad.fa-sliders-h-square:after {
+  content: "\10f3f0"; }
+
+.fad.fa-sliders-v:after {
+  content: "\10f3f1"; }
+
+.fad.fa-sliders-v-square:after {
+  content: "\10f3f2"; }
+
+.fad.fa-smile:after {
+  content: "\10f118"; }
+
+.fad.fa-smile-beam:after {
+  content: "\10f5b8"; }
+
+.fad.fa-smile-plus:after {
+  content: "\10f5b9"; }
+
+.fad.fa-smile-wink:after {
+  content: "\10f4da"; }
+
+.fad.fa-smog:after {
+  content: "\10f75f"; }
+
+.fad.fa-smoke:after {
+  content: "\10f760"; }
+
+.fad.fa-smoking:after {
+  content: "\10f48d"; }
+
+.fad.fa-smoking-ban:after {
+  content: "\10f54d"; }
+
+.fad.fa-sms:after {
+  content: "\10f7cd"; }
+
+.fad.fa-snake:after {
+  content: "\10f716"; }
+
+.fad.fa-snooze:after {
+  content: "\10f880"; }
+
+.fad.fa-snow-blowing:after {
+  content: "\10f761"; }
+
+.fad.fa-snowboarding:after {
+  content: "\10f7ce"; }
+
+.fad.fa-snowflake:after {
+  content: "\10f2dc"; }
+
+.fad.fa-snowflakes:after {
+  content: "\10f7cf"; }
+
+.fad.fa-snowman:after {
+  content: "\10f7d0"; }
+
+.fad.fa-snowmobile:after {
+  content: "\10f7d1"; }
+
+.fad.fa-snowplow:after {
+  content: "\10f7d2"; }
+
+.fad.fa-soap:after {
+  content: "\10e06e"; }
+
+.fad.fa-socks:after {
+  content: "\10f696"; }
+
+.fad.fa-solar-panel:after {
+  content: "\10f5ba"; }
+
+.fad.fa-solar-system:after {
+  content: "\10e02f"; }
+
+.fad.fa-sort:after {
+  content: "\10f0dc"; }
+
+.fad.fa-sort-alpha-down:after {
+  content: "\10f15d"; }
+
+.fad.fa-sort-alpha-down-alt:after {
+  content: "\10f881"; }
+
+.fad.fa-sort-alpha-up:after {
+  content: "\10f15e"; }
+
+.fad.fa-sort-alpha-up-alt:after {
+  content: "\10f882"; }
+
+.fad.fa-sort-alt:after {
+  content: "\10f883"; }
+
+.fad.fa-sort-amount-down:after {
+  content: "\10f160"; }
+
+.fad.fa-sort-amount-down-alt:after {
+  content: "\10f884"; }
+
+.fad.fa-sort-amount-up:after {
+  content: "\10f161"; }
+
+.fad.fa-sort-amount-up-alt:after {
+  content: "\10f885"; }
+
+.fad.fa-sort-circle:after {
+  content: "\10e030"; }
+
+.fad.fa-sort-circle-down:after {
+  content: "\10e031"; }
+
+.fad.fa-sort-circle-up:after {
+  content: "\10e032"; }
+
+.fad.fa-sort-down:after {
+  content: "\10f0dd"; }
+
+.fad.fa-sort-numeric-down:after {
+  content: "\10f162"; }
+
+.fad.fa-sort-numeric-down-alt:after {
+  content: "\10f886"; }
+
+.fad.fa-sort-numeric-up:after {
+  content: "\10f163"; }
+
+.fad.fa-sort-numeric-up-alt:after {
+  content: "\10f887"; }
+
+.fad.fa-sort-shapes-down:after {
+  content: "\10f888"; }
+
+.fad.fa-sort-shapes-down-alt:after {
+  content: "\10f889"; }
+
+.fad.fa-sort-shapes-up:after {
+  content: "\10f88a"; }
+
+.fad.fa-sort-shapes-up-alt:after {
+  content: "\10f88b"; }
+
+.fad.fa-sort-size-down:after {
+  content: "\10f88c"; }
+
+.fad.fa-sort-size-down-alt:after {
+  content: "\10f88d"; }
+
+.fad.fa-sort-size-up:after {
+  content: "\10f88e"; }
+
+.fad.fa-sort-size-up-alt:after {
+  content: "\10f88f"; }
+
+.fad.fa-sort-up:after {
+  content: "\10f0de"; }
+
+.fad.fa-soup:after {
+  content: "\10f823"; }
+
+.fad.fa-spa:after {
+  content: "\10f5bb"; }
+
+.fad.fa-space-shuttle:after {
+  content: "\10f197"; }
+
+.fad.fa-space-station-moon:after {
+  content: "\10e033"; }
+
+.fad.fa-space-station-moon-alt:after {
+  content: "\10e034"; }
+
+.fad.fa-spade:after {
+  content: "\10f2f4"; }
+
+.fad.fa-sparkles:after {
+  content: "\10f890"; }
+
+.fad.fa-speaker:after {
+  content: "\10f8df"; }
+
+.fad.fa-speakers:after {
+  content: "\10f8e0"; }
+
+.fad.fa-spell-check:after {
+  content: "\10f891"; }
+
+.fad.fa-spider:after {
+  content: "\10f717"; }
+
+.fad.fa-spider-black-widow:after {
+  content: "\10f718"; }
+
+.fad.fa-spider-web:after {
+  content: "\10f719"; }
+
+.fad.fa-spinner:after {
+  content: "\10f110"; }
+
+.fad.fa-spinner-third:after {
+  content: "\10f3f4"; }
+
+.fad.fa-splotch:after {
+  content: "\10f5bc"; }
+
+.fad.fa-spray-can:after {
+  content: "\10f5bd"; }
+
+.fad.fa-sprinkler:after {
+  content: "\10e035"; }
+
+.fad.fa-square:after {
+  content: "\10f0c8"; }
+
+.fad.fa-square-full:after {
+  content: "\10f45c"; }
+
+.fad.fa-square-root:after {
+  content: "\10f697"; }
+
+.fad.fa-square-root-alt:after {
+  content: "\10f698"; }
+
+.fad.fa-squirrel:after {
+  content: "\10f71a"; }
+
+.fad.fa-staff:after {
+  content: "\10f71b"; }
+
+.fad.fa-stamp:after {
+  content: "\10f5bf"; }
+
+.fad.fa-star:after {
+  content: "\10f005"; }
+
+.fad.fa-star-and-crescent:after {
+  content: "\10f699"; }
+
+.fad.fa-star-christmas:after {
+  content: "\10f7d4"; }
+
+.fad.fa-star-exclamation:after {
+  content: "\10f2f3"; }
+
+.fad.fa-star-half:after {
+  content: "\10f089"; }
+
+.fad.fa-star-half-alt:after {
+  content: "\10f5c0"; }
+
+.fad.fa-star-of-david:after {
+  content: "\10f69a"; }
+
+.fad.fa-star-of-life:after {
+  content: "\10f621"; }
+
+.fad.fa-star-shooting:after {
+  content: "\10e036"; }
+
+.fad.fa-starfighter:after {
+  content: "\10e037"; }
+
+.fad.fa-starfighter-alt:after {
+  content: "\10e038"; }
+
+.fad.fa-stars:after {
+  content: "\10f762"; }
+
+.fad.fa-starship:after {
+  content: "\10e039"; }
+
+.fad.fa-starship-freighter:after {
+  content: "\10e03a"; }
+
+.fad.fa-steak:after {
+  content: "\10f824"; }
+
+.fad.fa-steering-wheel:after {
+  content: "\10f622"; }
+
+.fad.fa-step-backward:after {
+  content: "\10f048"; }
+
+.fad.fa-step-forward:after {
+  content: "\10f051"; }
+
+.fad.fa-stethoscope:after {
+  content: "\10f0f1"; }
+
+.fad.fa-sticky-note:after {
+  content: "\10f249"; }
+
+.fad.fa-stocking:after {
+  content: "\10f7d5"; }
+
+.fad.fa-stomach:after {
+  content: "\10f623"; }
+
+.fad.fa-stop:after {
+  content: "\10f04d"; }
+
+.fad.fa-stop-circle:after {
+  content: "\10f28d"; }
+
+.fad.fa-stopwatch:after {
+  content: "\10f2f2"; }
+
+.fad.fa-stopwatch-20:after {
+  content: "\10e06f"; }
+
+.fad.fa-store:after {
+  content: "\10f54e"; }
+
+.fad.fa-store-alt:after {
+  content: "\10f54f"; }
+
+.fad.fa-store-alt-slash:after {
+  content: "\10e070"; }
+
+.fad.fa-store-slash:after {
+  content: "\10e071"; }
+
+.fad.fa-stream:after {
+  content: "\10f550"; }
+
+.fad.fa-street-view:after {
+  content: "\10f21d"; }
+
+.fad.fa-stretcher:after {
+  content: "\10f825"; }
+
+.fad.fa-strikethrough:after {
+  content: "\10f0cc"; }
+
+.fad.fa-stroopwafel:after {
+  content: "\10f551"; }
+
+.fad.fa-subscript:after {
+  content: "\10f12c"; }
+
+.fad.fa-subway:after {
+  content: "\10f239"; }
+
+.fad.fa-suitcase:after {
+  content: "\10f0f2"; }
+
+.fad.fa-suitcase-rolling:after {
+  content: "\10f5c1"; }
+
+.fad.fa-sun:after {
+  content: "\10f185"; }
+
+.fad.fa-sun-cloud:after {
+  content: "\10f763"; }
+
+.fad.fa-sun-dust:after {
+  content: "\10f764"; }
+
+.fad.fa-sun-haze:after {
+  content: "\10f765"; }
+
+.fad.fa-sunglasses:after {
+  content: "\10f892"; }
+
+.fad.fa-sunrise:after {
+  content: "\10f766"; }
+
+.fad.fa-sunset:after {
+  content: "\10f767"; }
+
+.fad.fa-superscript:after {
+  content: "\10f12b"; }
+
+.fad.fa-surprise:after {
+  content: "\10f5c2"; }
+
+.fad.fa-swatchbook:after {
+  content: "\10f5c3"; }
+
+.fad.fa-swimmer:after {
+  content: "\10f5c4"; }
+
+.fad.fa-swimming-pool:after {
+  content: "\10f5c5"; }
+
+.fad.fa-sword:after {
+  content: "\10f71c"; }
+
+.fad.fa-sword-laser:after {
+  content: "\10e03b"; }
+
+.fad.fa-sword-laser-alt:after {
+  content: "\10e03c"; }
+
+.fad.fa-swords:after {
+  content: "\10f71d"; }
+
+.fad.fa-swords-laser:after {
+  content: "\10e03d"; }
+
+.fad.fa-synagogue:after {
+  content: "\10f69b"; }
+
+.fad.fa-sync:after {
+  content: "\10f021"; }
+
+.fad.fa-sync-alt:after {
+  content: "\10f2f1"; }
+
+.fad.fa-syringe:after {
+  content: "\10f48e"; }
+
+.fad.fa-table:after {
+  content: "\10f0ce"; }
+
+.fad.fa-table-tennis:after {
+  content: "\10f45d"; }
+
+.fad.fa-tablet:after {
+  content: "\10f10a"; }
+
+.fad.fa-tablet-alt:after {
+  content: "\10f3fa"; }
+
+.fad.fa-tablet-android:after {
+  content: "\10f3fb"; }
+
+.fad.fa-tablet-android-alt:after {
+  content: "\10f3fc"; }
+
+.fad.fa-tablet-rugged:after {
+  content: "\10f48f"; }
+
+.fad.fa-tablets:after {
+  content: "\10f490"; }
+
+.fad.fa-tachometer:after {
+  content: "\10f0e4"; }
+
+.fad.fa-tachometer-alt:after {
+  content: "\10f3fd"; }
+
+.fad.fa-tachometer-alt-average:after {
+  content: "\10f624"; }
+
+.fad.fa-tachometer-alt-fast:after {
+  content: "\10f625"; }
+
+.fad.fa-tachometer-alt-fastest:after {
+  content: "\10f626"; }
+
+.fad.fa-tachometer-alt-slow:after {
+  content: "\10f627"; }
+
+.fad.fa-tachometer-alt-slowest:after {
+  content: "\10f628"; }
+
+.fad.fa-tachometer-average:after {
+  content: "\10f629"; }
+
+.fad.fa-tachometer-fast:after {
+  content: "\10f62a"; }
+
+.fad.fa-tachometer-fastest:after {
+  content: "\10f62b"; }
+
+.fad.fa-tachometer-slow:after {
+  content: "\10f62c"; }
+
+.fad.fa-tachometer-slowest:after {
+  content: "\10f62d"; }
+
+.fad.fa-taco:after {
+  content: "\10f826"; }
+
+.fad.fa-tag:after {
+  content: "\10f02b"; }
+
+.fad.fa-tags:after {
+  content: "\10f02c"; }
+
+.fad.fa-tally:after {
+  content: "\10f69c"; }
+
+.fad.fa-tanakh:after {
+  content: "\10f827"; }
+
+.fad.fa-tape:after {
+  content: "\10f4db"; }
+
+.fad.fa-tasks:after {
+  content: "\10f0ae"; }
+
+.fad.fa-tasks-alt:after {
+  content: "\10f828"; }
+
+.fad.fa-taxi:after {
+  content: "\10f1ba"; }
+
+.fad.fa-teeth:after {
+  content: "\10f62e"; }
+
+.fad.fa-teeth-open:after {
+  content: "\10f62f"; }
+
+.fad.fa-telescope:after {
+  content: "\10e03e"; }
+
+.fad.fa-temperature-down:after {
+  content: "\10e03f"; }
+
+.fad.fa-temperature-frigid:after {
+  content: "\10f768"; }
+
+.fad.fa-temperature-high:after {
+  content: "\10f769"; }
+
+.fad.fa-temperature-hot:after {
+  content: "\10f76a"; }
+
+.fad.fa-temperature-low:after {
+  content: "\10f76b"; }
+
+.fad.fa-temperature-up:after {
+  content: "\10e040"; }
+
+.fad.fa-tenge:after {
+  content: "\10f7d7"; }
+
+.fad.fa-tennis-ball:after {
+  content: "\10f45e"; }
+
+.fad.fa-terminal:after {
+  content: "\10f120"; }
+
+.fad.fa-text:after {
+  content: "\10f893"; }
+
+.fad.fa-text-height:after {
+  content: "\10f034"; }
+
+.fad.fa-text-size:after {
+  content: "\10f894"; }
+
+.fad.fa-text-width:after {
+  content: "\10f035"; }
+
+.fad.fa-th:after {
+  content: "\10f00a"; }
+
+.fad.fa-th-large:after {
+  content: "\10f009"; }
+
+.fad.fa-th-list:after {
+  content: "\10f00b"; }
+
+.fad.fa-theater-masks:after {
+  content: "\10f630"; }
+
+.fad.fa-thermometer:after {
+  content: "\10f491"; }
+
+.fad.fa-thermometer-empty:after {
+  content: "\10f2cb"; }
+
+.fad.fa-thermometer-full:after {
+  content: "\10f2c7"; }
+
+.fad.fa-thermometer-half:after {
+  content: "\10f2c9"; }
+
+.fad.fa-thermometer-quarter:after {
+  content: "\10f2ca"; }
+
+.fad.fa-thermometer-three-quarters:after {
+  content: "\10f2c8"; }
+
+.fad.fa-theta:after {
+  content: "\10f69e"; }
+
+.fad.fa-thumbs-down:after {
+  content: "\10f165"; }
+
+.fad.fa-thumbs-up:after {
+  content: "\10f164"; }
+
+.fad.fa-thumbtack:after {
+  content: "\10f08d"; }
+
+.fad.fa-thunderstorm:after {
+  content: "\10f76c"; }
+
+.fad.fa-thunderstorm-moon:after {
+  content: "\10f76d"; }
+
+.fad.fa-thunderstorm-sun:after {
+  content: "\10f76e"; }
+
+.fad.fa-ticket:after {
+  content: "\10f145"; }
+
+.fad.fa-ticket-alt:after {
+  content: "\10f3ff"; }
+
+.fad.fa-tilde:after {
+  content: "\10f69f"; }
+
+.fad.fa-times:after {
+  content: "\10f00d"; }
+
+.fad.fa-times-circle:after {
+  content: "\10f057"; }
+
+.fad.fa-times-hexagon:after {
+  content: "\10f2ee"; }
+
+.fad.fa-times-octagon:after {
+  content: "\10f2f0"; }
+
+.fad.fa-times-square:after {
+  content: "\10f2d3"; }
+
+.fad.fa-tint:after {
+  content: "\10f043"; }
+
+.fad.fa-tint-slash:after {
+  content: "\10f5c7"; }
+
+.fad.fa-tire:after {
+  content: "\10f631"; }
+
+.fad.fa-tire-flat:after {
+  content: "\10f632"; }
+
+.fad.fa-tire-pressure-warning:after {
+  content: "\10f633"; }
+
+.fad.fa-tire-rugged:after {
+  content: "\10f634"; }
+
+.fad.fa-tired:after {
+  content: "\10f5c8"; }
+
+.fad.fa-toggle-off:after {
+  content: "\10f204"; }
+
+.fad.fa-toggle-on:after {
+  content: "\10f205"; }
+
+.fad.fa-toilet:after {
+  content: "\10f7d8"; }
+
+.fad.fa-toilet-paper:after {
+  content: "\10f71e"; }
+
+.fad.fa-toilet-paper-alt:after {
+  content: "\10f71f"; }
+
+.fad.fa-toilet-paper-slash:after {
+  content: "\10e072"; }
+
+.fad.fa-tombstone:after {
+  content: "\10f720"; }
+
+.fad.fa-tombstone-alt:after {
+  content: "\10f721"; }
+
+.fad.fa-toolbox:after {
+  content: "\10f552"; }
+
+.fad.fa-tools:after {
+  content: "\10f7d9"; }
+
+.fad.fa-tooth:after {
+  content: "\10f5c9"; }
+
+.fad.fa-toothbrush:after {
+  content: "\10f635"; }
+
+.fad.fa-torah:after {
+  content: "\10f6a0"; }
+
+.fad.fa-torii-gate:after {
+  content: "\10f6a1"; }
+
+.fad.fa-tornado:after {
+  content: "\10f76f"; }
+
+.fad.fa-tractor:after {
+  content: "\10f722"; }
+
+.fad.fa-trademark:after {
+  content: "\10f25c"; }
+
+.fad.fa-traffic-cone:after {
+  content: "\10f636"; }
+
+.fad.fa-traffic-light:after {
+  content: "\10f637"; }
+
+.fad.fa-traffic-light-go:after {
+  content: "\10f638"; }
+
+.fad.fa-traffic-light-slow:after {
+  content: "\10f639"; }
+
+.fad.fa-traffic-light-stop:after {
+  content: "\10f63a"; }
+
+.fad.fa-trailer:after {
+  content: "\10e041"; }
+
+.fad.fa-train:after {
+  content: "\10f238"; }
+
+.fad.fa-tram:after {
+  content: "\10f7da"; }
+
+.fad.fa-transgender:after {
+  content: "\10f224"; }
+
+.fad.fa-transgender-alt:after {
+  content: "\10f225"; }
+
+.fad.fa-transporter:after {
+  content: "\10e042"; }
+
+.fad.fa-transporter-1:after {
+  content: "\10e043"; }
+
+.fad.fa-transporter-2:after {
+  content: "\10e044"; }
+
+.fad.fa-transporter-3:after {
+  content: "\10e045"; }
+
+.fad.fa-transporter-empty:after {
+  content: "\10e046"; }
+
+.fad.fa-trash:after {
+  content: "\10f1f8"; }
+
+.fad.fa-trash-alt:after {
+  content: "\10f2ed"; }
+
+.fad.fa-trash-restore:after {
+  content: "\10f829"; }
+
+.fad.fa-trash-restore-alt:after {
+  content: "\10f82a"; }
+
+.fad.fa-trash-undo:after {
+  content: "\10f895"; }
+
+.fad.fa-trash-undo-alt:after {
+  content: "\10f896"; }
+
+.fad.fa-treasure-chest:after {
+  content: "\10f723"; }
+
+.fad.fa-tree:after {
+  content: "\10f1bb"; }
+
+.fad.fa-tree-alt:after {
+  content: "\10f400"; }
+
+.fad.fa-tree-christmas:after {
+  content: "\10f7db"; }
+
+.fad.fa-tree-decorated:after {
+  content: "\10f7dc"; }
+
+.fad.fa-tree-large:after {
+  content: "\10f7dd"; }
+
+.fad.fa-tree-palm:after {
+  content: "\10f82b"; }
+
+.fad.fa-trees:after {
+  content: "\10f724"; }
+
+.fad.fa-triangle:after {
+  content: "\10f2ec"; }
+
+.fad.fa-triangle-music:after {
+  content: "\10f8e2"; }
+
+.fad.fa-trophy:after {
+  content: "\10f091"; }
+
+.fad.fa-trophy-alt:after {
+  content: "\10f2eb"; }
+
+.fad.fa-truck:after {
+  content: "\10f0d1"; }
+
+.fad.fa-truck-container:after {
+  content: "\10f4dc"; }
+
+.fad.fa-truck-couch:after {
+  content: "\10f4dd"; }
+
+.fad.fa-truck-loading:after {
+  content: "\10f4de"; }
+
+.fad.fa-truck-monster:after {
+  content: "\10f63b"; }
+
+.fad.fa-truck-moving:after {
+  content: "\10f4df"; }
+
+.fad.fa-truck-pickup:after {
+  content: "\10f63c"; }
+
+.fad.fa-truck-plow:after {
+  content: "\10f7de"; }
+
+.fad.fa-truck-ramp:after {
+  content: "\10f4e0"; }
+
+.fad.fa-trumpet:after {
+  content: "\10f8e3"; }
+
+.fad.fa-tshirt:after {
+  content: "\10f553"; }
+
+.fad.fa-tty:after {
+  content: "\10f1e4"; }
+
+.fad.fa-turkey:after {
+  content: "\10f725"; }
+
+.fad.fa-turntable:after {
+  content: "\10f8e4"; }
+
+.fad.fa-turtle:after {
+  content: "\10f726"; }
+
+.fad.fa-tv:after {
+  content: "\10f26c"; }
+
+.fad.fa-tv-alt:after {
+  content: "\10f8e5"; }
+
+.fad.fa-tv-music:after {
+  content: "\10f8e6"; }
+
+.fad.fa-tv-retro:after {
+  content: "\10f401"; }
+
+.fad.fa-typewriter:after {
+  content: "\10f8e7"; }
+
+.fad.fa-ufo:after {
+  content: "\10e047"; }
+
+.fad.fa-ufo-beam:after {
+  content: "\10e048"; }
+
+.fad.fa-umbrella:after {
+  content: "\10f0e9"; }
+
+.fad.fa-umbrella-beach:after {
+  content: "\10f5ca"; }
+
+.fad.fa-underline:after {
+  content: "\10f0cd"; }
+
+.fad.fa-undo:after {
+  content: "\10f0e2"; }
+
+.fad.fa-undo-alt:after {
+  content: "\10f2ea"; }
+
+.fad.fa-unicorn:after {
+  content: "\10f727"; }
+
+.fad.fa-union:after {
+  content: "\10f6a2"; }
+
+.fad.fa-universal-access:after {
+  content: "\10f29a"; }
+
+.fad.fa-university:after {
+  content: "\10f19c"; }
+
+.fad.fa-unlink:after {
+  content: "\10f127"; }
+
+.fad.fa-unlock:after {
+  content: "\10f09c"; }
+
+.fad.fa-unlock-alt:after {
+  content: "\10f13e"; }
+
+.fad.fa-upload:after {
+  content: "\10f093"; }
+
+.fad.fa-usb-drive:after {
+  content: "\10f8e9"; }
+
+.fad.fa-usd-circle:after {
+  content: "\10f2e8"; }
+
+.fad.fa-usd-square:after {
+  content: "\10f2e9"; }
+
+.fad.fa-user:after {
+  content: "\10f007"; }
+
+.fad.fa-user-alien:after {
+  content: "\10e04a"; }
+
+.fad.fa-user-alt:after {
+  content: "\10f406"; }
+
+.fad.fa-user-alt-slash:after {
+  content: "\10f4fa"; }
+
+.fad.fa-user-astronaut:after {
+  content: "\10f4fb"; }
+
+.fad.fa-user-chart:after {
+  content: "\10f6a3"; }
+
+.fad.fa-user-check:after {
+  content: "\10f4fc"; }
+
+.fad.fa-user-circle:after {
+  content: "\10f2bd"; }
+
+.fad.fa-user-clock:after {
+  content: "\10f4fd"; }
+
+.fad.fa-user-cog:after {
+  content: "\10f4fe"; }
+
+.fad.fa-user-cowboy:after {
+  content: "\10f8ea"; }
+
+.fad.fa-user-crown:after {
+  content: "\10f6a4"; }
+
+.fad.fa-user-edit:after {
+  content: "\10f4ff"; }
+
+.fad.fa-user-friends:after {
+  content: "\10f500"; }
+
+.fad.fa-user-graduate:after {
+  content: "\10f501"; }
+
+.fad.fa-user-hard-hat:after {
+  content: "\10f82c"; }
+
+.fad.fa-user-headset:after {
+  content: "\10f82d"; }
+
+.fad.fa-user-injured:after {
+  content: "\10f728"; }
+
+.fad.fa-user-lock:after {
+  content: "\10f502"; }
+
+.fad.fa-user-md:after {
+  content: "\10f0f0"; }
+
+.fad.fa-user-md-chat:after {
+  content: "\10f82e"; }
+
+.fad.fa-user-minus:after {
+  content: "\10f503"; }
+
+.fad.fa-user-music:after {
+  content: "\10f8eb"; }
+
+.fad.fa-user-ninja:after {
+  content: "\10f504"; }
+
+.fad.fa-user-nurse:after {
+  content: "\10f82f"; }
+
+.fad.fa-user-plus:after {
+  content: "\10f234"; }
+
+.fad.fa-user-robot:after {
+  content: "\10e04b"; }
+
+.fad.fa-user-secret:after {
+  content: "\10f21b"; }
+
+.fad.fa-user-shield:after {
+  content: "\10f505"; }
+
+.fad.fa-user-slash:after {
+  content: "\10f506"; }
+
+.fad.fa-user-tag:after {
+  content: "\10f507"; }
+
+.fad.fa-user-tie:after {
+  content: "\10f508"; }
+
+.fad.fa-user-times:after {
+  content: "\10f235"; }
+
+.fad.fa-user-unlock:after {
+  content: "\10e058"; }
+
+.fad.fa-user-visor:after {
+  content: "\10e04c"; }
+
+.fad.fa-users:after {
+  content: "\10f0c0"; }
+
+.fad.fa-users-class:after {
+  content: "\10f63d"; }
+
+.fad.fa-users-cog:after {
+  content: "\10f509"; }
+
+.fad.fa-users-crown:after {
+  content: "\10f6a5"; }
+
+.fad.fa-users-medical:after {
+  content: "\10f830"; }
+
+.fad.fa-users-slash:after {
+  content: "\10e073"; }
+
+.fad.fa-utensil-fork:after {
+  content: "\10f2e3"; }
+
+.fad.fa-utensil-knife:after {
+  content: "\10f2e4"; }
+
+.fad.fa-utensil-spoon:after {
+  content: "\10f2e5"; }
+
+.fad.fa-utensils:after {
+  content: "\10f2e7"; }
+
+.fad.fa-utensils-alt:after {
+  content: "\10f2e6"; }
+
+.fad.fa-vacuum:after {
+  content: "\10e04d"; }
+
+.fad.fa-vacuum-robot:after {
+  content: "\10e04e"; }
+
+.fad.fa-value-absolute:after {
+  content: "\10f6a6"; }
+
+.fad.fa-vector-square:after {
+  content: "\10f5cb"; }
+
+.fad.fa-venus:after {
+  content: "\10f221"; }
+
+.fad.fa-venus-double:after {
+  content: "\10f226"; }
+
+.fad.fa-venus-mars:after {
+  content: "\10f228"; }
+
+.fad.fa-vest:after {
+  content: "\10e085"; }
+
+.fad.fa-vest-patches:after {
+  content: "\10e086"; }
+
+.fad.fa-vhs:after {
+  content: "\10f8ec"; }
+
+.fad.fa-vial:after {
+  content: "\10f492"; }
+
+.fad.fa-vials:after {
+  content: "\10f493"; }
+
+.fad.fa-video:after {
+  content: "\10f03d"; }
+
+.fad.fa-video-plus:after {
+  content: "\10f4e1"; }
+
+.fad.fa-video-slash:after {
+  content: "\10f4e2"; }
+
+.fad.fa-vihara:after {
+  content: "\10f6a7"; }
+
+.fad.fa-violin:after {
+  content: "\10f8ed"; }
+
+.fad.fa-virus:after {
+  content: "\10e074"; }
+
+.fad.fa-virus-slash:after {
+  content: "\10e075"; }
+
+.fad.fa-viruses:after {
+  content: "\10e076"; }
+
+.fad.fa-voicemail:after {
+  content: "\10f897"; }
+
+.fad.fa-volcano:after {
+  content: "\10f770"; }
+
+.fad.fa-volleyball-ball:after {
+  content: "\10f45f"; }
+
+.fad.fa-volume:after {
+  content: "\10f6a8"; }
+
+.fad.fa-volume-down:after {
+  content: "\10f027"; }
+
+.fad.fa-volume-mute:after {
+  content: "\10f6a9"; }
+
+.fad.fa-volume-off:after {
+  content: "\10f026"; }
+
+.fad.fa-volume-slash:after {
+  content: "\10f2e2"; }
+
+.fad.fa-volume-up:after {
+  content: "\10f028"; }
+
+.fad.fa-vote-nay:after {
+  content: "\10f771"; }
+
+.fad.fa-vote-yea:after {
+  content: "\10f772"; }
+
+.fad.fa-vr-cardboard:after {
+  content: "\10f729"; }
+
+.fad.fa-wagon-covered:after {
+  content: "\10f8ee"; }
+
+.fad.fa-walker:after {
+  content: "\10f831"; }
+
+.fad.fa-walkie-talkie:after {
+  content: "\10f8ef"; }
+
+.fad.fa-walking:after {
+  content: "\10f554"; }
+
+.fad.fa-wallet:after {
+  content: "\10f555"; }
+
+.fad.fa-wand:after {
+  content: "\10f72a"; }
+
+.fad.fa-wand-magic:after {
+  content: "\10f72b"; }
+
+.fad.fa-warehouse:after {
+  content: "\10f494"; }
+
+.fad.fa-warehouse-alt:after {
+  content: "\10f495"; }
+
+.fad.fa-washer:after {
+  content: "\10f898"; }
+
+.fad.fa-watch:after {
+  content: "\10f2e1"; }
+
+.fad.fa-watch-calculator:after {
+  content: "\10f8f0"; }
+
+.fad.fa-watch-fitness:after {
+  content: "\10f63e"; }
+
+.fad.fa-water:after {
+  content: "\10f773"; }
+
+.fad.fa-water-lower:after {
+  content: "\10f774"; }
+
+.fad.fa-water-rise:after {
+  content: "\10f775"; }
+
+.fad.fa-wave-sine:after {
+  content: "\10f899"; }
+
+.fad.fa-wave-square:after {
+  content: "\10f83e"; }
+
+.fad.fa-wave-triangle:after {
+  content: "\10f89a"; }
+
+.fad.fa-waveform:after {
+  content: "\10f8f1"; }
+
+.fad.fa-waveform-path:after {
+  content: "\10f8f2"; }
+
+.fad.fa-webcam:after {
+  content: "\10f832"; }
+
+.fad.fa-webcam-slash:after {
+  content: "\10f833"; }
+
+.fad.fa-weight:after {
+  content: "\10f496"; }
+
+.fad.fa-weight-hanging:after {
+  content: "\10f5cd"; }
+
+.fad.fa-whale:after {
+  content: "\10f72c"; }
+
+.fad.fa-wheat:after {
+  content: "\10f72d"; }
+
+.fad.fa-wheelchair:after {
+  content: "\10f193"; }
+
+.fad.fa-whistle:after {
+  content: "\10f460"; }
+
+.fad.fa-wifi:after {
+  content: "\10f1eb"; }
+
+.fad.fa-wifi-1:after {
+  content: "\10f6aa"; }
+
+.fad.fa-wifi-2:after {
+  content: "\10f6ab"; }
+
+.fad.fa-wifi-slash:after {
+  content: "\10f6ac"; }
+
+.fad.fa-wind:after {
+  content: "\10f72e"; }
+
+.fad.fa-wind-turbine:after {
+  content: "\10f89b"; }
+
+.fad.fa-wind-warning:after {
+  content: "\10f776"; }
+
+.fad.fa-window:after {
+  content: "\10f40e"; }
+
+.fad.fa-window-alt:after {
+  content: "\10f40f"; }
+
+.fad.fa-window-close:after {
+  content: "\10f410"; }
+
+.fad.fa-window-frame:after {
+  content: "\10e04f"; }
+
+.fad.fa-window-frame-open:after {
+  content: "\10e050"; }
+
+.fad.fa-window-maximize:after {
+  content: "\10f2d0"; }
+
+.fad.fa-window-minimize:after {
+  content: "\10f2d1"; }
+
+.fad.fa-window-restore:after {
+  content: "\10f2d2"; }
+
+.fad.fa-windsock:after {
+  content: "\10f777"; }
+
+.fad.fa-wine-bottle:after {
+  content: "\10f72f"; }
+
+.fad.fa-wine-glass:after {
+  content: "\10f4e3"; }
+
+.fad.fa-wine-glass-alt:after {
+  content: "\10f5ce"; }
+
+.fad.fa-won-sign:after {
+  content: "\10f159"; }
+
+.fad.fa-wreath:after {
+  content: "\10f7e2"; }
+
+.fad.fa-wrench:after {
+  content: "\10f0ad"; }
+
+.fad.fa-x-ray:after {
+  content: "\10f497"; }
+
+.fad.fa-yen-sign:after {
+  content: "\10f157"; }
+
+.fad.fa-yin-yang:after {
+  content: "\10f6ad"; }
+@font-face {
+  font-family: 'Font Awesome 5 Free';
+  font-style: normal;
+  font-weight: 300;
+  font-display: block;
+  src: url("/fonts/fa-light-300.eot");
+  src: url("/fonts/fa-light-300.eot?#iefix") format("embedded-opentype"), url("/fonts/fa-light-300.woff2") format("woff2"), url("/fonts/fa-light-300.woff") format("woff"), url("/fonts/fa-light-300.ttf") format("truetype"), url("/fonts/fa-light-300.svg#fontawesome") format("svg"); }
+
+.fal {
+  font-family: 'Font Awesome 5 Free';
+  font-weight: 300; }
 @font-face {
   font-family: 'Font Awesome 5 Free';
   font-style: normal;
   font-weight: 400;
-  font-display: swap;
+  font-display: block;
   src: url("/fonts/fa-regular-400.eot");
   src: url("/fonts/fa-regular-400.eot?#iefix") format("embedded-opentype"), url("/fonts/fa-regular-400.woff2") format("woff2"), url("/fonts/fa-regular-400.woff") format("woff"), url("/fonts/fa-regular-400.ttf") format("truetype"), url("/fonts/fa-regular-400.svg#fontawesome") format("svg"); }
 
@@ -4276,7 +12771,7 @@ readers do not read off random characters that represent icons */
   font-family: 'Font Awesome 5 Free';
   font-style: normal;
   font-weight: 900;
-  font-display: swap;
+  font-display: block;
   src: url("/fonts/fa-solid-900.eot");
   src: url("/fonts/fa-solid-900.eot?#iefix") format("embedded-opentype"), url("/fonts/fa-solid-900.woff2") format("woff2"), url("/fonts/fa-solid-900.woff") format("woff"), url("/fonts/fa-solid-900.ttf") format("truetype"), url("/fonts/fa-solid-900.svg#fontawesome") format("svg"); }
 
diff --git a/resources/assets/sass/lib/nucleo.css b/resources/assets/sass/lib/nucleo.css
index b03698950..4171a5523 100644
--- a/resources/assets/sass/lib/nucleo.css
+++ b/resources/assets/sass/lib/nucleo.css
@@ -10,6 +10,7 @@ License - nucleoapp.com/license/
   src: url('/fonts/nucleo-icons.eot') format('embedded-opentype'), url('/fonts/nucleo-icons.woff2') format('woff2'), url('/fonts/nucleo-icons.woff') format('woff'), url('/fonts/nucleo-icons.ttf') format('truetype'), url('/fonts/nucleo-icons.svg') format('svg');
   font-weight: normal;
   font-style: normal;
+  font-display: swap;
 }
 /*------------------------
     base class definition
diff --git a/resources/assets/sass/profile.scss b/resources/assets/sass/profile.scss
new file mode 100644
index 000000000..0d1f2533f
--- /dev/null
+++ b/resources/assets/sass/profile.scss
@@ -0,0 +1,2 @@
+@import "node_modules/@glidejs/glide/src/assets/sass/glide.core.scss";
+@import "node_modules/@glidejs/glide/src/assets/sass/glide.theme.scss";
diff --git a/resources/assets/sass/spa.scss b/resources/assets/sass/spa.scss
index 72e08e16b..6fe81bc41 100644
--- a/resources/assets/sass/spa.scss
+++ b/resources/assets/sass/spa.scss
@@ -140,6 +140,10 @@ body {
     z-index: 2;
 }
 
+.fw-bold {
+    font-weight: bold;
+}
+
 .navbar-light .navbar-brand {
     color: var(--dark);
 
@@ -189,6 +193,10 @@ a.text-dark:hover {
 
 .border {
     border: 1px solid var(--border-color) !important;
+
+    &-right {
+        border-color: var(--border-color) !important;
+    }
 }
 
 .bg-white,
@@ -392,6 +400,14 @@ span.twitter-typeahead .tt-suggestion:focus {
     font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
 }
 
+.timestamp-overlay-badge {
+    color: var(--dark);
+}
+
+.modal-backdrop {
+    opacity: 0.8;
+}
+
 .timeline-status-component {
     .username {
         font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
diff --git a/resources/lang/af/web.php b/resources/lang/af/web.php
index 3844f847a..2c6a7b418 100644
--- a/resources/lang/af/web.php
+++ b/resources/lang/af/web.php
@@ -13,6 +13,7 @@ return [
 		'shared' => 'Shared',
 		'shares' => 'Shares',
 		'unshare' => 'Unshare',
+		'bookmark' => 'Bookmark',
 
 		'cancel' => 'Cancel',
 		'copyLink' => 'Copy Link',
@@ -23,6 +24,10 @@ return [
 		'other' => 'Other',
 		'readMore' => 'Read more',
 		'success' => 'Success',
+		'proceed' => 'Proceed',
+		'next' => 'Next',
+		'close' => 'Close',
+		'clickHere' => 'click here',
 
 		'sensitive' => 'Sensitive',
 		'sensitiveContent' => 'Sensitive Content',
@@ -97,6 +102,7 @@ return [
 		'modlog' => 'modlog',
 		'post' => 'post',
 		'story' => 'story',
+		'noneFound' => 'No notifications found',
 	],
 
 	'post' => [
@@ -176,11 +182,27 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'People you may know'
+		'peopleYouMayKnow' => 'People you may know',
+
+		'onboarding' => [
+			'welcome' => 'Welcome',
+			'thisIsYourHomeFeed' => 'This is your home feed, a chronological feed of posts from accounts you follow.',
+			'letUsHelpYouFind' => 'Let us help you find some interesting people to follow',
+			'refreshFeed' => 'Refresh my feed',
+		],
 	],
 
 	'hashtags' => [
 		'emptyFeed' => 'We can\'t seem to find any posts for this hashtag'
 	],
 
+	'report' => [
+		'report' => 'Report',
+		'selectReason' => 'Select a reason',
+		'reported' => 'Reported',
+		'sendingReport' => 'Sending report',
+		'thanksMsg' => 'Thanks for the report, people like you help keep our community safe!',
+		'contactAdminMsg' => 'If you\'d like to contact an administrator about this post or report',
+	],
+
 ];
diff --git a/resources/lang/ar/web.php b/resources/lang/ar/web.php
index 416d56e53..26adc8d89 100644
--- a/resources/lang/ar/web.php
+++ b/resources/lang/ar/web.php
@@ -13,6 +13,7 @@ return [
 		'shared' => 'تمَّ مُشارَكَتُه',
 		'shares' => 'مُشارَكَات',
 		'unshare' => 'إلغاء المُشارَكَة',
+		'bookmark' => 'ضَع عَلامَةً مَرجِعِيَّة',
 
 		'cancel' => 'إلغاء',
 		'copyLink' => 'نَسخ الرابِط',
@@ -23,6 +24,10 @@ return [
 		'other' => 'اُخرى',
 		'readMore' => 'قراءةُ المزيد',
 		'success' => 'نَجاح',
+		'proceed' => 'تابِع',
+		'next' => 'التَّالي',
+		'close' => 'إغْلَاق',
+		'clickHere' => 'اِضْغَط هُنَا',
 
 		'sensitive' => 'حسَّاس',
 		'sensitiveContent' => 'مُحتَوًى حسَّاس',
@@ -97,6 +102,7 @@ return [
 		'modlog' => 'سجلات المُشرِف',
 		'post' => 'مَنشور',
 		'story' => 'قَصَّة',
+		'noneFound' => 'لم يتم العثور على إشعارات',
 	],
 
 	'post' => [
@@ -176,11 +182,27 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'أشخاصٌ قَد تَعرِفُهُم'
+		'peopleYouMayKnow' => 'أشخاصٌ قَد تَعرِفُهُم',
+
+		'onboarding' => [
+			'welcome' => 'مَرحَبًا',
+			'thisIsYourHomeFeed' => 'هَذِهِ هِيَ تَغذِيَتُكَ الرَّئِيسَة، هِيَ تَغذِيَةُ مُرَتَّبَةٌ زَمَنِيًّا، مُكَوَّنَة مِن مَنشوراتِ الحِسابَاتِ الَّتِي تُتبِعُهَا.',
+			'letUsHelpYouFind' => 'دَعنا نُساعِدُكَ فِي العُثُورِ عَلَى أشخاصٍ يُثيرُونَ اِهتِمَامَكَ لِمُتابَعَتِهِم',
+			'refreshFeed' => 'حَدِّث تَغذِيَتي',
+		],
 	],
 
 	'hashtags' => [
 		'emptyFeed' => 'على ما يَبدوا، لا يُمكِنُنا العُثور على أي مَنشور يَحتَوي على هذا الوَسم'
 	],
 
+	'report' => [
+		'report' => 'إبلَاغ',
+		'selectReason' => 'حَدِّد سَبَبَاً',
+		'reported' => 'مُبْلَغٌ عَنه',
+		'sendingReport' => 'إرسَالُ التَّقريرِ جَارٍ',
+		'thanksMsg' => 'شُكرًا عَلَى الإبلَاغ، أُناسٌ مِن أمثالِكَ يُساعِدُونَ فِي الحِفاظِ عَلَى سَلامَةِ مُجتَمَعِنَا!',
+		'contactAdminMsg' => 'إذَا رَغِبتَ فِي التَّواصُلِ مَعَ مَسؤولٍ حَولَ هَذَا المَنشُورِ أو الإبلَاغ',
+	],
+
 ];
diff --git a/resources/lang/bn/web.php b/resources/lang/bn/web.php
index 3844f847a..d8018a0e2 100644
--- a/resources/lang/bn/web.php
+++ b/resources/lang/bn/web.php
@@ -3,136 +3,142 @@
 return [
 
 	'common' => [
-		'comment' => 'Comment',
-		'commented' => 'Commented',
-		'comments' => 'Comments',
-		'like' => 'Like',
-		'liked' => 'Liked',
-		'likes' => 'Likes',
-		'share' => 'Share',
-		'shared' => 'Shared',
-		'shares' => 'Shares',
-		'unshare' => 'Unshare',
+		'comment' => 'মন্তব্য',
+		'commented' => 'মন্তব্য করা হয়েছে',
+		'comments' => 'মন্তব্য',
+		'like' => 'পছন্দ',
+		'liked' => 'পছন্দকৃত',
+		'likes' => 'পছন্দ',
+		'share' => 'ভাগ করো',
+		'shared' => 'ভাগকৃত',
+		'shares' => 'ভাগ করা হয়েছে',
+		'unshare' => 'ভাগ ফিরত নাও',
+		'bookmark' => 'বুকমার্ক',
 
-		'cancel' => 'Cancel',
-		'copyLink' => 'Copy Link',
-		'delete' => 'Delete',
-		'error' => 'Error',
-		'errorMsg' => 'Something went wrong. Please try again later.',
-		'oops' => 'Oops!',
-		'other' => 'Other',
-		'readMore' => 'Read more',
-		'success' => 'Success',
+		'cancel' => 'বাতিল',
+		'copyLink' => 'সংযোগ অনুলিপি',
+		'delete' => 'মুছো',
+		'error' => 'ত্রুটি',
+		'errorMsg' => 'কোন সমস্যা হয়েছে। কিছুক্ষণ পর আবার চেষ্টা করো।',
+		'oops' => 'ওহো!',
+		'other' => 'অন্যান্য',
+		'readMore' => 'আরো পড়ো',
+		'success' => 'সফলতা',
+		'proceed' => 'অগ্রসর',
+		'next' => 'পরবর্তী',
+		'close' => 'বন্ধ করো',
+		'clickHere' => 'এখানে টিপ দাও',
 
-		'sensitive' => 'Sensitive',
-		'sensitiveContent' => 'Sensitive Content',
-		'sensitiveContentWarning' => 'This post may contain sensitive content',
+		'sensitive' => 'সংবেদনশীল',
+		'sensitiveContent' => 'সংবেদনশীল বস্তু',
+		'sensitiveContentWarning' => 'এই লেখা/ছবি/ভিডিওতে সংবেদনশীল কিছু থাকতে পারে',
 	],
 
 	'site' => [
-		'terms' => 'Terms of Use',
-		'privacy' => 'Privacy Policy',
+		'terms' => 'ব্যবহারের শর্তাবলী',
+		'privacy' => 'গোপনীয়তা নীতি',
 	],
 
 	'navmenu' => [
-		'search' => 'Search',
-		'admin' => 'Admin Dashboard',
+		'search' => 'অনুসন্ধান',
+		'admin' => 'প্রশাসক ড্যাশবোর্ড',
 
 		// Timelines
-		'homeFeed' => 'Home Feed',
-		'localFeed' => 'Local Feed',
-		'globalFeed' => 'Global Feed',
+		'homeFeed' => 'মূল প্রবাহ',
+		'localFeed' => 'স্থানীয় প্রবাহ',
+		'globalFeed' => 'বৈশ্বিক প্রবাহ',
 
 		// Core features
-		'discover' => 'Discover',
-		'directMessages' => 'Direct Messages',
-		'notifications' => 'Notifications',
-		'groups' => 'Groups',
-		'stories' => 'Stories',
+		'discover' => 'আবিষ্কার',
+		'directMessages' => 'সরাসরি বার্তা',
+		'notifications' => 'বিজ্ঞপ্তি',
+		'groups' => 'দল',
+		'stories' => 'গল্প',
 
 		// Self links
-		'profile' => 'Profile',
-		'drive' => 'Drive',
-		'settings' => 'Settings',
-		'compose' => 'Create New',
-		'logout' => 'Logout',
+		'profile' => 'নিজস্ব তথ্য',
+		'drive' => 'ড্রাইভ',
+		'settings' => 'পছন্দসমূহ',
+		'compose' => 'নতুন তৈরি করো',
+		'logout' => 'প্রস্থান',
 
 		// Nav footer
-		'about' => 'About',
-		'help' => 'Help',
-		'language' => 'Language',
-		'privacy' => 'Privacy',
-		'terms' => 'Terms',
+		'about' => 'সম্পর্কে',
+		'help' => 'সহায়তা',
+		'language' => 'ভাষা',
+		'privacy' => 'গোপনীয়তা',
+		'terms' => 'শর্তাবলী',
 
 		// Temporary links
-		'backToPreviousDesign' => 'Go back to previous design'
+		'backToPreviousDesign' => 'আগের নকশায় ফিরে যাও'
 	],
 
 	'directMessages' => [
-		'inbox' => 'Inbox',
-		'sent' => 'Sent',
-		'requests' => 'Requests'
+		'inbox' => 'বার্তাবাক্স',
+		'sent' => 'প্রেরিত',
+		'requests' => 'অনুরোধসমূহ'
 	],
 
 	'notifications' => [
-		'liked' => 'liked your',
-		'commented' => 'commented on your',
-		'reacted' => 'reacted to your',
-		'shared' => 'shared your',
-		'tagged' => 'tagged you in a',
+		'liked' => 'পছন্দ করেছে',
+		'commented' => 'মন্তব্য করেছে',
+		'reacted' => 'প্রতিক্রিয়া দেখিয়েছে',
+		'shared' => 'ভাগ করেছে',
+		'tagged' => 'আপনাকে ট্যাগ করেছেন',
 
-		'updatedA' => 'updated a',
-		'sentA' => 'sent a',
+		'updatedA' => 'হালনাগাদ করেছে',
+		'sentA' => 'প্রেরণ করেছে',
 
-		'followed' => 'followed',
-		'mentioned' => 'mentioned',
-		'you' => 'you',
+		'followed' => 'অনুসৃত',
+		'mentioned' => 'উল্লেখ করেছেন',
+		'you' => 'আপনি',
 
-		'yourApplication' => 'Your application to join',
-		'applicationApproved' => 'was approved!',
-		'applicationRejected' => 'was rejected. You can re-apply to join in 6 months.',
+		'yourApplication' => 'আপনার যুক্ত হওয়ার আবেদন',
+		'applicationApproved' => 'অনুমোদিত হয়েছে!',
+		'applicationRejected' => 'অনুমোদিত হয়নি। আপনি আবার ৬ মাস এর মধ্যে আবেদন করতে পারেন.',
 
-		'dm' => 'dm',
-		'groupPost' => 'group post',
-		'modlog' => 'modlog',
-		'post' => 'post',
-		'story' => 'story',
+		'dm' => 'সরাসরি বার্তা',
+		'groupPost' => 'গ্রুপ পোস্ট',
+		'modlog' => 'মডারেশন লগ',
+		'post' => 'পোস্ট',
+		'story' => 'স্টোরি',
+		'noneFound' => 'কোনো নোটিফিকেশন পাওয়া যায়নি',
 	],
 
 	'post' => [
-		'shareToFollowers' => 'Share to followers',
-		'shareToOther' => 'Share to other',
-		'noLikes' => 'No likes yet',
-		'uploading' => 'Uploading',
+		'shareToFollowers' => 'অনুসারীদের মাঝে শেয়ার করুন',
+		'shareToOther' => 'অন্যদের মাঝে শেয়ার করুন',
+		'noLikes' => 'এখনো কোনো লাইক নেই',
+		'uploading' => 'আপলোড করা হচ্ছে',
 	],
 
 	'profile' => [
-		'posts' => 'Posts',
-		'followers' => 'Followers',
-		'following' => 'Following',
-		'admin' => 'Admin',
-		'collections' => 'Collections',
-		'follow' => 'Follow',
-		'unfollow' => 'Unfollow',
-		'editProfile' => 'Edit Profile',
-		'followRequested' => 'Follow Requested',
-		'joined' => 'Joined',
+		'posts' => 'পোস্টসমূহ',
+		'followers' => 'অনুসারী',
+		'following' => 'অনুসরণ করা হচ্ছে',
+		'admin' => 'প্রশাসক',
+		'collections' => 'সংগ্রহশালা',
+		'follow' => 'অনুসরণ করুন',
+		'unfollow' => 'অনুসরণ বাতিল',
+		'editProfile' => 'প্রোফাইল সম্পাদন করুন',
+		'followRequested' => 'অনুসরণ এর অনুরোধ করা হয়েছে',
+		'joined' => 'যুক্ত হয়েছেন',
 
-		'emptyCollections' => 'We can\'t seem to find any collections',
-		'emptyPosts' => 'We can\'t seem to find any posts',
+		'emptyCollections' => 'আমরা কোনও সংগ্রহশালা খুঁজে পাচ্ছিনা',
+		'emptyPosts' => 'আমরা কোন পোষ্ট খুঁজে পাচ্ছিনা',
 	],
 
 	'menu' => [
-		'viewPost' => 'View Post',
-		'viewProfile' => 'View Profile',
-		'moderationTools' => 'Moderation Tools',
-		'report' => 'Report',
-		'archive' => 'Archive',
+		'viewPost' => 'পোস্ট দেখুন',
+		'viewProfile' => 'প্রোফাইল দেখুন',
+		'moderationTools' => 'মডারেশন Tools',
+		'report' => 'রিপোর্ট',
+		'archive' => 'আর্কাইভ',
 		'unarchive' => 'Unarchive',
-		'embed' => 'Embed',
+		'embed' => 'এমবেড করুন',
 
-		'selectOneOption' => 'Select one of the following options',
-		'unlistFromTimelines' => 'Unlist from Timelines',
+		'selectOneOption' => 'নিম্নলিখিত বিকল্পগুলির একটি নির্বাচন করুন।',
+		'unlistFromTimelines' => 'টাইমলাইন থেকে Unlist করুন',
 		'addCW' => 'Add Content Warning',
 		'removeCW' => 'Remove Content Warning',
 		'markAsSpammer' => 'Mark as Spammer',
@@ -176,11 +182,27 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'People you may know'
+		'peopleYouMayKnow' => 'People you may know',
+
+		'onboarding' => [
+			'welcome' => 'Welcome',
+			'thisIsYourHomeFeed' => 'This is your home feed, a chronological feed of posts from accounts you follow.',
+			'letUsHelpYouFind' => 'Let us help you find some interesting people to follow',
+			'refreshFeed' => 'Refresh my feed',
+		],
 	],
 
 	'hashtags' => [
 		'emptyFeed' => 'We can\'t seem to find any posts for this hashtag'
 	],
 
+	'report' => [
+		'report' => 'Report',
+		'selectReason' => 'Select a reason',
+		'reported' => 'Reported',
+		'sendingReport' => 'Sending report',
+		'thanksMsg' => 'Thanks for the report, people like you help keep our community safe!',
+		'contactAdminMsg' => 'If you\'d like to contact an administrator about this post or report',
+	],
+
 ];
diff --git a/resources/lang/bs/web.php b/resources/lang/bs/web.php
index 3844f847a..2c6a7b418 100644
--- a/resources/lang/bs/web.php
+++ b/resources/lang/bs/web.php
@@ -13,6 +13,7 @@ return [
 		'shared' => 'Shared',
 		'shares' => 'Shares',
 		'unshare' => 'Unshare',
+		'bookmark' => 'Bookmark',
 
 		'cancel' => 'Cancel',
 		'copyLink' => 'Copy Link',
@@ -23,6 +24,10 @@ return [
 		'other' => 'Other',
 		'readMore' => 'Read more',
 		'success' => 'Success',
+		'proceed' => 'Proceed',
+		'next' => 'Next',
+		'close' => 'Close',
+		'clickHere' => 'click here',
 
 		'sensitive' => 'Sensitive',
 		'sensitiveContent' => 'Sensitive Content',
@@ -97,6 +102,7 @@ return [
 		'modlog' => 'modlog',
 		'post' => 'post',
 		'story' => 'story',
+		'noneFound' => 'No notifications found',
 	],
 
 	'post' => [
@@ -176,11 +182,27 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'People you may know'
+		'peopleYouMayKnow' => 'People you may know',
+
+		'onboarding' => [
+			'welcome' => 'Welcome',
+			'thisIsYourHomeFeed' => 'This is your home feed, a chronological feed of posts from accounts you follow.',
+			'letUsHelpYouFind' => 'Let us help you find some interesting people to follow',
+			'refreshFeed' => 'Refresh my feed',
+		],
 	],
 
 	'hashtags' => [
 		'emptyFeed' => 'We can\'t seem to find any posts for this hashtag'
 	],
 
+	'report' => [
+		'report' => 'Report',
+		'selectReason' => 'Select a reason',
+		'reported' => 'Reported',
+		'sendingReport' => 'Sending report',
+		'thanksMsg' => 'Thanks for the report, people like you help keep our community safe!',
+		'contactAdminMsg' => 'If you\'d like to contact an administrator about this post or report',
+	],
+
 ];
diff --git a/resources/lang/ca/web.php b/resources/lang/ca/web.php
index 4e09a186a..eef1a3b52 100644
--- a/resources/lang/ca/web.php
+++ b/resources/lang/ca/web.php
@@ -3,40 +3,45 @@
 return [
 
 	'common' => [
-		'comment' => 'Comentar',
-		'commented' => 'Comentari',
+		'comment' => 'Comenta',
+		'commented' => 'Comentat',
 		'comments' => 'Comentaris',
 		'like' => 'M\'agrada',
 		'liked' => 'M\'ha agradat',
-		'likes' => '"M\'agrada"',
+		'likes' => 'Agradaments',
 		'share' => 'Comparteix',
 		'shared' => 'S\'han compartit',
 		'shares' => 'S\'han compartit',
 		'unshare' => 'Deixa de compartir',
+		'bookmark' => 'Afegeix als marcadors',
 
 		'cancel' => 'Cancel·la',
 		'copyLink' => 'Copia l\'enllaç',
-		'delete' => 'Esborra',
+		'delete' => 'Elimina',
 		'error' => 'Error',
 		'errorMsg' => 'Alguna cosa ha anat malament. Siusplau, intenta-ho més tard.',
-		'oops' => 'Uix!',
+		'oops' => 'Vaja!',
 		'other' => 'Altres',
-		'readMore' => 'Llegiu-ne més',
+		'readMore' => 'Més informació',
 		'success' => 'Completat amb èxit',
+		'proceed' => 'Continua',
+		'next' => 'Següent',
+		'close' => 'Tanca',
+		'clickHere' => 'fes clic aquí',
 
 		'sensitive' => 'Sensible',
 		'sensitiveContent' => 'Contingut sensible',
-		'sensitiveContentWarning' => 'Aquest article pot contenir contingut sensible',
+		'sensitiveContentWarning' => 'Aquesta publicació pot incloure contingut sensible',
 	],
 
 	'site' => [
 		'terms' => 'Condicions d\'ús',
-		'privacy' => 'Política de Privacitat',
+		'privacy' => 'Política de privadesa',
 	],
 
 	'navmenu' => [
-		'search' => 'Cercar',
-		'admin' => 'Tauler d\'Administració',
+		'search' => 'Cerca',
+		'admin' => 'Tauler d\'administració',
 
 		// Timelines
 		'homeFeed' => 'Línia de temps principal',
@@ -53,9 +58,9 @@ return [
 		// Self links
 		'profile' => 'Perfil',
 		'drive' => 'Unitat',
-		'settings' => 'Paràmetres',
-		'compose' => 'Crea un nou',
-		'logout' => 'Logout',
+		'settings' => 'Configuració',
+		'compose' => 'Crea una nova',
+		'logout' => 'Tanca la sessió',
 
 		// Nav footer
 		'about' => 'Quant a',
@@ -65,13 +70,13 @@ return [
 		'terms' => 'Termes',
 
 		// Temporary links
-		'backToPreviousDesign' => 'Tornar al disseny anterior'
+		'backToPreviousDesign' => 'Torna al disseny anterior'
 	],
 
 	'directMessages' => [
 		'inbox' => 'Safata d\'entrada',
-		'sent' => 'Enviat',
-		'requests' => 'Sol·licitud'
+		'sent' => 'Enviats',
+		'requests' => 'Sol·licituds'
 	],
 
 	'notifications' => [
@@ -84,9 +89,9 @@ return [
 		'updatedA' => 'actualitzat a',
 		'sentA' => 'enviat a',
 
-		'followed' => 'seguits',
-		'mentioned' => 'mencionat',
-		'you' => 'vostè',
+		'followed' => 't\'ha seguit',
+		'mentioned' => 'mencions',
+		'you' => 'a vós',
 
 		'yourApplication' => 'La teva sol·licitud per unir-te',
 		'applicationApproved' => 'està aprovat!',
@@ -97,13 +102,14 @@ return [
 		'modlog' => 'modlog',
 		'post' => 'publicació',
 		'story' => 'història',
+		'noneFound' => 'No hi ha notificacions',
 	],
 
 	'post' => [
-		'shareToFollowers' => 'Comparteix amb els seguidors',
-		'shareToOther' => 'Compartits per altres',
-		'noLikes' => 'Cap m\'agrada encara',
-		'uploading' => 'Carregant',
+		'shareToFollowers' => 'Comparteix amb qui et segueix',
+		'shareToOther' => 'Comparteix amb altri',
+		'noLikes' => 'Cap m\'agrada',
+		'uploading' => 'S\'està pujant',
 	],
 
 	'profile' => [
@@ -113,28 +119,28 @@ return [
 		'admin' => 'Administrador',
 		'collections' => 'Col·leccions',
 		'follow' => 'Segueix',
-		'unfollow' => 'Deixeu de seguir',
-		'editProfile' => 'Edita el teu perfil',
-		'followRequested' => 'Sol·licitud de seguidor',
+		'unfollow' => 'Deixa de seguir',
+		'editProfile' => 'Edita el perfil',
+		'followRequested' => 'Sol·licituds de seguiment',
 		'joined' => 'S\'ha unit',
 
-		'emptyCollections' => 'We can\'t seem to find any collections',
-		'emptyPosts' => 'We can\'t seem to find any posts',
+		'emptyCollections' => 'No s\'ha trobat cap col·lecció',
+		'emptyPosts' => 'No s\'ha trobat cap publicació',
 	],
 
 	'menu' => [
-		'viewPost' => 'Veure publicació',
+		'viewPost' => 'Mostra la publicació',
 		'viewProfile' => 'Mostra el perfil',
 		'moderationTools' => 'Eines de moderació',
-		'report' => 'Informe',
-		'archive' => 'Arxiu',
+		'report' => 'Denuncia',
+		'archive' => 'Arxiva',
 		'unarchive' => 'Desarxiva',
 		'embed' => 'Incrusta',
 
-		'selectOneOption' => 'Seleccioneu una de les opcions següents',
+		'selectOneOption' => 'Selecciona una de les següents opcions',
 		'unlistFromTimelines' => 'Desllista de les línies de temps',
-		'addCW' => 'Afegeix advertència de contingut',
-		'removeCW' => 'Esborra advertència de contingut',
+		'addCW' => 'Afegeix avís de contingut',
+		'removeCW' => 'Elimina l\'avís de contingut',
 		'markAsSpammer' => 'Marca com a brossa',
 		'markAsSpammerText' => 'Desllista + CW publicacions existents i futures',
 		'spam' => 'Contingut brossa',
@@ -142,45 +148,61 @@ return [
 		'abusive' => 'Abusiu o nociu',
 		'underageAccount' => 'Compte de menors d\'edat',
 		'copyrightInfringement' => 'Infracció de drets d’autor',
-		'impersonation' => 'Suplantacions',
-		'scamOrFraud' => 'Estafa o Frau',
-		'confirmReport' => 'Confirma l\'informe',
-		'confirmReportText' => 'Esteu segur que voleu informar d\'aquesta publicació?',
-		'reportSent' => 'Informe enviat!',
-		'reportSentText' => 'Hem rebut correctament el vostre informe.',
-		'reportSentError' => 'Hi ha hagut un problema en informar d\'aquesta publicació.',
+		'impersonation' => 'Suplantació d\'identitat',
+		'scamOrFraud' => 'Estafa o frau',
+		'confirmReport' => 'Confirma la denúncia',
+		'confirmReportText' => 'Segur que voleu denunciar aquesta publicació?',
+		'reportSent' => 'S\'ha enviat la denúncia',
+		'reportSentText' => 'Hem rebut correctament la teva denúncia.',
+		'reportSentError' => 'Hi ha hagut un problema en denunciar aquesta publicació.',
 
-		'modAddCWConfirm' => 'Confirmes que vols afegir un avís de contingut a aquesta publicació?',
-		'modCWSuccess' => 'Avís de contingut afegit correctament',
-		'modRemoveCWConfirm' => 'Confirmes que vols esborrar un avís de contingut d\'aquesta publicació?',
+		'modAddCWConfirm' => 'Segur que voleu afegir un avís de contingut a aquesta publicació?',
+		'modCWSuccess' => 'S\'ha afegit l\'avís de contingut correctament',
+		'modRemoveCWConfirm' => 'Segur que voleu eliminar l\'avís de contingut d\'aquesta publicació?',
 		'modRemoveCWSuccess' => 'Avís de contingut esborrat correctament',
 		'modUnlistConfirm' => 'Esteu segur que voleu desllistar d\'aquesta publicació?',
 		'modUnlistSuccess' => 'Entrada desllistada amb èxit',
-		'modMarkAsSpammerConfirm' => 'Esteu segur que voleu marcar aquest usuari com a brossa? Totes les publicacions existents i futures no apareixeran a les cronologies i s\'aplicarà un avís de contingut.',
+		'modMarkAsSpammerConfirm' => 'Segur que voleu marcar aquest usuari com a brossa? Totes les publicacions existents i futures desapareixeran de les cronologies i s\'aplicarà un avís de contingut.',
 		'modMarkAsSpammerSuccess' => 'El compte s\'ha marcat correctament com a brossa',
 
 		'toFollowers' => 'els seguidors',
 
-		'showCaption' => 'Mostra el subtítol',
+		'showCaption' => 'Mostra la descripció',
 		'showLikes' => 'Mostra els m\'agrada',
-		'compactMode' => 'Mode Compacte',
+		'compactMode' => 'Mode compacte',
 		'embedConfirmText' => 'En utilitzar aquesta inserció, accepteu el nostre',
 
-		'deletePostConfirm' => 'Esteu segur que voleu suprimir aquesta publicació?',
-		'archivePostConfirm' => 'Segur que voleu arxivar aquesta publicació?',
-		'unarchivePostConfirm' => 'Segur que voleu desarxivar aquesta publicació?',
+		'deletePostConfirm' => 'Segur que voleu eliminar aquesta publicació?',
+		'archivePostConfirm' => 'Segur que vols arxivar aquesta publicació?',
+		'unarchivePostConfirm' => 'Segur que vols desarxivar aquesta publicació?',
 	],
 
 	'story' => [
-		'add' => 'Afegir història'
+		'add' => 'Afegeix història'
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'Gent que potser coneixes'
+		'peopleYouMayKnow' => 'Gent que potser coneixeu',
+
+		'onboarding' => [
+			'welcome' => 'Us donem la benvinguda',
+			'thisIsYourHomeFeed' => 'Aquesta és la vostra línia de temps principal que mostra cronològicament les publicacions de comptes que seguiu.',
+			'letUsHelpYouFind' => 'Ens agradaria ajudar-vos a trobar gent interessant per seguir',
+			'refreshFeed' => 'Actualitza la meva línia de temps',
+		],
 	],
 
 	'hashtags' => [
-		'emptyFeed' => 'We can\'t seem to find any posts for this hashtag'
+		'emptyFeed' => 'No hi ha cap publicació per a aquesta etiqueta'
+	],
+
+	'report' => [
+		'report' => 'Denuncia',
+		'selectReason' => 'Tria una raó',
+		'reported' => 'Denunciat',
+		'sendingReport' => 'S\'està enviant la denúncia',
+		'thanksMsg' => 'Gràcies per la denúncia. Gent com vós fa que la nostra comunitat sigui segura!',
+		'contactAdminMsg' => 'Si voleu contactar amb un o una administradora sobre aquesta publicació o denúncia',
 	],
 
 ];
diff --git a/resources/lang/cs/web.php b/resources/lang/cs/web.php
index bf08f7ee4..15a5b0091 100644
--- a/resources/lang/cs/web.php
+++ b/resources/lang/cs/web.php
@@ -13,6 +13,7 @@ return [
 		'shared' => 'Sdíleno',
 		'shares' => 'Sdílení',
 		'unshare' => 'Zrušit sdílení',
+		'bookmark' => 'Záložka',
 
 		'cancel' => 'Zrušit',
 		'copyLink' => 'Kopírovat odkaz',
@@ -23,6 +24,10 @@ return [
 		'other' => 'Další',
 		'readMore' => 'Číst více',
 		'success' => 'Úspěch',
+		'proceed' => 'Pokračovat',
+		'next' => 'Další',
+		'close' => 'Zavřít',
+		'clickHere' => 'klikněte zde',
 
 		'sensitive' => 'Citlivé',
 		'sensitiveContent' => 'Citlivý obsah',
@@ -40,8 +45,8 @@ return [
 
 		// Timelines
 		'homeFeed' => 'Domovská časová osa',
-		'localFeed' => 'Místní časová osa',
-		'globalFeed' => 'Globalní časová osa',
+		'localFeed' => 'Místní kanál',
+		'globalFeed' => 'Globální časová osa',
 
 		// Core features
 		'discover' => 'Objevovat',
@@ -97,6 +102,7 @@ return [
 		'modlog' => 'moderátorský záznam',
 		'post' => 'příspěvek',
 		'story' => 'příbeh',
+		'noneFound' => 'Nebyla nalezena žádná oznámení',
 	],
 
 	'post' => [
@@ -176,11 +182,27 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'Lidé, které možná znáte'
+		'peopleYouMayKnow' => 'Lidé, které možná znáte',
+
+		'onboarding' => [
+			'welcome' => 'Vítejte',
+			'thisIsYourHomeFeed' => 'Toto je váš domovský kanál, chronologický kanál příspěvků z účtů, které sledujete.',
+			'letUsHelpYouFind' => 'Pomůžeme vám najít nějaké zajímavé lidi ke sledování',
+			'refreshFeed' => 'Obnovit můj kanál',
+		],
 	],
 
 	'hashtags' => [
 		'emptyFeed' => 'Zdá se, že pro tento štítek nelze najít žádné příspěvky'
 	],
 
+	'report' => [
+		'report' => 'Nahlásit',
+		'selectReason' => 'Vyberte důvod',
+		'reported' => 'Nahlášeno',
+		'sendingReport' => 'Odesílání hlášení',
+		'thanksMsg' => 'Díky za hlášení, lidé jako jste vy pomáhají udržet naši komunitu bezpečnou!',
+		'contactAdminMsg' => 'Pokud chcete kontaktovat administrátora ohledně tohoto příspěvku nebo hlášení',
+	],
+
 ];
diff --git a/resources/lang/cy/web.php b/resources/lang/cy/web.php
index 2f21f8d66..65abb201a 100644
--- a/resources/lang/cy/web.php
+++ b/resources/lang/cy/web.php
@@ -13,6 +13,7 @@ return [
 		'shared' => 'Rhannu',
 		'shares' => 'Rhannu',
 		'unshare' => 'Dad-rannu',
+		'bookmark' => 'Tudalnodau',
 
 		'cancel' => 'Canslo',
 		'copyLink' => 'Copïo\'r ddolen',
@@ -23,6 +24,10 @@ return [
 		'other' => 'Arall',
 		'readMore' => 'Darllen mwy',
 		'success' => 'Llwyddiant',
+		'proceed' => 'Parhau',
+		'next' => 'Nesaf',
+		'close' => 'Cau',
+		'clickHere' => 'cliciwch yma',
 
 		'sensitive' => 'Sensitif',
 		'sensitiveContent' => 'Cynnwys sensitif',
@@ -55,7 +60,7 @@ return [
 		'drive' => 'Gyriant storio',
 		'settings' => 'Gosodiadau',
 		'compose' => 'Creu newydd',
-		'logout' => 'Logout',
+		'logout' => 'Allgofnodi',
 
 		// Nav footer
 		'about' => 'Amdano',
@@ -97,6 +102,7 @@ return [
 		'modlog' => 'modlog',
 		'post' => 'post',
 		'story' => 'stori',
+		'noneFound' => 'Dim hysbysiadau',
 	],
 
 	'post' => [
@@ -176,11 +182,27 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'Pobl efallai eich bod chi\'n eu hadnabod'
+		'peopleYouMayKnow' => 'Pobl efallai eich bod chi\'n eu hadnabod',
+
+		'onboarding' => [
+			'welcome' => 'Croeso',
+			'thisIsYourHomeFeed' => 'Dyma\'ch porthiant cartref, porthiant cronolegol o bostiadau o gyfrifon rydych chi\'n eu dilyn.',
+			'letUsHelpYouFind' => 'Gadewch inni eich helpu i ddod o hyd i rai pobl ddiddorol i\'w dilyn',
+			'refreshFeed' => 'Adnewyddu fy mhorthiant',
+		],
 	],
 
 	'hashtags' => [
 		'emptyFeed' => 'Ni allwn dod o hyd i unrhyw bostiadau ar gyfer yr hashnod hwn'
 	],
 
+	'report' => [
+		'report' => 'Adroddi',
+		'selectReason' => 'Dewiswch reswm',
+		'reported' => 'Adroddwyd',
+		'sendingReport' => 'Anfon adroddiad',
+		'thanksMsg' => 'Diolch am yr adroddiad, mae pobl fel chi yn helpu i gadw ein cymuned yn ddiogel!',
+		'contactAdminMsg' => 'Os hoffech chi gysylltu â gweinyddwr am y post neu\'r adroddiad hwn',
+	],
+
 ];
diff --git a/resources/lang/da/web.php b/resources/lang/da/web.php
index 3844f847a..35b61ae4c 100644
--- a/resources/lang/da/web.php
+++ b/resources/lang/da/web.php
@@ -4,183 +4,205 @@ return [
 
 	'common' => [
 		'comment' => 'Comment',
-		'commented' => 'Commented',
-		'comments' => 'Comments',
-		'like' => 'Like',
-		'liked' => 'Liked',
-		'likes' => 'Likes',
-		'share' => 'Share',
-		'shared' => 'Shared',
-		'shares' => 'Shares',
-		'unshare' => 'Unshare',
+		'commented' => 'Kommenterede',
+		'comments' => 'Kommentarer',
+		'like' => 'Synes om',
+		'liked' => 'Synes om',
+		'likes' => 'Synes om',
+		'share' => 'Del',
+		'shared' => 'Delt',
+		'shares' => 'Delinger',
+		'unshare' => 'Fjern deling',
+		'bookmark' => 'Bookmark',
 
-		'cancel' => 'Cancel',
-		'copyLink' => 'Copy Link',
-		'delete' => 'Delete',
-		'error' => 'Error',
-		'errorMsg' => 'Something went wrong. Please try again later.',
-		'oops' => 'Oops!',
-		'other' => 'Other',
-		'readMore' => 'Read more',
-		'success' => 'Success',
+		'cancel' => 'Annuller',
+		'copyLink' => 'Kopier link',
+		'delete' => 'Slet',
+		'error' => 'Fejl',
+		'errorMsg' => 'Noget gik galt. Prøv venligst igen senere.',
+		'oops' => 'Hovsa!',
+		'other' => 'Andet',
+		'readMore' => 'Læs mere',
+		'success' => 'Succes',
+		'proceed' => 'Fortsæt',
+		'next' => 'Næste',
+		'close' => 'Luk',
+		'clickHere' => 'klik her',
 
-		'sensitive' => 'Sensitive',
-		'sensitiveContent' => 'Sensitive Content',
-		'sensitiveContentWarning' => 'This post may contain sensitive content',
+		'sensitive' => 'Følsomt',
+		'sensitiveContent' => 'Følsomt indhold',
+		'sensitiveContentWarning' => 'Dette opslag kan indeholde følsomt indhold',
 	],
 
 	'site' => [
-		'terms' => 'Terms of Use',
-		'privacy' => 'Privacy Policy',
+		'terms' => 'Brugsvilkår',
+		'privacy' => 'Privatlivspolitik',
 	],
 
 	'navmenu' => [
-		'search' => 'Search',
+		'search' => 'Søg',
 		'admin' => 'Admin Dashboard',
 
 		// Timelines
 		'homeFeed' => 'Home Feed',
-		'localFeed' => 'Local Feed',
-		'globalFeed' => 'Global Feed',
+		'localFeed' => 'Lokalt feed',
+		'globalFeed' => 'Globalt feed',
 
 		// Core features
-		'discover' => 'Discover',
-		'directMessages' => 'Direct Messages',
-		'notifications' => 'Notifications',
-		'groups' => 'Groups',
-		'stories' => 'Stories',
+		'discover' => 'Udforsk',
+		'directMessages' => 'Direkte beskeder',
+		'notifications' => 'Notifikationer',
+		'groups' => 'Grupper',
+		'stories' => 'Historier',
 
 		// Self links
-		'profile' => 'Profile',
-		'drive' => 'Drive',
-		'settings' => 'Settings',
-		'compose' => 'Create New',
-		'logout' => 'Logout',
+		'profile' => 'Profil',
+		'drive' => 'Drev',
+		'settings' => 'Indstillinger',
+		'compose' => 'Opret ny',
+		'logout' => 'Log ud',
 
 		// Nav footer
-		'about' => 'About',
-		'help' => 'Help',
-		'language' => 'Language',
-		'privacy' => 'Privacy',
-		'terms' => 'Terms',
+		'about' => 'Om',
+		'help' => 'Hjælp',
+		'language' => 'Sprog',
+		'privacy' => 'Privatliv',
+		'terms' => 'Betingelser',
 
 		// Temporary links
-		'backToPreviousDesign' => 'Go back to previous design'
+		'backToPreviousDesign' => 'Gå tilbage til forrige design'
 	],
 
 	'directMessages' => [
-		'inbox' => 'Inbox',
-		'sent' => 'Sent',
-		'requests' => 'Requests'
+		'inbox' => 'Indbakke',
+		'sent' => 'Sendt',
+		'requests' => 'Anmodninger'
 	],
 
 	'notifications' => [
-		'liked' => 'liked your',
-		'commented' => 'commented on your',
-		'reacted' => 'reacted to your',
-		'shared' => 'shared your',
-		'tagged' => 'tagged you in a',
+		'liked' => 'syntes godt om dit',
+		'commented' => 'kommenterede på dit',
+		'reacted' => 'reagerede på dit',
+		'shared' => 'delte dit',
+		'tagged' => 'taggede dig i et',
 
-		'updatedA' => 'updated a',
-		'sentA' => 'sent a',
+		'updatedA' => 'opdaterede et',
+		'sentA' => 'sendte en',
 
-		'followed' => 'followed',
-		'mentioned' => 'mentioned',
-		'you' => 'you',
+		'followed' => 'følger',
+		'mentioned' => 'nævnt',
+		'you' => 'dig',
 
-		'yourApplication' => 'Your application to join',
-		'applicationApproved' => 'was approved!',
-		'applicationRejected' => 'was rejected. You can re-apply to join in 6 months.',
+		'yourApplication' => 'Din ansøgning om at deltage',
+		'applicationApproved' => 'blev godkendt!',
+		'applicationRejected' => 'blev afvist. Du kan ansøge igen om 6 måneder.',
 
 		'dm' => 'dm',
-		'groupPost' => 'group post',
+		'groupPost' => 'gruppeopslag',
 		'modlog' => 'modlog',
-		'post' => 'post',
-		'story' => 'story',
+		'post' => 'opslag',
+		'story' => 'historie',
+		'noneFound' => 'Ingen notifikationer fundet',
 	],
 
 	'post' => [
-		'shareToFollowers' => 'Share to followers',
-		'shareToOther' => 'Share to other',
-		'noLikes' => 'No likes yet',
-		'uploading' => 'Uploading',
+		'shareToFollowers' => 'Del til følgere',
+		'shareToOther' => 'Del til andre',
+		'noLikes' => 'Ingen synes godt om endnu',
+		'uploading' => 'Uploader',
 	],
 
 	'profile' => [
-		'posts' => 'Posts',
-		'followers' => 'Followers',
-		'following' => 'Following',
+		'posts' => 'Opslag',
+		'followers' => 'Følgere',
+		'following' => 'Følger',
 		'admin' => 'Admin',
-		'collections' => 'Collections',
-		'follow' => 'Follow',
-		'unfollow' => 'Unfollow',
-		'editProfile' => 'Edit Profile',
-		'followRequested' => 'Follow Requested',
-		'joined' => 'Joined',
+		'collections' => 'Samlinger',
+		'follow' => 'Følg',
+		'unfollow' => 'Følg ikke længere',
+		'editProfile' => 'Redigér profil',
+		'followRequested' => 'Følg anmodet',
+		'joined' => 'Blev medlem',
 
 		'emptyCollections' => 'We can\'t seem to find any collections',
 		'emptyPosts' => 'We can\'t seem to find any posts',
 	],
 
 	'menu' => [
-		'viewPost' => 'View Post',
-		'viewProfile' => 'View Profile',
-		'moderationTools' => 'Moderation Tools',
+		'viewPost' => 'Se opslag',
+		'viewProfile' => 'Se profil',
+		'moderationTools' => 'Moderatorværktøjer',
 		'report' => 'Report',
 		'archive' => 'Archive',
 		'unarchive' => 'Unarchive',
 		'embed' => 'Embed',
 
 		'selectOneOption' => 'Select one of the following options',
-		'unlistFromTimelines' => 'Unlist from Timelines',
-		'addCW' => 'Add Content Warning',
-		'removeCW' => 'Remove Content Warning',
-		'markAsSpammer' => 'Mark as Spammer',
+		'unlistFromTimelines' => 'Skjul fra tidslinje',
+		'addCW' => 'Tilføj indholdsadvarsel',
+		'removeCW' => 'Fjern indholdsadvarsel',
+		'markAsSpammer' => 'Markér som spammer',
 		'markAsSpammerText' => 'Unlist + CW existing and future posts',
 		'spam' => 'Spam',
-		'sensitive' => 'Sensitive Content',
-		'abusive' => 'Abusive or Harmful',
-		'underageAccount' => 'Underage Account',
-		'copyrightInfringement' => 'Copyright Infringement',
+		'sensitive' => 'Følsomt indhold',
+		'abusive' => 'Krænkende eller skadelig',
+		'underageAccount' => 'Mindreårig konto',
+		'copyrightInfringement' => 'Krænkelse af ophavsret',
 		'impersonation' => 'Impersonation',
-		'scamOrFraud' => 'Scam or Fraud',
-		'confirmReport' => 'Confirm Report',
-		'confirmReportText' => 'Are you sure you want to report this post?',
-		'reportSent' => 'Report Sent!',
-		'reportSentText' => 'We have successfully received your report.',
+		'scamOrFraud' => 'Scam eller svindel',
+		'confirmReport' => 'Bekræft rapport',
+		'confirmReportText' => 'Er du sikker på, at du vil rapportere dette opslag?',
+		'reportSent' => 'Rapport sendt!',
+		'reportSentText' => 'Vi har modtaget din rapport.',
 		'reportSentError' => 'There was an issue reporting this post.',
 
-		'modAddCWConfirm' => 'Are you sure you want to add a content warning to this post?',
-		'modCWSuccess' => 'Successfully added content warning',
+		'modAddCWConfirm' => 'Er du sikker på, at du vil føje en indholdsadvarsel til dette indlæg?',
+		'modCWSuccess' => 'Tilføjede succesfuldt advarsel om indhold',
 		'modRemoveCWConfirm' => 'Are you sure you want to remove the content warning on this post?',
-		'modRemoveCWSuccess' => 'Successfully removed content warning',
+		'modRemoveCWSuccess' => 'Fjernede succesfuldt advarsel om indhold',
 		'modUnlistConfirm' => 'Are you sure you want to unlist this post?',
 		'modUnlistSuccess' => 'Successfully unlisted post',
 		'modMarkAsSpammerConfirm' => 'Are you sure you want to mark this user as a spammer? All existing and future posts will be unlisted on timelines and a content warning will be applied.',
-		'modMarkAsSpammerSuccess' => 'Successfully marked account as spammer',
+		'modMarkAsSpammerSuccess' => 'Markerede succesfuldt konto som spammer',
 
-		'toFollowers' => 'to Followers',
+		'toFollowers' => 'til følgere',
 
-		'showCaption' => 'Show Caption',
+		'showCaption' => 'Vis billedtekst',
 		'showLikes' => 'Show Likes',
-		'compactMode' => 'Compact Mode',
-		'embedConfirmText' => 'By using this embed, you agree to our',
+		'compactMode' => 'Kompakt tilstand',
+		'embedConfirmText' => 'Ved at bruge denne indlejring, accepterer du vores',
 
-		'deletePostConfirm' => 'Are you sure you want to delete this post?',
-		'archivePostConfirm' => 'Are you sure you want to archive this post?',
+		'deletePostConfirm' => 'Er du sikker på, at du vil slette dette opslag?',
+		'archivePostConfirm' => 'Er du sikker på, at du vil arkivere dette opslag?',
 		'unarchivePostConfirm' => 'Are you sure you want to unarchive this post?',
 	],
 
 	'story' => [
-		'add' => 'Add Story'
+		'add' => 'Tilføj historie'
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'People you may know'
+		'peopleYouMayKnow' => 'Folk du måske kender',
+
+		'onboarding' => [
+			'welcome' => 'Velkommen',
+			'thisIsYourHomeFeed' => 'This is your home feed, a chronological feed of posts from accounts you follow.',
+			'letUsHelpYouFind' => 'Lad os hjælpe dig med at finde nogle interessante mennesker du kan følge',
+			'refreshFeed' => 'Opdatér mit feed',
+		],
 	],
 
 	'hashtags' => [
 		'emptyFeed' => 'We can\'t seem to find any posts for this hashtag'
 	],
 
+	'report' => [
+		'report' => 'Report',
+		'selectReason' => 'Vælg en årsag',
+		'reported' => 'Rapporteret',
+		'sendingReport' => 'Sender rapport',
+		'thanksMsg' => 'Tak for rapporten, folk som dig hjælper med at passe på vores fællesskab!',
+		'contactAdminMsg' => 'Hvis du vil kontakte en administrator om dette indlæg eller rapport',
+	],
+
 ];
diff --git a/resources/lang/de/site.php b/resources/lang/de/site.php
index 92f81e03b..d820b0cc6 100644
--- a/resources/lang/de/site.php
+++ b/resources/lang/de/site.php
@@ -16,4 +16,16 @@ return [
 	'contact-us'	=> 'Kontaktiere uns',
 	'places'		=> 'Orte',
 	'profiles'		=> 'Profile',
+	
+	// site/contact
+	'you_can_contact_the_admins'                            => 'Du kannst die Administration kontaktieren, indem du',
+    'by_using_the_form_below'                               => 'das folgende Formular verwendest',
+    'or'                                                    => 'oder',
+    'by_sending_an_email_to'                                => 'eine E-Mail sendest an',
+    'the_admins_have_not_set_a_contact_email_address'       => 'Die Administration hat keine Kontakt-Adresse angegeben',
+    'Message'                                               => 'Nachricht',
+    'request_response_from_admins'                          => 'Um Antwort der Administration bitten',
+    'Submit'                                                => 'Absenden',
+    'log_in_to_send_a_message'                              => 'melde dich an, um eine Nachricht zu senden',
+    'Please'                                                => 'Bitte',
 ];
diff --git a/resources/lang/de/web.php b/resources/lang/de/web.php
index 7c557d03d..93d9f2272 100644
--- a/resources/lang/de/web.php
+++ b/resources/lang/de/web.php
@@ -13,6 +13,7 @@ return [
 		'shared' => 'Geteilt',
 		'shares' => 'Geteilt',
 		'unshare' => 'Teilen rückgängig machen',
+		'bookmark' => 'Lesezeichen',
 
 		'cancel' => 'Abbrechen',
 		'copyLink' => 'Link kopieren',
@@ -22,7 +23,11 @@ return [
 		'oops' => 'Hoppla!',
 		'other' => 'Anderes',
 		'readMore' => 'Weiterlesen',
-		'success' => 'Erfolgreich',
+		'success' => 'Erfolg',
+		'proceed' => 'Fortfahren',
+		'next' => 'Weiter',
+		'close' => 'Schließen',
+		'clickHere' => 'hier klicken',
 
 		'sensitive' => 'Sensibel',
 		'sensitiveContent' => 'Sensibler Inhalt',
@@ -54,7 +59,7 @@ return [
 		'profile' => 'Profil',
 		'drive' => 'Festplatte',
 		'settings' => 'Einstellungen',
-		'compose' => 'Neu erstellen',
+		'compose' => 'Neu erstellen:',
 		'logout' => 'Ausloggen',
 
 		// Nav footer
@@ -76,7 +81,7 @@ return [
 
 	'notifications' => [
 		'liked' => 'gefällt dein',
-		'commented' => 'kommentierte dein',
+		'commented' => 'kommentierte deinen',
 		'reacted' => 'reagierte auf dein',
 		'shared' => 'teilte deine',
 		'tagged' => 'markierte dich in einem',
@@ -84,9 +89,9 @@ return [
 		'updatedA' => 'aktualisierte ein',
 		'sentA' => 'sendete ein',
 
-		'followed' => 'gefolgt',
-		'mentioned' => 'erwähnt',
-		'you' => 'du',
+		'followed' => 'folgt',
+		'mentioned' => 'erwähnte',
+		'you' => 'dir',
 
 		'yourApplication' => 'Deine Bewerbung um beizutreten',
 		'applicationApproved' => 'wurde genehmigt!',
@@ -97,6 +102,7 @@ return [
 		'modlog' => 'modlog',
 		'post' => 'Beitrag',
 		'story' => 'Story',
+		'noneFound' => 'Keine Benachrichtigungen vorhanden',
 	],
 
 	'post' => [
@@ -147,15 +153,15 @@ return [
 		'confirmReport' => 'Meldung bestätigen',
 		'confirmReportText' => 'Bist du sicher, dass du diesen Beitrag melden möchtest?',
 		'reportSent' => 'Meldung gesendet!',
-		'reportSentText' => 'Wir haben deinen Bericht erfolgreich erhalten.',
+		'reportSentText' => 'Wir haben deine Meldung erfolgreich erhalten.',
 		'reportSentError' => 'Es gab ein Problem beim Melden dieses Beitrags.',
 
 		'modAddCWConfirm' => 'Bist du sicher, dass du diesem Beitrag eine Inhaltswarnung hinzufügen möchtest?',
 		'modCWSuccess' => 'Inhaltswarnung erfolgreich hinzugefügt',
-		'modRemoveCWConfirm' => 'Bist du sicher, dass die Inhaltswarnung auf diesem Beitrag entfernt werden soll?',
+		'modRemoveCWConfirm' => 'Bist du sicher, dass die Inhaltswarnung für diesen Beitrag entfernt werden soll?',
 		'modRemoveCWSuccess' => 'Inhaltswarnung erfolgreich entfernt',
 		'modUnlistConfirm' => 'Bist du sicher, dass du diesen Beitrag nicht listen möchtest?',
-		'modUnlistSuccess' => 'Beitrag erfolgreich nicht gelistet',
+		'modUnlistSuccess' => 'Beitrag aus Timelines entfernt',
 		'modMarkAsSpammerConfirm' => 'Bist du sicher, dass du diesen Benutzer als Spam markieren möchtest? Alle existierenden und zukünftigen Beiträge werden nicht mehr in der Zeitleiste angezeigt und mit einer Inhaltswarnung versehen.',
 		'modMarkAsSpammerSuccess' => 'Konto erfolgreich als Spammer markiert',
 
@@ -176,11 +182,27 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'Leute, die du vielleicht kennst'
+		'peopleYouMayKnow' => 'Leute, die du vielleicht kennst',
+
+		'onboarding' => [
+			'welcome' => 'Herzlich Willkommen',
+			'thisIsYourHomeFeed' => 'Dies ist dein Heim-Feed, ein chronologischer Feed von Beiträgen aus den Konten, denen du folgst.',
+			'letUsHelpYouFind' => 'Lass uns dir helfen, einige interessante Leute zu finden, denen du folgen kannst',
+			'refreshFeed' => 'Feed aktualisieren',
+		],
 	],
 
 	'hashtags' => [
 		'emptyFeed' => 'Wir können keine Beiträge mit diesem Hashtag finden'
 	],
 
+	'report' => [
+		'report' => 'Melden',
+		'selectReason' => 'Einen Grund auswählen',
+		'reported' => 'Gemeldet',
+		'sendingReport' => 'Meldung wird gesendet',
+		'thanksMsg' => 'Vielen Dank für die Meldung, Leute wie du helfen, unsere Community sicher zu halten!',
+		'contactAdminMsg' => 'Wenn du einen Administrator zu diesem Beitrag oder dieser Meldung kontaktieren möchtest',
+	],
+
 ];
diff --git a/resources/lang/el/web.php b/resources/lang/el/web.php
index a92b7e6fa..c81092bfd 100644
--- a/resources/lang/el/web.php
+++ b/resources/lang/el/web.php
@@ -13,6 +13,7 @@ return [
 		'shared' => 'Κοινοποιήθηκε',
 		'shares' => 'Κοινοποιήσεις',
 		'unshare' => 'Αναίρεση κοινοποίησης',
+		'bookmark' => 'Σελιδοδείκτης',
 
 		'cancel' => 'Ακύρωση',
 		'copyLink' => 'Αντιγραφή Συνδέσμου',
@@ -23,6 +24,10 @@ return [
 		'other' => 'Άλλο',
 		'readMore' => 'Διαβάστε περισσότερα',
 		'success' => 'Επιτυχής',
+		'proceed' => 'Συνέχεια',
+		'next' => 'Επόμενο',
+		'close' => 'Κλείσιμο',
+		'clickHere' => 'κλικ εδώ',
 
 		'sensitive' => 'Ευαίσθητο',
 		'sensitiveContent' => 'Ευαίσθητο περιεχόμενο',
@@ -41,10 +46,10 @@ return [
 		// Timelines
 		'homeFeed' => 'Αρχική ροή',
 		'localFeed' => 'Τοπική Ροή',
-		'globalFeed' => 'Ομοσπονδιακή Ροή',
+		'globalFeed' => 'Καθολική Ροή',
 
 		// Core features
-		'discover' => 'Ανακαλύψτε',
+		'discover' => 'Ανακάλυψη',
 		'directMessages' => 'Προσωπικά Μηνύματα',
 		'notifications' => 'Ειδοποιήσεις',
 		'groups' => 'Ομάδες',
@@ -65,7 +70,7 @@ return [
 		'terms' => 'Όροι',
 
 		// Temporary links
-		'backToPreviousDesign' => 'Go back to previous design'
+		'backToPreviousDesign' => 'Πηγαίνετε πίσω στο προηγούμενο σχεδιασμό'
 	],
 
 	'directMessages' => [
@@ -75,16 +80,16 @@ return [
 	],
 
 	'notifications' => [
-		'liked' => 'επισήμανε ότι του αρέσει το',
+		'liked' => 'του άρεσε',
 		'commented' => 'σχολίασε στο',
-		'reacted' => 'αντέδρασε στο {item} σας',
-		'shared' => 'κοινοποίησε το {item} σας',
-		'tagged' => 'σας πρόσθεσε με ετικέτα σε μια δημοσίευση',
+		'reacted' => 'αντέδρασε στο',
+		'shared' => 'κοινοποίησε το',
+		'tagged' => 'σας πρόσθεσε με ετικέτα σε',
 
 		'updatedA' => 'ενημέρωσε ένα',
 		'sentA' => 'έστειλε ένα',
 
-		'followed' => 'followed',
+		'followed' => 'ακολούθησε',
 		'mentioned' => 'αναφέρθηκε',
 		'you' => 'εσύ',
 
@@ -97,13 +102,14 @@ return [
 		'modlog' => 'modlog',
 		'post' => 'δημοσίευση',
 		'story' => 'ιστορία',
+		'noneFound' => 'Δε βρέθηκαν ειδοποιήσεις',
 	],
 
 	'post' => [
 		'shareToFollowers' => 'Μοιραστείτε με τους ακόλουθους',
-		'shareToOther' => 'Share to other',
+		'shareToOther' => 'Κοινή χρήση σε άλλο',
 		'noLikes' => 'Δεν υπάρχουν likes ακόμα',
-		'uploading' => 'Μεταφόρτωση',
+		'uploading' => 'Γίνεται μεταφόρτωση',
 	],
 
 	'profile' => [
@@ -113,10 +119,10 @@ return [
 		'admin' => 'Διαχειριστής',
 		'collections' => 'Συλλογές',
 		'follow' => 'Ακολούθησε',
-		'unfollow' => 'Διακοπή παρακολούθησης',
+		'unfollow' => 'Άρση ακολούθησης',
 		'editProfile' => 'Επεξεργασία Προφίλ',
 		'followRequested' => 'Ακολουθήστε Το Αίτημα',
-		'joined' => 'Joined',
+		'joined' => 'Έγινε μέλος',
 
 		'emptyCollections' => 'Δεν μπορούμε να βρούμε συλλογές',
 		'emptyPosts' => 'Δεν μπορούμε να βρούμε δημοσιεύσεις',
@@ -132,42 +138,42 @@ return [
 		'embed' => 'Ενσωμάτωση',
 
 		'selectOneOption' => 'Επιλέξτε μία από τις ακόλουθες επιλογές',
-		'unlistFromTimelines' => 'Unlist from Timelines',
+		'unlistFromTimelines' => 'Κατάργηση από Χρονοδιαγράμματα',
 		'addCW' => 'Προσθήκη Προειδοποίησης Περιεχομένου',
 		'removeCW' => 'Αφαίρεση Προειδοποίησης Περιεχομένου',
 		'markAsSpammer' => 'Σήμανση ως Spammer',
-		'markAsSpammerText' => 'Unlist + CW existing and future posts',
+		'markAsSpammerText' => 'Κατάργηση από λίστα + ΠΠ σε υπάρχουσες και μελλοντικές δημοσιεύσεις',
 		'spam' => 'Ανεπιθύμητα',
 		'sensitive' => 'Ευαίσθητο περιεχόμενο',
 		'abusive' => 'Καταχρηστικό ή επιβλαβές',
 		'underageAccount' => 'Λογαριασμός ανηλίκου',
 		'copyrightInfringement' => 'Παραβίαση πνευματικών δικαιωμάτων',
-		'impersonation' => 'Impersonation',
+		'impersonation' => 'Απομίμηση',
 		'scamOrFraud' => 'Ανεπιθύμητο ή απάτη',
 		'confirmReport' => 'Επιβεβαίωση Αναφοράς',
-		'confirmReportText' => 'Είστε βέβαιοι ότι θέλετε να αναφέρετε αυτή την ανάρτηση;',
+		'confirmReportText' => 'Σίγουρα θέλετε να αναφέρετε αυτή την ανάρτηση;',
 		'reportSent' => 'Η Αναφορά Στάλθηκε!',
 		'reportSentText' => 'Έχουμε λάβει με επιτυχία την αναφορά σας.',
 		'reportSentError' => 'Παρουσιάστηκε ένα πρόβλημα κατά την αναφορά της ανάρτησης.',
 
-		'modAddCWConfirm' => 'Είστε βέβαιοι ότι θέλετε να προσθέσετε μια προειδοποίηση περιεχομένου σε αυτή την ανάρτηση;',
+		'modAddCWConfirm' => 'Σίγουρα θέλετε να προσθέσετε μια προειδοποίηση περιεχομένου σε αυτή την ανάρτηση;',
 		'modCWSuccess' => 'Επιτυχής προσθήκη προειδοποίησης περιεχομένου',
-		'modRemoveCWConfirm' => 'Είστε βέβαιοι ότι θέλετε να αφαιρέσετε την προειδοποίηση περιεχομένου σε αυτή την ανάρτηση;',
+		'modRemoveCWConfirm' => 'Σίγουρα θέλετε να αφαιρέσετε την προειδοποίηση περιεχομένου σε αυτή την ανάρτηση;',
 		'modRemoveCWSuccess' => 'Επιτυχής αφαίρεση προειδοποίησης περιεχομένου',
-		'modUnlistConfirm' => 'Are you sure you want to unlist this post?',
-		'modUnlistSuccess' => 'Successfully unlisted post',
+		'modUnlistConfirm' => 'Σίγουρα θέλετε να αφαιρέσετε από τη λίστα αυτή την ανάρτηση;',
+		'modUnlistSuccess' => 'Επιτυχής κατάργηση δημοσίευσης από λίστα',
 		'modMarkAsSpammerConfirm' => 'Είστε βέβαιοι ότι θέλετε να επισημάνετε αυτόν τον χρήστη ως spammer? Όλες οι υπάρχουσες και μελλοντικές δημοσιεύσεις δεν θα καταχωρούνται στα χρονοδιαγράμματα και θα εφαρμόζεται προειδοποίηση περιεχομένου.',
 		'modMarkAsSpammerSuccess' => 'Επιτυχής σήμανση λογαριασμού ως spammer',
 
 		'toFollowers' => 'στους Ακόλουθους',
 
-		'showCaption' => 'Show Caption',
+		'showCaption' => 'Εμφάνιση Λεζάντας',
 		'showLikes' => 'Εμφάνιση "μου αρέσει"',
 		'compactMode' => 'Συμπαγής Λειτουργία',
-		'embedConfirmText' => 'Χρησιμοποιώντας αυτό το ενσωματωμένο, συμφωνείτε με την',
+		'embedConfirmText' => 'Χρησιμοποιώντας αυτή την ενσωμάτωση, συμφωνείτε με',
 
-		'deletePostConfirm' => 'Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν την ανάρτηση;',
-		'archivePostConfirm' => 'Είστε βέβαιοι ότι θέλετε να αρχειοθετήσετε αυτή την ανάρτηση;',
+		'deletePostConfirm' => 'Σίγουρα θέλετε να διαγράψετε αυτήν την ανάρτηση;',
+		'archivePostConfirm' => 'Σίγουρα θέλετε να αρχειοθετήσετε αυτή την ανάρτηση;',
 		'unarchivePostConfirm' => 'Είστε βέβαιοι ότι θέλετε να αφαιρέσετε αυτήν την ανάρτηση απο την αρχειοθήκη;',
 	],
 
@@ -176,11 +182,27 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'Άτομα που μπορεί να ξέρετε'
+		'peopleYouMayKnow' => 'Άτομα που μπορεί να ξέρετε',
+
+		'onboarding' => [
+			'welcome' => 'Καλώς ήρθατε',
+			'thisIsYourHomeFeed' => 'Αυτή είναι η αρχική σου ροή, μια χρονολογική ροή των δημοσιεύσεων από λογαριασμούς που ακολουθείτε.',
+			'letUsHelpYouFind' => 'Ας σας βοηθήσουμε να βρείτε μερικούς ενδιαφέροντες ανθρώπους να ακολουθήσετε',
+			'refreshFeed' => 'Ανανέωση της ροής μου',
+		],
 	],
 
 	'hashtags' => [
 		'emptyFeed' => 'Δεν μπορούμε να βρούμε δημοσιεύσεις για αυτό το hashtag'
 	],
 
+	'report' => [
+		'report' => 'Αναφορά',
+		'selectReason' => 'Επιλέξτε μια αιτία',
+		'reported' => 'Αναφέρθηκε',
+		'sendingReport' => 'Αποστολή αναφοράς',
+		'thanksMsg' => 'Ευχαριστούμε για την αναφορά, άνθρωποι σαν κι εσάς βοηθούν να κρατήσετε την κοινότητά μας ασφαλής!',
+		'contactAdminMsg' => 'Αν θέλετε να επικοινωνήσετε με το διαχειριστή για αυτή τη δημοσίευση ή αναφορά',
+	],
+
 ];
diff --git a/resources/lang/en/profile.php b/resources/lang/en/profile.php
index 7851852a2..04a2bcd90 100644
--- a/resources/lang/en/profile.php
+++ b/resources/lang/en/profile.php
@@ -12,4 +12,10 @@ return [
 
   'status.disabled.header' 	  => 'Profile Unavailable',
   'status.disabled.body'	  => 'Sorry, this profile is not available at the moment. Please try again shortly.',
+
+  'block.domain.max'      => 'Max limit of domain blocks reached! You can only block :max domains at a time. Ask your admin to adjust this limit.',
+
+  'mutedAccounts'           => 'Muted Accounts',
+  'blockedAccounts'         => 'Blocked Accounts',
+  'blockedDomains'          => 'Blocked Domains',
 ];
diff --git a/resources/lang/en/site.php b/resources/lang/en/site.php
index bb8a408ba..b06c5dcdd 100644
--- a/resources/lang/en/site.php
+++ b/resources/lang/en/site.php
@@ -17,4 +17,15 @@ return [
     'places'            => 'Places',
     'profiles'          => 'Profiles',
 
+    // site/contact
+    'you_can_contact_the_admins'                            => 'You can contact the admins',
+    'by_using_the_form_below'                               => 'by using the form below',
+    'or'                                                    => 'or',
+    'by_sending_an_email_to'                                => 'by sending an email to',
+    'the_admins_have_not_set_a_contact_email_address'       => 'The admins have not set a contact email address',
+    'Message'                                               => 'Message',
+    'request_response_from_admins'                          => 'Request response from admins',
+    'Submit'                                                => 'Submit',
+    'log_in_to_send_a_message'                              => 'log in to send a message',
+    'Please'                                                => 'Please',
 ];
diff --git a/resources/lang/es/web.php b/resources/lang/es/web.php
index 8384d1a93..5bac1c9c9 100644
--- a/resources/lang/es/web.php
+++ b/resources/lang/es/web.php
@@ -3,30 +3,35 @@
 return [
 
 	'common' => [
-		'comment' => 'Comentario',
+		'comment' => 'Comentar',
 		'commented' => 'Comentado',
 		'comments' => 'Comentarios',
 		'like' => 'Me gusta',
 		'liked' => 'Te gusta',
-		'likes' => 'Me gustas',
+		'likes' => 'Me gusta',
 		'share' => 'Compartir',
 		'shared' => 'Compartido',
 		'shares' => 'Compartidos',
 		'unshare' => 'No compartir',
+		'bookmark' => 'Marcador',
 
 		'cancel' => 'Cancelar',
 		'copyLink' => 'Copiar Enlace',
 		'delete' => 'Eliminar',
 		'error' => 'Error',
-		'errorMsg' => 'Algo fue mal. Por favor inténtelo de nuevo más tarde.',
+		'errorMsg' => 'Algo salió mal. Por favor inténtalo de nuevo más tarde.',
 		'oops' => 'Upss!',
 		'other' => 'Otros',
 		'readMore' => 'Ver más',
 		'success' => 'Correcto',
+		'proceed' => 'Proceder',
+		'next' => 'Siguiente',
+		'close' => 'Cerrar',
+		'clickHere' => 'haz click aquí',
 
 		'sensitive' => 'Sensible',
 		'sensitiveContent' => 'Contenido Sensible',
-		'sensitiveContentWarning' => 'Este post podría tener contenido sensible',
+		'sensitiveContentWarning' => 'Esta publicación podría contener contenido sensible',
 	],
 
 	'site' => [
@@ -55,7 +60,7 @@ return [
 		'drive' => 'Multimedia',
 		'settings' => 'Ajustes',
 		'compose' => 'Crear Nuevo',
-		'logout' => 'Logout',
+		'logout' => 'Cerrar sesión',
 
 		// Nav footer
 		'about' => 'Acerca de',
@@ -97,6 +102,7 @@ return [
 		'modlog' => 'modlog',
 		'post' => 'publicación',
 		'story' => 'historia',
+		'noneFound' => 'No se han encontrado notificaciones',
 	],
 
 	'post' => [
@@ -118,8 +124,8 @@ return [
 		'followRequested' => 'Seguimiento Solicitado',
 		'joined' => 'Se unió',
 
-		'emptyCollections' => 'We can\'t seem to find any collections',
-		'emptyPosts' => 'We can\'t seem to find any posts',
+		'emptyCollections' => 'Parece que no podemos encontrar ninguna colección',
+		'emptyPosts' => 'Parece que no podemos encontrar ningún post',
 	],
 
 	'menu' => [
@@ -141,8 +147,8 @@ return [
 		'sensitive' => 'Contenido Sensible',
 		'abusive' => 'Abusivo o Dañino',
 		'underageAccount' => 'Cuenta de Menor de Edad',
-		'copyrightInfringement' => 'Violación de Copyright',
-		'impersonation' => 'Suplantación',
+		'copyrightInfringement' => 'Infracción de derechos de autor',
+		'impersonation' => 'Suplantación de identidad',
 		'scamOrFraud' => 'Scam o Fraude',
 		'confirmReport' => 'Confirmar Reporte',
 		'confirmReportText' => '¿Seguro que quieres reportar esta publicación?',
@@ -166,8 +172,8 @@ return [
 		'compactMode' => 'Modo Compacto',
 		'embedConfirmText' => 'Usando este incrustado, usted acepta',
 
-		'deletePostConfirm' => '¿Seguro que desea eliminar esta publicación?',
-		'archivePostConfirm' => '¿Seguro que desea archivar esta publicación?',
+		'deletePostConfirm' => '¿Seguro que deseas eliminar esta publicación?',
+		'archivePostConfirm' => '¿Seguro que deseas archivar esta publicación?',
 		'unarchivePostConfirm' => '¿Seguro que desea desarchivar esta publicación?',
 	],
 
@@ -176,11 +182,27 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'Gente que podrías conocer'
+		'peopleYouMayKnow' => 'Personas que quizás conozcas',
+
+		'onboarding' => [
+			'welcome' => 'Bienvenido/a',
+			'thisIsYourHomeFeed' => 'Este es tu cronología principal, que muestra de manera cronológica las publicaciones de cuentas que sigues.',
+			'letUsHelpYouFind' => 'Déjanos ayudarte a encontrar algunas personas interesantes para seguir',
+			'refreshFeed' => 'Actualizar mi cronología',
+		],
 	],
 
 	'hashtags' => [
-		'emptyFeed' => 'We can\'t seem to find any posts for this hashtag'
+		'emptyFeed' => 'Parece que no podemos encontrar posts para este hashtag'
+	],
+
+	'report' => [
+		'report' => 'Reportar',
+		'selectReason' => 'Seleccionar un motivo',
+		'reported' => 'Reportado',
+		'sendingReport' => 'Enviando reporte',
+		'thanksMsg' => 'Gracias por el reporte, ¡personas como tú ayudan a mantener nuestra comunidad segura!',
+		'contactAdminMsg' => 'Si quieres contactar un administrador sobre esta publicación o reporte',
 	],
 
 ];
diff --git a/resources/lang/eu/web.php b/resources/lang/eu/web.php
index 2d64ab425..7bb51ea48 100644
--- a/resources/lang/eu/web.php
+++ b/resources/lang/eu/web.php
@@ -13,6 +13,7 @@ return [
 		'shared' => 'Partekatuta',
 		'shares' => 'Partekatze',
 		'unshare' => 'Utzi partekatzeari',
+		'bookmark' => 'Laster-marka',
 
 		'cancel' => 'Utzi',
 		'copyLink' => 'Kopiatu esteka',
@@ -22,7 +23,11 @@ return [
 		'oops' => 'Ene!',
 		'other' => 'Bestelakoa',
 		'readMore' => 'Irakurri gehiago',
-		'success' => 'Burutu da',
+		'success' => 'Arrakastaz burutu da',
+		'proceed' => 'Jarraitu',
+		'next' => 'Hurrengoa',
+		'close' => 'Itxi',
+		'clickHere' => 'klikatu hemen',
 
 		'sensitive' => 'Hunkigarria',
 		'sensitiveContent' => 'Eduki hunkigarria',
@@ -39,7 +44,7 @@ return [
 		'admin' => 'Adminaren panela',
 
 		// Timelines
-		'homeFeed' => 'Etxeko jarioa',
+		'homeFeed' => 'Hasierako jarioa',
 		'localFeed' => 'Jario lokala',
 		'globalFeed' => 'Jario globala',
 
@@ -55,7 +60,7 @@ return [
 		'drive' => 'Unitatea',
 		'settings' => 'Ezarpenak',
 		'compose' => 'Sortu berria',
-		'logout' => 'Saioa itxi',
+		'logout' => 'Itxi saioa',
 
 		// Nav footer
 		'about' => 'Honi buruz',
@@ -76,7 +81,7 @@ return [
 
 	'notifications' => [
 		'liked' => 'datsegi zure',
-		'commented' => 'iruzkindu du zure',
+		'commented' => '-(e)k iruzkindu du zure',
 		'reacted' => '-(e)k erantzun egin du zure',
 		'shared' => 'partekatu du zure',
 		'tagged' => 'etiketatu zaitu hemen:',
@@ -92,11 +97,12 @@ return [
 		'applicationApproved' => 'onartu da!',
 		'applicationRejected' => 'ez da onartu. Berriz eska dezakezu 6 hilabete barru.',
 
-		'dm' => 'mezu pribatua',
+		'dm' => 'mezu zuzena',
 		'groupPost' => 'talde argitarapena',
 		'modlog' => 'modloga',
 		'post' => 'bidalketa',
 		'story' => 'istorioa',
+		'noneFound' => 'Ez da jakinarazpenik aurkitu',
 	],
 
 	'post' => [
@@ -115,7 +121,7 @@ return [
 		'follow' => 'Jarraitu',
 		'unfollow' => 'Utzi jarraitzeari',
 		'editProfile' => 'Editatu profila',
-		'followRequested' => 'Jarraitzea eskatuta',
+		'followRequested' => 'Jarraitzeko eskaera bidalita',
 		'joined' => 'Elkartu da',
 
 		'emptyCollections' => 'Ez dugu topatu bildumarik',
@@ -127,28 +133,28 @@ return [
 		'viewProfile' => 'Ikusi profila',
 		'moderationTools' => 'Moderazio tresnak',
 		'report' => 'Salatu',
-		'archive' => 'Artxiboa',
+		'archive' => 'Artxibatu',
 		'unarchive' => 'Desartxibatu',
 		'embed' => 'Kapsulatu',
 
 		'selectOneOption' => 'Hautatu aukera hauetako bat',
-		'unlistFromTimelines' => 'Denbora-lerroetatik ezkutatu',
+		'unlistFromTimelines' => 'Denbora-lerroetatik kendu',
 		'addCW' => 'Gehitu edukiaren abisua',
 		'removeCW' => 'Kendu edukiaren abisua',
 		'markAsSpammer' => 'Markatu zabor-bidaltzaile gisa',
 		'markAsSpammerText' => 'Ezkutatu + edukiaren abisua jarri etorkizuneko bidalketei',
 		'spam' => 'Zaborra',
 		'sensitive' => 'Eduki hunkigarria',
-		'abusive' => 'Bortxazko edo Mingarria',
+		'abusive' => 'Iraingarri edo mingarria',
 		'underageAccount' => 'Adin txikiko baten kontua',
 		'copyrightInfringement' => 'Copyrightaren urraketa',
-		'impersonation' => 'Nortasunaren iruzurra',
-		'scamOrFraud' => 'Iruzur edo lapurreta',
+		'impersonation' => 'Inpersonazioa',
+		'scamOrFraud' => 'Iruzur edo maula',
 		'confirmReport' => 'Berretsi salaketa',
 		'confirmReportText' => 'Ziur al zaude bidalketa hau salatu nahi duzula?',
 		'reportSent' => 'Salaketa bidali da',
 		'reportSentText' => 'Zure salaketa ondo jaso dugu.',
-		'reportSentError' => 'Arazo bat egon da bidalketa hau salatzean.',
+		'reportSentError' => 'Arazo bat egon da bidalketa hau salatzerakoan.',
 
 		'modAddCWConfirm' => 'Ziur al zaude edukiaren abisua jarri nahi duzula bidalketa honetan?',
 		'modCWSuccess' => 'Edukiaren abisua ondo gehitu da',
@@ -164,7 +170,7 @@ return [
 		'showCaption' => 'Irudiaren azalpena erakutsi',
 		'showLikes' => 'Erakutsi atsegiteak',
 		'compactMode' => 'Modu trinkoa',
-		'embedConfirmText' => 'Kapsulatze hau erabiliz, onartzen dituzu gure',
+		'embedConfirmText' => 'Txertaketa hau erabiliz, onartzen dituzu gure',
 
 		'deletePostConfirm' => 'Ziur al zaude bidalketa hau ezabatu nahi duzula?',
 		'archivePostConfirm' => 'Ziur al zaude bidalketa hau artxibatu nahi duzula?',
@@ -176,11 +182,27 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'Ezagutu dezakezun jendea'
+		'peopleYouMayKnow' => 'Ezagun dezakezun jendea',
+
+		'onboarding' => [
+			'welcome' => 'Ongi etorri',
+			'thisIsYourHomeFeed' => 'Hau da zure hasierako jarioa, jarraitzen dituzun kontuen bidalketen jario kronologikoa.',
+			'letUsHelpYouFind' => 'Utz iezaguzu laguntzen jarraitzeko moduko jende interesgarria bilatzen',
+			'refreshFeed' => 'Nire jarioa eguneratu',
+		],
 	],
 
 	'hashtags' => [
 		'emptyFeed' => 'Ez dugu topatu traola hau duen bidalketarik'
 	],
 
+	'report' => [
+		'report' => 'Salatu',
+		'selectReason' => 'Hautatu arrazoia',
+		'reported' => 'Salatuta',
+		'sendingReport' => 'Salaketa bidaltzen',
+		'thanksMsg' => 'Eskerrik asko salaketagatik, zu bezalako jendeak gure komunitatea seguruagoa mantentzen du!',
+		'contactAdminMsg' => 'Administratzaile batekin harremanetan jarri nahi baduzu bidalketa edo salaketa honen harira',
+	],
+
 ];
diff --git a/resources/lang/fa/web.php b/resources/lang/fa/web.php
index c552c04b4..0e467019f 100644
--- a/resources/lang/fa/web.php
+++ b/resources/lang/fa/web.php
@@ -3,26 +3,31 @@
 return [
 
 	'common' => [
-		'comment' => 'دیدگاه',
-		'commented' => 'Commented',
-		'comments' => 'دیدگاه‌ها',
+		'comment' => 'نظر',
+		'commented' => 'نظر داده شد',
+		'comments' => 'نظر',
 		'like' => 'پسند',
-		'liked' => 'Liked',
+		'liked' => 'پسندیده شد',
 		'likes' => 'پسند',
 		'share' => 'هم‌رسانی',
-		'shared' => 'Shared',
+		'shared' => 'هم‌رسانی شد',
 		'shares' => 'هم‌رسانی',
-		'unshare' => 'لغو هم‌رسانی',
+		'unshare' => 'ناهم‌رسانی',
+		'bookmark' => 'نشانک',
 
 		'cancel' => 'لغو',
-		'copyLink' => 'روگرفت پیوند',
+		'copyLink' => 'رونوشت از پیوند',
 		'delete' => 'حذف',
 		'error' => 'خطا',
-		'errorMsg' => 'مشکلی رخ داده است. لطفا بعدا امتحان کنید.',
+		'errorMsg' => 'چیزی اشتباه شد. لطفاً بعداً دوباره تلاش کنید.',
 		'oops' => 'اوه!',
-		'other' => 'سایر',
-		'readMore' => 'بیشتر بخوانید',
+		'other' => 'دیگر',
+		'readMore' => 'بیش‌تر بخوانید',
 		'success' => 'موفق',
+		'proceed' => 'پیشروی',
+		'next' => 'بعدی',
+		'close' => 'بستن',
+		'clickHere' => 'این‌جا را بزنید',
 
 		'sensitive' => 'حساس',
 		'sensitiveContent' => 'محتوای حساس',
@@ -39,7 +44,7 @@ return [
 		'admin' => 'پیشخوان مدیریتی',
 
 		// Timelines
-		'homeFeed' => 'خط زمانی خانگی',
+		'homeFeed' => 'خوراک خانه',
 		'localFeed' => 'خط زمانی محلی',
 		'globalFeed' => 'خط زمانی سراسری',
 
@@ -55,7 +60,7 @@ return [
 		'drive' => 'Drive',
 		'settings' => 'تنظیمات',
 		'compose' => 'فرستهٔ جدید',
-		'logout' => 'Logout',
+		'logout' => 'خروج',
 
 		// Nav footer
 		'about' => 'درباره',
@@ -65,12 +70,12 @@ return [
 		'terms' => 'شرایط',
 
 		// Temporary links
-		'backToPreviousDesign' => 'بازگشت به طراحی پیشین'
+		'backToPreviousDesign' => 'بازگشت به طرّاحی پیشین'
 	],
 
 	'directMessages' => [
-		'inbox' => 'صندوق دریافت',
-		'sent' => 'فرستاده شده',
+		'inbox' => 'صندوق ورودی',
+		'sent' => 'فرستاده',
 		'requests' => 'درخواست‌ها'
 	],
 
@@ -84,19 +89,20 @@ return [
 		'updatedA' => 'updated a',
 		'sentA' => 'sent a',
 
-		'followed' => 'followed',
-		'mentioned' => 'mentioned',
+		'followed' => 'پی گرفت',
+		'mentioned' => 'اشاره کرد',
 		'you' => 'شما',
 
-		'yourApplication' => 'درخواست شما برای پیوستن',
+		'yourApplication' => 'درخواست پیوستنتان',
 		'applicationApproved' => 'تایید شد!',
-		'applicationRejected' => 'رد شد. ۶ ماه دیگر می‌توانید مجددا اقدام کنید.',
+		'applicationRejected' => 'رد شد. ۶ ماه دیگر می‌توانید دوباره درخواست کنید.',
 
 		'dm' => 'dm',
 		'groupPost' => 'فرستهٔ گروهی',
 		'modlog' => 'modlog',
 		'post' => 'فرسته',
 		'story' => 'داستان',
+		'noneFound' => 'هیچ آگاهی‌ای پیدا نشد',
 	],
 
 	'post' => [
@@ -143,7 +149,7 @@ return [
 		'underageAccount' => 'حساب زیر سن قانونی',
 		'copyrightInfringement' => 'نقض قوانین حق تکثیر',
 		'impersonation' => 'جعل هویت',
-		'scamOrFraud' => 'Scam or Fraud',
+		'scamOrFraud' => 'هرزنامه یا کلاه‌برداری',
 		'confirmReport' => 'تایید گزارش',
 		'confirmReportText' => 'مطمئنید که می‌خواهید این فرسته را گزارش کنید؟',
 		'reportSent' => 'گزارش فرستاده شد!',
@@ -157,7 +163,7 @@ return [
 		'modUnlistConfirm' => 'مطمئنید که می‌خواهید این فرسته را برون‌فهرست کنید؟',
 		'modUnlistSuccess' => 'فرسته با موفقیت برون‌فهرست شد',
 		'modMarkAsSpammerConfirm' => 'مطمئنید که می‌خواهید این کاربر را به عنوان هرزنامه‌نویس نشانه‌گذاری کنید؟ تمام فرسته‌های موجود و آتی روی خط زمانی به صورت برون‌فهرست درآمده و هشدار محتوا بر آن‌ها اعمال خواهد شد.',
-		'modMarkAsSpammerSuccess' => 'Successfully marked account as spammer',
+		'modMarkAsSpammerSuccess' => 'حساب با موفقیت به عنوان هرزه‌پراکن علامت خورد',
 
 		'toFollowers' => 'به دنبال‌کنندگان',
 
@@ -176,11 +182,27 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'افرادی که ممکن است بشناسید'
+		'peopleYouMayKnow' => 'افرادی که ممکن است بشناسید',
+
+		'onboarding' => [
+			'welcome' => 'خوش آمدید',
+			'thisIsYourHomeFeed' => 'این خوراک خانه‌تان است. خوراکی زمان‌نگاشته از فرسته‌هایحساب‌هایی که پی می‌گیرید.',
+			'letUsHelpYouFind' => 'بگذارید در یافتن افراد جالب برای پی‌گیری یاریتان کنیم',
+			'refreshFeed' => 'تازه‌سازی خوراکم',
+		],
 	],
 
 	'hashtags' => [
 		'emptyFeed' => 'به نظر می‌رسد که نمی‌توانیم چیزی برای این هشتگ پیدا کنیم'
 	],
 
+	'report' => [
+		'report' => 'گزارش',
+		'selectReason' => 'گزینش یک دلیل',
+		'reported' => 'گزارش شد',
+		'sendingReport' => 'فرستادن گزارش',
+		'thanksMsg' => 'ممنون از گزارش. افرادی چون شما اجتماعمان را امن نگه می‌دارند!',
+		'contactAdminMsg' => 'اگر می‌خواهید در بارهخ‌ای این فرسته یا گزارش با مدیری در تماس باشید',
+	],
+
 ];
diff --git a/resources/lang/fi/web.php b/resources/lang/fi/web.php
index 3844f847a..3b9062230 100644
--- a/resources/lang/fi/web.php
+++ b/resources/lang/fi/web.php
@@ -3,80 +3,85 @@
 return [
 
 	'common' => [
-		'comment' => 'Comment',
-		'commented' => 'Commented',
-		'comments' => 'Comments',
-		'like' => 'Like',
-		'liked' => 'Liked',
-		'likes' => 'Likes',
-		'share' => 'Share',
-		'shared' => 'Shared',
-		'shares' => 'Shares',
-		'unshare' => 'Unshare',
+		'comment' => 'Kommentti',
+		'commented' => 'Kommentoitu',
+		'comments' => 'Kommentit',
+		'like' => 'Tykkää',
+		'liked' => 'Tykätty',
+		'likes' => 'Tykkäykset',
+		'share' => 'Jaa',
+		'shared' => 'Jaettu',
+		'shares' => 'Jaot',
+		'unshare' => 'Peru jakaminen',
+		'bookmark' => 'Bookmark',
 
-		'cancel' => 'Cancel',
-		'copyLink' => 'Copy Link',
-		'delete' => 'Delete',
-		'error' => 'Error',
-		'errorMsg' => 'Something went wrong. Please try again later.',
-		'oops' => 'Oops!',
-		'other' => 'Other',
-		'readMore' => 'Read more',
-		'success' => 'Success',
+		'cancel' => 'Peruuta',
+		'copyLink' => 'Kopioi linkki',
+		'delete' => 'Poista',
+		'error' => 'Virhe',
+		'errorMsg' => 'Jokin meni pieleen. Yritä myöhemmin uudelleen.',
+		'oops' => 'Oho!',
+		'other' => 'Muu',
+		'readMore' => 'Lue lisää',
+		'success' => 'Onnistui',
+		'proceed' => 'Proceed',
+		'next' => 'Next',
+		'close' => 'Close',
+		'clickHere' => 'click here',
 
-		'sensitive' => 'Sensitive',
-		'sensitiveContent' => 'Sensitive Content',
-		'sensitiveContentWarning' => 'This post may contain sensitive content',
+		'sensitive' => 'Sensitiivinen',
+		'sensitiveContent' => 'Sensitiivinen sisältö',
+		'sensitiveContentWarning' => 'Tämä julkaisu saattaa sisältää sensitiivistä sisältöä',
 	],
 
 	'site' => [
-		'terms' => 'Terms of Use',
-		'privacy' => 'Privacy Policy',
+		'terms' => 'Käyttöehdot',
+		'privacy' => 'Tietosuojakäytäntö',
 	],
 
 	'navmenu' => [
-		'search' => 'Search',
-		'admin' => 'Admin Dashboard',
+		'search' => 'Hae',
+		'admin' => 'Ylläpitäjän hallintapaneeli',
 
 		// Timelines
-		'homeFeed' => 'Home Feed',
-		'localFeed' => 'Local Feed',
-		'globalFeed' => 'Global Feed',
+		'homeFeed' => 'Kotisyöte',
+		'localFeed' => 'Paikallinen syöte',
+		'globalFeed' => 'Maailmanlaajuinen syöte',
 
 		// Core features
-		'discover' => 'Discover',
-		'directMessages' => 'Direct Messages',
-		'notifications' => 'Notifications',
-		'groups' => 'Groups',
-		'stories' => 'Stories',
+		'discover' => 'Tutustu',
+		'directMessages' => 'Yksityisviestit',
+		'notifications' => 'Ilmoitukset',
+		'groups' => 'Ryhmät',
+		'stories' => 'Tarinat',
 
 		// Self links
-		'profile' => 'Profile',
-		'drive' => 'Drive',
-		'settings' => 'Settings',
-		'compose' => 'Create New',
-		'logout' => 'Logout',
+		'profile' => 'Profiili',
+		'drive' => 'Asema',
+		'settings' => 'Asetukset',
+		'compose' => 'Luo uusi',
+		'logout' => 'Kirjaudu ulos',
 
 		// Nav footer
-		'about' => 'About',
-		'help' => 'Help',
-		'language' => 'Language',
-		'privacy' => 'Privacy',
-		'terms' => 'Terms',
+		'about' => 'Tietoja',
+		'help' => 'Ohje',
+		'language' => 'Kieli',
+		'privacy' => 'Yksityisyys',
+		'terms' => 'Ehdot',
 
 		// Temporary links
-		'backToPreviousDesign' => 'Go back to previous design'
+		'backToPreviousDesign' => 'Palaa aiempaan ulkoasuun'
 	],
 
 	'directMessages' => [
-		'inbox' => 'Inbox',
-		'sent' => 'Sent',
-		'requests' => 'Requests'
+		'inbox' => 'Saapuneet',
+		'sent' => 'Lähetetty',
+		'requests' => 'Pyynnöt'
 	],
 
 	'notifications' => [
-		'liked' => 'liked your',
-		'commented' => 'commented on your',
+		'liked' => 'tykkäsi sinun',
+		'commented' => 'kommentoi sinun',
 		'reacted' => 'reacted to your',
 		'shared' => 'shared your',
 		'tagged' => 'tagged you in a',
@@ -97,6 +102,7 @@ return [
 		'modlog' => 'modlog',
 		'post' => 'post',
 		'story' => 'story',
+		'noneFound' => 'No notifications found',
 	],
 
 	'post' => [
@@ -141,46 +147,62 @@ return [
 		'sensitive' => 'Sensitive Content',
 		'abusive' => 'Abusive or Harmful',
 		'underageAccount' => 'Underage Account',
-		'copyrightInfringement' => 'Copyright Infringement',
-		'impersonation' => 'Impersonation',
-		'scamOrFraud' => 'Scam or Fraud',
-		'confirmReport' => 'Confirm Report',
-		'confirmReportText' => 'Are you sure you want to report this post?',
-		'reportSent' => 'Report Sent!',
-		'reportSentText' => 'We have successfully received your report.',
-		'reportSentError' => 'There was an issue reporting this post.',
+		'copyrightInfringement' => 'Tekijänoikeusloukkaus',
+		'impersonation' => 'Väärennetty henkilöllisyys',
+		'scamOrFraud' => 'Huijaus tai petos',
+		'confirmReport' => 'Vahvista ilmianto',
+		'confirmReportText' => 'Oletko varma, että haluat ilmiantaa tämän viestin?',
+		'reportSent' => 'Ilmoitus lähetetty!',
+		'reportSentText' => 'Saimme ilmoituksesi.',
+		'reportSentError' => 'Julkaisun ilmianto epäonnistui.',
 
-		'modAddCWConfirm' => 'Are you sure you want to add a content warning to this post?',
-		'modCWSuccess' => 'Successfully added content warning',
-		'modRemoveCWConfirm' => 'Are you sure you want to remove the content warning on this post?',
-		'modRemoveCWSuccess' => 'Successfully removed content warning',
-		'modUnlistConfirm' => 'Are you sure you want to unlist this post?',
-		'modUnlistSuccess' => 'Successfully unlisted post',
-		'modMarkAsSpammerConfirm' => 'Are you sure you want to mark this user as a spammer? All existing and future posts will be unlisted on timelines and a content warning will be applied.',
-		'modMarkAsSpammerSuccess' => 'Successfully marked account as spammer',
+		'modAddCWConfirm' => 'Haluatko varmasti lisätä sisältövaroituksen tähän julkaisuun?',
+		'modCWSuccess' => 'Sisältövaroitus lisätty onnistuneesti',
+		'modRemoveCWConfirm' => 'Haluatko varmasti poistaa julkaisun sisältövaroituksen?',
+		'modRemoveCWSuccess' => 'Sisältövaroitus poistettu',
+		'modUnlistConfirm' => 'Haluatko varmasti piilottaa julkaisun?',
+		'modUnlistSuccess' => 'Julkaisu piilotettu onnistuneesti',
+		'modMarkAsSpammerConfirm' => 'Haluatko varmasti merkitä käyttäjän roskapostittajaksi? Kaikki nykyiset ja tulevat julkaisut saavat sisältövaroituksen ja julkaisut piilotetaan julkisilta aikajanoilta.',
+		'modMarkAsSpammerSuccess' => 'Tili merkitty roskapostittajaksi',
 
-		'toFollowers' => 'to Followers',
+		'toFollowers' => 'seuraajille',
 
-		'showCaption' => 'Show Caption',
-		'showLikes' => 'Show Likes',
-		'compactMode' => 'Compact Mode',
-		'embedConfirmText' => 'By using this embed, you agree to our',
+		'showCaption' => 'Näytä kuvaus',
+		'showLikes' => 'Näytä tykkäykset',
+		'compactMode' => 'Kompakti tila',
+		'embedConfirmText' => 'Käyttämällä upotusta, hyväksyt',
 
-		'deletePostConfirm' => 'Are you sure you want to delete this post?',
-		'archivePostConfirm' => 'Are you sure you want to archive this post?',
-		'unarchivePostConfirm' => 'Are you sure you want to unarchive this post?',
+		'deletePostConfirm' => 'Haluatko varmasti poistaa julkaisun?',
+		'archivePostConfirm' => 'Haluatko varmasti arkistoida julkaisun?',
+		'unarchivePostConfirm' => 'Haluatko varmasti peruuttaa julkaisun arkistoinnin?',
 	],
 
 	'story' => [
-		'add' => 'Add Story'
+		'add' => 'Lisää tarina'
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'People you may know'
+		'peopleYouMayKnow' => 'People you may know',
+
+		'onboarding' => [
+			'welcome' => 'Welcome',
+			'thisIsYourHomeFeed' => 'This is your home feed, a chronological feed of posts from accounts you follow.',
+			'letUsHelpYouFind' => 'Let us help you find some interesting people to follow',
+			'refreshFeed' => 'Refresh my feed',
+		],
 	],
 
 	'hashtags' => [
 		'emptyFeed' => 'We can\'t seem to find any posts for this hashtag'
 	],
 
+	'report' => [
+		'report' => 'Report',
+		'selectReason' => 'Select a reason',
+		'reported' => 'Reported',
+		'sendingReport' => 'Sending report',
+		'thanksMsg' => 'Thanks for the report, people like you help keep our community safe!',
+		'contactAdminMsg' => 'If you\'d like to contact an administrator about this post or report',
+	],
+
 ];
diff --git a/resources/lang/fr/web.php b/resources/lang/fr/web.php
index 874ca5cfc..8cd8cdd69 100644
--- a/resources/lang/fr/web.php
+++ b/resources/lang/fr/web.php
@@ -13,20 +13,25 @@ return [
 		'shared' => 'Partagé',
 		'shares' => 'Partages',
 		'unshare' => 'Ne plus partager',
+		'bookmark' => 'Marque-page',
 
 		'cancel' => 'Annuler',
 		'copyLink' => 'Copier le lien',
 		'delete' => 'Supprimer',
 		'error' => 'Erreur',
 		'errorMsg' => 'Une erreur est survenue. Veuillez réessayer plus tard.',
-		'oops' => 'Zut !',
+		'oops' => 'Oups !',
 		'other' => 'Autre',
 		'readMore' => 'En savoir plus',
-		'success' => 'Opération réussie',
+		'success' => 'Succès',
+		'proceed' => 'Continuer',
+		'next' => 'Suivant',
+		'close' => 'Fermer',
+		'clickHere' => 'cliquez ici',
 
 		'sensitive' => 'Sensible',
 		'sensitiveContent' => 'Contenu sensible',
-		'sensitiveContentWarning' => 'Le contenu de ce message peut être sensible',
+		'sensitiveContentWarning' => 'Le contenu de cette publication peut être sensible',
 	],
 
 	'site' => [
@@ -39,9 +44,9 @@ return [
 		'admin' => 'Tableau de bord d\'administration',
 
 		// Timelines
-		'homeFeed' => 'Fil principal',
-		'localFeed' => 'Fil local',
-		'globalFeed' => 'Fil global',
+		'homeFeed' => 'Flux principal',
+		'localFeed' => 'Flux local',
+		'globalFeed' => 'Flux global',
 
 		// Core features
 		'discover' => 'Découvrir',
@@ -55,7 +60,7 @@ return [
 		'drive' => 'Médiathèque',
 		'settings' => 'Paramètres',
 		'compose' => 'Publier',
-		'logout' => 'Logout',
+		'logout' => 'Déconnexion',
 
 		// Nav footer
 		'about' => 'À propos',
@@ -97,6 +102,7 @@ return [
 		'modlog' => 'journal de modération',
 		'post' => 'publication',
 		'story' => 'story',
+		'noneFound' => 'Aucune notification trouvée',
 	],
 
 	'post' => [
@@ -115,11 +121,11 @@ return [
 		'follow' => 'S\'abonner',
 		'unfollow' => 'Se désabonner',
 		'editProfile' => 'Modifier votre profil',
-		'followRequested' => 'Demande d\'abonnement',
+		'followRequested' => 'Demande d\'abonnement faite',
 		'joined' => 'A rejoint',
 
 		'emptyCollections' => 'Aucune collection ne semble exister',
-		'emptyPosts' => 'Aucune publication ne semble exister',
+		'emptyPosts' => 'Il semble n’y avoir aucune publication',
 	],
 
 	'menu' => [
@@ -136,7 +142,7 @@ return [
 		'addCW' => 'Ajouter un avertissement de contenu',
 		'removeCW' => 'Enlever l’avertissement de contenu',
 		'markAsSpammer' => 'Marquer comme spammeur·euse',
-		'markAsSpammerText' => 'Retirer + avertissements pour les contenus existants et futurs',
+		'markAsSpammerText' => 'Retirer des flux + ajouter un avertissement de contenu pour les publications existantes et futures',
 		'spam' => 'Indésirable',
 		'sensitive' => 'Contenu sensible',
 		'abusive' => 'Abusif ou préjudiciable',
@@ -155,7 +161,7 @@ return [
 		'modRemoveCWConfirm' => 'Êtes-vous sûr·e de vouloir supprimer l\'avertissement de contenu sur cette publication ?',
 		'modRemoveCWSuccess' => 'Avertissement de contenu supprimé avec succès',
 		'modUnlistConfirm' => 'Êtes-vous sûr·e de vouloir retirer cette publication des flux ?',
-		'modUnlistSuccess' => 'Publication retirée des fils avec succès',
+		'modUnlistSuccess' => 'Publication retirée des flux avec succès',
 		'modMarkAsSpammerConfirm' => 'Êtes-vous sûr·e de vouloir marquer cet utilisateur·rice comme spammeur·euse ? Toutes les publications existantes et futures seront retirées des flux et un avertissement de contenu sera appliqué.',
 		'modMarkAsSpammerSuccess' => 'Compte marqué avec succès comme spammeur',
 
@@ -176,11 +182,27 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'Connaissances possibles'
+		'peopleYouMayKnow' => 'Connaissances possibles',
+
+		'onboarding' => [
+			'welcome' => 'Bienvenue',
+			'thisIsYourHomeFeed' => 'Ceci est votre flux personnel, un flux chronologique des publications de comptes que vous suivez.',
+			'letUsHelpYouFind' => 'Laissez-nous vous aider à trouver des personnes intéressantes à suivre',
+			'refreshFeed' => 'Actualiser mon flux',
+		],
 	],
 
 	'hashtags' => [
 		'emptyFeed' => 'Aucune publication ne semble exister pour ce hashtag'
 	],
 
+	'report' => [
+		'report' => 'Signaler',
+		'selectReason' => 'Sélectionner un motif',
+		'reported' => 'Signalé',
+		'sendingReport' => 'Envoi du signalement',
+		'thanksMsg' => 'Merci pour votre signalement, les gens comme vous aident à assurer la sécurité de notre communauté !',
+		'contactAdminMsg' => 'Si vous souhaitez contacter un·e administrateur·trice à propos de cette publication ou de ce signalement',
+	],
+
 ];
diff --git a/resources/lang/gd/web.php b/resources/lang/gd/web.php
index fd178e3e6..0b6d6908f 100644
--- a/resources/lang/gd/web.php
+++ b/resources/lang/gd/web.php
@@ -4,48 +4,53 @@ return [
 
 	'common' => [
 		'comment' => 'Beachd',
-		'commented' => 'Commented',
-		'comments' => 'Comments',
-		'like' => 'Like',
-		'liked' => 'Liked',
-		'likes' => 'Likes',
+		'commented' => 'Beachd ris',
+		'comments' => 'Beachdan',
+		'like' => 'Cuir ris na h-annsachdan',
+		'liked' => '’Na annsachd',
+		'likes' => 'Na h-annsachdan',
 		'share' => 'Co-roinn',
-		'shared' => 'Shared',
-		'shares' => 'Shares',
-		'unshare' => 'Unshare',
+		'shared' => '’Ga cho-roinneadh',
+		'shares' => '’Ga cho-roinneadh',
+		'unshare' => 'Na co-roinn tuilleadh',
+		'bookmark' => 'Comharra-lìn',
 
 		'cancel' => 'Sguir dheth',
 		'copyLink' => 'Dèan lethbhreac dhen cheangal',
 		'delete' => 'Sguab às',
 		'error' => 'Mearachd',
-		'errorMsg' => 'Something went wrong. Please try again later.',
+		'errorMsg' => 'Chaidh rudeigin ceàrr. Feuch ris a-rithist an ceann greis.',
 		'oops' => 'Ìoc!',
-		'other' => 'Other',
-		'readMore' => 'Read more',
-		'success' => 'Success',
+		'other' => 'Eile',
+		'readMore' => 'Leugh an còrr',
+		'success' => 'Chaidh leis',
+		'proceed' => 'Lean air adhart',
+		'next' => 'Air adhart',
+		'close' => 'Dùin',
+		'clickHere' => 'briog an-seo',
 
 		'sensitive' => 'Frionasach',
 		'sensitiveContent' => 'Susbaint fhrionasach',
-		'sensitiveContentWarning' => 'This post may contain sensitive content',
+		'sensitiveContentWarning' => 'Dh’fhaoidte gu bheil susbaint fhrionasach sa phost seo',
 	],
 
 	'site' => [
-		'terms' => 'Terms of Use',
-		'privacy' => 'Privacy Policy',
+		'terms' => 'Teirmichean a’ chleachdaidh',
+		'privacy' => 'Poileasaidh prìobhaideachd',
 	],
 
 	'navmenu' => [
 		'search' => 'Lorg',
-		'admin' => 'Admin Dashboard',
+		'admin' => 'Deas-bhòrd na rianachd',
 
 		// Timelines
 		'homeFeed' => 'Inbhir na dachaigh',
 		'localFeed' => 'Inbhir ionadail',
-		'globalFeed' => 'Global Feed',
+		'globalFeed' => 'Inbhir co-naisgte',
 
 		// Core features
-		'discover' => 'Discover',
-		'directMessages' => 'Direct Messages',
+		'discover' => 'Fidir',
+		'directMessages' => 'Teachdaireachdan dìreach',
 		'notifications' => 'Brathan',
 		'groups' => 'Buidhnean',
 		'stories' => 'Sgeulan',
@@ -54,8 +59,8 @@ return [
 		'profile' => 'Pròifil',
 		'drive' => 'Draibh',
 		'settings' => 'Roghainnean',
-		'compose' => 'Cruthaich fear ùr',
-		'logout' => 'Logout',
+		'compose' => 'Cruthaich',
+		'logout' => 'Clàraich a-mach',
 
 		// Nav footer
 		'about' => 'Mu dhèidhinn',
@@ -65,110 +70,111 @@ return [
 		'terms' => 'Teirmichean',
 
 		// Temporary links
-		'backToPreviousDesign' => 'Go back to previous design'
+		'backToPreviousDesign' => 'Till dhan cho-dhealbhachd roimhpe'
 	],
 
 	'directMessages' => [
 		'inbox' => 'Am bogsa a-steach',
-		'sent' => 'Sent',
+		'sent' => 'Air a chur',
 		'requests' => 'Iarrtasan'
 	],
 
 	'notifications' => [
-		'liked' => 'liked your',
-		'commented' => 'commented on your',
-		'reacted' => 'reacted to your',
-		'shared' => 'shared your',
-		'tagged' => 'tagged you in a',
+		'liked' => '– chuir iad seo uat ris na h-annsachdan aca:',
+		'commented' => '– thug iad beachd air seo uat:',
+		'reacted' => '– fhreagair iad ri seo uat:',
+		'shared' => '– cho-roinn iad seo uat:',
+		'tagged' => '– thug iad iomradh ort ann a sheo:',
 
-		'updatedA' => 'updated a',
-		'sentA' => 'sent a',
+		'updatedA' => '– dh’ùraich iad',
+		'sentA' => '– chuir iad',
 
-		'followed' => 'followed',
-		'mentioned' => 'mentioned',
-		'you' => 'you',
+		'followed' => '– lean iad:',
+		'mentioned' => '– thug iad iomradh air:',
+		'you' => 'thusa',
 
-		'yourApplication' => 'Your application to join',
-		'applicationApproved' => 'was approved!',
-		'applicationRejected' => 'was rejected. You can re-apply to join in 6 months.',
+		'yourApplication' => 'Tha an t-iarrtas agad air ballrachd air a',
+		'applicationApproved' => 'ghabhail ris!',
+		'applicationRejected' => 'dhiùltadh. ’S urrainn dhut iarrtas air ballrachd a chur a-steach a-rithist às dèidh 6 mìosan.',
 
-		'dm' => 'dm',
-		'groupPost' => 'group post',
-		'modlog' => 'modlog',
+		'dm' => 'teachdaireachd dhìreach',
+		'groupPost' => 'post buidhinn',
+		'modlog' => 'loga nam maor',
 		'post' => 'post',
 		'story' => 'sgeul',
+		'noneFound' => 'Cha deach brath a lorg',
 	],
 
 	'post' => [
-		'shareToFollowers' => 'Share to followers',
-		'shareToOther' => 'Share to other',
-		'noLikes' => 'No likes yet',
-		'uploading' => 'Uploading',
+		'shareToFollowers' => 'Co-roinn leis an luchd-leantainn',
+		'shareToOther' => 'Co-roinn le càch',
+		'noLikes' => 'Chan eil seo ’na annsachd fhathast',
+		'uploading' => '’Ga luchdadh suas',
 	],
 
 	'profile' => [
-		'posts' => 'Posts',
-		'followers' => 'Followers',
-		'following' => 'Following',
-		'admin' => 'Admin',
+		'posts' => 'Postaichean',
+		'followers' => 'Luchd-leantainn',
+		'following' => 'A’ leantainn',
+		'admin' => 'Rianaire',
 		'collections' => 'Cruinneachaidhean',
-		'follow' => 'Lean air',
-		'unfollow' => 'Unfollow',
+		'follow' => 'Lean',
+		'unfollow' => 'Na lean tuilleadh',
 		'editProfile' => 'Deasaich a’ phròifil',
-		'followRequested' => 'Follow Requested',
-		'joined' => 'Joined',
+		'followRequested' => 'Iarrar leantainn',
+		'joined' => 'Air ballrachd fhaighinn',
 
-		'emptyCollections' => 'We can\'t seem to find any collections',
-		'emptyPosts' => 'We can\'t seem to find any posts',
+		'emptyCollections' => 'Cha do lorg sinn cruinneachadh sam bith',
+		'emptyPosts' => 'Cha do lorg sinn post sam bith',
 	],
 
 	'menu' => [
 		'viewPost' => 'Seall am post',
 		'viewProfile' => 'Seall a’ phròifil',
 		'moderationTools' => 'Innealan na maorsainneachd',
-		'report' => 'Report',
-		'archive' => 'Archive',
-		'unarchive' => 'Unarchive',
+		'report' => 'Dèan gearan',
+		'archive' => 'Tasglannaich',
+		'unarchive' => 'Thoir às an tasg-lann',
 		'embed' => 'Leabaich',
 
 		'selectOneOption' => 'Tagh tè dhe na roghainnean seo',
-		'unlistFromTimelines' => 'Unlist from Timelines',
+		'unlistFromTimelines' => 'Falaich o loidhnichean-ama',
 		'addCW' => 'Cuir rabhadh susbainte ris',
 		'removeCW' => 'Thoir air falbh an rabhadh susbainte',
 		'markAsSpammer' => 'Cuir comharra gur e spamair a th’ ann',
-		'markAsSpammerText' => 'Unlist + CW existing and future posts',
+		'markAsSpammerText' => 'Falaich o loidhnichean-ama ⁊ cuir comharra na frionasachd ri postaichean a tha ann ’s ri teachd',
 		'spam' => 'Spama',
 		'sensitive' => 'Susbaint fhrionasach',
-		'abusive' => 'Abusive or Harmful',
-		'underageAccount' => 'Underage Account',
-		'copyrightInfringement' => 'Copyright Infringement',
-		'impersonation' => 'Impersonation',
-		'scamOrFraud' => 'Scam or Fraud',
+		'abusive' => 'Droch-dhìolach no cronail',
+		'underageAccount' => 'Cunntas fo-aoisich',
+		'copyrightInfringement' => 'Briseadh a-steach air còir-lethbhreac',
+		'impersonation' => 'Ann an riochd cuideigin eile',
+		'scamOrFraud' => 'Cleas-meallaidh no foill',
 		'confirmReport' => 'Dearbh an gearan',
-		'confirmReportText' => 'Are you sure you want to report this post?',
+		'confirmReportText' => 'A bheil thu cinnteach gu bheil thu airson gearan a dhèanamh mun phost seo?',
 		'reportSent' => 'Chaidh an gearan a chur!',
 		'reportSentText' => 'Fhuair sinn do ghearan.',
-		'reportSentError' => 'There was an issue reporting this post.',
+		'reportSentError' => 'Thachair duilgheadas le gearan a dhèanamh mun phost seo.',
 
-		'modAddCWConfirm' => 'Are you sure you want to add a content warning to this post?',
-		'modCWSuccess' => 'Successfully added content warning',
-		'modRemoveCWConfirm' => 'Are you sure you want to remove the content warning on this post?',
-		'modRemoveCWSuccess' => 'Successfully removed content warning',
-		'modUnlistConfirm' => 'Are you sure you want to unlist this post?',
-		'modUnlistSuccess' => 'Successfully unlisted post',
-		'modMarkAsSpammerConfirm' => 'Are you sure you want to mark this user as a spammer? All existing and future posts will be unlisted on timelines and a content warning will be applied.',
-		'modMarkAsSpammerSuccess' => 'Successfully marked account as spammer',
+		'modAddCWConfirm' => 'A bheil thu cinnteach gu bheil thu airson rabhadh susbainte a chur ris a’ phost seo?',
+		'modCWSuccess' => 'Chaidh rabhadh susbainte a chur ris',
+		'modRemoveCWConfirm' => 'A bheil thu cinnteach gu bheil thu airson an rabhadh susbainte a thoirt air falbh on phost seo?',
+		'modRemoveCWSuccess' => 'Chaidh an rabhadh susbainte a thoirt air falbh',
+		'modUnlistConfirm' => 'A bheil thu cinnteach gu bheil thu airson am post seo fhalach o liostaichean?',
+		'modUnlistSuccess' => 'Chaidh am post fhalach o liostaichean',
+		'modMarkAsSpammerConfirm' => 'A bheil tu cinnteach gu bheil thu comharra an spamair a chur ris a’ cleachdaiche seo? Thèid gach post a tha ann is postaichean ri teachd fhalach o loidhnichean-ama agus rabadh susbainte a chur riutha.',
+		'modMarkAsSpammerSuccess' => 'Chaidh comharra an spamair a chur ris a’ chunntas',
 
-		'toFollowers' => 'to Followers',
+		'toFollowers' => 'dhan luchd-leantainn',
 
 		'showCaption' => 'Seall am fo-thiotal',
-		'showLikes' => 'Show Likes',
-		'compactMode' => 'Compact Mode',
-		'embedConfirmText' => 'By using this embed, you agree to our',
+		'showLikes' => 'Seal na h-annsachdan',
+		'compactMode' => 'Am modh dùmhlaichte',
+		'embedConfirmText' => 'Nuair a chleachdas tu an leabachadh seo, aontaichidh tu ri',
 
 		'deletePostConfirm' => 'A bheil thu cinnteach gu bheil thu airson am post seo a sguabadh às?',
 		'archivePostConfirm' => 'A bheil thu cinnteach gu bheil thu airson am post seo a chur dhan tasg-lann?',
-		'unarchivePostConfirm' => 'Are you sure you want to unarchive this post?',
+		'unarchivePostConfirm' => 'A bheil thu cinnteach gu bheil thu airson am post seo a thoirt às an tasg-lann?',
 	],
 
 	'story' => [
@@ -176,11 +182,27 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'People you may know'
+		'peopleYouMayKnow' => 'Daoine as aithne dhut ’s dòcha',
+
+		'onboarding' => [
+			'welcome' => 'Fàilte ort',
+			'thisIsYourHomeFeed' => 'Seo inbhir na dachaigh agad a sheallas na postaichean o na cunntasan a leanas tu dhut, a-rèir an ama.',
+			'letUsHelpYouFind' => 'An cuidich sinn thu ach an lorg thu daoine inntinneach ri an leantainn?',
+			'refreshFeed' => 'Ath-nuadhaich an t-inbhir agam',
+		],
 	],
 
 	'hashtags' => [
-		'emptyFeed' => 'We can\'t seem to find any posts for this hashtag'
+		'emptyFeed' => 'Cha do lorg sinn post sam bith dhan taga hais seo'
+	],
+
+	'report' => [
+		'report' => 'Dèan gearan',
+		'selectReason' => 'Tagh adhbhar',
+		'reported' => 'Chaidh gearan a dhèanamh',
+		'sendingReport' => 'A’ cur a’ ghearain',
+		'thanksMsg' => 'Mòran taing airson gearan a dhèanamh, cuidichidh daoine mar a tha thu fhèin ach an cumamaid ar coimhearsnachd sàbhailte!',
+		'contactAdminMsg' => 'Nam bu toigh leat fios a chur gu rianaire mun post no ghearan seo',
 	],
 
 ];
diff --git a/resources/lang/gl/web.php b/resources/lang/gl/web.php
index 71c597f09..4bc6d547e 100644
--- a/resources/lang/gl/web.php
+++ b/resources/lang/gl/web.php
@@ -13,6 +13,7 @@ return [
 		'shared' => 'Compartiu',
 		'shares' => 'Compartido',
 		'unshare' => 'Non compartir',
+		'bookmark' => 'Marcar',
 
 		'cancel' => 'Cancelar',
 		'copyLink' => 'Copiar ligazón',
@@ -23,6 +24,10 @@ return [
 		'other' => 'Outro',
 		'readMore' => 'Ler máis',
 		'success' => 'Éxito',
+		'proceed' => 'Proceder',
+		'next' => 'Seguinte',
+		'close' => 'Pechar',
+		'clickHere' => 'preme aquí',
 
 		'sensitive' => 'Sensible',
 		'sensitiveContent' => 'Contido sensible',
@@ -55,7 +60,7 @@ return [
 		'drive' => 'Drive',
 		'settings' => 'Axustes',
 		'compose' => 'Crear Nova',
-		'logout' => 'Logout',
+		'logout' => 'Saír',
 
 		// Nav footer
 		'about' => 'Acerca de',
@@ -84,19 +89,20 @@ return [
 		'updatedA' => 'actualizou unha',
 		'sentA' => 'enviou unha',
 
-		'followed' => 'seguiu',
-		'mentioned' => 'mencionou',
-		'you' => 'you',
+		'followed' => 'seguiute',
+		'mentioned' => 'mencionoute',
+		'you' => 'ti',
 
 		'yourApplication' => 'A túa solicitude para unirte',
 		'applicationApproved' => 'foi aprobada!',
 		'applicationRejected' => 'for rexeitada. Podes volver a solicitar unirte en 6 meses.',
 
 		'dm' => 'md',
-		'groupPost' => 'group post',
+		'groupPost' => 'publicación grupal',
 		'modlog' => 'modlog',
 		'post' => 'publicación',
 		'story' => 'historia',
+		'noneFound' => 'Non hai notificacións',
 	],
 
 	'post' => [
@@ -118,8 +124,8 @@ return [
 		'followRequested' => 'Seguimento pedido',
 		'joined' => 'Uniuse',
 
-		'emptyCollections' => 'We can\'t seem to find any collections',
-		'emptyPosts' => 'We can\'t seem to find any posts',
+		'emptyCollections' => 'Non podemos atopar ningunha colección',
+		'emptyPosts' => 'Non podemos atopar ningunha publicación',
 	],
 
 	'menu' => [
@@ -176,11 +182,27 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'Xente que podes coñecer'
+		'peopleYouMayKnow' => 'Xente que podes coñecer',
+
+		'onboarding' => [
+			'welcome' => 'Benvido/a',
+			'thisIsYourHomeFeed' => 'Esta é a túa cronoloxía de inicio, formada por publicacións en orde cronolóxica das contas que segues.',
+			'letUsHelpYouFind' => 'Deixa que che axudemos a atopar xente interesante que seguir',
+			'refreshFeed' => 'Actualiza a cronoloxía',
+		],
 	],
 
 	'hashtags' => [
-		'emptyFeed' => 'We can\'t seem to find any posts for this hashtag'
+		'emptyFeed' => 'Non podemos atopar ningunha publicación con este cancelo'
+	],
+
+	'report' => [
+		'report' => 'Denunciar',
+		'selectReason' => 'Elixe unha razón',
+		'reported' => 'Denunciado',
+		'sendingReport' => 'Enviando a denuncia',
+		'thanksMsg' => 'Grazas pola denuncia e axudarnos a manter segura a comunidade!',
+		'contactAdminMsg' => 'Se queres contactar coa administración acerca desta publicación ou denuncia',
 	],
 
 ];
diff --git a/resources/lang/he/web.php b/resources/lang/he/web.php
index 12d18e168..213dd0b2a 100644
--- a/resources/lang/he/web.php
+++ b/resources/lang/he/web.php
@@ -13,6 +13,7 @@ return [
 		'shared' => 'שיתפו',
 		'shares' => 'שיתופים',
 		'unshare' => 'ביטול-שיתוף',
+		'bookmark' => 'שמירה',
 
 		'cancel' => 'ביטול',
 		'copyLink' => 'העתק קישור',
@@ -23,6 +24,10 @@ return [
 		'other' => 'אחר',
 		'readMore' => 'קרא עוד',
 		'success' => 'הצלחה',
+		'proceed' => 'המשך',
+		'next' => 'הבא',
+		'close' => 'סגור',
+		'clickHere' => 'לחץ כאן',
 
 		'sensitive' => 'רגיש',
 		'sensitiveContent' => 'תוכן רגיש',
@@ -84,7 +89,7 @@ return [
 		'updatedA' => 'עדכנו',
 		'sentA' => 'שלחו',
 
-		'followed' => 'עוקבים',
+		'followed' => 'עקבו',
 		'mentioned' => 'ציינו',
 		'you' => 'אתכם',
 
@@ -97,6 +102,7 @@ return [
 		'modlog' => 'לוג מנהלים',
 		'post' => 'פוסט',
 		'story' => 'סטורי',
+		'noneFound' => 'לא נמצאו התראות',
 	],
 
 	'post' => [
@@ -176,11 +182,27 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'אנשים שאתם אולי מכירים'
+		'peopleYouMayKnow' => 'אנשים שאתם אולי מכירים',
+
+		'onboarding' => [
+			'welcome' => 'ברוכים הבאים',
+			'thisIsYourHomeFeed' => 'זהו פיד הבית, פיד כרונולוגי של פוסטים מחשבונות אחריהם אתם עוקבים.',
+			'letUsHelpYouFind' => 'אפשרו לנו לעזור לך למצוא אנשים מעניינים לעקוב',
+			'refreshFeed' => 'ריענון הפיד',
+		],
 	],
 
 	'hashtags' => [
 		'emptyFeed' => 'לא נמצאו פוסטים עבור תיוג זה'
 	],
 
+	'report' => [
+		'report' => 'דווח',
+		'selectReason' => 'בחרו סיבה',
+		'reported' => 'דיווח נשלח',
+		'sendingReport' => 'שולח דיווח',
+		'thanksMsg' => 'תודה על הדיווח, אנשים כמוכם מסעיים לשמור על בטחון קהילתנו!',
+		'contactAdminMsg' => 'אם ברצונכם ליצור קשר עם מנהל לגבי הפוסט או דיווח הזה',
+	],
+
 ];
diff --git a/resources/lang/hi/web.php b/resources/lang/hi/web.php
index 3844f847a..79ab3ebe4 100644
--- a/resources/lang/hi/web.php
+++ b/resources/lang/hi/web.php
@@ -3,146 +3,152 @@
 return [
 
 	'common' => [
-		'comment' => 'Comment',
-		'commented' => 'Commented',
-		'comments' => 'Comments',
-		'like' => 'Like',
-		'liked' => 'Liked',
-		'likes' => 'Likes',
-		'share' => 'Share',
-		'shared' => 'Shared',
-		'shares' => 'Shares',
-		'unshare' => 'Unshare',
+		'comment' => 'टिप्पणी करें',
+		'commented' => 'टिप्पणी',
+		'comments' => 'टिप्पणियाँ',
+		'like' => 'रुचि',
+		'liked' => 'रुचि',
+		'likes' => 'रुचि',
+		'share' => 'साझा करें',
+		'shared' => 'साझा',
+		'shares' => 'साझा',
+		'unshare' => 'साझा न करें',
+		'bookmark' => 'बुकमार्क',
 
-		'cancel' => 'Cancel',
-		'copyLink' => 'Copy Link',
-		'delete' => 'Delete',
-		'error' => 'Error',
-		'errorMsg' => 'Something went wrong. Please try again later.',
-		'oops' => 'Oops!',
-		'other' => 'Other',
-		'readMore' => 'Read more',
-		'success' => 'Success',
+		'cancel' => 'रद्द',
+		'copyLink' => 'लिंक प्रतिलिपि',
+		'delete' => 'विलोपन',
+		'error' => 'त्रुटि',
+		'errorMsg' => 'कुछ दोष है। कृपया पुनः प्रयास करें।',
+		'oops' => 'ओह!',
+		'other' => 'अन्य',
+		'readMore' => 'आगे पढ़ें',
+		'success' => 'सफल हुआ',
+		'proceed' => 'आगे बढ़ें',
+		'next' => 'अगला',
+		'close' => 'बंद करें',
+		'clickHere' => 'यहाँ क्लिक करें',
 
-		'sensitive' => 'Sensitive',
-		'sensitiveContent' => 'Sensitive Content',
-		'sensitiveContentWarning' => 'This post may contain sensitive content',
+		'sensitive' => 'संवेदनशील',
+		'sensitiveContent' => 'संवेदनशील विषय वस्तु',
+		'sensitiveContentWarning' => 'इसमें प्रकाशित विषय-वस्तु संवेदनशील हो सकती है।',
 	],
 
 	'site' => [
-		'terms' => 'Terms of Use',
-		'privacy' => 'Privacy Policy',
+		'terms' => 'उपयोग के अनुबंध',
+		'privacy' => 'गोपनीयता नीति',
 	],
 
 	'navmenu' => [
-		'search' => 'Search',
-		'admin' => 'Admin Dashboard',
+		'search' => 'खोजें',
+		'admin' => 'एडमिन डैशबोर्ड',
 
 		// Timelines
-		'homeFeed' => 'Home Feed',
-		'localFeed' => 'Local Feed',
-		'globalFeed' => 'Global Feed',
+		'homeFeed' => 'होम फीड',
+		'localFeed' => 'लोकल फ़ीड',
+		'globalFeed' => 'ग्लोबल फ़ीड',
 
 		// Core features
-		'discover' => 'Discover',
-		'directMessages' => 'Direct Messages',
-		'notifications' => 'Notifications',
-		'groups' => 'Groups',
-		'stories' => 'Stories',
+		'discover' => 'अन्वेषण',
+		'directMessages' => 'संदेश',
+		'notifications' => 'सूचनाएँ',
+		'groups' => 'समूह',
+		'stories' => 'कथाएँ',
 
 		// Self links
-		'profile' => 'Profile',
-		'drive' => 'Drive',
-		'settings' => 'Settings',
-		'compose' => 'Create New',
-		'logout' => 'Logout',
+		'profile' => 'प्रोफाइल',
+		'drive' => 'ड्राइव',
+		'settings' => 'समायोजन',
+		'compose' => 'नया बनाएँ',
+		'logout' => 'लॉगआउट',
 
 		// Nav footer
-		'about' => 'About',
-		'help' => 'Help',
-		'language' => 'Language',
-		'privacy' => 'Privacy',
-		'terms' => 'Terms',
+		'about' => 'परिज्ञान',
+		'help' => 'सहायता',
+		'language' => 'भाषा',
+		'privacy' => 'गोपनीयता',
+		'terms' => 'अनुबंध',
 
 		// Temporary links
-		'backToPreviousDesign' => 'Go back to previous design'
+		'backToPreviousDesign' => 'पिछले संपादक पे वापस जाएँ'
 	],
 
 	'directMessages' => [
-		'inbox' => 'Inbox',
-		'sent' => 'Sent',
-		'requests' => 'Requests'
+		'inbox' => 'सन्देश',
+		'sent' => 'भेजे गए',
+		'requests' => 'निवेदन'
 	],
 
 	'notifications' => [
-		'liked' => 'liked your',
-		'commented' => 'commented on your',
-		'reacted' => 'reacted to your',
-		'shared' => 'shared your',
-		'tagged' => 'tagged you in a',
+		'liked' => 'आपकी पसंद',
+		'commented' => 'आपकी (पोस्ट) पे कमेंट किए',
+		'reacted' => 'आपके लिए प्रतिक्रिया दिये',
+		'shared' => 'आपका शेयर किये',
+		'tagged' => 'आपके एक (पोस्ट) में टैग किया गया',
 
-		'updatedA' => 'updated a',
-		'sentA' => 'sent a',
+		'updatedA' => 'अपडेट करें ....',
+		'sentA' => 'भेजें....',
 
-		'followed' => 'followed',
-		'mentioned' => 'mentioned',
-		'you' => 'you',
+		'followed' => 'अनुगमन किया',
+		'mentioned' => 'उल्लेख किया',
+		'you' => 'आप',
 
-		'yourApplication' => 'Your application to join',
-		'applicationApproved' => 'was approved!',
-		'applicationRejected' => 'was rejected. You can re-apply to join in 6 months.',
+		'yourApplication' => 'जुड़ने हेतु आपका आवेदन',
+		'applicationApproved' => 'स्वीकृत किया गया',
+		'applicationRejected' => 'अस्वीकृत किया गया। आप ६ मास के उपरांत पुनः आवेदन कर सकते हैं।',
 
-		'dm' => 'dm',
-		'groupPost' => 'group post',
-		'modlog' => 'modlog',
-		'post' => 'post',
-		'story' => 'story',
+		'dm' => 'संदेश',
+		'groupPost' => 'सामूहिक प्रकाशन',
+		'modlog' => 'मॉडलॉग',
+		'post' => 'प्रकाशन',
+		'story' => 'कथा',
+		'noneFound' => 'कोई नोटीफिकेसन नहीं प्राप्त हुयी',
 	],
 
 	'post' => [
-		'shareToFollowers' => 'Share to followers',
-		'shareToOther' => 'Share to other',
-		'noLikes' => 'No likes yet',
-		'uploading' => 'Uploading',
+		'shareToFollowers' => 'अनुयायियों से साझा करें',
+		'shareToOther' => 'अन्यों से साझा करें',
+		'noLikes' => 'अभी तक कोई रुचि नहीं',
+		'uploading' => 'अपलोड हो रहा है',
 	],
 
 	'profile' => [
-		'posts' => 'Posts',
-		'followers' => 'Followers',
-		'following' => 'Following',
-		'admin' => 'Admin',
-		'collections' => 'Collections',
-		'follow' => 'Follow',
-		'unfollow' => 'Unfollow',
-		'editProfile' => 'Edit Profile',
-		'followRequested' => 'Follow Requested',
-		'joined' => 'Joined',
+		'posts' => 'प्रकाशन',
+		'followers' => 'फोलोअर्स',
+		'following' => 'फॉलोइंग',
+		'admin' => 'एडमिन',
+		'collections' => 'कलेक्शनस',
+		'follow' => 'फॉलो',
+		'unfollow' => 'अनफॉलो',
+		'editProfile' => 'प्रोफाइल सम्पादित करें',
+		'followRequested' => 'रिक्वेस्टएड को फॉलो करें',
+		'joined' => 'ज्वाइनड',
 
-		'emptyCollections' => 'We can\'t seem to find any collections',
-		'emptyPosts' => 'We can\'t seem to find any posts',
+		'emptyCollections' => 'हमें किसी संग्रहों का पता नहीं लग सकता',
+		'emptyPosts' => 'हम किसी पोस्ट का पता नहीं लग सकता है',
 	],
 
 	'menu' => [
-		'viewPost' => 'View Post',
-		'viewProfile' => 'View Profile',
-		'moderationTools' => 'Moderation Tools',
-		'report' => 'Report',
+		'viewPost' => 'पोस्ट देखें',
+		'viewProfile' => 'प्रोफाइल देखें',
+		'moderationTools' => 'मॉडरेशन टूल्स',
+		'report' => 'रिपोर्ट',
 		'archive' => 'Archive',
 		'unarchive' => 'Unarchive',
-		'embed' => 'Embed',
+		'embed' => 'एम्बेड',
 
-		'selectOneOption' => 'Select one of the following options',
-		'unlistFromTimelines' => 'Unlist from Timelines',
-		'addCW' => 'Add Content Warning',
-		'removeCW' => 'Remove Content Warning',
-		'markAsSpammer' => 'Mark as Spammer',
-		'markAsSpammerText' => 'Unlist + CW existing and future posts',
-		'spam' => 'Spam',
-		'sensitive' => 'Sensitive Content',
-		'abusive' => 'Abusive or Harmful',
-		'underageAccount' => 'Underage Account',
-		'copyrightInfringement' => 'Copyright Infringement',
-		'impersonation' => 'Impersonation',
+		'selectOneOption' => 'किसी एक विकल्प को चुने',
+		'unlistFromTimelines' => 'टाइमलाइन्स से हटाएं',
+		'addCW' => 'कंटेंट चेतावनी जोड़ें',
+		'removeCW' => 'चेतावनी कंटेंट हटाएं',
+		'markAsSpammer' => 'स्पैमर मार्क करें',
+		'markAsSpammerText' => 'अनलिस्ट + सीडबल्यु मौजूदा और भविष्य पोस्ट',
+		'spam' => 'स्पैम',
+		'sensitive' => 'सेंसिटिव कंटेंट',
+		'abusive' => 'अपमानजनक या हानिकारक',
+		'underageAccount' => 'नाबालिग अकाउंट',
+		'copyrightInfringement' => 'कॉपीराईट का उल्लंघन',
+		'impersonation' => 'प्रतिरूपण',
 		'scamOrFraud' => 'Scam or Fraud',
 		'confirmReport' => 'Confirm Report',
 		'confirmReportText' => 'Are you sure you want to report this post?',
@@ -150,10 +156,10 @@ return [
 		'reportSentText' => 'We have successfully received your report.',
 		'reportSentError' => 'There was an issue reporting this post.',
 
-		'modAddCWConfirm' => 'Are you sure you want to add a content warning to this post?',
-		'modCWSuccess' => 'Successfully added content warning',
-		'modRemoveCWConfirm' => 'Are you sure you want to remove the content warning on this post?',
-		'modRemoveCWSuccess' => 'Successfully removed content warning',
+		'modAddCWConfirm' => 'क्या यह निश्चित है कि आप प्रकाशित सामग्री के साथ विषय-वस्तु सम्बंधित चेतावनी जोड़ना चाहते हैं?',
+		'modCWSuccess' => 'विषय-वस्तु सम्बंधित चेतावनी सफलता से जोड़ी गयी',
+		'modRemoveCWConfirm' => 'क्या यह निश्चित है कि आप प्रकाशित सामग्री से विषय-वस्तु सम्बंधित चेतावनी हटाना चाहते हैं?',
+		'modRemoveCWSuccess' => 'विषय-वस्तु सम्बंधित चेतावनी सफलता से हटाई गयी',
 		'modUnlistConfirm' => 'Are you sure you want to unlist this post?',
 		'modUnlistSuccess' => 'Successfully unlisted post',
 		'modMarkAsSpammerConfirm' => 'Are you sure you want to mark this user as a spammer? All existing and future posts will be unlisted on timelines and a content warning will be applied.',
@@ -176,11 +182,27 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'People you may know'
+		'peopleYouMayKnow' => 'People you may know',
+
+		'onboarding' => [
+			'welcome' => 'Welcome',
+			'thisIsYourHomeFeed' => 'This is your home feed, a chronological feed of posts from accounts you follow.',
+			'letUsHelpYouFind' => 'Let us help you find some interesting people to follow',
+			'refreshFeed' => 'Refresh my feed',
+		],
 	],
 
 	'hashtags' => [
 		'emptyFeed' => 'We can\'t seem to find any posts for this hashtag'
 	],
 
+	'report' => [
+		'report' => 'Report',
+		'selectReason' => 'Select a reason',
+		'reported' => 'Reported',
+		'sendingReport' => 'Sending report',
+		'thanksMsg' => 'Thanks for the report, people like you help keep our community safe!',
+		'contactAdminMsg' => 'If you\'d like to contact an administrator about this post or report',
+	],
+
 ];
diff --git a/resources/lang/hr/web.php b/resources/lang/hr/web.php
index 3844f847a..2c6a7b418 100644
--- a/resources/lang/hr/web.php
+++ b/resources/lang/hr/web.php
@@ -13,6 +13,7 @@ return [
 		'shared' => 'Shared',
 		'shares' => 'Shares',
 		'unshare' => 'Unshare',
+		'bookmark' => 'Bookmark',
 
 		'cancel' => 'Cancel',
 		'copyLink' => 'Copy Link',
@@ -23,6 +24,10 @@ return [
 		'other' => 'Other',
 		'readMore' => 'Read more',
 		'success' => 'Success',
+		'proceed' => 'Proceed',
+		'next' => 'Next',
+		'close' => 'Close',
+		'clickHere' => 'click here',
 
 		'sensitive' => 'Sensitive',
 		'sensitiveContent' => 'Sensitive Content',
@@ -97,6 +102,7 @@ return [
 		'modlog' => 'modlog',
 		'post' => 'post',
 		'story' => 'story',
+		'noneFound' => 'No notifications found',
 	],
 
 	'post' => [
@@ -176,11 +182,27 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'People you may know'
+		'peopleYouMayKnow' => 'People you may know',
+
+		'onboarding' => [
+			'welcome' => 'Welcome',
+			'thisIsYourHomeFeed' => 'This is your home feed, a chronological feed of posts from accounts you follow.',
+			'letUsHelpYouFind' => 'Let us help you find some interesting people to follow',
+			'refreshFeed' => 'Refresh my feed',
+		],
 	],
 
 	'hashtags' => [
 		'emptyFeed' => 'We can\'t seem to find any posts for this hashtag'
 	],
 
+	'report' => [
+		'report' => 'Report',
+		'selectReason' => 'Select a reason',
+		'reported' => 'Reported',
+		'sendingReport' => 'Sending report',
+		'thanksMsg' => 'Thanks for the report, people like you help keep our community safe!',
+		'contactAdminMsg' => 'If you\'d like to contact an administrator about this post or report',
+	],
+
 ];
diff --git a/resources/lang/hu/web.php b/resources/lang/hu/web.php
index 65a3f2bcf..f3b8e8452 100644
--- a/resources/lang/hu/web.php
+++ b/resources/lang/hu/web.php
@@ -7,26 +7,31 @@ return [
 		'commented' => 'Hozzászólva',
 		'comments' => 'Hozzászólások',
 		'like' => 'Tetszik',
-		'liked' => 'Tetszik',
+		'liked' => 'Kedvelve',
 		'likes' => 'Kedvelések',
 		'share' => 'Megosztás',
 		'shared' => 'Megosztva',
 		'shares' => 'Megosztások',
 		'unshare' => 'Megosztás visszavonása',
+		'bookmark' => 'Könyvjelző',
 
-		'cancel' => 'Mégsem',
-		'copyLink' => 'Link másolása',
+		'cancel' => 'Mégse',
+		'copyLink' => 'Hivatkozás másolása',
 		'delete' => 'Törlés',
 		'error' => 'Hiba',
-		'errorMsg' => 'Valami hiba történt. Próbáld újra később.',
+		'errorMsg' => 'Hiba történt. Próbálja újra később.',
 		'oops' => 'Hoppá!',
 		'other' => 'Egyéb',
 		'readMore' => 'Tovább',
-		'success' => 'Siker',
+		'success' => 'Sikeres',
+		'proceed' => 'Folytatás',
+		'next' => 'Következő',
+		'close' => 'Bezárás',
+		'clickHere' => 'kattintson ide',
 
 		'sensitive' => 'Érzékeny',
-		'sensitiveContent' => 'Kényes tartalom',
-		'sensitiveContentWarning' => 'Ez a poszt kényes tartalmat tartalmazhat',
+		'sensitiveContent' => 'Érzékeny tartalom',
+		'sensitiveContentWarning' => 'Ez a bejegyzés érzékeny tartalmat tartalmazhat',
 	],
 
 	'site' => [
@@ -39,7 +44,7 @@ return [
 		'admin' => 'Admin irányítópult',
 
 		// Timelines
-		'homeFeed' => 'Saját idővonal',
+		'homeFeed' => 'Kezdőlap',
 		'localFeed' => 'Helyi idővonal',
 		'globalFeed' => 'Globális idővonal',
 
@@ -52,15 +57,15 @@ return [
 
 		// Self links
 		'profile' => 'Profil',
-		'drive' => 'Meghajtó',
+		'drive' => 'Tárhely',
 		'settings' => 'Beállítások',
 		'compose' => 'Új létrehozása',
-		'logout' => 'Logout',
+		'logout' => 'Kijelentkezés',
 
 		// Nav footer
 		'about' => 'Rólunk',
 		'help' => 'Súgó',
-		'language' => 'Nyelvek',
+		'language' => 'Nyelv',
 		'privacy' => 'Adatvédelem',
 		'terms' => 'Feltételek',
 
@@ -71,32 +76,33 @@ return [
 	'directMessages' => [
 		'inbox' => 'Bejövő',
 		'sent' => 'Elküldött',
-		'requests' => 'Kérelmek'
+		'requests' => 'Kérések'
 	],
 
 	'notifications' => [
-		'liked' => 'kedvelte %-t',
-		'commented' => 'hozzászólt a %-hez',
-		'reacted' => 'reagált a %-re',
-		'shared' => 'megosztotta a %-t',
+		'liked' => 'kedvelte ezt:',
+		'commented' => 'hozzászólt ehhez:',
+		'reacted' => 'reagált erre:',
+		'shared' => 'megosztotta ezt:',
 		'tagged' => 'megjelölt ebben',
 
-		'updatedA' => 'frissítette a %-t',
-		'sentA' => 'küldött egy %-t',
+		'updatedA' => 'frissítette ezt:',
+		'sentA' => 'ezt küldte:',
 
-		'followed' => 'követés',
-		'mentioned' => 'megemlített',
-		'you' => 'te',
+		'followed' => 'követi',
+		'mentioned' => 'megemlítette',
+		'you' => 'Önt',
 
-		'yourApplication' => 'A csatlakozási kérelmed',
-		'applicationApproved' => 'elfogadva!',
-		'applicationRejected' => 'elutasítva. A csatlakozást 6 hónap múlva újra kérelmezheted.',
+		'yourApplication' => 'A csatlakozási kérését',
+		'applicationApproved' => 'elfogadták!',
+		'applicationRejected' => 'elutasították. A csatlakozást 6 hónap múlva újra kérheti.',
 
 		'dm' => 'közvetlen üzenet',
-		'groupPost' => 'csoportos poszt',
+		'groupPost' => 'csoportos bejegyzés',
 		'modlog' => 'mod napló',
 		'post' => 'bejegyzés',
 		'story' => 'történet',
+		'noneFound' => 'Nincsenek értesítések',
 	],
 
 	'post' => [
@@ -115,28 +121,28 @@ return [
 		'follow' => 'Követés',
 		'unfollow' => 'Követés visszavonása',
 		'editProfile' => 'Profil szerkesztése',
-		'followRequested' => 'Követési kérelmek',
+		'followRequested' => 'Követési kérések',
 		'joined' => 'Csatlakozott',
 
-		'emptyCollections' => 'Úgy fest, nem található egy kollekció se',
-		'emptyPosts' => 'Úgy fest, nem található egy bejegyzés se',
+		'emptyCollections' => 'Úgy tűnik, hogy egy gyűjtemény sem található',
+		'emptyPosts' => 'Úgy tűnik, hogy egy bejegyzés sem található',
 	],
 
 	'menu' => [
 		'viewPost' => 'Bejegyzés megtekintése',
 		'viewProfile' => 'Profil megtekintése',
 		'moderationTools' => 'Moderációs eszközök',
-		'report' => 'Bejelentés',
+		'report' => 'Jelentés',
 		'archive' => 'Archiválás',
 		'unarchive' => 'Visszaállítás archívumból',
 		'embed' => 'Beágyazás',
 
-		'selectOneOption' => 'Kérjük, válassz egyet az alábbi lehetőségek közül',
+		'selectOneOption' => 'Válasszon egyet az alábbi lehetőségek közül',
 		'unlistFromTimelines' => 'A bejegyzések ne jelenjenek meg az idővonalon',
 		'addCW' => 'Tartalmi figyelmeztetés hozzádása',
-		'removeCW' => 'Tartalmi figyelmeztetés törlése',
+		'removeCW' => 'Tartalmi figyelmeztetés eltávolítása',
 		'markAsSpammer' => 'Megjelölés spammerként',
-		'markAsSpammerText' => 'Összes jelenlegi és jövőbeli bejegyzés elrejtése és tartalom figyelmeztetéssel ellátása',
+		'markAsSpammerText' => 'Összes jelenlegi és jövőbeli bejegyzés elrejtése, és tartalmi figyelmeztetéssel ellátása',
 		'spam' => 'Spam',
 		'sensitive' => 'Érzékeny tartalom',
 		'abusive' => 'Bántalmazó vagy káros',
@@ -144,31 +150,31 @@ return [
 		'copyrightInfringement' => 'Szerzői jogok megsértése',
 		'impersonation' => 'Megszemélyesítés',
 		'scamOrFraud' => 'Átverés vagy visszaélés',
-		'confirmReport' => 'Bejelentés megerősítése',
-		'confirmReportText' => 'Biztosan jelenteni akarod ezt a bejegyzést?',
+		'confirmReport' => 'Jelentés megerősítése',
+		'confirmReportText' => 'Biztos, hogy jelenti ezt a bejegyzést?',
 		'reportSent' => 'Jelentés elküldve!',
 		'reportSentText' => 'A bejelentést sikeresen fogadtuk.',
 		'reportSentError' => 'Probléma lépett fel a bejegyzés jelentése közben.',
 
-		'modAddCWConfirm' => 'Biztosan tartalom figyelmeztetést akarsz erre a bejegyzésre alkalmazni?',
-		'modCWSuccess' => 'Tartalom figyelmeztetés alkalmazása sikeres',
-		'modRemoveCWConfirm' => 'Biztosan eltávolítod a tartalom figyelmeztetést erről a bejegyzésről?',
-		'modRemoveCWSuccess' => 'Tartalom figyelmeztetés eltávolítása sikeres',
-		'modUnlistConfirm' => 'Biztosan el akarod rejteni ezt a bejegyzést?',
+		'modAddCWConfirm' => 'Biztos, hogy tartalmi figyelmeztetést ad hozzá ehhez a bejegyzéshez?',
+		'modCWSuccess' => 'Tartalmi figyelmeztetés hozzáadása sikeres',
+		'modRemoveCWConfirm' => 'Biztos, hogy eltávolítja a tartalmi figyelmeztetést erről a bejegyzésről?',
+		'modRemoveCWSuccess' => 'Tartalmi figyelmeztetés eltávolítása sikeres',
+		'modUnlistConfirm' => 'Biztos, hogy elrejti ezt a bejegyzést?',
 		'modUnlistSuccess' => 'Bejegyzés elrejtése sikeres',
 		'modMarkAsSpammerConfirm' => 'Biztosan spammernek jelölöd ezt a felhasználót? Az összes jelenlegi és jövőbeli bejegyzése elrejtésre kerül az idővonalon és tartalom figyelmeztetés kerül alkalmazásra.',
 		'modMarkAsSpammerSuccess' => 'A fiók sikeresen spammerként jelölve',
 
 		'toFollowers' => 'követők',
 
-		'showCaption' => 'Képaláírás mutatása',
+		'showCaption' => 'Felirat megjelenítése',
 		'showLikes' => 'Lájkok mutatása',
 		'compactMode' => 'Kompakt mód',
-		'embedConfirmText' => 'A beillesztés használatával hozzájárulsz a mi',
+		'embedConfirmText' => 'A beágyazás használatával belegyezik a következőbe:',
 
-		'deletePostConfirm' => 'Biztosan törölni akarod ezt a bejegyzést?',
-		'archivePostConfirm' => 'Biztosan archiválni akarod ezt a bejegyzést?',
-		'unarchivePostConfirm' => 'Biztosan vissza akarod vonni ennek a bejegyzésnek az archiválását?',
+		'deletePostConfirm' => 'Biztos, hogy törli ezt a bejegyzést?',
+		'archivePostConfirm' => 'Biztos, hogy archiválja ezt a bejegyzést?',
+		'unarchivePostConfirm' => 'Biztos, hogy visszavonja a bejegyzés archiválását?',
 	],
 
 	'story' => [
@@ -176,11 +182,27 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'Emberek akiket ismerhetsz'
+		'peopleYouMayKnow' => 'Emberek, akiket ismerhet',
+
+		'onboarding' => [
+			'welcome' => 'Üdvözöljük',
+			'thisIsYourHomeFeed' => 'Ez a kezdőlap, az Ön által követett fiókok bejegyzései időrendi sorrendben.',
+			'letUsHelpYouFind' => 'Keressünk érdekes, követhető embereket',
+			'refreshFeed' => 'Kezdőlap frissítése',
+		],
 	],
 
 	'hashtags' => [
 		'emptyFeed' => 'Úgy tűnik nem található egy bejegyzés sem ehhez a hashtag-hez'
 	],
 
+	'report' => [
+		'report' => 'Jelentés',
+		'selectReason' => 'Válasszon egy indokot',
+		'reported' => 'Jelentve',
+		'sendingReport' => 'Jelentés elküldése',
+		'thanksMsg' => 'Köszönjük a jelentést, az Önhöz hasonló emberek teszik a közösségünket biztonságossá!',
+		'contactAdminMsg' => 'Ha kapcsolatba akar lépni egy adminisztrátorral a bejegyzéssel vagy jelentéssel kapcsolatban',
+	],
+
 ];
diff --git a/resources/lang/id/web.php b/resources/lang/id/web.php
index be72512e7..503311036 100644
--- a/resources/lang/id/web.php
+++ b/resources/lang/id/web.php
@@ -3,26 +3,31 @@
 return [
 
 	'common' => [
-		'comment' => 'Komentar',
+		'comment' => 'Komentari',
 		'commented' => 'Dikomentari',
 		'comments' => 'Komentar',
-		'like' => 'Menyukai',
+		'like' => 'Sukai',
 		'liked' => 'Disukai',
 		'likes' => 'Suka',
 		'share' => 'Bagikan',
 		'shared' => 'Dibagikan',
 		'shares' => 'Dibagikan',
 		'unshare' => 'Batalkan berbagi',
+		'bookmark' => 'Penanda Buku',
 
 		'cancel' => 'Batal',
 		'copyLink' => 'Salin tautan',
 		'delete' => 'Hapus',
-		'error' => 'Kesalahan',
-		'errorMsg' => 'Telah terjadi kesalahan. Silakan coba lagi nanti.',
+		'error' => 'Galat',
+		'errorMsg' => 'Terjadi kesalahan. Silakan coba lagi nanti.',
 		'oops' => 'Oops!',
 		'other' => 'Lainnya',
 		'readMore' => 'Baca selengkapnya',
 		'success' => 'Berhasil',
+		'proceed' => 'Lanjut',
+		'next' => 'Berikutnya',
+		'close' => 'Tutup',
+		'clickHere' => 'klik di sini',
 
 		'sensitive' => 'Sensitif',
 		'sensitiveContent' => 'Konten Sensitif',
@@ -40,21 +45,21 @@ return [
 
 		// Timelines
 		'homeFeed' => 'Beranda',
-		'localFeed' => 'Umpan lokal',
-		'globalFeed' => 'Umpan global',
+		'localFeed' => 'Beranda Setempat',
+		'globalFeed' => 'Beranda Global',
 
 		// Core features
 		'discover' => 'Jelajahi',
 		'directMessages' => 'Pesan Langsung',
-		'notifications' => 'Notifikasi',
+		'notifications' => 'Pemberitahuan',
 		'groups' => 'Grup',
 		'stories' => 'Cerita',
 
 		// Self links
 		'profile' => 'Profil',
-		'drive' => 'Perangkat Keras',
+		'drive' => 'Kandar',
 		'settings' => 'Pengaturan',
-		'compose' => 'Membuat baru',
+		'compose' => 'Buat',
 		'logout' => 'Keluar',
 
 		// Nav footer
@@ -65,7 +70,7 @@ return [
 		'terms' => 'Ketentuan',
 
 		// Temporary links
-		'backToPreviousDesign' => 'Kembali ke desain sebelumnya'
+		'backToPreviousDesign' => 'Kembali ke rancangan sebelumnya'
 	],
 
 	'directMessages' => [
@@ -77,32 +82,33 @@ return [
 	'notifications' => [
 		'liked' => 'menyukai',
 		'commented' => 'mengomentari',
-		'reacted' => 'bereaksi terhadap',
+		'reacted' => 'bereaksi ke',
 		'shared' => 'membagikan',
-		'tagged' => 'menandai Anda pada sebuah',
+		'tagged' => 'menandai Anda di',
 
-		'updatedA' => 'mengupdate sebuah',
-		'sentA' => 'mengirim sebuah',
+		'updatedA' => 'memperbarui',
+		'sentA' => 'mengirim',
 
 		'followed' => 'diikuti',
 		'mentioned' => 'disebut',
-		'you' => 'anda',
+		'you' => 'Anda',
 
-		'yourApplication' => 'Aplikasi anda untuk mengikuti',
+		'yourApplication' => 'Aplikasi Anda untuk mengikuti',
 		'applicationApproved' => 'telah disetujui!',
-		'applicationRejected' => 'telah ditolak. Anda dapat kembali mengajukan untuk bergabung dalam 6 bulan.',
+		'applicationRejected' => 'ditolak. Anda dapat mengajukan lagi untuk bergabung dalam 6 bulan.',
 
 		'dm' => 'dm',
 		'groupPost' => 'postingan grup',
 		'modlog' => 'modlog',
 		'post' => 'postingan',
 		'story' => 'cerita',
+		'noneFound' => 'Tidak ditemukan pemberitahuan',
 	],
 
 	'post' => [
-		'shareToFollowers' => 'Membagikan kepada pengikut',
-		'shareToOther' => 'Membagikan ke orang lain',
-		'noLikes' => 'Belum ada yang menyukai',
+		'shareToFollowers' => 'Bagikan kepada pengikut',
+		'shareToOther' => 'Bagikan ke orang lain',
+		'noLikes' => 'Masih belum disukai',
 		'uploading' => 'Mengunggah',
 	],
 
@@ -110,10 +116,10 @@ return [
 		'posts' => 'Postingan',
 		'followers' => 'Pengikut',
 		'following' => 'Mengikuti',
-		'admin' => 'Pengelola',
+		'admin' => 'Pengurus',
 		'collections' => 'Koleksi',
 		'follow' => 'Ikuti',
-		'unfollow' => 'Berhenti Ikuti',
+		'unfollow' => 'Berhenti ikuti',
 		'editProfile' => 'Ubah Profil',
 		'followRequested' => 'Meminta Permintaan Mengikuti',
 		'joined' => 'Bergabung',
@@ -128,7 +134,7 @@ return [
 		'moderationTools' => 'Alat Moderasi',
 		'report' => 'Laporkan',
 		'archive' => 'Arsipkan',
-		'unarchive' => 'Keluarkan dari arsip',
+		'unarchive' => 'Lepas arsip',
 		'embed' => 'Penyemat',
 
 		'selectOneOption' => 'Pilih salah satu dari opsi berikut',
@@ -176,11 +182,27 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'Orang yang mungkin Anda kenal'
+		'peopleYouMayKnow' => 'Orang yang mungkin Anda kenal',
+
+		'onboarding' => [
+			'welcome' => 'Selamat Datang',
+			'thisIsYourHomeFeed' => 'Ini merupakan tampilan beranda Anda, tampilan dari postingan akun yang Anda ikuti secara kronologis.',
+			'letUsHelpYouFind' => 'Biarkan kami membantumu menemukan orang-orang yang menarik untuk diikuti',
+			'refreshFeed' => 'Segarkan laman umpan',
+		],
 	],
 
 	'hashtags' => [
 		'emptyFeed' => 'Sepertinya kami tidak dapat menemukan postingan untuk tagar ini'
 	],
 
+	'report' => [
+		'report' => 'Laporkan',
+		'selectReason' => 'Pilih alasan',
+		'reported' => 'Terlaporkan',
+		'sendingReport' => 'Mengirim laporan',
+		'thanksMsg' => 'Terima kasih atas laporannya, tindakan Anda amat membantu menjaga komunitas!',
+		'contactAdminMsg' => 'Jika Anda berminat menghubungi seorang administrator mengenai postingan ini atau melaporkan',
+	],
+
 ];
diff --git a/resources/lang/it/web.php b/resources/lang/it/web.php
index bb023c3ca..f8f809aeb 100644
--- a/resources/lang/it/web.php
+++ b/resources/lang/it/web.php
@@ -6,13 +6,14 @@ return [
 		'comment' => 'Commenta',
 		'commented' => 'Commentato',
 		'comments' => 'Commenti',
-		'like' => 'Like',
+		'like' => 'Mi piace',
 		'liked' => 'Like aggiunto',
 		'likes' => 'Tutti i Like',
 		'share' => 'Condividi',
 		'shared' => 'Condiviso',
 		'shares' => 'Condivisioni',
 		'unshare' => 'Annulla condivisione',
+		'bookmark' => 'Preferiti',
 
 		'cancel' => 'Annulla',
 		'copyLink' => 'Copia link',
@@ -23,6 +24,10 @@ return [
 		'other' => 'Altro',
 		'readMore' => 'Leggi di più',
 		'success' => 'Riuscito',
+		'proceed' => 'Continua',
+		'next' => 'Avanti',
+		'close' => 'Chiudi',
+		'clickHere' => 'clicca qui',
 
 		'sensitive' => 'Sensibile',
 		'sensitiveContent' => 'Contenuto Sensibile',
@@ -76,17 +81,17 @@ return [
 
 	'notifications' => [
 		'liked' => 'ha messo like a',
-		'commented' => 'ha commentato',
+		'commented' => 'ha commentato il tuo',
 		'reacted' => 'ha reagito a',
-		'shared' => 'ha condiviso',
+		'shared' => 'ha condiviso il tuo',
 		'tagged' => 'ti ha taggato in',
 
 		'updatedA' => 'ha aggiornato un',
 		'sentA' => 'ha inviato un',
 
-		'followed' => 'stai seguendo',
+		'followed' => 'sta seguendo',
 		'mentioned' => 'menzionato',
-		'you' => 'tu',
+		'you' => 'te',
 
 		'yourApplication' => 'La tua candidatura per unirti',
 		'applicationApproved' => 'è stata approvata!',
@@ -97,6 +102,7 @@ return [
 		'modlog' => 'modlog',
 		'post' => 'post',
 		'story' => 'storia',
+		'noneFound' => 'Non ci sono notifiche',
 	],
 
 	'post' => [
@@ -176,11 +182,27 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'Persone che potresti conoscere'
+		'peopleYouMayKnow' => 'Persone che potresti conoscere',
+
+		'onboarding' => [
+			'welcome' => 'Benvenuto',
+			'thisIsYourHomeFeed' => 'Questo è il tuo feed principale, un feed in ordine cronologico dei post da account che segui.',
+			'letUsHelpYouFind' => 'Ti aiutiamo a trovare delle persone interessanti da seguire',
+			'refreshFeed' => 'Aggiorna il mio feed',
+		],
 	],
 
 	'hashtags' => [
-		'emptyFeed' => 'Non riusciamo a trovare alcun post con questo hashtag'
+		'emptyFeed' => 'Non riusciamo a trovare nessun post con questo hashtag'
+	],
+
+	'report' => [
+		'report' => 'Segnala',
+		'selectReason' => 'Seleziona un motivo',
+		'reported' => 'Segnalato',
+		'sendingReport' => 'Invio della segnalazione',
+		'thanksMsg' => 'Grazie per la segnalazione, le persone come te aiutano a mantenere la comunità al sicuro!',
+		'contactAdminMsg' => 'Se desideri contattare un amministratore per questo post o rapporto',
 	],
 
 ];
diff --git a/resources/lang/ja/web.php b/resources/lang/ja/web.php
index 430ae1201..c440ebeb9 100644
--- a/resources/lang/ja/web.php
+++ b/resources/lang/ja/web.php
@@ -13,6 +13,7 @@ return [
 		'shared' => '共有されました',
 		'shares' => '共有',
 		'unshare' => '共有解除',
+		'bookmark' => 'ブックマーク',
 
 		'cancel' => 'キャンセル',
 		'copyLink' => 'リンクをコピー',
@@ -23,6 +24,10 @@ return [
 		'other' => 'その他',
 		'readMore' => 'もっと読む',
 		'success' => '成功しました',
+		'proceed' => '続行',
+		'next' => '次へ',
+		'close' => '閉じる',
+		'clickHere' => 'ここをクリック',
 
 		'sensitive' => 'センシティブ',
 		'sensitiveContent' => 'センシティブなコンテンツ',
@@ -75,28 +80,29 @@ return [
 	],
 
 	'notifications' => [
-		'liked' => 'liked your',
-		'commented' => 'commented on your',
-		'reacted' => 'reacted to your',
-		'shared' => 'shared your',
-		'tagged' => 'tagged you in a',
+		'liked' => 'さんが次をいいねしました:',
+		'commented' => 'さんが次にコメントしました:',
+		'reacted' => 'さんが次に反応しました:',
+		'shared' => 'さんが次を共有しました:',
+		'tagged' => 'さんが次にあなたをタグ付けしました:',
 
-		'updatedA' => 'updated a',
-		'sentA' => 'sent a',
+		'updatedA' => 'さんが次を更新しました:',
+		'sentA' => 'さんが次を送信しました:',
 
-		'followed' => 'followed',
-		'mentioned' => 'mentioned',
+		'followed' => 'さんがフォローしました:',
+		'mentioned' => 'さんが返信しました:',
 		'you' => 'あなた',
 
-		'yourApplication' => 'Your application to join',
-		'applicationApproved' => 'was approved!',
-		'applicationRejected' => 'was rejected. You can re-apply to join in 6 months.',
+		'yourApplication' => '参加するアプリケーション',
+		'applicationApproved' => 'が承認されました!',
+		'applicationRejected' => 'は拒否されました。6ヶ月後に再度参加を申請できます。',
 
 		'dm' => 'dm',
 		'groupPost' => 'グループの投稿',
 		'modlog' => 'モデレーションログ',
 		'post' => '投稿',
 		'story' => 'ストーリー',
+		'noneFound' => '通知はありません',
 	],
 
 	'post' => [
@@ -159,12 +165,12 @@ return [
 		'modMarkAsSpammerConfirm' => 'このユーザーをスパムとして登録していいですか？既存のまた、今後の投稿はすべてタイムラインに表示されず、コンテンツ警告が適用されます。',
 		'modMarkAsSpammerSuccess' => 'アカウントをスパムとしてマークしました',
 
-		'toFollowers' => 'to Followers',
+		'toFollowers' => 'フォロワー向け',
 
 		'showCaption' => '説明を表示',
 		'showLikes' => 'いいねを表示',
 		'compactMode' => 'コンパクトモード',
-		'embedConfirmText' => 'By using this embed, you agree to our',
+		'embedConfirmText' => 'この埋め込みを利用する事で、あなたは次に同意したとみなされます:',
 
 		'deletePostConfirm' => '本当にこの投稿を削除しますか？',
 		'archivePostConfirm' => '本当にこの投稿をアーカイブしますか？',
@@ -176,11 +182,27 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => '知り合いかも'
+		'peopleYouMayKnow' => '知り合いかも',
+
+		'onboarding' => [
+			'welcome' => 'ようこそ',
+			'thisIsYourHomeFeed' => 'これはあなたのフォームフィードです、フォローしているアカウントからの投稿が時系列で表示されます。',
+			'letUsHelpYouFind' => '興味のある人をフォローするお手伝いをします',
+			'refreshFeed' => 'フィードをリフレッシュ',
+		],
 	],
 
 	'hashtags' => [
 		'emptyFeed' => 'このハッシュタグの投稿が見つかりませんでした'
 	],
 
+	'report' => [
+		'report' => '報告',
+		'selectReason' => '理由を選択してください',
+		'reported' => '報告済み',
+		'sendingReport' => '報告を送信中',
+		'thanksMsg' => '報告ありがとうございます、あなたのような人々が私達のコミュニティーを安全に保ちます！',
+		'contactAdminMsg' => 'この投稿または報告について管理者に問い合わせたい場合',
+	],
+
 ];
diff --git a/resources/lang/ko/web.php b/resources/lang/ko/web.php
index de0e4b2eb..af2451599 100644
--- a/resources/lang/ko/web.php
+++ b/resources/lang/ko/web.php
@@ -4,25 +4,30 @@ return [
 
 	'common' => [
 		'comment' => '댓글',
-		'commented' => 'Commented',
-		'comments' => 'Comments',
+		'commented' => '댓글 씀',
+		'comments' => '댓글',
 		'like' => '좋아요',
-		'liked' => 'Liked',
-		'likes' => 'Likes',
+		'liked' => '좋아함',
+		'likes' => '좋아요',
 		'share' => '공유',
-		'shared' => 'Shared',
-		'shares' => 'Shares',
-		'unshare' => 'Unshare',
+		'shared' => '공유함',
+		'shares' => '공유하기',
+		'unshare' => '공유 해제',
+		'bookmark' => '북마크',
 
 		'cancel' => '취소',
-		'copyLink' => 'Copy Link',
-		'delete' => 'Delete',
+		'copyLink' => '링크 복사',
+		'delete' => '지우기',
 		'error' => '오류',
 		'errorMsg' => '문제가 발생했습니다. 나중에 다시 시도하세요.',
 		'oops' => '이런!',
-		'other' => '기타',
+		'other' => '등',
 		'readMore' => '더보기',
 		'success' => '성공',
+		'proceed' => '진행',
+		'next' => '다음',
+		'close' => '닫기',
+		'clickHere' => '여기를 클릭',
 
 		'sensitive' => '민감함 ',
 		'sensitiveContent' => '민감한 내용',
@@ -44,18 +49,18 @@ return [
 		'globalFeed' => '글로벌 피드',
 
 		// Core features
-		'discover' => '발견하기',
+		'discover' => '발견',
 		'directMessages' => '쪽지',
 		'notifications' => '알림',
 		'groups' => '그룹',
-		'stories' => '스토리',
+		'stories' => '이야기',
 
 		// Self links
 		'profile' => '프로필',
 		'drive' => '드라이브',
 		'settings' => '설정',
 		'compose' => '새로 만들기',
-		'logout' => 'Logout',
+		'logout' => '로그아웃',
 
 		// Nav footer
 		'about' => '정보',
@@ -65,122 +70,140 @@ return [
 		'terms' => '약관',
 
 		// Temporary links
-		'backToPreviousDesign' => '이전 디자인으로 돌아가기'
+		'backToPreviousDesign' => '이전 디자인으로 되돌리기'
 	],
 
 	'directMessages' => [
-		'inbox' => '받은 편지함',
+		'inbox' => '받은쪽지함',
 		'sent' => '보냄',
 		'requests' => '요청 내역'
 	],
 
 	'notifications' => [
-		'liked' => 'liked your',
-		'commented' => 'commented on your',
-		'reacted' => 'reacted to your',
-		'shared' => 'shared your',
-		'tagged' => 'tagged you in a',
+		'liked' => '내가 좋아한',
+		'commented' => '내 댓글',
+		'reacted' => '내 반응',
+		'shared' => '내가 공유함',
+		'tagged' => '내가 태그됨',
 
-		'updatedA' => 'updated a',
-		'sentA' => 'sent a',
+		'updatedA' => '업데이트',
+		'sentA' => '보낸 이',
 
-		'followed' => 'followed',
-		'mentioned' => 'mentioned',
-		'you' => 'you',
+		'followed' => '님이 팔로우',
+		'mentioned' => ' 님으로부터의 멘션',
+		'you' => '나',
 
-		'yourApplication' => 'Your application to join',
-		'applicationApproved' => 'was approved!',
-		'applicationRejected' => 'was rejected. You can re-apply to join in 6 months.',
+		'yourApplication' => '가입 신청서 작성',
+		'applicationApproved' => '승인되었습니다!',
+		'applicationRejected' => '이 반려되었습니다. 6개월 후에 다시 재신청할 수 있습니다.',
 
-		'dm' => 'dm',
-		'groupPost' => 'group post',
-		'modlog' => 'modlog',
-		'post' => 'post',
-		'story' => 'story',
+		'dm' => 'DM',
+		'groupPost' => '묶어 발행',
+		'modlog' => '모드로그',
+		'post' => '발행',
+		'story' => '이야기',
+		'noneFound' => '알림을 찾을 수 없음',
 	],
 
 	'post' => [
-		'shareToFollowers' => 'Share to followers',
-		'shareToOther' => 'Share to other',
-		'noLikes' => 'No likes yet',
-		'uploading' => 'Uploading',
+		'shareToFollowers' => '팔로워에게 공유하기',
+		'shareToOther' => '다른 곳에 공유하기',
+		'noLikes' => '아직 좋아요 없음',
+		'uploading' => '업로드 중',
 	],
 
 	'profile' => [
-		'posts' => 'Posts',
-		'followers' => 'Followers',
-		'following' => 'Following',
-		'admin' => 'Admin',
-		'collections' => 'Collections',
-		'follow' => 'Follow',
-		'unfollow' => 'Unfollow',
-		'editProfile' => 'Edit Profile',
-		'followRequested' => 'Follow Requested',
-		'joined' => 'Joined',
+		'posts' => '발행물',
+		'followers' => '팔로워',
+		'following' => '팔로잉',
+		'admin' => '관리자',
+		'collections' => '컬렉션',
+		'follow' => '팔로우',
+		'unfollow' => '언팔로우',
+		'editProfile' => '프로필 편집',
+		'followRequested' => '팔로우 요청함',
+		'joined' => '가입함',
 
-		'emptyCollections' => 'We can\'t seem to find any collections',
-		'emptyPosts' => 'We can\'t seem to find any posts',
+		'emptyCollections' => '아무 컬렉션도 보이지 않습니다.',
+		'emptyPosts' => '아무 발행물도 보이지 않습니다.',
 	],
 
 	'menu' => [
-		'viewPost' => 'View Post',
-		'viewProfile' => 'View Profile',
-		'moderationTools' => 'Moderation Tools',
-		'report' => 'Report',
-		'archive' => 'Archive',
-		'unarchive' => 'Unarchive',
-		'embed' => 'Embed',
+		'viewPost' => '발행물 보기',
+		'viewProfile' => '프로필 보기',
+		'moderationTools' => '중재 도구',
+		'report' => '신고',
+		'archive' => '보관',
+		'unarchive' => '보관 해제',
+		'embed' => '임베드',
 
-		'selectOneOption' => 'Select one of the following options',
-		'unlistFromTimelines' => 'Unlist from Timelines',
-		'addCW' => 'Add Content Warning',
-		'removeCW' => 'Remove Content Warning',
-		'markAsSpammer' => 'Mark as Spammer',
-		'markAsSpammerText' => 'Unlist + CW existing and future posts',
+		'selectOneOption' => '다음의 선택사항 중 하나를 고르세요.',
+		'unlistFromTimelines' => '타임라인에서 제외',
+		'addCW' => '내용 경고 붙이기',
+		'removeCW' => '내용 경고 떼기',
+		'markAsSpammer' => '스패머로 표시',
+		'markAsSpammerText' => '현존 및 미래 발행물에 미등재 및 내용 경고',
 		'spam' => '스팸',
 		'sensitive' => '민감한 내용',
-		'abusive' => 'Abusive or Harmful',
-		'underageAccount' => 'Underage Account',
-		'copyrightInfringement' => 'Copyright Infringement',
-		'impersonation' => 'Impersonation',
-		'scamOrFraud' => 'Scam or Fraud',
-		'confirmReport' => 'Confirm Report',
-		'confirmReportText' => 'Are you sure you want to report this post?',
-		'reportSent' => 'Report Sent!',
-		'reportSentText' => 'We have successfully received your report.',
+		'abusive' => '가학 또는 유해',
+		'underageAccount' => '미성년 계정',
+		'copyrightInfringement' => '저작권 위반',
+		'impersonation' => '사칭',
+		'scamOrFraud' => '스팸 또는 사기',
+		'confirmReport' => '신고 확인',
+		'confirmReportText' => '이 게시물을 제보할까요?',
+		'reportSent' => '신고 발송!',
+		'reportSentText' => '제보를 잘 수령하였습니다.',
 		'reportSentError' => 'There was an issue reporting this post.',
 
-		'modAddCWConfirm' => 'Are you sure you want to add a content warning to this post?',
-		'modCWSuccess' => 'Successfully added content warning',
+		'modAddCWConfirm' => '이 게시물이 내용 경고를 붙일까요?',
+		'modCWSuccess' => '내용경고를 붙임',
 		'modRemoveCWConfirm' => 'Are you sure you want to remove the content warning on this post?',
-		'modRemoveCWSuccess' => 'Successfully removed content warning',
+		'modRemoveCWSuccess' => '내용경고를 뗌',
 		'modUnlistConfirm' => 'Are you sure you want to unlist this post?',
-		'modUnlistSuccess' => 'Successfully unlisted post',
-		'modMarkAsSpammerConfirm' => 'Are you sure you want to mark this user as a spammer? All existing and future posts will be unlisted on timelines and a content warning will be applied.',
-		'modMarkAsSpammerSuccess' => 'Successfully marked account as spammer',
+		'modUnlistSuccess' => '발행물 미등재 처리를 마쳤습니다.',
+		'modMarkAsSpammerConfirm' => '해당 이용자를 정말 스패머로 표시할까요?
+내용 경고가 적용되며 이전과 이후의 모든 발행물이 타임라인에 미등재됩니다.',
+		'modMarkAsSpammerSuccess' => '스패머 계정으로 표시함',
 
-		'toFollowers' => 'to Followers',
+		'toFollowers' => '팔로워',
 
-		'showCaption' => 'Show Caption',
-		'showLikes' => 'Show Likes',
-		'compactMode' => 'Compact Mode',
+		'showCaption' => '자막 보이기',
+		'showLikes' => '좋아요 보기',
+		'compactMode' => '콤팩트 모드',
 		'embedConfirmText' => 'By using this embed, you agree to our',
 
 		'deletePostConfirm' => 'Are you sure you want to delete this post?',
-		'archivePostConfirm' => 'Are you sure you want to archive this post?',
-		'unarchivePostConfirm' => 'Are you sure you want to unarchive this post?',
+		'archivePostConfirm' => '이 발행물을 정말 보관할까요?',
+		'unarchivePostConfirm' => '이 발행물을 정말 보관 취소할까요?',
 	],
 
 	'story' => [
-		'add' => 'Add Story'
+		'add' => '이야기 추가'
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'People you may know'
+		'peopleYouMayKnow' => '알 수도 있는 사람',
+
+		'onboarding' => [
+			'welcome' => '반가워요',
+			'thisIsYourHomeFeed' => '이곳은 팔로우 한 게시물을 시간 순으로 보여주는 홈 피드예요.',
+			'letUsHelpYouFind' => 'Let us help you find some interesting people to follow',
+			'refreshFeed' => '내 피드 새로 고침',
+		],
 	],
 
 	'hashtags' => [
 		'emptyFeed' => 'We can\'t seem to find any posts for this hashtag'
 	],
 
+	'report' => [
+		'report' => '신고',
+		'selectReason' => '이유 고르기',
+		'reported' => '신고 마침',
+		'sendingReport' => '신고 보내는 중',
+		'thanksMsg' => 'Thanks for the report, people like you help keep our community safe!',
+		'contactAdminMsg' => 'If you\'d like to contact an administrator about this post or report',
+	],
+
 ];
diff --git a/resources/lang/me/web.php b/resources/lang/me/web.php
new file mode 100644
index 000000000..2c6a7b418
--- /dev/null
+++ b/resources/lang/me/web.php
@@ -0,0 +1,208 @@
+<?php
+
+return [
+
+	'common' => [
+		'comment' => 'Comment',
+		'commented' => 'Commented',
+		'comments' => 'Comments',
+		'like' => 'Like',
+		'liked' => 'Liked',
+		'likes' => 'Likes',
+		'share' => 'Share',
+		'shared' => 'Shared',
+		'shares' => 'Shares',
+		'unshare' => 'Unshare',
+		'bookmark' => 'Bookmark',
+
+		'cancel' => 'Cancel',
+		'copyLink' => 'Copy Link',
+		'delete' => 'Delete',
+		'error' => 'Error',
+		'errorMsg' => 'Something went wrong. Please try again later.',
+		'oops' => 'Oops!',
+		'other' => 'Other',
+		'readMore' => 'Read more',
+		'success' => 'Success',
+		'proceed' => 'Proceed',
+		'next' => 'Next',
+		'close' => 'Close',
+		'clickHere' => 'click here',
+
+		'sensitive' => 'Sensitive',
+		'sensitiveContent' => 'Sensitive Content',
+		'sensitiveContentWarning' => 'This post may contain sensitive content',
+	],
+
+	'site' => [
+		'terms' => 'Terms of Use',
+		'privacy' => 'Privacy Policy',
+	],
+
+	'navmenu' => [
+		'search' => 'Search',
+		'admin' => 'Admin Dashboard',
+
+		// Timelines
+		'homeFeed' => 'Home Feed',
+		'localFeed' => 'Local Feed',
+		'globalFeed' => 'Global Feed',
+
+		// Core features
+		'discover' => 'Discover',
+		'directMessages' => 'Direct Messages',
+		'notifications' => 'Notifications',
+		'groups' => 'Groups',
+		'stories' => 'Stories',
+
+		// Self links
+		'profile' => 'Profile',
+		'drive' => 'Drive',
+		'settings' => 'Settings',
+		'compose' => 'Create New',
+		'logout' => 'Logout',
+
+		// Nav footer
+		'about' => 'About',
+		'help' => 'Help',
+		'language' => 'Language',
+		'privacy' => 'Privacy',
+		'terms' => 'Terms',
+
+		// Temporary links
+		'backToPreviousDesign' => 'Go back to previous design'
+	],
+
+	'directMessages' => [
+		'inbox' => 'Inbox',
+		'sent' => 'Sent',
+		'requests' => 'Requests'
+	],
+
+	'notifications' => [
+		'liked' => 'liked your',
+		'commented' => 'commented on your',
+		'reacted' => 'reacted to your',
+		'shared' => 'shared your',
+		'tagged' => 'tagged you in a',
+
+		'updatedA' => 'updated a',
+		'sentA' => 'sent a',
+
+		'followed' => 'followed',
+		'mentioned' => 'mentioned',
+		'you' => 'you',
+
+		'yourApplication' => 'Your application to join',
+		'applicationApproved' => 'was approved!',
+		'applicationRejected' => 'was rejected. You can re-apply to join in 6 months.',
+
+		'dm' => 'dm',
+		'groupPost' => 'group post',
+		'modlog' => 'modlog',
+		'post' => 'post',
+		'story' => 'story',
+		'noneFound' => 'No notifications found',
+	],
+
+	'post' => [
+		'shareToFollowers' => 'Share to followers',
+		'shareToOther' => 'Share to other',
+		'noLikes' => 'No likes yet',
+		'uploading' => 'Uploading',
+	],
+
+	'profile' => [
+		'posts' => 'Posts',
+		'followers' => 'Followers',
+		'following' => 'Following',
+		'admin' => 'Admin',
+		'collections' => 'Collections',
+		'follow' => 'Follow',
+		'unfollow' => 'Unfollow',
+		'editProfile' => 'Edit Profile',
+		'followRequested' => 'Follow Requested',
+		'joined' => 'Joined',
+
+		'emptyCollections' => 'We can\'t seem to find any collections',
+		'emptyPosts' => 'We can\'t seem to find any posts',
+	],
+
+	'menu' => [
+		'viewPost' => 'View Post',
+		'viewProfile' => 'View Profile',
+		'moderationTools' => 'Moderation Tools',
+		'report' => 'Report',
+		'archive' => 'Archive',
+		'unarchive' => 'Unarchive',
+		'embed' => 'Embed',
+
+		'selectOneOption' => 'Select one of the following options',
+		'unlistFromTimelines' => 'Unlist from Timelines',
+		'addCW' => 'Add Content Warning',
+		'removeCW' => 'Remove Content Warning',
+		'markAsSpammer' => 'Mark as Spammer',
+		'markAsSpammerText' => 'Unlist + CW existing and future posts',
+		'spam' => 'Spam',
+		'sensitive' => 'Sensitive Content',
+		'abusive' => 'Abusive or Harmful',
+		'underageAccount' => 'Underage Account',
+		'copyrightInfringement' => 'Copyright Infringement',
+		'impersonation' => 'Impersonation',
+		'scamOrFraud' => 'Scam or Fraud',
+		'confirmReport' => 'Confirm Report',
+		'confirmReportText' => 'Are you sure you want to report this post?',
+		'reportSent' => 'Report Sent!',
+		'reportSentText' => 'We have successfully received your report.',
+		'reportSentError' => 'There was an issue reporting this post.',
+
+		'modAddCWConfirm' => 'Are you sure you want to add a content warning to this post?',
+		'modCWSuccess' => 'Successfully added content warning',
+		'modRemoveCWConfirm' => 'Are you sure you want to remove the content warning on this post?',
+		'modRemoveCWSuccess' => 'Successfully removed content warning',
+		'modUnlistConfirm' => 'Are you sure you want to unlist this post?',
+		'modUnlistSuccess' => 'Successfully unlisted post',
+		'modMarkAsSpammerConfirm' => 'Are you sure you want to mark this user as a spammer? All existing and future posts will be unlisted on timelines and a content warning will be applied.',
+		'modMarkAsSpammerSuccess' => 'Successfully marked account as spammer',
+
+		'toFollowers' => 'to Followers',
+
+		'showCaption' => 'Show Caption',
+		'showLikes' => 'Show Likes',
+		'compactMode' => 'Compact Mode',
+		'embedConfirmText' => 'By using this embed, you agree to our',
+
+		'deletePostConfirm' => 'Are you sure you want to delete this post?',
+		'archivePostConfirm' => 'Are you sure you want to archive this post?',
+		'unarchivePostConfirm' => 'Are you sure you want to unarchive this post?',
+	],
+
+	'story' => [
+		'add' => 'Add Story'
+	],
+
+	'timeline' => [
+		'peopleYouMayKnow' => 'People you may know',
+
+		'onboarding' => [
+			'welcome' => 'Welcome',
+			'thisIsYourHomeFeed' => 'This is your home feed, a chronological feed of posts from accounts you follow.',
+			'letUsHelpYouFind' => 'Let us help you find some interesting people to follow',
+			'refreshFeed' => 'Refresh my feed',
+		],
+	],
+
+	'hashtags' => [
+		'emptyFeed' => 'We can\'t seem to find any posts for this hashtag'
+	],
+
+	'report' => [
+		'report' => 'Report',
+		'selectReason' => 'Select a reason',
+		'reported' => 'Reported',
+		'sendingReport' => 'Sending report',
+		'thanksMsg' => 'Thanks for the report, people like you help keep our community safe!',
+		'contactAdminMsg' => 'If you\'d like to contact an administrator about this post or report',
+	],
+
+];
diff --git a/resources/lang/mk/web.php b/resources/lang/mk/web.php
index 3844f847a..2c6a7b418 100644
--- a/resources/lang/mk/web.php
+++ b/resources/lang/mk/web.php
@@ -13,6 +13,7 @@ return [
 		'shared' => 'Shared',
 		'shares' => 'Shares',
 		'unshare' => 'Unshare',
+		'bookmark' => 'Bookmark',
 
 		'cancel' => 'Cancel',
 		'copyLink' => 'Copy Link',
@@ -23,6 +24,10 @@ return [
 		'other' => 'Other',
 		'readMore' => 'Read more',
 		'success' => 'Success',
+		'proceed' => 'Proceed',
+		'next' => 'Next',
+		'close' => 'Close',
+		'clickHere' => 'click here',
 
 		'sensitive' => 'Sensitive',
 		'sensitiveContent' => 'Sensitive Content',
@@ -97,6 +102,7 @@ return [
 		'modlog' => 'modlog',
 		'post' => 'post',
 		'story' => 'story',
+		'noneFound' => 'No notifications found',
 	],
 
 	'post' => [
@@ -176,11 +182,27 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'People you may know'
+		'peopleYouMayKnow' => 'People you may know',
+
+		'onboarding' => [
+			'welcome' => 'Welcome',
+			'thisIsYourHomeFeed' => 'This is your home feed, a chronological feed of posts from accounts you follow.',
+			'letUsHelpYouFind' => 'Let us help you find some interesting people to follow',
+			'refreshFeed' => 'Refresh my feed',
+		],
 	],
 
 	'hashtags' => [
 		'emptyFeed' => 'We can\'t seem to find any posts for this hashtag'
 	],
 
+	'report' => [
+		'report' => 'Report',
+		'selectReason' => 'Select a reason',
+		'reported' => 'Reported',
+		'sendingReport' => 'Sending report',
+		'thanksMsg' => 'Thanks for the report, people like you help keep our community safe!',
+		'contactAdminMsg' => 'If you\'d like to contact an administrator about this post or report',
+	],
+
 ];
diff --git a/resources/lang/nl/web.php b/resources/lang/nl/web.php
index cdb48207e..ba0f34205 100644
--- a/resources/lang/nl/web.php
+++ b/resources/lang/nl/web.php
@@ -13,6 +13,7 @@ return [
 		'shared' => 'Gedeeld',
 		'shares' => 'Gedeeld door',
 		'unshare' => 'Niet meer delen',
+		'bookmark' => 'Bladwijzer',
 
 		'cancel' => 'Annuleren',
 		'copyLink' => 'Link kopiëren',
@@ -23,6 +24,10 @@ return [
 		'other' => 'Anders',
 		'readMore' => 'Lees meer',
 		'success' => 'Geslaagd',
+		'proceed' => 'Doorgaan',
+		'next' => 'Volgende',
+		'close' => 'Sluiten',
+		'clickHere' => 'klik hier',
 
 		'sensitive' => 'Gevoelig',
 		'sensitiveContent' => 'Gevoelige inhoud',
@@ -55,7 +60,7 @@ return [
 		'drive' => 'Drive',
 		'settings' => 'Instellingen',
 		'compose' => 'Nieuwe aanmaken',
-		'logout' => 'Logout',
+		'logout' => 'Uitloggen',
 
 		// Nav footer
 		'about' => 'Over',
@@ -97,6 +102,7 @@ return [
 		'modlog' => 'modlogboek',
 		'post' => 'post',
 		'story' => 'verhaal',
+		'noneFound' => 'Geen notificaties gevonden',
 	],
 
 	'post' => [
@@ -118,8 +124,8 @@ return [
 		'followRequested' => 'Volgen verzocht',
 		'joined' => 'Lid geworden',
 
-		'emptyCollections' => 'We can\'t seem to find any collections',
-		'emptyPosts' => 'We can\'t seem to find any posts',
+		'emptyCollections' => 'We kunnen geen collecties vinden',
+		'emptyPosts' => 'We kunnen geen posts vinden',
 	],
 
 	'menu' => [
@@ -176,11 +182,27 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'Mensen die u misschien kent'
+		'peopleYouMayKnow' => 'Mensen die u misschien kent',
+
+		'onboarding' => [
+			'welcome' => 'Welkom',
+			'thisIsYourHomeFeed' => 'Dit is je thuisfeed, een chronologische feed van accounts die je volgt.',
+			'letUsHelpYouFind' => 'Laat ons u helpen interessante mensen te vinden om te volgen',
+			'refreshFeed' => 'Mijn feed vernieuwen',
+		],
 	],
 
 	'hashtags' => [
-		'emptyFeed' => 'We can\'t seem to find any posts for this hashtag'
+		'emptyFeed' => 'We kunnen geen berichten voor deze hashtag vinden'
+	],
+
+	'report' => [
+		'report' => 'Rapporteren',
+		'selectReason' => 'Een reden selecteren',
+		'reported' => 'Gerapporteerd',
+		'sendingReport' => 'Rapport versturen',
+		'thanksMsg' => 'Bedankt voor het rapport, mensen zoals u helpen onze gemeenschap veilig te houden!',
+		'contactAdminMsg' => 'Als u over dit bericht of rapport contact wilt opnemen met een beheerder',
 	],
 
 ];
diff --git a/resources/lang/no/web.php b/resources/lang/no/web.php
index 3844f847a..926e730c0 100644
--- a/resources/lang/no/web.php
+++ b/resources/lang/no/web.php
@@ -3,184 +3,206 @@
 return [
 
 	'common' => [
-		'comment' => 'Comment',
-		'commented' => 'Commented',
-		'comments' => 'Comments',
-		'like' => 'Like',
-		'liked' => 'Liked',
-		'likes' => 'Likes',
-		'share' => 'Share',
-		'shared' => 'Shared',
-		'shares' => 'Shares',
-		'unshare' => 'Unshare',
+		'comment' => 'Kommenter',
+		'commented' => 'Kommenterte',
+		'comments' => 'Kommentarer',
+		'like' => 'Lik',
+		'liked' => 'Likt',
+		'likes' => 'Liker',
+		'share' => 'Del',
+		'shared' => 'Delt',
+		'shares' => 'Delinger',
+		'unshare' => 'Fjern deling',
+		'bookmark' => 'Bookmerk',
 
-		'cancel' => 'Cancel',
-		'copyLink' => 'Copy Link',
-		'delete' => 'Delete',
-		'error' => 'Error',
-		'errorMsg' => 'Something went wrong. Please try again later.',
-		'oops' => 'Oops!',
-		'other' => 'Other',
-		'readMore' => 'Read more',
-		'success' => 'Success',
+		'cancel' => 'Avbryt',
+		'copyLink' => 'Kopier lenke',
+		'delete' => 'Slett',
+		'error' => 'Feil',
+		'errorMsg' => 'Noe gikk galt. Vennligst prøv igjen senere.',
+		'oops' => 'Oi sann!',
+		'other' => 'Annet',
+		'readMore' => 'Les mer',
+		'success' => 'Suksess',
+		'proceed' => 'Fortsett',
+		'next' => 'Neste',
+		'close' => 'Lukk',
+		'clickHere' => 'klikk her',
 
-		'sensitive' => 'Sensitive',
-		'sensitiveContent' => 'Sensitive Content',
-		'sensitiveContentWarning' => 'This post may contain sensitive content',
+		'sensitive' => 'Sensitivt',
+		'sensitiveContent' => 'Sensitivt innhold',
+		'sensitiveContentWarning' => 'Dette innlegget kan inneholde sensitivt innhold',
 	],
 
 	'site' => [
-		'terms' => 'Terms of Use',
-		'privacy' => 'Privacy Policy',
+		'terms' => 'Bruksvilkår',
+		'privacy' => 'Retningslinjer for personvern',
 	],
 
 	'navmenu' => [
-		'search' => 'Search',
-		'admin' => 'Admin Dashboard',
+		'search' => 'Søk',
+		'admin' => 'Administrasjonspanel',
 
 		// Timelines
-		'homeFeed' => 'Home Feed',
-		'localFeed' => 'Local Feed',
-		'globalFeed' => 'Global Feed',
+		'homeFeed' => 'Hjemstrøm',
+		'localFeed' => 'Lokal strøm',
+		'globalFeed' => 'Global strøm',
 
 		// Core features
-		'discover' => 'Discover',
-		'directMessages' => 'Direct Messages',
-		'notifications' => 'Notifications',
-		'groups' => 'Groups',
-		'stories' => 'Stories',
+		'discover' => 'Utforsk',
+		'directMessages' => 'Direktemeldinger',
+		'notifications' => 'Notifikasjoner',
+		'groups' => 'Grupper',
+		'stories' => 'Historier',
 
 		// Self links
-		'profile' => 'Profile',
-		'drive' => 'Drive',
-		'settings' => 'Settings',
-		'compose' => 'Create New',
-		'logout' => 'Logout',
+		'profile' => 'Profil',
+		'drive' => 'Drev',
+		'settings' => 'Innstillinger',
+		'compose' => 'Opprett ny',
+		'logout' => 'Logg ut',
 
 		// Nav footer
-		'about' => 'About',
-		'help' => 'Help',
-		'language' => 'Language',
-		'privacy' => 'Privacy',
-		'terms' => 'Terms',
+		'about' => 'Om',
+		'help' => 'Hjelp',
+		'language' => 'Språk',
+		'privacy' => 'Personvern',
+		'terms' => 'Vilkår',
 
 		// Temporary links
-		'backToPreviousDesign' => 'Go back to previous design'
+		'backToPreviousDesign' => 'Gå tilbake til forrige design'
 	],
 
 	'directMessages' => [
-		'inbox' => 'Inbox',
-		'sent' => 'Sent',
-		'requests' => 'Requests'
+		'inbox' => 'Innboks',
+		'sent' => 'Sendt',
+		'requests' => 'Forespørsler'
 	],
 
 	'notifications' => [
-		'liked' => 'liked your',
-		'commented' => 'commented on your',
-		'reacted' => 'reacted to your',
-		'shared' => 'shared your',
-		'tagged' => 'tagged you in a',
+		'liked' => 'likte din',
+		'commented' => 'kommenterte din',
+		'reacted' => 'reagerte på din',
+		'shared' => 'delte din',
+		'tagged' => 'tagget deg i en',
 
-		'updatedA' => 'updated a',
-		'sentA' => 'sent a',
+		'updatedA' => 'oppdaterte en',
+		'sentA' => 'sendte en',
 
-		'followed' => 'followed',
-		'mentioned' => 'mentioned',
-		'you' => 'you',
+		'followed' => 'fulgte',
+		'mentioned' => 'nevnte',
+		'you' => 'deg',
 
-		'yourApplication' => 'Your application to join',
-		'applicationApproved' => 'was approved!',
-		'applicationRejected' => 'was rejected. You can re-apply to join in 6 months.',
+		'yourApplication' => 'Din deltagelsessøknad',
+		'applicationApproved' => 'ble godkjent!',
+		'applicationRejected' => 'ble avvist. Du san søke på nytt om 6 måneder.',
 
 		'dm' => 'dm',
-		'groupPost' => 'group post',
-		'modlog' => 'modlog',
-		'post' => 'post',
-		'story' => 'story',
+		'groupPost' => 'gruppeinnlegg',
+		'modlog' => 'modlogg',
+		'post' => 'innlegg',
+		'story' => 'historie',
+		'noneFound' => 'Ingen nye varsler',
 	],
 
 	'post' => [
-		'shareToFollowers' => 'Share to followers',
-		'shareToOther' => 'Share to other',
-		'noLikes' => 'No likes yet',
-		'uploading' => 'Uploading',
+		'shareToFollowers' => 'Del med følgere',
+		'shareToOther' => 'Del til andre',
+		'noLikes' => 'Ingen liker ennå',
+		'uploading' => 'Laster opp',
 	],
 
 	'profile' => [
-		'posts' => 'Posts',
-		'followers' => 'Followers',
-		'following' => 'Following',
-		'admin' => 'Admin',
-		'collections' => 'Collections',
-		'follow' => 'Follow',
-		'unfollow' => 'Unfollow',
-		'editProfile' => 'Edit Profile',
-		'followRequested' => 'Follow Requested',
-		'joined' => 'Joined',
+		'posts' => 'Innlegg',
+		'followers' => 'Følgere',
+		'following' => 'Følger',
+		'admin' => 'Administrer',
+		'collections' => 'Samlinger',
+		'follow' => 'Følg',
+		'unfollow' => 'Slutt å følge',
+		'editProfile' => 'Rediger profil',
+		'followRequested' => 'Følgeforespørsler',
+		'joined' => 'Ble med',
 
-		'emptyCollections' => 'We can\'t seem to find any collections',
-		'emptyPosts' => 'We can\'t seem to find any posts',
+		'emptyCollections' => 'Vi kunne ikke finne noen samlinger',
+		'emptyPosts' => 'Vi kunne ikke finne noen innlegg',
 	],
 
 	'menu' => [
-		'viewPost' => 'View Post',
-		'viewProfile' => 'View Profile',
-		'moderationTools' => 'Moderation Tools',
-		'report' => 'Report',
-		'archive' => 'Archive',
-		'unarchive' => 'Unarchive',
-		'embed' => 'Embed',
+		'viewPost' => 'Vis innlegg',
+		'viewProfile' => 'Vis profil',
+		'moderationTools' => 'Modereringsverktøy',
+		'report' => 'Rapporter',
+		'archive' => 'Arkiver',
+		'unarchive' => 'Fjern fra arkiv',
+		'embed' => 'Bygg inn',
 
-		'selectOneOption' => 'Select one of the following options',
-		'unlistFromTimelines' => 'Unlist from Timelines',
-		'addCW' => 'Add Content Warning',
-		'removeCW' => 'Remove Content Warning',
-		'markAsSpammer' => 'Mark as Spammer',
-		'markAsSpammerText' => 'Unlist + CW existing and future posts',
+		'selectOneOption' => 'Velg ett av følgende alternativer',
+		'unlistFromTimelines' => 'Fjern fra tidslinjer',
+		'addCW' => 'Legg til innholdsvarsel',
+		'removeCW' => 'Fjern innholdsvarsel',
+		'markAsSpammer' => 'Marker som spammer',
+		'markAsSpammerText' => 'Avlisting + innholdsvarsel på eksisterende og fremtidige innlegg',
 		'spam' => 'Spam',
-		'sensitive' => 'Sensitive Content',
-		'abusive' => 'Abusive or Harmful',
-		'underageAccount' => 'Underage Account',
-		'copyrightInfringement' => 'Copyright Infringement',
-		'impersonation' => 'Impersonation',
-		'scamOrFraud' => 'Scam or Fraud',
-		'confirmReport' => 'Confirm Report',
-		'confirmReportText' => 'Are you sure you want to report this post?',
-		'reportSent' => 'Report Sent!',
-		'reportSentText' => 'We have successfully received your report.',
-		'reportSentError' => 'There was an issue reporting this post.',
+		'sensitive' => 'Sensitivt innhold',
+		'abusive' => 'Krenkende eller skadelig',
+		'underageAccount' => 'Mindreårig konto',
+		'copyrightInfringement' => 'Brudd på opphavsrett',
+		'impersonation' => 'Imitering',
+		'scamOrFraud' => 'Søppelpost eller svindel',
+		'confirmReport' => 'Bekreft rapport',
+		'confirmReportText' => 'Er du sikker på at du vil rapportere dette innlegget?',
+		'reportSent' => 'Rapporten er sendt!',
+		'reportSentText' => 'Vi har mottatt din rapport.',
+		'reportSentError' => 'Der var et problem med å rapportere dette innlegget.',
 
-		'modAddCWConfirm' => 'Are you sure you want to add a content warning to this post?',
-		'modCWSuccess' => 'Successfully added content warning',
-		'modRemoveCWConfirm' => 'Are you sure you want to remove the content warning on this post?',
-		'modRemoveCWSuccess' => 'Successfully removed content warning',
-		'modUnlistConfirm' => 'Are you sure you want to unlist this post?',
-		'modUnlistSuccess' => 'Successfully unlisted post',
-		'modMarkAsSpammerConfirm' => 'Are you sure you want to mark this user as a spammer? All existing and future posts will be unlisted on timelines and a content warning will be applied.',
-		'modMarkAsSpammerSuccess' => 'Successfully marked account as spammer',
+		'modAddCWConfirm' => 'Er du sikker på at du vil legge til et innholdsvarsel på dette innlegget?',
+		'modCWSuccess' => 'Innholdsvarsel ble lagt til',
+		'modRemoveCWConfirm' => 'Er du sikker på at du vil fjerne innholdsvarselet for dette innlegget?',
+		'modRemoveCWSuccess' => 'Innholdsvarsel ble fjernet',
+		'modUnlistConfirm' => 'Er du sikker på at du vil avliste dette innlegget?',
+		'modUnlistSuccess' => 'Avlistet innlegget',
+		'modMarkAsSpammerConfirm' => 'Er du sikker på at du vil markere denne brukeren som en spammer? Alle eksisterende og fremtidige innlegg vil bli avlistet på tidslinjer og et innholdsvarsel vil bli lagt til.',
+		'modMarkAsSpammerSuccess' => 'Vellykket markering av konto som spammer',
 
-		'toFollowers' => 'to Followers',
+		'toFollowers' => 'til følgere',
 
-		'showCaption' => 'Show Caption',
-		'showLikes' => 'Show Likes',
-		'compactMode' => 'Compact Mode',
-		'embedConfirmText' => 'By using this embed, you agree to our',
+		'showCaption' => 'Vis bildetekst',
+		'showLikes' => 'Vis liker',
+		'compactMode' => 'Kompaktmodus',
+		'embedConfirmText' => 'Ved å bruke denne innbakingen, godtar du vår',
 
-		'deletePostConfirm' => 'Are you sure you want to delete this post?',
-		'archivePostConfirm' => 'Are you sure you want to archive this post?',
-		'unarchivePostConfirm' => 'Are you sure you want to unarchive this post?',
+		'deletePostConfirm' => 'Er du sikker på at du vil slette dette innlegget?',
+		'archivePostConfirm' => 'Er du sikker på at du vil arkiveren dette innlegget?',
+		'unarchivePostConfirm' => 'Er du sikker på at vil hente dette innlegget tilbake fra arkivet?',
 	],
 
 	'story' => [
-		'add' => 'Add Story'
+		'add' => 'Legg til historie'
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'People you may know'
+		'peopleYouMayKnow' => 'Folk du kanskje kjenner',
+
+		'onboarding' => [
+			'welcome' => 'Velkommen',
+			'thisIsYourHomeFeed' => 'Dette er din hjemstrøm, en kronologisk strøm av innlegg fra konti du følger.',
+			'letUsHelpYouFind' => 'La oss hjelpe deg å finne noen interessante folk å følge',
+			'refreshFeed' => 'Oppdater strømmen min',
+		],
 	],
 
 	'hashtags' => [
-		'emptyFeed' => 'We can\'t seem to find any posts for this hashtag'
+		'emptyFeed' => 'Vi kunne ikke finne noen innlegg for denne emneknaggen'
+	],
+
+	'report' => [
+		'report' => 'Rapporter',
+		'selectReason' => 'Velg en årsak',
+		'reported' => 'Rapportert',
+		'sendingReport' => 'Sender rapport',
+		'thanksMsg' => 'Takk for at du rapporte, folk som deg hjelper med å holde fellesskapet trygt!',
+		'contactAdminMsg' => 'Om du ønsker å kontakte en administrator for dette innlegget eller denne rapporten',
 	],
 
 ];
diff --git a/resources/lang/oc/web.php b/resources/lang/oc/web.php
index 68f0d6cb7..4256f7d7f 100644
--- a/resources/lang/oc/web.php
+++ b/resources/lang/oc/web.php
@@ -4,73 +4,78 @@ return [
 
 	'common' => [
 		'comment' => 'Comentar',
-		'commented' => 'Commented',
-		'comments' => 'Comments',
-		'like' => 'Like',
-		'liked' => 'Liked',
-		'likes' => 'Likes',
-		'share' => 'Share',
-		'shared' => 'Shared',
-		'shares' => 'Shares',
-		'unshare' => 'Unshare',
+		'commented' => 'Comentat',
+		'comments' => 'Comentaris',
+		'like' => 'Agradar',
+		'liked' => 'Agradat',
+		'likes' => 'Aquò m\'agrada',
+		'share' => 'Partejar',
+		'shared' => 'Partejat',
+		'shares' => 'Partages',
+		'unshare' => 'Partejar pas mai',
+		'bookmark' => 'Marcapaginas',
 
 		'cancel' => 'Anullar',
-		'copyLink' => 'Copy Link',
-		'delete' => 'Delete',
+		'copyLink' => 'Copiar lo ligam',
+		'delete' => 'Suprimir',
 		'error' => 'Error',
-		'errorMsg' => 'Something went wrong. Please try again later.',
-		'oops' => 'Oops!',
-		'other' => 'Other',
-		'readMore' => 'Read more',
-		'success' => 'Success',
+		'errorMsg' => 'Una error es subrevenguda. Volgatz tornar ensajar mai tard.',
+		'oops' => 'Ops!',
+		'other' => 'Autre',
+		'readMore' => 'Ne legir mai',
+		'success' => 'Capitada',
+		'proceed' => 'Contunhar',
+		'next' => 'Seguent',
+		'close' => 'Tampar',
+		'clickHere' => 'clicatz aicí',
 
-		'sensitive' => 'Sensitive',
-		'sensitiveContent' => 'Sensitive Content',
-		'sensitiveContentWarning' => 'This post may contain sensitive content',
+		'sensitive' => 'Sensible',
+		'sensitiveContent' => 'Contengut sensible',
+		'sensitiveContentWarning' => 'Lo contengut d\'aquela publicacion poiriá èsser sensibla',
 	],
 
 	'site' => [
-		'terms' => 'Terms of Use',
-		'privacy' => 'Privacy Policy',
+		'terms' => 'Condicions d\'utilizacion',
+		'privacy' => 'Politica de confidencialitat',
 	],
 
 	'navmenu' => [
-		'search' => 'Search',
-		'admin' => 'Admin Dashboard',
+		'search' => 'Cercar',
+		'admin' => 'Tablèu de mandas d\'administracion',
 
 		// Timelines
-		'homeFeed' => 'Home Feed',
-		'localFeed' => 'Local Feed',
+		'homeFeed' => 'Flux principal',
+		'localFeed' => 'Flux local',
 		'globalFeed' => 'Global Feed',
 
 		// Core features
-		'discover' => 'Discover',
+		'discover' => 'Descobrir',
 		'directMessages' => 'Direct Messages',
 		'notifications' => 'Notifications',
-		'groups' => 'Groups',
-		'stories' => 'Stories',
+		'groups' => 'Grops',
+		'stories' => 'Contes',
 
 		// Self links
-		'profile' => 'Profile',
+		'profile' => 'Perfil',
 		'drive' => 'Drive',
-		'settings' => 'Settings',
-		'compose' => 'Create New',
-		'logout' => 'Logout',
+		'settings' => 'Paramètres',
+		'compose' => 'Ajustar una novèla',
+		'logout' => '',
 
 		// Nav footer
-		'about' => 'About',
-		'help' => 'Help',
-		'language' => 'Language',
-		'privacy' => 'Privacy',
-		'terms' => 'Terms',
+		'about' => 'A prepaus',
+		'help' => 'Ajuda',
+		'language' => 'Lenga',
+		'privacy' => 'Confidencialitat',
+		'terms' => 'Condicions d’utilizacion',
 
 		// Temporary links
 		'backToPreviousDesign' => 'Go back to previous design'
 	],
 
 	'directMessages' => [
-		'inbox' => 'Inbox',
-		'sent' => 'Sent',
+		'inbox' => 'Dintrant',
+		'sent' => 'Mandats',
 		'requests' => 'Requests'
 	],
 
@@ -81,22 +86,23 @@ return [
 		'shared' => 'shared your',
 		'tagged' => 'tagged you in a',
 
-		'updatedA' => 'updated a',
-		'sentA' => 'sent a',
+		'updatedA' => 'actualizat un',
+		'sentA' => 'a enviat un',
 
-		'followed' => 'followed',
-		'mentioned' => 'mentioned',
-		'you' => 'you',
+		'followed' => 's\'es abonat a',
+		'mentioned' => 'a mencionat',
+		'you' => 'vos',
 
-		'yourApplication' => 'Your application to join',
-		'applicationApproved' => 'was approved!',
-		'applicationRejected' => 'was rejected. You can re-apply to join in 6 months.',
+		'yourApplication' => 'Vòstra candidatura a rejónher',
+		'applicationApproved' => 'es estada aprovada!',
+		'applicationRejected' => 'es estada regetada.',
 
-		'dm' => 'dm',
+		'dm' => 'messatge privat',
 		'groupPost' => 'group post',
 		'modlog' => 'modlog',
 		'post' => 'post',
 		'story' => 'story',
+		'noneFound' => 'No notifications found',
 	],
 
 	'post' => [
@@ -134,7 +140,7 @@ return [
 		'selectOneOption' => 'Select one of the following options',
 		'unlistFromTimelines' => 'Unlist from Timelines',
 		'addCW' => 'Add Content Warning',
-		'removeCW' => 'Remove Content Warning',
+		'removeCW' => 'Lo tèxte es rescondut jos l’avertiment',
 		'markAsSpammer' => 'Mark as Spammer',
 		'markAsSpammerText' => 'Unlist + CW existing and future posts',
 		'spam' => 'Spam',
@@ -176,11 +182,27 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'Personas que coneissètz benlèu'
+		'peopleYouMayKnow' => 'Personas que coneissètz benlèu',
+
+		'onboarding' => [
+			'welcome' => 'Benvengut',
+			'thisIsYourHomeFeed' => 'This is your home feed, a chronological feed of posts from accounts you follow.',
+			'letUsHelpYouFind' => 'Let us help you find some interesting people to follow',
+			'refreshFeed' => 'Refresh my feed',
+		],
 	],
 
 	'hashtags' => [
 		'emptyFeed' => 'We can\'t seem to find any posts for this hashtag'
 	],
 
+	'report' => [
+		'report' => 'Report',
+		'selectReason' => 'Select a reason',
+		'reported' => 'Reported',
+		'sendingReport' => 'Sending report',
+		'thanksMsg' => 'Thanks for the report, people like you help keep our community safe!',
+		'contactAdminMsg' => 'If you\'d like to contact an administrator about this post or report',
+	],
+
 ];
diff --git a/resources/lang/pl/web.php b/resources/lang/pl/web.php
index 0d4a914b2..300759103 100644
--- a/resources/lang/pl/web.php
+++ b/resources/lang/pl/web.php
@@ -13,6 +13,7 @@ return [
 		'shared' => 'Udostępnione',
 		'shares' => 'Udostępnione',
 		'unshare' => 'Anuluj udostępnianie',
+		'bookmark' => 'Zakładka',
 
 		'cancel' => 'Anuluj',
 		'copyLink' => 'Kopiuj Link',
@@ -23,6 +24,10 @@ return [
 		'other' => 'Inne',
 		'readMore' => 'Czytaj więcej',
 		'success' => 'Sukces',
+		'proceed' => 'Kontynuuj',
+		'next' => 'Następny',
+		'close' => 'Zamknij',
+		'clickHere' => 'kliknij tutaj',
 
 		'sensitive' => 'Wrażliwe',
 		'sensitiveContent' => 'Treść wrażliwa',
@@ -55,7 +60,7 @@ return [
 		'drive' => 'Dysk',
 		'settings' => 'Ustawienia',
 		'compose' => 'Utwórz nowy',
-		'logout' => 'Logout',
+		'logout' => 'Wyloguj się',
 
 		// Nav footer
 		'about' => 'O nas',
@@ -97,6 +102,7 @@ return [
 		'modlog' => 'logi',
 		'post' => 'post',
 		'story' => 'opowieść',
+		'noneFound' => 'Brak powiadomień',
 	],
 
 	'post' => [
@@ -176,11 +182,27 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'Ludzie, których możesz znać'
+		'peopleYouMayKnow' => 'Ludzie, których możesz znać',
+
+		'onboarding' => [
+			'welcome' => 'Witaj',
+			'thisIsYourHomeFeed' => 'To jest Twój kanał główny, chronologiczny kanał wpisów z kont, które śledzisz.',
+			'letUsHelpYouFind' => 'Pomożemy Ci znaleźć ciekawych ludzi do obserwowania',
+			'refreshFeed' => 'Odśwież mój kanał',
+		],
 	],
 
 	'hashtags' => [
 		'emptyFeed' => 'Nie możemy znaleźć żadnych postów dla tego hasztaga'
 	],
 
+	'report' => [
+		'report' => 'Zgłoś',
+		'selectReason' => 'Wybierz przyczynę',
+		'reported' => 'Zgłoszono',
+		'sendingReport' => 'Wysyłanie zgłoszenia',
+		'thanksMsg' => 'Dziękujemy za zgłoszenie, ludzie tacy jak ty pomagają chronić naszą społeczność!',
+		'contactAdminMsg' => 'Jeśli chcesz skontaktować się z administratorem w sprawie tego wpisu lub go zgłosić',
+	],
+
 ];
diff --git a/resources/lang/pt/web.php b/resources/lang/pt/web.php
index 67e7bd45f..bd8f275ef 100644
--- a/resources/lang/pt/web.php
+++ b/resources/lang/pt/web.php
@@ -6,27 +6,32 @@ return [
 		'comment' => 'Comentar',
 		'commented' => 'Comentado',
 		'comments' => 'Comentários',
-		'like' => 'Curtir',
-		'liked' => 'Curtiu',
-		'likes' => 'Curtidas',
-		'share' => 'Compartilhar',
-		'shared' => 'Compartilhado',
-		'shares' => 'Compartilhamentos',
-		'unshare' => 'Desfazer compartilhamento',
+		'like' => 'Gosto',
+		'liked' => 'Gostei',
+		'likes' => 'Gostos',
+		'share' => 'Partilhar',
+		'shared' => 'Partilhado',
+		'shares' => 'Partilhas',
+		'unshare' => 'Despartilhar',
+		'bookmark' => 'Favorito',
 
 		'cancel' => 'Cancelar',
 		'copyLink' => 'Copiar link',
-		'delete' => 'Apagar',
+		'delete' => 'Eliminar',
 		'error' => 'Erro',
-		'errorMsg' => 'Algo deu errado. Por favor, tente novamente mais tarde.',
-		'oops' => 'Opa!',
+		'errorMsg' => 'Algo correu mal. Por favor, tente novamente mais tarde.',
+		'oops' => 'Oops!',
 		'other' => 'Outro',
-		'readMore' => 'Leia mais',
+		'readMore' => 'Ler mais',
 		'success' => 'Sucesso',
+		'proceed' => 'Continuar',
+		'next' => 'Seguinte',
+		'close' => 'Fechar',
+		'clickHere' => 'clique aqui',
 
 		'sensitive' => 'Sensível',
 		'sensitiveContent' => 'Conteúdo sensível',
-		'sensitiveContentWarning' => 'Esta publicação pode conter conteúdo inapropriado',
+		'sensitiveContentWarning' => 'Este post pode conter conteúdo sensível',
 	],
 
 	'site' => [
@@ -35,27 +40,27 @@ return [
 	],
 
 	'navmenu' => [
-		'search' => 'Pesquisar',
-		'admin' => 'Painel do Administrador',
+		'search' => 'Pesquisa',
+		'admin' => 'Painel de Administração',
 
 		// Timelines
-		'homeFeed' => 'Página inicial',
+		'homeFeed' => 'Inicio',
 		'localFeed' => 'Feed local',
 		'globalFeed' => 'Feed global',
 
 		// Core features
-		'discover' => 'Explorar',
-		'directMessages' => 'Mensagens privadas',
+		'discover' => 'Descobrir',
+		'directMessages' => 'Mensagens Diretas',
 		'notifications' => 'Notificações',
 		'groups' => 'Grupos',
-		'stories' => 'Histórias',
+		'stories' => 'Stories',
 
 		// Self links
 		'profile' => 'Perfil',
-		'drive' => 'Mídias',
-		'settings' => 'Configurações',
+		'drive' => 'Disco',
+		'settings' => 'Definições',
 		'compose' => 'Criar novo',
-		'logout' => 'Sair',
+		'logout' => 'Terminar Sessão',
 
 		// Nav footer
 		'about' => 'Sobre',
@@ -65,122 +70,139 @@ return [
 		'terms' => 'Termos',
 
 		// Temporary links
-		'backToPreviousDesign' => 'Voltar ao design anterior'
+		'backToPreviousDesign' => 'Voltar ao design antigo'
 	],
 
 	'directMessages' => [
-		'inbox' => 'Caixa de entrada',
+		'inbox' => 'Caixa de Entrada',
 		'sent' => 'Enviadas',
-		'requests' => 'Solicitações'
+		'requests' => 'Pedidos'
 	],
 
 	'notifications' => [
-		'liked' => 'curtiu seu',
-		'commented' => 'comentou em seu',
+		'liked' => 'gostou do seu',
+		'commented' => 'comentou no seu',
 		'reacted' => 'reagiu ao seu',
-		'shared' => 'compartilhou seu',
-		'tagged' => 'marcou você em um',
+		'shared' => 'Partilhou o seu',
+		'tagged' => 'marcou você numa publicação',
 
-		'updatedA' => 'atualizou um(a)',
+		'updatedA' => 'atualizou',
 		'sentA' => 'enviou um',
 
 		'followed' => 'seguiu',
-		'mentioned' => 'mencionado',
+		'mentioned' => 'mencionou',
 		'you' => 'você',
 
-		'yourApplication' => 'Sua inscrição para participar',
+		'yourApplication' => 'A sua candidatura para se juntar',
 		'applicationApproved' => 'foi aprovado!',
-		'applicationRejected' => 'foi rejeitado. Você pode se inscrever novamente para participar em 6 meses.',
+		'applicationRejected' => 'foi rejeitado. Você pode inscrever-se novamente em 6 meses.',
 
-		'dm' => 'mensagem direta',
-		'groupPost' => 'postagem do grupo',
+		'dm' => 'dm',
+		'groupPost' => 'publicação de grupo',
 		'modlog' => 'histórico de moderação',
 		'post' => 'publicação',
-		'story' => 'história',
+		'story' => 'story',
+		'noneFound' => 'Nenhuma notificação encontrada',
 	],
 
 	'post' => [
-		'shareToFollowers' => 'Compartilhar com os seguidores',
-		'shareToOther' => 'Compartilhar com outros',
-		'noLikes' => 'Ainda sem curtidas',
-		'uploading' => 'Enviando',
+		'shareToFollowers' => 'Partilhar com os seguidores',
+		'shareToOther' => 'Partilhar com outros',
+		'noLikes' => 'Ainda sem gostos',
+		'uploading' => 'A enviar',
 	],
 
 	'profile' => [
 		'posts' => 'Publicações',
 		'followers' => 'Seguidores',
-		'following' => 'Seguindo',
-		'admin' => 'Administrador',
+		'following' => 'A seguir',
+		'admin' => 'Admin',
 		'collections' => 'Coleções',
 		'follow' => 'Seguir',
 		'unfollow' => 'Deixar de seguir',
 		'editProfile' => 'Editar Perfil',
-		'followRequested' => 'Solicitação de seguir enviada',
-		'joined' => 'Entrou',
+		'followRequested' => 'Pedido para seguir enviado',
+		'joined' => 'Juntou-se',
 
 		'emptyCollections' => 'Não conseguimos encontrar nenhuma coleção',
-		'emptyPosts' => 'Não encontramos nenhuma publicação',
+		'emptyPosts' => 'Não conseguimos encontrar nenhuma publicação',
 	],
 
 	'menu' => [
 		'viewPost' => 'Ver publicação',
-		'viewProfile' => 'Ver Perfil',
+		'viewProfile' => 'Ver perfil',
 		'moderationTools' => 'Ferramentas de moderação',
 		'report' => 'Denunciar',
-		'archive' => 'Arquivo',
-		'unarchive' => 'Desarquivar',
+		'archive' => 'Arquivar',
+		'unarchive' => 'Retirar do arquivo',
 		'embed' => 'Incorporar',
 
-		'selectOneOption' => 'Selecione uma das opções a seguir',
-		'unlistFromTimelines' => 'Retirar das linhas do tempo',
+		'selectOneOption' => 'Selecione uma das seguintes opções',
+		'unlistFromTimelines' => 'Remover das cronologias',
 		'addCW' => 'Adicionar aviso de conteúdo',
 		'removeCW' => 'Remover aviso de conteúdo',
-		'markAsSpammer' => 'Marcar como Spammer',
-		'markAsSpammerText' => 'Retirar das linhas do tempo + adicionar aviso de conteúdo às publicações antigas e futuras',
-		'spam' => 'Lixo Eletrônico',
-		'sensitive' => 'Conteúdo sensível',
-		'abusive' => 'Abusivo ou Prejudicial',
+		'markAsSpammer' => 'Marcar como spammer',
+		'markAsSpammerText' => 'Remover das cronologias e adicionar um aviso de conteúdo às publicações existentes e futuras',
+		'spam' => 'Spam',
+		'sensitive' => 'Conteúdo Sensível',
+		'abusive' => 'Abusivo ou prejudicial',
 		'underageAccount' => 'Conta de menor de idade',
-		'copyrightInfringement' => 'Violação de direitos autorais',
-		'impersonation' => 'Roubo de identidade',
-		'scamOrFraud' => 'Golpe ou Fraude',
+		'copyrightInfringement' => 'Violação de direitos de autor',
+		'impersonation' => 'Roubo de Identidade',
+		'scamOrFraud' => 'Esquema ou fraude',
 		'confirmReport' => 'Confirmar denúncia',
-		'confirmReportText' => 'Você realmente quer denunciar esta publicação?',
+		'confirmReportText' => 'Tem a certeza que deseja denunciar esta mensagem?',
 		'reportSent' => 'Denúncia enviada!',
-		'reportSentText' => 'Nós recebemos sua denúncia com sucesso.',
-		'reportSentError' => 'Houve um problema ao denunciar esta publicação.',
+		'reportSentText' => 'Recebemos com sucesso a sua denúncia.',
+		'reportSentError' => 'Ocorreu um erro ao denunciar este conteúdo.',
 
-		'modAddCWConfirm' => 'Você realmente quer adicionar um aviso de conteúdo a esta publicação?',
-		'modCWSuccess' => 'Aviso de conteúdo sensível adicionado com sucesso',
-		'modRemoveCWConfirm' => 'Você realmente quer remover o aviso de conteúdo desta publicação?',
-		'modRemoveCWSuccess' => 'Aviso de conteúdo sensível removido com sucesso',
-		'modUnlistConfirm' => 'Você realmente quer definir esta publicação como não listada?',
-		'modUnlistSuccess' => 'A publicação foi definida como não listada com sucesso',
-		'modMarkAsSpammerConfirm' => 'Você realmente quer denunciar este usuário por spam? Todas as suas publicações anteriores e futuras serão marcadas com um aviso de conteúdo e removidas das linhas do tempo.',
-		'modMarkAsSpammerSuccess' => 'Perfil denunciado com sucesso',
+		'modAddCWConfirm' => 'Tem a certeza que pretende adicionar um aviso de conteúdo à publicação?',
+		'modCWSuccess' => 'Adicionou com sucesso um aviso de conteúdo',
+		'modRemoveCWConfirm' => 'Tem a certeza que pretende remover o aviso de conteúdo desta publicação?',
+		'modRemoveCWSuccess' => 'Removeu com sucesso o aviso de conteúdo',
+		'modUnlistConfirm' => 'Tem a certeza que pretende deslistar este post?',
+		'modUnlistSuccess' => 'Deslistou com sucesso este post',
+		'modMarkAsSpammerConfirm' => 'Tem a certeza que deseja marcar este utilizador como spammer? Todos os posts existentes e futuros serão deslistados da timeline e o alerta de conteúdo será aplicado.',
+		'modMarkAsSpammerSuccess' => 'Marcou com sucesso esta conta como spammer',
 
-		'toFollowers' => 'para seguidores',
+		'toFollowers' => 'para Seguidores',
 
-		'showCaption' => 'Mostrar legenda',
-		'showLikes' => 'Mostrar curtidas',
+		'showCaption' => 'Mostar legenda',
+		'showLikes' => 'Mostrar Gostos',
 		'compactMode' => 'Modo compacto',
-		'embedConfirmText' => 'Ao usar de forma “embed”, você concorda com nossas',
+		'embedConfirmText' => 'Ao utilizar este conteúdo, aceita os nossos',
 
-		'deletePostConfirm' => 'Você tem certeza que deseja excluir esta publicação?',
-		'archivePostConfirm' => 'Tem certeza que deseja arquivar esta publicação?',
-		'unarchivePostConfirm' => 'Tem certeza que deseja desarquivar esta publicação?',
+		'deletePostConfirm' => 'Tem a certeza que pretende apagar esta publicação?',
+		'archivePostConfirm' => 'Tem a certeza que pretende arquivar esta publicação?',
+		'unarchivePostConfirm' => 'Tem a certeza que pretende desarquivar este post?',
 	],
 
 	'story' => [
-		'add' => 'Adicionar Story'
+		'add' => 'Adicionar Storie'
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'Pessoas que você talvez conheça'
+		'peopleYouMayKnow' => 'Pessoas que talvez conheça',
+
+		'onboarding' => [
+			'welcome' => 'Bem-vindo',
+			'thisIsYourHomeFeed' => 'Este é o seu feed pessoal, com publicações em ordem cronológica das contas que segue.',
+			'letUsHelpYouFind' => 'Deixe-nos ajudar a encontrar algumas pessoas interessantes para seguir',
+			'refreshFeed' => 'Atualizar o meu feed',
+		],
 	],
 
 	'hashtags' => [
-		'emptyFeed' => 'Não encontramos nenhuma publicação com esta hashtag'
+		'emptyFeed' => 'Não conseguimos encontrar publicações com essa hashtag'
+	],
+
+	'report' => [
+		'report' => 'Denunciar',
+		'selectReason' => 'Selecione uma razão',
+		'reported' => 'Denunciado',
+		'sendingReport' => 'A enviar denúncia',
+		'thanksMsg' => 'Obrigado pela denúncia, pessoas como você ajudam a manter a nossa comunidade segura!',
+		'contactAdminMsg' => 'Se quiser entrar em contato com um administrador acerca desta publicação ou denúncia',
 	],
 
 ];
diff --git a/resources/lang/ro/web.php b/resources/lang/ro/web.php
index 3844f847a..92e54c5ca 100644
--- a/resources/lang/ro/web.php
+++ b/resources/lang/ro/web.php
@@ -3,184 +3,206 @@
 return [
 
 	'common' => [
-		'comment' => 'Comment',
-		'commented' => 'Commented',
-		'comments' => 'Comments',
-		'like' => 'Like',
-		'liked' => 'Liked',
-		'likes' => 'Likes',
-		'share' => 'Share',
-		'shared' => 'Shared',
-		'shares' => 'Shares',
-		'unshare' => 'Unshare',
+		'comment' => 'Comentariu',
+		'commented' => 'Comentariu',
+		'comments' => 'Comentarii',
+		'like' => 'Îmi place',
+		'liked' => 'Apreciate',
+		'likes' => 'Aprecieri',
+		'share' => 'Partajează',
+		'shared' => 'Partajat',
+		'shares' => 'Partajează',
+		'unshare' => 'Anularea partajării',
+		'bookmark' => 'Bookmark',
 
-		'cancel' => 'Cancel',
-		'copyLink' => 'Copy Link',
-		'delete' => 'Delete',
-		'error' => 'Error',
-		'errorMsg' => 'Something went wrong. Please try again later.',
-		'oops' => 'Oops!',
-		'other' => 'Other',
-		'readMore' => 'Read more',
-		'success' => 'Success',
+		'cancel' => 'Anulează',
+		'copyLink' => 'Copiere legătură',
+		'delete' => 'Șterge',
+		'error' => 'Eroare',
+		'errorMsg' => 'A apărut o problemă. Te rugăm să încerci din nou mai târziu.',
+		'oops' => 'Ups!',
+		'other' => 'Altele',
+		'readMore' => 'Citește mai mult',
+		'success' => 'Succes',
+		'proceed' => 'Proceed',
+		'next' => 'Next',
+		'close' => 'Close',
+		'clickHere' => 'click here',
 
-		'sensitive' => 'Sensitive',
-		'sensitiveContent' => 'Sensitive Content',
-		'sensitiveContentWarning' => 'This post may contain sensitive content',
+		'sensitive' => 'Sensibil',
+		'sensitiveContent' => 'Conținut sensibil',
+		'sensitiveContentWarning' => 'Această postare poate conține conținut sensibil',
 	],
 
 	'site' => [
-		'terms' => 'Terms of Use',
-		'privacy' => 'Privacy Policy',
+		'terms' => 'Condiții de utilizare',
+		'privacy' => 'Politica de confidenţialitate',
 	],
 
 	'navmenu' => [
-		'search' => 'Search',
-		'admin' => 'Admin Dashboard',
+		'search' => 'Caută',
+		'admin' => 'Panou de administrare',
 
 		// Timelines
-		'homeFeed' => 'Home Feed',
-		'localFeed' => 'Local Feed',
-		'globalFeed' => 'Global Feed',
+		'homeFeed' => 'Flux Acasă',
+		'localFeed' => 'Flux local',
+		'globalFeed' => 'Flux Global',
 
 		// Core features
-		'discover' => 'Discover',
-		'directMessages' => 'Direct Messages',
-		'notifications' => 'Notifications',
-		'groups' => 'Groups',
-		'stories' => 'Stories',
+		'discover' => 'Descoperă',
+		'directMessages' => 'Mesaje directe',
+		'notifications' => 'Notificări',
+		'groups' => 'Grupuri',
+		'stories' => 'Poveşti',
 
 		// Self links
-		'profile' => 'Profile',
-		'drive' => 'Drive',
-		'settings' => 'Settings',
-		'compose' => 'Create New',
-		'logout' => 'Logout',
+		'profile' => 'Profil',
+		'drive' => 'Unitate',
+		'settings' => 'Setări',
+		'compose' => 'Crează nou',
+		'logout' => 'Deconectare',
 
 		// Nav footer
-		'about' => 'About',
-		'help' => 'Help',
-		'language' => 'Language',
-		'privacy' => 'Privacy',
-		'terms' => 'Terms',
+		'about' => 'Despre',
+		'help' => 'Ajutor',
+		'language' => 'Limbă',
+		'privacy' => 'Confidențialitate',
+		'terms' => 'Termeni',
 
 		// Temporary links
-		'backToPreviousDesign' => 'Go back to previous design'
+		'backToPreviousDesign' => 'Înapoi la design-ul anterior'
 	],
 
 	'directMessages' => [
-		'inbox' => 'Inbox',
-		'sent' => 'Sent',
-		'requests' => 'Requests'
+		'inbox' => 'Mesaje',
+		'sent' => 'Trimis',
+		'requests' => 'Cereri'
 	],
 
 	'notifications' => [
-		'liked' => 'liked your',
-		'commented' => 'commented on your',
-		'reacted' => 'reacted to your',
-		'shared' => 'shared your',
-		'tagged' => 'tagged you in a',
+		'liked' => 'ți-a plăcut',
+		'commented' => 'a comentat la',
+		'reacted' => 'a reacționat la',
+		'shared' => 'ți-a distribuit',
+		'tagged' => 'te-a etichetat într-un',
 
-		'updatedA' => 'updated a',
-		'sentA' => 'sent a',
+		'updatedA' => 'a actualizat o',
+		'sentA' => 'a trimis o',
 
-		'followed' => 'followed',
-		'mentioned' => 'mentioned',
-		'you' => 'you',
+		'followed' => 'urmărit',
+		'mentioned' => 'menționat',
+		'you' => 'tu',
 
-		'yourApplication' => 'Your application to join',
-		'applicationApproved' => 'was approved!',
-		'applicationRejected' => 'was rejected. You can re-apply to join in 6 months.',
+		'yourApplication' => 'Cererea ta de a te alătura',
+		'applicationApproved' => 'a fost aprobată!',
+		'applicationRejected' => 'a fost respins. Puteţi aplica din nou pentru a vă alătura în 6 luni.',
 
 		'dm' => 'dm',
-		'groupPost' => 'group post',
+		'groupPost' => 'postare grup',
 		'modlog' => 'modlog',
-		'post' => 'post',
-		'story' => 'story',
+		'post' => 'postare',
+		'story' => 'poveste',
+		'noneFound' => 'No notifications found',
 	],
 
 	'post' => [
-		'shareToFollowers' => 'Share to followers',
-		'shareToOther' => 'Share to other',
-		'noLikes' => 'No likes yet',
-		'uploading' => 'Uploading',
+		'shareToFollowers' => 'Distribuie către urmăritori',
+		'shareToOther' => 'Distribuiți altora',
+		'noLikes' => 'Încă nu sunt aprecieri',
+		'uploading' => 'Se încarcă',
 	],
 
 	'profile' => [
-		'posts' => 'Posts',
-		'followers' => 'Followers',
-		'following' => 'Following',
-		'admin' => 'Admin',
-		'collections' => 'Collections',
-		'follow' => 'Follow',
-		'unfollow' => 'Unfollow',
-		'editProfile' => 'Edit Profile',
-		'followRequested' => 'Follow Requested',
-		'joined' => 'Joined',
+		'posts' => 'Postări',
+		'followers' => 'Urmăritori',
+		'following' => 'Urmăriți',
+		'admin' => 'Administrator',
+		'collections' => 'Colecții',
+		'follow' => 'Urmărește',
+		'unfollow' => 'Nu mai urmări',
+		'editProfile' => 'Editare profil',
+		'followRequested' => 'Urmărește cererea',
+		'joined' => 'S-a alăturat',
 
-		'emptyCollections' => 'We can\'t seem to find any collections',
-		'emptyPosts' => 'We can\'t seem to find any posts',
+		'emptyCollections' => 'Se pare că nu putem găsi colecții',
+		'emptyPosts' => 'Se pare că nu putem găsi niciun post',
 	],
 
 	'menu' => [
-		'viewPost' => 'View Post',
-		'viewProfile' => 'View Profile',
-		'moderationTools' => 'Moderation Tools',
-		'report' => 'Report',
-		'archive' => 'Archive',
-		'unarchive' => 'Unarchive',
-		'embed' => 'Embed',
+		'viewPost' => 'Vizualizați postul',
+		'viewProfile' => 'Vezi Profilul',
+		'moderationTools' => 'Instrumente de moderare',
+		'report' => 'Raportează',
+		'archive' => 'Arhivă',
+		'unarchive' => 'Dezarhivează',
+		'embed' => 'Încorporează',
 
-		'selectOneOption' => 'Select one of the following options',
-		'unlistFromTimelines' => 'Unlist from Timelines',
-		'addCW' => 'Add Content Warning',
-		'removeCW' => 'Remove Content Warning',
-		'markAsSpammer' => 'Mark as Spammer',
-		'markAsSpammerText' => 'Unlist + CW existing and future posts',
+		'selectOneOption' => 'Selectaţi una dintre următoarele opţiuni',
+		'unlistFromTimelines' => 'Dezlistare din Timelines',
+		'addCW' => 'Adaugă un avertisment privind conținutul',
+		'removeCW' => 'Elimină avertismentul privind conținutul',
+		'markAsSpammer' => 'Marchează ca Spammer',
+		'markAsSpammerText' => 'Anulare listă + postări CW existente și viitoare',
 		'spam' => 'Spam',
-		'sensitive' => 'Sensitive Content',
-		'abusive' => 'Abusive or Harmful',
-		'underageAccount' => 'Underage Account',
-		'copyrightInfringement' => 'Copyright Infringement',
-		'impersonation' => 'Impersonation',
-		'scamOrFraud' => 'Scam or Fraud',
-		'confirmReport' => 'Confirm Report',
-		'confirmReportText' => 'Are you sure you want to report this post?',
-		'reportSent' => 'Report Sent!',
-		'reportSentText' => 'We have successfully received your report.',
-		'reportSentError' => 'There was an issue reporting this post.',
+		'sensitive' => 'Conținut sensibil',
+		'abusive' => 'Abusiv sau dăunător',
+		'underageAccount' => 'Cont Minor',
+		'copyrightInfringement' => 'Încălcarea drepturilor de autor',
+		'impersonation' => 'Furt de identitate',
+		'scamOrFraud' => 'Înșelătorie sau fraudă',
+		'confirmReport' => 'Confirmați raportul',
+		'confirmReportText' => 'Ești sigur că vrei să raportezi această postare?',
+		'reportSent' => 'Raport trimis!',
+		'reportSentText' => 'Am primit cu succes raportul dvs.',
+		'reportSentError' => 'A existat o problemă la raportarea acestei postări.',
 
-		'modAddCWConfirm' => 'Are you sure you want to add a content warning to this post?',
-		'modCWSuccess' => 'Successfully added content warning',
-		'modRemoveCWConfirm' => 'Are you sure you want to remove the content warning on this post?',
-		'modRemoveCWSuccess' => 'Successfully removed content warning',
-		'modUnlistConfirm' => 'Are you sure you want to unlist this post?',
-		'modUnlistSuccess' => 'Successfully unlisted post',
-		'modMarkAsSpammerConfirm' => 'Are you sure you want to mark this user as a spammer? All existing and future posts will be unlisted on timelines and a content warning will be applied.',
-		'modMarkAsSpammerSuccess' => 'Successfully marked account as spammer',
+		'modAddCWConfirm' => 'Sunteţi sigur că doriţi să adăugaţi un avertisment cu privire la conţinut la acest post?',
+		'modCWSuccess' => 'Avertizare conținut adăugat cu succes',
+		'modRemoveCWConfirm' => 'Sigur doriți să eliminați avertizarea conținutului pe acest post?',
+		'modRemoveCWSuccess' => 'Avertisment conținut șters cu succes',
+		'modUnlistConfirm' => 'Ești sigur că vrei să elimini această postare?',
+		'modUnlistSuccess' => 'Mesaj nelistat cu succes',
+		'modMarkAsSpammerConfirm' => 'Sunteţi sigur că doriţi să marcaţi acest utilizator ca un spammer? Toate postările existente și viitoare vor fi nelistate pe calendare și se va aplica un avertisment privind conținutul.',
+		'modMarkAsSpammerSuccess' => 'Contul marcat cu succes ca spammer',
 
-		'toFollowers' => 'to Followers',
+		'toFollowers' => 'la Urmăritori',
 
-		'showCaption' => 'Show Caption',
-		'showLikes' => 'Show Likes',
-		'compactMode' => 'Compact Mode',
-		'embedConfirmText' => 'By using this embed, you agree to our',
+		'showCaption' => 'Afișați legenda',
+		'showLikes' => 'Arată like-urile',
+		'compactMode' => 'Modul compact',
+		'embedConfirmText' => 'Folosind acest lucru încorporat, sunteți de acord cu',
 
-		'deletePostConfirm' => 'Are you sure you want to delete this post?',
-		'archivePostConfirm' => 'Are you sure you want to archive this post?',
-		'unarchivePostConfirm' => 'Are you sure you want to unarchive this post?',
+		'deletePostConfirm' => 'Sunteţi sigur că doriţi să ştergeţi acest post?',
+		'archivePostConfirm' => 'Sunteți sigur că doriți să arhivați acest post?',
+		'unarchivePostConfirm' => 'Sunteți sigur că doriți să dezarhivați acest post?',
 	],
 
 	'story' => [
-		'add' => 'Add Story'
+		'add' => 'Adăugați poveste'
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'People you may know'
+		'peopleYouMayKnow' => 'Persoane pe care i-ai putea cunoaște',
+
+		'onboarding' => [
+			'welcome' => 'Welcome',
+			'thisIsYourHomeFeed' => 'This is your home feed, a chronological feed of posts from accounts you follow.',
+			'letUsHelpYouFind' => 'Let us help you find some interesting people to follow',
+			'refreshFeed' => 'Refresh my feed',
+		],
 	],
 
 	'hashtags' => [
-		'emptyFeed' => 'We can\'t seem to find any posts for this hashtag'
+		'emptyFeed' => 'Nu putem găsi postări pentru acest hashtag'
+	],
+
+	'report' => [
+		'report' => 'Report',
+		'selectReason' => 'Select a reason',
+		'reported' => 'Reported',
+		'sendingReport' => 'Sending report',
+		'thanksMsg' => 'Thanks for the report, people like you help keep our community safe!',
+		'contactAdminMsg' => 'If you\'d like to contact an administrator about this post or report',
 	],
 
 ];
diff --git a/resources/lang/ru/web.php b/resources/lang/ru/web.php
index acae889a3..ab469fc12 100644
--- a/resources/lang/ru/web.php
+++ b/resources/lang/ru/web.php
@@ -13,6 +13,7 @@ return [
 		'shared' => 'Поделились',
 		'shares' => 'Поделились',
 		'unshare' => 'Не делиться',
+		'bookmark' => 'Закладка',
 
 		'cancel' => 'Отмена',
 		'copyLink' => 'Скопировать ссылку',
@@ -23,6 +24,10 @@ return [
 		'other' => 'Прочее',
 		'readMore' => 'Читать далее',
 		'success' => 'Успешно',
+		'proceed' => 'Продолжить',
+		'next' => 'Далее',
+		'close' => 'Закрыть',
+		'clickHere' => 'нажмите здесь',
 
 		'sensitive' => 'Чувствительный',
 		'sensitiveContent' => 'Чувствительный контент',
@@ -54,8 +59,8 @@ return [
 		'profile' => 'Профиль',
 		'drive' => 'Диск',
 		'settings' => 'Настройки',
-		'compose' => 'Создать новый пост',
-		'logout' => 'Logout',
+		'compose' => 'Создать новый',
+		'logout' => 'Выйти',
 
 		// Nav footer
 		'about' => 'О нас',
@@ -81,11 +86,11 @@ return [
 		'shared' => 'поделился вашим',
 		'tagged' => 'отметил вас в публикации',
 
-		'updatedA' => 'updated a',
+		'updatedA' => 'обновил(а)',
 		'sentA' => 'отправил',
 
 		'followed' => 'подписался',
-		'mentioned' => 'mentioned',
+		'mentioned' => 'упомянул(а)',
 		'you' => 'вы',
 
 		'yourApplication' => 'Ваше заявка на вступление',
@@ -93,10 +98,11 @@ return [
 		'applicationRejected' => 'было отклонено. Вы можете повторно подать заявку на регистрацию в течение 6 месяцев.',
 
 		'dm' => 'сообщение',
-		'groupPost' => 'сообщения группы',
-		'modlog' => 'modlog',
+		'groupPost' => 'пост в группе',
+		'modlog' => 'журнал модерации',
 		'post' => 'пост',
 		'story' => 'история',
+		'noneFound' => 'Уведомления не найдены',
 	],
 
 	'post' => [
@@ -136,7 +142,7 @@ return [
 		'addCW' => 'Добавить предупреждение о контенте',
 		'removeCW' => 'Удалить предупреждение о контенте',
 		'markAsSpammer' => 'Пометить как спамера',
-		'markAsSpammerText' => 'Unlist + CW existing and future posts',
+		'markAsSpammerText' => 'Скрыть из лент и пометить предупреждениями существующие и будущие публикации',
 		'spam' => 'Спам',
 		'sensitive' => 'Деликатный контент',
 		'abusive' => 'Жестокое обращение или причинение вреда',
@@ -155,16 +161,16 @@ return [
 		'modRemoveCWConfirm' => 'Вы действительно хотите удалить предупреждение о контенте с этого поста?',
 		'modRemoveCWSuccess' => 'Предупреждение о контенте успешно удалено',
 		'modUnlistConfirm' => 'Вы действительно хотите скрыть этот пост из лент?',
-		'modUnlistSuccess' => 'Successfully unlisted post',
+		'modUnlistSuccess' => 'Пост удален',
 		'modMarkAsSpammerConfirm' => 'Вы уверены, что хотите отметить этого пользователя спамом? Все существующие и будущие сообщения будут исключены из списка в сроки, и будет применяться предупреждение о содержании.',
 		'modMarkAsSpammerSuccess' => 'Аккаунт успешно помечен как спаммер',
 
-		'toFollowers' => 'to Followers',
+		'toFollowers' => 'подписчикам',
 
 		'showCaption' => 'Показать подпись',
 		'showLikes' => 'Показать отметки "мне нравится"',
 		'compactMode' => 'Компактный режим',
-		'embedConfirmText' => 'By using this embed, you agree to our',
+		'embedConfirmText' => 'Используя этот инстант, вы соглашаетесь с нашими',
 
 		'deletePostConfirm' => 'Вы действительно хотите удалить этот пост?',
 		'archivePostConfirm' => 'Вы действительно хотите архивировать этот пост?',
@@ -176,11 +182,27 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'Возможные друзья'
+		'peopleYouMayKnow' => 'Возможные друзья',
+
+		'onboarding' => [
+			'welcome' => 'Добро пожаловать',
+			'thisIsYourHomeFeed' => 'Это ваша домашняя лента, где хронологически собраны посты с аккаунтов, на которые вы подписаны.',
+			'letUsHelpYouFind' => 'Давайте мы поможем вам найти интересных людей, на которых можно подписаться',
+			'refreshFeed' => 'Обновить мою ленту',
+		],
 	],
 
 	'hashtags' => [
 		'emptyFeed' => 'Похоже, мы не можем найти записи для этого хэштега'
 	],
 
+	'report' => [
+		'report' => 'Пожаловаться',
+		'selectReason' => 'Выберите причину',
+		'reported' => 'Жалоба отправлена',
+		'sendingReport' => 'Отправка жалобы',
+		'thanksMsg' => 'Спасибо за обращение! Такие, как вы, помогают сделать сообщество безопаснее!',
+		'contactAdminMsg' => 'Хотите ли вы связаться с администратором по поводу этой публикации или жалобы',
+	],
+
 ];
diff --git a/resources/lang/sk/web.php b/resources/lang/sk/web.php
index dc37b94b0..b8362e05e 100644
--- a/resources/lang/sk/web.php
+++ b/resources/lang/sk/web.php
@@ -13,6 +13,7 @@ return [
 		'shared' => 'Zdieľané',
 		'shares' => 'Zdiaľané',
 		'unshare' => 'Zrušiť zdieľanie',
+		'bookmark' => 'Uložiť',
 
 		'cancel' => 'Zrušiť',
 		'copyLink' => 'Skopírovať odkaz',
@@ -23,6 +24,10 @@ return [
 		'other' => 'Iné',
 		'readMore' => 'Zobraziť viac',
 		'success' => 'Hotovo',
+		'proceed' => 'Pokračovať',
+		'next' => 'Ďalej',
+		'close' => 'Zavrieť',
+		'clickHere' => 'klikni tu',
 
 		'sensitive' => 'Citlivý',
 		'sensitiveContent' => 'Citlivý obsah',
@@ -97,6 +102,7 @@ return [
 		'modlog' => 'modlog',
 		'post' => 'príspevok',
 		'story' => 'story',
+		'noneFound' => 'Žiadne nájdené notifikácie',
 	],
 
 	'post' => [
@@ -157,7 +163,7 @@ return [
 		'modUnlistConfirm' => 'Naozaj chcete odstrániť zo zoznamu tento príspevok?',
 		'modUnlistSuccess' => 'Príspevok bol úspešne odstránený zo zoznamu',
 		'modMarkAsSpammerConfirm' => 'Naozaj chcete označiť tohto používateľa ako odosielateľa spamu? Všetky existujúce a budúce príspevky budú odstránené z timelines a bude pridané upozornenie o obsahu.',
-		'modMarkAsSpammerSuccess' => 'Účet bol úspešne označený ako odosielateľa spamu',
+		'modMarkAsSpammerSuccess' => 'Účet bol úspešne označený ako spammer',
 
 		'toFollowers' => 'pre Sledujúcich',
 
@@ -176,11 +182,27 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'Ľudia ktorých možno poznáte'
+		'peopleYouMayKnow' => 'Ľudia ktorých možno poznáte',
+
+		'onboarding' => [
+			'welcome' => 'Vitajte',
+			'thisIsYourHomeFeed' => 'This is your home feed, a chronological feed of posts from accounts you follow.',
+			'letUsHelpYouFind' => 'Nechajte nás pomôcť vám nájsť zaujímavých ľudí ktorých môžete sledovať',
+			'refreshFeed' => 'Refresh my feed',
+		],
 	],
 
 	'hashtags' => [
 		'emptyFeed' => 'Zdá sa, že nemôžeme nájsť žiadne príspevky pre tento hashtag'
 	],
 
+	'report' => [
+		'report' => 'Nahlásiť',
+		'selectReason' => 'Vyberte dôvod',
+		'reported' => 'Nahlásené',
+		'sendingReport' => 'Odosielanie hlásenia',
+		'thanksMsg' => 'Ďakujeme za hlásenie, ľudia ako vy pomáhajú udržiavať našu komunitu v bezpečí!',
+		'contactAdminMsg' => 'Ak chcete kontaktovať administrátora ohľadom tohto príspevku alebo ho nahlásiť',
+	],
+
 ];
diff --git a/resources/lang/sr/web.php b/resources/lang/sr/web.php
index 3844f847a..9e27e010a 100644
--- a/resources/lang/sr/web.php
+++ b/resources/lang/sr/web.php
@@ -3,39 +3,44 @@
 return [
 
 	'common' => [
-		'comment' => 'Comment',
-		'commented' => 'Commented',
-		'comments' => 'Comments',
-		'like' => 'Like',
-		'liked' => 'Liked',
-		'likes' => 'Likes',
-		'share' => 'Share',
-		'shared' => 'Shared',
-		'shares' => 'Shares',
-		'unshare' => 'Unshare',
+		'comment' => 'Komentar',
+		'commented' => 'Komentarisao',
+		'comments' => 'Komentari',
+		'like' => 'Sviđa mi se',
+		'liked' => 'Sviđa mi se',
+		'likes' => 'Sviđanja',
+		'share' => 'Podeli',
+		'shared' => 'Podeljeno',
+		'shares' => 'Deljenja',
+		'unshare' => 'Nemoj deliti',
+		'bookmark' => 'Bookmark',
 
-		'cancel' => 'Cancel',
-		'copyLink' => 'Copy Link',
-		'delete' => 'Delete',
-		'error' => 'Error',
-		'errorMsg' => 'Something went wrong. Please try again later.',
-		'oops' => 'Oops!',
-		'other' => 'Other',
-		'readMore' => 'Read more',
-		'success' => 'Success',
+		'cancel' => 'Otkaži',
+		'copyLink' => 'Kopiraj vezu',
+		'delete' => 'Obriši',
+		'error' => 'Grеška',
+		'errorMsg' => 'Nešto nije u redu. Pokušaj ponovo kasnije.',
+		'oops' => 'Ups!',
+		'other' => 'Ostalo',
+		'readMore' => 'Pročitaj više',
+		'success' => 'Uspeh',
+		'proceed' => 'Proceed',
+		'next' => 'Next',
+		'close' => 'Close',
+		'clickHere' => 'click here',
 
-		'sensitive' => 'Sensitive',
-		'sensitiveContent' => 'Sensitive Content',
-		'sensitiveContentWarning' => 'This post may contain sensitive content',
+		'sensitive' => 'Osetljivo',
+		'sensitiveContent' => 'Osetljivi sadržaj',
+		'sensitiveContentWarning' => 'Ovaj post može sadržati osetljivi sadržaj',
 	],
 
 	'site' => [
-		'terms' => 'Terms of Use',
-		'privacy' => 'Privacy Policy',
+		'terms' => 'Uslovi korišćenja',
+		'privacy' => 'Politika privatnosti',
 	],
 
 	'navmenu' => [
-		'search' => 'Search',
+		'search' => 'Pretraga',
 		'admin' => 'Admin Dashboard',
 
 		// Timelines
@@ -97,6 +102,7 @@ return [
 		'modlog' => 'modlog',
 		'post' => 'post',
 		'story' => 'story',
+		'noneFound' => 'No notifications found',
 	],
 
 	'post' => [
@@ -176,11 +182,27 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'People you may know'
+		'peopleYouMayKnow' => 'People you may know',
+
+		'onboarding' => [
+			'welcome' => 'Welcome',
+			'thisIsYourHomeFeed' => 'This is your home feed, a chronological feed of posts from accounts you follow.',
+			'letUsHelpYouFind' => 'Let us help you find some interesting people to follow',
+			'refreshFeed' => 'Refresh my feed',
+		],
 	],
 
 	'hashtags' => [
 		'emptyFeed' => 'We can\'t seem to find any posts for this hashtag'
 	],
 
+	'report' => [
+		'report' => 'Report',
+		'selectReason' => 'Select a reason',
+		'reported' => 'Reported',
+		'sendingReport' => 'Sending report',
+		'thanksMsg' => 'Thanks for the report, people like you help keep our community safe!',
+		'contactAdminMsg' => 'If you\'d like to contact an administrator about this post or report',
+	],
+
 ];
diff --git a/resources/lang/sv/web.php b/resources/lang/sv/web.php
index 03b9891d9..9a7e28ce6 100644
--- a/resources/lang/sv/web.php
+++ b/resources/lang/sv/web.php
@@ -3,58 +3,63 @@
 return [
 
 	'common' => [
-		'comment' => 'Kommentera',
+		'comment' => 'Kommentar',
 		'commented' => 'Kommenterade',
 		'comments' => 'Kommentarer',
 		'like' => 'Gilla',
-		'liked' => 'Gillade',
-		'likes' => 'Gillar-markeringar',
+		'liked' => 'Gillad',
+		'likes' => 'Gillanden',
 		'share' => 'Dela',
-		'shared' => 'Delade',
-		'shares' => 'Delningar',
-		'unshare' => 'Sluta dela',
+		'shared' => 'Utdelad',
+		'shares' => 'Utdelade',
+		'unshare' => 'Sluta dela ut',
+		'bookmark' => 'Bokmärk',
 
 		'cancel' => 'Avbryt',
 		'copyLink' => 'Kopiera länk',
 		'delete' => 'Ta bort',
 		'error' => 'Fel',
-		'errorMsg' => 'Något gick fel. Försök igen senare',
-		'oops' => 'Oops!',
+		'errorMsg' => 'Något gick fel. Vänligen försök igen senare.',
+		'oops' => 'Hoppsan!',
 		'other' => 'Andra',
 		'readMore' => 'Läs mer',
 		'success' => 'Lyckades',
+		'proceed' => 'Fortsätt',
+		'next' => 'Nästa',
+		'close' => 'Stäng',
+		'clickHere' => 'klicka här',
 
 		'sensitive' => 'Känsligt',
 		'sensitiveContent' => 'Känsligt innehåll',
-		'sensitiveContentWarning' => 'TDet här inlägget kan innehålla känsligt innehåll',
+		'sensitiveContentWarning' => 'Det här inlägget kan innehålla känsligt innehåll',
 	],
 
 	'site' => [
-		'terms' => 'Villkor',
+		'terms' => 'Användarvillkor',
 		'privacy' => 'Integritetspolicy',
 	],
 
 	'navmenu' => [
 		'search' => 'Sök',
-		'admin' => 'Admin Panel',
+		'admin' => 'Kontrollpanel för administratör',
 
 		// Timelines
-		'homeFeed' => 'Hemflödet',
-		'localFeed' => 'Lokala flödet',
-		'globalFeed' => 'Globala flödet',
+		'homeFeed' => 'Hemflöde',
+		'localFeed' => 'Lokalt flöde',
+		'globalFeed' => 'Globalt flöde',
 
 		// Core features
-		'discover' => 'Utforska',
+		'discover' => 'Upptäck',
 		'directMessages' => 'Direktmeddelanden',
 		'notifications' => 'Notifikationer',
 		'groups' => 'Grupper',
-		'stories' => 'Stories',
+		'stories' => 'Historier',
 
 		// Self links
 		'profile' => 'Profil',
-		'drive' => 'Drive',
+		'drive' => 'Enhet',
 		'settings' => 'Inställningar',
-		'compose' => 'Skapa nytt',
+		'compose' => 'Skapa ny',
 		'logout' => 'Logga ut',
 
 		// Nav footer
@@ -62,10 +67,10 @@ return [
 		'help' => 'Hjälp',
 		'language' => 'Språk',
 		'privacy' => 'Integritet',
-		'terms' => 'Vilkor',
+		'terms' => 'Villkor',
 
 		// Temporary links
-		'backToPreviousDesign' => 'Gå tillbaka till den gamla designen'
+		'backToPreviousDesign' => 'Gå tillbaka till föregående design'
 	],
 
 	'directMessages' => [
@@ -76,27 +81,28 @@ return [
 
 	'notifications' => [
 		'liked' => 'gillade ditt',
-		'commented' => 'kommenterade på ditt',
-		'reacted' => 'reagerade på ditt',
-		'shared' => 'delade ditt',
-		'tagged' => 'taggade dig i en',
+		'commented' => 'kommenterade på din',
+		'reacted' => 'reagerade på din',
+		'shared' => 'delade din',
+		'tagged' => 'taggade dig i ett',
 
 		'updatedA' => 'uppdaterade en',
 		'sentA' => 'skickade en',
 
-		'followed' => 'följer',
+		'followed' => 'följde',
 		'mentioned' => 'nämnde',
-		'you' => 'dig',
+		'you' => 'du',
 
-		'yourApplication' => 'Din ansökan att gå med',
+		'yourApplication' => 'Din ansökan för att gå med',
 		'applicationApproved' => 'blev godkänd!',
-		'applicationRejected' => 'blev nekad. Du kan ansöka igen om 6 månader.',
+		'applicationRejected' => 'nekades. Du kan söka för att gå med igen om 6 månader.',
 
 		'dm' => 'dm',
-		'groupPost' => 'grupp inlägg',
+		'groupPost' => 'gruppinlägg',
 		'modlog' => 'modlog',
 		'post' => 'inlägg',
-		'story' => 'story',
+		'story' => 'historik',
+		'noneFound' => 'Inga aviseringar hittades',
 	],
 
 	'post' => [
@@ -110,7 +116,7 @@ return [
 		'posts' => 'Inlägg',
 		'followers' => 'Följare',
 		'following' => 'Följer',
-		'admin' => 'Admin',
+		'admin' => 'Administratör',
 		'collections' => 'Kollektioner',
 		'follow' => 'Följ',
 		'unfollow' => 'Sluta följa',
@@ -128,16 +134,16 @@ return [
 		'moderationTools' => 'Modereringsverktyg',
 		'report' => 'Rapportera',
 		'archive' => 'Arkivera',
-		'unarchive' => 'avarkivera',
+		'unarchive' => 'Avarkivera',
 		'embed' => 'Bädda in',
 
 		'selectOneOption' => 'Välj ett av följande alternativ',
 		'unlistFromTimelines' => 'Avlista från tidslinjer',
-		'addCW' => 'Lägg till känslighetsvarning',
+		'addCW' => 'Lägg till innehållsvarning',
 		'removeCW' => 'Ta bort känslighetsvarning',
 		'markAsSpammer' => 'Markera som spammare',
 		'markAsSpammerText' => 'Avlista + känslighetsmarkera nuvarande och framtida inlägg',
-		'spam' => 'Spam',
+		'spam' => 'Skräppost',
 		'sensitive' => 'Känsligt innehåll',
 		'abusive' => 'Missbruk eller skadligt',
 		'underageAccount' => 'Minderårigt konto',
@@ -176,11 +182,27 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'Personer du kanske känner'
+		'peopleYouMayKnow' => 'Personer du kanske känner',
+
+		'onboarding' => [
+			'welcome' => 'Välkommen',
+			'thisIsYourHomeFeed' => 'Detta är ditt hem foder, ett kronologiskt flöde av inlägg från konton du följer.',
+			'letUsHelpYouFind' => 'Låt oss hjälpa dig att hitta några intressanta människor att följa',
+			'refreshFeed' => 'Uppdatera mitt flöde',
+		],
 	],
 
 	'hashtags' => [
 		'emptyFeed' => 'Vi kan inte hitta några inlägg med den hashtagen'
 	],
 
+	'report' => [
+		'report' => 'Rapportera',
+		'selectReason' => 'Välj en anledning',
+		'reported' => 'Rapporterad',
+		'sendingReport' => 'Skickar rapport',
+		'thanksMsg' => 'Tack för rapporten, personer som gillar att du hjälper till att skydda vår gemenskap!',
+		'contactAdminMsg' => 'Om du vill kontakta en administratör om detta inlägg eller rapport',
+	],
+
 ];
diff --git a/resources/lang/th/web.php b/resources/lang/th/web.php
index ad46ea3c4..1e424e863 100644
--- a/resources/lang/th/web.php
+++ b/resources/lang/th/web.php
@@ -3,169 +3,206 @@
 return [
 
 	'common' => [
-		'comment' => 'Comment',
-		'commented' => 'Commented',
-		'comments' => 'Comments',
-		'like' => 'Like',
-		'liked' => 'Liked',
-		'likes' => 'Likes',
-		'share' => 'Share',
-		'shared' => 'Shared',
-		'shares' => 'Shares',
-		'unshare' => 'Unshare',
+		'comment' => 'ความคิดเห็น',
+		'commented' => 'แสดงความคิดเห็นนี้แล้ว',
+		'comments' => 'ความคิดเห็น',
+		'like' => 'ถูกใจ',
+		'liked' => 'ถูกใจแล้ว',
+		'likes' => 'ถูกใจ',
+		'share' => 'แชร์',
+		'shared' => 'แชร์แล้ว',
+		'shares' => 'แชร์',
+		'unshare' => 'เลิกแชร์',
+		'bookmark' => 'บุ๊คมาร์ก',
 
-		'cancel' => 'Cancel',
-		'copyLink' => 'Copy Link',
-		'delete' => 'Delete',
-		'error' => 'Error',
-		'errorMsg' => 'Something went wrong. Please try again later.',
-		'oops' => 'Oops!',
-		'other' => 'Other',
-		'readMore' => 'Read more',
-		'success' => 'Success',
+		'cancel' => 'ยกเลิก',
+		'copyLink' => 'คัดลอกลิงค์',
+		'delete' => 'ลบ',
+		'error' => 'เกิดข้อผิดพลาด',
+		'errorMsg' => 'มีบางอย่างผิดพลาด กรุณาลองอีกครั้งในภายหลัง',
+		'oops' => 'โอ๊ะ!',
+		'other' => 'อื่นๆ',
+		'readMore' => 'อ่านเพิ่มเติม',
+		'success' => 'สำเร็จ',
+		'proceed' => 'ดำเนินการ',
+		'next' => 'ถัดไป',
+		'close' => 'ปิด',
+		'clickHere' => 'คลิกที่นี่',
 
-		'sensitive' => 'Sensitive',
-		'sensitiveContent' => 'Sensitive Content',
-		'sensitiveContentWarning' => 'This post may contain sensitive content',
+		'sensitive' => 'ละเอียดอ่อน',
+		'sensitiveContent' => 'เนื้อหาที่ละเอียดอ่อน',
+		'sensitiveContentWarning' => 'โพสต์นี้อาจจะมีเนื้อหาที่ละเอียดอ่อนหรืออ่อนไว',
 	],
 
 	'site' => [
-		'terms' => 'Terms of Use',
-		'privacy' => 'Privacy Policy',
+		'terms' => 'ข้อตกลงการใช้งาน',
+		'privacy' => 'นโยบายความเป็นส่วนตัว',
 	],
 
 	'navmenu' => [
-		'search' => 'Search',
-		'admin' => 'Admin Dashboard',
+		'search' => 'ค้นหา',
+		'admin' => 'แอดมินแดชบอร์ด',
 
 		// Timelines
-		'homeFeed' => 'Home Feed',
-		'localFeed' => 'Local Feed',
-		'globalFeed' => 'Global Feed',
+		'homeFeed' => 'โฮมหน้าฟีด',
+		'localFeed' => 'หน้าฟีดท้องถิ่น',
+		'globalFeed' => 'หน้าฟีดทั่วโลก',
 
 		// Core features
-		'discover' => 'Discover',
-		'directMessages' => 'Direct Messages',
-		'notifications' => 'Notifications',
-		'groups' => 'Groups',
-		'stories' => 'Stories',
+		'discover' => 'สำรวจ',
+		'directMessages' => 'ข้อความส่วนตัว',
+		'notifications' => 'การแจ้งเตือน',
+		'groups' => 'กลุ่ม',
+		'stories' => 'เรื่องราว',
 
 		// Self links
-		'profile' => 'Profile',
-		'drive' => 'Drive',
-		'settings' => 'Settings',
-		'compose' => 'Create New',
+		'profile' => 'โปรไฟล์',
+		'drive' => 'ไดรฟ์',
+		'settings' => 'การตั้งค่า',
+		'compose' => 'สร้างใหม่',
+		'logout' => 'ออกจากระบบ',
+
+		// Nav footer
+		'about' => 'เกี่ยวกับ',
+		'help' => 'ความช่วยเหลือ',
+		'language' => 'ภาษา',
+		'privacy' => 'ส่วนตัว',
+		'terms' => 'ข้อตกลง',
 
 		// Temporary links
-		'backToPreviousDesign' => 'Go back to previous design'
+		'backToPreviousDesign' => 'กลับไปยังขั้นตอนก่อนหน้าออกแบบ'
 	],
 
 	'directMessages' => [
-		'inbox' => 'Inbox',
-		'sent' => 'Sent',
-		'requests' => 'Requests'
+		'inbox' => 'กล่องข้อความ',
+		'sent' => 'ส่ง',
+		'requests' => 'คำขอ'
 	],
 
 	'notifications' => [
-		'liked' => 'liked your',
-		'commented' => 'commented on your',
-		'reacted' => 'reacted to your',
-		'shared' => 'shared your',
-		'tagged' => 'tagged you in a',
+		'liked' => 'ถูกใจคุณแล้ว',
+		'commented' => 'แสดงความคิดเห็นคุณแล้ว',
+		'reacted' => 'ตอบสนองถึงคุณ',
+		'shared' => 'คุณแชร์แล้ว',
+		'tagged' => 'มีคนได้กล่าวถึงคุณใน',
 
-		'updatedA' => 'updated a',
-		'sentA' => 'sent a',
+		'updatedA' => 'อัปเดตแล้วเมื่อ',
+		'sentA' => 'ส่งเมื่อ',
 
-		'followed' => 'followed',
-		'mentioned' => 'mentioned',
-		'you' => 'you',
+		'followed' => 'ติดตามแล้ว',
+		'mentioned' => 'กล่าวถึงแล้ว',
+		'you' => 'คุณ',
 
-		'yourApplication' => 'Your application to join',
-		'applicationApproved' => 'was approved!',
-		'applicationRejected' => 'was rejected. You can re-apply to join in 6 months.',
+		'yourApplication' => 'ยื่นใบสมัครของคุณเพื่อเข้าร่วม',
+		'applicationApproved' => 'ได้อนุมัติแล้ว!',
+		'applicationRejected' => 'ถูกปฏิเสธแล้ว คุณสามารถสมัครใหม่เพื่อเข้าร่วมได้ภายใน 6 เดือนนะ',
 
 		'dm' => 'dm',
-		'groupPost' => 'group post',
-		'modlog' => 'modlog',
-		'post' => 'post',
-		'story' => 'story',
+		'groupPost' => 'โพสต์กลุ่ม',
+		'modlog' => 'ม็อดล็อก',
+		'post' => 'โพสต์',
+		'story' => 'เรื่องราว',
+		'noneFound' => 'ไม่พบการแจ้งเตือน',
 	],
 
 	'post' => [
-		'shareToFollowers' => 'Share to followers',
-		'shareToOther' => 'Share to other',
-		'noLikes' => 'No likes yet',
-		'uploading' => 'Uploading',
+		'shareToFollowers' => 'แชร์ให้ผู้ติดตาม',
+		'shareToOther' => 'แชร์ให้อื่นๆ',
+		'noLikes' => 'ยังไม่ถูกใจ',
+		'uploading' => 'กำลังอัพโหลด',
 	],
 
 	'profile' => [
-		'posts' => 'Posts',
-		'followers' => 'Followers',
-		'following' => 'Following',
-		'admin' => 'Admin',
-		'collections' => 'Collections',
-		'follow' => 'Follow',
-		'unfollow' => 'Unfollow',
-		'editProfile' => 'Edit Profile',
-		'followRequested' => 'Follow Requested',
-		'joined' => 'Joined',
+		'posts' => 'โพสต์',
+		'followers' => 'ผู้ติดตาม',
+		'following' => 'กำลังติดตาม',
+		'admin' => 'ผู้ดูแลระบบ',
+		'collections' => 'คอลเลกชัน',
+		'follow' => 'ติดตาม',
+		'unfollow' => 'เลิกติดตาม',
+		'editProfile' => 'แก้ไขโปร์ไฟล์',
+		'followRequested' => 'คำขอติดตาม',
+		'joined' => 'เข้าร่วมแล้ว',
+
+		'emptyCollections' => 'ดูเหมือนว่าเราจะไม่พบคอลเลกชันใดๆ',
+		'emptyPosts' => 'ดูเหมือนว่าเราจะไม่พบโพสต์ใดๆ',
 	],
 
 	'menu' => [
-		'viewPost' => 'View Post',
-		'viewProfile' => 'View Profile',
-		'moderationTools' => 'Moderation Tools',
-		'report' => 'Report',
-		'archive' => 'Archive',
-		'unarchive' => 'Unarchive',
-		'embed' => 'Embed',
+		'viewPost' => 'ดูโพสต์',
+		'viewProfile' => 'ดูโปรไฟล์',
+		'moderationTools' => 'เครื่องมือการกลั่นกรอง',
+		'report' => 'รายงาน',
+		'archive' => 'เอกสารสำคัญ',
+		'unarchive' => 'ยกเลิกการเก็บถาวร',
+		'embed' => 'ฝัง',
 
-		'selectOneOption' => 'Select one of the following options',
-		'unlistFromTimelines' => 'Unlist from Timelines',
-		'addCW' => 'Add Content Warning',
-		'removeCW' => 'Remove Content Warning',
-		'markAsSpammer' => 'Mark as Spammer',
-		'markAsSpammerText' => 'Unlist + CW existing and future posts',
-		'spam' => 'Spam',
-		'sensitive' => 'Sensitive Content',
-		'abusive' => 'Abusive or Harmful',
-		'underageAccount' => 'Underage Account',
-		'copyrightInfringement' => 'Copyright Infringement',
-		'impersonation' => 'Impersonation',
-		'scamOrFraud' => 'Scam or Fraud',
-		'confirmReport' => 'Confirm Report',
-		'confirmReportText' => 'Are you sure you want to report this post?',
-		'reportSent' => 'Report Sent!',
-		'reportSentText' => 'We have successfully received your report.',
-		'reportSentError' => 'There was an issue reporting this post.',
+		'selectOneOption' => 'เลือกหนึ่งในตัวเลือกที่กำลังติดตามดังต่อไปนี้',
+		'unlistFromTimelines' => 'ไม่แสดงจากไทม์ไลน์',
+		'addCW' => 'เพิ่มคำเตือนเนื้อหา',
+		'removeCW' => 'ลบคำเตือนเนื้อหาออก',
+		'markAsSpammer' => 'ทำเครื่องหมายบอกว่าสแปมเกอร์',
+		'markAsSpammerText' => 'ไม่แสดง + CW โพสต์ที่มีอยู่แล้วและในอนาคต',
+		'spam' => 'สแปม',
+		'sensitive' => 'เนื้อหาที่ละเอียดอ่อน',
+		'abusive' => 'ไม่เหมาะสมหรืออาจเป็นอันตราย',
+		'underageAccount' => 'บัญชีที่ยังไม่รู้บรรลุนิติภาวะ',
+		'copyrightInfringement' => 'การละเมิดลิขสิทธิ์',
+		'impersonation' => 'แอบอ้างบุคคลอื่น',
+		'scamOrFraud' => 'หลอกลวงหรือฉ้อโกง',
+		'confirmReport' => 'ยืนยันการรายงาน',
+		'confirmReportText' => 'คุณแน่ใจหรือไม่ว่าต้องการรายงานโพสต์นี้?',
+		'reportSent' => 'ส่งรายงานแล้ว!',
+		'reportSentText' => 'เราได้รับรายงานของคุณสำเร็จแล้วนะ',
+		'reportSentError' => 'เกิดปัญหากำลังรายงานโพสต์นี้',
 
-		'modAddCWConfirm' => 'Are you sure you want to add a content warning to this post?',
-		'modCWSuccess' => 'Successfully added content warning',
-		'modRemoveCWConfirm' => 'Are you sure you want to remove the content warning on this post?',
-		'modRemoveCWSuccess' => 'Successfully removed content warning',
-		'modUnlistConfirm' => 'Are you sure you want to unlist this post?',
-		'modUnlistSuccess' => 'Successfully unlisted post',
-		'modMarkAsSpammerConfirm' => 'Are you sure you want to mark this user as a spammer? All existing and future posts will be unlisted on timelines and a content warning will be applied.',
-		'modMarkAsSpammerSuccess' => 'Successfully marked account as spammer',
+		'modAddCWConfirm' => 'คุณแน่ใจหรือไม่ว่าต้องการที่จะเพิ่มคำเตือนในเนื้อหาโพสต์นี้?',
+		'modCWSuccess' => 'สำเร็จแล้วได้เพิ่มคำเตือนเนื้อหา',
+		'modRemoveCWConfirm' => 'คุณแน่ใจหรือไม่ว่าต้องการที่จะลบคำเตือนเนื้อหาในโพสต์นี้?',
+		'modRemoveCWSuccess' => 'สำเร็จแล้วได้ลบคำเตือนเนื้อหา',
+		'modUnlistConfirm' => 'คุณแน่ใจหรือไม่ว่าต้องการที่จะไม่แสดงในโพสต์นี้?',
+		'modUnlistSuccess' => 'ไม่แสดงโพสต์สำเร็จแล้ว',
+		'modMarkAsSpammerConfirm' => 'คุณแน่ใจว่าจะทำเครื่องหมายผู้ใช้รายนี้ว่าเป็นสแปม? โพสต์ที่มีอยู่และในอนาคตจะถูกนำออกจากไทม์ไลน์และใส่คำเตือนเนื้อหา',
+		'modMarkAsSpammerSuccess' => 'ทำเครื่องหมายบัญชีบอกว่าเป็นสแปมเมอร์สำเร็จแล้ว',
 
-		'toFollowers' => 'to Followers',
+		'toFollowers' => 'ถึงผู้ติดตาม',
 
-		'showCaption' => 'Show Caption',
-		'showLikes' => 'Show Likes',
-		'compactMode' => 'Compact Mode',
-		'embedConfirmText' => 'By using this embed, you agree to our',
+		'showCaption' => 'แสดงคำบรรยายภาพ',
+		'showLikes' => 'แสดงไลค์',
+		'compactMode' => 'โหมดกะทัดรัด',
+		'embedConfirmText' => 'การใช้ตัวฝังนี้แสดงว่าคุณยอมรับของเรา',
 
-		'deletePostConfirm' => 'Are you sure you want to delete this post?',
-		'archivePostConfirm' => 'Are you sure you want to archive this post?',
-		'unarchivePostConfirm' => 'Are you sure you want to unarchive this post?',
+		'deletePostConfirm' => 'คุณแน่ใจหรือไม่ว่าต้องการลบโพสต์นี้?',
+		'archivePostConfirm' => 'คุณแน่ใจว่าจะเก็บโพสต์นี้ถาวร?',
+		'unarchivePostConfirm' => 'คุณแน่ใจว่าจะเลิกเก็บโพสต์นี้ถาวร?',
 	],
 
 	'story' => [
-		'add' => 'Add Story'
+		'add' => 'เพิ่มเรื่องราว'
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'People you may know'
-	]
+		'peopleYouMayKnow' => 'คนที่คุณอาจรู้จัก',
+
+		'onboarding' => [
+			'welcome' => 'ยินดีต้อนรับ',
+			'thisIsYourHomeFeed' => 'นี่คือโฮมฟีดของคุณ ซึ่งเป็นฟีดที่จะแสดงโพสต์ตามลำดับเวลาจากบัญชีที่คุณติดตาม',
+			'letUsHelpYouFind' => 'ให้เราช่วยคุณค้นหาผู้คนที่น่าสนใจเพื่อติดตาม',
+			'refreshFeed' => 'รีเฟรชฟีดของฉัน',
+		],
+	],
+
+	'hashtags' => [
+		'emptyFeed' => 'ไม่พบโพสต์สำหรับแฮชแท็กนี้'
+	],
+
+	'report' => [
+		'report' => 'รายงาน',
+		'selectReason' => 'เลือกเหตุผล',
+		'reported' => 'รายงานแล้ว',
+		'sendingReport' => 'กำลังส่งรายงาน',
+		'thanksMsg' => 'ขอบคุณสำหรับรายงานของคุณ เพื่อช่วยให้ชุมชนและผู้คนของเราปลอดภัย!',
+		'contactAdminMsg' => 'หากคุณต้องการติดต่อผู้ดูแลระบบเกี่ยวกับโพสต์หรือรายงาน',
+	],
 
 ];
diff --git a/resources/lang/tr/web.php b/resources/lang/tr/web.php
index 032c9d828..7c7d55090 100644
--- a/resources/lang/tr/web.php
+++ b/resources/lang/tr/web.php
@@ -4,15 +4,16 @@ return [
 
 	'common' => [
 		'comment' => 'Yorum',
-		'commented' => 'Yorumlar',
+		'commented' => 'Yorumladı',
 		'comments' => 'Yorumlar',
 		'like' => 'Beğen',
 		'liked' => 'Beğenildi',
-		'likes' => 'Beğeniler',
+		'likes' => 'Beğenenler',
 		'share' => 'Paylaş',
-		'shared' => 'Paylaşılan',
+		'shared' => 'Paylaşıldı',
 		'shares' => 'Paylaşılanlar',
 		'unshare' => 'Paylaşımı kaldır',
+		'bookmark' => 'Yerimi',
 
 		'cancel' => 'İptal',
 		'copyLink' => 'Bağlantıyı Kopyala',
@@ -21,10 +22,14 @@ return [
 		'errorMsg' => 'Bir şeyler yanlış gitti. Lütfen daha sonra tekrar deneyiniz.',
 		'oops' => 'Hay aksi!',
 		'other' => 'Diğer',
-		'readMore' => 'Daha fazlasını oku',
+		'readMore' => 'Daha fazlası',
 		'success' => 'Başarılı',
+		'proceed' => 'İlerleyiniz',
+		'next' => 'İleri',
+		'close' => 'Kapat',
+		'clickHere' => 'buraya tıklayın',
 
-		'sensitive' => 'Hassasiyet',
+		'sensitive' => 'Hassas',
 		'sensitiveContent' => 'Hassas içerik',
 		'sensitiveContentWarning' => 'Bu ileti hassas içerik içeriyor olabilir',
 	],
@@ -35,17 +40,17 @@ return [
 	],
 
 	'navmenu' => [
-		'search' => 'Arama',
+		'search' => 'Ara',
 		'admin' => 'Yönetici Paneli',
 
 		// Timelines
-		'homeFeed' => 'Home Feed',
+		'homeFeed' => 'Anasayfa',
 		'localFeed' => 'Yerel Akış',
 		'globalFeed' => 'Evrensel Akış',
 
 		// Core features
 		'discover' => 'Keşfet',
-		'directMessages' => 'Direkt Mesajlar',
+		'directMessages' => 'Doğrudan Mesajlar',
 		'notifications' => 'Bildirimler',
 		'groups' => 'Gruplar',
 		'stories' => 'Hikayeler',
@@ -55,7 +60,7 @@ return [
 		'drive' => 'Depolama',
 		'settings' => 'Ayarlar',
 		'compose' => 'Yeni oluştur',
-		'logout' => 'Logout',
+		'logout' => 'Oturumu kapat',
 
 		// Nav footer
 		'about' => 'Hakkında',
@@ -75,35 +80,36 @@ return [
 	],
 
 	'notifications' => [
-		'liked' => 'liked your',
-		'commented' => 'commented on your',
-		'reacted' => 'reacted to your',
-		'shared' => 'shared your',
-		'tagged' => 'tagged you in a',
+		'liked' => 'beğendim',
+		'commented' => 'yorum yazdı',
+		'reacted' => 'tepki verdi',
+		'shared' => 'paylaştı',
+		'tagged' => 'sizi etiketledi',
 
-		'updatedA' => 'updated a',
-		'sentA' => 'sent a',
+		'updatedA' => 'güncel bir',
+		'sentA' => 'gönderdi',
 
-		'followed' => 'followed',
-		'mentioned' => 'mentioned',
+		'followed' => 'takip etti',
+		'mentioned' => 'bahsetti',
 		'you' => 'sen',
 
 		'yourApplication' => 'Katılma isteğiniz',
 		'applicationApproved' => 'onaylandı!',
 		'applicationRejected' => 'reddedildi. 6 ay sonra, tekrar katılma isteğinde bulunabilirsiniz.',
 
-		'dm' => 'özel mesaj',
-		'groupPost' => 'group post',
+		'dm' => 'dm',
+		'groupPost' => 'grup gönderisi',
 		'modlog' => 'modlog',
-		'post' => 'post',
+		'post' => 'gönderi',
 		'story' => 'hikaye',
+		'noneFound' => 'Bildirim bulunamadı',
 	],
 
 	'post' => [
-		'shareToFollowers' => 'Takipçileri paylaş',
-		'shareToOther' => 'Share to other',
+		'shareToFollowers' => 'Takipçilerle paylaş',
+		'shareToOther' => 'Diğerleriyle paylaş',
 		'noLikes' => 'Henüz beğenilmedi',
-		'uploading' => 'Yükleniyor',
+		'uploading' => 'Karşıya Yükleniyor',
 	],
 
 	'profile' => [
@@ -111,43 +117,43 @@ return [
 		'followers' => 'Takipçiler',
 		'following' => 'Takip ediliyor',
 		'admin' => 'Yönetici',
-		'collections' => 'Koleksiyonlar',
+		'collections' => 'Derlemeler',
 		'follow' => 'Takip et',
 		'unfollow' => 'Takibi bırak',
 		'editProfile' => 'Profili Düzenle',
 		'followRequested' => 'Takip İsteği',
 		'joined' => 'Katıldı',
 
-		'emptyCollections' => 'We can\'t seem to find any collections',
-		'emptyPosts' => 'We can\'t seem to find any posts',
+		'emptyCollections' => 'Herhangi bir koleksiyon bulunmuyor',
+		'emptyPosts' => 'Herhangi bir gönderi bulunmuyor',
 	],
 
 	'menu' => [
 		'viewPost' => 'Gönderiyi görüntüle',
 		'viewProfile' => 'Profili Görüntüle',
-		'moderationTools' => 'Denetim Ayarları',
+		'moderationTools' => 'Denetim Araçları',
 		'report' => 'Bildir',
-		'archive' => 'Archive',
+		'archive' => 'Arşiv',
 		'unarchive' => 'Arşivden çıkar',
-		'embed' => 'Embed',
+		'embed' => 'Yerleştir',
 
 		'selectOneOption' => 'Aşağıdaki seçeneklerden birini seçin',
 		'unlistFromTimelines' => 'Akışlardan kaldır',
 		'addCW' => 'İçerik Uyarısını Ekle',
 		'removeCW' => 'İçerik Uyarısını Kaldır',
-		'markAsSpammer' => 'Mark as Spammer',
-		'markAsSpammerText' => 'Unlist + CW existing and future posts',
-		'spam' => 'İstenmeyen',
+		'markAsSpammer' => 'İstenmeyen İleti Göndericisi Olarak İşaretle',
+		'markAsSpammerText' => 'Mevcut ve gelecekteki gönderileri + CW listesini kaldırın',
+		'spam' => 'İstenmeyen posta',
 		'sensitive' => 'Hassas içerik',
 		'abusive' => 'İstismarcı veya Zararlı',
-		'underageAccount' => 'Underage Account',
+		'underageAccount' => 'Yaşı Tutmayan Hesap',
 		'copyrightInfringement' => 'Telif hakkı ihlali',
 		'impersonation' => 'Taklit Hesap',
 		'scamOrFraud' => 'Dolandırıcılık',
 		'confirmReport' => 'Bildirimi onayla',
 		'confirmReportText' => 'Bu paylaşımı bildirmek istediğinizden emin misiniz?',
 		'reportSent' => 'Rapor Gönderildi!',
-		'reportSentText' => 'Raporunuzu başarıyla aldık.',
+		'reportSentText' => 'Raporunuzu başarılı bir şekilde aldık.',
 		'reportSentError' => 'Bu gönderi bildirilirken bir sorun oluştu.',
 
 		'modAddCWConfirm' => 'Bu gönderiye bir içerik uyarısı eklemek istediğinizden emin misiniz?',
@@ -164,7 +170,7 @@ return [
 		'showCaption' => 'Açıklamayı göster',
 		'showLikes' => 'Beğenileri Göster',
 		'compactMode' => 'Kompakt Mod',
-		'embedConfirmText' => 'By using this embed, you agree to our',
+		'embedConfirmText' => 'Bu gömüyü kullanarak,',
 
 		'deletePostConfirm' => 'Bu gönderiyi silmek istediğinizden emin misiniz?',
 		'archivePostConfirm' => 'Bu gönderiyi arşivlemek istediğinizden emin misiniz?',
@@ -176,11 +182,27 @@ return [
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'Tanıyor olabileceğin kişiler'
+		'peopleYouMayKnow' => 'Tanıyor olabileceğin kişiler',
+
+		'onboarding' => [
+			'welcome' => 'Hoş Geldiniz',
+			'thisIsYourHomeFeed' => 'Burası sizin akış sayfanız, takip ettiğiniz hesapların paylaşımları kronolojik gösterilir.',
+			'letUsHelpYouFind' => 'Takip etmek için size bazı ilginç kişileri bulmanızda yardımcı olalım',
+			'refreshFeed' => 'Akışımı yenile',
+		],
 	],
 
 	'hashtags' => [
-		'emptyFeed' => 'We can\'t seem to find any posts for this hashtag'
+		'emptyFeed' => 'Bu etiket ile ilgili bir gönderi bulamıyoruz'
+	],
+
+	'report' => [
+		'report' => 'Bildir',
+		'selectReason' => 'Bir sebep seçin',
+		'reported' => 'Bildirildi',
+		'sendingReport' => 'Bildiri gönderiliyor',
+		'thanksMsg' => 'Bildirdiğiniz için teşekkürler, sizin gibi insanlar sayesinde topluluğumuz güvende kalıyor!',
+		'contactAdminMsg' => 'Eğer bu gönderi veya bildirim hakkında bir yönetici ile irtibata geçmek istiyorsanız',
 	],
 
 ];
diff --git a/resources/lang/vi/web.php b/resources/lang/vi/web.php
index 5e116d800..79a309f01 100644
--- a/resources/lang/vi/web.php
+++ b/resources/lang/vi/web.php
@@ -13,6 +13,7 @@ return [
 		'shared' => 'Đã chia sẻ',
 		'shares' => 'Lượt chia sẻ',
 		'unshare' => 'Hủy chia sẻ',
+		'bookmark' => 'Lưu',
 
 		'cancel' => 'Hủy',
 		'copyLink' => 'Chép link',
@@ -23,6 +24,10 @@ return [
 		'other' => 'Khác',
 		'readMore' => 'Xem thêm',
 		'success' => 'Hoàn tất',
+		'proceed' => 'Tiếp tục',
+		'next' => 'Tiếp theo',
+		'close' => 'Đóng',
+		'clickHere' => 'nhấn vào đây',
 
 		'sensitive' => 'Nhạy cảm',
 		'sensitiveContent' => 'Nội dung nhạy cảm',
@@ -78,7 +83,7 @@ return [
 		'liked' => 'đã thích ảnh',
 		'commented' => 'bình luận về ảnh',
 		'reacted' => 'xem ảnh',
-		'shared' => 'chia sẻ ảnh',
+		'shared' => 'đã chia sẻ',
 		'tagged' => 'nhắc đến bạn trong',
 
 		'updatedA' => 'đã cập nhật',
@@ -97,6 +102,7 @@ return [
 		'modlog' => 'nhật ký kiểm duyệt',
 		'post' => 'bài đăng',
 		'story' => 'khoảnh khắc',
+		'noneFound' => 'Không có thông báo mới',
 	],
 
 	'post' => [
@@ -172,15 +178,31 @@ return [
 	],
 
 	'story' => [
-		'add' => 'Thêm khoảnh khắc'
+		'add' => 'Khoảnh khắc'
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'Những người bạn có thể biết'
+		'peopleYouMayKnow' => 'Những người bạn có thể biết',
+
+		'onboarding' => [
+			'welcome' => 'Chào mừng',
+			'thisIsYourHomeFeed' => 'Đây là bảng tin của bạn, được xếp theo thứ tự thời gian với những tài khoản mà bạn theo dõi.',
+			'letUsHelpYouFind' => 'Đây là vài người thú vị mà bạn nên theo dõi',
+			'refreshFeed' => 'Làm tươi bảng tin',
+		],
 	],
 
 	'hashtags' => [
 		'emptyFeed' => 'Không tìm thấy ảnh nào với hashtag này'
 	],
 
+	'report' => [
+		'report' => 'Báo cáo',
+		'selectReason' => 'Chọn một lý do',
+		'reported' => 'Bị báo cáo',
+		'sendingReport' => 'Đang gửi báo cáo...',
+		'thanksMsg' => 'Cảm ơn đã gửi báo cáo, bạn đã giúp cộng đồng sạch hơn!',
+		'contactAdminMsg' => 'Nếu cần thiết, hãy liên hệ quản trị viên về ảnh này hoặc báo cáo',
+	],
+
 ];
diff --git a/resources/lang/zh/web.php b/resources/lang/zh/web.php
index 3844f847a..e7e76f845 100644
--- a/resources/lang/zh/web.php
+++ b/resources/lang/zh/web.php
@@ -3,119 +3,125 @@
 return [
 
 	'common' => [
-		'comment' => 'Comment',
-		'commented' => 'Commented',
-		'comments' => 'Comments',
-		'like' => 'Like',
-		'liked' => 'Liked',
-		'likes' => 'Likes',
-		'share' => 'Share',
-		'shared' => 'Shared',
-		'shares' => 'Shares',
-		'unshare' => 'Unshare',
+		'comment' => '評論',
+		'commented' => '已評論',
+		'comments' => '條意見評論',
+		'like' => '按讚',
+		'liked' => '已按讚',
+		'likes' => '個人已按讚',
+		'share' => '分享',
+		'shared' => '已分享',
+		'shares' => '次分享',
+		'unshare' => '取消分享',
+		'bookmark' => '書籤',
 
-		'cancel' => 'Cancel',
-		'copyLink' => 'Copy Link',
-		'delete' => 'Delete',
-		'error' => 'Error',
-		'errorMsg' => 'Something went wrong. Please try again later.',
-		'oops' => 'Oops!',
-		'other' => 'Other',
-		'readMore' => 'Read more',
-		'success' => 'Success',
+		'cancel' => '取消',
+		'copyLink' => '複製連結',
+		'delete' => '删除',
+		'error' => '錯誤',
+		'errorMsg' => '出了點小問題，請稍後重試。',
+		'oops' => '呃…',
+		'other' => '其他',
+		'readMore' => '繼續讀下去',
+		'success' => '成功',
+		'proceed' => '繼續',
+		'next' => '下一個',
+		'close' => '關閉',
+		'clickHere' => '點擊此處',
 
-		'sensitive' => 'Sensitive',
-		'sensitiveContent' => 'Sensitive Content',
-		'sensitiveContentWarning' => 'This post may contain sensitive content',
+		'sensitive' => '敏感內容',
+		'sensitiveContent' => '敏感內容',
+		'sensitiveContentWarning' => '這篇文可能包含敏感內容',
 	],
 
 	'site' => [
-		'terms' => 'Terms of Use',
-		'privacy' => 'Privacy Policy',
+		'terms' => '使用條款',
+		'privacy' => '隱私權政策',
 	],
 
 	'navmenu' => [
-		'search' => 'Search',
-		'admin' => 'Admin Dashboard',
+		'search' => '搜尋',
+		'admin' => '管理儀表板',
 
 		// Timelines
-		'homeFeed' => 'Home Feed',
-		'localFeed' => 'Local Feed',
-		'globalFeed' => 'Global Feed',
+		'homeFeed' => '首頁動態',
+		'localFeed' => '站內動態',
+		'globalFeed' => '聯邦動態',
 
 		// Core features
-		'discover' => 'Discover',
-		'directMessages' => 'Direct Messages',
-		'notifications' => 'Notifications',
-		'groups' => 'Groups',
-		'stories' => 'Stories',
+		'discover' => '探索',
+		'directMessages' => '私人訊息',
+		'notifications' => '通知',
+		'groups' => '群組',
+		'stories' => '限時動態',
 
 		// Self links
-		'profile' => 'Profile',
+		'profile' => '個人檔案',
 		'drive' => 'Drive',
-		'settings' => 'Settings',
-		'compose' => 'Create New',
-		'logout' => 'Logout',
+		'settings' => '設定',
+		'compose' => '新增',
+		'logout' => '登出',
 
 		// Nav footer
-		'about' => 'About',
-		'help' => 'Help',
-		'language' => 'Language',
-		'privacy' => 'Privacy',
-		'terms' => 'Terms',
+		'about' => '關於',
+		'help' => '説明',
+		'language' => '語言',
+		'privacy' => '隱私權',
+		'terms' => '條款',
 
 		// Temporary links
-		'backToPreviousDesign' => 'Go back to previous design'
+		'backToPreviousDesign' => '回到先前的設計'
 	],
 
 	'directMessages' => [
-		'inbox' => 'Inbox',
-		'sent' => 'Sent',
-		'requests' => 'Requests'
+		'inbox' => '收件夾',
+		'sent' => '寄件夾',
+		'requests' => '請求'
 	],
 
 	'notifications' => [
-		'liked' => 'liked your',
-		'commented' => 'commented on your',
-		'reacted' => 'reacted to your',
-		'shared' => 'shared your',
+		'liked' => '喜歡你的',
+		'commented' => '評論了你的',
+		'reacted' => '反應了你的',
+		'shared' => '分享了你的',
 		'tagged' => 'tagged you in a',
 
 		'updatedA' => 'updated a',
 		'sentA' => 'sent a',
 
-		'followed' => 'followed',
-		'mentioned' => 'mentioned',
-		'you' => 'you',
+		'followed' => '已關注',
+		'mentioned' => '被提及',
+		'you' => '你',
 
-		'yourApplication' => 'Your application to join',
-		'applicationApproved' => 'was approved!',
-		'applicationRejected' => 'was rejected. You can re-apply to join in 6 months.',
+		'yourApplication' => '您的加入申請',
+		'applicationApproved' => '被批准了！',
+		'applicationRejected' => '被拒絕。您可以在 6 個月後再次申請加入。',
 
-		'dm' => 'dm',
+		'dm' => '直接訊息',
 		'groupPost' => 'group post',
 		'modlog' => 'modlog',
 		'post' => 'post',
 		'story' => 'story',
+		'noneFound' => 'No notifications found',
 	],
 
 	'post' => [
 		'shareToFollowers' => 'Share to followers',
 		'shareToOther' => 'Share to other',
 		'noLikes' => 'No likes yet',
-		'uploading' => 'Uploading',
+		'uploading' => '上傳中',
 	],
 
 	'profile' => [
 		'posts' => 'Posts',
-		'followers' => 'Followers',
-		'following' => 'Following',
-		'admin' => 'Admin',
+		'followers' => '跟隨者',
+		'following' => '追蹤中',
+		'admin' => '管理員',
 		'collections' => 'Collections',
-		'follow' => 'Follow',
-		'unfollow' => 'Unfollow',
-		'editProfile' => 'Edit Profile',
-		'followRequested' => 'Follow Requested',
+		'follow' => '追蹤',
+		'unfollow' => '取消追蹤',
+		'editProfile' => '編輯個人檔案',
+		'followRequested' => '追蹤請求',
 		'joined' => 'Joined',
 
 		'emptyCollections' => 'We can\'t seem to find any collections',
@@ -126,61 +132,77 @@ return [
 		'viewPost' => 'View Post',
 		'viewProfile' => 'View Profile',
 		'moderationTools' => 'Moderation Tools',
-		'report' => 'Report',
-		'archive' => 'Archive',
-		'unarchive' => 'Unarchive',
-		'embed' => 'Embed',
+		'report' => '檢舉',
+		'archive' => '封存',
+		'unarchive' => '取消封存',
+		'embed' => '嵌入',
 
-		'selectOneOption' => 'Select one of the following options',
-		'unlistFromTimelines' => 'Unlist from Timelines',
-		'addCW' => 'Add Content Warning',
-		'removeCW' => 'Remove Content Warning',
-		'markAsSpammer' => 'Mark as Spammer',
-		'markAsSpammerText' => 'Unlist + CW existing and future posts',
-		'spam' => 'Spam',
-		'sensitive' => 'Sensitive Content',
-		'abusive' => 'Abusive or Harmful',
-		'underageAccount' => 'Underage Account',
-		'copyrightInfringement' => 'Copyright Infringement',
-		'impersonation' => 'Impersonation',
-		'scamOrFraud' => 'Scam or Fraud',
-		'confirmReport' => 'Confirm Report',
-		'confirmReportText' => 'Are you sure you want to report this post?',
-		'reportSent' => 'Report Sent!',
-		'reportSentText' => 'We have successfully received your report.',
-		'reportSentError' => 'There was an issue reporting this post.',
+		'selectOneOption' => '選擇以下選項之一',
+		'unlistFromTimelines' => '不在時間軸中上顯示',
+		'addCW' => '增加內容警告',
+		'removeCW' => '移除內容警告',
+		'markAsSpammer' => '標記為垃圾訊息來源者',
+		'markAsSpammerText' => '對計有及未來貼文設定成不列出和增加內容警告',
+		'spam' => '垃圾訊息',
+		'sensitive' => '敏感內容',
+		'abusive' => '辱罵或有害',
+		'underageAccount' => '未成年帳號',
+		'copyrightInfringement' => '侵犯版權',
+		'impersonation' => '假冒帳號',
+		'scamOrFraud' => '詐騙內容',
+		'confirmReport' => '確認檢舉',
+		'confirmReportText' => '你確定要檢舉這篇貼文？',
+		'reportSent' => '檢舉已送出！',
+		'reportSentText' => '我們已經收到你的檢舉。',
+		'reportSentError' => '檢舉此貼文時出現問題。',
 
-		'modAddCWConfirm' => 'Are you sure you want to add a content warning to this post?',
-		'modCWSuccess' => 'Successfully added content warning',
-		'modRemoveCWConfirm' => 'Are you sure you want to remove the content warning on this post?',
-		'modRemoveCWSuccess' => 'Successfully removed content warning',
+		'modAddCWConfirm' => '您確定要為此貼文添加內容警告嗎？',
+		'modCWSuccess' => '成功添加內容警告',
+		'modRemoveCWConfirm' => '您確定要刪除此貼文上的內容警告嗎？',
+		'modRemoveCWSuccess' => '已成功刪除內容警告',
 		'modUnlistConfirm' => 'Are you sure you want to unlist this post?',
 		'modUnlistSuccess' => 'Successfully unlisted post',
-		'modMarkAsSpammerConfirm' => 'Are you sure you want to mark this user as a spammer? All existing and future posts will be unlisted on timelines and a content warning will be applied.',
-		'modMarkAsSpammerSuccess' => 'Successfully marked account as spammer',
+		'modMarkAsSpammerConfirm' => '您確定要將此使用者標記為垃圾訊息發送者嗎？所有現有和未來的貼文將改為非公開，並將加上內容警告。',
+		'modMarkAsSpammerSuccess' => '已成功將帳戶標記為垃圾訊息發送者',
 
-		'toFollowers' => 'to Followers',
+		'toFollowers' => '給關注者',
 
-		'showCaption' => 'Show Caption',
-		'showLikes' => 'Show Likes',
-		'compactMode' => 'Compact Mode',
-		'embedConfirmText' => 'By using this embed, you agree to our',
+		'showCaption' => '顯示文字說明',
+		'showLikes' => '顯示喜歡',
+		'compactMode' => '緊湊模式',
+		'embedConfirmText' => '使用此嵌入式內容即表示您同意我們的',
 
-		'deletePostConfirm' => 'Are you sure you want to delete this post?',
-		'archivePostConfirm' => 'Are you sure you want to archive this post?',
-		'unarchivePostConfirm' => 'Are you sure you want to unarchive this post?',
+		'deletePostConfirm' => '你確定要刪除此貼文？',
+		'archivePostConfirm' => '您確定要封存此貼文嗎？',
+		'unarchivePostConfirm' => '您確定要解除封存此貼文嗎？',
 	],
 
 	'story' => [
-		'add' => 'Add Story'
+		'add' => '新增故事'
 	],
 
 	'timeline' => [
-		'peopleYouMayKnow' => 'People you may know'
+		'peopleYouMayKnow' => '你可能認識',
+
+		'onboarding' => [
+			'welcome' => '歡迎',
+			'thisIsYourHomeFeed' => 'This is your home feed, a chronological feed of posts from accounts you follow.',
+			'letUsHelpYouFind' => 'Let us help you find some interesting people to follow',
+			'refreshFeed' => '更新我的源',
+		],
 	],
 
 	'hashtags' => [
-		'emptyFeed' => 'We can\'t seem to find any posts for this hashtag'
+		'emptyFeed' => '我們似乎找不到此主題標籤的任何貼文'
+	],
+
+	'report' => [
+		'report' => '檢舉',
+		'selectReason' => '選擇一個理由',
+		'reported' => '已檢舉',
+		'sendingReport' => '送出檢舉',
+		'thanksMsg' => '感謝你的檢舉讓世界更美好！',
+		'contactAdminMsg' => '如果你想要提供更多有關本次檢舉的內容給管理員',
 	],
 
 ];
diff --git a/resources/views/account/moderation/post/autospam.blade.php b/resources/views/account/moderation/post/autospam.blade.php
index 91296759d..d16d85f3e 100644
--- a/resources/views/account/moderation/post/autospam.blade.php
+++ b/resources/views/account/moderation/post/autospam.blade.php
@@ -69,7 +69,7 @@
 		<div class="col-12 col-md-6 offset-md-3 my-3">
 			<div class="border rounded p-3 border-primary">
 				<p class="h4 font-weight-bold pt-2 text-primary">Review the Community Guidelines</p>
-				<p class="lead pt-4 text-primary">We want to keep {{config('app.name')}} a safe place for everyone, and we created these <a class="font-weight-bold text-primary" href="{{route('help.community-guidelines')}}">Community Guidelines</a> to support and protect our community.</p>
+				<p class="lead pt-4 text-primary">We want to keep {{config_cache('app.name')}} a safe place for everyone, and we created these <a class="font-weight-bold text-primary" href="{{route('help.community-guidelines')}}">Community Guidelines</a> to support and protect our community.</p>
 			</div>
 		</div>
 
@@ -100,4 +100,4 @@
 	ctx.putImageData(imageData, 0, 0);
 </script>
 @endif
-@endpush
\ No newline at end of file
+@endpush
diff --git a/resources/views/account/moderation/post/cw.blade.php b/resources/views/account/moderation/post/cw.blade.php
index d1e1d3537..bffa7a186 100644
--- a/resources/views/account/moderation/post/cw.blade.php
+++ b/resources/views/account/moderation/post/cw.blade.php
@@ -70,7 +70,7 @@
 		<div class="col-12 col-md-6 offset-md-3 my-3">
 			<div class="border rounded p-3 border-primary">
 				<p class="h4 font-weight-bold pt-2 text-primary">Review the Community Guidelines</p>
-				<p class="lead pt-4 text-primary">We want to keep {{config('app.name')}} a safe place for everyone, and we created these <a class="font-weight-bold text-primary" href="{{route('help.community-guidelines')}}">Community Guidelines</a> to support and protect our community.</p>
+				<p class="lead pt-4 text-primary">We want to keep {{config_cache('app.name')}} a safe place for everyone, and we created these <a class="font-weight-bold text-primary" href="{{route('help.community-guidelines')}}">Community Guidelines</a> to support and protect our community.</p>
 			</div>
 		</div>
 
@@ -127,4 +127,4 @@
 	ctx.putImageData(imageData, 0, 0);
 </script>
 @endif
-@endpush
\ No newline at end of file
+@endpush
diff --git a/resources/views/account/moderation/post/removed.blade.php b/resources/views/account/moderation/post/removed.blade.php
index 123863489..4b8a1fee4 100644
--- a/resources/views/account/moderation/post/removed.blade.php
+++ b/resources/views/account/moderation/post/removed.blade.php
@@ -62,7 +62,7 @@
 		<div class="col-12 col-md-6 offset-md-3 my-3">
 			<div class="border rounded p-3 border-primary">
 				<p class="h4 font-weight-bold pt-2 text-primary">Review the Community Guidelines</p>
-				<p class="lead pt-4 text-primary">We want to keep {{config('app.name')}} a safe place for everyone, and we created these <a class="font-weight-bold text-primary" href="{{route('help.community-guidelines')}}">Community Guidelines</a> to support and protect our community.</p>
+				<p class="lead pt-4 text-primary">We want to keep {{config_cache('app.name')}} a safe place for everyone, and we created these <a class="font-weight-bold text-primary" href="{{route('help.community-guidelines')}}">Community Guidelines</a> to support and protect our community.</p>
 			</div>
 		</div>
 		<div class="col-12 col-md-6 offset-md-3 mt-4 mb-5">
@@ -96,4 +96,4 @@
 	ctx.putImageData(imageData, 0, 0);
 </script>
 @endif
-@endpush
\ No newline at end of file
+@endpush
diff --git a/resources/views/account/moderation/post/unlist.blade.php b/resources/views/account/moderation/post/unlist.blade.php
index 3c86acb76..4f62a10bb 100644
--- a/resources/views/account/moderation/post/unlist.blade.php
+++ b/resources/views/account/moderation/post/unlist.blade.php
@@ -69,7 +69,7 @@
 		<div class="col-12 col-md-6 offset-md-3 my-3">
 			<div class="border rounded p-3 border-primary">
 				<p class="h4 font-weight-bold pt-2 text-primary">Review the Community Guidelines</p>
-				<p class="lead pt-4 text-primary">We want to keep {{config('app.name')}} a safe place for everyone, and we created these <a class="font-weight-bold text-primary" href="{{route('help.community-guidelines')}}">Community Guidelines</a> to support and protect our community.</p>
+				<p class="lead pt-4 text-primary">We want to keep {{config_cache('app.name')}} a safe place for everyone, and we created these <a class="font-weight-bold text-primary" href="{{route('help.community-guidelines')}}">Community Guidelines</a> to support and protect our community.</p>
 			</div>
 		</div>
 
@@ -125,4 +125,4 @@
 	ctx.putImageData(imageData, 0, 0);
 </script>
 @endif
-@endpush
\ No newline at end of file
+@endpush
diff --git a/resources/views/admin/curated-register/index.blade.php b/resources/views/admin/curated-register/index.blade.php
new file mode 100644
index 000000000..a1564b971
--- /dev/null
+++ b/resources/views/admin/curated-register/index.blade.php
@@ -0,0 +1,311 @@
+@extends('admin.partial.template-full')
+
+@section('section')
+</div><div class="header bg-primary pb-3 mt-n4">
+    <div class="container-fluid">
+        <div class="header-body">
+            <div class="row align-items-center py-4">
+                <div class="col-lg-8 col-12">
+                    <p class="display-1 text-white d-inline-block mb-0">Curated Onboarding</p>
+                    <p class="text-white mb-0">The ideal solution for communities seeking a balance between open registration and invite-only membership</p>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+@if((bool) config_cache('instance.curated_registration.enabled'))
+<div class="m-n2 m-lg-4">
+    <div class="container-fluid mt-4">
+        @include('admin.curated-register.partials.nav')
+
+        @if($records && $records->count())
+        <div class="select-all-menu" style="display: none;">
+            <form class="form-inline" id="select-form">
+                <p class="mb-2 align-middle text-sm mr-2 font-weight-bold text-muted">Select an action:</p>
+                <label class="sr-only" for="actionInput">Action</label>
+                <select class="custom-select mb-2 mr-sm-2" id="actionInput">
+                    <option selected disabled>Select action</option>
+                    <option value="silently-reject-all" data-action="silently reject">Silently reject all</option>
+                    <option value="email-reject-all" data-action="reject all w/ email">Reject all w/ email</option>
+                    <option disabled value="">-------------------</option>
+                    <option value="request-info" data-action="request more info">Request more info</option>
+                    <option disabled value="">-------------------</option>
+                    <option value="approve-all" data-action="approve all">Approve all</option>
+                </select>
+                <button type="submit" class="btn btn-primary mb-2" id="actionInputButton" disabled>Submit</button>
+            </form>
+        </div>
+        <div class="table-responsive rounded">
+            <table class="table table-dark">
+                <thead class="thead-dark">
+                    <tr>
+                        <th scope="col">
+                            <div class="custom-control custom-checkbox">
+                                <input type="checkbox" class="custom-control-input" id="selectall">
+                                <label class="custom-control-label" for="selectall"></label>
+                            </div>
+                        </th>
+                        <th scope="col">ID</th>
+                        <th scope="col">Username</th>
+                        @if(in_array($filter, ['all', 'open', 'awaiting', 'responses']))
+                        <th scope="col">Status</th>
+                        @endif
+                        <th scope="col">Reason for Joining</th>
+                        <th scope="col">Email</th>
+                        <th scope="col">Created</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach($records as $record)
+                    <tr>
+                        <td>
+                            <div class="custom-control custom-checkbox">
+                                <input type="checkbox" class="custom-control-input account-select-check" id="r{{$record->id}}" data-id="{{$record->id}}">
+                                <label class="custom-control-label" for="r{{$record->id}}"></label>
+                            </div>
+                        </td>
+                        <td class="align-middle">
+                            <a href="/i/admin/curated-onboarding/show/{{$record->id}}" class="font-weight-bold">
+                                #{{ $record->id }}
+                            </a>
+                        </td>
+                        <td>
+                            <p class="font-weight-bold mb-0">
+                                &commat;{{ $record->username }}
+                            </p>
+                        </td>
+                        @if(in_array($filter, ['all', 'open', 'awaiting', 'responses']))
+                        <td class="align-middle">
+                            {!! $record->adminStatusLabel() !!}
+                        </td>
+                        @endif
+                        <td class="align-middle">
+                            {{ str_limit($record->reason_to_join, 100) }}
+                        </td>
+                        <td class="align-middle">
+                            <p class="mb-0">
+                                {{ str_limit(\Illuminate\Support\Str::mask($record->email, '*', 5, 10), 10) }}
+                            </p>
+                        </td>
+                        <td class="align-middle">{{ $record->created_at->diffForHumans() }}</td>
+                    </tr>
+                    @endforeach
+                </tbody>
+            </table>
+
+            <div class="d-flex mt-3">
+                {{ $records->links() }}
+            </div>
+        </div>
+        @else
+        <div class="card">
+            <div class="card-body">
+                <p class="text-center"><i class="far fa-check-circle fa-6x text-success"></i></p>
+                <p class="lead text-center">No {{ request()->filled('filter') ? request()->filter : 'open' }} applications found!</p>
+            </div>
+        </div>
+        @endif
+    </div>
+</div>
+@else
+@include('admin.curated-register.partials.not-enabled')
+@endif
+@endsection
+
+@push('scripts')
+<script type="text/javascript">
+    const menu = document.querySelector(".select-all-menu");
+    const selectAll = document.getElementById("selectall");
+    const checkboxes = document.querySelectorAll(".account-select-check");
+    const form = document.getElementById('select-form');
+    const action = document.getElementById('actionInput');
+    const actionBtn = document.getElementById('actionInputButton');
+
+    action.addEventListener("change", function() {
+        if([
+            'silently-reject-all',
+            'email-reject-all',
+            'request-info',
+            'approve-all'
+        ].includes(action.value)) {
+            actionBtn.removeAttribute('disabled')
+        } else {
+            actionBtn.setAttribute('disabled', 'disabled')
+        }
+    })
+
+    selectAll.addEventListener("change", function() {
+        checkboxes.forEach(function(checkbox) {
+            checkbox.checked = selectAll.checked;
+        });
+
+        if(selectAll.checked) {
+            menu.style.display = 'block';
+        } else {
+            menu.style.display = 'none';
+        }
+    });
+
+    checkboxes.forEach(function(checkbox) {
+        checkbox.addEventListener("change", function() {
+            let count = Array.from(checkboxes).filter(cb => cb.checked).length;
+
+            if(count > 1) {
+                menu.style.display = 'block';
+            } else {
+                menu.style.display = 'none';
+            }
+        })
+    })
+
+    form.addEventListener("submit", async function(event) {
+        event.preventDefault();
+        event.currentTarget?.blur();
+
+        const messages = await axios.get('/i/admin/api/curated-onboarding/templates/get')
+        .then(res => res.data);
+
+        let action = form.actionInput.value;
+        if(action === 'Select action') {
+            return;
+        }
+
+        let actionMap = {
+            'silently-reject-all': 'silently reject all these applications?',
+            'email-reject-all': 'reject and notify applicants via email?',
+            'request-info': 'request more info from these applicants?',
+            'approve-all': 'approve all these applicants?',
+        }
+
+        let wrapper = document.createElement('div');
+        let warning = document.createElement('p');
+        warning.classList.add('text-left');
+        warning.innerHTML = 'Are you sure you want to ' + actionMap[action];
+        wrapper.appendChild(warning)
+
+        swal({
+            title: "Confirm",
+            content: wrapper,
+            icon: "warning",
+            dangerMode: true,
+            buttons: {
+                cancel: "Cancel",
+                confirm: {
+                  text: "Proceed",
+                  value: "proceed",
+                }
+            },
+        })
+        .then(res => {
+            if(res === 'proceed') {
+                const ids = Array.from(checkboxes).filter(cb => cb.checked).map(el => el.getAttribute('data-id'));
+
+                if(action === 'request-info') {
+                    let wrapper = document.createElement('div');
+                    let warning = document.createElement('p');
+                    wrapper.classList.add('list-group')
+                    warning.classList.add('text-left');
+                    warning.innerHTML = 'Select a message to send:';
+                    wrapper.appendChild(warning);
+
+                    messages.forEach(m => {
+                        let mr = document.createElement('button');
+                        mr.classList.add('list-group-item');
+                        mr.innerHTML = m.name;
+                        mr.onclick = () => {
+                            swal.close();
+                            handleRequestType(m, ids)
+                        }
+                        wrapper.appendChild(mr);
+                    })
+
+                    swal({
+                        title: "Select Message Template",
+                        content: wrapper,
+                        icon: "warning",
+                        dangerMode: true,
+                        buttons: false,
+                    })
+                    return;
+                } else {
+                    ids.reduce((promiseChain, id) => {
+                        return promiseChain
+                        .then((result) => {
+                            return handleAction(id, action);
+                        })
+                        .catch((error) => {
+                            throw error;
+                        });
+                    }, Promise.resolve())
+                    .then(() => {
+                        console.log('All requests completed successfully');
+                        window.location.reload()
+                    })
+                    .catch((error) => {
+                        swal('Error', 'An error occured, please try again later!', 'error');
+                        console.error('Promise chain failed:', error);
+                    });
+                }
+            }
+        })
+    });
+
+    function handleRequestType(type, ids) {
+        swal({
+            title: 'Confirm Message Request',
+            text: type.content,
+            icon: "warning",
+            dangerMode: true,
+            buttons: {
+                cancel: "Cancel",
+                confirm: {
+                  text: "Proceed",
+                  value: "proceed",
+                }
+            }
+        }).then(res => {
+            if(res === 'proceed') {
+                ids.reduce((promiseChain, id) => {
+                    return promiseChain
+                    .then((result) => {
+                        return handleAction(id, 'request-info', type.content);
+                    })
+                    .catch((error) => {
+                        console.error(`Error fetching data for ID ${id}:`, error);
+                        throw error;
+                    });
+                }, Promise.resolve())
+                .then(() => {
+                    console.log('All requests completed successfully');
+                    window.location.reload()
+                })
+                .catch((error) => {
+                    swal('Error', 'An error occured, please try again later!', 'error');
+                    console.error('Promise chain failed:', error);
+                });
+            } else {
+                console.log(res)
+            }
+        })
+    }
+
+    function handleAction(id, type, msg = false) {
+        if(type === 'silently-reject-all') {
+            return axios.post(`/i/admin/api/curated-onboarding/show/${id}/reject`, {
+                action: 'reject-silent'
+            })
+        } else if(type === 'email-reject-all') {
+            return axios.post(`/i/admin/api/curated-onboarding/show/${id}/reject`, {
+                action: 'reject-email'
+            })
+        } else if(type === 'approve-all') {
+            return axios.post(`/i/admin/api/curated-onboarding/show/${id}/approve`)
+        } else if(type === 'request-info') {
+            axios.post(`/i/admin/api/curated-onboarding/show/${id}/message/send`, {
+                message: msg
+            })
+        }
+    }
+</script>
+@endpush
diff --git a/resources/views/admin/curated-register/partials/activity-log.blade.php b/resources/views/admin/curated-register/partials/activity-log.blade.php
new file mode 100644
index 000000000..d141a4424
--- /dev/null
+++ b/resources/views/admin/curated-register/partials/activity-log.blade.php
@@ -0,0 +1,515 @@
+<template v-if="loaded">
+@if($email_verified_at === null)
+<div class="alert alert-danger mb-3">
+    <p class="mb-0 font-weight-bold">Applicant has not verified their email address yet, action can not be taken at this time.</p>
+</div>
+@elseif($is_closed != true)
+<div class="d-flex justify-content-between flex-column flex-md-row mb-4" style="gap:1rem">
+    <button
+        class="btn btn-success bg-gradient-success rounded-pill"
+        v-on:click.prevent="handleAction('approve', $event)">
+        Approve
+    </button>
+    <button
+        class="btn btn-danger bg-gradient-danger rounded-pill flex-grow-1"
+        v-on:click.prevent="handleAction('reject', $event)">
+        Reject
+    </button>
+    <button
+        class="btn rounded-pill px-md-5"
+        :class="[ composeFormOpen ? 'btn-dark bg-gradient-dark' : 'btn-outline-dark' ]"
+        v-on:click.prevent="handleAction('request', $event)">
+        Request details
+    </button>
+    <button
+        class="btn rounded-pill px-md-5"
+        :class="[ messageFormOpen ? 'btn-dark bg-gradient-dark' : 'btn-outline-dark' ]"
+        v-on:click.prevent="handleAction('message', $event)">
+        Message
+    </button>
+</div>
+
+@else
+    @if($is_rejected == true)
+    <p>Application was <span class="font-weight-bold text-danger">rejected</span> on {{ $action_taken_at }}</p>
+    @elseif($is_approved == true)
+    <p>Application was <span class="font-weight-bold text-success">approved</span> on {{ $action_taken_at }}</p>
+    @else
+    <p>Application was closed on {{ $action_taken_at }}</p>
+    @endif
+@endif
+
+    <transition name="fade">
+        <div v-show="composeFormOpen">
+            <div class="card">
+                <div class="card-body pt-0">
+                    <p class="lead font-weight-bold text-center">Request Additional Details</p>
+                    <p class="text-muted">Use this form to request additional details. Once you press Send, we'll send the potential user an email with a special link they can visit with a form that they can provide additional details with. You can also Preview the email before it's sent.</p>
+
+                    <div v-if="responseTemplates && responseTemplates.length" class="my-3">
+                        <p class="small font-weight-bold mb-1">Template Responses</p>
+
+                        <div class="d-grid">
+                            <template v-for="tmpl in responseTemplates">
+                                <button
+                                    class="btn btn-lighter btn-sm py-1 font-weight-bold rounded-lg text-dark border border-muted px-3"
+                                    style="font-size: 13px;"
+                                    @click="useTemplate(tmpl)">
+                                    <i class="far fa-plus mr-1 text-muted"></i> @{{ tmpl.name.slice(0, 25) }}
+                                </button>
+                            </template>
+                        </div>
+                    </div>
+
+                    <div class="request-form">
+                        <div class="form-group">
+                            <label for="requestDetailsMessageInput" class="small text-muted">Your Message:</label>
+                            <textarea
+                                class="form-control text-dark"
+                                id="requestDetailsMessageInput"
+                                rows="5"
+                                v-model="composeMessage"
+                                style="white-space: pre-wrap;"
+                                placeholder="Enter your additional detail message here...">
+                            </textarea>
+                            <p class="help-text small text-right">
+                                <span>@{{ composeMessage && composeMessage.length ? composeMessage.length : 0 }}</span>
+                                <span>/</span>
+                                <span>2000</span>
+                            </p>
+                        </div>
+                        <div class="d-flex">
+                            <button
+                                type="button"
+                                class="btn btn-primary rounded-pill btn-sm px-4"
+                                v-on:click.prevent="handleSend()">
+                                Send
+                            </button>
+                            <a
+                                class="btn btn-dark rounded-pill btn-sm px-4"
+                                :href="previewDetailsMessageUrl"
+                                target="_blank">
+                                Preview
+                            </a>
+                            <a
+                                v-if="composeMessage && composeMessage.length"
+                                class="btn btn-outline-danger text-danger rounded-pill btn-sm px-4"
+                                @click="composeMessage = null">
+                                Clear
+                            </a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </transition>
+
+    <transition name="fade">
+        <div v-show="messageFormOpen">
+            <div class="card">
+                <div class="card-body pt-0">
+                    <p class="lead font-weight-bold text-center">Send Message</p>
+                    <p class="text-muted">Use this form to send a message to the applicant. Once you press Send, we'll send the potential user an email with your message. You can also Preview the email before it's sent.</p>
+
+                    <div v-if="responseTemplates && responseTemplates.length" class="my-3">
+                        <p class="small font-weight-bold mb-1">Template Responses</p>
+
+                        <div class="d-grid">
+                            <template v-for="tmpl in responseTemplates">
+                                <button
+                                    class="btn btn-lighter btn-sm py-1 font-weight-bold rounded-lg text-dark border border-muted px-3"
+                                    style="font-size: 13px;"
+                                    @click="useTemplateMessage(tmpl)">
+                                    <i class="far fa-plus mr-1 text-muted"></i> @{{ tmpl.name.slice(0, 25) }}
+                                </button>
+                            </template>
+                        </div>
+                    </div>
+
+                    <div class="request-form">
+                        <div class="form-group">
+                            <label for="sendMessageInput" class="small text-muted">Your Message:</label>
+                            <textarea
+                                class="form-control text-dark"
+                                id="sendMessageInput"
+                                rows="5"
+                                v-model="messageBody"
+                                style="white-space: pre-wrap;"
+                                placeholder="Enter your message here...">
+                            </textarea>
+                            <p class="help-text small text-right">
+                                <span>@{{ messageBody && messageBody.length ? messageBody.length : 0 }}</span>
+                                <span>/</span>
+                                <span>500</span>
+                            </p>
+                        </div>
+                        <div class="d-flex">
+                            <button
+                                type="button"
+                                class="btn btn-primary rounded-pill btn-sm px-4"
+                                v-on:click.prevent="handleMessageSend()">
+                                Send
+                            </button>
+                            <a
+                                class="btn btn-dark rounded-pill btn-sm px-4"
+                                :href="previewMessageUrl"
+                                target="_blank">
+                                Preview
+                            </a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </transition>
+
+    <div class="card border">
+        <div class="card-body">
+            <p class="text-center font-weight-bold">Activity Log</p>
+            <div class="activity-log">
+                <div v-if="!loaded" class="d-flex justify-content-center align-items-center py-5 my-5">
+                    <b-spinner />
+                </div>
+
+                <template v-else>
+                    <div
+                        v-for="activity in activities"
+                        class="activity-log-item"
+                        :key="activity.timestamp">
+                        <div v-if="activity.action === 'approved'" class="activity-log-item-icon bg-success">
+                            <i class="far fa-check fa-lg text-white"></i>
+                        </div>
+                        <div v-else-if="activity.action === 'rejected'" class="activity-log-item-icon bg-danger">
+                            <i class="far fa-times fa-lg text-white"></i>
+                        </div>
+                        <div v-else-if="activity.action === 'request_details'" class="activity-log-item-icon bg-lighter">
+                            <i class="fas fa-exclamation fa-lg text-dark"></i>
+                        </div>
+                        <div v-else class="activity-log-item-icon">
+                            <i class="fas fa-circle"></i>
+                        </div>
+                        <div class="activity-log-item-date">@{{ parseDate(activity.timestamp) }}<span>@{{ parseTime(activity.timestamp) }}</span></div>
+                        <div class="activity-log-item-content"><span class="activity-log-item-content-title">@{{ activity.title }}</span><span class="activity-log-item-content-message" v-if="activity.message">@{{ strLimit(activity.message) }}</span></div>
+                        <div class="d-flex" style="gap: 1rem;">
+                            <div v-if="activity.link">
+                                <a href="#" class="activity-log-item-content-link text-muted" @click.prevent="openModal(activity)">Details</a>
+                            </div>
+                            <div v-if="activity.user_response">
+                                <a href="#" class="activity-log-item-content-link" @click.prevent="openUserResponse(activity)">View User Response</a>
+                            </div>
+                        </div>
+                    </div>
+                </template>
+            </div>
+        </div>
+    </div>
+</template>
+<template v-else>
+    <div class="card card-body d-flex justify-content-center align-items-center py-5">
+        <b-spinner />
+    </div>
+</template>
+
+@push('scripts')
+<script type="text/javascript">
+    let app = new Vue({
+        el: '#panel',
+
+        data() {
+            return {
+                loaded: false,
+                activities: [],
+                composeFormOpen: false,
+                messageFormOpen: false,
+                composeMessage: null,
+                messageBody: null,
+                responseTemplates: [],
+            }
+        },
+
+        mounted() {
+            setTimeout(() => {
+                this.fetchResponseTemplates();
+                this.fetchActivities();
+            }, 1000)
+        },
+
+        computed: {
+            previewDetailsMessageUrl() {
+                return `/i/admin/curated-onboarding/show/{{$id}}/preview-details-message?message=${encodeURIComponent(this.composeMessage)}`;
+            },
+            previewMessageUrl() {
+                return `/i/admin/curated-onboarding/show/{{$id}}/preview-message?message=${encodeURIComponent(this.messageBody)}`;
+            }
+        },
+
+        methods: {
+            parseDate(timestamp) {
+                const date = new Date(timestamp);
+
+                return date.toLocaleDateString('en-US', {
+                    year: 'numeric',
+                    month: 'short',
+                    day: 'numeric'
+                });
+            },
+
+            parseTime(timestamp) {
+                const date = new Date(timestamp);
+
+                return date.toLocaleTimeString('en-US', {
+                    hour: '2-digit',
+                    minute: '2-digit',
+                    hour12: true
+                });
+            },
+
+            strLimit(str, len = 15) {
+                if(str && str.length) {
+                    return str.slice(0, len) + (str.length > 15 ? '...' : '');
+                }
+                return str;
+            },
+
+            fetchResponseTemplates() {
+                axios.get('/i/admin/api/curated-onboarding/templates/get')
+                .then(res => {
+                    this.responseTemplates = res.data;
+                })
+            },
+
+            fetchActivities() {
+                axios.get('/i/admin/api/curated-onboarding/show/{{$id}}/activity-log')
+                .then(res => {
+                    this.activities = res.data;
+                })
+                .finally(() => {
+                    this.loaded = true;
+                })
+            },
+
+            handleAction(action, $event) {
+                $event.currentTarget?.blur();
+
+                switch(action) {
+                    case 'approve':
+                        this.handleApprove();
+                    break;
+
+                    case 'reject':
+                        this.handleReject();
+                    break;
+
+                    case 'request':
+                        this.messageFormOpen = false;
+                        this.composeFormOpen = !this.composeFormOpen;
+                    break;
+
+                    case 'message':
+                        this.composeFormOpen = false;
+                        this.messageFormOpen = !this.messageFormOpen;
+                    break;
+                }
+            },
+
+            handleApprove() {
+                swal({
+                    title: "Approve Request?",
+                    text: "The user application request will be approved.",
+                    icon: "warning",
+                    buttons: true,
+                    dangerMode: true,
+                }).then((willApprove) => {
+                    if(willApprove) {
+                        this.handleApproveAction();
+                    } else {
+                        swal("Approval Cancelled!", "The application approval has been cancelled. If you change your mind, you can easily approve or reject this application in the future.", "success");
+
+                    }
+                })
+            },
+
+            handleReject() {
+                swal({
+                    title: "Are you sure?",
+                    text: "The user application request will be rejected.",
+                    icon: "warning",
+                    buttons: true,
+                    dangerMode: true,
+                })
+                .then((willReject) => {
+                    if (willReject) {
+                        swal({
+                            title: "Choose Action",
+                            text: "You can provide a rejection email, or simply silently reject",
+                            icon: "warning",
+                            buttons: {
+                                cancel: "Cancel",
+                                reject: {
+                                    text: "Reject with email",
+                                    value: "reject-email"
+                                },
+                                silent: {
+                                    text: "Silently Reject",
+                                    value: "reject-silent"
+                                }
+                            },
+                            dangerMode: true,
+                        })
+                        .then(res => {
+                            if(!res) {
+                                swal("Rejection Cancelled!", "The application rejection has been cancelled. If you change your mind, you can easily reject this application in the future.", "success");
+                            } else {
+                                this.handleRejectAction(res);
+                            }
+                        })
+                    } else {
+                        swal("Rejection Cancelled!", "The application rejection has been cancelled. If you change your mind, you can easily reject this application in the future.", "success");
+                    }
+                });
+            },
+
+            handleRejectAction(action) {
+                axios.post('/i/admin/api/curated-onboarding/show/{{$id}}/reject', {
+                    action: action
+                }).then(res => {
+                    window.location.href = '/i/admin/curated-onboarding/home?a=rj';
+                    console.log(res);
+                })
+            },
+
+            handleApproveAction() {
+                axios.post('/i/admin/api/curated-onboarding/show/{{$id}}/approve')
+                .then(res => {
+                    window.location.href = '/i/admin/curated-onboarding/home?a=aj';
+                })
+            },
+
+            handlePreview() {
+                axios.post('/i/admin/api/curated-onboarding/show/{{$id}}/message/preview', {
+                    message: this.composeMessage
+                })
+                .then(res => {
+                    console.log(res.data);
+                })
+            },
+
+            handleSend() {
+                swal({
+                    title: "Confirm",
+                    text: "Are you sure you want to send this request to this user?",
+                    icon: "warning",
+                    buttons: true,
+                    dangerMode: true,
+                }).then((hasConfirmed) => {
+                    if(hasConfirmed) {
+                        this.composeFormOpen = false;
+                        this.loaded = false;
+                        axios.post('/i/admin/api/curated-onboarding/show/{{$id}}/message/send', {
+                            message: this.composeMessage
+                        })
+                        .then(res => {
+                            this.composeMessage = null;
+                            swal('Successfully sent!','', 'success');
+                            this.fetchActivities();
+                        })
+                    }
+                })
+            },
+
+            openModal(activity) {
+                swal(activity.title, activity.message)
+            },
+
+            openUserResponse(activity) {
+                swal('User Response', activity.user_response.message)
+            },
+
+            useTemplate(tmpl) {
+                this.composeMessage = tmpl.content;
+            },
+
+            useTemplateMessage(tmpl) {
+                this.messageBody = tmpl.content;
+            },
+        }
+    });
+
+</script>
+@endpush
+
+@push('styles')
+<style type="text/css">
+    .activity-log-item {
+        border-left: 1px solid #e5e5e5;
+        position: relative;
+        padding: 2rem 1.5rem .5rem 2.5rem;
+        font-size: .9rem;
+        margin-left: 3rem;
+        min-height: 5rem
+    }
+    .activity-log-item:last-child {
+        padding-bottom: 4rem
+    }
+    .activity-log-item .activity-log-item-date {
+        margin-bottom: .5rem;
+        font-weight: bold;
+        color: var(--primary);
+    }
+    .activity-log-item .activity-log-item-date span {
+        color: #888;
+        font-size: 85%;
+        padding-left: .4rem;
+        font-weight: 300;
+    }
+    .activity-log-item .activity-log-item-content {
+        padding: .5rem .8rem;
+        background-color: #f4f4f4;
+        border-radius: .5rem;
+    }
+    .activity-log-item .activity-log-item-content span {
+        display:block;
+        color:#666;
+    }
+    .activity-log-item .activity-log-item-icon {
+        line-height:2.6rem;
+        position:absolute;
+        left:-1.3rem;
+        width:2.6rem;
+        height:2.6rem;
+        text-align:center;
+        border-radius:50%;
+        font-size:1.1rem;
+        background-color:#fff;
+        color:#fff
+    }
+    .activity-log-item .activity-log-item-icon {
+        color:#e5e5e5;
+        border:1px solid #e5e5e5;
+        font-size:.6rem
+    }
+    .activity-log-item-content-title {
+        font-weight: 500;
+        font-size: 15px;
+        color: #000000 !important;
+    }
+    .activity-log-item-content-message {
+        font-weight: 400;
+        font-size: 13px;
+    }
+    @media(min-width:992px) {
+        .activity-log-item {
+            margin-left:10rem
+        }
+        .activity-log-item .activity-log-item-date {
+            position:absolute;
+            left:-10rem;
+            width:7.5rem;
+            text-align:right
+        }
+        .activity-log-item .activity-log-item-date span {
+            display:block
+        }
+    }
+</style>
+@endpush
diff --git a/resources/views/admin/curated-register/partials/nav.blade.php b/resources/views/admin/curated-register/partials/nav.blade.php
new file mode 100644
index 000000000..8634813ad
--- /dev/null
+++ b/resources/views/admin/curated-register/partials/nav.blade.php
@@ -0,0 +1,45 @@
+@if(request()->filled('a'))
+@if(request()->input('a') === 'rj')
+<div class="alert alert-danger">
+    <p class="font-weight-bold mb-0"><i class="far fa-info-circle mr-2"></i>Successfully rejected application!</p>
+</div>
+@endif
+@if(request()->input('a') === 'aj')
+<div class="alert alert-success">
+    <p class="font-weight-bold mb-0"><i class="far fa-info-circle mr-2"></i>Successfully accepted application!</p>
+</div>
+@endif
+@endif
+
+<div class="row mb-3 justify-content-between">
+    <div class="col-12">
+        <ul class="nav nav-pills">
+            <li class="nav-item">
+                <a class="nav-link {{!request()->is('*home') || request()->has('filter') ? '':'active'}}" href="/i/admin/curated-onboarding/home">Open Applications</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link {{request()->has('filter') && request()->filter == 'responses' ? 'active':''}}" href="/i/admin/curated-onboarding/home?filter=responses">User Response Replies</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link {{request()->has('filter') && request()->filter == 'awaiting' ? 'active':''}}" href="/i/admin/curated-onboarding/home?filter=awaiting">Awaiting User Response</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link {{request()->has('filter') && request()->filter == 'approved' ? 'active':''}}" href="/i/admin/curated-onboarding/home?filter=approved&sort=desc">Approved Applications</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link {{request()->has('filter') && request()->filter == 'rejected' ? 'active':''}}" href="/i/admin/curated-onboarding/home?filter=rejected&sort=desc">Rejected Applications</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link {{request()->has('filter') && request()->filter == 'all' ? 'active':''}}" href="/i/admin/curated-onboarding/home?filter=all&sort=desc">All Applications</a>
+            </li>
+            <li class="nav-item">
+                <a class="nav-link {{ request()->is('*templates*') ? 'active' : ''}}" href="/i/admin/curated-onboarding/templates">Templates</a>
+            </li>
+        </ul>
+    </div>
+</div>
+
+
+@push('scripts')
+
+@endpush
diff --git a/resources/views/admin/curated-register/partials/not-enabled.blade.php b/resources/views/admin/curated-register/partials/not-enabled.blade.php
new file mode 100644
index 000000000..9248c3ea2
--- /dev/null
+++ b/resources/views/admin/curated-register/partials/not-enabled.blade.php
@@ -0,0 +1,24 @@
+<div class="m-n2 m-lg-4">
+    <div class="container-fluid mt-4">
+        <div class="row justify-content-center">
+            <div class="col-12 col-md-7">
+                <div class="card">
+                    <div class="card-body">
+                        <h1 class="text-center">Feature not enabled</h1>
+
+                        <p class="lead">To enable this feature:
+
+                        <ol class="lead">
+                            <li>Go to the <a href="/i/admin/settings" class="font-weight-bold">Settings page</a></li>
+                            <li>
+                                Under <strong>Registration Status</strong> select:
+                                <pre>Filtered - Anyone can apply (Curated Onboarding)</pre>
+                            </li>
+                            <li>Save the changes</li>
+                        </ol>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/resources/views/admin/curated-register/show.blade.php b/resources/views/admin/curated-register/show.blade.php
new file mode 100644
index 000000000..8da14df0e
--- /dev/null
+++ b/resources/views/admin/curated-register/show.blade.php
@@ -0,0 +1,102 @@
+@extends('admin.partial.template-full')
+
+@section('section')
+</div><div class="header bg-primary pb-3 mt-n4">
+    <div class="container-fluid">
+        <div class="header-body">
+            <div class="row align-items-center py-4">
+                <div class="col-lg-8 col-12">
+                    <p class="mb-0">
+                        <a href="{{ route('admin.curated-onboarding')}}" class="text-white">
+                            <i class="far fa-chevron-left mr-1"></i> Back to Curated Onboarding
+                        </a>
+                    </p>
+                    <p class="display-3 text-white d-inline-block">Application #{{ $record->id }}</p>
+                    <div class="text-white mb-0 d-flex align-items-center" style="gap:1rem">
+                        @if($record->is_closed)
+                        @else
+                            <span class="font-weight-bold">
+                                <i class="far fa-circle mr-2"></i>
+                                Open / Awaiting Admin Action
+                            </span>
+                        @endif
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="m-n2 m-lg-4">
+    <div class="container-fluid mt-4">
+        <div class="row">
+            <div class="col-12 col-md-4">
+                <div class="card border">
+                    <div class="card-header font-weight-bold bg-gradient-primary text-center text-white py-2">Details</div>
+                    <div class="list-group list-group-flush">
+                        <div class="list-group-item">
+                            <div>Username</div>
+                            <div>{{ $record->username }}</div>
+                        </div>
+                        <div class="list-group-item">
+                            <div>Email</div>
+                            <div>{{ $record->email }}</div>
+                        </div>
+                        <div class="list-group-item">
+                            <div>Created</div>
+                            <div data-toggle="tooltip" title="{{ $record->created_at }}">{{ $record->created_at->diffForHumans() }}</div>
+                        </div>
+                        @if($record->email_verified_at)
+                        <div class="list-group-item">
+                            <div>Email Verified</div>
+                            <div data-toggle="tooltip" title="{{ $record->email_verified_at }}">{{ $record->email_verified_at->diffForHumans() }}</div>
+                        </div>
+                        @else
+                        <div class="list-group-item">
+                            <div>Email Verified</div>
+                            <div class="text-danger">Not yet</div>
+                        </div>
+                        @endif
+                    </div>
+                </div>
+
+                <div class="card border mt-3">
+                    <div class="card-header font-weight-bold bg-gradient-primary text-center text-white py-2">Reason for Joining</div>
+                    <div class="card-body">
+                        <blockquote>{{ $record->reason_to_join }}</blockquote>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-12 col-md-8">
+                @include('admin.curated-register.partials.activity-log', [
+                    'id' => $record->id,
+                    'is_closed' => $record->is_closed,
+                    'is_approved' => $record->is_approved,
+                    'is_rejected' => $record->is_rejected,
+                    'action_taken_at' => $record->action_taken_at,
+                    'email_verified_at' => $record->email_verified_at
+                ])
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
+
+@push('styles')
+<style type="text/css">
+    .list-group-item {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+
+        div:first-child {
+                font-size: 12px;
+        }
+
+        div:last-child {
+            font-weight: bold;
+        }
+    }
+</style>
+@endpush
diff --git a/resources/views/admin/curated-register/template-create.blade.php b/resources/views/admin/curated-register/template-create.blade.php
new file mode 100644
index 000000000..5c37abfca
--- /dev/null
+++ b/resources/views/admin/curated-register/template-create.blade.php
@@ -0,0 +1,98 @@
+@extends('admin.partial.template-full')
+
+@section('section')
+</div><div class="header bg-primary pb-3 mt-n4">
+    <div class="container-fluid">
+        <div class="header-body">
+            <div class="row align-items-center py-4">
+                <div class="col-lg-8 col-12">
+                    <p class="display-1 text-white d-inline-block mb-0">Curated Onboarding</p>
+                    <p class="text-white mb-0">The ideal solution for communities seeking a balance between open registration and invite-only membership</p>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+@if((bool) config_cache('instance.curated_registration.enabled'))
+<div class="m-n2 m-lg-4">
+    <div class="container-fluid mt-4">
+        @include('admin.curated-register.partials.nav')
+
+        <div class="row justify-content-center">
+            <div class="col-12 col-lg-6">
+                <div class="card">
+                    <div class="card-body">
+                        <h2 class="display-4">Create Template</h2>
+                        <p class="lead my-0">Create re-usable templates of messages and application requests.</p>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row justify-content-center">
+            <div class="col-12 col-lg-6">
+                <div class="card">
+                    <div class="card-body">
+                        @if ($errors->any())
+                            <div class="alert alert-danger">
+                                @foreach ($errors->all() as $error)
+                                    <p class="font-weight-bold mb-0">{{ $error }}</p>
+                                @endforeach
+                            </div>
+                        @endif
+                        <form method="post">
+                            @csrf
+
+                            <div class="form-group">
+                                <label class="small font-weight-bold">Shortcut/Name</label>
+                                <input
+                                    class="form-control"
+                                    name="name"
+                                    value="{{old('name')}}"
+                                    placeholder="An optional name/shortcut for easy access" />
+                            </div>
+
+                            <div class="form-group">
+                                <label class="small font-weight-bold">Content</label>
+                                <textarea
+                                    class="form-control"
+                                    name="content"
+                                    value="{{old('content')}}"
+                                    rows="8"
+                                    placeholder="Add your custom message template here..."></textarea>
+                            </div>
+
+                            <p class="font-weight-bold">
+                                <a class="font-weight-bold small" data-toggle="collapse" href="#collapseDescription" aria-expanded="false" aria-controls="collapseDescription">
+                                    Add optional description
+                                </a>
+                            </p>
+
+                            <div class="collapse" id="collapseDescription">
+                                <div class="form-group">
+                                    <label class="small font-weight-bold">Description</label>
+                                    <textarea
+                                        class="form-control"
+                                        name="description"
+                                        rows="4"
+                                        placeholder="Add an optional description that is only visible to admins..."></textarea>
+                                </div>
+                            </div>
+
+                            <div class="custom-control custom-checkbox">
+                                <input type="checkbox" class="custom-control-input" id="active" name="active" checked>
+                                <label class="custom-control-label font-weight-bold" for="active">Mark as Active</label>
+                            </div>
+
+                            <hr>
+                            <button class="btn btn-primary btn-block rounded-pill font-weight-bold">Create Template</button>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endif
+
+@endsection
diff --git a/resources/views/admin/curated-register/template-edit.blade.php b/resources/views/admin/curated-register/template-edit.blade.php
new file mode 100644
index 000000000..236b979d3
--- /dev/null
+++ b/resources/views/admin/curated-register/template-edit.blade.php
@@ -0,0 +1,148 @@
+@extends('admin.partial.template-full')
+
+@section('section')
+</div><div class="header bg-primary pb-3 mt-n4">
+    <div class="container-fluid">
+        <div class="header-body">
+            <div class="row align-items-center py-4">
+                <div class="col-lg-8 col-12">
+                    <p class="display-1 text-white d-inline-block mb-0">Curated Onboarding</p>
+                    <p class="text-white mb-0">The ideal solution for communities seeking a balance between open registration and invite-only membership</p>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+@if((bool) config_cache('instance.curated_registration.enabled'))
+<div class="m-n2 m-lg-4">
+    <div class="container-fluid mt-4">
+        @include('admin.curated-register.partials.nav')
+
+        <div class="row justify-content-center">
+            <div class="col-12 col-lg-8">
+                @if (session('status'))
+                    <div class="alert alert-success font-weight-bold lead" id="shm">
+                        {{ session('status') }}
+                    </div>
+                    <script>
+                        setTimeout(() => document.getElementById('shm').classList.add('animate__animated', 'animate__bounceOutLeft'), 2000);
+                        setTimeout(() => document.getElementById('shm').style.display = 'none', 2500);
+                    </script>
+                @endif
+                <div class="card">
+                    <div class="card-body">
+                        <h2 class="display-4 mb-0">Edit Template</h2>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row justify-content-center">
+            <div class="col-12 col-lg-8">
+                <div class="card">
+                    <div class="card-body">
+                        @if ($errors->any())
+                            <div class="alert alert-danger">
+                                @foreach ($errors->all() as $error)
+                                    <p class="font-weight-bold mb-0">{{ $error }}</p>
+                                @endforeach
+                            </div>
+                        @endif
+                        <form method="post" id="updateForm">
+                            @csrf
+
+                            <div class="form-group">
+                                <label class="small font-weight-bold">Shortcut/Name</label>
+                                <input
+                                    class="form-control"
+                                    name="name"
+                                    value="{{$template->name}}"
+                                    placeholder="An optional name/shortcut for easy access" />
+                            </div>
+
+                            <div class="form-group">
+                                <label class="small font-weight-bold">Content</label>
+                                <textarea
+                                    class="form-control"
+                                    name="content"
+                                    rows="{{$template->content && strlen($template->content) > 500 ? 16 : 5}}"
+                                    placeholder="Add your custom message template here...">{{$template->content}}</textarea>
+                            </div>
+
+                            @if($template->description == null)
+                            <p class="font-weight-bold">
+                                <a class="font-weight-bold small" data-toggle="collapse" href="#collapseDescription" aria-expanded="false" aria-controls="collapseDescription">
+                                    Add optional description
+                                </a>
+                            </p>
+                            @endif
+
+                            <div class="collapse {{ $template->description === null ? '':'show'}}" id="collapseDescription">
+                                <div class="form-group">
+                                    <label class="small font-weight-bold">Description</label>
+                                    <textarea
+                                        class="form-control"
+                                        name="description"
+                                        rows="4"
+                                        placeholder="Add an optional description that is only visible to admins...">{{ $template->description }}</textarea>
+                                </div>
+                            </div>
+
+                            <div class="custom-control custom-checkbox">
+                                <input type="checkbox" class="custom-control-input" id="active" name="active" {{ $template->is_active ? 'checked' : ''}}>
+                                <label class="custom-control-label font-weight-bold" for="active">Mark as Active</label>
+                            </div>
+
+                            <hr>
+                            <div class="d-flex">
+                                <button type="button" class="btn btn-primary flex-grow-1 rounded-pill font-weight-bold" id="saveBtn">Save</button>
+                                <button type="button" class="btn btn-danger rounded-pill font-weight-bold" id="deleteBtn">Delete</button>
+                            </div>
+                        </form>
+                        <form method="post" id="deleteForm">
+                            @method('DELETE')
+                            @csrf
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endif
+
+@endsection
+
+@push('scripts')
+<script>
+    $('#saveBtn').click(() => {
+        $('#updateForm').submit()
+    })
+    $('#deleteBtn').click(() => {
+        swal({
+            title: 'Confirm Deletion',
+            text: 'Are you sure you want to delete this template? It will not be recoverable',
+            icon: 'warning',
+            dangerMode: true,
+            buttons: {
+                close: {
+                    text: "Close",
+                    value: "close",
+                    close: true,
+                    className: "swal-button--cancel"
+                },
+                confirm: {
+                    text: "Delete",
+                    value: "delete",
+                    className: "btn-danger"
+                }
+            }
+        }).then(res => {
+            if(res == 'delete') {
+                $('#deleteForm').submit();
+                // window.location.href = '/i/admin/curated-onboarding/templates';
+            }
+        })
+    })
+</script>
+@endpush
diff --git a/resources/views/admin/curated-register/templates.blade.php b/resources/views/admin/curated-register/templates.blade.php
new file mode 100644
index 000000000..17b10da80
--- /dev/null
+++ b/resources/views/admin/curated-register/templates.blade.php
@@ -0,0 +1,91 @@
+@extends('admin.partial.template-full')
+
+@section('section')
+</div><div class="header bg-primary pb-3 mt-n4">
+    <div class="container-fluid">
+        <div class="header-body">
+            <div class="row align-items-center py-4">
+                <div class="col-lg-8 col-12">
+                    <p class="display-1 text-white d-inline-block mb-0">Curated Onboarding</p>
+                    <p class="text-white mb-0">The ideal solution for communities seeking a balance between open registration and invite-only membership</p>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+@if((bool) config_cache('instance.curated_registration.enabled'))
+<div class="m-n2 m-lg-4">
+    <div class="container-fluid mt-4">
+        @include('admin.curated-register.partials.nav')
+
+        <div class="row">
+            <div class="col-12">
+                @if (session('status'))
+                    <div class="alert alert-success font-weight-bold lead" id="shm">
+                        {{ session('status') }}
+                    </div>
+                    <script>
+                        setTimeout(() => document.getElementById('shm').classList.add('animate__animated', 'animate__bounceOutLeft'), 2000);
+                        setTimeout(() => document.getElementById('shm').style.display = 'none', 2500);
+                    </script>
+                @endif
+                <div class="card">
+                    <div class="card-body d-flex justify-content-between align-items-center">
+                        <p class="lead my-0">Create and manage re-usable templates of messages and application requests.</p>
+                        <a class="btn btn-primary font-weight-bold rounded-pill" href="{{route('admin.curated-onboarding.create-template')}}">Create new Template</a>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-12">
+
+                <div class="table-responsive rounded">
+                    <table class="table table-dark">
+                        <thead class="thead-dark">
+                            <tr>
+                                <th scope="col">ID</th>
+                                <th scope="col">Shortcut/Name</th>
+                                <th scope="col">Content</th>
+                                <th scope="col">Active</th>
+                                <th scope="col">Created</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                        @foreach($templates as $template)
+                            <tr>
+                                <td class="align-middle">
+                                    <a
+                                        href="/i/admin/curated-onboarding/templates/edit/{{$template->id}}"
+                                        class="font-weight-bold">
+                                        {{ $template->id }}
+                                    </a>
+                                </td>
+                                <td class="align-middle">
+                                    {{ $template->name }}
+                                </td>
+                                <td class="align-middle">
+                                    {{ str_limit($template->content, 80) }}
+                                </td>
+                                <td class="align-middle">
+                                    {{ $template->is_active ? '✅' : '❌' }}
+                                </td>
+                                <td class="align-middle">
+                                    {{ $template->created_at->format('M d Y') }}
+                                </td>
+                            </tr>
+                        @endforeach
+                        </tbody>
+                    </table>
+
+                    <div class="d-flex mt-3">
+                        {{ $templates->links() }}
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endif
+
+@endsection
diff --git a/resources/views/admin/diagnostics/home.blade.php b/resources/views/admin/diagnostics/home.blade.php
index bf2b5d742..b23652b51 100644
--- a/resources/views/admin/diagnostics/home.blade.php
+++ b/resources/views/admin/diagnostics/home.blade.php
@@ -66,7 +66,7 @@
 		</li>
 		<li>
 			<strong><span class="badge badge-primary">OAUTH</span> enabled: </strong>
-			<span>{{ config_cache('pixelfed.oauth_enabled') ? '✅ true' : '❌ false' }}</span>
+			<span>{{ (bool) config_cache('pixelfed.oauth_enabled') ? '✅ true' : '❌ false' }}</span>
 		</li>
 		<li>
 			<strong><span class="badge badge-primary">OAUTH</span> token_expiration</strong>
@@ -298,7 +298,7 @@
 	<tr>
 		<td><span class="badge badge-primary">FEDERATION</span></td>
 		<td><strong>ACTIVITY_PUB</strong></td>
-		<td><span>{{config_cache('federation.activitypub.enabled') ? '✅ true' : '❌ false' }}</span></td>
+		<td><span>{{(bool) config_cache('federation.activitypub.enabled') ? '✅ true' : '❌ false' }}</span></td>
 	</tr>
 	<tr>
 		<td><span class="badge badge-primary">FEDERATION</span></td>
@@ -358,7 +358,7 @@
 	<tr>
 		<td><span class="badge badge-primary">FEDERATION</span></td>
 		<td><strong>PF_NETWORK_TIMELINE</strong></td>
-		<td><span>{{config_cache('federation.network_timeline') ? '✅ true' : '❌ false' }}</span></td>
+		<td><span>{{(bool) config_cache('federation.network_timeline') ? '✅ true' : '❌ false' }}</span></td>
 	</tr>
 	<tr>
 		<td><span class="badge badge-primary">FEDERATION</span></td>
@@ -368,7 +368,7 @@
 	<tr>
 		<td><span class="badge badge-primary">FEDERATION</span></td>
 		<td><strong>CUSTOM_EMOJI</strong></td>
-		<td><span>{{config_cache('federation.custom_emoji.enabled') ? '✅ true' : '❌ false' }}</span></td>
+		<td><span>{{(bool) config_cache('federation.custom_emoji.enabled') ? '✅ true' : '❌ false' }}</span></td>
 	</tr>
 	<tr>
 		<td><span class="badge badge-primary">FEDERATION</span></td>
@@ -545,7 +545,7 @@
 	<tr>
 		<td><span class="badge badge-primary">INSTANCE</span></td>
 		<td><strong>STORIES_ENABLED</strong></td>
-		<td><span>{{config_cache('instance.stories.enabled') ? '✅ true' : '❌ false' }}</span></td>
+		<td><span>{{(bool) config_cache('instance.stories.enabled') ? '✅ true' : '❌ false' }}</span></td>
 	</tr>
 	<tr>
 		<td><span class="badge badge-primary">INSTANCE</span></td>
@@ -654,7 +654,7 @@
 	<tr>
 		<td><span class="badge badge-primary">MEDIA</span></td>
 		<td><strong>MEDIA_EXIF_DATABASE</strong></td>
-		<td><span>{{config_cache('media.exif.batabase') ? '✅ true' : '❌ false' }}</span></td>
+		<td><span>{{config_cache('media.exif.database') ? '✅ true' : '❌ false' }}</span></td>
 	</tr>
 
 	<tr>
@@ -740,7 +740,7 @@
 	<tr>
 		<td><span class="badge badge-primary">PIXELFED</span></td>
 		<td><strong>PF_ENABLE_CLOUD</strong></td>
-		<td><span>{{config_cache('pixelfed.cloud_storage') ? '✅ true' : '❌ false' }}</span></td>
+		<td><span>{{(bool) config_cache('pixelfed.cloud_storage') ? '✅ true' : '❌ false' }}</span></td>
 	</tr>
 	<tr>
 		<td><span class="badge badge-primary">PIXELFED</span></td>
@@ -750,12 +750,12 @@
 	<tr>
 		<td><span class="badge badge-primary">PIXELFED</span></td>
 		<td><strong>PF_OPTIMIZE_IMAGES</strong></td>
-		<td><span>{{config_cache('pixelfed.optimize_image') ? '✅ true' : '❌ false' }}</span></td>
+		<td><span>{{(bool) config_cache('pixelfed.optimize_image') ? '✅ true' : '❌ false' }}</span></td>
 	</tr>
 	<tr>
 		<td><span class="badge badge-primary">PIXELFED</span></td>
 		<td><strong>PF_OPTIMIZE_VIDEOS</strong></td>
-		<td><span>{{config_cache('pixelfed.optimize_video') ? '✅ true' : '❌ false' }}</span></td>
+		<td><span>{{(bool) config_cache('pixelfed.optimize_video') ? '✅ true' : '❌ false' }}</span></td>
 	</tr>
 	<tr>
 		<td><span class="badge badge-primary">PIXELFED</span></td>
@@ -810,12 +810,12 @@
 	<tr>
 		<td><span class="badge badge-primary">PIXELFED</span></td>
 		<td><strong>OAUTH_ENABLED</strong></td>
-		<td><span>{{config_cache('pixelfed.oauth_enabled') ? '✅ true' : '❌ false' }}</span></td>
+		<td><span>{{ (bool) config_cache('pixelfed.oauth_enabled') ? '✅ true' : '❌ false' }}</span></td>
 	</tr>
 	<tr>
 		<td><span class="badge badge-primary">PIXELFED</span></td>
 		<td><strong>PF_BOUNCER_ENABLED</strong></td>
-		<td><span>{{config_cache('pixelfed.bouncer.enabled') ? '✅ true' : '❌ false' }}</span></td>
+		<td><span>{{(bool) config_cache('pixelfed.bouncer.enabled') ? '✅ true' : '❌ false' }}</span></td>
 	</tr>
 	<tr>
 		<td><span class="badge badge-primary">PIXELFED</span></td>
diff --git a/resources/views/admin/messages/home.blade.php b/resources/views/admin/messages/home.blade.php
index ee0b86e6e..1a9c2c3bc 100644
--- a/resources/views/admin/messages/home.blade.php
+++ b/resources/views/admin/messages/home.blade.php
@@ -1,36 +1,101 @@
 @extends('admin.partial.template-full')
 
 @section('section')
-<div class="title">
-	<h3 class="font-weight-bold d-inline-block">Messages</h3>
 </div>
+<div class="header bg-primary pb-3 mt-n4">
+    <div class="container-fluid">
+        <div class="header-body">
+            <div class="row align-items-center py-4">
+                <div class="col-lg-6 col-7">
+                    <p class="display-1 text-white d-inline-block mb-0">Messages</p>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="container mt-3">
 
-<hr>
-<div class="table-responsive">
-  <table class="table">
-    <thead class="bg-light">
-      <tr>
-        <th scope="col">#</th>
-        <th scope="col">User</th>
-        <th scope="col">Message</th>
-        <th scope="col">Created</th>
-      </tr>
-    </thead>
-    <tbody>
-      @foreach($messages as $msg)
-      <tr>
-        <td>
-          <a href="/i/admin/messages/show/{{$msg->id}}" class="btn btn-sm btn-outline-primary">
-           	{{$msg->id}}
-          </a>
-        </td>
-        <td class="font-weight-bold"><a href="{{$msg->user->url()}}">{{$msg->user->username}}</a></td>
-        <td class="font-weight-bold">{{str_limit($msg->message, 40)}}</td>
-        <td class="font-weight-bold">{{$msg->created_at->diffForHumans()}}</td>
-      </tr>
-      @endforeach
-    </tbody>
-  </table>
+    <div class="row justify-content-center">
+        @if (session('status'))
+        <div class="col-12" id="flash">
+            <div class="alert alert-success">
+                {{ session('status') }}
+            </div>
+        </div>
+        @endif
+        @if (session('error'))
+        <div class="col-12" id="flash">
+            <div class="alert alert-danger">
+                {{ session('error') }}
+            </div>
+        </div>
+        @endif
+        <div class="col-12">
+            <ul class="nav nav-pills my-3">
+                <li class="nav-item">
+                    <a class="nav-link {{$sort=='all'?'active':''}}" href="?sort=all">All</a>
+                </li>
+
+                <li class="nav-item">
+                    <a class="nav-link {{$sort=='open'?'active':''}}" href="?sort=open">Open</a>
+                </li>
+
+                <li class="nav-item">
+                    <a class="nav-link {{$sort=='closed'?'active':''}}" href="?sort=closed">Closed</a>
+                </li>
+            </ul>
+        </div>
+        <div class="col-12">
+            <div class="table-responsive">
+              <table class="table">
+                <thead class="bg-light">
+                  <tr>
+                    <th scope="col">#</th>
+                    <th scope="col">User</th>
+                    <th scope="col">Message</th>
+                    <th scope="col">Created</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  @foreach($messages as $msg)
+                  <tr>
+                    <td>
+                      <a href="/i/admin/messages/show/{{$msg->id}}" class="btn btn-sm btn-outline-primary">
+                       	{{$msg->id}}
+                      </a>
+                    </td>
+                    <td class="font-weight-bold"><a href="{{$msg->user->url()}}">{{$msg->user->username}}</a></td>
+                    <td class="font-weight-bold">{{str_limit($msg->message, 40)}}</td>
+                    <td class="font-weight-bold">{{$msg->created_at->diffForHumans()}}</td>
+                  </tr>
+                  @endforeach
+                </tbody>
+              </table>
+            </div>
+            <hr />
+            {{$messages->links()}}
+        </div>
+    </div>
 </div>
-{{$messages->links()}}
-@endsection
\ No newline at end of file
+@endsection
+
+@push('scripts')
+<script type="text/javascript">
+    function checkAndRemoveElementOnLoad(selector, delay, action = 'hide') {
+        window.addEventListener('load', () => {
+            setTimeout(() => {
+                const element = document.querySelector(selector);
+                if (element) {
+                    if (action === 'hide') {
+                        element.style.display = 'none';
+                    } else if (action === 'remove') {
+                        element.remove();
+                    }
+                }
+            }, delay * 1000);
+        });
+    }
+
+    checkAndRemoveElementOnLoad('#flash', 5, 'remove');
+</script>
+@endpush
diff --git a/resources/views/admin/messages/show.blade.php b/resources/views/admin/messages/show.blade.php
index a86372e15..93d6775e2 100644
--- a/resources/views/admin/messages/show.blade.php
+++ b/resources/views/admin/messages/show.blade.php
@@ -4,56 +4,161 @@
 <div class="title">
 	<div class="d-flex justify-content-between align-items-center">
 		<div class="font-weight-bold"># {{$message->id}}</div>
-		<div class="font-weight-bold h3">Message</div>
-		<div>
-			@if($message->read_at)
-			<span class="btn btn-outline-secondary btn-sm disabled" disabled>Read</span>
-			@else
-			<button type="button" class="btn btn-outline-primary btn-sm" id="markRead">Mark Read</button>
-			@endif
-		</div>
+		<div class="font-weight-bold h3">Contact Form Message</div>
+		<div></div>
 	</div>
 </div>
 
-<hr>
+<hr class="mt-0">
 
-<div class="row">
-	
-	<div class="col-12 col-md-3 text-md-right">
-		@if($message->response_requested)
-		<p class="text-dark font-weight-bold">Response Requested</p>
-		@endif
-		<p class="text-dark">Sent {{$message->created_at->diffForHumans()}}</p>
+<div class="row mb-3">
+	<div class="col-12 col-md-4">
+        <div class="card">
+            <div class="list-group list-group-flush">
+                @if($message->responded_at)
+                <div class="list-group-item">
+                    <div class="d-flex justify-content-between">
+                        <div class="small text-muted">Admin Response Sent</div>
+                        <div>
+                            <span class="font-weight-bold" title="{{$message->responded_at}}" data-toggle="tooltip">
+                                {{$message->responded_at->diffForHumans()}}
+                            </span>
+                        </div>
+                    </div>
+                </div>
+                @endif
+
+                <div class="list-group-item">
+                    <div class="d-flex justify-content-between">
+                        <div class="small text-muted">Status</div>
+                        @if($message->read_at == null)
+                        <div class="text-success font-weight-bold">Open</div>
+                        @else
+                        <div class="text-muted">Closed</div>
+                        @endif
+                    </div>
+                </div>
+                <div class="list-group-item">
+                    <div class="d-flex justify-content-between">
+                        <div class="small text-muted">Response Requested</div>
+                        @if($message->response_requested == 1)
+                        <div class="font-weight-bold">Yes</div>
+                        @else
+                        <div class="text-muted">No</div>
+                        @endif
+                    </div>
+                </div>
+
+                <div class="list-group-item">
+                    <div class="d-flex justify-content-between">
+                        <div class="small text-muted">Created</div>
+                        <div>
+                            <span class="font-weight-bold" title="{{$message->created_at}}" data-toggle="tooltip">
+                                {{$message->created_at->diffForHumans()}}
+                            </span>
+                        </div>
+                    </div>
+                </div>
+
+                @if($message->user && $message->user->last_active_at)
+                <div class="list-group-item">
+                    <div class="d-flex justify-content-between">
+                        <div class="small text-muted">User Last Active</div>
+                        <div>
+                            <span class="font-weight-bold" title="{{$message->user->last_active_at}}" data-toggle="tooltip">
+                                {{$message->user->last_active_at->diffForHumans()}}
+                            </span>
+                        </div>
+                    </div>
+                </div>
+                @endif
+
+                @if(!$message->read_at)
+                <div class="list-group-item">
+                    <button type="button" class="btn btn-outline-primary btn-block" id="markRead">Mark Read</button>
+                </div>
+                @endif
+            </div>
+        </div>
 	</div>
-	<div class="col-12 col-md-6">
-		
-		<div class="card shadow-none border">
-			<div class="card-header bg-white">
-				<div class="media">
-					<img src="{{$message->user->profile->avatarUrl()}}" class="mr-3 rounded-circle" width="40px" height="40px">
-					<div class="media-body">
-						<h5 class="my-0">&commat;{{$message->user->username}}</h5>
-						<span class="text-muted">{{$message->user->email}}</span>
+
+	<div class="col-12 col-md-8">
+		<div class="row">
+			<div class="col-12">
+				<div class="card shadow-none border">
+					<div class="card-header bg-white">
+						<div class="media">
+							<img
+                                src="{{$message->user->profile->avatarUrl()}}"
+                                class="mr-3 rounded-circle"
+                                width="40px"
+                                height="40px"
+                                onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=0';">
+							<div class="media-body">
+								<h5 class="my-0">&commat;{{$message->user->username}}</h5>
+								<span class="text-muted">{{$message->user->email}}</span>
+							</div>
+						</div>
 					</div>
-				</div>
-			</div>
-			<div class="card-body">
-				<p class="mb-0">{{$message->message}}</p>
+					<div class="card-body">
+						<p class="text-uppercase text-muted small mb-2">Message Body</p>
+						<p class="mb-0">{{$message->message}}</p>
+
+                        <hr>
+                        <p class="text-uppercase text-muted small mb-2">Admin Reply:</p>
+
+                        @if($message->responded_at)
+                        <p class="mb-0">{{$message->response}}</p>
+                        @else
+                        @if(config('mail.default') === 'log')
+                        <div class="alert alert-danger">
+                        <p class="mb-0">You need to configure your mail driver before you can send outgoing emails.</p>
+                        </div>
+                        @else
+                        <form method="post" id="mform">
+    						@csrf
+    						<div class="form-group">
+    							<textarea
+                                    class="form-control"
+                                    name="message"
+                                    id="message"
+                                    rows="4"
+                                    style="resize: none;"
+                                    maxlength="500"
+                                    placeholder="Reply to &commat;{{$message->user->username}} via email ..."></textarea>
+    							@if ($errors->any())
+    							@foreach ($errors->all() as $error)
+    							<p class="invalid-feedback mb-0" style="display:block;">
+    								<strong>{{ $error }}</strong>
+    							</p>
+    							@endforeach
+    							@endif
+    						</div>
+    						<div class="d-flex justify-content-between align-items-center">
+                                <div>
+                                    <button type="button" class="btn btn-primary font-weight-bold submit-btn">Send</button>
+    								<button type="button" class="btn btn-outline-primary font-weight-bold preview-btn">Preview</button>
+                                </div>
+
+                                <div>
+        							<span class="small text-muted font-weight-bold">
+        								<span id="messageCount">0</span>/500
+        							</span>
+                                </div>
+    						</div>
+    					</form>
+                        @endif
+                        @endif
+    				</div>
+                </div>
 			</div>
 		</div>
 	</div>
-	<div class="col-12 col-md-3">
-		{{-- @if($message->responded_at == null)
-		<button class="btn btn-primary font-weight-bold btn-block">Send Response</button>
-		<hr>
-		@endif
-		<button class="btn btn-outline-danger font-weight-bold btn-block">Delete</button> --}}
-	</div>
 </div>
-
 @endsection
 
 @push('scripts')
+@if($message->responded_at == null)
 <script type="text/javascript">
 	$('#markRead').on('click', function(e) {
 		e.preventDefault();
@@ -61,8 +166,34 @@
 		axios.post('/i/admin/messages/mark-read', {
 			id: '{{$message->id}}',
 		}).then(res => {
-			window.location.href = window.location.href;
+			window.location.href = '/i/admin/messages/home';
 		})	
 	})
+
+    const submitBtn = document.querySelector('.submit-btn');
+    submitBtn.addEventListener('click', () => {
+        const form = document.getElementById('mform');
+        form.action = '/i/admin/messages/show/{{$message->id}}';
+        form.submit()
+    });
+
+    const previewBtn = document.querySelector('.preview-btn');
+    previewBtn.addEventListener('click', () => {
+        const form = document.getElementById('mform');
+        form.action = '/i/admin/messages/preview/{{$message->id}}';
+        form.submit()
+    });
+
+    function countChars() {
+        const input = document.getElementById('message');
+        const counter = document.getElementById('messageCount');
+
+        input.addEventListener('input', function() {
+            counter.textContent = input.value.length;
+        });
+    }
+
+    countChars();
 </script>
-@endpush
\ No newline at end of file
+@endif
+@endpush
diff --git a/resources/views/admin/partial/sidenav.blade.php b/resources/views/admin/partial/sidenav.blade.php
index bfd93e77e..4226c3488 100644
--- a/resources/views/admin/partial/sidenav.blade.php
+++ b/resources/views/admin/partial/sidenav.blade.php
@@ -18,7 +18,7 @@
 					<li class="nav-item">
 						<a class="nav-link {{request()->is('*autospam*')?'active':''}}" href="{{route('admin.autospam')}}">
 							<i class="ni ni-bold-right text-primary"></i>
-							<span class="nav-link-text">Autospam <span class="badge badge-primary ml-1">NEW</span></span>
+							<span class="nav-link-text">Autospam</span>
 						</a>
 					</li>
 
@@ -56,6 +56,15 @@
 							<span class="nav-link-text">Settings</span>
 						</a>
 					</li>
+
+					@if((bool) config_cache('instance.curated_registration.enabled'))
+					<li class="nav-item">
+						<a class="nav-link {{request()->is('*admin/curated-onboarding*')?'active':''}}" href="{{route('admin.curated-onboarding')}}">
+							<i class="ni ni-bold-right text-primary"></i>
+							<span class="nav-link-text">Curated Onboarding</span>
+						</a>
+					</li>
+					@endif
 				</ul>
 
 				<hr class="my-3">
@@ -64,7 +73,7 @@
 					<li class="nav-item">
 						<a class="nav-link {{request()->is('*custom-emoji*')?'active':''}}" href="{{route('admin.custom-emoji')}}">
 							<i class="ni ni-bold-right text-primary"></i>
-							<span class="nav-link-text">Custom Emoji <span class="badge badge-primary ml-1">NEW</span></span>
+							<span class="nav-link-text">Custom Emoji</span>
 						</a>
 					</li>
 
@@ -96,10 +105,17 @@
 						</a>
 					</li>
 
+					{{-- <li class="nav-item">
+						<a class="nav-link {{request()->is('*roles*')?'active':''}}" href="{{route('admin.roles')}}">
+							<i class="ni ni-bold-right text-primary"></i>
+							<span class="nav-link-text">Roles <span class="badge badge-primary ml-1">NEW</span></span>
+						</a>
+					</li> --}}
+
 					<li class="nav-item">
 						<a class="nav-link {{request()->is('*stories*')?'active':''}}" href="{{route('admin.stories')}}">
 							<i class="ni ni-bold-right text-primary"></i>
-							<span class="nav-link-text">Stories <span class="badge badge-primary ml-1">NEW</span></span>
+							<span class="nav-link-text">Stories</span>
 						</a>
 					</li>
 				</ul>
@@ -118,14 +134,14 @@
 					<li class="nav-item">
 						<a class="nav-link {{request()->is('*diagnostics*')?'active':''}}" href="{{route('admin.diagnostics')}}">
 							<i class="ni ni-bold-right text-primary"></i>
-							<span class="nav-link-text">Diagnostics <span class="badge badge-primary ml-1">NEW</span></span>
+							<span class="nav-link-text">Diagnostics</span>
 						</a>
 					</li>
 
                     <li class="nav-item">
                         <a class="nav-link {{request()->is('*directory*')?'active':''}}" href="{{route('admin.directory')}}">
                             <i class="ni ni-bold-right text-primary"></i>
-                            <span class="nav-link-text">Directory <span class="badge badge-primary ml-1">NEW</span></span>
+                            <span class="nav-link-text">Directory</span>
                         </a>
                     </li>
 
diff --git a/resources/views/admin/settings/customcss.blade.php b/resources/views/admin/settings/customcss.blade.php
new file mode 100644
index 000000000..07049f0a6
--- /dev/null
+++ b/resources/views/admin/settings/customcss.blade.php
@@ -0,0 +1,45 @@
+@extends('admin.partial.template-full')
+
+@section('section')
+</div>
+<div class="header bg-primary pb-3 mt-n4">
+    <div class="container-fluid">
+        <div class="header-body">
+            <div class="row align-items-center py-4">
+                <div class="col-lg-6 col-7">
+                    <p class="display-1 text-white d-inline-block mb-0">Custom CSS</p>
+                    <p class="lead mb-0 text-white">Customize your instance with custom css.</p>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="container-fluid mt-4">
+    <div class="col-12 col-md-6">
+        <form method="post">
+            @csrf
+            <div class="form-group">
+                <div class="custom-control custom-checkbox">
+                    <input
+                        type="checkbox"
+                        name="show"
+                        class="custom-control-input"
+                        id="customCheck1"
+                        {{ (bool) config_cache('uikit.show_custom.css') ? 'checked' : null}}
+                    >
+                    <label class="custom-control-label" for="customCheck1">Enable Custom CSS</label>
+                </div>
+            </div>
+            <div class="form-group">
+                <label for="css" class="font-weight-bold">Custom CSS</label>
+                <textarea
+                    class="form-control"
+                    id="css"
+                    name="css"
+                    rows="5">{!!config_cache('uikit.custom.css')!!}</textarea>
+            </div>
+            <button class="btn btn-primary">Save</button>
+        </form>
+    </div>
+</div>
+@endsection
diff --git a/resources/views/admin/settings/home.blade.php b/resources/views/admin/settings/home.blade.php
index 7635ac61f..d78780878 100644
--- a/resources/views/admin/settings/home.blade.php
+++ b/resources/views/admin/settings/home.blade.php
@@ -1,392 +1,12 @@
 @extends('admin.partial.template-full')
 
 @section('section')
-<div class="title mb-4">
-	<h3 class="font-weight-bold">Settings</h3>
-@if(config('instance.enable_cc'))
-	<p class="lead mb-0">Manage instance settings</p>
 </div>
-<form method="post">
-	@csrf
-	<ul class="nav nav-tabs nav-fill border-bottom-0" id="myTab" role="tablist">
-		<li class="nav-item">
-			<a class="nav-link font-weight-bold active" id="home-tab" data-toggle="tab" href="#home" role="tab" aria-controls="home" aria-selected="true"><i class="fas fa-home"></i></a>
-		</li>
-		<li class="nav-item border-none">
-			<a class="nav-link font-weight-bold px-4" id="landing-tab" data-toggle="tab" href="#landing" role="tab" aria-controls="landing">Landing</a>
-		</li>
-		<li class="nav-item border-none">
-			<a class="nav-link font-weight-bold px-4" id="brand-tab" data-toggle="tab" href="#brand" role="tab" aria-controls="brand">Brand</a>
-		</li>
-		{{-- <li class="nav-item border-none">
-			<a class="nav-link font-weight-bold px-4" id="media-tab" data-toggle="tab" href="#media" role="tab" aria-controls="media">Mail</a>
-		</li> --}}
-		<li class="nav-item border-none">
-			<a class="nav-link font-weight-bold px-4" id="media-tab" data-toggle="tab" href="#media" role="tab" aria-controls="media">Media</a>
-		</li>
-		<li class="nav-item border-none">
-			<a class="nav-link font-weight-bold px-4" id="rules-tab" data-toggle="tab" href="#rules" role="tab" aria-controls="rules">Rules</a>
-		</li>
-		<li class="nav-item border-none">
-			<a class="nav-link font-weight-bold px-4" id="users-tab" data-toggle="tab" href="#users" role="tab" aria-controls="users">Users</a>
-		</li>
-		<li class="nav-item">
-			<a class="nav-link font-weight-bold px-4" id="advanced-tab" data-toggle="tab" href="#advanced" role="tab" aria-controls="advanced">Advanced</a>
-		</li>
-	</ul>
-	<div class="tab-content" id="myTabContent">
-
-	<div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="home-tab">
-		{{-- <div class="ml-n4 mr-n2 p-3 border-top border-bottom">
-			<label class="font-weight-bold text-muted">System Configuration</label>
-			<ul class="list-unstyled">
-				<li>
-					<span class="text-muted">Max Upload Size: </span>
-					<span class="font-weight-bold">{{$system['max_upload_size']}}</span>
-				</li>
-				<li>
-					<span class="text-muted">Image Driver: </span>
-					<span class="font-weight-bold">{{$system['image_driver']}}</span>
-				</li>
-				<li>
-					<span class="text-muted">Image Driver Loaded: </span>
-					<span class="font-weight-bold">
-						@if($system['image_driver_loaded'])
-						<i class="fas fa-check text-success"></i>
-						@else
-						<i class="fas fa-times text-danger"></i>
-						@endif
-					</span>
-				</li>
-				<li>
-					<span class="text-muted">File Permissions: </span>
-					<span class="font-weight-bold">
-						@if($system['permissions'])
-						<i class="fas fa-check text-success"></i>
-						@else
-						<i class="fas fa-times text-danger"></i>
-						@endif
-					</span>
-				</li>
-				<li>
-					<span class="text-muted"></span>
-					<span class="font-weight-bold"></span>
-				</li>
-			</ul>
-		</div> --}}
-		<div class="form-group mb-0">
-			<div class="ml-n4 mr-n2 p-3 border-top border-bottom">
-				<label class="font-weight-bold text-muted">Features</label>
-				@if($cloud_ready)
-				<div class="custom-control custom-checkbox mt-2">
-					<input type="checkbox" name="cloud_storage" class="custom-control-input" id="cls1" {{config_cache('pixelfed.cloud_storage') ? 'checked' : ''}}>
-					<label class="custom-control-label font-weight-bold" for="cls1">Cloud Storage</label>
-				</div>
-				<p class="mb-4 small">Store photos &amp; videos on S3 compatible object storage providers.</p>
-				@endif
-
-				<div class="custom-control custom-checkbox mt-2">
-					<input type="checkbox" name="activitypub" class="custom-control-input" id="ap" {{config_cache('federation.activitypub.enabled') ? 'checked' : ''}}>
-					<label class="custom-control-label font-weight-bold" for="ap">ActivityPub</label>
-				</div>
-				<p class="mb-4 small">ActivityPub federation, compatible with Pixelfed, Mastodon and other projects.</p>
-
-				<div class="custom-control custom-checkbox mt-2">
-					<input type="checkbox" name="open_registration" class="custom-control-input" id="openReg" {{config_cache('pixelfed.open_registration') ? 'checked' : ''}}>
-					<label class="custom-control-label font-weight-bold" for="openReg">Open Registrations</label>
-				</div>
-				<p class="mb-4 small">Allow new user registrations.</p>
-
-				<div class="custom-control custom-checkbox mt-2">
-					<input type="checkbox" name="mobile_apis" class="custom-control-input" id="cf2" {{config_cache('pixelfed.oauth_enabled') ? 'checked' : ''}}>
-					<label class="custom-control-label font-weight-bold" for="cf2">Mobile APIs</label>
-				</div>
-				<p class="mb-4 small">Enable apis required for mobile app support.</p>
-
-				<div class="custom-control custom-checkbox mt-2">
-					<input type="checkbox" name="stories" class="custom-control-input" id="cf3" {{config_cache('instance.stories.enabled') ? 'checked' : ''}}>
-					<label class="custom-control-label font-weight-bold" for="cf3">Stories</label>
-				</div>
-				<p class="mb-4 small">Allow users to share ephemeral Stories.</p>
-
-				<div class="custom-control custom-checkbox mt-2">
-					<input type="checkbox" name="ig_import" class="custom-control-input" id="cf4" {{config_cache('pixelfed.import.instagram.enabled') ? 'checked' : ''}}>
-					<label class="custom-control-label font-weight-bold" for="cf4">Instagram Import</label>
-				</div>
-				<p class="mb-4 small">Allow <span class="font-weight-bold">experimental</span> Instagram Import support.</p>
-
-				<div class="custom-control custom-checkbox mt-2">
-					<input type="checkbox" name="spam_detection" class="custom-control-input" id="cf5" {{config_cache('pixelfed.bouncer.enabled') ? 'checked' : ''}}>
-					<label class="custom-control-label font-weight-bold" for="cf5">Spam detection</label>
-				</div>
-				<p class="mb-4 small">Detect and remove spam from timelines.</p>
-			</div>
-		</div>
-		{{-- <div class="form-group mb-0">
-			<div class="ml-n4 mr-n2 p-3 border-top border-bottom">
-				<label class="font-weight-bold text-muted">Name</label>
-				<input class="form-control col-8" name="name" placeholder="Pixelfed" value="{{config_cache('app.name')}}">
-				<p class="help-text small text-muted mt-3 mb-0">The instance name used in titles, metadata and apis.</p>
-			</div>
-		</div>
-		<div class="form-group mb-0">
-			<div class="ml-n4 mr-n2 p-3 border-bottom">
-				<label class="font-weight-bold text-muted">Short Description</label>
-				<textarea class="form-control" rows="3" name="short_description">{{config_cache('app.short_description')}}</textarea>
-				<p class="help-text small text-muted mt-3 mb-0">Short description of instance used on various pages and apis.</p>
-			</div>
-		</div>
-		<div class="form-group mb-0">
-			<div class="ml-n4 mr-n2 p-3 border-bottom">
-				<label class="font-weight-bold text-muted">Long Description</label>
-				<textarea class="form-control" rows="3" name="long_description">{{config_cache('app.description')}}</textarea>
-				<p class="help-text small text-muted mt-3 mb-0">Longer description of instance used on about page.</p>
-			</div>
-		</div> --}}
-	</div>
-
-	<div class="tab-pane" id="landing" role="tabpanel" aria-labelledby="landing-tab">
-		<div class="form-group mb-0">
-			<div class="ml-n4 mr-n2 p-3 border-top border-bottom">
-				<p class="mb-0 small">Configure your landing page</p>
-			</div>
-		</div>
-		<div class="form-group mb-0">
-			<div class="ml-n4 mr-n2 p-3 border-bottom">
-				<p class="font-weight-bold text-muted">Discovery</p>
-
-				<div class="my-3">
-					<div class="custom-control custom-checkbox">
-						<input type="checkbox" class="custom-control-input" id="show_directory" name="show_directory" {{ config_cache('instance.landing.show_directory') ? 'checked' : ''}}>
-						<label class="custom-control-label font-weight-bold" for="show_directory">Show Directory</label>
-					</div>
-				</div>
-
-				<div class="my-3">
-					<div class="custom-control custom-checkbox">
-						<input type="checkbox" class="custom-control-input" id="show_explore_feed" name="show_explore_feed" {{ config_cache('instance.landing.show_explore') ? 'checked' : ''}}>
-						<label class="custom-control-label font-weight-bold" for="show_explore_feed">Show Explore Feed</label>
-					</div>
-				</div>
-			</div>
-		</div>
-		<div class="form-group mb-0">
-			<div class="ml-n4 mr-n2 p-3 border-bottom">
-				<p class="font-weight-bold text-muted">Admin Account</p>
-
-				<div class="my-3">
-					<select class="custom-select" name="admin_account_id" style="max-width: 300px;">
-						<option selected disabled>Select an admin account</option>
-						@foreach($availableAdmins as $acct)
-							<option
-								value="{{ $acct->profile_id }}" {!! $currentAdmin && $currentAdmin['id'] == $acct->profile_id ? 'selected' : null !!}
-								>
-								<span class="font-weight-bold">&commat;{{ $acct->username }}</span>
-							</option>
-						@endforeach
-					</select>
-				</div>
-			</div>
-		</div>
-	</div>
-
-	<div class="tab-pane" id="brand" role="tabpanel" aria-labelledby="brand-tab">
-		<div class="form-group mb-0">
-			<div class="ml-n4 mr-n2 p-3 border-top border-bottom">
-				<label class="font-weight-bold text-muted">Name</label>
-				<input class="form-control col-8" name="name" placeholder="Pixelfed" value="{{config_cache('app.name')}}">
-				<p class="help-text small text-muted mt-3 mb-0">The instance name used in titles, metadata and apis.</p>
-			</div>
-		</div>
-		<div class="form-group mb-0">
-			<div class="ml-n4 mr-n2 p-3 border-bottom">
-				<label class="font-weight-bold text-muted">Short Description</label>
-				<textarea class="form-control" rows="3" name="short_description">{{config_cache('app.short_description')}}</textarea>
-				<p class="help-text small text-muted mt-3 mb-0">Short description of instance used on various pages and apis.</p>
-			</div>
-		</div>
-		<div class="form-group mb-0">
-			<div class="ml-n4 mr-n2 p-3 border-bottom">
-				<label class="font-weight-bold text-muted">Long Description</label>
-				<textarea class="form-control" rows="3" name="long_description">{{config_cache('app.description')}}</textarea>
-				<p class="help-text small text-muted mt-3 mb-0">Longer description of instance used on about page.</p>
-			</div>
-		</div>
-		<div class="form-group mb-0">
-			<div class="ml-n4 mr-n2 p-3 border-top border-bottom">
-				<label class="font-weight-bold text-muted">About Title</label>
-				<input class="form-control col-8" name="about_title" placeholder="Photo Sharing. For Everyone" value="{{config_cache('about.title')}}">
-				<p class="help-text small text-muted mt-3 mb-0">The header title used on the <a href="/site/about">about page</a>.</p>
-			</div>
-		</div>
-	</div>
-
-	<div class="tab-pane" id="users" role="tabpanel" aria-labelledby="users-tab">
-		<div class="form-group mb-0">
-			<div class="ml-n4 mr-n2 p-3 border-top">
-				<div class="custom-control custom-checkbox mt-2">
-					<input type="checkbox" name="require_email_verification" class="custom-control-input" id="mailVerification" {{config_cache('pixelfed.enforce_email_verification') ? 'checked' : ''}}>
-					<label class="custom-control-label font-weight-bold" for="mailVerification">Require Email Verification</label>
-				</div>
-			</div>
-		</div>
-
-		<div class="form-group">
-			<div class="ml-n4 mr-n2 p-3 border-top">
-				<div class="custom-control custom-checkbox my-2">
-					<input type="checkbox" name="enforce_account_limit" class="custom-control-input" id="userEnforceLimit" {{config_cache('pixelfed.enforce_account_limit') ? 'checked' : ''}}>
-					<label class="custom-control-label font-weight-bold" for="userEnforceLimit">Enable account storage limit</label>
-					<p class="help-text small text-muted">Set a storage limit per user account.</p>
-				</div>
-				<label class="font-weight-bold text-muted">Account Limit</label>
-				<input class="form-control" name="account_limit" placeholder="Pixelfed" value="{{config_cache('pixelfed.max_account_size')}}">
-				<p class="help-text small text-muted mt-3 mb-0">Account limit size in KB.</p>
-				<p class="help-text small text-muted mb-0">{{config_cache('pixelfed.max_account_size')}} KB = {{floor(config_cache('pixelfed.max_account_size') / 1024)}} MB</p>
-			</div>
-		</div>
-
-		<div class="form-group">
-			<div class="ml-n4 mr-n2 p-3 border-top">
-				<div class="custom-control custom-checkbox my-2">
-					<input type="checkbox" name="account_autofollow" class="custom-control-input" id="userAccountAutofollow" {{config_cache('account.autofollow') ? 'checked' : ''}}>
-					<label class="custom-control-label font-weight-bold" for="userAccountAutofollow">Auto Follow Accounts</label>
-					<p class="help-text small text-muted">Enable auto follow accounts, new accounts will follow accounts you set.</p>
-				</div>
-				<label class="font-weight-bold text-muted">Accounts</label>
-				<textarea class="form-control" name="account_autofollow_usernames" placeholder="Add account usernames to follow separated by commas">{{config_cache('account.autofollow_usernames')}}</textarea>
-				<p class="help-text small text-muted mt-3 mb-0">Add account usernames to follow separated by commas.</p>
-			</div>
-		</div>
-	</div>
-
-	<div class="tab-pane" id="media" role="tabpanel" aria-labelledby="media-tab">
-		<div class="form-group mb-0">
-			<div class="ml-n4 mr-n2 p-3 border-top">
-				<label class="font-weight-bold text-muted">Max Size</label>
-				<input class="form-control" name="max_photo_size" value="{{config_cache('pixelfed.max_photo_size')}}">
-				<p class="help-text small text-muted mt-3 mb-0">Maximum file upload size in KB</p>
-				<p class="help-text small text-muted mb-0">{{config_cache('pixelfed.max_photo_size')}} KB = {{number_format(config_cache('pixelfed.max_photo_size') / 1024)}} MB</p>
-			</div>
-		</div>
-		<div class="form-group mb-0">
-			<div class="ml-n4 mr-n2 p-3 border-top">
-				<label class="font-weight-bold text-muted">Photo Album Limit</label>
-				<input class="form-control" name="max_album_length" value="{{config_cache('pixelfed.max_album_length')}}">
-				<p class="help-text small text-muted mt-3 mb-0">The maximum number of photos or videos per album</p>
-			</div>
-		</div>
-		<div class="form-group mb-0">
-			<div class="ml-n4 mr-n2 p-3 border-top">
-				<label class="font-weight-bold text-muted">Image Quality</label>
-				<input class="form-control" name="image_quality" value="{{config_cache('pixelfed.image_quality')}}">
-				<p class="help-text small text-muted mt-3 mb-0">Image optimization quality from 0-100%. Set to 0 to disable image optimization.</p>
-			</div>
-		</div>
-		<div class="form-group">
-			<div class="ml-n4 mr-n2 p-3 border-top border-bottom">
-				<label class="font-weight-bold text-muted">Media Types</label>
-				<div class="custom-control custom-checkbox mt-2">
-					<input type="checkbox" name="type_jpeg" class="custom-control-input" id="mediaType1" {{$jpeg ? 'checked' : ''}}>
-					<label class="custom-control-label" for="mediaType1"><span class="border border-dark px-1 rounded font-weight-bold">JPEG</span></label>
-				</div>
-				<div class="custom-control custom-checkbox mt-2">
-					<input type="checkbox" name="type_png" class="custom-control-input" id="mediaType2" {{$png ? 'checked' : ''}}>
-					<label class="custom-control-label" for="mediaType2"><span class="border border-dark px-1 rounded font-weight-bold">PNG</span></label>
-				</div>
-				<div class="custom-control custom-checkbox mt-2">
-					<input type="checkbox" name="type_gif" class="custom-control-input" id="mediaType3" {{$gif ? 'checked' : ''}}>
-					<label class="custom-control-label" for="mediaType3"><span class="border border-dark px-1 rounded font-weight-bold">GIF</span></label>
-				</div>
-				<div class="custom-control custom-checkbox mt-2">
-					<input type="checkbox" name="type_webp" class="custom-control-input" id="mediaType4" {{$webp ? 'checked' : ''}}>
-					<label class="custom-control-label" for="mediaType4"><span class="border border-dark px-1 rounded font-weight-bold">WebP</span></label>
-				</div>
-				<div class="custom-control custom-checkbox mt-2">
-					<input type="checkbox" name="type_mp4" class="custom-control-input" id="mediaType5" {{$mp4 ? 'checked' : ''}}>
-					<label class="custom-control-label" for="mediaType5"><span class="border border-dark px-1 rounded font-weight-bold">MP4</span></label>
-				</div>
-				<p class="help-text small text-muted mt-3 mb-0">Allowed media types.</p>
-			</div>
-		</div>
-	</div>
-
-	<div class="tab-pane" id="rules" role="tabpanel" aria-labelledby="rules-tab">
-		<div class="border-top">
-			<p class="lead mt-3 py-3 text-center">Add rules that explain what is acceptable use.</p>
-		</div>
-		<div class="ml-n4 mr-n2 p-3 border-top border-bottom">
-			<p class="font-weight-bold text-muted">Active Rules</p>
-			<ol class="font-weight-bold">
-				@if($rules)
-				@foreach($rules as $rule)
-				<li class="mb-4">
-					<p class="mb-0">
-						{{$rule}}
-					</p>
-					<p>
-						<button type="button" class="btn btn-outline-danger btn-sm py-0 rule-delete" data-index="{{$loop->index}}">Delete</button>
-					</p>
-				</li>
-				@endforeach
-				@endif
-			</ol>
-		</div>
-		<div class="form-group mb-0">
-			<div class="ml-n4 mr-n2 p-3 border-top border-bottom">
-				<label class="font-weight-bold text-muted">Add Rule</label>
-				<input class="form-control" name="new_rule" placeholder="Add a new rule, we recommend being descriptive but keeping it short"/>
-			</div>
-		</div>
-	</div>
-
-	<div class="tab-pane" id="advanced" role="tabpanel" aria-labelledby="advanced-tab">
-		<div class="form-group mb-0">
-			<div class="ml-n4 mr-n2 p-3 border-top border-bottom">
-				<label class="font-weight-bold text-muted">Custom CSS</label>
-				<div class="custom-control custom-checkbox my-2">
-					<input type="checkbox" name="show_custom_css" class="custom-control-input" id="showCustomCss" {{config_cache('uikit.show_custom.css') ? 'checked' : ''}}>
-					<label class="custom-control-label font-weight-bold" for="showCustomCss">Enable custom CSS</label>
-				</div>
-				<textarea class="form-control" name="custom_css" rows="3">{{config_cache('uikit.custom.css')}}</textarea>
-				<p class="help-text small text-muted mt-3 mb-0">Add custom CSS, will be used on all pages</p>
-			</div>
-		</div>
-	</div>
-
-	</div>
-
-	<div class="form-group row mb-0 mt-4">
-		<div class="col-12 text-right">
-			<button type="submit" class="btn btn-primary font-weight-bold px-5">Save</button>
-		</div>
-	</div>
-</form>
-@else
-</div>
-<div class="py-5">
-	<p class="lead text-center font-weight-bold">Not enabled</p>
-	<p class="text-center">Add <code>ENABLE_CONFIG_CACHE=true</code> in your <span class="font-weight-bold">.env</span> file <br /> and run <span class="font-weight-bold">php artisan config:cache</span></p>
-</div>
-@endif
+<admin-settings />
 @endsection
 
 @push('scripts')
 <script type="text/javascript">
-	$('.rule-delete').on('click', function(e) {
-		if(window.confirm('Are you sure you want to delete this rule?')) {
-			let idx = e.target.dataset.index;
-			axios.post(window.location.href, {
-				'rule_delete': idx
-			}).then(res => {
-				$('.rule-delete[data-index="'+idx+'"]').parents().eq(1).remove();
-			});
-		}
-	});
-
-	$(document).ready(function() {
-		setTimeout(() => {
-			$('.alert-success').fadeOut();
-		}, 1000);
-	});
+    new Vue({ el: '#panel'});
 </script>
 @endpush
diff --git a/resources/views/atom/user.blade.php b/resources/views/atom/user.blade.php
index b0c2ee073..badb1f8de 100644
--- a/resources/views/atom/user.blade.php
+++ b/resources/views/atom/user.blade.php
@@ -1,46 +1,52 @@
-<?=
-/* Using an echo tag here so the `<? ... ?>` won't get parsed as short tags */
-'<?xml version="1.0" encoding="UTF-8"?>' . PHP_EOL
-?>
+<?= '<?xml version="1.0" encoding="UTF-8"?>' . PHP_EOL ?>
 <feed xmlns="http://www.w3.org/2005/Atom" xmlns:media="http://search.yahoo.com/mrss/">
-	<id>{{$permalink}}</id>
-	<title>{{$profile['username']}} on Pixelfed</title>
-	<subtitle type="html">{{$profile['note']}}</subtitle>
-	@if($items && count($items))
-<updated>{{$items[0]['created_at']}}</updated>
-	@endif
+    <id>{{$permalink}}</id>
+    <title>{{$profile['username']}} on {{config('pixelfed.domain.app', 'Pixelfed')}}</title>
+    <subtitle type="html">{{strip_tags($profile['note'])}}</subtitle>
+    @if($items && count($items))
+        <updated>{{$items[0]['created_at']}}</updated>
+    @endif
 
-	<author>
-		<name>{{$profile['username']}}</name>
-		<uri>{{$profile['url']}}</uri>
-	</author>
+    <author>
+        <name>{{$profile['username']}}</name>
+        <uri>{{$profile['url']}}</uri>
+    </author>
 
-	<link rel="alternate" type="text/html" href="{{$profile['url']}}" />
-	<link rel="self" type="application/atom+xml" href="{{$permalink}}" />
-	@if($items && count($items))
-	@foreach($items as $item)
-	<entry>
-		<id>{{ $item['url'] }}</id>
-		<title>{{ $item['content_text'] ? $item['content_text'] : "No caption" }}</title>
-		<updated>{{ $item['created_at'] }}</updated>
-		<author>
-			<name>{{$profile['username']}}</name>
-			<uri>{{$profile['url']}}</uri>
-		</author>
-		<content type="html">
-			<![CDATA[
-			<img id="rss_item_{{$item['id']}}" src="{{ $item['media_attachments'][0]['url'] }}" alt="{{ $item['media_attachments'][0]['description'] }}">
-			<p style="padding:10px;">{!! $item['content'] !!}</p>
-			]]>
-		</content>
-		<link rel="alternate" href="{{ $item['url'] }}" />
-		@if($item['content'] && strlen($item['content']))
-		<summary type="html">{{ $item['content'] }}</summary>
-		@endif
-		<media:content url="{{ $item['media_attachments'][0]['url'] }}" type="{{ $item['media_attachments'][0]['mime'] }}" medium="image" />
-	</entry>
-	@endforeach
-
-@endif
+    <link rel="alternate" type="text/html" href="{{$profile['url']}}" />
+    <link rel="self" type="application/atom+xml" href="{{$permalink}}" />
 
+    @if($items && count($items))
+        @foreach($items as $item)
+            <entry>
+                <id>{{ $item['url'] }}</id>
+                <title>{{ $item['content_text'] ? $item['content_text'] : "No caption" }}</title>
+                <updated>{{ $item['created_at'] }}</updated>
+                <author>
+                    <name>{{$profile['username']}}</name>
+                    <uri>{{$profile['url']}}</uri>
+                </author>
+                <content type="html">
+                    <![CDATA[
+                    <div class="media-gallery">
+                        @foreach($item['media_attachments'] as $media)
+                            <img class="media-item" src="{{ $media['url'] }}" alt="{{ $media['description'] ?? '' }}">
+                        @endforeach
+                    </div>
+                    <p style="padding:10px;">{!! $item['content'] !!}</p>
+                    ]]>
+                </content>
+                <link rel="alternate" href="{{ $item['url'] }}" />
+                @if($item['content'] && strlen($item['content']))
+                    <summary type="html">{{ $item['content'] }}</summary>
+                @endif
+                @foreach($item['media_attachments'] as $media)
+                    <media:content
+                        url="{{ $media['url'] }}"
+                        type="{{ $media['mime'] }}"
+                        medium="image"
+                    />
+                @endforeach
+            </entry>
+        @endforeach
+    @endif
 </feed>
diff --git a/resources/views/auth/checkpoint.blade.php b/resources/views/auth/checkpoint.blade.php
index 480be02d6..fd99073dc 100644
--- a/resources/views/auth/checkpoint.blade.php
+++ b/resources/views/auth/checkpoint.blade.php
@@ -38,7 +38,7 @@
 	                                	name="code"
 	                                	placeholder="{{__('Two-Factor Authentication Code')}}"
 	                                	required
-	                                	autocomplete="new-password"
+	                                	autocomplete="one-time-code"
 	                                	autofocus=""
 	                                	inputmode="numeric"
 	                                	minlength="6">
diff --git a/resources/views/auth/curated-register/concierge.blade.php b/resources/views/auth/curated-register/concierge.blade.php
new file mode 100644
index 000000000..3d8f300b7
--- /dev/null
+++ b/resources/views/auth/curated-register/concierge.blade.php
@@ -0,0 +1,124 @@
+@extends('layouts.blank')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center align-items-center">
+        <div class="col-12 col-md-7">
+            <div class="logo">
+                <img src="/img/pixelfed-icon-color.svg" width="40" height="40" alt="Pixelfed Logo">
+                <p class="font-weight-bold mb-0">Pixelfed</p>
+            </div>
+
+            @include('auth.curated-register.partials.progress-bar', ['step' => 4])
+
+            @if ($errors->any())
+                @foreach ($errors->all() as $error)
+                <div class="alert alert-danger bg-danger border-danger text-white">
+                    <p class="lead font-weight-bold mb-0"><i class="far fa-exclamation-triangle mr-2"></i> {{ $error }}</p>
+                </div>
+                @endforeach
+                <div class="mb-5"></div>
+            @endif
+
+            @if($emailConfirmed)
+            <h1 class="text-center font-weight-bold mt-4">Information Requested</h1>
+            <p class="lead text-center"><span class="font-weight-light">Our admin team requests the following information from you:</span></p>
+            <div class="border border-primary p-4 rounded my-3" style="border-style: dashed !important;">
+                <p class="mb-0 lead">testing</p>
+            </div>
+            <hr class="border-dark">
+
+            <form method="post">
+                @csrf
+                <input type="hidden" name="action" value="message">
+
+                <div class="form-group">
+                    <label for="message">Your Response</label>
+                    <textarea
+                        class="form-control bg-dark border-dark text-white"
+                        rows="4"
+                        id="reason"
+                        name="response"
+                        placeholder="Enter your response here, up to 1000 chars..."
+                        maxlength="1000"></textarea>
+                    <div class="help-text small text-muted d-flex justify-content-end mt-1 font-weight-bold">
+                        <span id="charCount" class="text-white">0</span>/<span>1000</span>
+                    </div>
+                </div>
+
+                <button class="btn btn-primary font-weight-bold rounded-pill px-5">Submit</button>
+            </form>
+            <hr class="border-dark">
+            <p class="text-muted small text-center">For additional information, please see our <a href="{{ route('help.curated-onboarding') }}" style="font-weight: 600;">Curated Onboarding</a> Help Center page.</p>
+            @else
+                @include('auth.curated-register.partials.message-email-confirm', ['step' => 4])
+            @endif
+        </div>
+    </div>
+</div>
+@endsection
+
+@push('scripts')
+<script>
+document.addEventListener('DOMContentLoaded', function () {
+    var textInput = document.getElementById('reason');
+    var charCount = document.getElementById('charCount');
+    var currentLength = textInput.value.length;
+    charCount.textContent = currentLength;
+
+    textInput.addEventListener('input', function () {
+        var currentLength = textInput.value.length;
+        charCount.textContent = currentLength;
+    });
+});
+</script>
+@endpush
+
+@push('styles')
+    <link href="{{ mix('css/landing.css') }}" rel="stylesheet">
+    <style type="text/css">
+        .gap-1 {
+            gap: 1rem;
+        }
+
+        .opacity-5 {
+            opacity: .5;
+        }
+
+        .logo {
+            display: flex;
+            margin-top: 50px;
+            align-items: center;
+            justify-content: center;
+            gap: 1rem;
+
+            p {
+                font-size: 30px;
+            }
+        }
+
+        .action-btns {
+            display: flex;
+            margin: 3rem auto 1rem auto;
+            flex-direction: row;
+            gap: 1rem;
+
+            form {
+                flex-grow: 1;
+            }
+        }
+
+        .small-links {
+            display: flex;
+            justify-content: center;
+            flex-direction: row;
+            margin-bottom: 5rem;
+            gap: 1rem;
+
+            a {
+                color: rgba(255, 255, 255, 0.6);
+                font-size: 12px;
+            }
+        }
+    </style>
+@endpush
diff --git a/resources/views/auth/curated-register/concierge_form.blade.php b/resources/views/auth/curated-register/concierge_form.blade.php
new file mode 100644
index 000000000..472003fd5
--- /dev/null
+++ b/resources/views/auth/curated-register/concierge_form.blade.php
@@ -0,0 +1,129 @@
+@extends('layouts.blank')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center align-items-center">
+        <div class="col-12 col-md-7">
+            <div class="logo">
+                <img src="/img/pixelfed-icon-color.svg" width="40" height="40" alt="Pixelfed Logo">
+                <p class="font-weight-bold mb-0">Pixelfed</p>
+            </div>
+
+            @include('auth.curated-register.partials.progress-bar', ['step' => 4])
+
+            @if ($errors->any())
+                @foreach ($errors->all() as $error)
+                <div class="alert alert-danger bg-danger border-danger text-white">
+                    <p class="lead font-weight-bold mb-0"><i class="far fa-exclamation-triangle mr-2"></i> {{ $error }}</p>
+                </div>
+                @endforeach
+                <div class="mb-5"></div>
+            @endif
+
+            <h1 class="text-center font-weight-bold mt-4 mb-3"><i class="far fa-info-circle mr-2"></i> Information Requested</h1>
+            <p class="h5" style="line-height: 1.5;">Before we can process your application to join, our admin team have requested additional information from you. Please respond at your earliest convenience!</p>
+            <hr class="border-dark">
+            <p>From our Admins:</p>
+            <div class="card card-body mb-1 bg-dark border border-secondary" style="border-style: dashed !important;">
+                <p class="lead mb-0" style="white-space: pre-wrap; opacity: 0.8;">{{ $activity->message }}</p>
+            </div>
+            <p class="mb-3 small text-muted">If you don't understand this request, or need additional context you should request clarification from the admin team.</p>
+            {{-- <hr class="border-dark"> --}}
+
+            <form method="post">
+                @csrf
+                <input type="hidden" name="crid" value="{{ $activity->register_id }}">
+                <input type="hidden" name="acid" value="{{ $activity->id }}">
+                <div class="form-group">
+                    <label for="message">Your Response</label>
+                    <textarea
+                        class="form-control bg-dark border-dark text-white"
+                        rows="4"
+                        id="reason"
+                        name="response"
+                        placeholder="Enter your response here, up to 1000 chars..."
+                        maxlength="1000">{{ old('response') }}</textarea>
+                    <div class="help-text small text-muted d-flex justify-content-end mt-1 font-weight-bold">
+                        <span id="charCount" class="text-white">0</span>/<span>1000</span>
+                    </div>
+                </div>
+                @if($showCaptcha)
+                <div class="d-flex justify-content-center my-3">
+                    {!! Captcha::display() !!}
+                </div>
+                @endif
+                <div class="text-center">
+                    <button class="btn btn-primary font-weight-bold rounded-pill px-5">Submit my response</button>
+                </div>
+            </form>
+            <hr class="border-dark">
+            <p class="text-muted small text-center">For additional information, please see our <a href="{{ route('help.curated-onboarding') }}" style="font-weight: 600;">Curated Onboarding</a> Help Center page.</p>
+        </div>
+    </div>
+</div>
+@endsection
+
+@push('scripts')
+<script>
+document.addEventListener('DOMContentLoaded', function () {
+    var textInput = document.getElementById('reason');
+    var charCount = document.getElementById('charCount');
+    var currentLength = textInput.value.length;
+    charCount.textContent = currentLength;
+
+    textInput.addEventListener('input', function () {
+        var currentLength = textInput.value.length;
+        charCount.textContent = currentLength;
+    });
+});
+</script>
+@endpush
+
+@push('styles')
+    <link href="{{ mix('css/landing.css') }}" rel="stylesheet">
+    <style type="text/css">
+        .gap-1 {
+            gap: 1rem;
+        }
+
+        .opacity-5 {
+            opacity: .5;
+        }
+
+        .logo {
+            display: flex;
+            margin-top: 50px;
+            align-items: center;
+            justify-content: center;
+            gap: 1rem;
+
+            p {
+                font-size: 30px;
+            }
+        }
+
+        .action-btns {
+            display: flex;
+            margin: 3rem auto 1rem auto;
+            flex-direction: row;
+            gap: 1rem;
+
+            form {
+                flex-grow: 1;
+            }
+        }
+
+        .small-links {
+            display: flex;
+            justify-content: center;
+            flex-direction: row;
+            margin-bottom: 5rem;
+            gap: 1rem;
+
+            a {
+                color: rgba(255, 255, 255, 0.6);
+                font-size: 12px;
+            }
+        }
+    </style>
+@endpush
diff --git a/resources/views/auth/curated-register/confirm_email.blade.php b/resources/views/auth/curated-register/confirm_email.blade.php
new file mode 100644
index 000000000..786023a92
--- /dev/null
+++ b/resources/views/auth/curated-register/confirm_email.blade.php
@@ -0,0 +1,91 @@
+@extends('layouts.blank')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center align-items-center">
+        <div class="col-12 col-md-7">
+            <div class="logo">
+                <img src="/img/pixelfed-icon-color.svg" width="40" height="40" alt="Pixelfed Logo">
+                <p class="font-weight-bold mb-0">Pixelfed</p>
+            </div>
+
+            @include('auth.curated-register.partials.progress-bar', ['step' => 3])
+
+            @if ($errors->any())
+                @foreach ($errors->all() as $error)
+                <div class="alert alert-danger bg-danger border-danger text-white">
+                    <p class="lead font-weight-bold mb-0"><i class="far fa-exclamation-triangle mr-2"></i> {{ $error }}</p>
+                </div>
+                @endforeach
+                <div class="mb-5"></div>
+            @endif
+
+            <h1 class="text-center">Confirm Email</h1>
+            <p class="lead text-center">Please confirm your email address so we can continue processing your registration application.</p>
+
+            <form method="post">
+                @csrf
+                <input type="hidden" name="sid" value={{request()->input('sid')}}>
+                <input type="hidden" name="code" value={{request()->input('code')}}>
+                @if(config('instance.curated_registration.captcha_enabled'))
+                <div class="d-flex justify-content-center my-3">
+                    {!! Captcha::display() !!}
+                </div>
+                @endif
+                <div class="mt-3 pt-4">
+                    <button class="btn btn-primary rounded-pill font-weight-bold btn-block">Confirm Email Address</button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+@endsection
+
+@push('styles')
+    <link href="{{ mix('css/landing.css') }}" rel="stylesheet">
+    <style type="text/css">
+        .gap-1 {
+            gap: 1rem;
+        }
+
+        .opacity-5 {
+            opacity: .5;
+        }
+
+        .logo {
+            display: flex;
+            margin-top: 50px;
+            align-items: center;
+            justify-content: center;
+            gap: 1rem;
+
+            p {
+                font-size: 30px;
+            }
+        }
+
+        .action-btns {
+            display: flex;
+            margin: 3rem auto 1rem auto;
+            flex-direction: row;
+            gap: 1rem;
+
+            form {
+                flex-grow: 1;
+            }
+        }
+
+        .small-links {
+            display: flex;
+            justify-content: center;
+            flex-direction: row;
+            margin-bottom: 5rem;
+            gap: 1rem;
+
+            a {
+                color: rgba(255, 255, 255, 0.6);
+                font-size: 12px;
+            }
+        }
+    </style>
+@endpush
diff --git a/resources/views/auth/curated-register/email_confirmed.blade.php b/resources/views/auth/curated-register/email_confirmed.blade.php
new file mode 100644
index 000000000..8d4f8dc13
--- /dev/null
+++ b/resources/views/auth/curated-register/email_confirmed.blade.php
@@ -0,0 +1,74 @@
+@extends('layouts.blank')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center align-items-center">
+        <div class="col-12 col-md-7">
+            <div class="logo">
+                <img src="/img/pixelfed-icon-color.svg" width="40" height="40" alt="Pixelfed Logo">
+                <p class="font-weight-bold mb-0">Pixelfed</p>
+            </div>
+
+            @include('auth.curated-register.partials.progress-bar', ['step' => 4])
+
+            <p class="text-center"><i class="fal fa-check-circle text-success fa-8x"></i></p>
+            <h1 class="text-center font-weight-bold my-4">Email Confirmed!</h1>
+            <p class="h4 text-center"><span class="font-weight-bold">Our admin team will review your application.</span></p>
+            <hr class="border-dark">
+            <p class="lead text-center">Most applications are processed within 24-48 hours. We will send you an email once your account is ready!</p>
+            <p class="text-muted text-center">If we need any additional information, we will send you an automated request with a link that you can visit and provide further details to help process your application.</p>
+            <hr class="border-dark">
+            <p class="text-muted small text-center">For additional information, please see our <a href="{{ route('help.curated-onboarding') }}" style="font-weight: 600;">Curated Onboarding</a> Help Center page.</p>
+        </div>
+    </div>
+</div>
+@endsection
+
+@push('styles')
+    <link href="{{ mix('css/landing.css') }}" rel="stylesheet">
+    <style type="text/css">
+        .gap-1 {
+            gap: 1rem;
+        }
+
+        .opacity-5 {
+            opacity: .5;
+        }
+
+        .logo {
+            display: flex;
+            margin-top: 50px;
+            align-items: center;
+            justify-content: center;
+            gap: 1rem;
+
+            p {
+                font-size: 30px;
+            }
+        }
+
+        .action-btns {
+            display: flex;
+            margin: 3rem auto 1rem auto;
+            flex-direction: row;
+            gap: 1rem;
+
+            form {
+                flex-grow: 1;
+            }
+        }
+
+        .small-links {
+            display: flex;
+            justify-content: center;
+            flex-direction: row;
+            margin-bottom: 5rem;
+            gap: 1rem;
+
+            a {
+                color: rgba(255, 255, 255, 0.6);
+                font-size: 12px;
+            }
+        }
+    </style>
+@endpush
diff --git a/resources/views/auth/curated-register/index.blade.php b/resources/views/auth/curated-register/index.blade.php
new file mode 100644
index 000000000..934c15ec7
--- /dev/null
+++ b/resources/views/auth/curated-register/index.blade.php
@@ -0,0 +1,88 @@
+@extends('layouts.blank')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center align-items-center">
+        <div class="col-12 col-md-7">
+            <div class="logo">
+                <img src="/img/pixelfed-icon-color.svg" width="40" height="40" alt="Pixelfed Logo">
+                <p class="font-weight-bold mb-0">Pixelfed</p>
+            </div>
+
+            @include('auth.curated-register.partials.progress-bar', ['step' => $step ?? 1])
+
+            @if ($errors->any())
+                @foreach ($errors->all() as $error)
+                <div class="alert alert-danger bg-danger border-danger text-white">
+                    <p class="lead font-weight-bold mb-0"><i class="far fa-exclamation-triangle mr-2"></i> {{ $error }}</p>
+                </div>
+                @endforeach
+                <div class="mb-5"></div>
+            @endif
+            @if($step === 1)
+                @include('auth.curated-register.partials.step-1')
+            @elseif ($step === 2)
+                @include('auth.curated-register.partials.step-2')
+            @elseif ($step === 3)
+                @include('auth.curated-register.partials.step-3')
+            @elseif ($step === 4)
+                @include('auth.curated-register.partials.step-4')
+            @endif
+        </div>
+    </div>
+</div>
+@endsection
+
+@push('styles')
+    <link href="{{ mix('css/landing.css') }}" rel="stylesheet">
+    <style type="text/css">
+        .gap-1 {
+            gap: 1rem;
+        }
+
+        .opacity-5 {
+            opacity: .5;
+        }
+
+        .logo {
+            display: flex;
+            margin-top: 50px;
+            align-items: center;
+            justify-content: center;
+            gap: 1rem;
+
+            p {
+                font-size: 30px;
+            }
+        }
+
+        .action-btns {
+            display: flex;
+            margin: 3rem auto 1rem auto;
+            flex-direction: row;
+            gap: 1rem;
+
+            form {
+                flex-grow: 1;
+            }
+        }
+
+        .small-links {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            flex-direction: row;
+            margin-bottom: 5rem;
+            gap: 1rem;
+
+            a {
+                color: rgba(255, 255, 255, 0.6);
+                font-size: 12px;
+            }
+
+            span {
+                color: rgba(255, 255, 255, 0.4);
+            }
+        }
+    </style>
+@endpush
diff --git a/resources/views/auth/curated-register/partials/message-email-confirm.blade.php b/resources/views/auth/curated-register/partials/message-email-confirm.blade.php
new file mode 100644
index 000000000..3f0711b63
--- /dev/null
+++ b/resources/views/auth/curated-register/partials/message-email-confirm.blade.php
@@ -0,0 +1,23 @@
+<p class="mt-5 lead text-center font-weight-bold">Please verify your email address</p>
+<form method="post">
+    @csrf
+    <input type="hidden" name="action" value="email">
+    <div class="form-group">
+        <input
+            type="email"
+            class="form-control form-control-lg bg-dark border-dark text-white"
+            name="email"
+            placeholder="Your email address"
+            required />
+    </div>
+    @if(config('instance.curated_registration.captcha_enabled'))
+    <div class="d-flex justify-content-center my-3">
+        {!! Captcha::display() !!}
+    </div>
+    @endif
+    <div class="d-flex justify-content-center">
+        <button class="btn btn-primary font-weight-bold rounded-pill px-5">Verify</button>
+    </div>
+</form>
+<hr class="border-dark">
+<p class="text-muted small text-center">For additional information, please see our <a href="{{ route('help.curated-onboarding') }}" style="font-weight: 600;">Curated Onboarding</a> Help Center page.</p>
diff --git a/resources/views/auth/curated-register/partials/progress-bar.blade.php b/resources/views/auth/curated-register/partials/progress-bar.blade.php
new file mode 100644
index 000000000..778ab1a9c
--- /dev/null
+++ b/resources/views/auth/curated-register/partials/progress-bar.blade.php
@@ -0,0 +1,134 @@
+ <section class="step-wizard">
+    <ul class="step-wizard-list">
+        <li class="step-wizard-item {{ $step === 1 ? 'current-item':'' }}">
+            <span class="progress-count">1</span>
+            <span class="progress-label">Review Rules</span>
+        </li>
+        <li class="step-wizard-item {{ $step === 2 ? 'current-item':'' }}">
+            <span class="progress-count">2</span>
+            <span class="progress-label">Your Details</span>
+        </li>
+        <li class="step-wizard-item {{ $step === 3 ? 'current-item':'' }}">
+            <span class="progress-count">3</span>
+            <span class="progress-label">Confirm Email</span>
+        </li>
+        <li class="step-wizard-item {{ $step === 4 ? 'current-item':'' }}">
+            <span class="progress-count">4</span>
+            <span class="progress-label">Await Review</span>
+        </li>
+    </ul>
+</section>
+
+@push('styles')
+<style type="text/css">
+.step-wizard {
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin: 1rem auto;
+}
+
+.step-wizard-list{
+    background: transparent;
+    color: #fff;
+    list-style-type: none;
+    border-radius: 10px;
+    display: flex;
+    padding: 20px 10px;
+    position: relative;
+    z-index: 10;
+}
+
+.step-wizard-item {
+    padding: 0 10px;
+    flex-basis: 0;
+    -webkit-box-flex: 1;
+    -ms-flex-positive:1;
+    flex-grow: 1;
+    max-width: 100%;
+    display: flex;
+    flex-direction: column;
+    text-align: center;
+    min-width: 20px;
+    position: relative;
+}
+@media (min-width: 600px) {
+    .step-wizard-item {
+        padding: 0 20px;
+        min-width: 140px;
+    }
+}
+.step-wizard-item + .step-wizard-item:after{
+    content: "";
+    position: absolute;
+    left: 0;
+    top: 19px;
+    background: var(--primary);
+    width: 100%;
+    height: 2px;
+    transform: translateX(-50%);
+    z-index: -10;
+}
+.progress-count{
+    height: 40px;
+    width:40px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 50%;
+    font-weight: 600;
+    margin: 0 auto;
+    position: relative;
+    z-index:10;
+    color: transparent;
+}
+.progress-count:after{
+    content: "";
+    height: 40px;
+    width: 40px;
+    background: var(--primary);
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    border-radius: 50%;
+    z-index: -10;
+}
+.progress-count:before{
+    content: "";
+    height: 10px;
+    width: 20px;
+    border-left: 3px solid #fff;
+    border-bottom: 3px solid #fff;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -60%) rotate(-45deg);
+    transform-origin: center center;
+}
+.progress-label{
+    font-size: 14px;
+    font-weight: 600;
+    margin-top: 10px;
+}
+.current-item .progress-count:before,
+.current-item ~ .step-wizard-item .progress-count:before{
+    display: none;
+}
+.current-item ~ .step-wizard-item .progress-count:after{
+    height:10px;
+    width:10px;
+}
+.current-item ~ .step-wizard-item .progress-label{
+    opacity: 0.5;
+}
+.current-item .progress-count:after{
+    background: #080e2b;
+    border: 2px solid var(--primary);
+}
+.current-item .progress-count{
+    color: #fff;
+}
+</style>
+@endpush
diff --git a/resources/views/auth/curated-register/partials/server-rules.blade.php b/resources/views/auth/curated-register/partials/server-rules.blade.php
new file mode 100644
index 000000000..8264697f6
--- /dev/null
+++ b/resources/views/auth/curated-register/partials/server-rules.blade.php
@@ -0,0 +1,18 @@
+@php
+$rules = json_decode(config_cache('app.rules'), true)
+@endphp
+
+<div class="list-group pt-4">
+    @foreach($rules as $id => $rule)
+    <div class="list-group-item bg-transparent border-dark d-flex align-items-center gap-1">
+        <div style="display: block;width: 40px; height:40px;">
+            <div class="border border-primary text-white font-weight-bold rounded-circle d-flex justify-content-center align-items-center" style="display: block;width: 40px; height:40px;">
+                {{ $id + 1 }}
+            </div>
+        </div>
+        <div class="flex-shrink-1">
+            <p class="mb-0 flex-shrink-1 flex-wrap">{{ $rule }}</p>
+        </div>
+    </div>
+    @endforeach
+</div>
diff --git a/resources/views/auth/curated-register/partials/step-1.blade.php b/resources/views/auth/curated-register/partials/step-1.blade.php
new file mode 100644
index 000000000..c51ca3fef
--- /dev/null
+++ b/resources/views/auth/curated-register/partials/step-1.blade.php
@@ -0,0 +1,175 @@
+@php
+$id = str_random(14);
+@endphp
+<h1 class="text-center">Before you continue.</h1>
+@if(config_cache('app.rules') && strlen(config_cache('app.rules')) > 5)
+<p class="lead text-center">Let's go over a few basic guidelines established by the server's administrators.</p>
+
+@include('auth.curated-register.partials.server-rules')
+@else
+<p class="lead text-center mt-4"><span class="opacity-5">The admins have not specified any community rules, however we suggest youreview the</span> <a href="/site/terms" target="_blank" class="text-white font-weight-bold">Terms of Use</a> <span class="opacity-5">and</span> <a href="/site/privacy" target="_blank" class="text-white font-weight-bold">Privacy Policy</a>.</p>
+@endif
+
+<div class="action-btns">
+    <form method="post" id="{{$id}}" class="flex-grow-1">
+        @csrf
+        <input type="hidden" name="step" value="1">
+        <button type="button" class="btn btn-primary rounded-pill font-weight-bold btn-block flex-grow-1" onclick="onSubmit()">Accept</button>
+    </form>
+
+    <a class="btn btn-outline-muted rounded-pill" href="/">Go back</a>
+</div>
+
+<div class="small-links">
+    <a href="/login">Login</a>
+    <span>·</span>
+    <a href="/auth/sign_up/resend-confirmation">Re-send confirmation</a>
+    <span>·</span>
+    <a href="{{route('help.curated-onboarding')}}" target="_blank">Help</a>
+</div>
+
+@push('scripts')
+<script>
+    function onSubmit() {
+        @if ($errors->any())
+        document.getElementById('{{$id}}').submit();
+        return;
+        @endif
+        swal({
+            text: "Please select the region you are located in",
+            icon: "info",
+            buttons: {
+                cancel: false,
+                usa: {
+                    text: "United States",
+                    className: "swal-button--cancel",
+                    value: "usa"
+                },
+                uk: {
+                    text: "UK",
+                    className: "swal-button--cancel",
+                    value: "uk"
+                },
+                eu: {
+                    text: "EU",
+                    className: "swal-button--cancel",
+                    value: "eu"
+                },
+                other: {
+                    text: "Other",
+                    className: "swal-button--cancel",
+                    value: "other"
+                }
+            },
+            dangerMode: false,
+        }).then((region) => {
+            handleRegion(region);
+        })
+    }
+
+    function handleRegion(region) {
+        if(!region) {
+            return;
+        }
+        let minAge = 16;
+        if(['usa', 'uk', 'other'].includes(region)) {
+            minAge = 13;
+        }
+        swal({
+            title: "Enter Your Date of Birth",
+            text: "We require your birthdate solely to confirm that you meet our age requirement.\n\n Rest assured, this information is not stored or used for any other purpose.",
+            content: {
+                element: "input",
+                attributes: {
+                    placeholder: "Enter your birthday in YYYY-MM-DD format",
+                    type: "date",
+                    min: '1900-01-01',
+                    max: getToday(),
+                    pattern: "\d{4}-\d{2}-\d{2}",
+                    required: true
+                }
+            },
+            buttons: {
+                cancel: false,
+                confirm: {
+                    text: 'Confirm Birthdate',
+                    className: "swal-button--cancel",
+                }
+            }
+        }).then((inputValue) => {
+            if (inputValue === false) return;
+
+            if (inputValue === "") {
+                swal("Oops!", "You need to provide your date of birth to proceed!", "error");
+                return false;
+            }
+
+            const dob = new Date(inputValue);
+            if (isValidDate(dob)) {
+                const age = calculateAge(dob);
+                // swal(`Your age is ${age}`);
+                if(age >= 120 || age <= 5) {
+                    swal({
+                        title: "Ineligible to join",
+                        text: "Sorry, the birth date you provided is not valid and we cannot process your request at this time.\n\nIf you entered your birthdate incorrectly you can try again, otherwise if you attempt to bypass our minimum age requirements, your account may be suspended.",
+                        icon: "error",
+                        buttons: {
+                            cancel: "I understand"
+                        }
+                    }).then(() => {
+                        window.location.href = '/'
+                    });
+                    return;
+                }
+                if (age >= minAge) {
+                    document.getElementById('{{$id}}').submit();
+                } else {
+                    swal({
+                        title: "Ineligible to join",
+                        text: `Sorry, you must be at least ${minAge} years old to join our service according to the laws of your country or region.`,
+                        icon: "error",
+                        buttons: {
+                            cancel: "I understand"
+                        }
+                    }).then(() => {
+                        window.location.href = '/'
+                    });
+                }
+            } else {
+                swal("Invalid date format!");
+                return false;
+            }
+        });
+    }
+
+    function calculateAge(dob) {
+        const diff_ms = Date.now() - dob.getTime();
+        console.log(diff_ms);
+        const age_dt = new Date(diff_ms);
+        return Math.abs(age_dt.getUTCFullYear() - 1970);
+    }
+
+    function getToday() {
+        var today = new Date();
+        var dd = today.getDate();
+        var mm = today.getMonth() + 1;
+        var yyyy = today.getFullYear();
+
+        if (dd < 10) {
+           dd = '0' + dd;
+        }
+
+        if (mm < 10) {
+           mm = '0' + mm;
+        }
+
+        yyyy = yyyy - 10;
+
+        return yyyy + '-' + mm + '-' + dd;
+    }
+
+    function isValidDate(d) {
+        return d instanceof Date && !isNaN(d);
+    }
+</script>
+@endpush
diff --git a/resources/views/auth/curated-register/partials/step-2.blade.php b/resources/views/auth/curated-register/partials/step-2.blade.php
new file mode 100644
index 000000000..1d508a4c3
--- /dev/null
+++ b/resources/views/auth/curated-register/partials/step-2.blade.php
@@ -0,0 +1,117 @@
+<h2><span style="opacity:0.5;">Let's begin setting up your account on</span> <strong style="opacity: 1">{{ config('pixelfed.domain.app') }}</strong></h2>
+<form method="post">
+    @csrf
+    <input type="hidden" name="step" value="2">
+    <div class="my-5 details-form">
+        <div class="details-form-field">
+            <label class="text-muted small font-weight-bold mb-0">Username</label>
+            <div class="input-group">
+                <input
+                    type="text"
+                    class="form-control form-control-lg bg-dark border-dark text-white"
+                    placeholder="username"
+                    aria-label="Your username"
+                    aria-describedby="username-addon"
+                    maxlength="15"
+                    required
+                    name="username"
+                    value="{{ request()->session()->get('cur-reg.form-username') }}">
+                <div class="input-group-append">
+                    <span class="input-group-text bg-dark border-dark text-muted font-weight-bold" id="username-addon">&commat;{{ config('pixelfed.domain.app') }}</span>
+                </div>
+            </div>
+            <p class="help-text small text-muted mb-0">You can use letters, numbers, and underscores with a max length of 15 chars.</p>
+        </div>
+
+        <div class="details-form-field">
+            <label class="text-muted small font-weight-bold mb-0">Email</label>
+            <input
+                type="text"
+                class="form-control form-control-lg bg-dark border-dark text-white"
+                placeholder="Your email address"
+                name="email"
+                value="{{ request()->session()->get('cur-reg.form-email') }}"
+                required>
+        </div>
+
+        <div class="details-form-field">
+            <label class="text-muted small font-weight-bold mb-0">Password</label>
+            <input
+                type="password"
+                autocomplete="new-password"
+                minlength="6"
+                class="form-control form-control-lg bg-dark border-dark text-white"
+                placeholder="Password"
+                name="password"
+                required>
+        </div>
+
+        <div class="details-form-field">
+            <label class="text-muted small font-weight-bold mb-0">Password Confirm</label>
+            <input
+                type="password"
+                autocomplete="new-password"
+                minlength="6"
+                class="form-control form-control-lg bg-dark border-dark text-white"
+                placeholder="Confirm Password"
+                name="password_confirmation"
+                required>
+        </div>
+        <div class="border-top border-dark mt-3 pt-4">
+            <p class="lead">
+                Our moderators manually review sign-ups. To assist in the processing of your registration, please provide some information about yourself and explain why you wish to create an account on {{ config('pixelfed.domain.app') }}.
+            </p>
+        </div>
+        <div class="details-form-field">
+            <label class="text-muted small font-weight-bold mb-0">About yourself and why you'd like to join</label>
+            <textarea
+                class="form-control form-control-lg bg-dark text-white border-dark"
+                rows="4"
+                name="reason"
+                maxlength="1000"
+                id="reason"
+                placeholder="Briefly explain why you'd like to join and optionally provide links to other accounts to help admins process your request"
+                required>{{ request()->session()->get('cur-reg.form-reason') }}</textarea>
+            <div class="help-text small text-muted float-right mt-1 font-weight-bold">
+                <span id="charCount" class="text-white">0</span>/<span>1000</span>
+            </div>
+        </div>
+        <div class="border-top border-dark mt-3 pt-4">
+            <div class="details-form-field">
+                <div class="custom-control custom-checkbox">
+                    <input type="checkbox" class="custom-control-input" id="agree" name="agree" required>
+                    <label class="custom-control-label text-muted" for="agree">I have read and agreed to our <a href="/site/terms" target="_blank" class="text-white">Terms of Use</a> and <a href="/site/privacy" target="_blank" class="text-white">Privacy Policy</a>.</label>
+                </div>
+            </div>
+        </div>
+        <div class="mt-3 pt-4">
+            <button class="btn btn-primary rounded-pill font-weight-bold btn-block">Proceed</button>
+        </div>
+    </div>
+</form>
+
+@push('scripts')
+<script>
+document.addEventListener('DOMContentLoaded', function () {
+    var textInput = document.getElementById('reason');
+    var charCount = document.getElementById('charCount');
+    var currentLength = textInput.value.length;
+    charCount.textContent = currentLength;
+
+    textInput.addEventListener('input', function () {
+        var currentLength = textInput.value.length;
+        charCount.textContent = currentLength;
+    });
+});
+</script>
+@endpush
+
+@push('styles')
+<style type="text/css">
+.details-form {
+    display: flex;
+    gap: 1rem;
+    flex-direction: column;
+}
+</style>
+@endpush
diff --git a/resources/views/auth/curated-register/partials/step-3.blade.php b/resources/views/auth/curated-register/partials/step-3.blade.php
new file mode 100644
index 000000000..5cb0541ac
--- /dev/null
+++ b/resources/views/auth/curated-register/partials/step-3.blade.php
@@ -0,0 +1,30 @@
+<h2><span style="opacity:0.5;">Confirm Your Email</h2>
+@if(isset($verifiedEmail))
+<div class="alert alert-success bg-success border-success p-4 text-center mt-5">
+    <p class="text-center text-white mb-4"><i class="far fa-envelope-open fa-4x"></i></p>
+    <p class="lead font-weight-bold text-white mb-0">Please check your email inbox, we sent an email confirmation with a link that you need to visit.</p>
+</div>
+@else
+<p class="lead">Please confirm your email address is correct, we will send a verification e-mail with a special verification link that you need to visit before proceeding.</p>
+<form method="post">
+    @csrf
+    <input type="hidden" name="step" value="3">
+    <div class="details-form-field">
+          <input
+            type="text"
+            class="form-control form-control-lg bg-dark border-dark text-white"
+            placeholder="Your email address"
+            name="email"
+            value="{{ request()->session()->get('cur-reg.form-email') }}"
+            required>
+    </div>
+    @if(config('instance.curated_registration.captcha_enabled'))
+    <div class="d-flex justify-content-center my-3">
+        {!! Captcha::display() !!}
+    </div>
+    @endif
+    <div class="mt-3 pt-4">
+        <button class="btn btn-primary rounded-pill font-weight-bold btn-block">My email is correct</button>
+    </div>
+</form>
+@endif
diff --git a/resources/views/auth/curated-register/partials/step-4.blade.php b/resources/views/auth/curated-register/partials/step-4.blade.php
new file mode 100644
index 000000000..d2a1eafd1
--- /dev/null
+++ b/resources/views/auth/curated-register/partials/step-4.blade.php
@@ -0,0 +1,2 @@
+<h2><span>Processing your membership request</span></h2>
+<p class="lead">We will send you an email once your account is ready!</p>
diff --git a/resources/views/auth/curated-register/resend-confirmation.blade.php b/resources/views/auth/curated-register/resend-confirmation.blade.php
new file mode 100644
index 000000000..822146b1a
--- /dev/null
+++ b/resources/views/auth/curated-register/resend-confirmation.blade.php
@@ -0,0 +1,112 @@
+@extends('layouts.blank')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center align-items-center">
+        <div class="col-12 col-md-7">
+            <div class="logo">
+                <img src="/img/pixelfed-icon-color.svg" width="40" height="40" alt="Pixelfed Logo">
+                <p class="font-weight-bold mb-0">Pixelfed</p>
+            </div>
+
+            @include('auth.curated-register.partials.progress-bar', ['step' => 3])
+
+            @if ($errors->any())
+                @foreach ($errors->all() as $error)
+                <div class="alert alert-danger bg-danger border-danger text-white">
+                    <p class="lead font-weight-bold mb-0"><i class="far fa-exclamation-triangle mr-2"></i> {!! $error !!}</p>
+                </div>
+                @endforeach
+                <div class="mb-5"></div>
+            @endif
+
+            <h1 class="text-center">Resend Confirmation</h1>
+            <p class="lead text-center">Please confirm your email address so we verify your registration application to re-send your email verification email.</p>
+
+            <form method="post">
+                @csrf
+                <div class="form-group">
+                    <input
+                        type="email"
+                        class="form-control form-control-lg bg-dark border-dark text-white"
+                        name="email"
+                        placeholder="Your email address"
+                        required />
+                </div>
+                @if(config('instance.curated_registration.captcha_enabled'))
+                <div class="d-flex justify-content-center my-3">
+                    {!! Captcha::display() !!}
+                </div>
+                @endif
+                <div class="d-flex justify-content-center">
+                    <button class="btn btn-primary font-weight-bold rounded-pill px-5">Verify</button>
+                </div>
+            </form>
+
+        </div>
+        <div class="col-12 col-md-7 mt-5">
+            <div class="small-links">
+                <a href="/">Home</a>
+                <span>·</span>
+                <a href="/login">Login</a>
+                <span>·</span>
+                <a href="{{route('help.curated-onboarding')}}" target="_blank">Help</a>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
+
+@push('styles')
+    <link href="{{ mix('css/landing.css') }}" rel="stylesheet">
+    <style type="text/css">
+        .gap-1 {
+            gap: 1rem;
+        }
+
+        .opacity-5 {
+            opacity: .5;
+        }
+
+        .logo {
+            display: flex;
+            margin-top: 50px;
+            align-items: center;
+            justify-content: center;
+            gap: 1rem;
+
+            p {
+                font-size: 30px;
+            }
+        }
+
+        .action-btns {
+            display: flex;
+            margin: 3rem auto 1rem auto;
+            flex-direction: row;
+            gap: 1rem;
+
+            form {
+                flex-grow: 1;
+            }
+        }
+
+        .small-links {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            flex-direction: row;
+            margin-bottom: 5rem;
+            gap: 1rem;
+
+            a {
+                color: rgba(255, 255, 255, 0.6);
+                font-size: 12px;
+            }
+
+            span {
+                color: rgba(255, 255, 255, 0.4);
+            }
+        }
+    </style>
+@endpush
diff --git a/resources/views/auth/curated-register/resent-confirmation.blade.php b/resources/views/auth/curated-register/resent-confirmation.blade.php
new file mode 100644
index 000000000..2ad27bb2d
--- /dev/null
+++ b/resources/views/auth/curated-register/resent-confirmation.blade.php
@@ -0,0 +1,87 @@
+@extends('layouts.blank')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center align-items-center">
+        <div class="col-12 col-md-7">
+            <div class="logo">
+                <img src="/img/pixelfed-icon-color.svg" width="40" height="40" alt="Pixelfed Logo">
+                <p class="font-weight-bold mb-0">Pixelfed</p>
+            </div>
+
+            @include('auth.curated-register.partials.progress-bar', ['step' => 3])
+
+            <div class="alert alert-muted bg-transparent border-muted p-4 text-center mt-5">
+                <p class="text-center text-success mb-4"><i class="far fa-envelope-open fa-4x"></i></p>
+                <p class="h2 font-weight-bold text-white">Please check your email inbox</p>
+                <hr style="opacity: 0.2">
+                <p class="lead text-white">We sent a confirmation link to your email that you need to verify before we can process your registration application.</p>
+                <p class="text-muted mb-0">The verification link expires after 24 hours.</p>
+            </div>
+        </div>
+        <div class="col-12 col-md-7 mt-5">
+            <div class="small-links">
+                <a href="/">Home</a>
+                <span>·</span>
+                <a href="/login">Login</a>
+                <span>·</span>
+                <a href="{{route('help.curated-onboarding')}}" target="_blank">Help</a>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
+
+@push('styles')
+    <link href="{{ mix('css/landing.css') }}" rel="stylesheet">
+    <style type="text/css">
+        .gap-1 {
+            gap: 1rem;
+        }
+
+        .opacity-5 {
+            opacity: .5;
+        }
+
+        .logo {
+            display: flex;
+            margin-top: 50px;
+            align-items: center;
+            justify-content: center;
+            gap: 1rem;
+
+            p {
+                font-size: 30px;
+            }
+        }
+
+        .action-btns {
+            display: flex;
+            margin: 3rem auto 1rem auto;
+            flex-direction: row;
+            gap: 1rem;
+
+            form {
+                flex-grow: 1;
+            }
+        }
+
+        .small-links {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            flex-direction: row;
+            margin-bottom: 5rem;
+            gap: 1rem;
+
+            a {
+                color: rgba(255, 255, 255, 0.6);
+                font-size: 12px;
+            }
+
+            span {
+                color: rgba(255, 255, 255, 0.4);
+            }
+        }
+    </style>
+@endpush
diff --git a/resources/views/auth/curated-register/user_response_sent.blade.php b/resources/views/auth/curated-register/user_response_sent.blade.php
new file mode 100644
index 000000000..17e57eaf1
--- /dev/null
+++ b/resources/views/auth/curated-register/user_response_sent.blade.php
@@ -0,0 +1,79 @@
+@extends('layouts.blank')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center align-items-center">
+        <div class="col-12 col-md-7">
+            <div class="logo">
+                <img src="/img/pixelfed-icon-color.svg" width="40" height="40" alt="Pixelfed Logo">
+                <p class="font-weight-bold mb-0">Pixelfed</p>
+            </div>
+
+            @include('auth.curated-register.partials.progress-bar', ['step' => 4])
+
+            <p class="text-center"><i class="fal fa-check-circle text-success fa-8x"></i></p>
+            <h1 class="text-center font-weight-bold my-4">Succesfully Sent Response!</h1>
+            <p class="h4 text-center"><span class="font-weight-bold">Our admin team will review your application.</span></p>
+            <hr class="border-dark">
+            <p class="lead text-center">Most applications are processed within 24-48 hours. We will send you an email once your account is ready!</p>
+            <p class="text-muted text-center">If we need any additional information, we will send you an automated request with a link that you can visit and provide further details to help process your application.</p>
+            <hr class="border-dark">
+            <p class="text-muted small text-center">For additional information, please see our <a href="{{ route('help.curated-onboarding') }}" style="font-weight: 600;">Curated Onboarding</a> Help Center page.</p>
+        </div>
+    </div>
+</div>
+@endsection
+
+@push('styles')
+    <link href="{{ mix('css/landing.css') }}" rel="stylesheet">
+    <style type="text/css">
+        .gap-1 {
+            gap: 1rem;
+        }
+
+        .opacity-5 {
+            opacity: .5;
+        }
+
+        .logo {
+            display: flex;
+            margin-top: 50px;
+            align-items: center;
+            justify-content: center;
+            gap: 1rem;
+
+            p {
+                font-size: 30px;
+            }
+        }
+
+        .action-btns {
+            display: flex;
+            margin: 3rem auto 1rem auto;
+            flex-direction: row;
+            gap: 1rem;
+
+            form {
+                flex-grow: 1;
+            }
+        }
+
+        .small-links {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            flex-direction: row;
+            margin-bottom: 5rem;
+            gap: 1rem;
+
+            a {
+                color: rgba(255, 255, 255, 0.6);
+                font-size: 12px;
+            }
+
+            span {
+                color: rgba(255, 255, 255, 0.4);
+            }
+        }
+    </style>
+@endpush
diff --git a/resources/views/auth/email/forgot.blade.php b/resources/views/auth/email/forgot.blade.php
new file mode 100644
index 000000000..e4b67d792
--- /dev/null
+++ b/resources/views/auth/email/forgot.blade.php
@@ -0,0 +1,127 @@
+@extends('layouts.blank')
+
+@push('styles')
+<link href="{{ mix('css/landing.css') }}" rel="stylesheet">
+<link rel="preload" as="image" href="{{ url('/_landing/bg.jpg')}}" />
+@endpush
+
+@section('content')
+<div class="page-wrapper">
+    <div class="container mt-4">
+        <div class="row justify-content-center">
+            <div class="col-xl-6 col-lg-5 col-md-7 col-12">
+                <div class="text-center">
+                    <a href="/">
+                        <img src="/img/pixelfed-icon-white.svg" height="60px">
+                    </a>
+                    <h1 class="pt-4 pb-1">Forgot Email</h1>
+                    <p class="font-weight-light pb-2">Recover your account by sending an email to an associated username</p>
+                </div>
+
+                @if(session('status'))
+                    <div class="alert alert-success">
+                        <div class="d-flex align-items-center font-weight-bold" style="gap:1rem;">
+                            <i class="far fa-check-circle fa-lg" style="opacity:70%"></i>
+
+                            {{ session('status') }}
+                        </div>
+                    </div>
+                @endif
+
+                @if ($errors->any())
+                    @foreach ($errors->all() as $error)
+                    <div class="alert alert-danger bg-danger text-white border-danger">
+                        <div class="d-flex align-items-center font-weight-bold" style="gap:1rem;">
+                            <i class="far fa-exclamation-triangle fa-2x" style="opacity:70%"></i>
+                            {{ $error }}
+                        </div>
+                    </div>
+                    @endforeach
+                @endif
+
+                <div class="card bg-glass">
+                    <div class="card-header bg-transparent p-3 text-center font-weight-bold" style="border-bottom:1px solid #ffffff20">{{ __('Recover Email') }}</div>
+
+                    <div class="card-body">
+
+                        <form id="passwordReset" method="POST" action="{{ route('email.forgot') }}">
+                            @csrf
+
+                            <div class="form-group row">
+                                <div class="col-md-12">
+                                    <label class="font-weight-bold small text-muted">Username</label>
+                                    <input
+                                        id="username"
+                                        type="text"
+                                        class="form-control form-control-lg bg-glass text-white"
+                                        name="username"
+                                        maxlength="15"
+                                        placeholder="{{ __('Your username') }}" required>
+                                     @if ($errors->has('username') )
+                                        <span class="text-danger small mb-3">
+                                            <strong>{{ $errors->first('username') }}</strong>
+                                        </span>
+                                     @endif
+                                </div>
+                            </div>
+
+                            @if((bool) config_cache('captcha.enabled'))
+                            <label class="font-weight-bold small text-muted">Captcha</label>
+                            <div class="d-flex flex-grow-1">
+                                {!! Captcha::display(['data-theme' => 'dark']) !!}
+                            </div>
+                            @if ($errors->has('h-captcha-response'))
+                                <div class="text-danger small mb-3">
+                                    <strong>{{ $errors->first('h-captcha-response') }}</strong>
+                                </div>
+                            @endif
+                            @endif
+
+                            <div class="form-group row pt-4 mb-0">
+                                <div class="col-md-12">
+                                    <button type="button" id="sbtn" class="btn btn-primary btn-block rounded-pill font-weight-bold" onclick="event.preventDefault();handleSubmit()">
+                                        {{ __('Send Email Reminder') }}
+                                    </button>
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+
+                <div class="mt-3 d-flex justify-content-between align-items-center">
+                    <a class="btn btn-link text-white font-weight-bold text-decoration-none" href="{{ route('login') }}">
+                        <i class="far fa-long-arrow-left fa-lg mr-1"></i> {{ __('Back to Login') }}
+                    </a>
+
+                    <a href="{{ route('password.request') }}" class="text-white font-weight-bold text-decoration-none">Forgot password?</a>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
+
+@push('scripts')
+<script type="text/javascript">
+    function handleSubmit() {
+        let username = document.getElementById('username');
+        username.classList.add('disabled');
+
+        let btn = document.getElementById('sbtn');
+        btn.classList.add('disabled');
+        btn.setAttribute('disabled', 'disabled');
+        btn.innerHTML = '<div class="spinner-border spinner-border-sm" role="status"><span class="sr-only">Loading...</span></div>';
+        document.getElementById('passwordReset').submit()
+    }
+</script>
+@endpush
+
+@push('styles')
+<style>
+    .bg-glass:focus {
+        background: rgba(255, 255, 255, 0.05) !important;
+        box-shadow: none !important;
+        border-color: rgba(255, 255, 255, 0.3);
+    }
+</style>
+@endpush
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 3403cd6b3..0f77f778e 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -4,16 +4,28 @@
 <div class="container mt-4">
     <div class="row justify-content-center">
         <div class="col-lg-5">
-            <div class="">
-                <div class="card-header bg-transparent p-3 text-center font-weight-bold h3">{{ __('Login') }}</div>
+            <div class="card shadow-none border">
+                <div class="card-header bg-transparent p-3">
+                    <h4 class="font-weight-bold mb-0 text-center">
+                        Account Login
+                    </h4>
+                </div>
 
+                @if ($errors->any())
+                    @foreach ($errors->all() as $error)
+                    <div class="alert alert-danger m-3">
+                        <span class="font-weight-bold small"><i class="far fa-exclamation-triangle mr-2"></i> {{ $error }}</span>
+                    </div>
+                    @endforeach
+                @endif
                 <div class="card-body">
                     <form method="POST" action="{{ route('login') }}">
                         @csrf
 
-                        <div class="form-group row">
+                        <div class="form-group row mb-0">
 
                             <div class="col-md-12">
+                                <label for="email" class="small font-weight-bold text-muted mb-0">Email Address</label>
                                 <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" placeholder="{{__('Email')}}" required autofocus>
 
                                 @if ($errors->has('email'))
@@ -21,12 +33,19 @@
                                         <strong>{{ $errors->first('email') }}</strong>
                                     </span>
                                 @endif
+
+                                <div class="help-text small text-right mb-0">
+                                    <a href="{{ route('email.forgot') }}" class="small text-muted font-weight-bold">
+                                        {{ __('Forgot Email') }}
+                                    </a>
+                                </div>
                             </div>
                         </div>
 
-                        <div class="form-group row">
+                        <div class="form-group row mb-0">
 
                             <div class="col-md-12">
+                                <label for="password" class="small font-weight-bold text-muted mb-0">Password</label>
                                 <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" placeholder="{{__('Password')}}" required>
 
                                 @if ($errors->has('password'))
@@ -34,6 +53,12 @@
                                         <strong>{{ $errors->first('password') }}</strong>
                                     </span>
                                 @endif
+
+                                <p class="help-text small text-right mb-0">
+                                    <a href="{{ route('password.request') }}" class="small text-muted font-weight-bold">
+                                        {{ __('Forgot Password') }}
+                                    </a>
+                                </p>
                             </div>
                         </div>
 
@@ -51,10 +76,10 @@
                         </div>
 
                         @if(
-                        	config('captcha.enabled') ||
-                        	config('captcha.active.login') ||
+                        	(bool) config_cache('captcha.enabled') &&
+                        	(bool) config_cache('captcha.active.login') ||
                         	(
-                        		config('captcha.triggers.login.enabled') &&
+                        		(bool) config_cache('captcha.triggers.login.enabled') &&
                         		request()->session()->has('login_attempts') &&
                         		request()->session()->get('login_attempts') >= config('captcha.triggers.login.attempts')
                         	)
@@ -64,14 +89,9 @@
 	                        </div>
                         @endif
 
-                        <div class="form-group row mb-4">
-                            <div class="col-md-12">
-                                <button type="submit" class="btn btn-primary btn-block btn-lg font-weight-bold">
-                                    {{ __('Login') }}
-                                </button>
-
-                            </div>
-                        </div>
+                        <button type="submit" class="btn btn-primary btn-block btn-lg font-weight-bold rounded-pill">
+                            {{ __('Login') }}
+                        </button>
 
                     </form>
                     @if(
@@ -91,20 +111,38 @@
                     </form>
                     @endif
 
+                    @if((bool) config_cache('pixelfed.open_registration') || (bool) config_cache('instance.curated_registration.enabled'))
                     <hr>
 
-                    <p class="text-center font-weight-bold">
-                        @if(config_cache('pixelfed.open_registration'))
+                    <p class="text-center font-weight-bold mb-0">
                         <a href="/register">Register</a>
-                        <span class="px-1">·</span>
-                        @endif
-                        <a href="{{ route('password.request') }}">
-                            {{ __('Forgot Password') }}
-                        </a>
                     </p>
+                    @endif
                 </div>
             </div>
         </div>
     </div>
 </div>
 @endsection
+
+@push('scripts')
+<script>
+document.addEventListener("DOMContentLoaded", function() {
+    function getQueryParam(name) {
+        const urlParams = new URLSearchParams(window.location.search);
+        return urlParams.get(name);
+    }
+    const email = getQueryParam('email');
+    if (email) {
+        const emailInput = document.getElementById('email');
+        if (emailInput) {
+            emailInput.value = email;
+            const passwordInput = document.getElementById('password');
+            if (passwordInput) {
+                passwordInput.focus();
+            }
+        }
+    }
+});
+</script>
+@endpush
diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
index d144e142a..19461fa29 100644
--- a/resources/views/auth/passwords/email.blade.php
+++ b/resources/views/auth/passwords/email.blade.php
@@ -9,7 +9,7 @@
 <div class="page-wrapper">
 	<div class="container mt-4">
 	    <div class="row justify-content-center">
-	        <div class="col-lg-5">
+	        <div class="col-xl-6 col-lg-5 col-md-7 col-12">
 	        	<div class="text-center">
 	                <a href="/">
 	                	<img src="/img/pixelfed-icon-white.svg" height="60px">
@@ -19,9 +19,9 @@
 	            </div>
 
                 @if(session('status') || $errors->has('email'))
-                    <div class="alert alert-info small">
-                    	<div class="d-flex align-items-center font-weight-bold" style="gap:0.5rem;">
-                    		<i class="far fa-exclamation-triangle fa-lg" style="opacity:20%"></i>
+                    <div class="alert alert-info">
+                    	<div class="d-flex align-items-center font-weight-bold" style="gap:1rem;">
+                    		<i class="far fa-exclamation-triangle fa-2x" style="opacity:70%"></i>
 
                         	{{ session('status') ?? $errors->first('email') }}
                         </div>
@@ -39,7 +39,13 @@
 	                        <div class="form-group row">
 	                            <div class="col-md-12">
 	                            	<label class="font-weight-bold small text-muted">Email</label>
-	                                <input id="email" type="email" class="form-control" name="email" placeholder="{{ __('E-Mail Address') }}" required>
+	                                <input
+                                        id="email"
+                                        type="email"
+                                        class="form-control form-control-lg bg-glass text-white"
+                                        name="email"
+                                        placeholder="{{ __('E-Mail Address') }}"
+                                        required>
 	                                 @if ($errors->has('email') && $errors->first('email') === 'The email must be a valid email address.')
 	                                    <span class="text-danger small mb-3">
 	                                        <strong>{{ $errors->first('email') }}</strong>
@@ -48,7 +54,7 @@
 	                            </div>
 	                        </div>
 
-							@if(config('captcha.enabled'))
+							@if((bool) config_cache('captcha.enabled'))
 							<label class="font-weight-bold small text-muted">Captcha</label>
 	                        <div class="d-flex flex-grow-1">
 	                            {!! Captcha::display(['data-theme' => 'dark']) !!}
@@ -76,7 +82,7 @@
                         <i class="far fa-long-arrow-left fa-lg mr-1"></i> {{ __('Back to Login') }}
                     </a>
 
-                    <a href="#" class="text-white font-weight-bold text-decoration-none" onclick="event.preventDefault();forgotUsername()">Forgot email?</a>
+                    <a href="{{route('email.forgot')}}" class="text-white font-weight-bold text-decoration-none">Forgot email?</a>
 	            </div>
 	        </div>
 	    </div>
@@ -86,29 +92,6 @@
 
 @push('scripts')
 <script type="text/javascript">
-	function forgotUsername() {
-		swal({
-			title: 'Forgot email?',
-			text: 'Contact the instance admins to assist you in recovering your account.',
-			icon: 'info',
-			buttons: {
-				contact: {
-					text: "Contact Admins",
-					value: "contact",
-					className: "bg-danger"
-				},
-				cancel: "Close",
-			},
-		})
-		.then((value) => {
-			switch(value) {
-				case 'contact':
-					window.location.href = '/site/contact';
-				break;
-			}
-		});
-	}
-
 	function handleSubmit() {
 		let email = document.getElementById('email');
 		email.classList.add('disabled');
@@ -121,3 +104,13 @@
 	}
 </script>
 @endpush
+
+@push('styles')
+<style>
+    .bg-glass:focus {
+        background: rgba(255, 255, 255, 0.05) !important;
+        box-shadow: none !important;
+        border-color: rgba(255, 255, 255, 0.3);
+    }
+</style>
+@endpush
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
index efe59ac95..ecabcaddf 100644
--- a/resources/views/auth/passwords/reset.blade.php
+++ b/resources/views/auth/passwords/reset.blade.php
@@ -9,7 +9,7 @@
 <div class="page-wrapper">
 	<div class="container mt-4">
 	    <div class="row justify-content-center">
-	        <div class="col-lg-5">
+	        <div class="col-xl-6 col-lg-5 col-md-7 col-12">
 	        	<div class="text-center">
 	                <a href="/">
 	                	<img src="/img/pixelfed-icon-white.svg" height="60px">
@@ -41,14 +41,14 @@
 	                            	<label class="font-weight-bold small text-muted">Email</label>
 	                                <input
 	                                	id="email"
-	                                	type="email"
-	                                	class="form-control {{ $errors->has('email') ? ' is-invalid' : '' }}"
+	                                	type="text"
+                                        class="form-control form-control-lg bg-dark bg-glass text-white{{ $errors->has('email') ? ' is-invalid' : '' }}"
 	                                	name="email"
 	                                	value="{{ $email ?? old('email') }}"
 	                                	placeholder="{{ __('E-Mail Address') }}"
 	                                	required
 	                                	disabled
-	                                	style="opacity: 20%;">
+                                        style="opacity:.5">
 
 	                                @if ($errors->has('email'))
 	                                    <span class="invalid-feedback">
@@ -67,7 +67,7 @@
 	                                <input
 	                                	id="password"
 	                                	type="password"
-	                                	class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}"
+                                        class="form-control form-control-lg bg-glass text-white{{ $errors->has('password') ? ' is-invalid' : '' }}"
 	                                	name="password"
 	                                	placeholder="{{ __('Password') }}"
 	                                	minlength="{{config('pixelfed.min_password_length')}}"
@@ -93,7 +93,7 @@
 	                                <input
 	                                	id="password-confirm"
 	                                	type="password"
-	                                	class="form-control{{ $errors->has('password_confirmation') ? ' is-invalid' : '' }}"
+                                        class="form-control form-control-lg bg-glass text-white{{ $errors->has('password_confirmation') ? ' is-invalid' : '' }}"
 	                                	name="password_confirmation"
 	                                	placeholder="{{ __('Confirm Password') }}"
 	                                	minlength="{{config('pixelfed.min_password_length')}}"
@@ -109,7 +109,7 @@
 	                            </div>
 	                        </div>
 
-							@if(config('captcha.enabled'))
+							@if((bool) config_cache('captcha.enabled'))
 							<label class="font-weight-bold small pt-3 text-muted">Captcha</label>
 	                        <div class="d-flex flex-grow-1">
 	                            {!! Captcha::display(['data-theme' => 'dark']) !!}
@@ -152,3 +152,13 @@
 	}
 </script>
 @endpush
+
+@push('styles')
+<style>
+    .bg-glass:focus {
+        background: rgba(255, 255, 255, 0.05) !important;
+        box-shadow: none !important;
+        border-color: rgba(255, 255, 255, 0.3);
+    }
+</style>
+@endpush
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index a2c008bd7..3cb70c7fe 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -81,7 +81,7 @@
                             </div>
                         </div>
 
-                        @if(config('captcha.enabled') || config('captcha.active.register'))
+                        @if((bool) config_cache('captcha.enabled') && (bool) config_cache('captcha.active.register'))
                         <div class="d-flex justify-content-center my-3">
                             {!! Captcha::display() !!}
                         </div>
diff --git a/resources/views/auth/sudo.blade.php b/resources/views/auth/sudo.blade.php
index edbbabe25..d173d6677 100644
--- a/resources/views/auth/sudo.blade.php
+++ b/resources/views/auth/sudo.blade.php
@@ -29,7 +29,7 @@
 	                            	type="password"
 	                            	class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}"
 	                            	name="password"
-	                            	autocomplete="new-password"
+	                            	autocomplete="current-password"
 	                            	placeholder="{{__('Password')}}"
 	                            	required>
 
diff --git a/resources/views/components/collapse.blade.php b/resources/views/components/collapse.blade.php
new file mode 100644
index 000000000..144579366
--- /dev/null
+++ b/resources/views/components/collapse.blade.php
@@ -0,0 +1,12 @@
+@php
+$cid = 'col' . str_random(6);
+@endphp
+<p>
+  <a class="text-dark font-weight-bold" data-toggle="collapse" href="#{{$cid}}" role="button" aria-expanded="false" aria-controls="{{$cid}}">
+    <i class="fas fa-chevron-down mr-2"></i>
+    {{ $title }}
+  </a>
+  <div class="collapse" id="{{$cid}}">
+    {{ $slot }}
+  </div>
+</p>
diff --git a/resources/views/emails/confirm_email.blade.php b/resources/views/emails/confirm_email.blade.php
index ee8dcd2db..17b5e8318 100644
--- a/resources/views/emails/confirm_email.blade.php
+++ b/resources/views/emails/confirm_email.blade.php
@@ -11,6 +11,12 @@ Confirm Email
 
 <p>This link expires after 24 hours.</p>
 <br>
+<small>
+  If the link above is not working, please copy the following address into your web browser:
+  <br><br>
+  {{ $verify->url() }}
+</small>
+<br><br>
 
 Thanks,<br>
 <a href="{{ config('app.url') }}">{{ config('pixelfed.domain.app') }}</a>
diff --git a/resources/views/emails/contact/admin-response.blade.php b/resources/views/emails/contact/admin-response.blade.php
new file mode 100644
index 000000000..d04d3218a
--- /dev/null
+++ b/resources/views/emails/contact/admin-response.blade.php
@@ -0,0 +1,24 @@
+<x-mail::message>
+Hello **&commat;{{$contact->user->username}}**,
+
+You contacted the admin team of {{config('pixelfed.domain.app')}} with the following inquiry:
+
+<x-mail::panel>
+<i>{{str_limit($contact->message, 80)}}</i>
+</x-mail::panel>
+
+<x-mail::button :url="$url" color="primary">
+    View Admin Response
+</x-mail::button>
+
+<small>
+or copy and paste the following url: <a href="{{$url}}">{{$url}}</a>
+</small>
+<br>
+<br>
+<br>
+<small>
+Thanks,<br>
+The {{ ucfirst(config('pixelfed.domain.app')) }} Admin Team
+</small>
+</x-mail::message>
diff --git a/resources/views/emails/curated-register/admin_notify.blade.php b/resources/views/emails/curated-register/admin_notify.blade.php
new file mode 100644
index 000000000..72e7e082b
--- /dev/null
+++ b/resources/views/emails/curated-register/admin_notify.blade.php
@@ -0,0 +1,34 @@
+@component('mail::message')
+# [#{{$verify->id}}] New Curated Onboarding Application
+
+Hello admin,
+
+**Please review this new onboarding application.**
+
+<x-mail::panel>
+<p>
+<small>
+Username: <strong>{{ $verify->username }}</strong>
+</small>
+<br>
+<small>
+Email: <strong>{{ $verify->email }}</strong>
+</small>
+</p>
+
+<hr>
+
+<small><strong>*The user provided the following reason to join:*</strong></small>
+<p style="font-size:9pt;">{!!str_limit(nl2br($verify->reason_to_join), 300)!!}</p>
+</x-mail::panel>
+
+<x-mail::button :url="$verify->adminReviewUrl()" color="success">
+<strong>Review Onboarding Application</strong>
+</x-mail::button>
+
+Thanks,<br>
+<a href="{{ config('app.url') }}">{{ config('pixelfed.domain.app') }}</a>
+<br>
+<hr>
+<p style="font-size:10pt;">This is an automated message, please be aware that replies to this email cannot be monitored or responded to.</p>
+@endcomponent
diff --git a/resources/views/emails/curated-register/admin_notify_user_response.blade.php b/resources/views/emails/curated-register/admin_notify_user_response.blade.php
new file mode 100644
index 000000000..504795f83
--- /dev/null
+++ b/resources/views/emails/curated-register/admin_notify_user_response.blade.php
@@ -0,0 +1,21 @@
+@component('mail::message')
+# New Curated Onboarding Response ({{ '#' . $activity->id}})
+
+Hello,
+
+You have a new response from a curated onboarding application from **{{$activity->application->email}}**.
+
+<x-mail::panel>
+<p style="white-space: pre-wrap;">{!! $activity->message !!}</p>
+</x-mail::panel>
+
+<x-mail::button :url="$activity->adminReviewUrl()" color="success">
+<strong>Review Onboarding Response</strong>
+</x-mail::button>
+
+Thanks,<br>
+<a href="{{ config('app.url') }}">{{ config('pixelfed.domain.app') }}</a>
+<br>
+<hr>
+<p style="font-size:10pt;">This is an automated message, please be aware that replies to this email cannot be monitored or responded to.</p>
+@endcomponent
diff --git a/resources/views/emails/curated-register/confirm_email.blade.php b/resources/views/emails/curated-register/confirm_email.blade.php
new file mode 100644
index 000000000..bcadc3832
--- /dev/null
+++ b/resources/views/emails/curated-register/confirm_email.blade.php
@@ -0,0 +1,21 @@
+@component('mail::message')
+# Action Needed: Confirm Your Email to Activate Your Pixelfed Account
+
+Hello **{{'@'.$verify->username}}**,
+
+Please confirm your email address so we can process your new registration application.
+
+<x-mail::button :url="$verify->emailConfirmUrl()" color="success">
+<strong>Confirm Email Address</strong>
+</x-mail::button>
+
+
+<p style="font-size:10pt;">If you did not create this account, please disregard this email. This link expires after 24 hours.</p>
+<br>
+
+Thanks,<br>
+<a href="{{ config('app.url') }}">{{ config('pixelfed.domain.app') }}</a>
+<br>
+<hr>
+<p style="font-size:10pt;">This is an automated message, please be aware that replies to this email cannot be monitored or responded to.</p>
+@endcomponent
diff --git a/resources/views/emails/curated-register/message-from-admin.blade.php b/resources/views/emails/curated-register/message-from-admin.blade.php
new file mode 100644
index 000000000..55f4ceff9
--- /dev/null
+++ b/resources/views/emails/curated-register/message-from-admin.blade.php
@@ -0,0 +1,21 @@
+@component('mail::message')
+# New Message from {{config('pixelfed.domain.app')}}
+
+Hello,
+
+You recently applied to join our Pixelfed community using the &commat;**{{ $verify->username }}** username.
+
+The admins have a message for you:
+
+<x-mail::panel>
+<p style="white-space: pre-wrap;">{{ $verify->message }}</p>
+</x-mail::panel>
+
+Please do not respond to this email, any replies will not be seen by our admin team.
+
+Thanks,<br>
+<a href="{{ config('app.url') }}">{{ config('pixelfed.domain.app') }}</a>
+<br>
+<hr>
+<p style="font-size:10pt;">This is an automated message on behalf of our admin team, please be aware that replies to this email cannot be monitored or responded to.</p>
+@endcomponent
diff --git a/resources/views/emails/curated-register/request-accepted.blade.php b/resources/views/emails/curated-register/request-accepted.blade.php
new file mode 100644
index 000000000..79badefe5
--- /dev/null
+++ b/resources/views/emails/curated-register/request-accepted.blade.php
@@ -0,0 +1,37 @@
+@component('mail::message')
+Hello **{{'@'.$verify->username}}**,
+
+
+We are excited to inform you that your account has been successfully activated!
+
+Your journey into the world of visual storytelling begins now, and we can’t wait to see the incredible content you’ll create and share.
+
+<x-mail::button :url="url('/login?email=' . $verify->email)" color="success">
+<strong>Sign-in to your account</strong>
+</x-mail::button>
+
+Here’s what you can do next:
+
+<x-mail::panel>
+**Personalize Your Profile**: Customize your profile to reflect your personality or brand.
+
+**Start Sharing**: Post your first photo or album and share your unique perspective with the world.
+
+**Engage with the Community**: Follow other users, like and comment on posts, and become an active member of our vibrant community.
+
+**Explore**: Discover amazing content from a diverse range of users and hashtags.
+</x-mail::panel>
+
+Need help getting started? Visit our [Help Center]({{url('site/help')}}) for tips, tutorials, and FAQs. Remember, our community thrives on respect and creativity, so please familiarize yourself with our [Community Guidelines]({{url('site/kb/community-guidelines')}}).
+
+If you have any questions or need assistance, feel free to reach out to [our support team]({{url('/site/contact')}}).
+
+Happy posting, and once again, welcome to Pixelfed!
+
+Warm regards,<br>
+<strong>{{ config('pixelfed.domain.app') }}</strong>
+
+<br>
+<hr>
+<p style="font-size:10pt;">This is an automated message, please be aware that replies to this email cannot be monitored or responded to.</p>
+@endcomponent
diff --git a/resources/views/emails/curated-register/request-details-from-user.blade.php b/resources/views/emails/curated-register/request-details-from-user.blade.php
new file mode 100644
index 000000000..59c26c7cd
--- /dev/null
+++ b/resources/views/emails/curated-register/request-details-from-user.blade.php
@@ -0,0 +1,22 @@
+@component('mail::message')
+# Action Needed: Additional information requested
+
+Hello **{{'@'.$verify->username}}**
+
+To help us process your registration application, we require more information.
+
+Our onboarding team have requested the following details:
+
+@component('mail::panel')
+<p style="white-space: pre-wrap;">{!! $activity->message !!}</p>
+@endcomponent
+<x-mail::button :url="$activity->emailReplyUrl()" color="success">
+<strong>Reply with your response</strong>
+</x-mail::button>
+
+<p style="font-size:10pt;">Please respond promptly, your application will be automatically removed 7 days after your last interaction.</p>
+<br>
+
+Thanks,<br>
+<a href="{{ config('app.url') }}">{{ config('pixelfed.domain.app') }}</a>
+@endcomponent
diff --git a/resources/views/emails/curated-register/request-rejected.blade.php b/resources/views/emails/curated-register/request-rejected.blade.php
new file mode 100644
index 000000000..6d7a475dc
--- /dev/null
+++ b/resources/views/emails/curated-register/request-rejected.blade.php
@@ -0,0 +1,19 @@
+@component('mail::message')
+Hello **{{'@'.$verify->username}}**,
+
+We appreciate the time you took to apply for an account on {{ config('pixelfed.domain.app') }}.
+
+Unfortunately, after reviewing your [application]({{route('help.curated-onboarding')}}), we have decided not to proceed with the activation of your account.
+
+This decision is made to ensure the best experience for all members of our community. We encourage you to review our [guidelines]({{route('help.community-guidelines')}}) and consider applying again in the future.
+
+We appreciate your understanding. If you believe this decision was made in error, or if you have any questions, please don’t hesitate to [contact us]({{route('site.contact')}}).
+
+<br>
+
+Thanks,<br>
+<a href="{{ config('app.url') }}">{{ config('pixelfed.domain.app') }}</a>
+<br>
+<hr>
+<p style="font-size:10pt;">This is an automated message, please be aware that replies to this email cannot be monitored or responded to.</p>
+@endcomponent
diff --git a/resources/views/emails/forgot-email/message.blade.php b/resources/views/emails/forgot-email/message.blade.php
new file mode 100644
index 000000000..dcae7cfbc
--- /dev/null
+++ b/resources/views/emails/forgot-email/message.blade.php
@@ -0,0 +1,33 @@
+@component('mail::message')
+Hello,
+
+You recently requested to know the email address associated with your username [**{{'@' . $user->username}}**]({{$user->url()}}) on [**{{config('pixelfed.domain.app')}}**]({{config('app.url')}}).
+
+We're here to assist! Simply tap on the Login button below.
+
+<x-mail::button :url="url('/login?email=' . urlencode($user->email))" color="success">
+Login to my <strong>{{'@' . $user->username}}</strong> account
+</x-mail::button>
+
+----
+<br>
+
+The email address linked to your username is:
+<x-mail::panel>
+<p>
+<strong>{{$user->email}}</strong>
+</p>
+</x-mail::panel>
+
+You can use this email address to log in to your account.
+
+<small>If needed, you can [reset your password]({{ route('password.request')}}). For security reasons, we recommend keeping your account information, including your email address, updated and secure. If you did not make this request or if you have any other questions or concerns, please feel free to [contact our support team]({{route('site.contact')}}).</small>
+
+Thank you for being a part of our community!
+
+Best regards,<br>
+<a href="{{ config('app.url') }}"><strong>{{ config('pixelfed.domain.app') }}</strong></a>
+<br>
+<hr>
+<p style="font-size:10pt;">This is an automated message, please be aware that replies to this email cannot be monitored or responded to.</p>
+@endcomponent
diff --git a/resources/views/emails/parental-controls/invite.blade.php b/resources/views/emails/parental-controls/invite.blade.php
new file mode 100644
index 000000000..bece5b1bb
--- /dev/null
+++ b/resources/views/emails/parental-controls/invite.blade.php
@@ -0,0 +1,18 @@
+<x-mail::message>
+# You've been invited to join Pixelfed!
+
+<x-mail::panel>
+A parent account with the username **{{ $verify->parent->username }}** has invited you to join Pixelfed with a special youth account managed by them.
+
+If you do not recognize this account as your parents or a trusted guardian, please check with them first.
+</x-mail::panel>
+
+<x-mail::button :url="$verify->inviteUrl()">
+Accept Invite
+</x-mail::button>
+
+Thanks,<br>
+Pixelfed
+
+<small>This email is automatically generated. Please do not reply to this message.</small>
+</x-mail::message>
diff --git a/resources/views/errors/custom.blade.php b/resources/views/errors/custom.blade.php
new file mode 100644
index 000000000..932292b6b
--- /dev/null
+++ b/resources/views/errors/custom.blade.php
@@ -0,0 +1,10 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+  <div class="error-page py-5 my-5 text-center">
+    <h3 class="font-weight-bold">{!! $title ?? config('instance.page.404.header')!!}</h3>
+    <p class="lead">{!! $body ?? config('instance.page.404.body')!!}</p>
+  </div>
+</div>
+@endsection
diff --git a/resources/views/groups/confirm-leave.blade.php b/resources/views/groups/confirm-leave.blade.php
new file mode 100644
index 000000000..41d400716
--- /dev/null
+++ b/resources/views/groups/confirm-leave.blade.php
@@ -0,0 +1,34 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container mt-5">
+	<div class="row justify-content-center">
+
+		<div class="col-12 col-md-7">
+			<p class="h3 font-weight-bold">Are you sure you want to leave this group?</p>
+			{{-- <p class="lead mb-3">If you decide to leave this group, all of your content will be permanently deleted.</p>
+			<p class="lead font-weight-bold">All of your interactions will be removed, including group</p>
+			<ul class="lead mb-5">
+				<li>Posts</li>
+				<li>Photos & Videos</li>
+				<li>Comments</li>
+				<li>Events</li>
+				<li>Polls</li>
+				<li>Likes</li>
+				<li>Shares</li>
+				<li>Reactions</li>
+				<li>Group Invitations</li>
+				<li>Moderation Reports</li>
+				<li>Recommendations</li>
+			</ul> --}}
+			<p class="mb-1">Any content you shared will remain accessible</p>
+			<p class="mb-3">You will not be able to re-join this group for 24 hours</p>
+			<hr>
+			<form class="d-flex justify-content-between">
+				<button class="btn btn-light border font-weight-bold" style="width: 75%;">Cancel</button>
+				<button type="submit" class="btn btn-danger font-weight-bold">Leave Group</button>
+			</form>
+		</div>
+	</div>
+</div>
+@endsection
diff --git a/resources/views/groups/index.blade.php b/resources/views/groups/index.blade.php
new file mode 100644
index 000000000..f3928546c
--- /dev/null
+++ b/resources/views/groups/index.blade.php
@@ -0,0 +1,10 @@
+@extends('layouts.app')
+
+@section('content')
+<groups-home />
+@endsection
+
+@push('scripts')
+<script type="text/javascript" src="{{ mix('js/groups.js') }}"></script>
+<script type="text/javascript">App.boot();</script>
+@endpush
diff --git a/resources/views/groups/invite-claim.blade.php b/resources/views/groups/invite-claim.blade.php
new file mode 100644
index 000000000..3c27f17a8
--- /dev/null
+++ b/resources/views/groups/invite-claim.blade.php
@@ -0,0 +1,10 @@
+@extends('layouts.app')
+
+@section('content')
+<groups-invite id="{{$group['id']}}" />
+@endsection
+
+@push('scripts')
+<script type="text/javascript" src="{{ mix('js/groups.js') }}"></script>
+<script type="text/javascript">App.boot();</script>
+@endpush
diff --git a/resources/views/groups/invite.blade.php b/resources/views/groups/invite.blade.php
new file mode 100644
index 000000000..47eec9b53
--- /dev/null
+++ b/resources/views/groups/invite.blade.php
@@ -0,0 +1,23 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="row align-items-center" style="display: flex;width: 100%;height: 100vh;overflow: hidden;">
+	<div class="col-12 col-md-6 h-100 bg-primary d-flex align-items-center justify-content-center">
+		<div class="d-flex flex-column align-items-center" style="max-width: 300px;">
+			<p class="h3 text-center text-light font-weight-light">You were invited to join the <strong>{{ $group->name }}</strong> group.</p>
+			<div class="card card-body mt-3">
+				<div class="media align-items-center">
+					<img src="{{$group->metadata['header']['url'] }}" width="64" height="64" class="rounded-circle mr-3">
+					<div class="media-body">
+						<p class="lead mb-0">{{ $group->name }}</p>
+						<p class="small mb-0">34 members</p>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="col-12 col-md-6 h-100 d-flex align-items-center">
+		<p></p>
+	</div>
+</div>
+@endsection
diff --git a/resources/views/groups/profile.blade.php b/resources/views/groups/profile.blade.php
new file mode 100644
index 000000000..cbb95d866
--- /dev/null
+++ b/resources/views/groups/profile.blade.php
@@ -0,0 +1,10 @@
+@extends('layouts.app')
+
+@section('content')
+<group-profile pg="{{$group}}" pp="{{$profile}}" />
+@endsection
+
+@push('scripts')
+<script type="text/javascript" src="{{ mix('js/groups.js') }}"></script>
+<script type="text/javascript">App.boot();</script>
+@endpush
diff --git a/resources/views/groups/report.blade.php b/resources/views/groups/report.blade.php
new file mode 100644
index 000000000..be090b024
--- /dev/null
+++ b/resources/views/groups/report.blade.php
@@ -0,0 +1,39 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+	<div class="col-12 col-md-6 offset-md-3 mt-5 pt-5">
+		<div class="card shadow-none border">
+			<div class="card-header font-weight-bold bg-danger text-white">
+				Report Group
+			</div>
+			<div class="card-body">
+				{{-- <p class="text-muted">
+					Only report groups if they are violating the <a href="#" class="font-weight-bold">Terms of Service</a> or <a href="#" class="font-weight-bold">Community Guidelines</a>.
+				</p> --}}
+				<p class="font-weight-bold text-muted">Reason (select one)</p>
+				<div class="custom-control custom-radio">
+					<input type="radio" name="customRadio" class="custom-control-input" id="r1">
+					<label class="custom-control-label" for="r1">Spam or excessive off-topic content</label>
+				</div>
+				<div class="custom-control custom-radio">
+					<input type="radio" name="customRadio" class="custom-control-input" id="r2">
+					<label class="custom-control-label" for="r2">Abusive, harmful or illegal content</label>
+				</div>
+				<div class="custom-control custom-radio">
+					<input type="radio" name="customRadio" class="custom-control-input" id="r2">
+					<label class="custom-control-label" for="r2">Impersonation</label>
+				</div>
+				<div class="custom-control custom-radio">
+					<input type="radio" name="customRadio" class="custom-control-input" id="r2">
+					<label class="custom-control-label" for="r2">Not moderated enough or ignores moderation reports</label>
+				</div>
+				<div class="custom-control custom-radio">
+					<input type="radio" name="customRadio" class="custom-control-input" id="r2">
+					<label class="custom-control-label" for="r2">Other</label>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+@endsection
diff --git a/resources/views/groups/settings.blade.php b/resources/views/groups/settings.blade.php
new file mode 100644
index 000000000..c7c0be6e5
--- /dev/null
+++ b/resources/views/groups/settings.blade.php
@@ -0,0 +1,10 @@
+@extends('layouts.app')
+
+@section('content')
+<group-settings group-id="{{$group->id}}" />
+@endsection
+
+@push('scripts')
+<script type="text/javascript" src="{{ mix('js/groups.js') }}"></script>
+<script type="text/javascript">App.boot();</script>
+@endpush
diff --git a/resources/views/groups/show.blade.php b/resources/views/groups/show.blade.php
new file mode 100644
index 000000000..3fa190f3b
--- /dev/null
+++ b/resources/views/groups/show.blade.php
@@ -0,0 +1,10 @@
+@extends('layouts.spa')
+
+@section('content')
+<group-feed group-id="{{$id}}" path="{{$path}}" />
+@endsection
+
+@push('scripts')
+<script type="text/javascript" src="{{ mix('js/groups.js') }}"></script>
+<script type="text/javascript">App.boot();</script>
+@endpush
diff --git a/resources/views/groups/status.blade.php b/resources/views/groups/status.blade.php
new file mode 100644
index 000000000..31b5ce8b4
--- /dev/null
+++ b/resources/views/groups/status.blade.php
@@ -0,0 +1,10 @@
+@extends('layouts.app')
+
+@section('content')
+<gs-permalink gid="{{$group->id}}" sid="{{$gp['status_id']}}" />
+@endsection
+
+@push('scripts')
+<script type="text/javascript" src="{{ mix('js/group-status.js') }}"></script>
+<script type="text/javascript">App.boot();</script>
+@endpush
diff --git a/resources/views/groups/topic-feed.blade.php b/resources/views/groups/topic-feed.blade.php
new file mode 100644
index 000000000..c9d31d4e0
--- /dev/null
+++ b/resources/views/groups/topic-feed.blade.php
@@ -0,0 +1,10 @@
+@extends('layouts.app')
+
+@section('content')
+<group-topic-feed gid="{{$gid}}" name="{{$tag}}" />
+@endsection
+
+@push('scripts')
+<script type="text/javascript" src="{{ mix('js/group-topic-feed.js') }}"></script>
+<script type="text/javascript">App.boot();</script>
+@endpush
diff --git a/resources/views/groups/unavailable.blade.php b/resources/views/groups/unavailable.blade.php
new file mode 100644
index 000000000..ab48447dd
--- /dev/null
+++ b/resources/views/groups/unavailable.blade.php
@@ -0,0 +1,25 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container d-flex justify-content-center">
+  <div class="error-page py-5 my-5" style="max-width: 450px;">
+    <h3 class="font-weight-bold">Group Unavailable</h3>
+    <p class="lead">The group you are trying to view is unavailable</p>
+
+    <div class="text-muted">
+		<p class="pt-4 mb-1">This can happen for a few reasons:</p>
+		<ul>
+			<li>The group url is invalid or has a typo</li>
+			<li>We are experiencing higher than usual traffic to this group and have temporarily limited access to this group</li>
+			<li>The group has been flagged for review by our automated abuse detection systems</li>
+			<li>The group is temporarily disabled by group administrators</li>
+			<li>The group has been deleted</li>
+		</ul>
+
+		<p class="pt-4">
+			If you are a group administrator, you can view your <a href="#" class="font-weight-bold">groups settings</a> for more information.
+		</p>
+    </div>
+  </div>
+</div>
+@endsection
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 2f7b05cd3..e5aed6dad 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.app',['title' => 'Welcome to ' . config('app.name')])
+@extends('layouts.app',['title' => 'Welcome to ' . config_cache('app.name')])
 
 @section('content')
 <div class="container mt-4">
@@ -14,7 +14,7 @@
                         </div>
                     @endif
 
-                    <p class="lead mb-0">Welcome to {{config('app.name')}}!</p>
+                    <p class="lead mb-0">Welcome to {{config_cache('app.name')}}!</p>
                 </div>
             </div>
 
diff --git a/resources/views/layouts/app-guest.blade.php b/resources/views/layouts/app-guest.blade.php
index 6adcffac4..7d8dbd201 100644
--- a/resources/views/layouts/app-guest.blade.php
+++ b/resources/views/layouts/app-guest.blade.php
@@ -5,11 +5,11 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
 	<meta name="mobile-web-app-capable" content="yes">
 
-	<title>{{ $title ?? config('app.name', 'Pixelfed') }}</title>
+	<title>{{ $title ?? config_cache('app.name', 'Pixelfed') }}</title>
 	<link rel="manifest" href="{{url('/manifest.json')}}">
 
-	<meta property="og:site_name" content="{{ config('app.name', 'pixelfed') }}">
-	<meta property="og:title" content="{{ $title ?? config('app.name', 'pixelfed') }}">
+	<meta property="og:site_name" content="{{ config_cache('app.name', 'pixelfed') }}">
+	<meta property="og:title" content="{{ $title ?? config_cache('app.name', 'pixelfed') }}">
 	<meta property="og:type" content="article">
 	<meta property="og:url" content="{{url(request()->url())}}">
 	@stack('meta')
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 94f90ed97..7cc95981f 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -11,10 +11,10 @@
 
 	<title>{{ $title ?? config_cache('app.name') }}</title>
 	<link rel="manifest" href="{{url('/manifest.json')}}">
-
-	<meta property="og:site_name" content="{{ config_cache('app.name') }}">
-	<meta property="og:title" content="{{ $title ?? config_cache('app.name') }}">
-	<meta property="og:type" content="article">
+	<meta property="og:logo" content="{{ url('/img/pixelfed-icon-color.png')}}" />
+	<meta property="og:site_name" content="Pixelfed">
+	<meta property="og:title" content="{{ $ogTitle ?? $title ?? config_cache('app.name') }}">
+	<meta property="og:type" content="{{ $ogType ?? 'article' }}">
 	<meta property="og:url" content="{{url(request()->url())}}">
 	@stack('meta')
 
@@ -70,12 +70,12 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
 	<meta name="mobile-web-app-capable" content="yes">
 
-	<title>{{ $title ?? config('app.name', 'Pixelfed') }}</title>
+	<title>{{ $title ?? config_cache('app.name', 'Pixelfed') }}</title>
 	<link rel="manifest" href="/manifest.json">
-
-	<meta property="og:site_name" content="{{ config('app.name', 'pixelfed') }}">
-	<meta property="og:title" content="{{ $title ?? config('app.name', 'pixelfed') }}">
-	<meta property="og:type" content="article">
+	<meta property="og:logo" content="{{ url('/img/pixelfed-icon-color.png')}}" />
+	<meta property="og:site_name" content="Pixelfed">
+	<meta property="og:title" content="{{ $ogTitle ?? $title ?? config_cache('app.name', 'pixelfed') }}">
+	<meta property="og:type" content="{{ $ogType ?? 'article' }}">
 	<meta property="og:url" content="{{url(request()->url())}}">
 	@stack('meta')
 
diff --git a/resources/views/layouts/blank.blade.php b/resources/views/layouts/blank.blade.php
index 00042315d..deaf71d62 100644
--- a/resources/views/layouts/blank.blade.php
+++ b/resources/views/layouts/blank.blade.php
@@ -11,8 +11,8 @@
 
 	<title>{{ $title ?? config_cache('app.name') }}</title>
 
-	<meta property="og:site_name" content="{{ config('app.name', 'pixelfed') }}">
-	<meta property="og:title" content="{{ $title ?? config('app.name', 'pixelfed') }}">
+	<meta property="og:site_name" content="{{ config_cache('app.name', 'pixelfed') }}">
+	<meta property="og:title" content="{{ $title ?? config_cache('app.name', 'pixelfed') }}">
 	<meta property="og:type" content="article">
 	<meta property="og:url" content="{{request()->url()}}">
 	@stack('meta')
diff --git a/resources/views/layouts/bundle.blade.php b/resources/views/layouts/bundle.blade.php
index 1050a39d6..94e0c2c00 100644
--- a/resources/views/layouts/bundle.blade.php
+++ b/resources/views/layouts/bundle.blade.php
@@ -9,11 +9,11 @@
 
     <meta name="mobile-web-app-capable" content="yes">
 
-    <title>{{ $title ?? config('app.name', 'Laravel') }}</title>
+    <title>{{ $title ?? config_cache('app.name', 'Pixelfed') }}</title>
     <link rel="manifest" href="/manifest.json">
 
-    <meta property="og:site_name" content="{{ config('app.name', 'pixelfed') }}">
-    <meta property="og:title" content="{{ $title ?? config('app.name', 'pixelfed') }}">
+    <meta property="og:site_name" content="{{ config_cache('app.name', 'pixelfed') }}">
+    <meta property="og:title" content="{{ $title ?? config_cache('app.name', 'pixelfed') }}">
     <meta property="og:type" content="article">
     <meta property="og:url" content="{{request()->url()}}">
     @stack('meta')
diff --git a/resources/views/layouts/partial/nav.blade.php b/resources/views/layouts/partial/nav.blade.php
index 1d89902bf..56fe7da4a 100644
--- a/resources/views/layouts/partial/nav.blade.php
+++ b/resources/views/layouts/partial/nav.blade.php
@@ -105,7 +105,7 @@
 									{{__('navmenu.discover')}}
 								</a>
 
-								@if(config_cache('instance.stories.enabled'))
+								@if((bool) config_cache('instance.stories.enabled'))
 								<a class="dropdown-item lead" href="/i/stories/new">
 									<span style="width: 50px;margin-right:14px;">
 										<span class="fal fa-history text-lighter fa-lg"></span>
diff --git a/resources/views/layouts/partial/noauthnav.blade.php b/resources/views/layouts/partial/noauthnav.blade.php
index 465b51354..004c8497f 100644
--- a/resources/views/layouts/partial/noauthnav.blade.php
+++ b/resources/views/layouts/partial/noauthnav.blade.php
@@ -2,7 +2,7 @@
     <div class="container">
         <a class="navbar-brand d-flex align-items-center" href="{{ url('/') }}">
             <img src="/img/pixelfed-icon-color.svg" height="30px" class="px-2" alt="Pixelfed logo">
-            <span class="font-weight-bold mb-0" style="font-size:20px;">{{ config('app.name', 'Laravel') }}</span>
+            <span class="font-weight-bold mb-0" style="font-size:20px;">{{ config_cache('app.name', 'Pixelfed') }}</span>
         </a>
     </div>
 </nav>
diff --git a/resources/views/portfolio/layout.blade.php b/resources/views/portfolio/layout.blade.php
index 14158fb37..89e909284 100644
--- a/resources/views/portfolio/layout.blade.php
+++ b/resources/views/portfolio/layout.blade.php
@@ -11,8 +11,8 @@
 
 	<title>{!! $title ?? config_cache('app.name') !!}</title>
 
-	<meta property="og:site_name" content="{{ config('app.name', 'pixelfed') }}">
-	<meta property="og:title" content="{{ $title ?? config('app.name', 'pixelfed') }}">
+	<meta property="og:site_name" content="{{ config_cache('app.name', 'pixelfed') }}">
+	<meta property="og:title" content="{{ $title ?? config_cache('app.name', 'pixelfed') }}">
 	<meta property="og:type" content="article">
 	<meta property="og:url" content="{{request()->url()}}">
 	@stack('meta')
diff --git a/resources/views/profile/embed-removed.blade.php b/resources/views/profile/embed-removed.blade.php
index 7a49d2e79..c236eb790 100644
--- a/resources/views/profile/embed-removed.blade.php
+++ b/resources/views/profile/embed-removed.blade.php
@@ -9,8 +9,8 @@
 
 	<title>Pixelfed | 404 Embed Not Found</title>
 
-	<meta property="og:site_name" content="{{ config('app.name', 'pixelfed') }}">
-	<meta property="og:title" content="{{ $title ?? config('app.name', 'pixelfed') }}">
+	<meta property="og:site_name" content="{{ config_cache('app.name', 'pixelfed') }}">
+	<meta property="og:title" content="{{ $title ?? config_cache('app.name', 'pixelfed') }}">
 	<meta name="medium" content="image">
 	<meta name="theme-color" content="#10c5f8">
 	<meta name="apple-mobile-web-app-capable" content="yes">
diff --git a/resources/views/profile/embed.blade.php b/resources/views/profile/embed.blade.php
index cc6097e3a..d0edb9f59 100644
--- a/resources/views/profile/embed.blade.php
+++ b/resources/views/profile/embed.blade.php
@@ -1,118 +1,110 @@
 <!DOCTYPE html>
-<html lang="{{ app()->getLocale() }}">
-<head>
-
+<html lang="en">
+    <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="mobile-web-app-capable" content="yes">
-
-    <title>{{ $title ?? config('app.name', 'Pixelfed') }}</title>
-
-    <meta property="og:site_name" content="{{ config('app.name', 'pixelfed') }}">
-    <meta property="og:title" content="{{ $title ?? config('app.name', 'pixelfed') }}">
-    <meta property="og:type" content="article">
+    <title>{{ $title ?? config_cache('app.name', 'Pixelfed') }}</title>
+    <meta property="og:site_name" content="{{ config_cache('app.name', 'pixelfed') }}">
+    <meta property="og:title" content="{{ $title ?? config_cache('app.name', 'pixelfed') }}">
+    <meta property="og:type" content="profile">
     <meta property="og:url" content="{{$profile['url']}}">
     <meta name="medium" content="image">
     <meta name="theme-color" content="#10c5f8">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <link rel="shortcut icon" type="image/png" href="{{url('/img/favicon.png?v=2')}}">
     <link rel="apple-touch-icon" type="image/png" href="{{url('/img/favicon.png?v=2')}}">
-    <link href="{{ mix('css/app.css') }}" rel="stylesheet">
-    <style type="text/css">
-      body.embed-card {
-          background: #fff !important;
-          margin: 0;
-          padding-bottom: 0;
-      }
-      .status-card-embed {
-        box-shadow: none;
-        border-radius: 4px;
-        overflow: hidden;
-    }
-</style>
+    <style>.btn,img{vertical-align:middle}.btn,a{background-color:transparent}.btn:hover,a{text-decoration:none}.card,.col-4,.info-overlay,.square{position:relative}*,::after,::before{box-sizing:border-box}p{margin-top:0;margin-bottom:1rem}a{color:#2c78bf}a:hover{color:#1e5181;text-decoration:underline}img{border-style:none}.small{font-size:.875em;font-weight:400}.btn,body{font-size:.9rem;font-weight:400;line-height:1.6;color:#212529}.row{display:flex;flex-wrap:wrap;margin-right:-15px;margin-left:-15px}.col-4{width:100%;padding-right:15px;padding-left:15px;flex:0 0 33.33333333%;max-width:33.33333333%}.btn{display:inline-block;text-align:center;-webkit-user-select:none;-moz-user-select:none;user-select:none;border:1px solid transparent;padding:.375rem .75rem;border-radius:.25rem;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}.card,body{display:flex}@media (prefers-reduced-motion:reduce){.btn{transition:none}}.btn:hover{color:#212529}.btn:focus{outline:0;box-shadow:0 0 0 .2rem rgba(44,120,191,.25)}.btn-primary:focus,.btn-primary:not(:disabled):not(.disabled):active:focus{box-shadow:0 0 0 .2rem rgba(76,140,201,.5)}.btn:disabled{opacity:.65}.btn:not(:disabled):not(.disabled){cursor:pointer}.btn-primary,.btn-primary:disabled{color:#fff;background-color:#2c78bf;border-color:#2c78bf}.btn-primary:focus,.btn-primary:hover{background-color:#2564a0;border-color:#225e96;color:#fff}.btn-primary:not(:disabled):not(.disabled):active{color:#fff;background-color:#225e96;border-color:#20578b}.btn-sm{padding:.25rem .5rem;font-size:.7875rem;line-height:1.5;border-radius:.2rem}.card{flex-direction:column;min-width:0;word-wrap:break-word;background-color:#fff;background-clip:border-box;border:1px solid rgba(0,0,0,.125);border-radius:.25rem}.card-body{flex:1 1 auto;min-height:1px;padding:1.25rem}.card-footer,.card-header{padding:.75rem 1.25rem;background-color:#fff}.card-header{margin-bottom:0;border-bottom:1px solid rgba(0,0,0,.125)}.card-header:first-child{border-radius:calc(.25rem - 1px) calc(.25rem - 1px) 0 0}.card-footer{border-top:1px solid rgba(0,0,0,.125)}.card-footer:last-child{border-radius:0 0 calc(.25rem - 1px) calc(.25rem - 1px)}.bg-white{background-color:#fff!important}.border{border:1px solid #dee2e6!important}.d-flex{display:flex!important}.d-inline-flex{display:inline-flex!important}.justify-content-between{justify-content:space-between!important}.align-items-center{align-items:center!important}.shadow-none{box-shadow:none!important}.mb-0{margin-bottom:0!important}.mb-1{margin-bottom:.25rem!important}.mt-2{margin-top:.5rem!important}.mt-4{margin-top:1.5rem!important}.px-0{padding-right:0!important;padding-left:0!important}.py-1{padding-top:.25rem!important}.pr-1,.px-1{padding-right:.25rem!important}.pb-1,.py-1{padding-bottom:.25rem!important}.px-1{padding-left:.25rem!important}.pl-2{padding-left:.5rem!important}.px-4{padding-right:1.5rem!important;padding-left:1.5rem!important}.text-center{text-align:center!important}.text-uppercase{text-transform:uppercase!important}.font-weight-bold{font-weight:700!important}a.text-dark:focus,a.text-dark:hover{color:#000!important}a.text-muted:focus,a.text-muted:hover{color:#454b50!important}.text-muted{color:#6c757d!important}@media print{*,::after,::before{text-shadow:none!important;box-shadow:none!important}a:not(.btn){text-decoration:underline}img{page-break-inside:avoid}p{orphans:3;widows:3}body{min-width:992px!important}}body{margin:0;text-align:left;background-color:rgba(247,251,253,.4705882353);min-height:100vh;flex-flow:column;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Helvetica,Arial,sans-serif}.text-dark{color:#212529!important}.square{width:100%}.square::after{content:"";display:block;padding-bottom:100%}.square-content{position:absolute;width:100%;height:100%;background-repeat:no-repeat;background-size:cover;background-position:50%}@media (max-width:576px){.card-md-border-0{border-width:0!important;border-radius:0!important}.card-md-rounded-0{border-width:1px 0;border-radius:0!important}}.card{box-shadow:0 2px 6px 0 hsla(0,0%,0%,.2);border:none}body.embed-card{background:#fff!important;margin:0;padding-bottom:0}.status-card-embed{box-shadow:none;border-radius:4px;overflow:hidden}.avatar{border-radius:100%}.info-overlay-text-label{display:flex;justify-content:flex-end;position:absolute;width:100%;height:100%;padding:10px;h5{z-index:2;margin:0;svg{fill:#fff;width:25px;height:25px;transition:width100msease-out;@media(min-width:768px){width:30px;height:30px;}@media(min-width:1080px){width:40px;height:40px;}}}}</style>
 </head>
 <body class="bg-white">
-  <div class="embed-card">
-      <div class="card status-card-embed card-md-rounded-0 border">
-        <div class="card-header d-inline-flex align-items-center justify-content-between bg-white">
-          <div>
-            <img src="{{$profile['avatar']}}" width="32px" height="32px" style="border-radius: 32px;">
-            <a class="username font-weight-bold pl-2 text-dark" target="_blank" href="{{$profile['url']}}">
-              {{$profile['username']}}
-          </a>
-      </div>
-      <div>
-        <a class="small font-weight-bold text-muted pr-1" href="{{config('app.url')}}" target="_blank">{{config('pixelfed.domain.app')}}</a>
-        <img src="/img/pixelfed-icon-color.svg" width="26px">
+    <div class="embed-card">
+        <div class="card status-card-embed card-md-rounded-0 border">
+            <div class="card-header d-inline-flex align-items-center justify-content-between bg-white">
+                <div>
+                    <img src="{{$profile['avatar']}}" width="32" height="32" class="avatar" onerror="this.onerror=null;this.src='/storage/avatars/default.jpg';">
+                    <a class="username font-weight-bold pl-2 text-dark" target="_blank" href="{{$profile['url']}}">
+                        {{$profile['username']}}
+                    </a>
+                </div>
+                <div>
+                    <a class="small font-weight-bold text-muted pr-1" href="{{config('app.url')}}" target="_blank">{{config('pixelfed.domain.app')}}</a>
+                    <img src="/img/pixelfed-icon-color.svg" width="26" height="26">
+                </div>
+            </div>
+            <div class="card-body pb-1">
+                <div class="d-flex justify-content-between align-items-center">
+                    <div class="text-center">
+                        <p class="mb-0 font-weight-bold prettyCount" data-count="{{$profile['statuses_count']}}"></p>
+                        <p class="mb-0 text-muted text-uppercase small font-weight-bold">Posts</p>
+                    </div>
+                    <div class="text-center">
+                        <p class="mb-0 font-weight-bold prettyCount" data-count="{{$profile['followers_count']}}"></p>
+                        <p class="mb-0 text-muted text-uppercase small font-weight-bold">Followers</p>
+                    </div>
+                    <div class="text-center">
+                        <p class="mb-0"><a href="{{config('app.url')}}/i/intent/follow?user={{$profile['username']}}" class="btn btn-primary btn-sm py-1 px-4 text-uppercase font-weight-bold" target="_blank">Follow</a></p>
+                    </div>
+                </div>
+                <div class="row mt-4 mb-1 embed-row"></div>
+            </div>
+            <div class="card-footer bg-white">
+                <p class="text-center mb-0">
+                    <a href="{{$profile['url']}}" class="font-weight-bold" target="_blank">View More Posts</a>
+                </p>
+            </div>
+        </div>
     </div>
-</div>
-<div class="card-body pb-1">
-  <div class="d-flex justify-content-between align-items-center">
-    <div class="text-center">
-      <p class="mb-0 font-weight-bold prettyCount" data-count="{{$profile['statuses_count']}}"></p>
-      <p class="mb-0 text-muted text-uppercase small font-weight-bold">Posts</p>
-  </div>
-  <div class="text-center">
-      <p class="mb-0 font-weight-bold prettyCount" data-count="{{$profile['followers_count']}}"></p>
-      <p class="mb-0 text-muted text-uppercase small font-weight-bold">Followers</p>
-  </div>
-  <div class="text-center">
-      <p class="mb-0"><a href="/i/intent/follow?user={{$profile['username']}}" class="btn btn-primary btn-sm py-1 px-4 text-uppercase font-weight-bold" target="_blank">Follow</a></p>
-  </div>
-</div>
-<div class="row mt-4 mb-1 embed-row"></div>
-</div>
-<div class="card-footer bg-white">
-  <p class="text-center mb-0">
-    <a href="{{$profile['url']}}" class="font-weight-bold" target="_blank">View More Posts</a>
-</p>
-</div>
-</div>
-</div>
-<script type="text/javascript" src="{{mix('js/manifest.js')}}"></script>
-<script type="text/javascript" src="{{mix('js/vendor.js')}}"></script>
-<script type="text/javascript" src="{{mix('js/app.js')}}"></script>
-<script type="text/javascript">
-  window.addEventListener("message", e=>{const t=e.data||{};});
-</script>
-<script type="text/javascript">document.querySelectorAll('.caption-container a').forEach(function(i) {i.setAttribute('target', '_blank');});</script>
-<script type="text/javascript">
-    document.querySelectorAll('.prettyCount').forEach(function(i) {
-      i.innerText = App.util.format.count(i.getAttribute('data-count'));
-  });
-</script>
-<script type="text/javascript">
- axios.get('/api/pixelfed/v1/accounts/{{$profile['id']}}/statuses', {
-    params: {
-       only_media: true,
-       limit: 24
-   }
-})
- .then(res => {
-  let parent = $('.embed-row');
-  res.data
-  .filter(res => res.pf_type == 'photo')
-  .filter(res => !res.sensitive)
-  .slice(0, 9)
-  .forEach(post => {
-     let el = `<div class="col-4 mt-2 px-0">
-     <a class="card info-overlay card-md-border-0 px-1 shadow-none" href="${post.url}" target="_blank">
-     <div class="square">
-     <div class="square-content" style="background-image: url('${post.media_attachments[0].url}')">
-     </div>
-     </div>
-     </a>
-     </div>`;
-     parent.append(el);
- })
-})
- .finally(() => {
-    window.parent.postMessage({type:"setHeight",id:0,height:document.getElementsByTagName("html")[0].scrollHeight},"*");
-    setTimeout(() => {
-        window.parent.postMessage({type:"setHeight",id:0,height:document.getElementsByTagName("html")[0].scrollHeight},"*");
-    }, 5000);
-})
-</script>
+    <script type="text/javascript">
+        window.addEventListener("message", e=>{const t=e.data||{};});
+        document.querySelectorAll('.caption-container a').forEach(function(i) {i.setAttribute('target', '_blank');});
+        function formatCount(count = 0, locale = 'en-GB', notation = 'compact') {
+            if(count < 1) {
+                return 0;
+            }
+            return new Intl.NumberFormat(locale, { notation: notation , compactDisplay: "short" }).format(count);
+        }
+        function generateElements(html) {
+            const template = document.createElement('template');
+            template.innerHTML = html.trim();
+            return template.content.children;
+        }
+        document.querySelectorAll('.prettyCount').forEach(function(i) {
+            i.innerText = formatCount(i.getAttribute('data-count'));
+        });
+        fetch("{{config('app.url')}}/api/pixelfed/v1/accounts/{{$profile['id']}}/statuses?only_media=true&limit=24")
+        .then(res => res.json())
+        .then(res => {
+            let parent = document.querySelector('.embed-row');
+            res.filter(post => ['photo', 'photo:album'].includes(post.pf_type) && !post.sensitive && post.visibility === 'public')
+               .slice(0, 9)
+               .forEach((post, idx) => {
+                   let mediaUrl = post.media_attachments[0].preview_url ? post.media_attachments[0].preview_url : post.media_attachments[0].url;
+                   let html = post.pf_type === 'photo:album' ?
+                   `<div class="col-4 mt-2 px-0"><a class="card info-overlay card-md-border-0 px-1 shadow-none" href="${post.url}" target="_blank"><div class="square"><div class="square-content" style="background-image: url('${mediaUrl}')"><div class="info-overlay-text-label"><h5><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path d="M160 80H512c8.8 0 16 7.2 16 16V320c0 8.8-7.2 16-16 16H490.8L388.1 178.9c-4.4-6.8-12-10.9-20.1-10.9s-15.7 4.1-20.1 10.9l-52.2 79.8-12.4-16.9c-4.5-6.2-11.7-9.8-19.4-9.8s-14.8 3.6-19.4 9.8L175.6 336H160c-8.8 0-16-7.2-16-16V96c0-8.8 7.2-16 16-16zM96 96V320c0 35.3 28.7 64 64 64H512c35.3 0 64-28.7 64-64V96c0-35.3-28.7-64-64-64H160c-35.3 0-64 28.7-64 64zM48 120c0-13.3-10.7-24-24-24S0 106.7 0 120V344c0 75.1 60.9 136 136 136H456c13.3 0 24-10.7 24-24s-10.7-24-24-24H136c-48.6 0-88-39.4-88-88V120zm208 24a32 32 0 1 0 -64 0 32 32 0 1 0 64 0z"/></svg></h5></div></div></div></a></div>` :
+                   `<div class="col-4 mt-2 px-0"><a class="card info-overlay card-md-border-0 px-1 shadow-none" href="${post.url}" target="_blank"><div class="square"><div class="square-content" style="background-image: url('${mediaUrl}')"></div></div></a></div>`;
+                   let el = document.createElement('div');
+                   el.innerHTML = html;
+                   parent.appendChild(el.firstChild);
+               });
+        })
+        window.addEventListener("message", e => {
+            const t = e.data || {};
+            if (window.parent && t.type === 'setHeight') {
+                updateHeight(t.id)
+            }
+        });
+
+        function updateHeight(id) {
+            setTimeout(() => {
+                window.parent.postMessage({
+                    type: 'setHeight',
+                    id: id,
+                    height: document.documentElement.scrollHeight
+                }, "*");
+            }, 2500)
+        }
+
+    </script>
 </body>
 </html>
diff --git a/resources/views/profile/private.blade.php b/resources/views/profile/private.blade.php
index ffff37d49..118ef643e 100644
--- a/resources/views/profile/private.blade.php
+++ b/resources/views/profile/private.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.app-guest',['title' => $user->username . " on " . config('app.name')])
+@extends('layouts.app-guest',['title' => $user->username . " on " . config_cache('app.name')])
 
 @section('content')
 @if (session('error'))
diff --git a/resources/views/profile/show.blade.php b/resources/views/profile/show.blade.php
index 5107c0ab3..dfa8edabb 100644
--- a/resources/views/profile/show.blade.php
+++ b/resources/views/profile/show.blade.php
@@ -1,4 +1,13 @@
-@extends('layouts.app',['title' => $profile->username . " on " . config('app.name')])
+@extends('layouts.app', [
+    'title' => $profile->name . ' (@' . $acct . ') - Pixelfed',
+    'ogTitle' => $profile->name . ' (@' . $acct . ')',
+    'ogType' => 'profile'
+])
+
+@php
+$acct = $profile->username . '@' . config('pixelfed.domain.app');
+$metaDescription = \App\Services\AccountService::getMetaDescription($profile->id);
+@endphp
 
 @section('content')
 @if (session('error'))
@@ -8,9 +17,6 @@
 @endif
 
 <profile profile-id="{{$profile->id}}" profile-username="{{$profile->username}}" :profile-settings="{{json_encode($settings)}}" profile-layout="metro"></profile>
-@if($profile->website)
-<a class="d-none" href="{{$profile->website}}" rel="me external nofollow noopener">{{$profile->website}}</a>
-@endif
 
 <noscript>
 	<div class="container">
@@ -20,13 +26,20 @@
 
 @endsection
 
-@push('meta')<meta property="og:description" content="{{strip_tags($profile->bio)}}">
-	@if(false == $settings['crawlable'] || $profile->remote_url)
-	<meta name="robots" content="noindex, nofollow">
-	@else  <meta property="og:image" content="{{$profile->avatarUrl()}}">
-		<link href="{{$profile->permalink('.atom')}}" rel="alternate" title="{{$profile->username}} on Pixelfed" type="application/atom+xml">
-		<link href='{{$profile->permalink()}}' rel='alternate' type='application/activity+json'>
-	@endif
+@push('meta')<meta name="description" content="{{$metaDescription}}">
+    <meta property="og:description" content="{{$metaDescription}}">
+    <meta property="og:image" content="{{$profile->avatarUrl()}}">
+    <meta property="og:image:width" content="200">
+    <meta property="og:image:height" content="200">
+    <meta property="twitter:card" content="summary">
+    <meta property="profile:username" content="{{$acct}}">
+	<link href="{{$profile->permalink('.atom')}}" rel="alternate" title="{{$profile->username}} on Pixelfed" type="application/atom+xml">
+	<link href="{{$profile->permalink()}}" rel="alternate" type="application/activity+json">
+    <meta name="application-name" content="Pixelfed">
+    <meta name="generator" content="pixelfed">
+    @if($profile->website)<link href="{{$profile->website}}" rel="me" type="text/html">
+@endif
+	@if(false == $settings['crawlable'] || $profile->remote_url)<meta name="robots" content="noindex, nofollow">@endif
 @endpush
 
 @push('scripts')<script type="text/javascript" src="{{ mix('js/profile.js') }}"></script>
diff --git a/resources/views/profile/show_carousel.blade.php b/resources/views/profile/show_carousel.blade.php
new file mode 100644
index 000000000..a5be918d0
--- /dev/null
+++ b/resources/views/profile/show_carousel.blade.php
@@ -0,0 +1,42 @@
+@extends('layouts.blank', [
+    'title' => $profile->name . ' (@' . $acct . ') - Pixelfed',
+    'ogTitle' => $profile->name . ' (@' . $acct . ')',
+    'ogType' => 'profile'
+])
+
+@php
+$acct = $profile->username . '@' . config('pixelfed.domain.app');
+$metaDescription = \App\Services\AccountService::getMetaDescription($profile->id);
+@endphp
+
+@section('content')
+@if (session('error'))
+        <div class="alert alert-danger text-center font-weight-bold mb-0">
+                {{ session('error') }}
+        </div>
+@endif
+
+<profile-carousel profile-id="{{$profile->id}}" />
+
+@endsection
+
+@push('meta')<meta name="description" content="{{$metaDescription}}">
+    <meta property="og:description" content="{{$metaDescription}}">
+    <meta property="og:image" content="{{$profile->avatarUrl()}}">
+    <meta property="og:image:width" content="200">
+    <meta property="og:image:height" content="200">
+    <meta property="twitter:card" content="summary">
+    <meta property="profile:username" content="{{$acct}}">
+    <link href="{{$profile->permalink('.atom')}}" rel="alternate" title="{{$profile->username}} on Pixelfed" type="application/atom+xml">
+    <link href="{{$profile->permalink()}}" rel="alternate" type="application/activity+json">
+    <meta name="application-name" content="Pixelfed">
+    <meta name="generator" content="pixelfed">
+    <link href="{{ mix('css/profile.css') }}" rel="stylesheet">
+    @if($profile->website)<link href="{{$profile->website}}" rel="me" type="text/html">
+@endif
+    @if(false == $settings['crawlable'] || $profile->remote_url)<meta name="robots" content="noindex, nofollow">@endif
+@endpush
+
+@push('scripts')<script type="text/javascript" src="{{ mix('js/profile.js') }}"></script>
+<script type="text/javascript" defer>App.boot();</script>
+@endpush
diff --git a/resources/views/settings/applications.blade.php b/resources/views/settings/applications.blade.php
index 691ab0c81..97270fb62 100644
--- a/resources/views/settings/applications.blade.php
+++ b/resources/views/settings/applications.blade.php
@@ -6,7 +6,7 @@
 	<h3 class="font-weight-bold">Applications</h3>
 </div>
 <hr>
-@if(config_cache('pixelfed.oauth_enabled') == true)
+@if((bool) config_cache('pixelfed.oauth_enabled') == true)
 	<passport-authorized-clients></passport-authorized-clients>
 	<passport-personal-access-tokens></passport-personal-access-tokens>
 @else
diff --git a/resources/views/settings/developers.blade.php b/resources/views/settings/developers.blade.php
index 8b4c94471..22d869580 100644
--- a/resources/views/settings/developers.blade.php
+++ b/resources/views/settings/developers.blade.php
@@ -6,7 +6,7 @@
 	<h3 class="font-weight-bold">Developers</h3>
 </div>
 <hr>
-@if(config_cache('pixelfed.oauth_enabled') == true)
+@if((bool) config_cache('pixelfed.oauth_enabled') == true)
 	<passport-clients></passport-clients>
 @else
 	<p class="lead">OAuth has not been enabled on this instance.</p>
diff --git a/resources/views/settings/email.blade.php b/resources/views/settings/email.blade.php
index 7286896b1..4b7ddd677 100644
--- a/resources/views/settings/email.blade.php
+++ b/resources/views/settings/email.blade.php
@@ -1,63 +1,36 @@
-@extends('layouts.app')
+@extends('settings.template')
 
-@section('content')
-@if (session('status'))
-    <div class="alert alert-primary px-3 h6 text-center">
-        {{ session('status') }}
-    </div>
-@endif
-@if ($errors->any())
-    <div class="alert alert-danger px-3 h6 text-center">
-            @foreach($errors->all() as $error)
-                <p class="font-weight-bold mb-1">{{ $error }}</p>
-            @endforeach
-    </div>
-@endif
-@if (session('error'))
-    <div class="alert alert-danger px-3 h6 text-center">
-        {{ session('error') }}
-    </div>
-@endif
+@section('section')
 
-<div class="container">
-  <div class="col-12">
-    <div class="card shadow-none border mt-5">
-      <div class="card-body">
-        <div class="row">
-          <div class="col-12 p-3 p-md-5">
-			  <div class="title">
-			    <h3 class="font-weight-bold">Email Settings</h3>
-			  </div>
-			  <hr>
-			  <form method="post" action="{{route('settings.email')}}">
-			    @csrf
-			    <input type="hidden" class="form-control" name="name" value="{{Auth::user()->profile->name}}">
-			    <input type="hidden" class="form-control" name="username" value="{{Auth::user()->profile->username}}">
-			    <input type="hidden" class="form-control" name="website" value="{{Auth::user()->profile->website}}">
-
-			    <div class="form-group">
-			      <label for="email" class="font-weight-bold">Email Address</label>
-			        <input type="email" class="form-control" id="email" name="email" placeholder="Email Address" value="{{Auth::user()->email}}">
-			        <p class="help-text small text-muted font-weight-bold">
-			          @if(Auth::user()->email_verified_at)
-			          <span class="text-success">Verified</span> {{Auth::user()->email_verified_at->diffForHumans()}}
-			          @else
-			          <span class="text-danger">Unverified</span> You need to <a href="/i/verify-email">verify your email</a>.
-			          @endif
-			        </p>
-			    </div>
-			    <div class="form-group row">
-			      <div class="col-12 text-right">
-			        <button type="submit" class="btn btn-primary font-weight-bold py-0 px-5">Submit</button>
-			      </div>
-			    </div>
-			  </form>
-          </div>
-        </div>
-      </div>
+<div class="d-flex justify-content-between align-items-center">
+    <div class="title d-flex align-items-center" style="gap: 1rem;">
+        <p class="mb-0"><a href="/settings/home"><i class="far fa-chevron-left fa-lg"></i></a></p>
+        <h3 class="font-weight-bold mb-0">Email Settings</h3>
     </div>
-  </div>
 </div>
 
+<hr>
+<form method="post" action="{{route('settings.email')}}">
+    @csrf
+    <input type="hidden" class="form-control" name="name" value="{{Auth::user()->profile->name}}">
+    <input type="hidden" class="form-control" name="username" value="{{Auth::user()->profile->username}}">
+    <input type="hidden" class="form-control" name="website" value="{{Auth::user()->profile->website}}">
 
+    <div class="form-group">
+        <label for="email" class="font-weight-bold">Email Address</label>
+        <input type="email" class="form-control" id="email" name="email" placeholder="Email Address" value="{{Auth::user()->email}}">
+        <p class="help-text small text-muted font-weight-bold">
+            @if(Auth::user()->email_verified_at)
+            <span class="text-success">Verified</span> {{Auth::user()->email_verified_at->diffForHumans()}}
+            @else
+            <span class="text-danger">Unverified</span> You need to <a href="/i/verify-email">verify your email</a>.
+            @endif
+        </p>
+    </div>
+    <div class="form-group row">
+        <div class="col-12 text-right">
+            <button type="submit" class="btn btn-primary font-weight-bold py-0 px-5">Submit</button>
+        </div>
+    </div>
+</form>
 @endsection
diff --git a/resources/views/settings/home.blade.php b/resources/views/settings/home.blade.php
index 97cffd5ec..1ecd6bca8 100644
--- a/resources/views/settings/home.blade.php
+++ b/resources/views/settings/home.blade.php
@@ -88,6 +88,7 @@
 			</div>
 		</div>
 
+        @if((bool) config_cache('federation.activitypub.enabled'))
         <div class="form-group row">
             <label for="aliases" class="col-sm-3 col-form-label font-weight-bold">Account Aliases</label>
             <div class="col-sm-9" id="aliases">
@@ -95,6 +96,17 @@
                 <p class="help-text text-muted small">To move from another account to this one, first you need to create an alias.</p>
             </div>
         </div>
+
+        @if((bool) config_cache('federation.migration'))
+        <div class="form-group row">
+            <label for="aliases" class="col-sm-3 col-form-label font-weight-bold">Account Migrate</label>
+            <div class="col-sm-9" id="aliases">
+                <a class="font-weight-bold" href="/settings/account/migration/manage">Migrate to another account</a>
+                <p class="help-text text-muted small">To redirect this account to a different one (where supported).</p>
+            </div>
+        </div>
+        @endif
+        @endif
 		@if(config_cache('pixelfed.enforce_account_limit'))
 		<div class="pt-3">
 			<p class="font-weight-bold text-muted text-center">Storage Usage</p>
diff --git a/resources/views/settings/migration/index.blade.php b/resources/views/settings/migration/index.blade.php
new file mode 100644
index 000000000..3407e55bc
--- /dev/null
+++ b/resources/views/settings/migration/index.blade.php
@@ -0,0 +1,108 @@
+@extends('layouts.app')
+
+@section('content')
+@if (session('status'))
+    <div class="alert alert-primary px-3 h6 font-weight-bold text-center">
+        {{ session('status') }}
+    </div>
+@endif
+@if ($errors->any())
+    <div class="alert alert-danger px-3 h6 text-center">
+            @foreach($errors->all() as $error)
+                <p class="font-weight-bold mb-1">{{ $error }}</p>
+            @endforeach
+    </div>
+@endif
+@if (session('error'))
+    <div class="alert alert-danger px-3 h6 text-center">
+        {{ session('error') }}
+    </div>
+@endif
+
+<div class="container">
+  <div class="col-12">
+    <div class="card shadow-none border mt-5">
+      <div class="card-body">
+        <div class="row">
+          <div class="col-12 p-3 p-md-5">
+            <div class="title">
+                <div class="d-flex justify-content-between align-items-center">
+                    <h3 class="font-weight-bold">Account Migration</h3>
+
+                    <a class="font-weight-bold" href="/settings/home">
+                        <i class="far fa-long-arrow-left"></i>
+                        Back to Settings
+                    </a>
+                </div>
+                <hr />
+            </div>
+            <div>
+                @if($hasExistingMigration)
+                <div class="row">
+                    <div class="col-12 mt-5">
+                        <p class="lead text-center">You have migrated your account already.</p>
+                        <p>You can only migrate your account once per 30 days. If you want to migrate your followers back to this account, follow this process in reverse.</p>
+                    </div>
+                </div>
+                @else
+                <div class="row">
+                    <div class="col-12">
+                        <p class="lead">If you want to move this account to another account, please read the following carefully.</p>
+                        <ul class="text-danger lead">
+                            <li class="font-weight-bold">Only followers will be transferred; no other information will be moved automatically.</li>
+                            <li>This process will transfer all followers from your existing account to your new account.</li>
+                            <li>A redirect notice will be added to your current account's profile, and it will be removed from search results.</li>
+                            <li>You must set up the new account to link back to your current account before proceeding.</li>
+                            <li>Once the transfer is initiated, there will be a waiting period during which you cannot initiate another transfer.</li>
+                            <li>After the transfer, your current account will be limited in functionality, but you will retain the ability to export data and possibly reactivate the account.</li>
+                        </ul>
+                        <p class="mb-0">For more information on Aliases and Account Migration, visit the <a href="/site/kb/your-profile">Help Center</a>.</p>
+                        <hr>
+
+                        <form method="post" autocomplete="off">
+                            @csrf
+                            <div class="row">
+                                <div class="col-12 col-md-6">
+                                    <div class="form-group">
+                                        <label class="font-weight-bold mb-0">New Account Handle</label>
+                                        <p class="small text-muted">Enter the username@domain of the account you want to move to</p>
+                                        <input
+                                            type="email"
+                                            class="form-control"
+                                            name="acct"
+                                            placeholder="username@domain.tld"
+                                            role="presentation"
+                                            autocomplete="new-user-email"
+                                        />
+                                    </div>
+                                </div>
+                                <div class="col-12 col-md-6">
+                                    <div class="form-group">
+                                        <label class="font-weight-bold mb-0">Account Password</label>
+                                        <p class="small text-muted">For security purposes please enter the password of the current account</p>
+                                        <input
+                                            type="password"
+                                            class="form-control"
+                                            name="password"
+                                            role="presentation"
+                                            placeholder="Your account password"
+                                            autocomplete="new-password"
+                                            />
+                                    </div>
+                                </div>
+                            </div>
+
+                            <button class="btn btn-primary btn-block font-weight-bold btn-lg rounded-pill">Move Followers</button>
+                        </form>
+                    </div>
+                </div>
+                @endif
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+@endsection
diff --git a/resources/views/settings/parental-controls/add.blade.php b/resources/views/settings/parental-controls/add.blade.php
new file mode 100644
index 000000000..b7ca4c7ab
--- /dev/null
+++ b/resources/views/settings/parental-controls/add.blade.php
@@ -0,0 +1,59 @@
+@extends('settings.template-vue')
+
+@section('section')
+<form class="d-flex h-100 flex-column" method="post">
+    @csrf
+<div class="d-flex h-100 flex-column">
+    <div class="d-flex justify-content-between align-items-center">
+        <div class="title d-flex align-items-center" style="gap: 1rem;">
+            <p class="mb-0"><a href="/settings/parental-controls"><i class="far fa-chevron-left fa-lg"></i></a></p>
+            <h3 class="font-weight-bold mb-0">Add child</h3>
+        </div>
+    </div>
+
+    <hr />
+
+    <div class="d-flex flex-column flex-grow-1">
+        <h4>Choose your child's policies</h4>
+
+        <div class="mb-4">
+            <p class="font-weight-bold mb-1">Allowed Actions</p>
+
+            @include('settings.parental-controls.checkbox', ['name' => 'post', 'title' => 'Post', 'checked' => true])
+            @include('settings.parental-controls.checkbox', ['name' => 'comment', 'title' => 'Comment', 'checked' => true])
+            @include('settings.parental-controls.checkbox', ['name' => 'like', 'title' => 'Like', 'checked' => true])
+            @include('settings.parental-controls.checkbox', ['name' => 'share', 'title' => 'Share', 'checked' => true])
+            @include('settings.parental-controls.checkbox', ['name' => 'follow', 'title' => 'Follow'])
+            @include('settings.parental-controls.checkbox', ['name' => 'bookmark', 'title' => 'Bookmark'])
+            @include('settings.parental-controls.checkbox', ['name' => 'story', 'title' => 'Add to story'])
+            @include('settings.parental-controls.checkbox', ['name' => 'collection', 'title' => 'Add to collection'])
+        </div>
+        <div class="mb-4">
+            <p class="font-weight-bold mb-1">Enabled features</p>
+
+            @include('settings.parental-controls.checkbox', ['name' => 'discovery_feeds', 'title' => 'Discovery Feeds'])
+            @include('settings.parental-controls.checkbox', ['name' => 'dms', 'title' => 'Direct Messages'])
+            @include('settings.parental-controls.checkbox', ['name' => 'federation', 'title' => 'Federation'])
+        </div>
+        <div class="mb-4">
+            <p class="font-weight-bold mb-1">Preferences</p>
+
+            @include('settings.parental-controls.checkbox', ['name' => 'hide_network', 'title' => 'Hide my child\'s connections'])
+            @include('settings.parental-controls.checkbox', ['name' => 'private', 'title' => 'Make my child\'s account private'])
+            @include('settings.parental-controls.checkbox', ['name' => 'hide_cw', 'title' => 'Hide sensitive media'])
+        </div>
+    </div>
+
+    <div>
+        <div class="form-group">
+            <label class="font-weight-bold mb-0">Email address</label>
+            <p class="help-text lh-1 small">Where should we send this invite?</p>
+            <input class="form-control" placeholder="Enter your childs email address" name="email" required>
+        </div>
+
+        <button class="btn btn-dark btn-block font-weight-bold">Add Child</button>
+    </div>
+</div>
+</form>
+@endsection
+
diff --git a/resources/views/settings/parental-controls/checkbox.blade.php b/resources/views/settings/parental-controls/checkbox.blade.php
new file mode 100644
index 000000000..b6cedbe92
--- /dev/null
+++ b/resources/views/settings/parental-controls/checkbox.blade.php
@@ -0,0 +1,7 @@
+@php
+$id = str_random(6) . '_' . str_slug($name);
+$defaultChecked = isset($checked) && $checked ? 'checked=""' : '';
+@endphp<div class="custom-control custom-checkbox">
+                <input type="checkbox" class="custom-control-input" id="{{$id}}" name="{{$name}}" {!!$defaultChecked!!}>
+                <label class="custom-control-label pl-2" for="{{$id}}">{{ $title }}</label>
+            </div>
diff --git a/resources/views/settings/parental-controls/child-status.blade.php b/resources/views/settings/parental-controls/child-status.blade.php
new file mode 100644
index 000000000..9852dacd7
--- /dev/null
+++ b/resources/views/settings/parental-controls/child-status.blade.php
@@ -0,0 +1,44 @@
+@if($state)
+<div class="card shadow-none border">
+    @if($state === 'sent_invite')
+    <div class="card-body d-flex justify-content-center flex-column align-items-center py-5" style="gap:1rem">
+        <i class="far fa-envelope fa-3x"></i>
+        <p class="lead mb-0 font-weight-bold">Child Invite Sent!</p>
+
+        <div class="list-group">
+            <div class="list-group-item py-1"><i class="far fa-check-circle text-success mr-2"></i> Created child invite</div>
+            <div class="list-group-item py-1"><i class="far fa-check-circle text-success mr-2"></i> Sent invite email to child</div>
+            <div class="list-group-item py-1"><i class="far fa-times-circle text-dark mr-2"></i> Child joined via invite</div>
+            <div class="list-group-item py-1"><i class="far fa-times-circle text-dark mr-2"></i> Child account is active</div>
+        </div>
+    </div>
+    @elseif($state === 'awaiting_email_confirmation')
+    <div class="card-body d-flex justify-content-center flex-column align-items-center py-5" style="gap:1rem">
+        <i class="far fa-envelope fa-3x"></i>
+        <p class="lead mb-0 font-weight-bold">Child Invite Sent!</p>
+
+        <div class="list-group">
+            <div class="list-group-item py-1"><i class="far fa-check-circle text-success mr-2"></i> Created child invite</div>
+            <div class="list-group-item py-1"><i class="far fa-check-circle text-success mr-2"></i> Sent invite email to child</div>
+            <div class="list-group-item py-1"><i class="far fa-check-circle text-success mr-2"></i> Child joined via invite</div>
+            <div class="list-group-item py-1"><i class="far fa-times-circle text-dark mr-2"></i> Child account is active</div>
+        </div>
+    </div>
+    @elseif($state === 'active')
+    <div class="card-body d-flex justify-content-center flex-column align-items-center py-5" style="gap:1rem">
+        <i class="far fa-check-circle fa-3x text-success"></i>
+        <p class="lead mb-0 font-weight-bold">Child Account Active</p>
+
+        <div class="list-group">
+            <div class="list-group-item py-1"><i class="far fa-check-circle text-success mr-2"></i> Created child invite</div>
+            <div class="list-group-item py-1"><i class="far fa-check-circle text-success mr-2"></i> Sent invite email to child</div>
+            <div class="list-group-item py-1"><i class="far fa-check-circle text-success mr-2"></i> Child joined via invite</div>
+            <div class="list-group-item py-1"><i class="far fa-check-circle text-success mr-2"></i> Child account is active</div>
+        </div>
+
+        <a class="btn btn-dark font-weight-bold px-5" href="{{ $pc->childAccount()['url'] }}">View Account</a>
+    </div>
+    @endif
+</div>
+@else
+@endif
diff --git a/resources/views/settings/parental-controls/delete-invite.blade.php b/resources/views/settings/parental-controls/delete-invite.blade.php
new file mode 100644
index 000000000..36b66ab15
--- /dev/null
+++ b/resources/views/settings/parental-controls/delete-invite.blade.php
@@ -0,0 +1,32 @@
+@extends('settings.template-vue')
+
+@section('section')
+<form class="d-flex h-100 flex-column" method="post">
+    @csrf
+    <div class="d-flex h-100 flex-column" style="gap: 1rem;">
+        <div class="d-flex justify-content-between align-items-center">
+            <div class="title d-flex align-items-center" style="gap: 1rem;">
+                <p class="mb-0"><a href="{{ $pc->manageUrl() }}?actions"><i class="far fa-chevron-left fa-lg"></i></a></p>
+                <div>
+                    <h3 class="font-weight-bold mb-0">Cancel child invite</h3>
+                    <p class="small mb-0">Last updated: {{ $pc->updated_at->diffForHumans() }}</p>
+                </div>
+            </div>
+        </div>
+        <div>
+            <hr />
+        </div>
+
+        <div class="d-flex bg-light align-items-center justify-content-center flex-grow-1 flex-column">
+            <p>
+                <i class="far fa-exclamation-triangle fa-3x"></i>
+            </p>
+            <h4>Are you sure you want to cancel this invite?</h4>
+            <p>The child you invited will not be able to join if you cancel the invite.</p>
+        </div>
+
+        <button type="submit" class="btn btn-danger btn-block font-weight-bold">Cancel invite</button>
+    </div>
+</form>
+
+@endsection
diff --git a/resources/views/settings/parental-controls/index.blade.php b/resources/views/settings/parental-controls/index.blade.php
new file mode 100644
index 000000000..a99093f33
--- /dev/null
+++ b/resources/views/settings/parental-controls/index.blade.php
@@ -0,0 +1,62 @@
+@extends('settings.template-vue')
+
+@section('section')
+<div class="d-flex h-100 flex-column">
+    <div class="d-flex justify-content-between align-items-center">
+        <div class="title d-flex align-items-center" style="gap: 1rem;">
+            <p class="mb-0"><a href="/settings/home"><i class="far fa-chevron-left fa-lg"></i></a></p>
+            <h3 class="font-weight-bold mb-0">Parental Controls</h3>
+        </div>
+    </div>
+
+    <hr />
+
+    @if($children->count())
+    <div class="d-flex flex-column flex-grow-1 w-100">
+        <div class="list-group w-100">
+            @foreach($children as $child)
+            <a class="list-group-item d-flex align-items-center text-decoration-none text-dark" href="{{ $child->manageUrl() }}" style="gap: 1rem;">
+                <img src="/storage/avatars/default.png" width="40" height="40" class="rounded-circle" />
+
+                <div class="flex-grow-1">
+                    @if($child->child_id && $child->email_verified_at)
+                    <p class="font-weight-bold mb-0" style="line-height: 1.5;">&commat;{{ $child->childAccount()['username'] }}</p>
+                    <p class="small text-muted mb-0" style="line-height: 1;">{{ $child->childAccount()['display_name'] }}</p>
+                    @else
+                    <p class="font-weight-light mb-0 text-danger" style="line-height: 1.5;">Invite Pending</p>
+                    <p class="mb-0 small" style="line-height: 1;">{{ $child->email }}</p>
+                    @endif
+                </div>
+
+                <div class="font-weight-bold small text-lighter" style="line-height:1;">
+                    <i class="far fa-clock mr-1"></i>
+                    {{ $child->updated_at->diffForHumans() }}
+                </div>
+            </a>
+            @endforeach
+        </div>
+
+        <div class="mt-3">
+            {{ $children->links() }}
+        </div>
+    </div>
+    @else
+    <div class="d-flex flex-grow-1 bg-light mb-3 rounded p-4">
+        <p>You are not managing any children accounts.</p>
+    </div>
+    @endif
+
+    <div class="d-flex justify-content-between align-items-center">
+        <a class="btn btn-outline-dark font-weight-bold py-2 px-4" href="{{ route('settings.pc.add') }}">
+            <i class="far fa-plus mr-2"></i> Add Child
+        </a>
+
+        <div class="font-weight-bold">
+            <span>{{ $children->total() }}/{{ config('instance.parental_controls.limits.max_children') }}</span>
+            <span>children added</span>
+        </div>
+    </div>
+
+</div>
+@endsection
+
diff --git a/resources/views/settings/parental-controls/invite-register-form.blade.php b/resources/views/settings/parental-controls/invite-register-form.blade.php
new file mode 100644
index 000000000..a21808efa
--- /dev/null
+++ b/resources/views/settings/parental-controls/invite-register-form.blade.php
@@ -0,0 +1,115 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container mt-4">
+    <div class="row justify-content-center">
+        <div class="col-lg-5">
+            <div class="card shadow-none border mb-3">
+                <a
+                    class="card-body d-flex flex-column justify-content-center align-items-center text-decoration-none"
+                    href="{{ $pc->parent->url() }}"
+                    target="_blank">
+                    <p class="text-center font-weight-bold text-muted">You've been invited by:</p>
+
+                    <div class="media align-items-center">
+                        <img
+                            src="{{ $pc->parent->avatarUrl() }}"
+                            width="30"
+                            height="30"
+                            class="rounded-circle mr-2"
+                            draggable="false"
+                            onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=0';">
+
+                        <div class="media-body">
+                            <p class="lead font-weight-bold mb-0 text-dark" style="line-height: 1;">&commat;{{ $pc->parent->username }}</p>
+                        </div>
+                    </div>
+                </a>
+            </div>
+            <div class="card shadow-none border">
+                <div class="card-header bg-white p-3 text-center font-weight-bold">Create your Account</div>
+
+                <div class="card-body">
+                    <form method="POST" class="px-md-3">
+                        @csrf
+
+                        <input type="hidden" name="rt" value="{{ (new \App\Http\Controllers\Auth\RegisterController())->getRegisterToken() }}">
+                        <div class="form-group row">
+                            <div class="col-md-12">
+                                <label class="small font-weight-bold text-lighter">Name</label>
+                                <input id="name" type="text" class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}" name="name" value="{{ old('name') }}" placeholder="{{ __('Name') }}" required autofocus>
+
+                                @if ($errors->has('name'))
+                                    <span class="invalid-feedback">
+                                        <strong>{{ $errors->first('name') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group row">
+                            <div class="col-md-12">
+                                <label class="small font-weight-bold text-lighter">Username</label>
+                                <input id="username" type="text" class="form-control{{ $errors->has('username') ? ' is-invalid' : '' }}" name="username" value="{{ old('username') }}" placeholder="{{ __('Username') }}" required>
+
+                                @if ($errors->has('username'))
+                                    <span class="invalid-feedback">
+                                        <strong>{{ $errors->first('username') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group row">
+                            <div class="col-md-12">
+                                <label class="small font-weight-bold text-lighter">Password</label>
+                                <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" placeholder="{{ __('Password') }}" required>
+
+                                @if ($errors->has('password'))
+                                    <span class="invalid-feedback">
+                                        <strong>{{ $errors->first('password') }}</strong>
+                                    </span>
+                                @endif
+                            </div>
+                        </div>
+
+                        <div class="form-group row">
+                            <div class="col-md-12">
+                                <label class="small font-weight-bold text-lighter">Confirm Password</label>
+                                <input id="password-confirm" type="password" class="form-control" name="password_confirmation" placeholder="{{ __('Confirm Password') }}" required>
+                            </div>
+                        </div>
+
+                        <div class="form-group row">
+                            <div class="col-md-12">
+                                <div class="form-check">
+                                  <input class="form-check-input" name="agecheck" type="checkbox" value="true" id="ageCheck" required>
+                                  <label class="form-check-label" for="ageCheck">
+                                    I am at least 16 years old
+                                  </label>
+                                </div>
+                            </div>
+                        </div>
+
+                        @if((bool) config_cache('captcha.enabled'))
+                        <div class="d-flex justify-content-center my-3">
+                            {!! Captcha::display() !!}
+                        </div>
+                        @endif
+
+                        <p class="small">By signing up, you agree to our <a href="{{route('site.terms')}}" class="font-weight-bold text-dark">Terms of Use</a> and <a href="{{route('site.privacy')}}" class="font-weight-bold text-dark">Privacy Policy</a>, in addition, you understand that your account is managed by <span class="font-weight-bold">{{ $pc->parent->username }}</span> and they can limit your account without your permission. For more details, view the <a href="/site/kb/parental-controls" class="text-dark font-weight-bold">Parental Controls</a> help center page.</p>
+
+                        <div class="form-group row">
+                            <div class="col-md-12">
+                                <button type="submit" class="btn btn-primary btn-block py-0 font-weight-bold">
+                                    {{ __('Register') }}
+                                </button>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
diff --git a/resources/views/settings/parental-controls/manage.blade.php b/resources/views/settings/parental-controls/manage.blade.php
new file mode 100644
index 000000000..a6cc62119
--- /dev/null
+++ b/resources/views/settings/parental-controls/manage.blade.php
@@ -0,0 +1,119 @@
+@extends('settings.template-vue')
+
+@section('section')
+<form class="d-flex h-100 flex-column" method="post">
+    @csrf
+<div class="d-flex h-100 flex-column">
+    <div class="d-flex justify-content-between align-items-center">
+        <div class="title d-flex align-items-center" style="gap: 1rem;">
+            <p class="mb-0"><a href="/settings/parental-controls"><i class="far fa-chevron-left fa-lg"></i></a></p>
+            <div>
+                <h3 class="font-weight-bold mb-0">Manage child</h3>
+                <p class="small mb-0">Last updated: {{ $pc->updated_at->diffForHumans() }}</p>
+            </div>
+        </div>
+
+        <button class="btn btn-dark font-weight-bold">Update</button>
+    </div>
+
+    <hr />
+
+    <div class="d-flex flex-column flex-grow-1">
+        <ul class="nav nav-pills mb-0" id="pills-tab" role="tablist">
+            <li class="nav-item" role="presentation">
+                <button class="nav-link active font-weight-bold" id="pills-status-tab" data-toggle="pill" data-target="#pills-status" type="button" role="tab" aria-controls="pills-status" aria-selected="true">Status</button>
+            </li>
+            <li class="nav-item" role="presentation">
+                <button class="nav-link font-weight-bold" id="pills-permissions-tab" data-toggle="pill" data-target="#pills-permissions" type="button" role="tab" aria-controls="pills-permissions" aria-selected="false">Permissions</button>
+            </li>
+            <li class="nav-item" role="presentation">
+                <button class="nav-link font-weight-bold" id="pills-details-tab" data-toggle="pill" data-target="#pills-details" type="button" role="tab" aria-controls="pills-details" aria-selected="false">Account Details</button>
+            </li>
+            <li class="nav-item" role="presentation">
+                <button class="nav-link font-weight-bold" id="pills-actions-tab" data-toggle="pill" data-target="#pills-actions" type="button" role="tab" aria-controls="pills-actions" aria-selected="false">Actions</button>
+            </li>
+        </ul>
+        <div>
+            <hr>
+        </div>
+        <div class="tab-content" id="pills-tabContent">
+            <div class="tab-pane fade show active" id="pills-status" role="tabpanel" aria-labelledby="pills-status-tab">
+                @if(!$pc->child_id && !$pc->email_verified_at)
+                @include('settings.parental-controls.child-status', ['state' => 'sent_invite'])
+                @elseif($pc->child_id && !$pc->email_verified_at)
+                @include('settings.parental-controls.child-status', ['state' => 'awaiting_email_confirmation'])
+                @elseif($pc->child_id && $pc->email_verified_at)
+                @include('settings.parental-controls.child-status', ['state' => 'active'])
+                @else
+                @include('settings.parental-controls.child-status', ['state' => 'sent_invite'])
+                @endif
+            </div>
+            <div class="tab-pane fade" id="pills-permissions" role="tabpanel" aria-labelledby="pills-permissions-tab">
+                <div class="mb-4">
+                    <p class="font-weight-bold mb-1">Allowed Actions</p>
+
+                    @include('settings.parental-controls.checkbox', ['name' => 'post', 'title' => 'Post', 'checked' => $pc->permissions['post']])
+                    @include('settings.parental-controls.checkbox', ['name' => 'comment', 'title' => 'Comment', 'checked' => $pc->permissions['comment']])
+                    @include('settings.parental-controls.checkbox', ['name' => 'like', 'title' => 'Like', 'checked' => $pc->permissions['like']])
+                    @include('settings.parental-controls.checkbox', ['name' => 'share', 'title' => 'Share', 'checked' => $pc->permissions['share']])
+                    @include('settings.parental-controls.checkbox', ['name' => 'follow', 'title' => 'Follow', 'checked' => $pc->permissions['follow']])
+                    @include('settings.parental-controls.checkbox', ['name' => 'bookmark', 'title' => 'Bookmark', 'checked' => $pc->permissions['bookmark']])
+                    @include('settings.parental-controls.checkbox', ['name' => 'story', 'title' => 'Add to story', 'checked' => $pc->permissions['story']])
+                    @include('settings.parental-controls.checkbox', ['name' => 'collection', 'title' => 'Add to collection', 'checked' => $pc->permissions['collection']])
+                </div>
+                <div class="mb-4">
+                    <p class="font-weight-bold mb-1">Enabled features</p>
+
+                    @include('settings.parental-controls.checkbox', ['name' => 'discovery_feeds', 'title' => 'Discovery Feeds', 'checked' => $pc->permissions['discovery_feeds']])
+                    @include('settings.parental-controls.checkbox', ['name' => 'dms', 'title' => 'Direct Messages', 'checked' => $pc->permissions['dms']])
+                    @include('settings.parental-controls.checkbox', ['name' => 'federation', 'title' => 'Federation', 'checked' => $pc->permissions['federation']])
+                </div>
+                <div class="mb-4">
+                    <p class="font-weight-bold mb-1">Preferences</p>
+
+                    @include('settings.parental-controls.checkbox', ['name' => 'hide_network', 'title' => 'Hide my child\'s connections', 'checked' => $pc->permissions['hide_network']])
+                    @include('settings.parental-controls.checkbox', ['name' => 'private', 'title' => 'Make my child\'s account private', 'checked' => $pc->permissions['private']])
+                    @include('settings.parental-controls.checkbox', ['name' => 'hide_cw', 'title' => 'Hide sensitive media', 'checked' => $pc->permissions['hide_cw']])
+                </div>
+            </div>
+            <div class="tab-pane fade" id="pills-details" role="tabpanel" aria-labelledby="pills-details-tab">
+                <div>
+                    <div class="form-group">
+                        <label class="font-weight-bold mb-0">Email address</label>
+                        <input class="form-control" name="email" value="{{ $pc->email }}" disabled>
+                    </div>
+                </div>
+            </div>
+            <div class="tab-pane fade" id="pills-actions" role="tabpanel" aria-labelledby="pills-actions-tab">
+                <div class="d-flex flex-column" style="gap: 2rem;">
+                    @if(!$pc->child_id && !$pc->email_verified_at)
+                    <div>
+                        <p class="lead font-weight-bold mb-0">Cancel Invite</p>
+                        <p class="small text-muted">Cancel the child invite and prevent it from being used.</p>
+                        <a class="btn btn-outline-dark px-5" href="{{ route('settings.pc.cancel-invite', ['id' => $pc->id]) }}"><i class="fas fa-user-minus mr-1"></i> Cancel Invite</a>
+                    </div>
+                    @else
+                    <div>
+                        <p class="lead font-weight-bold mb-0">Stop Managing</p>
+                        <p class="small text-muted">Transition account to a regular account without parental controls.</p>
+                        <a class="btn btn-outline-dark px-5" href="{{ route('settings.pc.stop-managing', ['id' => $pc->id]) }}"><i class="fas fa-user-minus mr-1"></i> Stop Managing Child</a>
+                    </div>
+                    @endif
+                </div>
+            </div>
+        </div>
+    </div>
+
+</div>
+</form>
+@endsection
+
+@push('scripts')
+<script type="text/javascript">
+    @if(request()->has('permissions'))
+    $('#pills-tab button[data-target="#pills-permissions"]').tab('show')
+    @elseif(request()->has('actions'))
+    $('#pills-tab button[data-target="#pills-actions"]').tab('show')
+    @endif
+</script>
+@endpush
diff --git a/resources/views/settings/parental-controls/stop-managing.blade.php b/resources/views/settings/parental-controls/stop-managing.blade.php
new file mode 100644
index 000000000..747339fd8
--- /dev/null
+++ b/resources/views/settings/parental-controls/stop-managing.blade.php
@@ -0,0 +1,32 @@
+@extends('settings.template-vue')
+
+@section('section')
+<form class="d-flex h-100 flex-column" method="post">
+    @csrf
+    <div class="d-flex h-100 flex-column" style="gap: 1rem;">
+        <div class="d-flex justify-content-between align-items-center">
+            <div class="title d-flex align-items-center" style="gap: 1rem;">
+                <p class="mb-0"><a href="{{ $pc->manageUrl() }}?actions"><i class="far fa-chevron-left fa-lg"></i></a></p>
+                <div>
+                    <h3 class="font-weight-bold mb-0">Stop Managing Child</h3>
+                    <p class="small mb-0">Last updated: {{ $pc->updated_at->diffForHumans() }}</p>
+                </div>
+            </div>
+        </div>
+        <div>
+            <hr />
+        </div>
+
+        <div class="d-flex bg-light align-items-center justify-content-center flex-grow-1 flex-column">
+            <p>
+                <i class="far fa-exclamation-triangle fa-3x"></i>
+            </p>
+            <h4>Confirm Stop Managing this Account?</h4>
+            <p>This child account will be transitioned to a regular account without any limitations.</p>
+        </div>
+
+        <button type="submit" class="btn btn-danger btn-block font-weight-bold">Stop Managing</button>
+    </div>
+</form>
+
+@endsection
diff --git a/resources/views/settings/partial/sidebar.blade.php b/resources/views/settings/partial/sidebar.blade.php
index a3837066a..0eadb9773 100644
--- a/resources/views/settings/partial/sidebar.blade.php
+++ b/resources/views/settings/partial/sidebar.blade.php
@@ -1,79 +1,80 @@
-	<div class="col-12 col-md-3">
-		<ul class="nav flex-column settings-nav py-3">
-			<li class="nav-item pl-3 {{request()->is('settings/home')?'active':''}}">
-				<a class="nav-link font-weight-light  text-muted" href="{{route('settings')}}">Account</a>
-			</li>
-			<li class="nav-item pl-3 {{request()->is('settings/accessibility')?'active':''}}">
-				<a class="nav-link font-weight-light text-muted" href="{{route('settings.accessibility')}}">Accessibility</a>
-			</li>
-			<li class="nav-item pl-3 {{request()->is('settings/email')?'active':''}}">
-				<a class="nav-link font-weight-light text-muted" href="{{route('settings.email')}}">Email</a>
-			</li>
-			@if(config('pixelfed.user_invites.enabled'))
-			<li class="nav-item pl-3 {{request()->is('settings/invites*')?'active':''}}">
-				<a class="nav-link font-weight-light text-muted" href="{{route('settings.invites')}}">Invites</a>
-			</li>
-			@endif
-			<li class="nav-item pl-3 {{request()->is('settings/media*')?'active':''}}">
-				<a class="nav-link font-weight-light text-muted" href="{{route('settings.media')}}">Media</a>
-			</li>
-			<li class="nav-item pl-3 {{request()->is('settings/notifications')?'active':''}}">
-				<a class="nav-link font-weight-light text-muted" href="{{route('settings.notifications')}}">Notifications</a>
-			</li>
-			<li class="nav-item pl-3 {{request()->is('settings/password')?'active':''}}">
-				<a class="nav-link font-weight-light text-muted" href="{{route('settings.password')}}">Password</a>
-			</li>
-			<li class="nav-item pl-3 {{request()->is('settings/privacy*')?'active':''}}">
-				<a class="nav-link font-weight-light text-muted" href="{{route('settings.privacy')}}">Privacy</a>
-			</li>
-			<li class="nav-item pl-3 {{request()->is('settings/relationships*')?'active':''}}">
-				<a class="nav-link font-weight-light text-muted" href="{{route('settings.relationships')}}">Relationships</a>
-			</li>
-			<li class="nav-item pl-3 {{request()->is('settings/security*')?'active':''}}">
-				<a class="nav-link font-weight-light text-muted" href="{{route('settings.security')}}">Security</a>
-			</li>
-			<li class="nav-item pl-3 {{request()->is('settings/timeline*')?'active':''}}">
-				<a class="nav-link font-weight-light text-muted" href="{{route('settings.timeline')}}">Timelines</a>
-			</li>
-			<li class="nav-item">
-				<hr>
-			</li>
-			<li class="nav-item pl-3 {{request()->is('*import*')?'active':''}}">
-				<a class="nav-link font-weight-light text-muted" href="{{route('settings.import')}}">Import</a>
-			</li>
-			<li class="nav-item pl-3 {{request()->is('settings/data-export')?'active':''}}">
-				<a class="nav-link font-weight-light text-muted" href="{{route('settings.dataexport')}}">Export</a>
-			</li>
+    <div class="col-12 col-md-3">
+        <ul class="nav flex-column settings-nav py-3">
+            <li class="nav-item pl-3 {{request()->is('settings/home')?'active':''}}">
+                <a class="nav-link font-weight-light  text-muted" href="{{route('settings')}}">Account</a>
+            </li>
+            <li class="nav-item pl-3 {{request()->is('settings/accessibility')?'active':''}}">
+                <a class="nav-link font-weight-light text-muted" href="{{route('settings.accessibility')}}">Accessibility</a>
+            </li>
+            <li class="nav-item pl-3 {{request()->is('settings/email')?'active':''}}">
+                <a class="nav-link font-weight-light text-muted" href="{{route('settings.email')}}">Email</a>
+            </li>
+            {{-- @if(config('pixelfed.user_invites.enabled'))
+            <li class="nav-item pl-3 {{request()->is('settings/invites*')?'active':''}}">
+                <a class="nav-link font-weight-light text-muted" href="{{route('settings.invites')}}">Invites</a>
+            </li>
+            @endif --}}
+            <li class="nav-item pl-3 {{request()->is('settings/media*')?'active':''}}">
+                <a class="nav-link font-weight-light text-muted" href="{{route('settings.media')}}">Media</a>
+            </li>
+            {{-- <li class="nav-item pl-3 {{request()->is('settings/notifications')?'active':''}}">
+                <a class="nav-link font-weight-light text-muted" href="{{route('settings.notifications')}}">Notifications</a>
+            </li> --}}
+            <li class="nav-item pl-3 {{request()->is('settings/password')?'active':''}}">
+                <a class="nav-link font-weight-light text-muted" href="{{route('settings.password')}}">Password</a>
+            </li>
+            <li class="nav-item pl-3 {{request()->is('settings/privacy*')?'active':''}}">
+                <a class="nav-link font-weight-light text-muted" href="{{route('settings.privacy')}}">Privacy</a>
+            </li>
+            <li class="nav-item pl-3 {{request()->is('settings/relationships*')?'active':''}}">
+                <a class="nav-link font-weight-light text-muted" href="{{route('settings.relationships')}}">Relationships</a>
+            </li>
+            <li class="nav-item pl-3 {{request()->is('settings/security*')?'active':''}}">
+                <a class="nav-link font-weight-light text-muted" href="{{route('settings.security')}}">Security</a>
+            </li>
+            <li class="nav-item pl-3 {{request()->is('settings/timeline*')?'active':''}}">
+                <a class="nav-link font-weight-light text-muted" href="{{route('settings.timeline')}}">Timelines</a>
+            </li>
+            <li class="nav-item">
+                <hr>
+            </li>
 
-			@if(config_cache('pixelfed.oauth_enabled') == true)
-			<li class="nav-item">
-			<hr>
-			</li>
-			<li class="nav-item pl-3 {{request()->is('settings/applications')?'active':''}}">
-				<a class="nav-link font-weight-light text-muted" href="{{route('settings.applications')}}">Applications</a>
-			</li>
-			<li class="nav-item pl-3 {{request()->is('settings/developers')?'active':''}}">
-				<a class="nav-link font-weight-light text-muted" href="{{route('settings.developers')}}">Developers</a>
-			</li>
-			@endif
+            @if((bool) config_cache('pixelfed.oauth_enabled') == true)
+            <li class="nav-item pl-3 {{request()->is('settings/applications')?'active':''}}">
+                <a class="nav-link font-weight-light text-muted" href="{{route('settings.applications')}}">Applications</a>
+            </li>
+            <li class="nav-item pl-3 {{request()->is('settings/developers')?'active':''}}">
+                <a class="nav-link font-weight-light text-muted" href="{{route('settings.developers')}}">Developers</a>
+            </li>
+            @endif
 
-			<li class="nav-item">
-			<hr>
-			</li>
-			<li class="nav-item pl-3 {{request()->is('settings/labs*')?'active':''}}">
-				<a class="nav-link font-weight-light text-muted" href="{{route('settings.labs')}}">Labs</a>
-			</li>
-		</ul>
-	</div>
+            <li class="nav-item pl-3 {{request()->is('*import*')?'active':''}}">
+                <a class="nav-link font-weight-light text-muted" href="{{route('settings.import')}}">Import</a>
+            </li>
+            <li class="nav-item pl-3 {{request()->is('settings/data-export')?'active':''}}">
+                <a class="nav-link font-weight-light text-muted" href="{{route('settings.dataexport')}}">Export</a>
+            </li>
 
-	@push('styles')
-	<style type="text/css">
-		.settings-nav {
-			@media only screen and (min-width: 768px) {
-				border-right: 1px solid #dee2e6 !important
-			}
-			height: 100%;
-			flex-grow: 1;
-		}
-	</style>
-	@endpush
+            <li class="nav-item pl-3 {{request()->is('settings/labs*')?'active':''}}">
+                <a class="nav-link font-weight-light text-muted" href="{{route('settings.labs')}}">Labs</a>
+            </li>
+
+            @if(config('instance.parental_controls.enabled'))
+            <li class="nav-item pl-3 {{request()->is('settings/parental-controls*')?'active':''}}">
+                <a class="nav-link font-weight-light text-muted" href="{{route('settings.parental-controls')}}">Parental Controls</a>
+            </li>
+            @endif
+        </ul>
+    </div>
+
+    @push('styles')
+    <style type="text/css">
+        .settings-nav {
+            @media only screen and (min-width: 768px) {
+                border-right: 1px solid #dee2e6 !important
+            }
+            height: 100%;
+            flex-grow: 1;
+        }
+    </style>
+    @endpush
diff --git a/resources/views/settings/privacy.blade.php b/resources/views/settings/privacy.blade.php
index 57f83c664..9a0ca36a2 100644
--- a/resources/views/settings/privacy.blade.php
+++ b/resources/views/settings/privacy.blade.php
@@ -8,8 +8,9 @@
   <hr>
   <div class="form-group pb-1">
     <p>
-      <a class="btn btn-outline-secondary py-0 font-weight-bold" href="{{route('settings.privacy.muted-users')}}">Muted Users</a>
-      <a class="btn btn-outline-secondary py-0 font-weight-bold" href="{{route('settings.privacy.blocked-users')}}">Blocked Users</a>
+      <a class="btn btn-link py-0 font-weight-bold" href="{{route('settings.privacy.muted-users')}}">{{ __('profile.mutedAccounts') }}</a>
+      <a class="btn btn-link py-0 font-weight-bold" href="{{route('settings.privacy.blocked-users')}}">{{ __('profile.blockedAccounts') }}</a>
+      <a class="btn btn-link py-0 font-weight-bold" href="{{route('settings.privacy.domain-blocks')}}">{{ __('profile.blockedDomains') }}</a>
     </p>
   </div>
   <form method="post">
@@ -96,6 +97,14 @@
       <p class="text-muted small help-text">Display following count on profile</p>
     </div>
 
+    <div class="form-check pb-3">
+      <input class="form-check-input" type="checkbox" name="disable_embeds" id="disable_embeds" {{$settings->disable_embeds ? 'checked=""':''}}>
+      <label class="form-check-label font-weight-bold" for="disable_embeds">
+        {{__('Disable Embeds')}}
+      </label>
+      <p class="text-muted small help-text">Disable post and profile embeds</p>
+    </div>
+
     @if(!$settings->is_private)
     <div class="form-check pb-3">
       <input class="form-check-input" type="checkbox" name="show_atom" id="show_atom" {{$settings->show_atom ? 'checked=""':''}}>
diff --git a/resources/views/settings/privacy/blocked.blade.php b/resources/views/settings/privacy/blocked.blade.php
index e3b2eab2b..8906eae7d 100644
--- a/resources/views/settings/privacy/blocked.blade.php
+++ b/resources/views/settings/privacy/blocked.blade.php
@@ -2,40 +2,36 @@
 
 @section('section')
 
-  <div class="title">
-    <h3 class="font-weight-bold">Blocked Users</h3>
-  </div>
-  <hr>
-  <div class="form-group pb-1">
-    <p>
-      <a class="btn btn-outline-secondary py-0 font-weight-bold" href="{{route('settings.privacy.muted-users')}}">Muted Users</a>
-      <a class="btn btn-outline-primary py-0 font-weight-bold" href="{{route('settings.privacy.blocked-users')}}">Blocked Users</a>
-      {{-- <a class="btn btn-outline-secondary py-0 font-weight-bold" href="{{route('settings.privacy.blocked-keywords')}}">Blocked keywords</a>
-      <a class="btn btn-outline-secondary py-0 font-weight-bold" href="{{route('settings.privacy.blocked-instances')}}">Blocked instances</a> --}}
-    </p>
-  </div>
-  @if($users->count() > 0)
-  <ul class="list-group list-group-flush">
-    @foreach($users as $user)
-    <li class="list-group-item">
-      <div class="d-flex justify-content-between align-items-center font-weight-bold">
-        <span><a href="{{$user->url()}}" class="text-decoration-none text-dark"><img class="rounded-circle mr-3" src="{{$user->avatarUrl()}}" width="32px">{{$user->username}}</a></span>
-        <span class="btn-group">
-          <form method="post">
-            @csrf
-            <input type="hidden" name="profile_id" value="{{$user->id}}">
-            <button type="submit" class="btn btn-outline-secondary btn-sm px-3 font-weight-bold">Unblock</button>
-          </form>
-        </span>
-      </div> 
-    </li>
-    @endforeach
-  </ul>
-  <div class="d-flex justify-content-center mt-3 font-weight-bold">
-    {{$users->links()}}
-  </div>
-  @else
-  <p class="lead">You are not blocking any accounts.</p>
-  @endif
+<div class="d-flex justify-content-between align-items-center">
+    <div class="title d-flex align-items-center" style="gap: 1rem;">
+        <p class="mb-0"><a href="/settings/privacy"><i class="far fa-chevron-left fa-lg"></i></a></p>
+        <h3 class="font-weight-bold mb-0">Blocked Accounts</h3>
+    </div>
+</div>
+<hr />
 
-@endsection
\ No newline at end of file
+@if($users->count() > 0)
+<div class="list-group">
+    @foreach($users as $user)
+    <div class="list-group-item">
+        <div class="d-flex justify-content-between align-items-center font-weight-bold">
+            <span><a href="{{$user->url()}}" class="text-decoration-none text-dark"><img class="rounded-circle mr-3" src="{{$user->avatarUrl()}}" width="32px" onerror="this.onerror=null;this.src='/storage/avatars/default.jpg?v=0';">{{$user->username}}</a></span>
+            <span class="btn-group">
+                <form method="post">
+                    @csrf
+                    <input type="hidden" name="profile_id" value="{{$user->id}}">
+                    <button type="submit" class="btn btn-link btn-sm px-3 font-weight-bold">Unblock</button>
+                </form>
+            </span>
+        </div>
+    </div>
+    @endforeach
+</div>
+<div class="d-flex justify-content-center mt-3 font-weight-bold">
+    {{$users->links()}}
+</div>
+@else
+<p class="lead text-center font-weight-bold">You are not blocking any accounts.</p>
+@endif
+
+@endsection
diff --git a/resources/views/settings/privacy/domain-blocks.blade.php b/resources/views/settings/privacy/domain-blocks.blade.php
new file mode 100644
index 000000000..1602527ec
--- /dev/null
+++ b/resources/views/settings/privacy/domain-blocks.blade.php
@@ -0,0 +1,274 @@
+@extends('settings.template-vue')
+
+@section('section')
+<div>
+    <div class="d-flex justify-content-between align-items-center">
+        <div class="title d-flex align-items-center" style="gap: 1rem;">
+            <p class="mb-0"><a href="/settings/privacy"><i class="far fa-chevron-left fa-lg"></i></a></p>
+            <h3 class="font-weight-bold mb-0">Domain Blocks</h3>
+        </div>
+    </div>
+
+    <p class="mt-3 mb-n2 small">You can block entire domains, this prevents users on that instance from interacting with your content and from you seeing content from that domain on public feeds.</p>
+
+    <hr />
+
+    <div v-if="!loaded" class="d-flex justify-content-center align-items-center flex-grow-1">
+        <b-spinner />
+    </div>
+
+    <div v-else>
+        <div class="mb-3 d-flex flex-column flex-md-row justify-content-between align-items-center" style="gap: 2rem;">
+            <div style="width: 60%;">
+                <div class="input-group align-items-center">
+                    <input class="form-control form-control-sm rounded-lg" v-model="q" placeholder="Search by domain..." style="padding-right: 60px;" :disabled="!blocks || !blocks.length">
+                    <div style="margin-left: -60px;width: 60px;z-index:3">
+                        <button class="btn btn-link" type="button" style="font-size: 12px;text-decoration: none;" v-html="q && q.length ? 'Clear': '&nbsp;'" @click="searchAction()"></button>
+                    </div>
+                </div>
+            </div>
+
+            <button type="button" class="btn btn-outline-primary btn-sm font-weight-bold px-3 flex-grow" @click="openModal">
+                <i class="fas fa-plus mr-1"></i> New Block
+            </button>
+        </div>
+        <div v-if="blocks && blocks.length" class="list-group">
+            <div
+                v-for="(item, idx) in chunks[index]"
+                class="list-group-item">
+                <div class="d-flex justify-content-between align-items-center font-weight-bold">
+                <span>
+                    <span v-text="item"></span>
+                </span>
+                <span class="btn-group">
+                    <button type="button" class="btn btn-link btn-sm px-3 font-weight-bold" @click="handleUnblock(item)">Unblock</button>
+                </span>
+                </div>
+            </div>
+        </div>
+
+        <nav v-if="blocks && blocks.length && chunks && chunks.length > 1" class="mt-3" aria-label="Domain block pagination">
+            <ul class="pagination justify-content-center" style="gap: 1rem">
+                <li
+                    class="page-item"
+                    :class="[ !index ? 'disabled' : 'font-weight-bold' ]"
+                    :disabled="!index"
+                    @click="paginate('prev')">
+                    <span class="page-link px-5 rounded-lg">Previous</span>
+                </li>
+                <li
+                    class="page-item"
+                    :class="[ index + 1 === chunks.length ? 'disabled' : 'font-weight-bold' ]"
+                    @click="paginate('next')">
+                    <span class="page-link px-5 rounded-lg" href="#">Next</span>
+                </li>
+            </ul>
+        </nav>
+
+        <div v-if="!blocks || !blocks.length">
+            <hr />
+            <p class="lead text-center font-weight-bold">You are not blocking any domains.</p>
+        </div>
+    </div>
+</div>
+@endsection
+
+@push('scripts')
+<script type="text/javascript">
+    let app = new Vue({
+        el: '#content',
+
+        data: {
+            loaded: false,
+            q: undefined,
+            blocks: [],
+            filteredBlocks: [],
+            chunks: [],
+            index: 0,
+            pagination: [],
+        },
+
+        watch: {
+            q: function(newVal, oldVal) {
+                this.filterResults(newVal)
+            }
+        },
+
+        mounted() {
+            this.fetchBlocks()
+        },
+
+        methods: {
+            fetchBlocks() {
+                axios.get('/api/v1/domain_blocks', { params: { 'limit': 200 }})
+                .then(res => {
+                    let pages = false
+                    if(res.headers?.link) {
+                        pages = this.parseLinkHeader(res.headers['link'])
+                    }
+                    this.blocks = res.data
+                    if(!pages || !pages.hasOwnProperty('next')) {
+                        this.buildList()
+                    } else {
+                        this.handlePagination(pages)
+                    }
+                })
+                .catch(err => {
+                    console.log(err.response)
+                })
+            },
+
+            handlePagination(pages) {
+                if(!pages || !pages.hasOwnProperty('next')) {
+                    this.buildList()
+                    return
+                }
+                this.pagination = pages
+                this.fetchPagination()
+            },
+
+            buildList() {
+                this.index = 0
+                this.chunks = this.chunkify(this.blocks)
+                this.loaded = true
+            },
+
+            buildSearchList() {
+                this.index = 0
+                this.chunks = this.chunkify(this.filteredBlocks)
+                this.loaded = true
+            },
+
+            fetchPagination() {
+                axios.get(this.pagination.next)
+                .then(res => {
+                    let pages = false
+                    if(res.headers?.link) {
+                        pages = this.parseLinkHeader(res.headers['link'])
+                    }
+                    this.blocks.push(...res.data)
+                    if(!pages || !pages.hasOwnProperty('next')) {
+                        this.buildList()
+                    } else {
+                        this.handlePagination(pages)
+                    }
+                })
+                .catch(err => {
+                    this.buildList()
+                })
+            },
+
+            handleUnblock(domain) {
+                this.loaded = false
+                axios.delete('/api/v1/domain_blocks', {
+                    params: {
+                        domain: domain
+                    }
+                })
+                .then(res => {
+                    this.blocks = this.blocks.filter(d => d != domain)
+                    this.buildList()
+                })
+                .catch(err => {
+                    this.buildList()
+                })
+            },
+
+            filterResults(query) {
+                this.loaded = false
+                let formattedQuery = query.trim().toLowerCase()
+                this.filteredBlocks = this.blocks.filter(domain => domain.toLowerCase().startsWith(formattedQuery))
+                this.buildSearchList()
+            },
+
+            searchAction($event) {
+                event.currentTarget.blur()
+                this.q = ''
+            },
+
+            openModal() {
+                swal({
+                    title: 'Domain Block',
+                    text: 'Add domain to block, must start with https://',
+                    content: "input",
+                    button: {
+                        text: "Block",
+                        closeModal: false,
+                    }
+                }).then(val => {
+                    if (!val) {
+                        swal.stopLoading()
+                        swal.close()
+                        return
+                    }
+
+                    axios.post('/api/v1/domain_blocks', { domain: val })
+                    .then(res => {
+                        let parsedUrl = new URL(val)
+                        swal.stopLoading()
+                        swal.close()
+                        this.index = 0
+                        if(this.blocks.indexOf(parsedUrl.hostname) === -1) {
+                            this.blocks.unshift(parsedUrl.hostname)
+                        }
+                        this.buildList()
+                    })
+                    .catch(err => {
+                        swal.stopLoading()
+                        swal.close()
+                        if(err.response?.data?.message || err.response?.data?.error) {
+                            swal('Error', err.response?.data?.message ?? err.response?.data?.error, 'error')
+                        }
+                    })
+                })
+            },
+
+            chunkify(arr, len = 10) {
+                var chunks = [],
+                    i = 0,
+                    n = arr.length
+
+                while (i < n) {
+                    chunks.push(arr.slice(i, i += len))
+                }
+
+                return chunks
+            },
+
+            paginate(dir) {
+                if(dir === 'prev' && this.index > 0) {
+                    this.index--
+                    return
+                }
+
+                if(dir === 'next' && this.index + 1 < this.chunks.length) {
+                    this.index++
+                    return
+                }
+            },
+
+            parseLinkHeader(linkHeader) {
+                const links = {}
+
+                if (!linkHeader) {
+                    return links
+                }
+
+                linkHeader.split(',').forEach(part => {
+                    const match = part.match(/<([^>]+)>;\s*rel="([^"]+)"/)
+                    if (match) {
+                        const url = match[1]
+                        const rel = match[2]
+
+                        if (rel === 'prev' || rel === 'next') {
+                            links[rel] = url
+                        }
+                    }
+                })
+
+                return links
+            }
+        }
+    })
+</script>
+@endpush
diff --git a/resources/views/settings/privacy/muted.blade.php b/resources/views/settings/privacy/muted.blade.php
index a13b9b716..152b8d641 100644
--- a/resources/views/settings/privacy/muted.blade.php
+++ b/resources/views/settings/privacy/muted.blade.php
@@ -1,41 +1,35 @@
 @extends('settings.template')
 
 @section('section')
-
-  <div class="title">
-    <h3 class="font-weight-bold">Muted Users</h3>
-  </div>
-  <hr>
-  <div class="form-group pb-1">
-    <p>
-      <a class="btn btn-outline-primary py-0 font-weight-bold" href="{{route('settings.privacy.muted-users')}}">Muted Users</a>
-      <a class="btn btn-outline-secondary py-0 font-weight-bold" href="{{route('settings.privacy.blocked-users')}}">Blocked Users</a>
-      {{-- <a class="btn btn-outline-secondary py-0 font-weight-bold" href="{{route('settings.privacy.blocked-keywords')}}">Blocked keywords</a>
-      <a class="btn btn-outline-secondary py-0 font-weight-bold" href="{{route('settings.privacy.blocked-instances')}}">Blocked instances</a> --}}
-    </p>
-  </div>
-  @if($users->count() > 0)
-  <ul class="list-group list-group-flush">
+<div class="d-flex justify-content-between align-items-center">
+    <div class="title d-flex align-items-center" style="gap: 1rem;">
+        <p class="mb-0"><a href="/settings/privacy"><i class="far fa-chevron-left fa-lg"></i></a></p>
+        <h3 class="font-weight-bold mb-0">Muted Accounts</h3>
+    </div>
+</div>
+<hr />
+@if($users->count() > 0)
+<div class="list-group">
     @foreach($users as $user)
-    <li class="list-group-item">
-      <div class="d-flex justify-content-between align-items-center font-weight-bold">
-        <span><a href="{{$user->url()}}" class="text-decoration-none text-dark"><img class="rounded-circle mr-3" src="{{$user->avatarUrl()}}" width="32px">{{$user->username}}</a></span>
-        <span class="btn-group">
-          <form method="post">
-            @csrf
-            <input type="hidden" name="profile_id" value="{{$user->id}}">
-            <button type="submit" class="btn btn-outline-secondary btn-sm px-3 font-weight-bold">Unmute</button>
-          </form>
-        </span>
-      </div> 
-    </li>
+    <div class="list-group-item">
+        <div class="d-flex justify-content-between align-items-center font-weight-bold">
+            <span><a href="{{$user->url()}}" class="text-decoration-none text-dark"><img class="rounded-circle mr-3" src="{{$user->avatarUrl()}}" width="32px" onerror="this.onerror=null;this.src='/storage/avatars/default.jpg?v=0';">{{$user->username}}</a></span>
+            <span class="btn-group">
+                <form method="post">
+                    @csrf
+                    <input type="hidden" name="profile_id" value="{{$user->id}}">
+                    <button type="submit" class="btn btn-link btn-sm px-3 font-weight-bold">Unmute</button>
+                </form>
+            </span>
+        </div>
+    </div>
     @endforeach
-  </ul>
-  <div class="d-flex justify-content-center mt-3 font-weight-bold">
+</div>
+<div class="d-flex justify-content-center mt-3 font-weight-bold">
     {{$users->links()}}
-  </div>
-  @else
-  <p class="lead">You are not muting any accounts.</p>
-  @endif
+</div>
+@else
+<p class="lead text-center font-weight-bold">You are not muting any accounts.</p>
+@endif
 
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/settings/relationships/home.blade.php b/resources/views/settings/relationships/home.blade.php
index b246de49c..fcde2b43e 100644
--- a/resources/views/settings/relationships/home.blade.php
+++ b/resources/views/settings/relationships/home.blade.php
@@ -6,18 +6,14 @@
 	<h3 class="font-weight-bold">Relationships</h3>
 </div>
 <hr>
-<ul class="nav nav-pills">
-	<li class="nav-item">
-		<a class="nav-link font-weight-bold {{!request()->has('mode') || $mode == 'followers' ? 'active' : ''}}" href="?mode=followers&page=1">Followers</a>
-	</li>
-	<li class="nav-item">
-		<a class="nav-link font-weight-bold {{$mode == 'following' ? 'active' : ''}}" href="?mode=following&page=1">Following</a>
-	</li>
-	<li class="nav-item">
-		<a class="nav-link font-weight-bold {{$mode == 'hashtags' ? 'active' : ''}}" href="?mode=hashtags&page=1">Hashtags</a>
-	</li>
-</ul>
-<hr>
+<div class="form-group pb-1">
+    <p>
+        <a class="btn py-0 btn-link {{!request()->has('mode') || $mode == 'followers' ? 'font-weight-bold' : 'text-muted'}}" href="?mode=followers&page=1">Followers</a>
+        <a class="btn btn-link py-0  {{$mode == 'following' ? 'font-weight-bold' : 'text-muted'}}" href="?mode=following&page=1">Following</a>
+        <a class="btn btn-link py-0 {{$mode == 'hashtags' ? 'font-weight-bold' : 'text-muted'}}" href="?mode=hashtags&page=1">Hashtags</a>
+    </p>
+</div>
+
 @if(empty($data))
 <p class="text-center lead pt-5 mt-5">You are not {{$mode == 'hashtags' ? 'following any hashtags.' : ($mode == 'following' ? 'following anyone.' : 'followed by anyone.')}}</p>
 @else
@@ -149,9 +145,7 @@
 				break;
 
 				case 'unfollowhashtag':
-				axios.post('/api/local/discover/tag/subscribe', {
-					name: id
-				}).then(res => {
+				axios.post('/api/v1/tags/' + id + '/unfollow').then(res => {
 					swal(
 						'Unfollow Successful',
 						'You have successfully unfollowed that hashtag',
diff --git a/resources/views/settings/template-vue.blade.php b/resources/views/settings/template-vue.blade.php
new file mode 100644
index 000000000..adcbb34c2
--- /dev/null
+++ b/resources/views/settings/template-vue.blade.php
@@ -0,0 +1,37 @@
+@extends('layouts.app')
+
+@section('content')
+@if (session('status'))
+<div class="alert alert-primary px-3 h6 text-center">
+    {{ session('status') }}
+</div>
+@endif
+@if ($errors->any())
+<div class="alert alert-danger px-3 h6 text-center">
+    @foreach($errors->all() as $error)
+    <p class="font-weight-bold mb-1">{{ $error }}</p>
+    @endforeach
+</div>
+@endif
+@if (session('error'))
+<div class="alert alert-danger px-3 h6 text-center">
+    {{ session('error') }}
+</div>
+@endif
+
+<div class="container">
+    <div class="col-12">
+        <div class="card shadow-none border mt-5">
+            <div class="card-body p-0">
+                <div class="row">
+                    @include('settings.partial.sidebar')
+                    <div class="col-12 col-md-9 p-5">
+                        @yield('section')
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+@endsection
diff --git a/resources/views/site/contact.blade.php b/resources/views/site/contact.blade.php
index 984752f30..2ea96554e 100644
--- a/resources/views/site/contact.blade.php
+++ b/resources/views/site/contact.blade.php
@@ -10,38 +10,38 @@
     @auth
     <p class="lead">
       @if(config('instance.email') && config('instance.contact.enabled'))
-        You can contact the admins by sending an email to <span class="font-weight-bold">{{config('instance.email')}}</span> or by using the form below.
+        {{__('site.you_can_contact_the_admins')}} {{__('site.by_sending_an_email_to')}} <span class="font-weight-bold">{{config('instance.email')}}</span> {{__('site.or')}} {{__('site.by_using_the_form_below')}}.
       @elseif(config('instance.email') && !config('instance.contact.enabled'))
-        You can contact the admins by sending an email to <span class="font-weight-bold">{{config('instance.email')}}</span>.
+        {{__('site.you_can_contact_the_admins')}} {{__('site.by_sending_an_email_to')}} <span class="font-weight-bold">{{config('instance.email')}}</span>.
       @elseif(!config('instance.email') && config('instance.contact.enabled'))
-       You can contact the admins by using the form below.
+       {{__('site.you_can_contact_the_admins')}} {{__('site.by_using_the_form_below')}}.
       @else
-        The admins have not set a contact email address.
+       {{__('the_admins_have_not_set_a_contact_email_address')}}
       @endif
     </p>
     @if(config('instance.contact.enabled'))
   	<form method="POST">
       @csrf
   		<div class="form-group">
-  			<label for="input1" class="font-weight-bold">Message</label>
+  			<label for="input1" class="font-weight-bold">{{__('site.Message')}}</label>
   			<textarea class="form-control" id="input1" name="message" rows="6" placeholder="" maxlength="500" required>{{old('message')}}</textarea>
   			<span class="form-text text-muted text-right msg-counter">0/500</span>
   		</div>
 		<div class="form-group form-check">
 			<input type="checkbox" class="form-check-input" id="input2" name="request_response">
-			<label class="form-check-label" for="input2">Request response from admins</label>
+			<label class="form-check-label" for="input2">{{__('site.request_response_from_admins')}}</label>
 		</div>
-  		<button type="submit" class="btn btn-primary font-weight-bold py-0">Submit</button>
+  		<button type="submit" class="btn btn-primary font-weight-bold py-0">{{__('site.Submit')}}</button>
   	</form>
     @endif
     @else
     <p class="lead">
       @if(config('instance.email') && config('instance.contact.enabled'))
-        You can contact the admins by sending an email to <span class="font-weight-bold">{{config('instance.email')}}</span> or log in to send a message.
+        {{__('site.you_can_contact_the_admins')}} {{__('site.by_sending_an_email_to')}} <span class="font-weight-bold">{{config('instance.email')}}</span> {{__('site.or')}} {{__('site.log_in_to_send_a_message')}}.
       @elseif (!config('instance.email') && config('instance.contact.enabled'))
-        The admins have not set a contact email address. Please log in to send a message.
+        {{__('the_admins_have_not_set_a_contact_email_address')}}. {{__('site.Please')}} {{__('site.log_in_to_send_a_message')}}.
       @elseif (config('instance.email') && !config('instance.contact.enabled'))
-        You can contact the admins by sending an email to <span class="font-weight-bold">{{config('instance.email')}}</span>.
+        {{__('site.you_can_contact_the_admins')}} {{__('site.by_sending_an_email_to')}} <span class="font-weight-bold">{{config('instance.email')}}</span>.
       @endif
     </p>
     @endauth
diff --git a/resources/views/site/contact/admin-response.blade.php b/resources/views/site/contact/admin-response.blade.php
new file mode 100644
index 000000000..7006d17e7
--- /dev/null
+++ b/resources/views/site/contact/admin-response.blade.php
@@ -0,0 +1,55 @@
+@extends('layouts.blank')
+
+@section('content')
+<div class="container pt-5">
+    <div class="row justify-content-center">
+        <div class="col-12 col-lg-8">
+            <div class="card shadow-none border">
+                <div class="card-header d-flex justify-content-between align-items-center">
+                    <a class="btn btn-link font-weight-bold" href="/i/web">Back to Pixelfed</a>
+                    <h1 class="h4 mb-0">Contact Form Response</h1>
+                    <p class="d-none d-md-block mb-0 text-muted">Ticket ID #{{$contact->id}}</p>
+                </div>
+
+                <div class="list-group list-group-flush">
+                    <div class="list-group-item">
+                        <div class="media">
+                            <img src="{{$contact->user->profile->avatarUrl()}}" class="mr-3 rounded-circle" width="40px" height="40px" onerror="this.onerror=null;this.src='/storage/avatars/default.png?v=2'">
+                            <div class="media-body">
+                                <h5 class="my-0">&commat;{{$contact->user->username}}</h5>
+                                <span class="text-muted">{{$contact->user->name}}</span>
+                            </div>
+                        </div>
+                        <p class="my-2 font-weight-bold">You sent the following inquiry:</p>
+                        <div class="card shadow-none border bg-light rounded mb-2">
+                            <div class="card-body">
+                                {{ $contact->message }}
+                            </div>
+                        </div>
+                        <p class="small text-muted">You sent this inquiry on {{$contact->created_at->format('M d, Y')}} at {{$contact->created_at->format('h:i:s a e')}}</p>
+                    </div>
+
+                    @if($contact->response)
+                    <div class="list-group-item">
+                        <p class="my-2 font-weight-bold">The admin(s) responded to your inquiry:</p>
+                        <div class="card shadow-none border bg-light rounded mb-2">
+                            <div class="card-body">
+                                {{ $contact->response }}
+                            </div>
+                        </div>
+                        @if($contact->responded_at)
+                        <p class="small text-muted">The response was created on {{$contact->responded_at->format('M d, Y')}} at {{$contact->responded_at->format('h:i:s a e')}}</p>
+                        @endif
+                    </div>
+                    <div class="list-group-item">
+                        <div class="text-center">
+                            <p class="mb-0 small text-muted font-weight-bold">If you would like to respond, use the <a href="/site/contact">contact form</a>.</p>
+                        </div>
+                    </div>
+                    @endif
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
diff --git a/resources/views/site/help/account-migration.blade.php b/resources/views/site/help/account-migration.blade.php
new file mode 100644
index 000000000..eda63742c
--- /dev/null
+++ b/resources/views/site/help/account-migration.blade.php
@@ -0,0 +1,19 @@
+@extends('site.help.partial.template', ['breadcrumb'=>'Account Migration'])
+
+@section('section')
+
+    <div class="title">
+        <h3 class="font-weight-bold">Account Migration</h3>
+    </div>
+
+    <hr>
+
+    @if((bool) config_cache('federation.migration') === false)
+    <div class="alert alert-danger">
+        <p class="font-weight-bold mb-0">Account Migration is not available on this server.</p>
+    </div>
+    @endif
+
+    <p class="lead">Account Migration is a feature that allows users to move their account followers from one Pixelfed instance (server) to another.</p>
+    <p class="lead">This can be useful if a user wants to switch to a different instance due to preferences for its community, policies, or features.</p>
+@endsection
diff --git a/resources/views/site/help/curated-onboarding.blade.php b/resources/views/site/help/curated-onboarding.blade.php
new file mode 100644
index 000000000..6a4d980f3
--- /dev/null
+++ b/resources/views/site/help/curated-onboarding.blade.php
@@ -0,0 +1,162 @@
+@extends('site.help.partial.template', ['breadcrumb'=>'Curated Onboarding'])
+
+@section('section')
+<div class="title">
+    <h3 class="font-weight-bold">Curated Onboarding</h3>
+</div>
+<hr>
+@if((bool) config_cache('instance.curated_registration.enabled') == false)
+<div class="card bg-danger mb-3">
+    <div class="card-body">
+        @if((bool) config_cache('pixelfed.open_registration'))
+        <p class="mb-0 text-white font-weight-bold">Curated Onboarding is not available on this server, however anyone can join.</p>
+        <hr>
+        <p class="mb-0 text-center"><a href="/register" class="btn btn-light font-weight-bold rounded-pill">Create New Account</a></p>
+        @else
+        <p class="mb-0 text-white font-weight-bold">Curated Onboarding is not available on this server.</p>
+        @endif
+    </div>
+</div>
+@endif
+<p class="lead font-weight-bold">Curated Onboarding is our innovative approach to ensure each new member is a perfect fit for our community.</p>
+<p class="lead font-weight-light">This process goes beyond the usual sign-up routine. It's a thoughtful method to understand each applicant's intentions and aspirations within our platform.</p>
+<p class="lead font-weight-light">If you're excited to be a part of a platform that values individuality, creativity, and community, we invite you to apply to join our community. Share with us your story, and let's embark on this visual journey together!</p>
+@if((bool) config_cache('instance.curated_registration.enabled') && !request()->user())
+<p class="text-center pt-3">
+    <a class="btn btn-outline-primary rounded-pill btn-lg font-weight-bold px-5" href="{{ route('auth.curated-onboarding') }}">Apply to Join <i class="far fa-arrow-right ml-2"></i></a>
+</p>
+@endif
+<hr class="my-5">
+<h5 class="text-center text-muted font-weight-light my-5">How does Curated Onboarding work?</h5>
+<ol>
+    <li>
+        <p class="h5 font-weight-bold mb-2">Application Submission</p>
+        <p style="font-size: 16px;line-height: 1.7;">Start your journey by providing your username and email, along with a personal note about why you're excited to join Pixelfed. This insight into your interests and aspirations helps us get to know you better.</p>
+    </li>
+    <hr class="my-5">
+    <li>
+        <p class="h5 font-weight-bold mb-2">Admin Review and Interaction</p>
+        <p style="font-size: 16px;line-height: 1.7;">Our team carefully reviews each application, assessing your fit within our community. If we're intrigued but need more information, we'll reach out directly. You'll receive an email with a link to a special form where you can view our request and respond in detail. This two-way communication ensures a thorough and fair evaluation process.</p>
+    </li>
+    <hr class="my-5">
+    <li>
+        <p class="h5 font-weight-bold mb-2">Decision – Acceptance or Rejection</p>
+        <p style="font-size: 16px;line-height: 1.7;">Each application is thoughtfully considered. If you're a match for our community, you'll be greeted with a warm welcome email and instructions to activate your account. If your application is not accepted, we will inform you respectfully, leaving the possibility open for future applications.</p>
+    </li>
+</ol>
+<hr class="my-5">
+<h5 class="text-center text-muted font-weight-light my-5">Why Curated Onboarding?</h5>
+<ul>
+    <li>
+        <p class="h5 font-weight-bold mb-2">Fostering Quality Connections</p>
+        <p style="font-size: 16px;line-height: 1.7;">At Pixelfed, we believe in the power of meaningful connections. It's not just about how many people are in the community, but how they enrich and enliven our platform. Our curated onboarding process is designed to welcome members who share our enthusiasm for creativity and engagement, ensuring every interaction on Pixelfed is enjoyable and rewarding.</p>
+    </li>
+    <hr class="my-5">
+    <li>
+        <p class="h5 font-weight-bold mb-2">Ensuring Safety and Respect</p>
+        <p style="font-size: 16px;line-height: 1.7;">A careful onboarding process is critical for maintaining a safe and respectful environment. It allows Pixelfed to align every new member with the platform's values of kindness and inclusivity.</p>
+    </li>
+    <hr class="my-5">
+    <li>
+        <p class="h5 font-weight-bold mb-2">Encouraging Community Engagement</p>
+        <p style="font-size: 16px;line-height: 1.7;">By engaging with applicants from the start, Pixelfed fosters a community that's not just active but passionate. This approach welcomes users who are genuinely interested in making a positive contribution to Pixelfed's vibrant community.</p>
+    </li>
+</ul>
+<hr class="my-5">
+<h5 class="text-center text-muted font-weight-light my-5">FAQs & Troubleshooting</h5>
+<p>
+    <a class="text-dark font-weight-bold" data-toggle="collapse" href="#collapse1" role="button" aria-expanded="false" aria-controls="collapse1">
+        <i class="fas fa-chevron-down mr-2"></i>
+        "You have re-attempted too many times."
+    </a>
+    <div class="collapse mb-5" id="collapse1">
+        <div>
+            This indicates that you've attempted to verify your email address too many times. This most likely is the result of an issue delivering the verification emails to your email provider. If you are experiencing this issue, we suggest that you <a href="/site/contact">contact the admin onboarding team</a> and mention that you're having issues verifying your email address.
+        </div>
+    </div>
+</p>
+<p>
+    <a class="text-dark font-weight-bold" data-toggle="collapse" href="#collapse2" role="button" aria-expanded="false" aria-controls="collapse2">
+        <i class="fas fa-chevron-down mr-2"></i>
+        I haven't recieved the email confirmation
+    </a>
+    <div class="collapse mb-5" id="collapse2">
+        <div>
+            This indicates the desired username is already in-use or was previously used by a now deleted account. You need to pick a different username.
+        </div>
+    </div>
+</p>
+<p>
+    <a class="text-dark font-weight-bold" data-toggle="collapse" href="#collapse3" role="button" aria-expanded="false" aria-controls="collapse3">
+        <i class="fas fa-chevron-down mr-2"></i>
+        "Email is invalid."
+    </a>
+    <div class="collapse mb-5" id="collapse3">
+        <div>
+            This indicates the desired email is not supported. While it may be a valid email, admins may have blocked specific domains from being associated with account email addresses.
+        </div>
+    </div>
+</p>
+<p>
+    <a class="text-dark font-weight-bold" data-toggle="collapse" href="#collapse4" role="button" aria-expanded="false" aria-controls="collapse4">
+        <i class="fas fa-chevron-down mr-2"></i>
+        "The username has already been taken."
+    </a>
+    <div class="collapse mb-5" id="collapse4">
+        <div>
+            This indicates the desired username is already in-use or was previously used by a now deleted account. You need to pick a different username.
+        </div>
+    </div>
+</p>
+<p>
+    <a class="text-dark font-weight-bold" data-toggle="collapse" href="#collapse5" role="button" aria-expanded="false" aria-controls="collapse5">
+        <i class="fas fa-chevron-down mr-2"></i>
+        "Username is invalid. Can only contain one dash (-), period (.) or underscore (_)."
+    </a>
+    <div class="collapse mb-5" id="collapse5">
+        <div>
+            This indicates the desired username is not a valid format, usernames may only contain one dash (-), period (.) or underscore (_) and must start with a letter or number.
+        </div>
+    </div>
+</p>
+<p>
+    <a class="text-dark font-weight-bold" data-toggle="collapse" href="#collapse6" role="button" aria-expanded="false" aria-controls="collapse6">
+        <i class="fas fa-chevron-down mr-2"></i>
+        "The reason must be at least 20 characters."
+    </a>
+    <div class="collapse mb-5" id="collapse6">
+        <div>
+            This indicates the reason you provided for joining is less than the minimum accepted characters. The reason should be atleast 20 characters long, up to 1000 characters. If you desire to share a longer reason than 1000 characters, consider using a pastebin and posting the link. We can't guarantee that admins will visit any links you provided, so ideally you can keep the length within 1000 chars.
+        </div>
+    </div>
+</p>
+<p>
+    <a class="text-dark font-weight-bold" data-toggle="collapse" href="#collapse7" role="button" aria-expanded="false" aria-controls="collapse7">
+        <i class="fas fa-chevron-down mr-2"></i>
+        My application was rejected, what can I do now?
+    </a>
+    <div class="collapse mb-5" id="collapse7">
+        <div>
+            <p>We understand that receiving a notification of rejection can be disappointing. Here's what you can consider if your application to join Pixelfed hasn't been successful:</p>
+
+            <ul>
+                <li>
+                    <strong>Review Your Application:</strong> Reflect on the information you provided. Our decision may have been influenced by a variety of factors, including the clarity of your intentions or how well they align with our community values. Consider if there was any additional context or passion for Pixelfed that you could have included.
+                </li>
+                <li>
+                    <strong>Reapply with Updated Information:</strong> We encourage you to reapply if you feel your initial application didn’t fully capture your enthusiasm or alignment with our community values. However, we recommend exercising caution and thoughtfulness. Please take time to refine and enhance your application before resubmitting, as repetitive or frequent submissions can overwhelm our admin team. We value careful consideration and meaningful updates in reapplications, as this helps us maintain a fair and manageable review process for everyone. Your patience and understanding in this regard are greatly appreciated and can positively influence the outcome of future applications.
+                </li>
+                <li>
+                    <strong>Seek Feedback:</strong> If you are seeking clarity on why your application wasn't successful, you're welcome to contact us for feedback. However, please be mindful that our admins handle a high volume of queries and applications. While we strive to provide helpful responses, our ability to offer detailed individual feedback may be limited. We ask for your patience and understanding in this matter. When reaching out, ensure your query is concise and considerate of the admins' time. This approach will help us assist you more effectively and maintain a positive interaction, even if your initial application didn't meet our criteria.
+                </li>
+                <li>
+                    <strong>Stay Engaged:</strong> Even if you're not a member yet, you can stay connected with Pixelfed through our public forums, blog, or social media channels. This will keep you updated on any changes or new features that might make our platform a better fit for you in the future.
+                </li>
+            </ul>
+
+            <p>Remember, a rejection is not necessarily a reflection of your qualities or potential as a member of our community. It's often about finding the right fit at the right time. We appreciate your interest in Pixelfed and hope you won't be discouraged from exploring other ways to engage with our platform.</p>
+            </p>
+        </div>
+    </div>
+</p>
+@endsection
diff --git a/resources/views/site/help/email-confirmation-issues.blade.php b/resources/views/site/help/email-confirmation-issues.blade.php
new file mode 100644
index 000000000..6c1c52cab
--- /dev/null
+++ b/resources/views/site/help/email-confirmation-issues.blade.php
@@ -0,0 +1,16 @@
+@extends('site.help.partial.template', ['breadcrumb'=>'Email Confirmation Issues'])
+
+@section('section')
+<div class="title">
+    <h3 class="font-weight-bold">Email Confirmation Issues</h3>
+</div>
+<hr>
+<p>If you have been redirected to this page, it may be due to one of the following reasons:</p>
+
+<ul>
+    <li>The email confirmation link has already been used.</li>
+    <li>The email confirmation link may have expired, they are only valid for 24 hours.</li>
+    <li>You cannot confirm an email for another account while logged in to a different account. Try logging out, or use a different browser to open the email confirmation link.</li>
+    <li>The account the associated email belongs to may have been deleted, or the account may have changed the email address.</li>
+</ul>
+@endsection
diff --git a/resources/views/site/help/import.blade.php b/resources/views/site/help/import.blade.php
index d4006791f..a4b7d1fc7 100644
--- a/resources/views/site/help/import.blade.php
+++ b/resources/views/site/help/import.blade.php
@@ -13,7 +13,7 @@
     <p class="text-center font-weight-bold">How to get your export data from Instagram:</p>
     <ol class="pb-4">
         <li class="mb-2">
-            <span>Follow the Instagram instructions on <strong>Downloading a copy of your data on Instagram</strong> on <a href="https://help.instagram.com/181231772500920" class="font-weight-bold">this page</a>. <strong class="text-danger small font-weight-bold">Make sure you select the JSON format</strong></span>
+            <span><strong>Download your information in Instagram's Accounts Center</strong> on <a href="https://www.instagram.com/download/request" class="font-weight-bold">this page</a>. <strong class="text-danger small font-weight-bold">Make sure you select the JSON format</strong></span>
         </li>
         <li class="mb-2">
             <span>Wait for the email from Instagram with your download link</span>
diff --git a/resources/views/site/help/parental-controls.blade.php b/resources/views/site/help/parental-controls.blade.php
new file mode 100644
index 000000000..d7b9710dd
--- /dev/null
+++ b/resources/views/site/help/parental-controls.blade.php
@@ -0,0 +1,47 @@
+@extends('site.help.partial.template', ['breadcrumb'=>'Parental Controls'])
+
+@section('section')
+  <div class="title">
+    <h3 class="font-weight-bold">Parental Controls</h3>
+  </div>
+  <hr>
+
+  <p>In the digital age, ensuring your children's online safety is paramount. Designed with both fun and safety in mind, this feature allows parents to create child accounts, tailor-made for a worry-free social media experience.</p>
+
+  <p class="font-weight-bold text-center">Key Features:</p>
+
+  <ul>
+    <li><strong>Child Account Creation</strong>: Easily set up a child account with just a few clicks. This account is linked to your own, giving you complete oversight.</li>
+    <li><strong>Post Control</strong>: Decide if your child can post content. This allows you to ensure they're only sharing what's appropriate and safe.</li>
+    <li><strong>Comment Management</strong>: Control whether your child can comment on posts. This helps in safeguarding them from unwanted interactions and maintaining a positive online environment.</li>
+    <li><strong>Like & Share Restrictions</strong>: You have the power to enable or disable the ability to like and share posts. This feature helps in controlling the extent of your child's social media engagement.</li>
+    <li><strong>Disable Federation</strong>: For added safety, you can choose to disable federation for your child's account, limiting their interaction to a more controlled environment.</li>
+  </ul>
+  <hr>
+
+  <x-collapse title="How do I create a child account?">
+    <div>
+      @if(config('instance.parental_controls.enabled'))
+      <ol>
+        <li>Click <a href="/settings/parental-controls">here</a> and tap on the <strong>Add Child</strong> button in the bottom left corner</li>
+        <li>Select the Allowed Actions, Enabled features and Preferences</li>
+        <li>Enter your childs email address</li>
+        <li>Press the <strong>Add Child</strong> buttton</li>
+        <li>Open your childs email and tap on the <strong>Accept Invite</strong> button in the email, ensure your parent username is present in the email</li>
+        <li>Fill out the child display name, username and password</li>
+        <li>Press <strong>Register</strong> and your child account will be active!</li>
+      </ol>
+      @else
+      <p>This feature has been disabled by server admins.</p>
+      @endif
+    </div>
+  </x-collapse>
+
+@if(config('instance.parental_controls.enabled'))
+  <x-collapse title="How many child accounts can I create/manage?">
+    <div>
+      You can create and manage up to <strong>{{ config('instance.parental_controls.limits.max_children') }}</strong> child accounts.
+    </div>
+  </x-collapse>
+@endif
+@endsection
diff --git a/resources/views/site/help/partial/sidebar.blade.php b/resources/views/site/help/partial/sidebar.blade.php
index e0a82c9d3..1e8c3d68f 100644
--- a/resources/views/site/help/partial/sidebar.blade.php
+++ b/resources/views/site/help/partial/sidebar.blade.php
@@ -33,6 +33,13 @@
       <li class="nav-item {{request()->is('*/import')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('help.import')}}">Instagram Import</a>
       </li>
+      @if((bool) config_cache('instance.curated_registration.enabled'))
+      <li class="nav-item {{request()->is('*/curated-onboarding')?'active':''}}">
+        <a class="nav-link font-weight-light text-muted" href="{{route('help.curated-onboarding')}}">
+          Curated Onboarding
+        </a>
+      </li>
+      @endif
       <li class="nav-item">
         <hr>
       </li>
diff --git a/resources/views/site/help/sharing-media.blade.php b/resources/views/site/help/sharing-media.blade.php
index d429f7406..3fe275d39 100644
--- a/resources/views/site/help/sharing-media.blade.php
+++ b/resources/views/site/help/sharing-media.blade.php
@@ -50,7 +50,7 @@
 		</a>
 		<div class="collapse" id="collapse3">
 			<div>
-				During the compose process, you will see the <span class="font-weight-bold">Caption</span> input. Captions are optional and limited to <span class="font-weight-bold">{{config('pixelfed.max_caption_length')}}</span> characters.
+				During the compose process, you will see the <span class="font-weight-bold">Caption</span> input. Captions are optional and limited to <span class="font-weight-bold">{{config_cache('pixelfed.max_caption_length')}}</span> characters.
 			</div>
 		</div>
 	</p>
diff --git a/resources/views/site/index.blade.php b/resources/views/site/index.blade.php
index e6753a727..b7d3befaa 100644
--- a/resources/views/site/index.blade.php
+++ b/resources/views/site/index.blade.php
@@ -8,7 +8,7 @@
 
 	<meta name="mobile-web-app-capable" content="yes">
 
-	<title>{{ config('app.name', 'Pixelfed') }}</title>
+	<title>{{ config_cache('app.name', 'Pixelfed') }}</title>
 
 	<link rel="canonical" href="{{ request()->url() }}" />
 
diff --git a/resources/views/status/embed-removed.blade.php b/resources/views/status/embed-removed.blade.php
index e5f94525b..b9f0a2df6 100644
--- a/resources/views/status/embed-removed.blade.php
+++ b/resources/views/status/embed-removed.blade.php
@@ -9,8 +9,8 @@
 
 	<title>Pixelfed | 404 Embed Not Found</title>
 
-	<meta property="og:site_name" content="{{ config('app.name', 'pixelfed') }}">
-	<meta property="og:title" content="{{ $title ?? config('app.name', 'pixelfed') }}">
+	<meta property="og:site_name" content="{{ config_cache('app.name', 'pixelfed') }}">
+	<meta property="og:title" content="{{ $title ?? config_cache('app.name', 'pixelfed') }}">
 	<meta name="medium" content="image">
 	<meta name="theme-color" content="#10c5f8">
 	<meta name="apple-mobile-web-app-capable" content="yes">
diff --git a/resources/views/status/embed.blade.php b/resources/views/status/embed.blade.php
index 54d9b7330..7446ee528 100644
--- a/resources/views/status/embed.blade.php
+++ b/resources/views/status/embed.blade.php
@@ -1,172 +1,82 @@
 <!DOCTYPE html>
-<html lang="{{ app()->getLocale() }}">
+<html lang="en">
 <head>
-		
-		<meta charset="utf-8">
-		<meta http-equiv="X-UA-Compatible" content="IE=edge">
-		<meta name="viewport" content="width=device-width, initial-scale=1">
-		<meta name="mobile-web-app-capable" content="yes">
-
-		<title>{{ $title ?? config('app.name', 'Pixelfed') }}</title>
-
-		<meta property="og:site_name" content="{{ config('app.name', 'pixelfed') }}">
-		<meta property="og:title" content="{{ $title ?? config('app.name', 'pixelfed') }}">
-		<meta property="og:type" content="article">
-		<meta property="og:url" content="{{$status->url()}}">
-		<meta name="medium" content="image">
-		<meta name="theme-color" content="#10c5f8">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<link rel="shortcut icon" type="image/png" href="/img/favicon.png?v=2">
-		<link rel="apple-touch-icon" type="image/png" href="/img/favicon.png?v=2">
-		<link href="{{ mix('css/app.css') }}" rel="stylesheet">
-		<style type="text/css">
-			body.embed-card {
-					background: #fff !important;
-					margin: 0;
-					padding-bottom: 0;
-			}
-			.status-card-embed {
-				box-shadow: none;
-				border-radius: 4px;
-				overflow: hidden;
-			}
-		</style>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="mobile-web-app-capable" content="yes">
+    <title>{{ $title ?? config_cache('app.name', 'Pixelfed') }}</title>
+    <meta property="og:site_name" content="{{ config_cache('app.name', 'pixelfed') }}">
+    <meta property="og:title" content="{{ $title ?? config_cache('app.name', 'pixelfed') }}">
+    <meta property="og:type" content="article">
+    <meta property="og:url" content="{{$status['url']}}">
+    <meta name="medium" content="image">
+    <meta name="theme-color" content="#10c5f8">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <link rel="shortcut icon" type="image/png" href="/img/favicon.png?v=2">
+    <link rel="apple-touch-icon" type="image/png" href="/img/favicon.png?v=2">
+    <style type="text/css">hr,p{margin-bottom:1rem}.small,body{font-weight:400}.card,body{display:flex}*,::after,::before{box-sizing:border-box}p{margin-top:0}a{color:#2c78bf;text-decoration:none;background-color:transparent}a:hover{color:#1e5181;text-decoration:underline}img{vertical-align:middle;border-style:none}hr{box-sizing:content-box;height:0;overflow:visible;margin-top:1rem;border:0;border-top:1px solid rgba(0,0,0,.1)}.small{font-size:.875em}.card{position:relative;flex-direction:column;min-width:0;word-wrap:break-word;background-color:#fff;background-clip:border-box;border:1px solid rgba(0,0,0,.125);border-radius:.25rem}.card-body{flex:1 1 auto;min-height:1px;padding:1.25rem}.card-footer,.card-header{padding:.75rem 1.25rem;background-color:#fff}.card-header{margin-bottom:0;border-bottom:1px solid rgba(0,0,0,.125)}.card-header:first-child{border-radius:calc(.25rem - 1px) calc(.25rem - 1px) 0 0}.card-footer{border-top:1px solid rgba(0,0,0,.125)}.card-footer:last-child{border-radius:0 0 calc(.25rem - 1px) calc(.25rem - 1px)}.bg-white{background-color:#fff!important}.border{border:1px solid #dee2e6!important}.d-inline-flex{display:inline-flex!important}.justify-content-between{justify-content:space-between!important}.align-items-center{align-items:center!important}.my-0{margin-top:0!important}.mb-0,.my-0{margin-bottom:0!important}.mb-2{margin-bottom:.5rem!important}.pr-1{padding-right:.25rem!important}.pl-2{padding-left:.5rem!important}.text-uppercase{text-transform:uppercase!important}.font-weight-bold{font-weight:700!important}a.text-dark:focus,a.text-dark:hover{color:#000!important}a.text-muted:focus,a.text-muted:hover{color:#454b50!important}.text-muted{color:#6c757d!important}@media print{*,::after,::before{text-shadow:none!important;box-shadow:none!important}a:not(.btn){text-decoration:underline}img{page-break-inside:avoid}p{orphans:3;widows:3}body{min-width:992px!important}}body{margin:0;font-size:.9rem;line-height:1.6;color:#212529;text-align:left;background-color:rgba(247,251,253,.4705882353);min-height:100vh;flex-flow:column;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Helvetica,Arial,sans-serif}.text-dark{color:#212529!important}@media (max-width:576px){.card-md-rounded-0{border-width:1px 0;border-radius:0!important}}.card{box-shadow:0 2px 6px 0 hsla(0,0%,0%,.2);border:none}.status-card-embed{box-shadow:none;border-radius:4px;overflow:hidden}body.embed-card{background:#fff!important;margin:0;padding-bottom:0}.avatar{border-radius:100%}image-carousel{display:block;position:relative;width:100%;overflow:hidden}image-carousel img{width:100%;display:none}image-carousel img.active{display:block}.carousel-buttons{position:absolute;top:50%;width:100%;display:flex;justify-content:space-between;transform:translateY(-50%);pointer-events:none}.carousel-button{display:flex;justify-content:center;align-items:center;width:40px;height:40px;background:#fff;color:#000;border:1px solid #ccc;border-radius:100%;padding:10px;margin:5px;cursor:none;pointer-events:none;opacity:0;z-index:2;transition:opacity .1s ease-out}.carousel-button.active{cursor:pointer;pointer-events:all}image-carousel:hover .carousel-button.active{opacity:1;transition:opacity .3s ease-out}.carousel-button.prev{align-self:flex-start}.carousel-button.next{align-self:flex-end}.carousel-indicators{position:absolute;bottom:10px;width:100%;display:flex;justify-content:center}.carousel-indicator{background:rgba(0,0,0,.5);border-radius:50%;width:10px;height:10px;margin:0 5px;cursor:pointer;transition:background .1s ease-out}.carousel-indicator.active{background:#fff}
+    </style>
 </head>
 <body class="bg-white">
-	<div class="embed-card">
-	@php($item = $status)
-	<div class="card status-card-embed card-md-rounded-0 border">
-		<div class="card-header d-inline-flex align-items-center bg-white">
-			<img src="{{$item->profile->avatarUrl()}}" width="32px" height="32px" style="border-radius: 32px;">
-			<a class="username font-weight-bold pl-2 text-dark" target="_blank" href="{{$item->profile->url()}}">
-				{{$item->profile->username}}
-			</a>
-		</div>
-		<a href="{{$status->url()}}" target="_blank">
-		@php($status = $item)
-		@switch($status->viewType())
-			@case('photo')
-			@case('image')
-				@if($status->is_nsfw)
-				<details class="details-animated">
-					<summary>
-						<p class="mb-0 lead font-weight-bold">CW / NSFW / Hidden Media</p>
-						<p class="font-weight-light">(click to show)</p>
-					</summary>
-					<a class="max-hide-overflow {{$status->firstMedia()->filter_class}}" href="{{$status->url()}}" target="_blank">
-						<img class="card-img-top" src="{{$status->mediaUrl()}}">
-					</a>
-				</details>
-				@else
-				<div class="{{$status->firstMedia()->filter_class}}">
-					<img src="{{$status->mediaUrl()}}" width="100%">
-				</div>
-				@endif
-			@break
-			@case('photo:album')
-				<div id="photo-carousel-wrapper-{{$status->id}}" class="carousel slide carousel-fade mb-n3 " data-ride="carousel">
-					<ol class="carousel-indicators">
-						@for($i = 0; $i < $status->media_count; $i++)
-						<li data-target="#photo-carousel-wrapper-{{$status->id}}" data-slide-to="{{$i}}" class="{{$i == 0 ? 'active' : ''}}"></li>
-						@endfor
-					</ol>
-					<div class="carousel-inner">
-						@foreach($status->media()->orderBy('order')->get() as $media)
-						<div class="carousel-item {{$loop->iteration == 1 ? 'active' : ''}}">
-							<figure class="{{$media->filter_class}}">
-								<div class="float-right mr-3 badge badge-dark border border-secondary rounded-pill p-2" style="position:absolute;top:8px;right:0;margin-bottom:-20px;">{{$loop->iteration}}/{{$loop->count}}</div>
-								<img class="d-block w-100" src="{{$media->url()}}" alt="{{$status->caption}}">
-							</figure>
-						</div>
-						@endforeach
-					</div>
-					<a class="carousel-control-prev" href="#photo-carousel-wrapper-{{$status->id}}" role="button" data-slide="prev">
-						<span class="carousel-control-prev-icon" aria-hidden="true"></span>
-						<span class="sr-only">Previous</span>
-					</a>
-					<a class="carousel-control-next" href="#photo-carousel-wrapper-{{$status->id}}" role="button" data-slide="next">
-						<span class="carousel-control-next-icon" aria-hidden="true"></span>
-						<span class="sr-only">Next</span>
-					</a>
-				</div>
-			@break
-			@case('video')
-				@if($status->is_nsfw)
-				<details class="details-animated">
-					<summary>
-						<p class="mb-0 lead font-weight-bold">CW / NSFW / Hidden Media</p>
-						<p class="font-weight-light">(click to show)</p>
-					</summary>
-					<div class="embed-responsive embed-responsive-16by9">
-						<video class="video" preload="none" controls loop>
-							<source src="{{$status->firstMedia()->url()}}" type="{{$status->firstMedia()->mime}}">
-						</video>
-					</div>
-				 </details>
-				@else
-				<div class="embed-responsive embed-responsive-16by9">
-					<video class="video" preload="none" controls loop>
-						<source src="{{$status->firstMedia()->url()}}" type="{{$status->firstMedia()->mime}}">
-					</video>
-				</div>
-				@endif
-			@break
-			@case('video-album')
-				@if($status->is_nsfw)
-				<details class="details-animated">
-					<summary>
-						<p class="mb-0 lead font-weight-bold">CW / NSFW / Hidden Media</p>
-						<p class="font-weight-light">(click to show)</p>
-					</summary>
-					<div class="embed-responsive embed-responsive-16by9">
-						<video class="video" preload="none" controls loop>
-							<source src="{{$status->firstMedia()->url()}}" type="{{$status->firstMedia()->mime}}">
-						</video>
-					</div>
-				 </details>
-				@else
-				<div class="embed-responsive embed-responsive-16by9">
-					<video class="video" preload="none" controls loop>
-						<source src="{{$status->firstMedia()->url()}}" type="{{$status->firstMedia()->mime}}">
-					</video>
-				</div>
-				@endif
-			@break
-		@endswitch
-	</a>
-	@if($layout != 'compact')
-		<div class="card-body">
-			<div class="view-more mb-2">
-				<a class="font-weight-bold" href="{{$status->url()}}" target="_blank">View More on Pixelfed</a>
-			</div>
-			<hr>
-			<div class="caption">
-				<p class="my-0">
-					<span class="username font-weight-bold">
-						<bdi><a class="text-dark" href="{{$item->profile->url()}}" target="_blank">{{$item->profile->username}}</a></bdi>
-					</span>
-				 @if($showCaption)
-					<span class="caption-container">{!! $item->rendered ?? e($item->caption) !!}</span>
-					@endif
-				</p>
-			</div>
-		</div>
-		@endif
-		<div class="card-footer bg-white d-inline-flex justify-content-between align-items-center">
-			<div class="timestamp">
-				<p class="small text-uppercase mb-0"><a href="{{$item->url()}}" class="text-muted" target="_blank">{{$item->created_at->diffForHumans()}}</a></p>
-			</div>
-			<div>
-				<a class="small font-weight-bold text-muted pr-1" href="{{config('app.url')}}" target="_blank">{{config('pixelfed.domain.app')}}</a>
-				<img src="/img/pixelfed-icon-color.svg" width="26px">
-			</div>
-		</div>
-	</div>
-	</div>
-	<script type="text/javascript">window.addEventListener("message",e=>{const t=e.data||{};window.parent&&"setHeight"===t.type&&window.parent.postMessage({type:"setHeight",id:t.id,height:document.getElementsByTagName("html")[0].scrollHeight},"*")});</script>
-	<script type="text/javascript">document.querySelectorAll('.caption-container a').forEach(function(i) {i.setAttribute('target', '_blank');});</script>
-		<script type="text/javascript" src="{{ mix('js/manifest.js') }}"></script>
-		<script type="text/javascript" src="{{ mix('js/vendor.js') }}"></script>
-		<script type="text/javascript" src="{{ mix('js/app.js') }}"></script>
+    <div class="embed-card">
+        <div class="card status-card-embed card-md-rounded-0 border">
+            <div class="card-header d-inline-flex align-items-center bg-white">
+                <img src="{{$status['account']['avatar']}}" width="32" height="32" class="avatar" onerror="this.onerror=null;this.src='/storage/avatars/default.jpg';">
+                <a class="username font-weight-bold pl-2 text-dark" target="_blank" rel="ugc" href="{{$status['account']['url']}}">
+                    {{$status['account']['username']}}
+                </a>
+            </div>
+            @if($status['pf_type'] === 'photo')
+            <a href="{{$status['url']}}" target="_blank" rel="ugc">
+                <div>
+                    <img src="{{$status['media_attachments'][0]['preview_url'] ?? $status['media_attachments'][0]['url']}}" width="100%">
+                </div>
+            </a>
+            @elseif($status['pf_type'] === 'photo:album')
+            <image-carousel>
+                @foreach($status['media_attachments'] as $media)
+                    <img src="{{$media['url']}}">
+                @endforeach
+            </image-carousel>
+            @endif
+            @if($layout != 'compact')
+            <div class="card-body">
+                <div class="view-more mb-2">
+                    <a class="font-weight-bold" href="{{$status['url']}}" target="_blank">View More on Pixelfed</a>
+                </div>
+                <hr>
+                <div class="caption">
+                    <p class="my-0">
+                        <span class="username font-weight-bold">
+                            <bdi><a class="text-dark" href="{{$status['account']['url']}}" target="_blank">{{$status['account']['username']}}</a></bdi>
+                        </span>
+                        @if($showCaption)
+                        <span class="caption-container">{{ $status['content_text'] }}</span>
+                        @endif
+                    </p>
+                </div>
+            </div>
+            @endif
+            <div class="card-footer bg-white d-inline-flex justify-content-between align-items-center">
+                <div class="timestamp">
+                    <p class="small text-uppercase mb-0">
+                        <a href="{{$status['url']}}" class="text-muted" target="_blank" rel="ugc">
+                            {{now()->parse($status['created_at'])->diffForHumans()}}
+                        </a>
+                    </p>
+                </div>
+                <div>
+                    <a class="small font-weight-bold text-muted pr-1" href="{{config('app.url')}}" target="_blank">{{config('pixelfed.domain.app')}}</a>
+                    <img src="/img/pixelfed-icon-color.svg" width="26" height="26" />
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        window.addEventListener("message",e=>{const t=e.data||{};window.parent&&"setHeight"===t.type&&window.parent.postMessage({type:"setHeight",id:t.id,height:document.getElementsByTagName("html")[0].scrollHeight},"*")});
+        document.querySelectorAll('.caption-container a').forEach(function(i) {i.setAttribute('target', '_blank');});
+        document.addEventListener("DOMContentLoaded",()=>{class t extends HTMLElement{constructor(){super(),this.currentIndex=0,this.images=null,this.totalImages=0,this.indicators=[]}connectedCallback(){if(this.images=this.querySelectorAll("img"),this.totalImages=this.images.length,0===this.totalImages){console.error("No images found in the carousel");return}this.createButtons(),this.createIndicators(),this.showImage(this.currentIndex)}createButtons(){this.nextButton=document.createElement("button"),this.nextButton.innerHTML='<svg xmlns="http://www.w3.org/2000/svg" height="12" width="6" viewBox="0 0 256 512"><path d="M24.7 38.1L4.9 57.9c-4.7 4.7-4.7 12.3 0 17L185.6 256 4.9 437.1c-4.7 4.7-4.7 12.3 0 17L24.7 473.9c4.7 4.7 12.3 4.7 17 0l209.4-209.4c4.7-4.7 4.7-12.3 0-17L41.7 38.1c-4.7-4.7-12.3-4.7-17 0z"/></svg>',this.nextButton.className="carousel-button next",this.nextButton.addEventListener("click",()=>this.nextImage()),this.prevButton=document.createElement("button"),this.prevButton.innerHTML='<svg xmlns="http://www.w3.org/2000/svg" height="12" width="6" viewBox="0 0 256 512"><path d="M231.3 473.9l19.8-19.8c4.7-4.7 4.7-12.3 0-17L70.4 256 251.1 74.9c4.7-4.7 4.7-12.3 0-17L231.3 38.1c-4.7-4.7-12.3-4.7-17 0L4.9 247.5c-4.7 4.7-4.7 12.3 0 17L214.3 473.9c4.7 4.7 12.3 4.7 17 0z"/></svg>',this.prevButton.className="carousel-button prev",this.prevButton.addEventListener("click",()=>this.prevImage());let t=document.createElement("div");t.className="carousel-buttons",t.appendChild(this.prevButton),t.appendChild(this.nextButton),this.appendChild(t),this.updateButtonVisibility()}createIndicators(){this.indicatorsContainer=document.createElement("div"),this.indicatorsContainer.className="carousel-indicators",this.indicators=Array.from(this.images).map((t,e)=>{let i=document.createElement("div");return i.className="carousel-indicator",i.addEventListener("click",()=>this.showImage(e)),this.indicatorsContainer.appendChild(i),i}),this.appendChild(this.indicatorsContainer),this.updateIndicators()}showImage(t){if(!this.images||!this.indicators){console.error("Images or indicators are not initialized");return}this.images.forEach((e,i)=>{e.classList.toggle("active",i===t)}),this.indicators.forEach((e,i)=>{e.classList.toggle("active",i===t)}),this.currentIndex=t,this.updateButtonVisibility()}nextImage(){this.currentIndex<this.totalImages-1&&this.showImage(this.currentIndex+1)}prevImage(){this.currentIndex>0&&this.showImage(this.currentIndex-1)}updateButtonVisibility(){this.prevButton.classList.toggle("active",0!==this.currentIndex),this.nextButton.classList.toggle("active",this.currentIndex!==this.totalImages-1)}updateIndicators(){if(!this.indicators){console.error("Indicators are not initialized");return}this.indicators.forEach((t,e)=>{t.classList.toggle("active",e===this.currentIndex)})}}customElements.define("image-carousel",t)});
+    </script>
 </body>
 </html>
diff --git a/resources/views/status/show.blade.php b/resources/views/status/show.blade.php
index 8d4ce4548..d9743c92f 100644
--- a/resources/views/status/show.blade.php
+++ b/resources/views/status/show.blade.php
@@ -1,4 +1,30 @@
-@extends('layouts.app',['title' => "{$user->username} shared a post"])
+@extends('layouts.app', [
+    'title' => $desc ?? "{$user->username} shared a post",
+    'ogTitle' => $ogTitle
+])
+
+@php
+$s = \App\Services\StatusService::get($status->id, false);
+$displayName = $s && $s['account'] ? $s['account']['display_name'] : false;
+$captionPreview = false;
+$domain = $displayName ? '@' . parse_url($s['account']['url'], PHP_URL_HOST) : '';
+$wf = $displayName ? $s['account']['username'] . $domain : '';
+$ogTitle = $displayName ? $displayName . ' (@' . $s['account']['username'] . $domain . ')' : '';
+$mediaCount = $s['media_attachments'] && count($s['media_attachments']) ? count($s['media_attachments']) : 0;
+$mediaSuffix = $mediaCount < 2 ? '' : 's';
+$ogDescription = $s['content_text'] ? $s['content_text'] : 'Attached: ' . $mediaCount . ' ' . $s['media_attachments'][0]['type'] . $mediaSuffix;
+if($s['content_text']) {
+    $captionLen = strlen($s['content_text']);
+    $captionPreview = $captionLen > 40 ? substr($s['content_text'], 0, 40) . '…' : $s['content_text'];
+}
+$desc = false;
+if($displayName && $captionPreview) {
+    $desc = $displayName . ': "' . $captionPreview . '" - Pixelfed';
+} else if($displayName) {
+    $desc = $displayName . ': Shared a new post - Pixelfed';
+}
+
+@endphp
 
 @section('content')
 <noscript>
@@ -7,20 +33,28 @@
   </div>
 </noscript>
 <div class="mt-md-4"></div>
-<post-component status-template="{{$status->viewType()}}" status-id="{{$status->id}}" status-username="{{$status->profile->username}}" status-url="{{$status->url()}}" status-profile-url="{{$status->profile->url()}}" status-avatar="{{$status->profile->avatarUrl()}}" status-profile-id="{{$status->profile_id}}" profile-layout="metro"></post-component>
+<post-component
+    status-template="{{$status->viewType()}}"
+    status-id="{{$status->id}}"
+    status-username="{{$s['account']['username']}}"
+    status-url="{{$s['url']}}"
+    status-profile-url="{{$s['account']['url']}}"
+    status-avatar="{{$s['account']['avatar']}}"
+    status-profile-id="{{$status->profile_id}}"
+    profile-layout="metro" />
 
 
 @endsection
 
-@push('meta')
-
-    <meta property="og:description" content="{{ $status->caption }}">
-    <meta property="og:image" content="{{$status->thumb()}}">
-    <link href='{{$status->url()}}' rel='alternate' type='application/activity+json'>
-    <meta name="twitter:card" content="summary_large_image">
-    @if($status->viewType() == "video" || $status->viewType() == "video:album")
-        <meta property="og:video" content="{{$status->mediaUrl()}}">
-    @endif
+@push('meta')@if($mediaCount && $s['pf_type'] === "photo" || $s['pf_type'] === "photo:album")
+<meta property="og:image" content="{{$s['media_attachments'][0]['url']}}">
+    @elseif($mediaCount && $s['pf_type'] === "video" || $s['pf_type'] === "video:album")<meta property="og:video" content="{{$s['media_attachments'][0]['url']}}">
+    @endif<meta property="og:description" content="{{ $ogDescription }}">
+    <meta property="og:published_time" content="{{$s['created_at']}}">
+    <meta property="profile:username" content="{{ $wf }}">
+    <link href='{{$s['url']}}' rel='alternate' type='application/activity+json'>
+    <meta name="twitter:card" content="summary">
+    <meta name="description" content="{{ $ogDescription }}">
 @endpush
 
 @push('scripts')
diff --git a/resources/views/vendor/mail/html/message.blade.php b/resources/views/vendor/mail/html/message.blade.php
index deec4a1f4..26c1f7d80 100644
--- a/resources/views/vendor/mail/html/message.blade.php
+++ b/resources/views/vendor/mail/html/message.blade.php
@@ -2,7 +2,7 @@
 {{-- Header --}}
 @slot('header')
 @component('mail::header', ['url' => config('app.url')])
-{{ config('app.name') }}
+{{ config_cache('app.name') }}
 @endcomponent
 @endslot
 
@@ -21,7 +21,7 @@
 {{-- Footer --}}
 @slot('footer')
 @component('mail::footer')
-© {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.')
+© {{ date('Y') }} {{ config_cache('app.name') }}. @lang('All rights reserved.')
 @endcomponent
 @endslot
 @endcomponent
diff --git a/resources/views/vendor/mail/text/message.blade.php b/resources/views/vendor/mail/text/message.blade.php
index 1ae9ed8f1..3416a9bd4 100644
--- a/resources/views/vendor/mail/text/message.blade.php
+++ b/resources/views/vendor/mail/text/message.blade.php
@@ -2,7 +2,7 @@
     {{-- Header --}}
     @slot('header')
         @component('mail::header', ['url' => config('app.url')])
-            {{ config('app.name') }}
+            {{ config_cache('app.name') }}
         @endcomponent
     @endslot
 
@@ -21,7 +21,7 @@
     {{-- Footer --}}
     @slot('footer')
         @component('mail::footer')
-            © {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.')
+            © {{ date('Y') }} {{ config_cache('app.name') }}. @lang('All rights reserved.')
         @endcomponent
     @endslot
 @endcomponent
diff --git a/resources/views/vendor/passport/authorize.blade.php b/resources/views/vendor/passport/authorize.blade.php
index 986f76801..a644289ca 100644
--- a/resources/views/vendor/passport/authorize.blade.php
+++ b/resources/views/vendor/passport/authorize.blade.php
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>{{ config('app.name') }} - Authorization</title>
+    <title>{{ config_cache('app.name') }} - Authorization</title>
     <link href="{{ mix('/css/app.css') }}" rel="stylesheet">
     <style>
         .passport-authorize .container {
diff --git a/routes/api.php b/routes/api.php
index 23abfc323..f3d4b57bb 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -1,9 +1,8 @@
 <?php
 
-use Illuminate\Http\Request;
-use App\Http\Middleware\DeprecatedEndpoint;
+use App\Http\Controllers\Api\V1\TagsController;
 
-$middleware = ['auth:api','validemail'];
+$middleware = ['auth:api', 'validemail'];
 
 Route::post('/f/inbox', 'FederationController@sharedInbox');
 Route::post('/users/{username}/inbox', 'FederationController@userInbox');
@@ -19,12 +18,80 @@ Route::redirect('.well-known/change-password', '/settings/password');
 Route::get('api/nodeinfo/2.0.json', 'FederationController@nodeinfo');
 Route::get('api/service/health-check', 'HealthCheckController@get');
 
-Route::group(['prefix' => 'api'], function() use($middleware) {
+Route::prefix('api/v0/groups')->middleware($middleware)->group(function () {
+    Route::get('config', 'Groups\GroupsApiController@getConfig');
+    Route::post('permission/create', 'Groups\CreateGroupsController@checkCreatePermission');
+    Route::post('create', 'Groups\CreateGroupsController@storeGroup');
 
-    Route::group(['prefix' => 'v1'], function() use($middleware) {
+    Route::post('search/invite/friends/send', 'Groups\GroupsSearchController@inviteFriendsToGroup');
+    Route::post('search/invite/friends', 'Groups\GroupsSearchController@searchFriendsToInvite');
+    Route::post('search/global', 'Groups\GroupsSearchController@searchGlobalResults');
+    Route::post('search/lac', 'Groups\GroupsSearchController@searchLocalAutocomplete');
+    Route::post('search/addrec', 'Groups\GroupsSearchController@searchAddRecent');
+    Route::get('search/getrec', 'Groups\GroupsSearchController@searchGetRecent');
+    Route::get('comments', 'Groups\GroupsCommentController@getComments');
+    Route::post('comment', 'Groups\GroupsCommentController@storeComment');
+    Route::post('comment/photo', 'Groups\GroupsCommentController@storeCommentPhoto');
+    Route::post('comment/delete', 'Groups\GroupsCommentController@deleteComment');
+    Route::get('discover/popular', 'Groups\GroupsDiscoverController@getDiscoverPopular');
+    Route::get('discover/new', 'Groups\GroupsDiscoverController@getDiscoverNew');
+    Route::post('delete', 'Groups\GroupsMetaController@deleteGroup');
+    Route::post('status/new', 'Groups\GroupsPostController@storePost');
+    Route::post('status/delete', 'Groups\GroupsPostController@deletePost');
+    Route::post('status/like', 'Groups\GroupsPostController@likePost');
+    Route::post('status/unlike', 'Groups\GroupsPostController@unlikePost');
+    Route::get('topics/list', 'Groups\GroupsTopicController@groupTopics');
+    Route::get('topics/tag', 'Groups\GroupsTopicController@groupTopicTag');
+    Route::get('accounts/{gid}/{pid}', 'Groups\GroupsApiController@getGroupAccount');
+    Route::get('categories/list', 'Groups\GroupsApiController@getGroupCategories');
+    Route::get('category/list', 'Groups\GroupsApiController@getGroupsByCategory');
+    Route::get('self/recommended/list', 'Groups\GroupsApiController@getRecommendedGroups');
+    Route::get('self/list', 'Groups\GroupsApiController@getSelfGroups');
+    Route::get('media/list', 'Groups\GroupsPostController@getGroupMedia');
+    Route::get('members/list', 'Groups\GroupsMemberController@getGroupMembers');
+    Route::get('members/requests', 'Groups\GroupsMemberController@getGroupMemberJoinRequests');
+    Route::post('members/request', 'Groups\GroupsMemberController@handleGroupMemberJoinRequest');
+    Route::get('members/get', 'Groups\GroupsMemberController@getGroupMember');
+    Route::get('member/intersect/common', 'Groups\GroupsMemberController@getGroupMemberCommonIntersections');
+    Route::get('status', 'Groups\GroupsPostController@getStatus');
+    Route::post('like', 'GroupController@likePost');
+    Route::post('comment/like', 'Groups\GroupsCommentController@likePost');
+    Route::post('comment/unlike', 'Groups\GroupsCommentController@unlikePost');
+    Route::get('self/feed', 'Groups\GroupsFeedController@getSelfFeed');
+    Route::get('self/notifications', 'Groups\GroupsNotificationsController@selfGlobalNotifications');
+    Route::get('{id}/user/{pid}/feed', 'Groups\GroupsFeedController@getGroupProfileFeed');
+    Route::get('{id}/feed', 'Groups\GroupsFeedController@getGroupFeed');
+    Route::get('{id}/atabs', 'Groups\GroupsAdminController@getAdminTabs');
+    Route::get('{id}/admin/interactions', 'Groups\GroupsAdminController@getInteractionLogs');
+    Route::get('{id}/admin/blocks', 'Groups\GroupsAdminController@getBlocks');
+    Route::post('{id}/admin/blocks/add', 'Groups\GroupsAdminController@addBlock');
+    Route::post('{id}/admin/blocks/undo', 'Groups\GroupsAdminController@undoBlock');
+    Route::post('{id}/admin/blocks/export', 'Groups\GroupsAdminController@exportBlocks');
+    Route::get('{id}/reports/list', 'Groups\GroupsAdminController@getReportList');
+
+    Route::get('{id}/members/interaction-limits', 'GroupController@getMemberInteractionLimits');
+    Route::post('{id}/invite/check', 'GroupController@groupMemberInviteCheck');
+    Route::post('{id}/invite/accept', 'GroupController@groupMemberInviteAccept');
+    Route::post('{id}/invite/decline', 'GroupController@groupMemberInviteDecline');
+    Route::post('{id}/members/interaction-limits', 'GroupController@updateMemberInteractionLimits');
+    Route::post('{id}/report/action', 'GroupController@reportAction');
+    Route::post('{id}/report/create', 'GroupController@reportCreate');
+    Route::post('{id}/admin/mbs', 'GroupController@metaBlockSearch');
+    Route::post('{id}/join', 'GroupController@joinGroup');
+    Route::post('{id}/cjr', 'GroupController@cancelJoinRequest');
+    Route::post('{id}/leave', 'GroupController@groupLeave');
+    Route::post('{id}/settings', 'GroupController@updateGroup');
+    Route::get('{id}/likes/{sid}', 'GroupController@showStatusLikes');
+    Route::get('{id}', 'GroupController@getGroup');
+});
+
+Route::group(['prefix' => 'api'], function () use ($middleware) {
+
+    Route::group(['prefix' => 'v1'], function () use ($middleware) {
         Route::post('apps', 'Api\ApiV1Controller@apps');
         Route::get('apps/verify_credentials', 'Api\ApiV1Controller@getApp')->middleware($middleware);
         Route::get('instance', 'Api\ApiV1Controller@instance');
+        Route::get('instance/peers', 'Api\ApiV1Controller@instancePeers');
         Route::get('bookmarks', 'Api\ApiV1Controller@bookmarks')->middleware($middleware);
 
         Route::get('accounts/verify_credentials', 'Api\ApiV1Controller@verifyCredentials')->middleware($middleware);
@@ -50,9 +117,9 @@ Route::group(['prefix' => 'api'], function() use($middleware) {
         Route::get('blocks', 'Api\ApiV1Controller@accountBlocks')->middleware($middleware);
         Route::get('conversations', 'Api\ApiV1Controller@conversations')->middleware($middleware);
         Route::get('custom_emojis', 'Api\ApiV1Controller@customEmojis');
-        Route::get('domain_blocks', 'Api\ApiV1Controller@accountDomainBlocks')->middleware($middleware);
-        Route::post('domain_blocks', 'Api\ApiV1Controller@accountDomainBlocks')->middleware($middleware);
-        Route::delete('domain_blocks', 'Api\ApiV1Controller@accountDomainBlocks')->middleware($middleware);
+        Route::get('domain_blocks', 'Api\V1\DomainBlockController@index')->middleware($middleware);
+        Route::post('domain_blocks', 'Api\V1\DomainBlockController@store')->middleware($middleware);
+        Route::delete('domain_blocks', 'Api\V1\DomainBlockController@delete')->middleware($middleware);
         Route::get('endorsements', 'Api\ApiV1Controller@accountEndorsements')->middleware($middleware);
         Route::get('favourites', 'Api\ApiV1Controller@accountFavourites')->middleware($middleware);
         Route::get('filters', 'Api\ApiV1Controller@accountFilters')->middleware($middleware);
@@ -92,29 +159,35 @@ Route::group(['prefix' => 'api'], function() use($middleware) {
         Route::get('markers', 'Api\ApiV1Controller@getMarkers')->middleware($middleware);
         Route::post('markers', 'Api\ApiV1Controller@setMarkers')->middleware($middleware);
 
-        Route::get('followed_tags', 'Api\ApiV1Controller@getFollowedTags')->middleware($middleware);
-        Route::post('tags/{id}/follow', 'Api\ApiV1Controller@followHashtag')->middleware($middleware);
-        Route::post('tags/{id}/unfollow', 'Api\ApiV1Controller@unfollowHashtag')->middleware($middleware);
-        Route::get('tags/{id}', 'Api\ApiV1Controller@getHashtag')->middleware($middleware);
+        Route::get('followed_tags', [TagsController::class, 'getFollowedTags'])->middleware($middleware);
+        Route::post('tags/{id}/follow', [TagsController::class, 'followHashtag'])->middleware($middleware);
+        Route::post('tags/{id}/unfollow', [TagsController::class, 'unfollowHashtag'])->middleware($middleware);
+        Route::get('tags/{id}/related', [TagsController::class, 'relatedTags'])->middleware($middleware);
+        Route::get('tags/{id}', [TagsController::class, 'getHashtag'])->middleware($middleware);
 
         Route::get('statuses/{id}/history', 'StatusEditController@history')->middleware($middleware);
         Route::put('statuses/{id}', 'StatusEditController@store')->middleware($middleware);
+
+        Route::group(['prefix' => 'admin'], function () use ($middleware) {
+            Route::get('domain_blocks', 'Api\V1\Admin\DomainBlocksController@index')->middleware($middleware);
+            Route::post('domain_blocks', 'Api\V1\Admin\DomainBlocksController@create')->middleware($middleware);
+            Route::get('domain_blocks/{id}', 'Api\V1\Admin\DomainBlocksController@show')->middleware($middleware);
+            Route::put('domain_blocks/{id}', 'Api\V1\Admin\DomainBlocksController@update')->middleware($middleware);
+            Route::delete('domain_blocks/{id}', 'Api\V1\Admin\DomainBlocksController@delete')->middleware($middleware);
+        })->middleware($middleware);
     });
 
-    Route::group(['prefix' => 'v2'], function() use($middleware) {
+    Route::group(['prefix' => 'v2'], function () use ($middleware) {
         Route::get('search', 'Api\ApiV2Controller@search')->middleware($middleware);
         Route::post('media', 'Api\ApiV2Controller@mediaUploadV2')->middleware($middleware);
         Route::get('streaming/config', 'Api\ApiV2Controller@getWebsocketConfig');
         Route::get('instance', 'Api\ApiV2Controller@instance');
     });
 
-    Route::group(['prefix' => 'v1.1'], function() use($middleware) {
-        $reportMiddleware = $middleware;
-        $reportMiddleware[] = DeprecatedEndpoint::class;
-        Route::post('report', 'Api\ApiV1Dot1Controller@report')->middleware($reportMiddleware);
+    Route::group(['prefix' => 'v1.1'], function () use ($middleware) {
+        Route::post('report', 'Api\ApiV1Dot1Controller@report')->middleware($middleware);
 
-        Route::group(['prefix' => 'accounts'], function () use($middleware) {
-            $middleware[] = DeprecatedEndpoint::class;
+        Route::group(['prefix' => 'accounts'], function () use ($middleware) {
             Route::get('timelines/home', 'Api\ApiV1Controller@timelineHome')->middleware($middleware);
             Route::delete('avatar', 'Api\ApiV1Dot1Controller@deleteAvatar')->middleware($middleware);
             Route::get('{id}/posts', 'Api\ApiV1Dot1Controller@accountPosts')->middleware($middleware);
@@ -123,10 +196,11 @@ Route::group(['prefix' => 'api'], function() use($middleware) {
             Route::get('two-factor', 'Api\ApiV1Dot1Controller@accountTwoFactor')->middleware($middleware);
             Route::get('emails-from-pixelfed', 'Api\ApiV1Dot1Controller@accountEmailsFromPixelfed')->middleware($middleware);
             Route::get('apps-and-applications', 'Api\ApiV1Dot1Controller@accountApps')->middleware($middleware);
+            Route::get('mutuals/{id}', 'Api\ApiV1Dot1Controller@getMutualAccounts')->middleware($middleware);
+            Route::get('username/{username}', 'Api\ApiV1Dot1Controller@accountUsernameToId')->middleware($middleware);
         });
 
-        Route::group(['prefix' => 'collections'], function () use($middleware) {
-            $middleware[] = DeprecatedEndpoint::class;
+        Route::group(['prefix' => 'collections'], function () use ($middleware) {
             Route::get('accounts/{id}', 'CollectionController@getUserCollections')->middleware($middleware);
             Route::get('items/{id}', 'CollectionController@getItems')->middleware($middleware);
             Route::get('view/{id}', 'CollectionController@getCollection')->middleware($middleware);
@@ -134,10 +208,10 @@ Route::group(['prefix' => 'api'], function() use($middleware) {
             Route::post('update/{id}', 'CollectionController@store')->middleware($middleware);
             Route::delete('delete/{id}', 'CollectionController@delete')->middleware($middleware);
             Route::post('remove', 'CollectionController@deleteId')->middleware($middleware);
+            Route::get('self', 'CollectionController@getSelfCollections')->middleware($middleware);
         });
 
-        Route::group(['prefix' => 'direct'], function () use($middleware) {
-            $middleware[] = DeprecatedEndpoint::class;
+        Route::group(['prefix' => 'direct'], function () use ($middleware) {
             Route::get('thread', 'DirectMessageController@thread')->middleware($middleware);
             Route::post('thread/send', 'DirectMessageController@create')->middleware($middleware);
             Route::delete('thread/message', 'DirectMessageController@delete')->middleware($middleware);
@@ -148,20 +222,17 @@ Route::group(['prefix' => 'api'], function() use($middleware) {
             Route::post('lookup', 'DirectMessageController@composeLookup')->middleware($middleware);
         });
 
-        Route::group(['prefix' => 'archive'], function () use($middleware) {
-            $middleware[] = DeprecatedEndpoint::class;
+        Route::group(['prefix' => 'archive'], function () use ($middleware) {
             Route::post('add/{id}', 'Api\ApiV1Dot1Controller@archive')->middleware($middleware);
             Route::post('remove/{id}', 'Api\ApiV1Dot1Controller@unarchive')->middleware($middleware);
             Route::get('list', 'Api\ApiV1Dot1Controller@archivedPosts')->middleware($middleware);
         });
 
-        Route::group(['prefix' => 'places'], function () use($middleware) {
-            $middleware[] = DeprecatedEndpoint::class;
+        Route::group(['prefix' => 'places'], function () use ($middleware) {
             Route::get('posts/{id}/{slug}', 'Api\ApiV1Dot1Controller@placesById')->middleware($middleware);
         });
 
-        Route::group(['prefix' => 'stories'], function () use($middleware) {
-            $middleware[] = DeprecatedEndpoint::class;
+        Route::group(['prefix' => 'stories'], function () use ($middleware) {
             Route::get('carousel', 'Stories\StoryApiV1Controller@carousel')->middleware($middleware);
             Route::post('add', 'Stories\StoryApiV1Controller@add')->middleware($middleware);
             Route::post('publish', 'Stories\StoryApiV1Controller@publish')->middleware($middleware);
@@ -170,25 +241,23 @@ Route::group(['prefix' => 'api'], function() use($middleware) {
             Route::post('comment', 'Stories\StoryApiV1Controller@comment')->middleware($middleware);
         });
 
-        Route::group(['prefix' => 'compose'], function () use($middleware) {
-            $middleware[] = DeprecatedEndpoint::class;
+        Route::group(['prefix' => 'compose'], function () use ($middleware) {
             Route::get('search/location', 'ComposeController@searchLocation')->middleware($middleware);
             Route::get('settings', 'ComposeController@composeSettings')->middleware($middleware);
         });
 
-        Route::group(['prefix' => 'discover'], function () use($middleware) {
-            $middleware[] = DeprecatedEndpoint::class;
+        Route::group(['prefix' => 'discover'], function () use ($middleware) {
             Route::get('accounts/popular', 'Api\ApiV1Controller@discoverAccountsPopular')->middleware($middleware);
             Route::get('posts/trending', 'DiscoverController@trendingApi')->middleware($middleware);
             Route::get('posts/hashtags', 'DiscoverController@trendingHashtags')->middleware($middleware);
+            Route::get('posts/network/trending', 'DiscoverController@discoverNetworkTrending')->middleware($middleware);
         });
 
-        Route::group(['prefix' => 'directory'], function () use($middleware) {
-            $middleware[] = DeprecatedEndpoint::class;
+        Route::group(['prefix' => 'directory'], function () {
             Route::get('listing', 'PixelfedDirectoryController@get');
         });
 
-        Route::group(['prefix' => 'auth'], function () use($middleware) {
+        Route::group(['prefix' => 'auth'], function () {
             Route::get('iarpfc', 'Api\ApiV1Dot1Controller@inAppRegistrationPreFlightCheck');
             Route::post('iar', 'Api\ApiV1Dot1Controller@inAppRegistration');
             Route::post('iarc', 'Api\ApiV1Dot1Controller@inAppRegistrationConfirm');
@@ -198,9 +267,19 @@ Route::group(['prefix' => 'api'], function() use($middleware) {
             Route::post('invite/admin/uc', 'AdminInviteController@apiUsernameCheck')->middleware('throttle:20,120');
             Route::post('invite/admin/ec', 'AdminInviteController@apiEmailCheck')->middleware('throttle:10,1440');
         });
+
+        Route::group(['prefix' => 'push'], function () use ($middleware) {
+            Route::get('state', 'Api\ApiV1Dot1Controller@getPushState')->middleware($middleware);
+            Route::post('compare', 'Api\ApiV1Dot1Controller@comparePush')->middleware($middleware);
+            Route::post('update', 'Api\ApiV1Dot1Controller@updatePush')->middleware($middleware);
+            Route::post('disable', 'Api\ApiV1Dot1Controller@disablePush')->middleware($middleware);
+        });
+
+        Route::post('status/create', 'Api\ApiV1Dot1Controller@statusCreate')->middleware($middleware);
+        Route::get('nag/state', 'Api\ApiV1Dot1Controller@nagState');
     });
 
-    Route::group(['prefix' => 'live'], function() use($middleware) {
+    Route::group(['prefix' => 'live'], function () {
         // Route::post('create_stream', 'LiveStreamController@createStream')->middleware($middleware);
         // Route::post('stream/edit', 'LiveStreamController@editStream')->middleware($middleware);
         // Route::get('active/list', 'LiveStreamController@getActiveStreams')->middleware($middleware);
@@ -218,7 +297,7 @@ Route::group(['prefix' => 'api'], function() use($middleware) {
         // Route::post('broadcast/finish', 'LiveStreamController@clientBroadcastFinish')->middleware($middleware);
     });
 
-    Route::group(['prefix' => 'admin'], function() use($middleware) {
+    Route::group(['prefix' => 'admin'], function () use ($middleware) {
         Route::post('moderate/post/{id}', 'Api\ApiV1Dot1Controller@moderatePost')->middleware($middleware);
         Route::get('supported', 'Api\AdminApiController@supported')->middleware($middleware);
         Route::get('stats', 'Api\AdminApiController@getStats')->middleware($middleware);
@@ -239,15 +318,15 @@ Route::group(['prefix' => 'api'], function() use($middleware) {
         Route::get('instance/stats', 'Api\AdminApiController@getAllStats')->middleware($middleware);
     });
 
-    Route::group(['prefix' => 'landing/v1'], function() use($middleware) {
+    Route::group(['prefix' => 'landing/v1'], function () {
         Route::get('directory', 'LandingController@getDirectoryApi');
     });
 
-    Route::group(['prefix' => 'pixelfed'], function() use($middleware) {
-        Route::group(['prefix' => 'v1'], function() use($middleware) {
+    Route::group(['prefix' => 'pixelfed'], function () use ($middleware) {
+        Route::group(['prefix' => 'v1'], function () use ($middleware) {
             Route::post('report', 'Api\ApiV1Dot1Controller@report')->middleware($middleware);
 
-            Route::group(['prefix' => 'accounts'], function () use($middleware) {
+            Route::group(['prefix' => 'accounts'], function () use ($middleware) {
                 Route::get('timelines/home', 'Api\ApiV1Controller@timelineHome')->middleware($middleware);
                 Route::delete('avatar', 'Api\ApiV1Dot1Controller@deleteAvatar')->middleware($middleware);
                 Route::get('{id}/posts', 'Api\ApiV1Dot1Controller@accountPosts')->middleware($middleware);
@@ -258,13 +337,13 @@ Route::group(['prefix' => 'api'], function() use($middleware) {
                 Route::get('apps-and-applications', 'Api\ApiV1Dot1Controller@accountApps')->middleware($middleware);
             });
 
-            Route::group(['prefix' => 'archive'], function () use($middleware) {
+            Route::group(['prefix' => 'archive'], function () use ($middleware) {
                 Route::post('add/{id}', 'Api\ApiV1Dot1Controller@archive')->middleware($middleware);
                 Route::post('remove/{id}', 'Api\ApiV1Dot1Controller@unarchive')->middleware($middleware);
                 Route::get('list', 'Api\ApiV1Dot1Controller@archivedPosts')->middleware($middleware);
             });
 
-            Route::group(['prefix' => 'collections'], function () use($middleware) {
+            Route::group(['prefix' => 'collections'], function () use ($middleware) {
                 Route::get('accounts/{id}', 'CollectionController@getUserCollections')->middleware($middleware);
                 Route::get('items/{id}', 'CollectionController@getItems')->middleware($middleware);
                 Route::get('view/{id}', 'CollectionController@getCollection')->middleware($middleware);
@@ -272,14 +351,15 @@ Route::group(['prefix' => 'api'], function() use($middleware) {
                 Route::post('update/{id}', 'CollectionController@store')->middleware($middleware);
                 Route::delete('delete/{id}', 'CollectionController@delete')->middleware($middleware);
                 Route::post('remove', 'CollectionController@deleteId')->middleware($middleware);
+                Route::get('self', 'CollectionController@getSelfCollections')->middleware($middleware);
             });
 
-            Route::group(['prefix' => 'compose'], function () use($middleware) {
+            Route::group(['prefix' => 'compose'], function () use ($middleware) {
                 Route::get('search/location', 'ComposeController@searchLocation')->middleware($middleware);
                 Route::get('settings', 'ComposeController@composeSettings')->middleware($middleware);
             });
 
-            Route::group(['prefix' => 'direct'], function () use($middleware) {
+            Route::group(['prefix' => 'direct'], function () use ($middleware) {
                 Route::get('thread', 'DirectMessageController@thread')->middleware($middleware);
                 Route::post('thread/send', 'DirectMessageController@create')->middleware($middleware);
                 Route::delete('thread/message', 'DirectMessageController@delete')->middleware($middleware);
@@ -290,17 +370,17 @@ Route::group(['prefix' => 'api'], function() use($middleware) {
                 Route::post('lookup', 'DirectMessageController@composeLookup')->middleware($middleware);
             });
 
-            Route::group(['prefix' => 'discover'], function () use($middleware) {
+            Route::group(['prefix' => 'discover'], function () use ($middleware) {
                 Route::get('accounts/popular', 'Api\ApiV1Controller@discoverAccountsPopular')->middleware($middleware);
                 Route::get('posts/trending', 'DiscoverController@trendingApi')->middleware($middleware);
                 Route::get('posts/hashtags', 'DiscoverController@trendingHashtags')->middleware($middleware);
             });
 
-            Route::group(['prefix' => 'directory'], function () use($middleware) {
+            Route::group(['prefix' => 'directory'], function () {
                 Route::get('listing', 'PixelfedDirectoryController@get');
             });
 
-            Route::group(['prefix' => 'places'], function () use($middleware) {
+            Route::group(['prefix' => 'places'], function () use ($middleware) {
                 Route::get('posts/{id}/{slug}', 'Api\ApiV1Dot1Controller@placesById')->middleware($middleware);
             });
 
@@ -309,8 +389,9 @@ Route::group(['prefix' => 'api'], function() use($middleware) {
             Route::get('app/settings', 'UserAppSettingsController@get')->middleware($middleware);
             Route::post('app/settings', 'UserAppSettingsController@store')->middleware($middleware);
 
-            Route::group(['prefix' => 'stories'], function () use($middleware) {
+            Route::group(['prefix' => 'stories'], function () use ($middleware) {
                 Route::get('carousel', 'Stories\StoryApiV1Controller@carousel')->middleware($middleware);
+                Route::get('self-carousel', 'Stories\StoryApiV1Controller@selfCarousel')->middleware($middleware);
                 Route::post('add', 'Stories\StoryApiV1Controller@add')->middleware($middleware);
                 Route::post('publish', 'Stories\StoryApiV1Controller@publish')->middleware($middleware);
                 Route::post('seen', 'Stories\StoryApiV1Controller@viewed')->middleware($middleware);
diff --git a/routes/web-admin.php b/routes/web-admin.php
new file mode 100644
index 000000000..b37a967cc
--- /dev/null
+++ b/routes/web-admin.php
@@ -0,0 +1,192 @@
+<?php
+
+Route::domain(config('pixelfed.domain.admin'))->prefix('i/admin')->group(function () {
+    Route::redirect('/', '/dashboard');
+    Route::redirect('timeline', config('app.url').'/timeline');
+    Route::get('settings/custom-css', 'AdminController@customCss')->name('admin.custom-css');
+    Route::post('settings/custom-css', 'AdminController@saveCustomCss');
+    Route::get('dashboard', 'AdminController@home')->name('admin.home');
+    Route::get('stats', 'AdminController@stats')->name('admin.stats');
+    Route::get('reports', 'AdminController@reports')->name('admin.reports');
+    Route::get('reports/show/{id}', 'AdminController@showReport');
+    Route::post('reports/show/{id}', 'AdminController@updateReport');
+    Route::post('reports/bulk', 'AdminController@bulkUpdateReport');
+    Route::get('reports/autospam/{id}', 'AdminController@showSpam');
+    Route::post('reports/autospam/sync', 'AdminController@fixUncategorizedSpam');
+    Route::post('reports/autospam/{id}', 'AdminController@updateSpam');
+    Route::get('reports/autospam', 'AdminController@spam');
+    Route::get('reports/appeals', 'AdminController@appeals');
+    Route::get('reports/appeal/{id}', 'AdminController@showAppeal');
+    Route::post('reports/appeal/{id}', 'AdminController@updateAppeal');
+    Route::get('reports/email-verifications', 'AdminController@reportMailVerifications');
+    Route::post('reports/email-verifications/ignore', 'AdminController@reportMailVerifyIgnore');
+    Route::post('reports/email-verifications/approve', 'AdminController@reportMailVerifyApprove');
+    Route::post('reports/email-verifications/clear-ignored', 'AdminController@reportMailVerifyClearIgnored');
+    Route::redirect('stories', '/stories/list');
+    Route::get('stories/list', 'AdminController@stories')->name('admin.stories');
+    Route::redirect('statuses', '/statuses/list');
+    Route::get('statuses/list', 'AdminController@statuses')->name('admin.statuses');
+    Route::get('statuses/show/{id}', 'AdminController@showStatus');
+    Route::redirect('profiles', '/i/admin/profiles/list');
+    Route::get('profiles/list', 'AdminController@profiles')->name('admin.profiles');
+    Route::get('profiles/edit/{id}', 'AdminController@profileShow');
+    Route::redirect('users', '/users/list');
+    Route::get('users/list', 'AdminController@users')->name('admin.users');
+    Route::get('users/show/{id}', 'AdminController@userShow');
+    Route::get('users/edit/{id}', 'AdminController@userEdit');
+    Route::post('users/edit/{id}', 'AdminController@userEditSubmit');
+    Route::get('users/activity/{id}', 'AdminController@userActivity');
+    Route::get('users/message/{id}', 'AdminController@userMessage');
+    Route::post('users/message/{id}', 'AdminController@userMessageSend');
+    Route::get('users/modtools/{id}', 'AdminController@userModTools');
+    Route::get('users/modlogs/{id}', 'AdminController@userModLogs');
+    Route::post('users/modlogs/{id}', 'AdminController@userModLogsMessage');
+    Route::post('users/modlogs/{id}/delete', 'AdminController@userModLogDelete');
+    Route::get('users/delete/{id}', 'AdminController@userDelete');
+    Route::post('users/delete/{id}', 'AdminController@userDeleteProcess');
+    Route::post('users/moderation/update', 'AdminController@userModerate');
+    Route::get('media', 'AdminController@media')->name('admin.media');
+    Route::redirect('media/list', '/i/admin/media');
+    Route::get('media/show/{id}', 'AdminController@mediaShow');
+    Route::get('settings', 'AdminController@settings')->name('admin.settings');
+    Route::post('settings', 'AdminController@settingsHomeStore');
+    Route::get('settings/features', 'AdminController@settingsFeatures')->name('admin.settings.features');
+    Route::get('settings/pages', 'AdminController@settingsPages')->name('admin.settings.pages');
+    Route::get('settings/pages/edit', 'PageController@edit')->name('admin.settings.pages.edit');
+    Route::post('settings/pages/edit', 'PageController@store');
+    Route::post('settings/pages/delete', 'PageController@delete');
+    Route::post('settings/pages/create', 'PageController@generatePage');
+    Route::get('settings/maintenance', 'AdminController@settingsMaintenance')->name('admin.settings.maintenance');
+    Route::get('settings/backups', 'AdminController@settingsBackups')->name('admin.settings.backups');
+    Route::get('settings/storage', 'AdminController@settingsStorage')->name('admin.settings.storage');
+    Route::get('settings/system', 'AdminController@settingsSystem')->name('admin.settings.system');
+
+    Route::get('instances', 'AdminController@instances')->name('admin.instances');
+    Route::post('instances', 'AdminController@instanceScan');
+    Route::get('instances/show/{id}', 'AdminController@instanceShow');
+    Route::post('instances/edit/{id}', 'AdminController@instanceEdit');
+    Route::get('apps/home', 'AdminController@appsHome')->name('admin.apps');
+    Route::get('hashtags/home', 'AdminController@hashtagsHome')->name('admin.hashtags');
+    Route::get('discover/home', 'AdminController@discoverHome')->name('admin.discover');
+    Route::get('discover/category/create', 'AdminController@discoverCreateCategory')->name('admin.discover.create-category');
+    Route::post('discover/category/create', 'AdminController@discoverCreateCategoryStore');
+    Route::get('discover/category/edit/{id}', 'AdminController@discoverCategoryEdit');
+    Route::post('discover/category/edit/{id}', 'AdminController@discoverCategoryUpdate');
+    Route::post('discover/category/hashtag/create', 'AdminController@discoveryCategoryTagStore')->name('admin.discover.create-hashtag');
+
+    Route::get('messages/home', 'AdminController@messagesHome')->name('admin.messages');
+    Route::get('messages/show/{id}', 'AdminController@messagesShow');
+    Route::post('messages/mark-read', 'AdminController@messagesMarkRead');
+    Route::post('messages/show/{id}', 'AdminController@messagesReply');
+    Route::post('messages/preview/{id}', 'AdminController@messagesReplyPreview');
+    Route::redirect('site-news', '/i/admin/newsroom');
+    Route::get('newsroom', 'AdminController@newsroomHome')->name('admin.newsroom.home');
+    Route::get('newsroom/create', 'AdminController@newsroomCreate')->name('admin.newsroom.create');
+    Route::get('newsroom/edit/{id}', 'AdminController@newsroomEdit');
+    Route::post('newsroom/edit/{id}', 'AdminController@newsroomUpdate');
+    Route::delete('newsroom/edit/{id}', 'AdminController@newsroomDelete');
+    Route::post('newsroom/create', 'AdminController@newsroomStore');
+
+    Route::get('diagnostics/home', 'AdminController@diagnosticsHome')->name('admin.diagnostics');
+    Route::post('diagnostics/decrypt', 'AdminController@diagnosticsDecrypt')->name('admin.diagnostics.decrypt');
+    Route::get('custom-emoji/home', 'AdminController@customEmojiHome')->name('admin.custom-emoji');
+    Route::post('custom-emoji/toggle-active/{id}', 'AdminController@customEmojiToggleActive');
+    Route::get('custom-emoji/new', 'AdminController@customEmojiAdd');
+    Route::post('custom-emoji/new', 'AdminController@customEmojiStore');
+    Route::post('custom-emoji/delete/{id}', 'AdminController@customEmojiDelete');
+    Route::get('custom-emoji/duplicates/{id}', 'AdminController@customEmojiShowDuplicates');
+
+    Route::get('directory/home', 'AdminController@directoryHome')->name('admin.directory');
+
+    Route::get('autospam/home', 'AdminController@autospamHome')->name('admin.autospam');
+
+    Route::redirect('asf/', 'asf/home');
+    Route::get('asf/home', 'AdminShadowFilterController@home');
+    Route::get('asf/create', 'AdminShadowFilterController@create');
+    Route::get('asf/edit/{id}', 'AdminShadowFilterController@edit');
+    Route::post('asf/edit/{id}', 'AdminShadowFilterController@storeEdit');
+    Route::post('asf/create', 'AdminShadowFilterController@store');
+
+    Route::get('asf/home', 'AdminShadowFilterController@home');
+    Route::redirect('curated-onboarding/', 'curated-onboarding/home');
+    Route::get('curated-onboarding/home', 'AdminCuratedRegisterController@index')->name('admin.curated-onboarding');
+    Route::get('curated-onboarding/templates', 'AdminCuratedRegisterController@templates')->name('admin.curated-onboarding.templates');
+    Route::get('curated-onboarding/templates/create', 'AdminCuratedRegisterController@templateCreate')->name('admin.curated-onboarding.create-template');
+    Route::post('curated-onboarding/templates/create', 'AdminCuratedRegisterController@templateStore');
+    Route::get('curated-onboarding/templates/edit/{id}', 'AdminCuratedRegisterController@templateEdit');
+    Route::post('curated-onboarding/templates/edit/{id}', 'AdminCuratedRegisterController@templateEditStore');
+    Route::delete('curated-onboarding/templates/edit/{id}', 'AdminCuratedRegisterController@templateDelete');
+    Route::get('curated-onboarding/show/{id}/preview-details-message', 'AdminCuratedRegisterController@previewDetailsMessageShow');
+    Route::get('curated-onboarding/show/{id}/preview-message', 'AdminCuratedRegisterController@previewMessageShow');
+    Route::get('curated-onboarding/show/{id}', 'AdminCuratedRegisterController@show');
+
+    Route::prefix('api')->group(function() {
+        Route::get('stats', 'AdminController@getStats');
+        Route::get('accounts', 'AdminController@getAccounts');
+        Route::get('posts', 'AdminController@getPosts');
+        Route::get('instances', 'AdminController@getInstances');
+        Route::post('directory/save', 'AdminController@directoryStore');
+        Route::get('directory/initial-data', 'AdminController@directoryInitialData');
+        Route::get('directory/popular-posts', 'AdminController@directoryGetPopularPosts');
+        Route::post('directory/add-by-id', 'AdminController@directoryGetAddPostByIdSearch');
+        Route::delete('directory/banner-image', 'AdminController@directoryDeleteBannerImage');
+        Route::post('directory/submit', 'AdminController@directoryHandleServerSubmission');
+        Route::post('directory/testimonial/save', 'AdminController@directorySaveTestimonial');
+        Route::post('directory/testimonial/delete', 'AdminController@directoryDeleteTestimonial');
+        Route::post('directory/testimonial/update', 'AdminController@directoryUpdateTestimonial');
+        Route::get('hashtags/stats', 'AdminController@hashtagsStats');
+        Route::get('hashtags/query', 'AdminController@hashtagsApi');
+        Route::get('hashtags/get', 'AdminController@hashtagsGet');
+        Route::post('hashtags/update', 'AdminController@hashtagsUpdate');
+        Route::post('hashtags/clear-trending-cache', 'AdminController@hashtagsClearTrendingCache');
+        Route::get('instances/get', 'AdminController@getInstancesApi');
+        Route::get('instances/stats', 'AdminController@getInstancesStatsApi');
+        Route::get('instances/query', 'AdminController@getInstancesQueryApi');
+        Route::post('instances/update', 'AdminController@postInstanceUpdateApi');
+        Route::post('instances/create', 'AdminController@postInstanceCreateNewApi');
+        Route::post('instances/delete', 'AdminController@postInstanceDeleteApi');
+        Route::post('instances/refresh-stats', 'AdminController@postInstanceRefreshStatsApi');
+        Route::get('instances/download-backup', 'AdminController@downloadBackup');
+        Route::post('instances/import-data', 'AdminController@importBackup');
+        Route::get('reports/moderated-profiles', 'AdminController@getModeratedProfiles');
+        Route::post('reports/moderated-profiles/update', 'AdminController@updateModeratedProfile');
+        Route::post('reports/moderated-profiles/create', 'AdminController@createModeratedProfile');
+        Route::get('reports/moderated-profiles/show', 'AdminController@getModeratedProfile');
+        Route::post('reports/moderated-profiles/delete', 'AdminController@deleteModeratedProfile');
+        Route::get('reports/moderated-profiles/export', 'AdminController@exportModeratedProfiles');
+        Route::get('reports/stats', 'AdminController@reportsStats');
+        Route::get('reports/all', 'AdminController@reportsApiAll');
+        Route::get('reports/remote', 'AdminController@reportsApiRemote');
+        Route::post('reports/remote/handle', 'AdminController@reportsApiRemoteHandle');
+        Route::get('reports/get/{id}', 'AdminController@reportsApiGet');
+        Route::post('reports/handle', 'AdminController@reportsApiHandle');
+        Route::get('reports/spam/all', 'AdminController@reportsApiSpamAll');
+        Route::get('reports/spam/get/{id}', 'AdminController@reportsApiSpamGet');
+        Route::post('reports/spam/handle', 'AdminController@reportsApiSpamHandle');
+        Route::post('autospam/config', 'AdminController@getAutospamConfigApi');
+        Route::post('autospam/reports/closed', 'AdminController@getAutospamReportsClosedApi');
+        Route::post('autospam/train', 'AdminController@postAutospamTrainSpamApi');
+        Route::post('autospam/search/non-spam', 'AdminController@postAutospamTrainNonSpamSearchApi');
+        Route::post('autospam/train/non-spam', 'AdminController@postAutospamTrainNonSpamSubmitApi');
+        Route::post('autospam/tokens/custom', 'AdminController@getAutospamCustomTokensApi');
+        Route::post('autospam/tokens/store', 'AdminController@saveNewAutospamCustomTokensApi');
+        Route::post('autospam/tokens/update', 'AdminController@updateAutospamCustomTokensApi');
+        Route::post('autospam/tokens/export', 'AdminController@exportAutospamCustomTokensApi');
+        Route::post('autospam/config/enable', 'AdminController@enableAutospamApi');
+        Route::post('autospam/config/disable', 'AdminController@disableAutospamApi');
+        // Route::get('instances/{id}/accounts', 'AdminController@getInstanceAccounts');
+        Route::get('curated-onboarding/show/{id}/activity-log', 'AdminCuratedRegisterController@apiActivityLog');
+        Route::post('curated-onboarding/show/{id}/message/preview', 'AdminCuratedRegisterController@apiMessagePreviewStore');
+        Route::post('curated-onboarding/show/{id}/message/send', 'AdminCuratedRegisterController@apiMessageSendStore');
+        Route::post('curated-onboarding/show/{id}/reject', 'AdminCuratedRegisterController@apiHandleReject');
+        Route::post('curated-onboarding/show/{id}/approve', 'AdminCuratedRegisterController@apiHandleApprove');
+        Route::get('curated-onboarding/templates/get', 'AdminCuratedRegisterController@getActiveTemplates');
+        Route::get('settings/fetch', 'AdminController@settingsApiFetch');
+        Route::post('settings/rules/add', 'AdminController@settingsApiRulesAdd');
+        Route::post('settings/rules/delete', 'AdminController@settingsApiRulesDelete');
+        Route::post('settings/rules/delete/all', 'AdminController@settingsApiRulesDeleteAll');
+        Route::post('settings/autofollow/add', 'AdminController@settingsApiAutofollowAdd');
+        Route::post('settings/autofollow/delete', 'AdminController@settingsApiAutofollowDelete');
+        Route::post('settings/update/{type}', 'AdminController@settingsApiUpdateType');
+    });
+});
diff --git a/routes/web-api.php b/routes/web-api.php
new file mode 100644
index 000000000..4b0595c66
--- /dev/null
+++ b/routes/web-api.php
@@ -0,0 +1,174 @@
+<?php
+
+use App\Http\Controllers\SoftwareUpdateController;
+
+Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofactor', 'localization'])->group(function () {
+    Route::group(['prefix' => 'api'], function () {
+        Route::get('search', 'SearchController@searchAPI');
+        Route::post('status/view', 'StatusController@storeView');
+        Route::get('v1/polls/{id}', 'PollController@getPoll');
+        Route::post('v1/polls/{id}/votes', 'PollController@vote');
+
+        Route::group(['prefix' => 'web-admin'], function() {
+            Route::get('software-update/check', [SoftwareUpdateController::class, 'getSoftwareUpdateCheck']);
+        });
+
+        Route::group(['prefix' => 'compose'], function() {
+            Route::group(['prefix' => 'v0'], function() {
+                Route::post('/media/upload', 'ComposeController@mediaUpload');
+                Route::post('/media/update', 'ComposeController@mediaUpdate');
+                Route::delete('/media/delete', 'ComposeController@mediaDelete');
+                Route::get('/search/tag', 'ComposeController@searchTag');
+                Route::get('/search/location', 'ComposeController@searchLocation');
+                Route::get('/search/mention', 'ComposeController@searchMentionAutocomplete');
+                Route::get('/search/hashtag', 'ComposeController@searchHashtagAutocomplete');
+
+                Route::post('/publish', 'ComposeController@store');
+                Route::post('/publish/text', 'ComposeController@storeText');
+                Route::get('/media/processing', 'ComposeController@mediaProcessingCheck');
+                Route::get('/settings', 'ComposeController@composeSettings');
+                Route::post('/poll', 'ComposeController@createPoll');
+            });
+        });
+
+        Route::group(['prefix' => 'direct'], function () {
+            Route::get('browse', 'DirectMessageController@browse');
+            Route::post('create', 'DirectMessageController@create');
+            Route::get('thread', 'DirectMessageController@thread');
+            Route::post('mute', 'DirectMessageController@mute');
+            Route::post('unmute', 'DirectMessageController@unmute');
+            Route::delete('message', 'DirectMessageController@delete');
+            Route::post('media', 'DirectMessageController@mediaUpload');
+            Route::post('lookup', 'DirectMessageController@composeLookup');
+            Route::post('read', 'DirectMessageController@read');
+        });
+
+        Route::group(['prefix' => 'v2'], function() {
+            Route::get('config', 'ApiController@siteConfiguration');
+            Route::get('discover', 'InternalApiController@discover');
+            Route::get('discover/posts', 'InternalApiController@discoverPosts')->middleware('auth:api');
+            Route::get('profile/{username}/status/{postid}', 'PublicApiController@status');
+            Route::get('profile/{username}/status/{postid}/state', 'PublicApiController@statusState');
+            Route::get('comments/{username}/status/{postId}', 'PublicApiController@statusComments');
+            Route::get('status/{id}/replies', 'InternalApiController@statusReplies');
+            Route::post('moderator/action', 'InternalApiController@modAction');
+            Route::get('discover/categories', 'InternalApiController@discoverCategories');
+            Route::get('loops', 'DiscoverController@loopsApi');
+            Route::post('loops/watch', 'DiscoverController@loopWatch');
+            Route::get('discover/tag', 'DiscoverController@getHashtags');
+            Route::get('statuses/{id}/replies', 'Api\ApiV1Controller@statusReplies');
+            Route::get('statuses/{id}/state', 'Api\ApiV1Controller@statusState');
+        });
+
+        Route::group(['prefix' => 'pixelfed'], function() {
+            Route::group(['prefix' => 'v1'], function() {
+                Route::get('accounts/verify_credentials', 'ApiController@verifyCredentials');
+                Route::get('accounts/relationships', 'Api\ApiV1Controller@accountRelationshipsById');
+                Route::get('accounts/search', 'Api\ApiV1Controller@accountSearch');
+                Route::get('accounts/{id}/statuses', 'PublicApiController@accountStatuses');
+                Route::post('accounts/{id}/block', 'Api\ApiV1Controller@accountBlockById');
+                Route::post('accounts/{id}/unblock', 'Api\ApiV1Controller@accountUnblockById');
+                Route::get('statuses/{id}', 'PublicApiController@getStatus');
+                Route::get('accounts/{id}', 'PublicApiController@account');
+                Route::post('avatar/update', 'ApiController@avatarUpdate');
+                Route::get('custom_emojis', 'Api\ApiV1Controller@customEmojis');
+                Route::get('notifications', 'ApiController@notifications');
+                Route::get('timelines/public', 'PublicApiController@publicTimelineApi');
+                Route::get('timelines/home', 'PublicApiController@homeTimelineApi');
+                Route::get('timelines/network', 'PublicApiController@networkTimelineApi');
+                Route::get('newsroom/timeline', 'NewsroomController@timelineApi');
+                Route::post('newsroom/markasread', 'NewsroomController@markAsRead');
+                Route::get('favourites', 'Api\BaseApiController@accountLikes');
+                Route::get('mutes', 'AccountController@accountMutes');
+                Route::get('blocks', 'AccountController@accountBlocks');
+            });
+
+            Route::group(['prefix' => 'v2'], function() {
+                Route::get('config', 'ApiController@siteConfiguration');
+                Route::get('discover', 'InternalApiController@discover');
+                Route::get('discover/posts', 'InternalApiController@discoverPosts');
+                Route::get('discover/profiles', 'DiscoverController@profilesDirectoryApi');
+                Route::get('profile/{username}/status/{postid}', 'PublicApiController@status');
+                Route::get('comments/{username}/status/{postId}', 'PublicApiController@statusComments');
+                Route::post('moderator/action', 'InternalApiController@modAction');
+                Route::get('discover/categories', 'InternalApiController@discoverCategories');
+                Route::get('loops', 'DiscoverController@loopsApi');
+                Route::post('loops/watch', 'DiscoverController@loopWatch');
+                Route::get('discover/tag', 'DiscoverController@getHashtags');
+                Route::get('discover/posts/trending', 'DiscoverController@trendingApi');
+                Route::get('discover/posts/hashtags', 'DiscoverController@trendingHashtags');
+                Route::get('discover/posts/places', 'DiscoverController@trendingPlaces');
+                Route::get('seasonal/yir', 'SeasonalController@getData');
+                Route::post('seasonal/yir', 'SeasonalController@store');
+                Route::get('mutes', 'AccountController@accountMutesV2');
+                Route::get('blocks', 'AccountController@accountBlocksV2');
+                Route::get('filters', 'AccountController@accountFiltersV2');
+                Route::post('status/compose', 'InternalApiController@composePost');
+                Route::get('status/{id}/replies', 'InternalApiController@statusReplies');
+                Route::post('status/{id}/archive', 'ApiController@archive');
+                Route::post('status/{id}/unarchive', 'ApiController@unarchive');
+                Route::get('statuses/archives', 'ApiController@archivedPosts');
+                Route::get('discover/memories', 'DiscoverController@myMemories');
+                Route::get('discover/account-insights', 'DiscoverController@accountInsightsPopularPosts');
+                Route::get('discover/server-timeline', 'DiscoverController@serverTimeline');
+                Route::get('discover/meta', 'DiscoverController@enabledFeatures');
+                Route::post('discover/admin/features', 'DiscoverController@updateFeatures');
+            });
+
+            Route::get('discover/accounts/popular', 'DiscoverController@discoverAccountsPopular');
+            Route::post('web/change-language.json', 'SpaController@updateLanguage');
+        });
+
+        Route::group(['prefix' => 'local'], function () {
+            // Route::post('status/compose', 'InternalApiController@composePost')->middleware('throttle:maxPostsPerHour,60')->middleware('throttle:maxPostsPerDay,1440');
+            Route::get('exp/rec', 'ApiController@userRecommendations');
+            Route::post('discover/tag/subscribe', 'HashtagFollowController@store');
+            Route::get('discover/tag/list', 'HashtagFollowController@getTags');
+            // Route::get('profile/sponsor/{id}', 'ProfileSponsorController@get');
+            Route::get('bookmarks', 'InternalApiController@bookmarks');
+            Route::get('collection/items/{id}', 'CollectionController@getItems');
+            Route::post('collection/item', 'CollectionController@storeId');
+            Route::delete('collection/item', 'CollectionController@deleteId');
+            Route::get('collection/{id}', 'CollectionController@getCollection');
+            Route::post('collection/{id}', 'CollectionController@store');
+            Route::delete('collection/{id}', 'CollectionController@delete');
+            Route::post('collection/{id}/publish', 'CollectionController@publish');
+            Route::get('profile/collections/{id}', 'CollectionController@getUserCollections');
+
+            Route::post('compose/tag/untagme', 'MediaTagController@untagProfile');
+
+            Route::post('import/ig', 'ImportPostController@store');
+            Route::get('import/ig/config', 'ImportPostController@getConfig');
+            Route::post('import/ig/media', 'ImportPostController@storeMedia');
+            Route::post('import/ig/existing', 'ImportPostController@getImportedFiles');
+            Route::post('import/ig/posts', 'ImportPostController@getImportedPosts');
+            Route::post('import/ig/processing', 'ImportPostController@getProcessingCount');
+        });
+
+        Route::group(['prefix' => 'web/stories'], function () {
+            Route::get('v1/recent', 'StoryController@recent');
+            Route::get('v1/viewers', 'StoryController@viewers');
+            Route::get('v1/profile/{id}', 'StoryController@profile');
+            Route::get('v1/exists/{id}', 'StoryController@exists');
+            Route::get('v1/poll/results', 'StoryController@pollResults');
+            Route::post('v1/viewed', 'StoryController@viewed');
+            Route::post('v1/react', 'StoryController@react');
+            Route::post('v1/comment', 'StoryController@comment');
+            Route::post('v1/publish/poll', 'StoryController@publishStoryPoll');
+            Route::post('v1/poll/vote', 'StoryController@storyPollVote');
+            Route::post('v1/report', 'StoryController@storeReport');
+            Route::post('v1/add', 'StoryController@apiV1Add');
+            Route::post('v1/crop', 'StoryController@cropPhoto');
+            Route::post('v1/publish', 'StoryController@publishStory');
+            Route::delete('v1/delete/{id}', 'StoryController@apiV1Delete');
+        });
+
+        Route::group(['prefix' => 'portfolio'], function () {
+            Route::post('self/curated.json', 'PortfolioController@storeCurated');
+            Route::post('self/settings.json', 'PortfolioController@getSettings');
+            Route::get('account/settings.json', 'PortfolioController@getAccountSettings');
+            Route::post('self/update-settings.json', 'PortfolioController@storeSettings');
+            Route::get('{username}/feed', 'PortfolioController@getFeed');
+        });
+    });
+});
diff --git a/routes/web-portfolio.php b/routes/web-portfolio.php
new file mode 100644
index 000000000..3785aaac1
--- /dev/null
+++ b/routes/web-portfolio.php
@@ -0,0 +1,23 @@
+<?php
+
+Route::domain(config('portfolio.domain'))->group(function () {
+    Route::redirect('redirect/home', config('app.url'));
+    Route::get('/', 'PortfolioController@index');
+    Route::post('api/portfolio/self/curated.json', 'PortfolioController@storeCurated');
+    Route::post('api/portfolio/self/settings.json', 'PortfolioController@getSettings');
+    Route::get('api/portfolio/account/settings.json', 'PortfolioController@getAccountSettings');
+    Route::post('api/portfolio/self/update-settings.json', 'PortfolioController@storeSettings');
+    Route::get('api/portfolio/{username}/feed', 'PortfolioController@getFeed');
+
+    Route::prefix(config('portfolio.path'))->group(function() {
+        Route::get('/', 'PortfolioController@index');
+        Route::get('settings', 'PortfolioController@settings')->name('portfolio.settings');
+        Route::post('settings', 'PortfolioController@store');
+        Route::get('{username}/{id}', 'PortfolioController@showPost');
+        Route::get('{username}', 'PortfolioController@show');
+
+        Route::fallback(function () {
+            return view('errors.404');
+        });
+    });
+});
diff --git a/routes/web.php b/routes/web.php
index b823b8729..b9fbad7d9 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,186 +1,13 @@
 <?php
 
-Route::domain(config('pixelfed.domain.admin'))->prefix('i/admin')->group(function () {
-	Route::redirect('/', '/dashboard');
-	Route::redirect('timeline', config('app.url').'/timeline');
-	Route::get('dashboard', 'AdminController@home')->name('admin.home');
-	Route::get('stats', 'AdminController@stats')->name('admin.stats');
-	Route::get('reports', 'AdminController@reports')->name('admin.reports');
-	Route::get('reports/show/{id}', 'AdminController@showReport');
-	Route::post('reports/show/{id}', 'AdminController@updateReport');
-	Route::post('reports/bulk', 'AdminController@bulkUpdateReport');
-	Route::get('reports/autospam/{id}', 'AdminController@showSpam');
-	Route::post('reports/autospam/sync', 'AdminController@fixUncategorizedSpam');
-	Route::post('reports/autospam/{id}', 'AdminController@updateSpam');
-	Route::get('reports/autospam', 'AdminController@spam');
-	Route::get('reports/appeals', 'AdminController@appeals');
-	Route::get('reports/appeal/{id}', 'AdminController@showAppeal');
-	Route::post('reports/appeal/{id}', 'AdminController@updateAppeal');
-	Route::get('reports/email-verifications', 'AdminController@reportMailVerifications');
-	Route::post('reports/email-verifications/ignore', 'AdminController@reportMailVerifyIgnore');
-	Route::post('reports/email-verifications/approve', 'AdminController@reportMailVerifyApprove');
-	Route::post('reports/email-verifications/clear-ignored', 'AdminController@reportMailVerifyClearIgnored');
-	Route::redirect('stories', '/stories/list');
-	Route::get('stories/list', 'AdminController@stories')->name('admin.stories');
-	Route::redirect('statuses', '/statuses/list');
-	Route::get('statuses/list', 'AdminController@statuses')->name('admin.statuses');
-	Route::get('statuses/show/{id}', 'AdminController@showStatus');
-	Route::redirect('profiles', '/i/admin/profiles/list');
-	Route::get('profiles/list', 'AdminController@profiles')->name('admin.profiles');
-	Route::get('profiles/edit/{id}', 'AdminController@profileShow');
-	Route::redirect('users', '/users/list');
-	Route::get('users/list', 'AdminController@users')->name('admin.users');
-	Route::get('users/show/{id}', 'AdminController@userShow');
-	Route::get('users/edit/{id}', 'AdminController@userEdit');
-	Route::post('users/edit/{id}', 'AdminController@userEditSubmit');
-	Route::get('users/activity/{id}', 'AdminController@userActivity');
-	Route::get('users/message/{id}', 'AdminController@userMessage');
-	Route::post('users/message/{id}', 'AdminController@userMessageSend');
-	Route::get('users/modtools/{id}', 'AdminController@userModTools');
-	Route::get('users/modlogs/{id}', 'AdminController@userModLogs');
-	Route::post('users/modlogs/{id}', 'AdminController@userModLogsMessage');
-	Route::post('users/modlogs/{id}/delete', 'AdminController@userModLogDelete');
-	Route::get('users/delete/{id}', 'AdminController@userDelete');
-	Route::post('users/delete/{id}', 'AdminController@userDeleteProcess');
-	Route::post('users/moderation/update', 'AdminController@userModerate');
-	Route::get('media', 'AdminController@media')->name('admin.media');
-	Route::redirect('media/list', '/i/admin/media');
-	Route::get('media/show/{id}', 'AdminController@mediaShow');
-	Route::get('settings', 'AdminController@settings')->name('admin.settings');
-	Route::post('settings', 'AdminController@settingsHomeStore');
-	Route::get('settings/features', 'AdminController@settingsFeatures')->name('admin.settings.features');
-	Route::get('settings/pages', 'AdminController@settingsPages')->name('admin.settings.pages');
-	Route::get('settings/pages/edit', 'PageController@edit')->name('admin.settings.pages.edit');
-	Route::post('settings/pages/edit', 'PageController@store');
-	Route::post('settings/pages/delete', 'PageController@delete');
-	Route::post('settings/pages/create', 'PageController@generatePage');
-	Route::get('settings/maintenance', 'AdminController@settingsMaintenance')->name('admin.settings.maintenance');
-	Route::get('settings/backups', 'AdminController@settingsBackups')->name('admin.settings.backups');
-	Route::get('settings/storage', 'AdminController@settingsStorage')->name('admin.settings.storage');
-	Route::get('settings/system', 'AdminController@settingsSystem')->name('admin.settings.system');
-
-	Route::get('instances', 'AdminController@instances')->name('admin.instances');
-	Route::post('instances', 'AdminController@instanceScan');
-	Route::get('instances/show/{id}', 'AdminController@instanceShow');
-	Route::post('instances/edit/{id}', 'AdminController@instanceEdit');
-	Route::get('apps/home', 'AdminController@appsHome')->name('admin.apps');
-	Route::get('hashtags/home', 'AdminController@hashtagsHome')->name('admin.hashtags');
-	Route::get('discover/home', 'AdminController@discoverHome')->name('admin.discover');
-	Route::get('discover/category/create', 'AdminController@discoverCreateCategory')->name('admin.discover.create-category');
-	Route::post('discover/category/create', 'AdminController@discoverCreateCategoryStore');
-	Route::get('discover/category/edit/{id}', 'AdminController@discoverCategoryEdit');
-	Route::post('discover/category/edit/{id}', 'AdminController@discoverCategoryUpdate');
-	Route::post('discover/category/hashtag/create', 'AdminController@discoveryCategoryTagStore')->name('admin.discover.create-hashtag');
-
-	Route::get('messages/home', 'AdminController@messagesHome')->name('admin.messages');
-	Route::get('messages/show/{id}', 'AdminController@messagesShow');
-	Route::post('messages/mark-read', 'AdminController@messagesMarkRead');
-	Route::redirect('site-news', '/i/admin/newsroom');
-	Route::get('newsroom', 'AdminController@newsroomHome')->name('admin.newsroom.home');
-	Route::get('newsroom/create', 'AdminController@newsroomCreate')->name('admin.newsroom.create');
-	Route::get('newsroom/edit/{id}', 'AdminController@newsroomEdit');
-	Route::post('newsroom/edit/{id}', 'AdminController@newsroomUpdate');
-	Route::delete('newsroom/edit/{id}', 'AdminController@newsroomDelete');
-	Route::post('newsroom/create', 'AdminController@newsroomStore');
-
-	Route::get('diagnostics/home', 'AdminController@diagnosticsHome')->name('admin.diagnostics');
-	Route::post('diagnostics/decrypt', 'AdminController@diagnosticsDecrypt')->name('admin.diagnostics.decrypt');
-	Route::get('custom-emoji/home', 'AdminController@customEmojiHome')->name('admin.custom-emoji');
-	Route::post('custom-emoji/toggle-active/{id}', 'AdminController@customEmojiToggleActive');
-	Route::get('custom-emoji/new', 'AdminController@customEmojiAdd');
-	Route::post('custom-emoji/new', 'AdminController@customEmojiStore');
-	Route::post('custom-emoji/delete/{id}', 'AdminController@customEmojiDelete');
-	Route::get('custom-emoji/duplicates/{id}', 'AdminController@customEmojiShowDuplicates');
-
-	Route::get('directory/home', 'AdminController@directoryHome')->name('admin.directory');
-
-	Route::get('autospam/home', 'AdminController@autospamHome')->name('admin.autospam');
-
-    Route::redirect('asf/', 'asf/home');
-    Route::get('asf/home', 'AdminShadowFilterController@home');
-    Route::get('asf/create', 'AdminShadowFilterController@create');
-    Route::get('asf/edit/{id}', 'AdminShadowFilterController@edit');
-    Route::post('asf/edit/{id}', 'AdminShadowFilterController@storeEdit');
-    Route::post('asf/create', 'AdminShadowFilterController@store');
-
-	Route::prefix('api')->group(function() {
-		Route::get('stats', 'AdminController@getStats');
-		Route::get('accounts', 'AdminController@getAccounts');
-		Route::get('posts', 'AdminController@getPosts');
-		Route::get('instances', 'AdminController@getInstances');
-		Route::post('directory/save', 'AdminController@directoryStore');
-		Route::get('directory/initial-data', 'AdminController@directoryInitialData');
-		Route::get('directory/popular-posts', 'AdminController@directoryGetPopularPosts');
-		Route::post('directory/add-by-id', 'AdminController@directoryGetAddPostByIdSearch');
-		Route::delete('directory/banner-image', 'AdminController@directoryDeleteBannerImage');
-		Route::post('directory/submit', 'AdminController@directoryHandleServerSubmission');
-		Route::post('directory/testimonial/save', 'AdminController@directorySaveTestimonial');
-		Route::post('directory/testimonial/delete', 'AdminController@directoryDeleteTestimonial');
-		Route::post('directory/testimonial/update', 'AdminController@directoryUpdateTestimonial');
-		Route::get('hashtags/stats', 'AdminController@hashtagsStats');
-		Route::get('hashtags/query', 'AdminController@hashtagsApi');
-		Route::get('hashtags/get', 'AdminController@hashtagsGet');
-		Route::post('hashtags/update', 'AdminController@hashtagsUpdate');
-		Route::post('hashtags/clear-trending-cache', 'AdminController@hashtagsClearTrendingCache');
-		Route::get('instances/get', 'AdminController@getInstancesApi');
-		Route::get('instances/stats', 'AdminController@getInstancesStatsApi');
-		Route::get('instances/query', 'AdminController@getInstancesQueryApi');
-		Route::post('instances/update', 'AdminController@postInstanceUpdateApi');
-		Route::post('instances/create', 'AdminController@postInstanceCreateNewApi');
-		Route::post('instances/delete', 'AdminController@postInstanceDeleteApi');
-		Route::post('instances/refresh-stats', 'AdminController@postInstanceRefreshStatsApi');
-		Route::get('instances/download-backup', 'AdminController@downloadBackup');
-		Route::post('instances/import-data', 'AdminController@importBackup');
-		Route::get('reports/stats', 'AdminController@reportsStats');
-		Route::get('reports/all', 'AdminController@reportsApiAll');
-		Route::get('reports/get/{id}', 'AdminController@reportsApiGet');
-		Route::post('reports/handle', 'AdminController@reportsApiHandle');
-		Route::get('reports/spam/all', 'AdminController@reportsApiSpamAll');
-		Route::get('reports/spam/get/{id}', 'AdminController@reportsApiSpamGet');
-		Route::post('reports/spam/handle', 'AdminController@reportsApiSpamHandle');
-		Route::post('autospam/config', 'AdminController@getAutospamConfigApi');
-		Route::post('autospam/reports/closed', 'AdminController@getAutospamReportsClosedApi');
-		Route::post('autospam/train', 'AdminController@postAutospamTrainSpamApi');
-		Route::post('autospam/search/non-spam', 'AdminController@postAutospamTrainNonSpamSearchApi');
-		Route::post('autospam/train/non-spam', 'AdminController@postAutospamTrainNonSpamSubmitApi');
-		Route::post('autospam/tokens/custom', 'AdminController@getAutospamCustomTokensApi');
-		Route::post('autospam/tokens/store', 'AdminController@saveNewAutospamCustomTokensApi');
-		Route::post('autospam/tokens/update', 'AdminController@updateAutospamCustomTokensApi');
-		Route::post('autospam/tokens/export', 'AdminController@exportAutospamCustomTokensApi');
-		Route::post('autospam/config/enable', 'AdminController@enableAutospamApi');
-		Route::post('autospam/config/disable', 'AdminController@disableAutospamApi');
-	});
-});
-
-Route::domain(config('portfolio.domain'))->group(function () {
-	Route::redirect('redirect/home', config('app.url'));
-	Route::get('/', 'PortfolioController@index');
-	Route::post('api/portfolio/self/curated.json', 'PortfolioController@storeCurated');
-	Route::post('api/portfolio/self/settings.json', 'PortfolioController@getSettings');
-	Route::get('api/portfolio/account/settings.json', 'PortfolioController@getAccountSettings');
-	Route::post('api/portfolio/self/update-settings.json', 'PortfolioController@storeSettings');
-	Route::get('api/portfolio/{username}/feed', 'PortfolioController@getFeed');
-
-	Route::prefix(config('portfolio.path'))->group(function() {
-		Route::get('/', 'PortfolioController@index');
-		Route::get('settings', 'PortfolioController@settings')->name('portfolio.settings');
-		Route::post('settings', 'PortfolioController@store');
-		Route::get('{username}/{id}', 'PortfolioController@showPost');
-		Route::get('{username}', 'PortfolioController@show');
-
-		Route::fallback(function () {
-			return view('errors.404');
-		});
-	});
-});
-
 Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofactor', 'localization'])->group(function () {
-	Route::get('/', 'SiteController@home')->name('timeline.personal');
-	Route::redirect('/home', '/')->name('home');
-	Route::get('web/directory', 'LandingController@directoryRedirect');
-	Route::get('web/explore', 'LandingController@exploreRedirect');
+    Route::get('/', 'SiteController@home')->name('timeline.personal');
+    Route::redirect('/home', '/')->name('home');
+    Route::get('web/directory', 'LandingController@directoryRedirect');
+    Route::get('web/explore', 'LandingController@exploreRedirect');
+    Route::get('authorize_interaction', 'AuthorizeInteractionController@get');
 
-	Auth::routes();
+    Auth::routes();
     Route::get('auth/raw/mastodon/start', 'RemoteAuthController@startRedirect');
     Route::post('auth/raw/mastodon/config', 'RemoteAuthController@getConfig');
     Route::post('auth/raw/mastodon/domains', 'RemoteAuthController@getAuthDomains');
@@ -200,475 +27,461 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
     Route::post('auth/raw/mastodon/s/account-to-id', 'RemoteAuthController@accountToId');
     Route::post('auth/raw/mastodon/s/finish-up', 'RemoteAuthController@finishUp');
     Route::post('auth/raw/mastodon/s/login', 'RemoteAuthController@handleLogin');
+    Route::get('auth/pci/{id}/{code}', 'ParentalControlsController@inviteRegister');
+    Route::post('auth/pci/{id}/{code}', 'ParentalControlsController@inviteRegisterStore');
 
-	Route::get('discover', 'DiscoverController@home')->name('discover');
+    Route::get('auth/sign_up', 'SiteController@curatedOnboarding')->name('auth.curated-onboarding');
+    Route::post('auth/sign_up', 'CuratedRegisterController@proceed');
+    Route::get('auth/sign_up/concierge/response-sent', 'CuratedRegisterController@conciergeResponseSent');
+    Route::get('auth/sign_up/concierge', 'CuratedRegisterController@concierge');
+    Route::post('auth/sign_up/concierge', 'CuratedRegisterController@conciergeStore');
+    Route::get('auth/sign_up/concierge/form', 'CuratedRegisterController@conciergeFormShow');
+    Route::post('auth/sign_up/concierge/form', 'CuratedRegisterController@conciergeFormStore');
+    Route::get('auth/sign_up/confirm', 'CuratedRegisterController@confirmEmail');
+    Route::post('auth/sign_up/confirm', 'CuratedRegisterController@confirmEmailHandle');
+    Route::get('auth/sign_up/confirmed', 'CuratedRegisterController@emailConfirmed');
+    Route::get('auth/sign_up/resend-confirmation', 'CuratedRegisterController@resendConfirmation');
+    Route::post('auth/sign_up/resend-confirmation', 'CuratedRegisterController@resendConfirmationProcess');
+    Route::get('auth/forgot/email', 'UserEmailForgotController@index')->name('email.forgot');
+    Route::post('auth/forgot/email', 'UserEmailForgotController@store')->middleware('throttle:10,900,forgotEmail');
 
-	Route::group(['prefix' => 'api'], function () {
-		Route::get('search', 'SearchController@searchAPI');
-		Route::post('status/view', 'StatusController@storeView');
-		Route::get('v1/polls/{id}', 'PollController@getPoll');
-		Route::post('v1/polls/{id}/votes', 'PollController@vote');
+    Route::group([
+        'as' => 'passport.',
+        'prefix' => config('passport.path', 'oauth'),
+    ], function () {
+        Route::post('/token', [
+            'uses' => '\Laravel\Passport\Http\Controllers\AccessTokenController@issueToken',
+            'as' => 'token',
+            'middleware' => 'throttle',
+        ]);
 
-		Route::group(['prefix' => 'compose'], function() {
-			Route::group(['prefix' => 'v0'], function() {
-				Route::post('/media/upload', 'ComposeController@mediaUpload');
-				Route::post('/media/update', 'ComposeController@mediaUpdate');
-				Route::delete('/media/delete', 'ComposeController@mediaDelete');
-				Route::get('/search/tag', 'ComposeController@searchTag');
-				Route::get('/search/location', 'ComposeController@searchLocation');
-				Route::get('/search/mention', 'ComposeController@searchMentionAutocomplete');
-				Route::get('/search/hashtag', 'ComposeController@searchHashtagAutocomplete');
+        Route::get('/authorize', [
+            'uses' => '\Laravel\Passport\Http\Controllers\AuthorizationController@authorize',
+            'as' => 'authorizations.authorize',
+            'middleware' => 'web',
+        ]);
 
-				Route::post('/publish', 'ComposeController@store');
-				Route::post('/publish/text', 'ComposeController@storeText');
-				Route::get('/media/processing', 'ComposeController@mediaProcessingCheck');
-				Route::get('/settings', 'ComposeController@composeSettings');
-				Route::post('/poll', 'ComposeController@createPoll');
-			});
-		});
+        $guard = config('passport.guard', null);
 
-		Route::group(['prefix' => 'direct'], function () {
-			Route::get('browse', 'DirectMessageController@browse');
-			Route::post('create', 'DirectMessageController@create');
-			Route::get('thread', 'DirectMessageController@thread');
-			Route::post('mute', 'DirectMessageController@mute');
-			Route::post('unmute', 'DirectMessageController@unmute');
-			Route::delete('message', 'DirectMessageController@delete');
-			Route::post('media', 'DirectMessageController@mediaUpload');
-			Route::post('lookup', 'DirectMessageController@composeLookup');
-			Route::post('read', 'DirectMessageController@read');
-		});
+        Route::middleware(['web', $guard ? 'auth:'.$guard : 'auth'])->group(function () {
+            Route::post('/token/refresh', [
+                'uses' => '\Laravel\Passport\Http\Controllers\TransientTokenController@refresh',
+                'as' => 'token.refresh',
+            ]);
 
-		Route::group(['prefix' => 'v2'], function() {
-			Route::get('config', 'ApiController@siteConfiguration');
-			Route::get('discover', 'InternalApiController@discover');
-			Route::get('discover/posts', 'InternalApiController@discoverPosts')->middleware('auth:api');
-			Route::get('profile/{username}/status/{postid}', 'PublicApiController@status');
-			Route::get('profile/{username}/status/{postid}/state', 'PublicApiController@statusState');
-			Route::get('comments/{username}/status/{postId}', 'PublicApiController@statusComments');
-			Route::get('status/{id}/replies', 'InternalApiController@statusReplies');
-			Route::post('moderator/action', 'InternalApiController@modAction');
-			Route::get('discover/categories', 'InternalApiController@discoverCategories');
-			Route::get('loops', 'DiscoverController@loopsApi');
-			Route::post('loops/watch', 'DiscoverController@loopWatch');
-			Route::get('discover/tag', 'DiscoverController@getHashtags');
-			Route::get('statuses/{id}/replies', 'Api\ApiV1Controller@statusReplies');
-			Route::get('statuses/{id}/state', 'Api\ApiV1Controller@statusState');
-		});
+            Route::post('/authorize', [
+                'uses' => '\App\Http\Controllers\OAuth\OobAuthorizationController@approve',
+                'as' => 'authorizations.approve',
+            ]);
 
-		Route::group(['prefix' => 'pixelfed'], function() {
-			Route::group(['prefix' => 'v1'], function() {
-				Route::get('accounts/verify_credentials', 'ApiController@verifyCredentials');
-				Route::get('accounts/relationships', 'Api\ApiV1Controller@accountRelationshipsById');
-				Route::get('accounts/search', 'Api\ApiV1Controller@accountSearch');
-				Route::get('accounts/{id}/statuses', 'PublicApiController@accountStatuses');
-				Route::post('accounts/{id}/block', 'Api\ApiV1Controller@accountBlockById');
-				Route::post('accounts/{id}/unblock', 'Api\ApiV1Controller@accountUnblockById');
-				Route::get('statuses/{id}', 'PublicApiController@getStatus');
-				Route::get('accounts/{id}', 'PublicApiController@account');
-				Route::post('avatar/update', 'ApiController@avatarUpdate');
-				Route::get('custom_emojis', 'Api\ApiV1Controller@customEmojis');
-				Route::get('notifications', 'ApiController@notifications');
-				Route::get('timelines/public', 'PublicApiController@publicTimelineApi');
-				Route::get('timelines/home', 'PublicApiController@homeTimelineApi');
-				Route::get('timelines/network', 'PublicApiController@networkTimelineApi');
-				Route::get('newsroom/timeline', 'NewsroomController@timelineApi');
-				Route::post('newsroom/markasread', 'NewsroomController@markAsRead');
-				Route::get('favourites', 'Api\BaseApiController@accountLikes');
-				Route::get('mutes', 'AccountController@accountMutes');
-				Route::get('blocks', 'AccountController@accountBlocks');
-			});
+            Route::delete('/authorize', [
+                'uses' => '\Laravel\Passport\Http\Controllers\DenyAuthorizationController@deny',
+                'as' => 'authorizations.deny',
+            ]);
 
-			Route::group(['prefix' => 'v2'], function() {
-				Route::get('config', 'ApiController@siteConfiguration');
-				Route::get('discover', 'InternalApiController@discover');
-				Route::get('discover/posts', 'InternalApiController@discoverPosts');
-				Route::get('discover/profiles', 'DiscoverController@profilesDirectoryApi');
-				Route::get('profile/{username}/status/{postid}', 'PublicApiController@status');
-				Route::get('comments/{username}/status/{postId}', 'PublicApiController@statusComments');
-				Route::post('moderator/action', 'InternalApiController@modAction');
-				Route::get('discover/categories', 'InternalApiController@discoverCategories');
-				Route::get('loops', 'DiscoverController@loopsApi');
-				Route::post('loops/watch', 'DiscoverController@loopWatch');
-				Route::get('discover/tag', 'DiscoverController@getHashtags');
-				Route::get('discover/posts/trending', 'DiscoverController@trendingApi');
-				Route::get('discover/posts/hashtags', 'DiscoverController@trendingHashtags');
-				Route::get('discover/posts/places', 'DiscoverController@trendingPlaces');
-				Route::get('seasonal/yir', 'SeasonalController@getData');
-				Route::post('seasonal/yir', 'SeasonalController@store');
-				Route::get('mutes', 'AccountController@accountMutesV2');
-				Route::get('blocks', 'AccountController@accountBlocksV2');
-				Route::get('filters', 'AccountController@accountFiltersV2');
-				Route::post('status/compose', 'InternalApiController@composePost');
-				Route::get('status/{id}/replies', 'InternalApiController@statusReplies');
-				Route::post('status/{id}/archive', 'ApiController@archive');
-				Route::post('status/{id}/unarchive', 'ApiController@unarchive');
-				Route::get('statuses/archives', 'ApiController@archivedPosts');
-				Route::get('discover/memories', 'DiscoverController@myMemories');
-				Route::get('discover/account-insights', 'DiscoverController@accountInsightsPopularPosts');
-				Route::get('discover/server-timeline', 'DiscoverController@serverTimeline');
-				Route::get('discover/meta', 'DiscoverController@enabledFeatures');
-				Route::post('discover/admin/features', 'DiscoverController@updateFeatures');
-			});
+            Route::get('/tokens', [
+                'uses' => '\Laravel\Passport\Http\Controllers\AuthorizedAccessTokenController@forUser',
+                'as' => 'tokens.index',
+            ]);
 
-			Route::get('discover/accounts/popular', 'Api\ApiV1Controller@discoverAccountsPopular');
-			Route::post('web/change-language.json', 'SpaController@updateLanguage');
-		});
+            Route::delete('/tokens/{token_id}', [
+                'uses' => '\Laravel\Passport\Http\Controllers\AuthorizedAccessTokenController@destroy',
+                'as' => 'tokens.destroy',
+            ]);
 
-		Route::group(['prefix' => 'local'], function () {
-			// Route::post('status/compose', 'InternalApiController@composePost')->middleware('throttle:maxPostsPerHour,60')->middleware('throttle:maxPostsPerDay,1440');
-			Route::get('exp/rec', 'ApiController@userRecommendations');
-			Route::post('discover/tag/subscribe', 'HashtagFollowController@store');
-			Route::get('discover/tag/list', 'HashtagFollowController@getTags');
-			// Route::get('profile/sponsor/{id}', 'ProfileSponsorController@get');
-			Route::get('bookmarks', 'InternalApiController@bookmarks');
-			Route::get('collection/items/{id}', 'CollectionController@getItems');
-			Route::post('collection/item', 'CollectionController@storeId');
-			Route::delete('collection/item', 'CollectionController@deleteId');
-			Route::get('collection/{id}', 'CollectionController@getCollection');
-			Route::post('collection/{id}', 'CollectionController@store');
-			Route::delete('collection/{id}', 'CollectionController@delete');
-			Route::post('collection/{id}/publish', 'CollectionController@publish');
-			Route::get('profile/collections/{id}', 'CollectionController@getUserCollections');
+            Route::get('/clients', [
+                'uses' => '\Laravel\Passport\Http\Controllers\ClientController@forUser',
+                'as' => 'clients.index',
+            ]);
 
-			Route::post('compose/tag/untagme', 'MediaTagController@untagProfile');
+            Route::post('/clients', [
+                'uses' => '\Laravel\Passport\Http\Controllers\ClientController@store',
+                'as' => 'clients.store',
+            ]);
 
-			Route::post('import/ig', 'ImportPostController@store');
-			Route::get('import/ig/config', 'ImportPostController@getConfig');
-			Route::post('import/ig/media', 'ImportPostController@storeMedia');
-			Route::post('import/ig/existing', 'ImportPostController@getImportedFiles');
-			Route::post('import/ig/posts', 'ImportPostController@getImportedPosts');
-			Route::post('import/ig/processing', 'ImportPostController@getProcessingCount');
-		});
+            Route::put('/clients/{client_id}', [
+                'uses' => '\Laravel\Passport\Http\Controllers\ClientController@update',
+                'as' => 'clients.update',
+            ]);
 
-		Route::group(['prefix' => 'web/stories'], function () {
-			Route::get('v1/recent', 'StoryController@recent');
-			Route::get('v1/viewers', 'StoryController@viewers');
-			Route::get('v1/profile/{id}', 'StoryController@profile');
-			Route::get('v1/exists/{id}', 'StoryController@exists');
-			Route::get('v1/poll/results', 'StoryController@pollResults');
-			Route::post('v1/viewed', 'StoryController@viewed');
-			Route::post('v1/react', 'StoryController@react');
-			Route::post('v1/comment', 'StoryController@comment');
-			Route::post('v1/publish/poll', 'StoryController@publishStoryPoll');
-			Route::post('v1/poll/vote', 'StoryController@storyPollVote');
-			Route::post('v1/report', 'StoryController@storeReport');
-			Route::post('v1/add', 'StoryController@apiV1Add');
-			Route::post('v1/crop', 'StoryController@cropPhoto');
-			Route::post('v1/publish', 'StoryController@publishStory');
-			Route::delete('v1/delete/{id}', 'StoryController@apiV1Delete');
-		});
+            Route::delete('/clients/{client_id}', [
+                'uses' => '\Laravel\Passport\Http\Controllers\ClientController@destroy',
+                'as' => 'clients.destroy',
+            ]);
 
-		Route::group(['prefix' => 'portfolio'], function () {
-			Route::post('self/curated.json', 'PortfolioController@storeCurated');
-			Route::post('self/settings.json', 'PortfolioController@getSettings');
-			Route::get('account/settings.json', 'PortfolioController@getAccountSettings');
-			Route::post('self/update-settings.json', 'PortfolioController@storeSettings');
-			Route::get('{username}/feed', 'PortfolioController@getFeed');
-		});
-	});
+            Route::get('/scopes', [
+                'uses' => '\Laravel\Passport\Http\Controllers\ScopeController@all',
+                'as' => 'scopes.index',
+            ]);
 
-	Route::get('discover/tags/{hashtag}', 'DiscoverController@showTags');
-	Route::get('discover/places', 'PlaceController@directoryHome')->name('discover.places');
-	Route::get('discover/places/{id}/{slug}', 'PlaceController@show');
-	Route::get('discover/location/country/{country}', 'PlaceController@directoryCities');
+            Route::get('/personal-access-tokens', [
+                'uses' => '\Laravel\Passport\Http\Controllers\PersonalAccessTokenController@forUser',
+                'as' => 'personal.tokens.index',
+            ]);
 
-	Route::group(['prefix' => 'i'], function () {
-		Route::redirect('/', '/');
-		Route::get('compose', 'StatusController@compose')->name('compose');
-		Route::post('comment', 'CommentController@store');
-		Route::post('delete', 'StatusController@delete');
-		Route::post('mute', 'AccountController@mute');
-		Route::post('unmute', 'AccountController@unmute');
-		Route::post('block', 'AccountController@block');
-		Route::post('unblock', 'AccountController@unblock');
-		Route::post('like', 'LikeController@store');
-		Route::post('share', 'StatusController@storeShare');
-		Route::post('follow', 'FollowerController@store');
-		Route::post('bookmark', 'BookmarkController@store');
-		Route::get('lang/{locale}', 'SiteController@changeLocale');
-		Route::get('restored', 'AccountController@accountRestored');
+            Route::post('/personal-access-tokens', [
+                'uses' => '\Laravel\Passport\Http\Controllers\PersonalAccessTokenController@store',
+                'as' => 'personal.tokens.store',
+            ]);
 
-		Route::get('verify-email', 'AccountController@verifyEmail');
-		Route::post('verify-email', 'AccountController@sendVerifyEmail');
-		Route::get('verify-email/request', 'InternalApiController@requestEmailVerification');
-		Route::post('verify-email/request', 'InternalApiController@requestEmailVerificationStore');
-		Route::get('confirm-email/{userToken}/{randomToken}', 'AccountController@confirmVerifyEmail');
+            Route::delete('/personal-access-tokens/{token_id}', [
+                'uses' => '\Laravel\Passport\Http\Controllers\PersonalAccessTokenController@destroy',
+                'as' => 'personal.tokens.destroy',
+            ]);
+        });
 
-		Route::get('auth/sudo', 'AccountController@sudoMode');
-		Route::post('auth/sudo', 'AccountController@sudoModeVerify');
-		Route::get('auth/checkpoint', 'AccountController@twoFactorCheckpoint');
-		Route::post('auth/checkpoint', 'AccountController@twoFactorVerify');
+    });
 
-		Route::get('results', 'SearchController@results');
-		Route::post('visibility', 'StatusController@toggleVisibility');
+    Route::get('discover', 'DiscoverController@home')->name('discover');
 
-		Route::post('metro/dark-mode', 'SettingsController@metroDarkMode');
+    Route::get('discover/tags/{hashtag}', 'DiscoverController@showTags');
+    Route::get('discover/places', 'PlaceController@directoryHome')->name('discover.places');
+    Route::get('discover/places/{id}/{slug}', 'PlaceController@show');
+    Route::get('discover/location/country/{country}', 'PlaceController@directoryCities');
 
-		Route::group(['prefix' => 'report'], function () {
-			Route::get('/', 'ReportController@showForm')->name('report.form');
-			Route::post('/', 'ReportController@formStore');
-			Route::get('not-interested', 'ReportController@notInterestedForm')->name('report.not-interested');
-			Route::get('spam', 'ReportController@spamForm')->name('report.spam');
-			Route::get('spam/comment', 'ReportController@spamCommentForm')->name('report.spam.comment');
-			Route::get('spam/post', 'ReportController@spamPostForm')->name('report.spam.post');
-			Route::get('spam/profile', 'ReportController@spamProfileForm')->name('report.spam.profile');
-			Route::get('sensitive/comment', 'ReportController@sensitiveCommentForm')->name('report.sensitive.comment');
-			Route::get('sensitive/post', 'ReportController@sensitivePostForm')->name('report.sensitive.post');
-			Route::get('sensitive/profile', 'ReportController@sensitiveProfileForm')->name('report.sensitive.profile');
-			Route::get('abusive/comment', 'ReportController@abusiveCommentForm')->name('report.abusive.comment');
-			Route::get('abusive/post', 'ReportController@abusivePostForm')->name('report.abusive.post');
-			Route::get('abusive/profile', 'ReportController@abusiveProfileForm')->name('report.abusive.profile');
-		});
+    Route::group(['prefix' => 'i'], function () {
+        Route::redirect('/', '/');
+        Route::get('compose', 'StatusController@compose')->name('compose');
+        Route::post('comment', 'CommentController@store');
+        Route::post('delete', 'StatusController@delete');
+        Route::post('mute', 'AccountController@mute');
+        Route::post('unmute', 'AccountController@unmute');
+        Route::post('block', 'AccountController@block');
+        Route::post('unblock', 'AccountController@unblock');
+        Route::post('like', 'LikeController@store');
+        Route::post('share', 'StatusController@storeShare');
+        Route::post('follow', 'FollowerController@store');
+        Route::post('bookmark', 'BookmarkController@store');
+        Route::get('lang/{locale}', 'SiteController@changeLocale');
+        Route::get('restored', 'AccountController@accountRestored');
 
-		Route::get('collections/create', 'CollectionController@create');
+        Route::get('verify-email', 'AccountController@verifyEmail')->name('account.verify_email');
+        Route::post('verify-email', 'AccountController@sendVerifyEmail');
+        Route::get('verify-email/request', 'InternalApiController@requestEmailVerification');
+        Route::post('verify-email/request', 'InternalApiController@requestEmailVerificationStore');
+        Route::get('confirm-email/{userToken}/{randomToken}', 'AccountController@confirmVerifyEmail');
 
-		Route::get('me', 'ProfileController@meRedirect');
-		Route::get('intent/follow', 'SiteController@followIntent');
-		Route::get('rs/{id}', 'StoryController@remoteStory');
-		Route::get('stories/new', 'StoryController@compose');
-		Route::get('my/story', 'StoryController@iRedirect');
-		Route::get('web/profile/_/{id}', 'InternalApiController@remoteProfile');
-		Route::get('web/post/_/{profileId}/{statusid}', 'InternalApiController@remoteStatus');
+        Route::get('auth/sudo', 'AccountController@sudoMode');
+        Route::post('auth/sudo', 'AccountController@sudoModeVerify');
+        Route::get('auth/checkpoint', 'AccountController@twoFactorCheckpoint');
+        Route::post('auth/checkpoint', 'AccountController@twoFactorVerify');
 
-		Route::group(['prefix' => 'import', 'middleware' => 'dangerzone'], function() {
-			Route::get('job/{uuid}/1', 'ImportController@instagramStepOne');
-			Route::post('job/{uuid}/1', 'ImportController@instagramStepOneStore');
-			Route::get('job/{uuid}/2', 'ImportController@instagramStepTwo');
-			Route::post('job/{uuid}/2', 'ImportController@instagramStepTwoStore');
-			Route::get('job/{uuid}/3', 'ImportController@instagramStepThree');
-			Route::post('job/{uuid}/3', 'ImportController@instagramStepThreeStore');
-		});
+        Route::get('results', 'SearchController@results');
+        Route::post('visibility', 'StatusController@toggleVisibility');
 
-		Route::get('redirect', 'SiteController@redirectUrl');
-		Route::post('admin/media/block/add', 'MediaBlocklistController@add');
-		Route::post('admin/media/block/delete', 'MediaBlocklistController@delete');
+        Route::post('metro/dark-mode', 'SettingsController@metroDarkMode');
 
-		Route::get('warning', 'AccountInterstitialController@get');
-		Route::post('warning', 'AccountInterstitialController@read');
-		Route::get('my2020', 'SeasonalController@yearInReview');
+        Route::group(['prefix' => 'report'], function () {
+            Route::get('/', 'ReportController@showForm')->name('report.form');
+            Route::post('/', 'ReportController@formStore');
+            Route::get('not-interested', 'ReportController@notInterestedForm')->name('report.not-interested');
+            Route::get('spam', 'ReportController@spamForm')->name('report.spam');
+            Route::get('spam/comment', 'ReportController@spamCommentForm')->name('report.spam.comment');
+            Route::get('spam/post', 'ReportController@spamPostForm')->name('report.spam.post');
+            Route::get('spam/profile', 'ReportController@spamProfileForm')->name('report.spam.profile');
+            Route::get('sensitive/comment', 'ReportController@sensitiveCommentForm')->name('report.sensitive.comment');
+            Route::get('sensitive/post', 'ReportController@sensitivePostForm')->name('report.sensitive.post');
+            Route::get('sensitive/profile', 'ReportController@sensitiveProfileForm')->name('report.sensitive.profile');
+            Route::get('abusive/comment', 'ReportController@abusiveCommentForm')->name('report.abusive.comment');
+            Route::get('abusive/post', 'ReportController@abusivePostForm')->name('report.abusive.post');
+            Route::get('abusive/profile', 'ReportController@abusiveProfileForm')->name('report.abusive.profile');
+        });
 
-		Route::get('web/my-portfolio', 'PortfolioController@myRedirect');
-		Route::get('web/hashtag/{tag}', 'SpaController@hashtagRedirect');
-		Route::get('web/username/{id}', 'SpaController@usernameRedirect');
-		Route::get('web/post/{id}', 'SpaController@webPost');
-		Route::get('web/profile/{id}', 'SpaController@webProfile');
+        Route::get('collections/create', 'CollectionController@create');
 
-		Route::get('web/{q}', 'SpaController@index')->where('q', '.*');
-		Route::get('web', 'SpaController@index');
-	});
+        Route::get('me', 'ProfileController@meRedirect');
+        Route::get('intent/follow', 'SiteController@followIntent');
+        Route::get('rs/{id}', 'StoryController@remoteStory');
+        Route::get('stories/new', 'StoryController@compose');
+        Route::get('my/story', 'StoryController@iRedirect');
+        Route::get('web/profile/_/{id}', 'InternalApiController@remoteProfile');
+        Route::get('web/post/_/{profileId}/{statusid}', 'InternalApiController@remoteStatus');
 
-	Route::group(['prefix' => 'account'], function () {
-		Route::redirect('/', '/');
-		Route::get('direct', 'AccountController@direct');
-		Route::get('direct/t/{id}', 'AccountController@directMessage');
-		Route::get('activity', 'AccountController@notifications')->name('notifications');
-		Route::get('follow-requests', 'AccountController@followRequests')->name('follow-requests');
-		Route::post('follow-requests', 'AccountController@followRequestHandle');
-		Route::get('follow-requests.json', 'AccountController@followRequestsJson');
-		Route::get('portfolio/{username}.json', 'PortfolioController@getApFeed');
-		Route::get('portfolio/{username}.rss', 'PortfolioController@getRssFeed');
-	});
-
-	Route::group(['prefix' => 'settings'], function () {
-		Route::redirect('/', '/settings/home');
-		Route::get('home', 'SettingsController@home')
-		->name('settings');
-		Route::post('home', 'SettingsController@homeUpdate');
-		Route::get('avatar', 'SettingsController@avatar')->name('settings.avatar');
-		Route::post('avatar', 'AvatarController@store');
-		Route::delete('avatar', 'AvatarController@deleteAvatar');
-		Route::get('password', 'SettingsController@password')->name('settings.password')->middleware('dangerzone');
-		Route::post('password', 'SettingsController@passwordUpdate')->middleware('dangerzone');
-		Route::get('email', 'SettingsController@email')->name('settings.email')->middleware('dangerzone');
-		Route::post('email', 'SettingsController@emailUpdate')->middleware('dangerzone');
-		Route::get('notifications', 'SettingsController@notifications')->name('settings.notifications');
-		Route::get('privacy', 'SettingsController@privacy')->name('settings.privacy');
-		Route::post('privacy', 'SettingsController@privacyStore');
-		Route::get('privacy/muted-users', 'SettingsController@mutedUsers')->name('settings.privacy.muted-users');
-		Route::post('privacy/muted-users', 'SettingsController@mutedUsersUpdate');
-		Route::get('privacy/blocked-users', 'SettingsController@blockedUsers')->name('settings.privacy.blocked-users');
-		Route::post('privacy/blocked-users', 'SettingsController@blockedUsersUpdate');
-		Route::get('privacy/blocked-instances', 'SettingsController@blockedInstances')->name('settings.privacy.blocked-instances');
-		Route::post('privacy/blocked-instances', 'SettingsController@blockedInstanceStore');
-		Route::post('privacy/blocked-instances/unblock', 'SettingsController@blockedInstanceUnblock')->name('settings.privacy.blocked-instances.unblock');
-		Route::get('privacy/blocked-keywords', 'SettingsController@blockedKeywords')->name('settings.privacy.blocked-keywords');
-		Route::post('privacy/account', 'SettingsController@privateAccountOptions')->name('settings.privacy.account');
-		Route::group(['prefix' => 'remove', 'middleware' => 'dangerzone'], function() {
-			Route::get('request/temporary', 'SettingsController@removeAccountTemporary')->name('settings.remove.temporary');
-			Route::post('request/temporary', 'SettingsController@removeAccountTemporarySubmit');
-			Route::get('request/permanent', 'SettingsController@removeAccountPermanent')->name('settings.remove.permanent');
-			Route::post('request/permanent', 'SettingsController@removeAccountPermanentSubmit');
-		});
-
-		Route::group(['prefix' => 'security', 'middleware' => 'dangerzone'], function() {
-			Route::get(
-				'/',
-				'SettingsController@security'
-			)->name('settings.security');
-			Route::get(
-				'2fa/setup',
-				'SettingsController@securityTwoFactorSetup'
-			)->name('settings.security.2fa.setup');
-			Route::post(
-				'2fa/setup',
-				'SettingsController@securityTwoFactorSetupStore'
-			);
-			Route::get(
-				'2fa/edit',
-				'SettingsController@securityTwoFactorEdit'
-			)->name('settings.security.2fa.edit');
-			Route::post(
-				'2fa/edit',
-				'SettingsController@securityTwoFactorUpdate'
-			);
-			Route::get(
-				'2fa/recovery-codes',
-				'SettingsController@securityTwoFactorRecoveryCodes'
-			)->name('settings.security.2fa.recovery');
-			Route::post(
-				'2fa/recovery-codes',
-				'SettingsController@securityTwoFactorRecoveryCodesRegenerate'
-			);
-
-		});
-
-		Route::get('applications', 'SettingsController@applications')->name('settings.applications')->middleware('dangerzone');
-		Route::get('data-export', 'SettingsController@dataExport')->name('settings.dataexport')->middleware('dangerzone');
-		Route::post('data-export/following', 'SettingsController@exportFollowing')->middleware('dangerzone');
-		Route::post('data-export/followers', 'SettingsController@exportFollowers')->middleware('dangerzone');
-		Route::post('data-export/mute-block-list', 'SettingsController@exportMuteBlockList')->middleware('dangerzone');
-		Route::post('data-export/account', 'SettingsController@exportAccount')->middleware('dangerzone');
-		Route::post('data-export/statuses', 'SettingsController@exportStatuses')->middleware('dangerzone');
-		Route::get('developers', 'SettingsController@developers')->name('settings.developers')->middleware('dangerzone');
-		Route::get('labs', 'SettingsController@labs')->name('settings.labs');
-		Route::post('labs', 'SettingsController@labsStore');
-
-		Route::get('accessibility', 'SettingsController@accessibility')->name('settings.accessibility');
-		Route::post('accessibility', 'SettingsController@accessibilityStore');
-
-		Route::group(['prefix' => 'relationships'], function() {
-			Route::redirect('/', '/settings/relationships/home');
-			Route::get('home', 'SettingsController@relationshipsHome')->name('settings.relationships');
-		});
-		Route::get('invites/create', 'UserInviteController@create')->name('settings.invites.create');
-		Route::post('invites/create', 'UserInviteController@store');
-		Route::get('invites', 'UserInviteController@show')->name('settings.invites');
-		// Route::get('sponsor', 'SettingsController@sponsor')->name('settings.sponsor');
-		// Route::post('sponsor', 'SettingsController@sponsorStore');
         Route::group(['prefix' => 'import', 'middleware' => 'dangerzone'], function() {
-		  Route::get('/', 'SettingsController@dataImport')->name('settings.import');
-		  Route::prefix('instagram')->group(function() {
-			Route::get('/', 'ImportController@instagram')->name('settings.import.ig');
-			Route::post('/', 'ImportController@instagramStart');
-		  });
-		  Route::prefix('mastodon')->group(function() {
-			Route::get('/', 'ImportController@mastodon')->name('settings.import.mastodon');
-		  });
-		});
+            Route::get('job/{uuid}/1', 'ImportController@instagramStepOne');
+            Route::post('job/{uuid}/1', 'ImportController@instagramStepOneStore');
+            Route::get('job/{uuid}/2', 'ImportController@instagramStepTwo');
+            Route::post('job/{uuid}/2', 'ImportController@instagramStepTwoStore');
+            Route::get('job/{uuid}/3', 'ImportController@instagramStepThree');
+            Route::post('job/{uuid}/3', 'ImportController@instagramStepThreeStore');
+        });
 
-		Route::get('timeline', 'SettingsController@timelineSettings')->name('settings.timeline');
-		Route::post('timeline', 'SettingsController@updateTimelineSettings');
-		Route::get('media', 'SettingsController@mediaSettings')->name('settings.media');
-		Route::post('media', 'SettingsController@updateMediaSettings');
+        Route::get('redirect', 'SiteController@redirectUrl');
+        Route::post('admin/media/block/add', 'MediaBlocklistController@add');
+        Route::post('admin/media/block/delete', 'MediaBlocklistController@delete');
+
+        Route::get('warning', 'AccountInterstitialController@get');
+        Route::post('warning', 'AccountInterstitialController@read');
+
+        Route::get('contact-admin-response/{id}', 'ContactController@showAdminResponse');
+
+        Route::get('web/my-portfolio', 'PortfolioController@myRedirect');
+        Route::get('web/hashtag/{tag}', 'SpaController@hashtagRedirect');
+        Route::get('web/username/{id}', 'SpaController@usernameRedirect');
+        Route::get('web/post/{id}', 'SpaController@webPost');
+        Route::get('web/profile/{id}', 'SpaController@webProfile');
+
+        Route::get('web/{q}', 'SpaController@index')->where('q', '.*');
+        Route::get('web', 'SpaController@index');
+    });
+
+    Route::group(['prefix' => 'account'], function () {
+        Route::redirect('/', '/');
+        Route::get('direct', 'AccountController@direct');
+        Route::get('direct/t/{id}', 'AccountController@directMessage');
+        Route::get('activity', 'AccountController@notifications')->name('notifications');
+        Route::get('follow-requests', 'AccountController@followRequests')->name('follow-requests');
+        Route::post('follow-requests', 'AccountController@followRequestHandle');
+        Route::get('follow-requests.json', 'AccountController@followRequestsJson');
+        Route::get('portfolio/{username}.json', 'PortfolioController@getApFeed');
+        Route::get('portfolio/{username}.rss', 'PortfolioController@getRssFeed');
+    });
+
+    Route::group(['prefix' => 'settings'], function () {
+        Route::redirect('/', '/settings/home');
+        Route::get('home', 'SettingsController@home')
+        ->name('settings');
+        Route::post('home', 'SettingsController@homeUpdate');
+        Route::get('avatar', 'SettingsController@avatar')->name('settings.avatar');
+        Route::post('avatar', 'AvatarController@store');
+        Route::delete('avatar', 'AvatarController@deleteAvatar');
+        Route::get('password', 'SettingsController@password')->name('settings.password')->middleware('dangerzone');
+        Route::post('password', 'SettingsController@passwordUpdate')->middleware('dangerzone');
+        Route::get('email', 'SettingsController@email')->name('settings.email')->middleware('dangerzone');
+        Route::post('email', 'SettingsController@emailUpdate')->middleware('dangerzone');
+        Route::get('notifications', 'SettingsController@notifications')->name('settings.notifications');
+        Route::get('privacy', 'SettingsController@privacy')->name('settings.privacy');
+        Route::post('privacy', 'SettingsController@privacyStore');
+        Route::get('privacy/muted-users', 'SettingsController@mutedUsers')->name('settings.privacy.muted-users');
+        Route::post('privacy/muted-users', 'SettingsController@mutedUsersUpdate');
+        Route::get('privacy/blocked-users', 'SettingsController@blockedUsers')->name('settings.privacy.blocked-users');
+        Route::post('privacy/blocked-users', 'SettingsController@blockedUsersUpdate');
+        Route::get('privacy/domain-blocks', 'SettingsController@domainBlocks')->name('settings.privacy.domain-blocks');
+        Route::get('privacy/blocked-instances', 'SettingsController@blockedInstances')->name('settings.privacy.blocked-instances');
+        Route::post('privacy/blocked-instances', 'SettingsController@blockedInstanceStore');
+        Route::post('privacy/blocked-instances/unblock', 'SettingsController@blockedInstanceUnblock')->name('settings.privacy.blocked-instances.unblock');
+        Route::get('privacy/blocked-keywords', 'SettingsController@blockedKeywords')->name('settings.privacy.blocked-keywords');
+        Route::post('privacy/account', 'SettingsController@privateAccountOptions')->name('settings.privacy.account');
+        Route::group(['prefix' => 'remove', 'middleware' => 'dangerzone'], function() {
+            Route::get('request/temporary', 'SettingsController@removeAccountTemporary')->name('settings.remove.temporary');
+            Route::post('request/temporary', 'SettingsController@removeAccountTemporarySubmit');
+            Route::get('request/permanent', 'SettingsController@removeAccountPermanent')->name('settings.remove.permanent');
+            Route::post('request/permanent', 'SettingsController@removeAccountPermanentSubmit');
+        });
+
+        Route::group(['prefix' => 'security', 'middleware' => 'dangerzone'], function() {
+            Route::get(
+                '/',
+                'SettingsController@security'
+            )->name('settings.security');
+            Route::get(
+                '2fa/setup',
+                'SettingsController@securityTwoFactorSetup'
+            )->name('settings.security.2fa.setup');
+            Route::post(
+                '2fa/setup',
+                'SettingsController@securityTwoFactorSetupStore'
+            );
+            Route::get(
+                '2fa/edit',
+                'SettingsController@securityTwoFactorEdit'
+            )->name('settings.security.2fa.edit');
+            Route::post(
+                '2fa/edit',
+                'SettingsController@securityTwoFactorUpdate'
+            );
+            Route::get(
+                '2fa/recovery-codes',
+                'SettingsController@securityTwoFactorRecoveryCodes'
+            )->name('settings.security.2fa.recovery');
+            Route::post(
+                '2fa/recovery-codes',
+                'SettingsController@securityTwoFactorRecoveryCodesRegenerate'
+            );
+
+        });
+
+        Route::get('parental-controls', 'ParentalControlsController@index')->name('settings.parental-controls')->middleware('dangerzone');
+        Route::get('parental-controls/add', 'ParentalControlsController@add')->name('settings.pc.add')->middleware('dangerzone');
+        Route::post('parental-controls/add', 'ParentalControlsController@store')->middleware('dangerzone');
+        Route::get('parental-controls/manage/{id}', 'ParentalControlsController@view')->middleware('dangerzone');
+        Route::post('parental-controls/manage/{id}', 'ParentalControlsController@update')->middleware('dangerzone');
+        Route::get('parental-controls/manage/{id}/cancel-invite', 'ParentalControlsController@cancelInvite')->name('settings.pc.cancel-invite')->middleware('dangerzone');
+        Route::post('parental-controls/manage/{id}/cancel-invite', 'ParentalControlsController@cancelInviteHandle')->middleware('dangerzone');
+        Route::get('parental-controls/manage/{id}/stop-managing', 'ParentalControlsController@stopManaging')->name('settings.pc.stop-managing')->middleware('dangerzone');
+        Route::post('parental-controls/manage/{id}/stop-managing', 'ParentalControlsController@stopManagingHandle')->middleware('dangerzone');
+
+        Route::get('applications', 'SettingsController@applications')->name('settings.applications')->middleware('dangerzone');
+        Route::get('data-export', 'SettingsController@dataExport')->name('settings.dataexport')->middleware('dangerzone');
+        Route::post('data-export/following', 'SettingsController@exportFollowing')->middleware('dangerzone');
+        Route::post('data-export/followers', 'SettingsController@exportFollowers')->middleware('dangerzone');
+        Route::post('data-export/mute-block-list', 'SettingsController@exportMuteBlockList')->middleware('dangerzone');
+        Route::post('data-export/account', 'SettingsController@exportAccount')->middleware('dangerzone');
+        Route::post('data-export/statuses', 'SettingsController@exportStatuses')->middleware('dangerzone');
+        Route::get('developers', 'SettingsController@developers')->name('settings.developers')->middleware('dangerzone');
+        Route::get('labs', 'SettingsController@labs')->name('settings.labs');
+        Route::post('labs', 'SettingsController@labsStore');
+
+        Route::get('accessibility', 'SettingsController@accessibility')->name('settings.accessibility');
+        Route::post('accessibility', 'SettingsController@accessibilityStore');
+
+        Route::group(['prefix' => 'relationships'], function() {
+            Route::redirect('/', '/settings/relationships/home');
+            Route::get('home', 'SettingsController@relationshipsHome')->name('settings.relationships');
+        });
+        Route::get('invites/create', 'UserInviteController@create')->name('settings.invites.create');
+        Route::post('invites/create', 'UserInviteController@store');
+        Route::get('invites', 'UserInviteController@show')->name('settings.invites');
+        // Route::get('sponsor', 'SettingsController@sponsor')->name('settings.sponsor');
+        // Route::post('sponsor', 'SettingsController@sponsorStore');
+        Route::group(['prefix' => 'import', 'middleware' => 'dangerzone'], function() {
+          Route::get('/', 'SettingsController@dataImport')->name('settings.import');
+          Route::prefix('instagram')->group(function() {
+            Route::get('/', 'ImportController@instagram')->name('settings.import.ig');
+            Route::post('/', 'ImportController@instagramStart');
+          });
+          Route::prefix('mastodon')->group(function() {
+            Route::get('/', 'ImportController@mastodon')->name('settings.import.mastodon');
+          });
+        });
+
+        Route::get('timeline', 'SettingsController@timelineSettings')->name('settings.timeline');
+        Route::post('timeline', 'SettingsController@updateTimelineSettings');
+        Route::get('media', 'SettingsController@mediaSettings')->name('settings.media');
+        Route::post('media', 'SettingsController@updateMediaSettings');
 
         Route::group(['prefix' => 'account/aliases', 'middleware' => 'dangerzone'], function() {
             Route::get('manage', 'ProfileAliasController@index');
             Route::post('manage', 'ProfileAliasController@store');
             Route::post('manage/delete', 'ProfileAliasController@delete');
         });
-	});
 
-	Route::group(['prefix' => 'site'], function () {
-		Route::redirect('/', '/');
-		Route::get('about', 'SiteController@about')->name('site.about');
-		Route::view('help', 'site.help')->name('site.help');
-		Route::view('developer-api', 'site.developer')->name('site.developers');
-		Route::view('fediverse', 'site.fediverse')->name('site.fediverse');
-		Route::view('open-source', 'site.opensource')->name('site.opensource');
-		Route::view('banned-instances', 'site.bannedinstances')->name('site.bannedinstances');
-		Route::get('terms', 'SiteController@terms')->name('site.terms');
-		Route::get('privacy', 'SiteController@privacy')->name('site.privacy');
-		Route::view('platform', 'site.platform')->name('site.platform');
-		Route::view('language', 'site.language')->name('site.language');
-		Route::get('contact', 'ContactController@show')->name('site.contact');
-		Route::post('contact', 'ContactController@store');
-		Route::group(['prefix'=>'kb'], function() {
-			Route::view('getting-started', 'site.help.getting-started')->name('help.getting-started');
-			Route::view('sharing-media', 'site.help.sharing-media')->name('help.sharing-media');
-			Route::view('your-profile', 'site.help.your-profile')->name('help.your-profile');
-			Route::view('stories', 'site.help.stories')->name('help.stories');
-			Route::view('embed', 'site.help.embed')->name('help.embed');
-			Route::view('hashtags', 'site.help.hashtags')->name('help.hashtags');
-			Route::view('instance-actor', 'site.help.instance-actor')->name('help.instance-actor');
-			Route::view('discover', 'site.help.discover')->name('help.discover');
-			Route::view('direct-messages', 'site.help.dm')->name('help.dm');
-			Route::view('timelines', 'site.help.timelines')->name('help.timelines');
-			Route::view('what-is-the-fediverse', 'site.help.what-is-fediverse')->name('help.what-is-fediverse');
-			Route::view('safety-tips', 'site.help.safety-tips')->name('help.safety-tips');
+        Route::group(['prefix' => 'account/migration', 'middleware' => 'dangerzone'], function() {
+            Route::get('manage', 'ProfileMigrationController@index');
+            Route::post('manage', 'ProfileMigrationController@store');
+        });
+    });
 
-			Route::get('community-guidelines', 'SiteController@communityGuidelines')->name('help.community-guidelines');
-			Route::view('controlling-visibility', 'site.help.controlling-visibility')->name('help.controlling-visibility');
-			Route::view('blocking-accounts', 'site.help.blocking-accounts')->name('help.blocking-accounts');
-			Route::view('report-something', 'site.help.report-something')->name('help.report-something');
-			Route::view('data-policy', 'site.help.data-policy')->name('help.data-policy');
-			Route::view('labs-deprecation', 'site.help.labs-deprecation')->name('help.labs-deprecation');
-			Route::view('tagging-people', 'site.help.tagging-people')->name('help.tagging-people');
-			Route::view('licenses', 'site.help.licenses')->name('help.licenses');
-			Route::view('instance-max-users-limit', 'site.help.instance-max-users')->name('help.instance-max-users-limit');
-			Route::view('import', 'site.help.import')->name('help.import');
-		});
-		Route::get('newsroom/{year}/{month}/{slug}', 'NewsroomController@show');
-		Route::get('newsroom/archive', 'NewsroomController@archive');
-		Route::get('newsroom/search', 'NewsroomController@search');
-		Route::get('newsroom', 'NewsroomController@index');
-		Route::get('legal-notice', 'SiteController@legalNotice');
-	});
+    Route::group(['prefix' => 'site'], function () {
+        Route::redirect('/', '/');
+        Route::get('about', 'SiteController@about')->name('site.about');
+        Route::view('help', 'site.help')->name('site.help');
+        Route::view('developer-api', 'site.developer')->name('site.developers');
+        Route::view('fediverse', 'site.fediverse')->name('site.fediverse');
+        Route::view('open-source', 'site.opensource')->name('site.opensource');
+        Route::view('banned-instances', 'site.bannedinstances')->name('site.bannedinstances');
+        Route::get('terms', 'SiteController@terms')->name('site.terms');
+        Route::get('privacy', 'SiteController@privacy')->name('site.privacy');
+        Route::view('platform', 'site.platform')->name('site.platform');
+        Route::view('language', 'site.language')->name('site.language');
+        Route::get('contact', 'ContactController@show')->name('site.contact');
+        Route::post('contact', 'ContactController@store');
+        Route::group(['prefix'=>'kb'], function() {
+            Route::view('getting-started', 'site.help.getting-started')->name('help.getting-started');
+            Route::view('sharing-media', 'site.help.sharing-media')->name('help.sharing-media');
+            Route::view('your-profile', 'site.help.your-profile')->name('help.your-profile');
+            Route::view('stories', 'site.help.stories')->name('help.stories');
+            Route::view('embed', 'site.help.embed')->name('help.embed');
+            Route::view('hashtags', 'site.help.hashtags')->name('help.hashtags');
+            Route::view('instance-actor', 'site.help.instance-actor')->name('help.instance-actor');
+            Route::view('discover', 'site.help.discover')->name('help.discover');
+            Route::view('direct-messages', 'site.help.dm')->name('help.dm');
+            Route::view('timelines', 'site.help.timelines')->name('help.timelines');
+            Route::view('what-is-the-fediverse', 'site.help.what-is-fediverse')->name('help.what-is-fediverse');
+            Route::view('safety-tips', 'site.help.safety-tips')->name('help.safety-tips');
 
-	Route::group(['prefix' => 'timeline'], function () {
-		Route::redirect('/', '/');
-		Route::get('public', 'TimelineController@local')->name('timeline.public');
-		Route::get('network', 'TimelineController@network')->name('timeline.network');
-	});
+            Route::get('community-guidelines', 'SiteController@communityGuidelines')->name('help.community-guidelines');
+            Route::view('controlling-visibility', 'site.help.controlling-visibility')->name('help.controlling-visibility');
+            Route::view('blocking-accounts', 'site.help.blocking-accounts')->name('help.blocking-accounts');
+            Route::view('report-something', 'site.help.report-something')->name('help.report-something');
+            Route::view('data-policy', 'site.help.data-policy')->name('help.data-policy');
+            Route::view('labs-deprecation', 'site.help.labs-deprecation')->name('help.labs-deprecation');
+            Route::view('tagging-people', 'site.help.tagging-people')->name('help.tagging-people');
+            Route::view('licenses', 'site.help.licenses')->name('help.licenses');
+            Route::view('instance-max-users-limit', 'site.help.instance-max-users')->name('help.instance-max-users-limit');
+            Route::view('import', 'site.help.import')->name('help.import');
+            Route::view('parental-controls', 'site.help.parental-controls');
+            Route::view('email-confirmation-issues', 'site.help.email-confirmation-issues')->name('help.email-confirmation-issues');
+            Route::view('curated-onboarding', 'site.help.curated-onboarding')->name('help.curated-onboarding');
+            Route::view('account-migration', 'site.help.account-migration')->name('help.account-migration');
+        });
+        Route::get('newsroom/{year}/{month}/{slug}', 'NewsroomController@show');
+        Route::get('newsroom/archive', 'NewsroomController@archive');
+        Route::get('newsroom/search', 'NewsroomController@search');
+        Route::get('newsroom', 'NewsroomController@index');
+        Route::get('legal-notice', 'SiteController@legalNotice');
+    });
 
-	Route::group(['prefix' => 'users'], function () {
-		Route::redirect('/', '/');
-		Route::get('{user}.atom', 'ProfileController@showAtomFeed')->where('user', '.*');
-		Route::get('{username}/outbox', 'FederationController@userOutbox');
-		Route::get('{username}/followers', 'FederationController@userFollowers');
-		Route::get('{username}/following', 'FederationController@userFollowing');
-		Route::get('{username}', 'ProfileController@permalinkRedirect');
-	});
+    Route::group(['prefix' => 'timeline'], function () {
+        Route::redirect('/', '/');
+        Route::get('public', 'TimelineController@local')->name('timeline.public');
+        Route::get('network', 'TimelineController@network')->name('timeline.network');
+    });
 
-	Route::group(['prefix' => 'installer'], function() {
-		Route::get('api/requirements', 'InstallController@getRequirements')->withoutMiddleware(['web']);
-		Route::post('precheck/database', 'InstallController@precheckDatabase')->withoutMiddleware(['web']);
-		Route::post('store', 'InstallController@store')->withoutMiddleware(['web']);
-		Route::get('/', 'InstallController@index')->withoutMiddleware(['web']);
-		Route::get('/{q}', 'InstallController@index')->withoutMiddleware(['web'])->where('q', '.*');
-	});
+    Route::group(['prefix' => 'users'], function () {
+        Route::redirect('/', '/');
+        Route::get('{user}.atom', 'ProfileController@showAtomFeed')->where('user', '.*');
+        Route::get('{username}/outbox', 'FederationController@userOutbox');
+        Route::get('{username}/followers', 'FederationController@userFollowers');
+        Route::get('{username}/following', 'FederationController@userFollowing');
+        Route::get('{username}', 'ProfileController@permalinkRedirect');
+    });
 
-	Route::group(['prefix' => 'e'], function() {
-		Route::get('terms', 'MobileController@terms');
-		Route::get('privacy', 'MobileController@privacy');
-	});
+    Route::group(['prefix' => 'installer'], function() {
+        Route::get('api/requirements', 'InstallController@getRequirements')->withoutMiddleware(['web']);
+        Route::post('precheck/database', 'InstallController@precheckDatabase')->withoutMiddleware(['web']);
+        Route::post('store', 'InstallController@store')->withoutMiddleware(['web']);
+        Route::get('/', 'InstallController@index')->withoutMiddleware(['web']);
+        Route::get('/{q}', 'InstallController@index')->withoutMiddleware(['web'])->where('q', '.*');
+    });
 
-	Route::get('auth/invite/a/{code}', 'AdminInviteController@index');
-	Route::post('api/v1.1/auth/invite/admin/re', 'AdminInviteController@apiRegister')->middleware('throttle:5,1440');
+    Route::group(['prefix' => 'e'], function() {
+        Route::get('terms', 'MobileController@terms');
+        Route::get('privacy', 'MobileController@privacy');
+    });
 
-	Route::get('storage/m/_v2/{pid}/{mhash}/{uhash}/{f}', 'MediaController@fallbackRedirect');
-	Route::get('stories/{username}', 'ProfileController@stories');
-	Route::get('p/{id}', 'StatusController@shortcodeRedirect');
-	Route::get('c/{collection}', 'CollectionController@show');
-	Route::get('p/{username}/{id}/c', 'CommentController@showAll');
-	Route::get('p/{username}/{id}/embed', 'StatusController@showEmbed');
-	Route::get('p/{username}/{id}/edit', 'StatusController@edit');
-	Route::post('p/{username}/{id}/edit', 'StatusController@editStore');
-	Route::get('p/{username}/{id}.json', 'StatusController@showObject');
-	Route::get('p/{username}/{id}', 'StatusController@show');
-	Route::get('{username}/embed', 'ProfileController@embed');
-	Route::get('{username}/live', 'LiveStreamController@showProfilePlayer');
-	Route::get('@{username}@{domain}', 'SiteController@legacyWebfingerRedirect');
-	Route::get('@{username}', 'SiteController@legacyProfileRedirect');
-	Route::get('{username}', 'ProfileController@show');
+    Route::get('auth/invite/a/{code}', 'AdminInviteController@index');
+    Route::post('api/v1.1/auth/invite/admin/re', 'AdminInviteController@apiRegister')->middleware('throttle:5,1440');
+
+    Route::redirect('groups/', '/groups/home');
+    Route::redirect('groups/home', '/groups/feed');
+
+    Route::prefix('groups')->group(function() {
+        // Route::get('feed', 'GroupController@index');
+        Route::get('{id}/invite/claim', 'GroupController@groupInviteClaim');
+        Route::get('{id}/invite', 'GroupController@groupInviteLanding');
+        Route::get('{id}/settings', 'GroupController@groupSettings');
+        Route::get('{gid}/topics/{topic}', 'Groups\GroupsTopicController@showTopicFeed');
+        Route::get('{gid}/p/{sid}.json', 'GroupController@getStatusObject');
+        Route::get('{gid}/p/{sid}', 'GroupController@showStatus');
+        Route::get('{id}/user/{pid}', 'GroupController@showProfile');
+        Route::get('{id}/un/{pid}', 'GroupController@showProfile');
+        Route::get('{id}/username/{pid}', 'GroupController@showProfileByUsername');
+        Route::get('{id}/{path}', 'GroupController@show');
+        Route::get('{id}.json', 'GroupController@getGroupObject');
+        Route::get('feed', 'GroupController@index');
+        Route::get('create', 'GroupController@index');
+        Route::get('discover', 'GroupController@index');
+        Route::get('search', 'GroupController@index');
+        Route::get('joins', 'GroupController@index');
+        Route::get('notifications', 'GroupController@index');
+        Route::get('{id}', 'GroupController@show');
+    });
+    Route::get('g/{hid}', 'GroupController@groupShortLinkRedirect');
+
+    Route::get('storage/m/_v2/{pid}/{mhash}/{uhash}/{f}', 'MediaController@fallbackRedirect');
+    Route::get('stories/{username}', 'ProfileController@stories');
+    Route::get('p/{id}', 'StatusController@shortcodeRedirect');
+    Route::get('c/{collection}', 'CollectionController@show');
+    Route::get('p/{username}/{id}/c', 'CommentController@showAll');
+    Route::get('p/{username}/{id}/embed', 'StatusController@showEmbed');
+    Route::get('p/{username}/{id}/edit', 'StatusController@edit');
+    Route::post('p/{username}/{id}/edit', 'StatusController@editStore');
+    Route::get('p/{username}/{id}.json', 'StatusController@showObject');
+    Route::get('p/{username}/{id}', 'StatusController@show');
+    Route::get('{username}/embed', 'ProfileController@embed');
+    Route::get('{username}/live', 'LiveStreamController@showProfilePlayer');
+    Route::get('@{username}@{domain}', 'SiteController@legacyWebfingerRedirect');
+    Route::get('@{username}', 'SiteController@legacyProfileRedirect');
+    Route::get('{username}', 'ProfileController@show');
 });
diff --git a/tests/bats/helpers.bats b/tests/bats/helpers.bats
new file mode 100644
index 000000000..6ba65c2c3
--- /dev/null
+++ b/tests/bats/helpers.bats
@@ -0,0 +1,103 @@
+setup() {
+    DIR="$(cd "$(dirname "${BATS_TEST_FILENAME:-}")" >/dev/null 2>&1 && pwd)"
+    ROOT="$(dirname "$(dirname "$DIR")")"
+
+    load "$ROOT/docker/shared/root/docker/helpers.sh"
+}
+
+teardown() {
+    if [[ -e test_dir ]]; then
+        rm -rf test_dir
+    fi
+}
+
+@test "test [is-true]" {
+    is-true "1"
+    is-true "true"
+    is-true "TrUe"
+}
+
+@test "test [is-false]" {
+    is-false "0"
+    is-false "false"
+    is-false "FaLsE"
+}
+
+@test "test [is-false-expressions-0]" {
+    if is-false "0"; then
+        return 0
+    fi
+
+    return 1
+}
+
+@test "test [is-false-expressions-false]" {
+    if is-false "false"; then
+        return 0
+    fi
+
+    return 1
+}
+
+@test "test [is-false-expressions-FaLse]" {
+    if is-false "FaLse"; then
+        return 0
+    fi
+
+    return 1
+}
+
+@test "test [is-false-expressions-invalid]" {
+    if is-false "invalid"; then
+        return 0
+    fi
+
+    return 1
+}
+
+@test "test [is-true-expressions-1]" {
+    if is-true "1"; then
+        return 0
+    fi
+
+    return 1
+}
+
+@test "test [is-true-expressions-true]" {
+    if is-true "true"; then
+        return 0
+    fi
+
+    return 1
+}
+
+@test "test [is-true-expressions-TrUE]" {
+    if is-true "TrUE"; then
+        return 0
+    fi
+
+    return 1
+}
+
+@test "test [directory-is-empty] - non existing" {
+    directory-is-empty test_dir
+}
+
+@test "test [directory-is-empty] - actually empty" {
+    mkdir -p test_dir
+
+    directory-is-empty test_dir
+}
+
+@test "test [directory-is-empty] - not empty (directory)" {
+    mkdir -p test_dir/sub-dir
+
+    ! directory-is-empty test_dir
+}
+
+@test "test [directory-is-empty] - not empty (file)" {
+    mkdir -p test_dir/
+    touch test_dir/hello-world.txt
+
+    ! directory-is-empty test_dir
+}
diff --git a/webpack.mix.js b/webpack.mix.js
index 8d78b82c8..af23a60c0 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -1,8 +1,10 @@
 let mix = require('laravel-mix');
 const fs = require("fs");
+const path = require("path");
 
 mix.before(() => {
-	fs.rmSync('public/js', { recursive: true, force: true });
+    fs.rmSync('public/css', { recursive: true, force: true });
+    fs.rmSync('public/js', { recursive: true, force: true });
 });
 
 
@@ -11,6 +13,7 @@ mix.sass('resources/assets/sass/app.scss', 'public/css')
 .sass('resources/assets/sass/admin.scss', 'public/css')
 .sass('resources/assets/sass/portfolio.scss', 'public/css')
 .sass('resources/assets/sass/spa.scss', 'public/css')
+.sass('resources/assets/sass/profile.scss', 'public/css')
 .sass('resources/assets/sass/landing.scss', 'public/css').version();
 
 mix.js('resources/assets/js/app.js', 'public/js')
@@ -38,6 +41,9 @@ mix.js('resources/assets/js/app.js', 'public/js')
 .js('resources/assets/js/admin_invite.js', 'public/js')
 .js('resources/assets/js/landing.js', 'public/js')
 .js('resources/assets/js/remote_auth.js', 'public/js')
+.js('resources/assets/js/groups.js', 'public/js')
+.js('resources/assets/js/group-status.js', 'public/js')
+.js('resources/assets/js/group-topic-feed.js', 'public/js')
 .vue({ version: 2 });
 
 mix.extract();
@@ -46,31 +52,35 @@ mix.version();
 const TerserPlugin = require('terser-webpack-plugin');
 
 mix.options({
-	processCssUrls: false,
-	terser: {
-		parallel: true,
-		terserOptions: {
-			compress: true,
-			output: {
-				comments: false
-			}
-		}
-	}
+    processCssUrls: false,
+    terser: {
+        parallel: true,
+        terserOptions: {
+            compress: true,
+            output: {
+                comments: false
+            }
+        }
+    }
 })
+mix.alias({
+    '@': path.join(__dirname, 'resources/assets/components'),
+    '~': path.join(__dirname, 'resources/assets/js/components'),
+});
 mix.webpackConfig({
-	optimization: {
-		providedExports: false,
-		sideEffects: false,
-		usedExports: false,
-		minimize: true,
-		minimizer: [ new TerserPlugin({
-			extractComments: false,
-		})]
-	},
-	output: {
-		chunkFilename: 'js/[name].[chunkhash].js',
-	}
+    optimization: {
+        providedExports: false,
+        sideEffects: false,
+        usedExports: false,
+        minimize: true,
+        minimizer: [ new TerserPlugin({
+            extractComments: false,
+        })]
+    },
+    output: {
+        chunkFilename: 'js/[name].[chunkhash].js',
+    }
 });
 mix.autoload({
-	jquery: ['$', 'jQuery', 'window.jQuery']
+    jquery: ['$', 'jQuery', 'window.jQuery']
 });