--admin
+```
+## Conclusion
+
+Restart nginx with `# service nginx restart` and you should be up and running.
+
+Make sure your time is in sync, or other instances will receive your posts with
+incorrect timestamps. You should have ntpd running.
+
+## Questions
+
+Questions about the installation or didn’t it work as it should be, ask in [#pleroma:matrix.org](https://matrix.heldscal.la/#/room/#freenode_#pleroma:matrix.org) or IRC Channel **#pleroma** on **Freenode**.
diff --git a/docs/installation/gentoo_en.md b/docs/installation/gentoo_en.md
index 32152aea7..5a676380c 100644
--- a/docs/installation/gentoo_en.md
+++ b/docs/installation/gentoo_en.md
@@ -28,6 +28,7 @@ Gentoo quite pointedly does not come with a cron daemon installed, and as such i
* `dev-db/postgresql`
* `dev-lang/elixir`
* `dev-vcs/git`
+* `dev-util/cmake`
#### Optional ebuilds used in this guide
@@ -46,7 +47,7 @@ Gentoo quite pointedly does not come with a cron daemon installed, and as such i
* Emerge all required the required and suggested software in one go:
```shell
- # emerge --ask dev-db/postgresql dev-lang/elixir dev-vcs/git www-servers/nginx app-crypt/certbot app-crypt/certbot-nginx
+ # emerge --ask dev-db/postgresql dev-lang/elixir dev-vcs/git www-servers/nginx app-crypt/certbot app-crypt/certbot-nginx dev-util/cmake
```
If you would not like to install the optional packages, remove them from this line.
diff --git a/docs/installation/migrating_from_source_otp_en.md b/docs/installation/migrating_from_source_otp_en.md
index 31c2f1294..d303a6daf 100644
--- a/docs/installation/migrating_from_source_otp_en.md
+++ b/docs/installation/migrating_from_source_otp_en.md
@@ -8,13 +8,15 @@ You will be running commands as root. If you aren't root already, please elevate
The system needs to have `curl` and `unzip` installed for downloading and unpacking release builds.
-```sh tab="Alpine"
-apk add curl unzip
-```
+=== "Alpine"
+ ```sh
+ apk add curl unzip
+ ```
-```sh tab="Debian/Ubuntu"
-apt install curl unzip
-```
+=== "Debian/Ubuntu"
+ ```sh
+ apt install curl unzip
+ ```
## Moving content out of the application directory
When using OTP releases the application directory changes with every version so it would be a bother to keep content there (and also dangerous unless `--no-rm` option is used when updating). Fortunately almost all paths in Pleroma are configurable, so it is possible to move them out of there.
@@ -110,27 +112,29 @@ OTP releases have different service files than from-source installs so they need
**Warning:** The service files assume pleroma user's home directory is `/opt/pleroma`, please make sure all paths fit your installation.
-```sh tab="Alpine"
-# Copy the service into a proper directory
-cp -f ~pleroma/installation/init.d/pleroma /etc/init.d/pleroma
+=== "Alpine"
+ ```sh
+ # Copy the service into a proper directory
+ cp -f ~pleroma/installation/init.d/pleroma /etc/init.d/pleroma
-# Start pleroma
-rc-service pleroma start
-```
+ # Start pleroma
+ rc-service pleroma start
+ ```
-```sh tab="Debian/Ubuntu"
-# Copy the service into a proper directory
-cp ~pleroma/installation/pleroma.service /etc/systemd/system/pleroma.service
+=== "Debian/Ubuntu"
+ ```sh
+ # Copy the service into a proper directory
+ cp ~pleroma/installation/pleroma.service /etc/systemd/system/pleroma.service
-# Reload service files
-systemctl daemon-reload
+ # Reload service files
+ systemctl daemon-reload
-# Reenable pleroma to start on boot
-systemctl reenable pleroma
+ # Reenable pleroma to start on boot
+ systemctl reenable pleroma
-# Start pleroma
-systemctl start pleroma
-```
+ # Start pleroma
+ systemctl start pleroma
+ ```
## Running mix tasks
Refer to [Running mix tasks](otp_en.md#running-mix-tasks) section from OTP release installation guide.
diff --git a/docs/installation/netbsd_en.md b/docs/installation/netbsd_en.md
index 3626acc69..6ad0de2f6 100644
--- a/docs/installation/netbsd_en.md
+++ b/docs/installation/netbsd_en.md
@@ -19,6 +19,7 @@ databases/postgresql11-client
databases/postgresql11-server
devel/git-base
devel/git-docs
+devel/cmake
lang/elixir
security/acmesh
security/sudo
diff --git a/docs/installation/openbsd_en.md b/docs/installation/openbsd_en.md
index 5dbe24f75..eee452845 100644
--- a/docs/installation/openbsd_en.md
+++ b/docs/installation/openbsd_en.md
@@ -14,11 +14,12 @@ The following packages need to be installed:
* git
* postgresql-server
* postgresql-contrib
+ * cmake
To install them, run the following command (with doas or as root):
```
-pkg_add elixir gmake ImageMagick git postgresql-server postgresql-contrib
+pkg_add elixir gmake ImageMagick git postgresql-server postgresql-contrib cmake
```
Pleroma requires a reverse proxy, OpenBSD has relayd in base (and is used in this guide) and packages/ports are available for nginx (www/nginx) and apache (www/apache-httpd). Independently of the reverse proxy, [acme-client(1)](https://man.openbsd.org/acme-client) can be used to get a certificate from Let's Encrypt.
diff --git a/docs/installation/openbsd_fi.md b/docs/installation/openbsd_fi.md
index 272273cff..b5b5056a9 100644
--- a/docs/installation/openbsd_fi.md
+++ b/docs/installation/openbsd_fi.md
@@ -16,7 +16,7 @@ Matrix-kanava #freenode_#pleroma:matrix.org ovat hyviä paikkoja löytää apua
Asenna tarvittava ohjelmisto:
-`# pkg_add git elixir gmake postgresql-server-10.3 postgresql-contrib-10.3`
+`# pkg_add git elixir gmake postgresql-server-10.3 postgresql-contrib-10.3 cmake`
Luo postgresql-tietokanta:
diff --git a/docs/installation/otp_en.md b/docs/installation/otp_en.md
index 338dfa7d0..b7e3bb2ac 100644
--- a/docs/installation/otp_en.md
+++ b/docs/installation/otp_en.md
@@ -28,15 +28,17 @@ Other than things bundled in the OTP release Pleroma depends on:
* nginx (could be swapped with another reverse proxy but this guide covers only it)
* certbot (for Let's Encrypt certificates, could be swapped with another ACME client, but this guide covers only it)
-```sh tab="Alpine"
-echo "http://nl.alpinelinux.org/alpine/latest-stable/community" >> /etc/apk/repositories
-apk update
-apk add curl unzip ncurses postgresql postgresql-contrib nginx certbot
-```
+=== "Alpine"
+ ```
+ echo "http://nl.alpinelinux.org/alpine/latest-stable/community" >> /etc/apk/repositories
+ apk update
+ apk add curl unzip ncurses postgresql postgresql-contrib nginx certbot
+ ```
-```sh tab="Debian/Ubuntu"
-apt install curl unzip libncurses5 postgresql postgresql-contrib nginx certbot
-```
+=== "Debian/Ubuntu"
+ ```
+ apt install curl unzip libncurses5 postgresql postgresql-contrib nginx certbot
+ ```
## Setup
### Configuring PostgreSQL
@@ -47,31 +49,35 @@ apt install curl unzip libncurses5 postgresql postgresql-contrib nginx certbot
RUM indexes are an alternative indexing scheme that is not included in PostgreSQL by default. You can read more about them on the [Configuration page](../configuration/cheatsheet.md#rum-indexing-for-full-text-search). They are completely optional and most of the time are not worth it, especially if you are running a single user instance (unless you absolutely need ordered search results).
-```sh tab="Alpine"
-apk add git build-base postgresql-dev
-git clone https://github.com/postgrespro/rum /tmp/rum
-cd /tmp/rum
-make USE_PGXS=1
-make USE_PGXS=1 install
-cd
-rm -r /tmp/rum
-```
+=== "Alpine"
+ ```
+ apk add git build-base postgresql-dev
+ git clone https://github.com/postgrespro/rum /tmp/rum
+ cd /tmp/rum
+ make USE_PGXS=1
+ make USE_PGXS=1 install
+ cd
+ rm -r /tmp/rum
+ ```
-```sh tab="Debian/Ubuntu"
-# Available only on Buster/19.04
-apt install postgresql-11-rum
-```
+=== "Debian/Ubuntu"
+ ```
+ # Available only on Buster/19.04
+ apt install postgresql-11-rum
+ ```
#### (Optional) Performance configuration
It is encouraged to check [Optimizing your PostgreSQL performance](../configuration/postgresql.md) document, for tips on PostgreSQL tuning.
-```sh tab="Alpine"
-rc-service postgresql restart
-```
+=== "Alpine"
+ ```
+ rc-service postgresql restart
+ ```
-```sh tab="Debian/Ubuntu"
-systemctl restart postgresql
-```
+=== "Debian/Ubuntu"
+ ```
+ systemctl restart postgresql
+ ```
If you are using PostgreSQL 12 or higher, add this to your Ecto database configuration
@@ -121,9 +127,6 @@ chown -R pleroma /etc/pleroma
# Run the config generator
su pleroma -s $SHELL -lc "./bin/pleroma_ctl instance gen --output /etc/pleroma/config.exs --output-psql /tmp/setup_db.psql"
-# Run the environment file generator.
-su pleroma -s $SHELL -lc "./bin/pleroma_ctl release_env gen"
-
# Create the postgres database
su postgres -s $SHELL -lc "psql -f /tmp/setup_db.psql"
@@ -134,7 +137,7 @@ su pleroma -s $SHELL -lc "./bin/pleroma_ctl migrate"
# su pleroma -s $SHELL -lc "./bin/pleroma_ctl migrate --migrations-path priv/repo/optional_migrations/rum_indexing/"
# Start the instance to verify that everything is working as expected
-su pleroma -s $SHELL -lc "export $(cat /opt/pleroma/config/pleroma.env); ./bin/pleroma daemon"
+su pleroma -s $SHELL -lc "./bin/pleroma daemon"
# Wait for about 20 seconds and query the instance endpoint, if it shows your uri, name and email correctly, you are configured correctly
sleep 20 && curl http://localhost:4000/api/v1/instance
@@ -154,14 +157,16 @@ certbot certonly --standalone --preferred-challenges http -d yourinstance.tld
The location of nginx configs is dependent on the distro
-```sh tab="Alpine"
-cp /opt/pleroma/installation/pleroma.nginx /etc/nginx/conf.d/pleroma.conf
-```
+=== "Alpine"
+ ```
+ cp /opt/pleroma/installation/pleroma.nginx /etc/nginx/conf.d/pleroma.conf
+ ```
-```sh tab="Debian/Ubuntu"
-cp /opt/pleroma/installation/pleroma.nginx /etc/nginx/sites-available/pleroma.conf
-ln -s /etc/nginx/sites-available/pleroma.conf /etc/nginx/sites-enabled/pleroma.conf
-```
+=== "Debian/Ubuntu"
+ ```
+ cp /opt/pleroma/installation/pleroma.nginx /etc/nginx/sites-available/pleroma.conf
+ ln -s /etc/nginx/sites-available/pleroma.conf /etc/nginx/sites-enabled/pleroma.conf
+ ```
If your distro does not have either of those you can append `include /etc/nginx/pleroma.conf` to the end of the http section in /etc/nginx/nginx.conf and
```sh
@@ -178,36 +183,39 @@ nginx -t
```
#### Start nginx
-```sh tab="Alpine"
-rc-service nginx start
-```
+=== "Alpine"
+ ```
+ rc-service nginx start
+ ```
-```sh tab="Debian/Ubuntu"
-systemctl start nginx
-```
+=== "Debian/Ubuntu"
+ ```
+ systemctl start nginx
+ ```
At this point if you open your (sub)domain in a browser you should see a 502 error, that's because Pleroma is not started yet.
### Setting up a system service
-```sh tab="Alpine"
-# Copy the service into a proper directory
-cp /opt/pleroma/installation/init.d/pleroma /etc/init.d/pleroma
+=== "Alpine"
+ ```
+ # Copy the service into a proper directory
+ cp /opt/pleroma/installation/init.d/pleroma /etc/init.d/pleroma
-# Start pleroma and enable it on boot
-rc-service pleroma start
-rc-update add pleroma
-```
+ # Start pleroma and enable it on boot
+ rc-service pleroma start
+ rc-update add pleroma
+ ```
-```sh tab="Debian/Ubuntu"
-# Copy the service into a proper directory
-cp /opt/pleroma/installation/pleroma.service /etc/systemd/system/pleroma.service
+=== "Debian/Ubuntu"
+ ```
+ # Copy the service into a proper directory
+ cp /opt/pleroma/installation/pleroma.service /etc/systemd/system/pleroma.service
-
-# Start pleroma and enable it on boot
-systemctl start pleroma
-systemctl enable pleroma
-```
+ # Start pleroma and enable it on boot
+ systemctl start pleroma
+ systemctl enable pleroma
+ ```
If everything worked, you should see Pleroma-FE when visiting your domain. If that didn't happen, try reviewing the installation steps, starting Pleroma in the foreground and seeing if there are any errrors.
@@ -227,43 +235,45 @@ $EDITOR path-to-nginx-config
nginx -t
```
-```sh tab="Alpine"
-# Restart nginx
-rc-service nginx restart
+=== "Alpine"
+ ```
+ # Restart nginx
+ rc-service nginx restart
-# Start the cron daemon and make it start on boot
-rc-service crond start
-rc-update add crond
+ # Start the cron daemon and make it start on boot
+ rc-service crond start
+ rc-update add crond
-# Ensure the webroot menthod and post hook is working
-certbot renew --cert-name yourinstance.tld --webroot -w /var/lib/letsencrypt/ --dry-run --post-hook 'rc-service nginx reload'
+ # Ensure the webroot menthod and post hook is working
+ certbot renew --cert-name yourinstance.tld --webroot -w /var/lib/letsencrypt/ --dry-run --post-hook 'rc-service nginx reload'
-# Add it to the daily cron
-echo '#!/bin/sh
-certbot renew --cert-name yourinstance.tld --webroot -w /var/lib/letsencrypt/ --post-hook "rc-service nginx reload"
-' > /etc/periodic/daily/renew-pleroma-cert
-chmod +x /etc/periodic/daily/renew-pleroma-cert
+ # Add it to the daily cron
+ echo '#!/bin/sh
+ certbot renew --cert-name yourinstance.tld --webroot -w /var/lib/letsencrypt/ --post-hook "rc-service nginx reload"
+ ' > /etc/periodic/daily/renew-pleroma-cert
+ chmod +x /etc/periodic/daily/renew-pleroma-cert
-# If everything worked the output should contain /etc/cron.daily/renew-pleroma-cert
-run-parts --test /etc/periodic/daily
-```
+ # If everything worked the output should contain /etc/cron.daily/renew-pleroma-cert
+ run-parts --test /etc/periodic/daily
+ ```
-```sh tab="Debian/Ubuntu"
-# Restart nginx
-systemctl restart nginx
+=== "Debian/Ubuntu"
+ ```
+ # Restart nginx
+ systemctl restart nginx
-# Ensure the webroot menthod and post hook is working
-certbot renew --cert-name yourinstance.tld --webroot -w /var/lib/letsencrypt/ --dry-run --post-hook 'systemctl reload nginx'
+ # Ensure the webroot menthod and post hook is working
+ certbot renew --cert-name yourinstance.tld --webroot -w /var/lib/letsencrypt/ --dry-run --post-hook 'systemctl reload nginx'
-# Add it to the daily cron
-echo '#!/bin/sh
-certbot renew --cert-name yourinstance.tld --webroot -w /var/lib/letsencrypt/ --post-hook "systemctl reload nginx"
-' > /etc/cron.daily/renew-pleroma-cert
-chmod +x /etc/cron.daily/renew-pleroma-cert
+ # Add it to the daily cron
+ echo '#!/bin/sh
+ certbot renew --cert-name yourinstance.tld --webroot -w /var/lib/letsencrypt/ --post-hook "systemctl reload nginx"
+ ' > /etc/cron.daily/renew-pleroma-cert
+ chmod +x /etc/cron.daily/renew-pleroma-cert
-# If everything worked the output should contain /etc/cron.daily/renew-pleroma-cert
-run-parts --test /etc/cron.daily
-```
+ # If everything worked the output should contain /etc/cron.daily/renew-pleroma-cert
+ run-parts --test /etc/cron.daily
+ ```
## Create your first user and set as admin
```sh
@@ -279,3 +289,4 @@ This will create an account withe the username of 'joeuser' with the email addre
## Questions
Questions about the installation or didn’t it work as it should be, ask in [#pleroma:matrix.org](https://matrix.heldscal.la/#/room/#freenode_#pleroma:matrix.org) or IRC Channel **#pleroma** on **Freenode**.
+
diff --git a/installation/freebsd/rc.d/pleroma b/installation/freebsd/rc.d/pleroma
new file mode 100755
index 000000000..f62aef18d
--- /dev/null
+++ b/installation/freebsd/rc.d/pleroma
@@ -0,0 +1,27 @@
+#!/bin/sh
+# $FreeBSD$
+# PROVIDE: pleroma
+# REQUIRE: DAEMON postgresql
+# KEYWORD: shutdown
+
+# sudo -u pleroma MIX_ENV=prod elixir --erl \"-detached\" -S mix phx.server
+
+. /etc/rc.subr
+
+name=pleroma
+rcvar=pleroma_enable
+
+desc="Pleroma Social Media Platform"
+
+load_rc_config ${name}
+
+: ${pleroma_user:=pleroma}
+: ${pleroma_home:=$(getent passwd ${pleroma_user} | awk -F: '{print $6}')}
+: ${pleroma_chdir:="${pleroma_home}/pleroma"}
+: ${pleroma_env:="HOME=${pleroma_home} MIX_ENV=prod"}
+
+command=/usr/local/bin/elixir
+command_args="--erl \"-detached\" -S /usr/local/bin/mix phx.server"
+procname="*beam.smp"
+
+run_rc_command "$1"
diff --git a/installation/init.d/pleroma b/installation/init.d/pleroma
index e908cda1b..384536f7e 100755
--- a/installation/init.d/pleroma
+++ b/installation/init.d/pleroma
@@ -8,7 +8,6 @@ pidfile="/var/run/pleroma.pid"
directory=/opt/pleroma
healthcheck_delay=60
healthcheck_timer=30
-export $(cat /opt/pleroma/config/pleroma.env)
: ${pleroma_port:-4000}
diff --git a/installation/pleroma.service b/installation/pleroma.service
index ee00a3b7a..5dcbc1387 100644
--- a/installation/pleroma.service
+++ b/installation/pleroma.service
@@ -17,8 +17,6 @@ Environment="MIX_ENV=prod"
Environment="HOME=/var/lib/pleroma"
; Path to the folder containing the Pleroma installation.
WorkingDirectory=/opt/pleroma
-; Path to the environment file. the file contains RELEASE_COOKIE and etc
-EnvironmentFile=/opt/pleroma/config/pleroma.env
; Path to the Mix binary.
ExecStart=/usr/bin/mix phx.server
diff --git a/lib/mix/pleroma.ex b/lib/mix/pleroma.ex
index 074492a46..fe9b0d16c 100644
--- a/lib/mix/pleroma.ex
+++ b/lib/mix/pleroma.ex
@@ -14,7 +14,7 @@ defmodule Mix.Pleroma do
:swoosh,
:timex
]
- @cachex_children ["object", "user"]
+ @cachex_children ["object", "user", "scrubber"]
@doc "Common functions to be reused in mix tasks"
def start_pleroma do
Pleroma.Config.Holder.save_default()
diff --git a/lib/mix/tasks/pleroma/database.ex b/lib/mix/tasks/pleroma/database.ex
index 82e2abdcb..7d8f00b08 100644
--- a/lib/mix/tasks/pleroma/database.ex
+++ b/lib/mix/tasks/pleroma/database.ex
@@ -10,6 +10,7 @@ defmodule Mix.Tasks.Pleroma.Database do
alias Pleroma.User
require Logger
require Pleroma.Constants
+ import Ecto.Query
import Mix.Pleroma
use Mix.Task
@@ -53,8 +54,6 @@ def run(["update_users_following_followers_counts"]) do
end
def run(["prune_objects" | args]) do
- import Ecto.Query
-
{options, [], []} =
OptionParser.parse(
args,
@@ -94,8 +93,6 @@ def run(["prune_objects" | args]) do
end
def run(["fix_likes_collections"]) do
- import Ecto.Query
-
start_pleroma()
from(object in Object,
@@ -130,4 +127,33 @@ def run(["vacuum", args]) do
Maintenance.vacuum(args)
end
+
+ def run(["ensure_expiration"]) do
+ start_pleroma()
+ days = Pleroma.Config.get([:mrf_activity_expiration, :days], 365)
+
+ Pleroma.Activity
+ |> join(:left, [a], u in assoc(a, :expiration))
+ |> join(:inner, [a, _u], o in Object,
+ on:
+ fragment(
+ "(?->>'id') = COALESCE((?)->'object'->> 'id', (?)->>'object')",
+ o.data,
+ a.data,
+ a.data
+ )
+ )
+ |> where(local: true)
+ |> where([a, u], is_nil(u))
+ |> where([a], fragment("(? ->> 'type'::text) = 'Create'", a.data))
+ |> where([_a, _u, o], fragment("?->>'type' = 'Note'", o.data))
+ |> Pleroma.RepoStreamer.chunk_stream(100)
+ |> Stream.each(fn activities ->
+ Enum.each(activities, fn activity ->
+ expires_at = Timex.shift(activity.inserted_at, days: days)
+ Pleroma.ActivityExpiration.create(activity, expires_at, false)
+ end)
+ end)
+ |> Stream.run()
+ end
end
diff --git a/lib/mix/tasks/pleroma/ecto/migrate.ex b/lib/mix/tasks/pleroma/ecto/migrate.ex
index bc8ed29fb..e903bd171 100644
--- a/lib/mix/tasks/pleroma/ecto/migrate.ex
+++ b/lib/mix/tasks/pleroma/ecto/migrate.ex
@@ -41,6 +41,10 @@ def run(args \\ []) do
load_pleroma()
{opts, _} = OptionParser.parse!(args, strict: @switches, aliases: @aliases)
+ if Application.get_env(:pleroma, Pleroma.Repo)[:ssl] do
+ Application.ensure_all_started(:ssl)
+ end
+
opts =
if opts[:to] || opts[:step] || opts[:all],
do: opts,
diff --git a/lib/mix/tasks/pleroma/ecto/rollback.ex b/lib/mix/tasks/pleroma/ecto/rollback.ex
index f43bd0b98..3dba952cb 100644
--- a/lib/mix/tasks/pleroma/ecto/rollback.ex
+++ b/lib/mix/tasks/pleroma/ecto/rollback.ex
@@ -40,6 +40,10 @@ def run(args \\ []) do
load_pleroma()
{opts, _} = OptionParser.parse!(args, strict: @switches, aliases: @aliases)
+ if Application.get_env(:pleroma, Pleroma.Repo)[:ssl] do
+ Application.ensure_all_started(:ssl)
+ end
+
opts =
if opts[:to] || opts[:step] || opts[:all],
do: opts,
diff --git a/lib/mix/tasks/pleroma/emoji.ex b/lib/mix/tasks/pleroma/emoji.ex
index f4eaeac98..8f52ee98d 100644
--- a/lib/mix/tasks/pleroma/emoji.ex
+++ b/lib/mix/tasks/pleroma/emoji.ex
@@ -15,7 +15,7 @@ def run(["ls-packs" | args]) do
{options, [], []} = parse_global_opts(args)
url_or_path = options[:manifest] || default_manifest()
- manifest = fetch_and_decode(url_or_path)
+ manifest = fetch_and_decode!(url_or_path)
Enum.each(manifest, fn {name, info} ->
to_print = [
@@ -42,7 +42,7 @@ def run(["get-packs" | args]) do
url_or_path = options[:manifest] || default_manifest()
- manifest = fetch_and_decode(url_or_path)
+ manifest = fetch_and_decode!(url_or_path)
for pack_name <- pack_names do
if Map.has_key?(manifest, pack_name) do
@@ -92,7 +92,7 @@ def run(["get-packs" | args]) do
])
)
- files = fetch_and_decode(files_loc)
+ files = fetch_and_decode!(files_loc)
IO.puts(IO.ANSI.format(["Unpacking ", :bright, pack_name]))
@@ -243,9 +243,11 @@ def run(["reload"]) do
IO.puts("Emoji packs have been reloaded.")
end
- defp fetch_and_decode(from) do
+ defp fetch_and_decode!(from) do
with {:ok, json} <- fetch(from) do
Jason.decode!(json)
+ else
+ {:error, error} -> raise "#{from} cannot be fetched. Error: #{error} occur."
end
end
diff --git a/lib/mix/tasks/pleroma/relay.ex b/lib/mix/tasks/pleroma/relay.ex
index c3312507e..a6d8d6c1c 100644
--- a/lib/mix/tasks/pleroma/relay.ex
+++ b/lib/mix/tasks/pleroma/relay.ex
@@ -35,10 +35,16 @@ def run(["unfollow", target]) do
def run(["list"]) do
start_pleroma()
- with {:ok, list} <- Relay.list(true) do
- list |> Enum.each(&shell_info(&1))
+ with {:ok, list} <- Relay.list() do
+ Enum.each(list, &print_relay_url/1)
else
{:error, e} -> shell_error("Error while fetching relay subscription list: #{inspect(e)}")
end
end
+
+ defp print_relay_url(%{followed_back: false} = relay) do
+ shell_info("#{relay.actor} - no Accept received (relay didn't follow back)")
+ end
+
+ defp print_relay_url(relay), do: shell_info(relay.actor)
end
diff --git a/lib/mix/tasks/pleroma/release_env.ex b/lib/mix/tasks/pleroma/release_env.ex
deleted file mode 100644
index 9da74ffcf..000000000
--- a/lib/mix/tasks/pleroma/release_env.ex
+++ /dev/null
@@ -1,76 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors #{name}
#{object.data["content"]}"
- else
- _ -> object.data["content"] || ""
- end
- end
+ def render_content(%{data: %{"name" => name}} = object) when not is_nil(name) and name != "" do
+ url = object.data["url"] || object.data["id"]
- def render_content(%{data: %{"type" => object_type}} = object)
- when object_type in ["Article", "Page"] do
- with summary when not is_nil(summary) and summary != "" <- object.data["name"],
- url when is_bitstring(url) <- object.data["url"] do
- "#{summary}
#{object.data["content"]}"
- else
- _ -> object.data["content"] || ""
- end
+ "#{name}
#{object.data["content"]}"
end
def render_content(object), do: object.data["content"] || ""
diff --git a/lib/pleroma/web/media_proxy/media_proxy.ex b/lib/pleroma/web/media_proxy/media_proxy.ex
index dfbfcea6b..e18dd8224 100644
--- a/lib/pleroma/web/media_proxy/media_proxy.ex
+++ b/lib/pleroma/web/media_proxy/media_proxy.ex
@@ -9,28 +9,31 @@ defmodule Pleroma.Web.MediaProxy do
alias Pleroma.Web.MediaProxy.Invalidation
@base64_opts [padding: false]
+ @cache_table :banned_urls_cache
+
+ def cache_table, do: @cache_table
@spec in_banned_urls(String.t()) :: boolean()
- def in_banned_urls(url), do: elem(Cachex.exists?(:banned_urls_cache, url(url)), 1)
+ def in_banned_urls(url), do: elem(Cachex.exists?(@cache_table, url(url)), 1)
def remove_from_banned_urls(urls) when is_list(urls) do
- Cachex.execute!(:banned_urls_cache, fn cache ->
+ Cachex.execute!(@cache_table, fn cache ->
Enum.each(Invalidation.prepare_urls(urls), &Cachex.del(cache, &1))
end)
end
def remove_from_banned_urls(url) when is_binary(url) do
- Cachex.del(:banned_urls_cache, url(url))
+ Cachex.del(@cache_table, url(url))
end
def put_in_banned_urls(urls) when is_list(urls) do
- Cachex.execute!(:banned_urls_cache, fn cache ->
+ Cachex.execute!(@cache_table, fn cache ->
Enum.each(Invalidation.prepare_urls(urls), &Cachex.put(cache, &1, true))
end)
end
def put_in_banned_urls(url) when is_binary(url) do
- Cachex.put(:banned_urls_cache, url(url), true)
+ Cachex.put(@cache_table, url(url), true)
end
def url(url) when is_nil(url) or url == "", do: nil
diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex
index f29b3cb57..dd00600ea 100644
--- a/lib/pleroma/web/oauth/oauth_controller.ex
+++ b/lib/pleroma/web/oauth/oauth_controller.ex
@@ -76,6 +76,13 @@ defp do_authorize(%Plug.Conn{} = conn, params) do
available_scopes = (app && app.scopes) || []
scopes = Scopes.fetch_scopes(params, available_scopes)
+ scopes =
+ if scopes == [] do
+ available_scopes
+ else
+ scopes
+ end
+
# Note: `params` might differ from `conn.params`; use `@params` not `@conn.params` in template
render(conn, Authenticator.auth_template(), %{
response_type: params["response_type"],
diff --git a/lib/pleroma/web/preload/timelines.ex b/lib/pleroma/web/preload/timelines.ex
index 57de04051..b279a865d 100644
--- a/lib/pleroma/web/preload/timelines.ex
+++ b/lib/pleroma/web/preload/timelines.ex
@@ -16,7 +16,7 @@ def generate_terms(params) do
end
def build_public_tag(acc, params) do
- if Pleroma.Config.get([:restrict_unauthenticated, :timelines, :federated], true) do
+ if Pleroma.Config.restrict_unauthenticated_access?(:timelines, :federated) do
acc
else
Map.put(acc, @public_url, public_timeline(params))
diff --git a/lib/pleroma/workers/cron/clear_oauth_token_worker.ex b/lib/pleroma/workers/cron/clear_oauth_token_worker.ex
index d41be4e87..276f47efc 100644
--- a/lib/pleroma/workers/cron/clear_oauth_token_worker.ex
+++ b/lib/pleroma/workers/cron/clear_oauth_token_worker.ex
@@ -16,8 +16,8 @@ defmodule Pleroma.Workers.Cron.ClearOauthTokenWorker do
def perform(_job) do
if Config.get([:oauth2, :clean_expired_tokens], false) do
Token.delete_expired_tokens()
- else
- :ok
end
+
+ :ok
end
end
diff --git a/lib/pleroma/workers/cron/digest_emails_worker.ex b/lib/pleroma/workers/cron/digest_emails_worker.ex
index ee646229f..0c56f00fb 100644
--- a/lib/pleroma/workers/cron/digest_emails_worker.ex
+++ b/lib/pleroma/workers/cron/digest_emails_worker.ex
@@ -37,9 +37,9 @@ def perform(_job) do
)
|> Repo.all()
|> send_emails
- else
- :ok
end
+
+ :ok
end
def send_emails(users) do
diff --git a/lib/pleroma/workers/cron/new_users_digest_worker.ex b/lib/pleroma/workers/cron/new_users_digest_worker.ex
index abc8a5e95..8bbaed83d 100644
--- a/lib/pleroma/workers/cron/new_users_digest_worker.ex
+++ b/lib/pleroma/workers/cron/new_users_digest_worker.ex
@@ -55,11 +55,9 @@ def perform(_job) do
|> Repo.all()
|> Enum.map(&Pleroma.Emails.NewUsersDigestEmail.new_users(&1, users_and_statuses))
|> Enum.each(&Pleroma.Emails.Mailer.deliver/1)
- else
- :ok
end
- else
- :ok
end
+
+ :ok
end
end
diff --git a/lib/pleroma/workers/cron/purge_expired_activities_worker.ex b/lib/pleroma/workers/cron/purge_expired_activities_worker.ex
index e926c5dc8..6549207fc 100644
--- a/lib/pleroma/workers/cron/purge_expired_activities_worker.ex
+++ b/lib/pleroma/workers/cron/purge_expired_activities_worker.ex
@@ -23,9 +23,9 @@ defmodule Pleroma.Workers.Cron.PurgeExpiredActivitiesWorker do
def perform(_job) do
if Config.get([ActivityExpiration, :enabled]) do
Enum.each(ActivityExpiration.due_expirations(@interval), &delete_activity/1)
- else
- :ok
end
+ after
+ :ok
end
def delete_activity(%ActivityExpiration{activity_id: activity_id}) do
@@ -41,7 +41,7 @@ def delete_activity(%ActivityExpiration{activity_id: activity_id}) do
{:user, _} ->
Logger.error(
- "#{__MODULE__} Couldn't delete expired activity: not found actorof ##{activity_id}"
+ "#{__MODULE__} Couldn't delete expired activity: not found actor of ##{activity_id}"
)
end
end
diff --git a/lib/pleroma/workers/cron/stats_worker.ex b/lib/pleroma/workers/cron/stats_worker.ex
index e54bd9a7f..6a79540bc 100644
--- a/lib/pleroma/workers/cron/stats_worker.ex
+++ b/lib/pleroma/workers/cron/stats_worker.ex
@@ -12,5 +12,6 @@ defmodule Pleroma.Workers.Cron.StatsWorker do
@impl Oban.Worker
def perform(_job) do
Pleroma.Stats.do_collect()
+ :ok
end
end
diff --git a/mix.exs b/mix.exs
index aab833c5e..11fdb1670 100644
--- a/mix.exs
+++ b/mix.exs
@@ -127,7 +127,7 @@ defp deps do
{:pbkdf2_elixir, "~> 1.2"},
{:bcrypt_elixir, "~> 2.2"},
{:trailing_format_plug, "~> 0.0.7"},
- {:fast_sanitize, "~> 0.1"},
+ {:fast_sanitize, "~> 0.2.0"},
{:html_entities, "~> 0.5", override: true},
{:phoenix_html, "~> 2.14"},
{:calendar, "~> 1.0"},
diff --git a/mix.lock b/mix.lock
index 55c3c59c6..7ec3a0b28 100644
--- a/mix.lock
+++ b/mix.lock
@@ -42,8 +42,8 @@
"ex_machina": {:hex, :ex_machina, "2.4.0", "09a34c5d371bfb5f78399029194a8ff67aff340ebe8ba19040181af35315eabb", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm", "a20bc9ddc721b33ea913b93666c5d0bdca5cbad7a67540784ae277228832d72c"},
"ex_syslogger": {:hex, :ex_syslogger, "1.5.2", "72b6aa2d47a236e999171f2e1ec18698740f40af0bd02c8c650bf5f1fd1bac79", [:mix], [{:poison, ">= 1.5.0", [hex: :poison, repo: "hexpm", optional: true]}, {:syslog, "~> 1.1.0", [hex: :syslog, repo: "hexpm", optional: false]}], "hexpm", "ab9fab4136dbc62651ec6f16fa4842f10cf02ab4433fa3d0976c01be99398399"},
"excoveralls": {:hex, :excoveralls, "0.13.1", "b9f1697f7c9e0cfe15d1a1d737fb169c398803ffcbc57e672aa007e9fd42864c", [:mix], [{:hackney, "~> 1.16", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "b4bb550e045def1b4d531a37fb766cbbe1307f7628bf8f0414168b3f52021cce"},
- "fast_html": {:hex, :fast_html, "1.0.3", "2cc0d4b68496266a1530e0c852cafeaede0bd10cfdee26fda50dc696c203162f", [:make, :mix], [], "hexpm", "ab3d782b639d3c4655fbaec0f9d032c91f8cab8dd791ac7469c2381bc7c32f85"},
- "fast_sanitize": {:hex, :fast_sanitize, "0.1.7", "2a7cd8734c88a2de6de55022104f8a3b87f1fdbe8bbf131d9049764b53d50d0d", [:mix], [{:fast_html, "~> 1.0", [hex: :fast_html, repo: "hexpm", optional: false]}, {:plug, "~> 1.8", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "f39fe8ea08fbac17487c30bf09b7d9f3e12472e51fb07a88ffeb8fd17da8ab67"},
+ "fast_html": {:hex, :fast_html, "2.0.1", "e126c74d287768ae78c48938da6711164517300d108a78f8a38993df8d588335", [:make, :mix], [{:elixir_make, "~> 0.4", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:nimble_pool, "~> 0.1.0", [hex: :nimble_pool, repo: "hexpm", optional: false]}], "hexpm", "bdd6f8525c95ad391a4f10d9a1b3da4cea94078ec8638487aa8c24015ad9393a"},
+ "fast_sanitize": {:hex, :fast_sanitize, "0.2.0", "004b40d5bbecda182b6fdba762a51fffd3501e689e8eafe196e1a97eb0caf733", [:mix], [{:fast_html, "~> 2.0", [hex: :fast_html, repo: "hexpm", optional: false]}, {:plug, "~> 1.8", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "11fcb37f26d272a3a2aff861872bf100be4eeacea69505908b8cdbcea5b0813a"},
"flake_id": {:hex, :flake_id, "0.1.0", "7716b086d2e405d09b647121a166498a0d93d1a623bead243e1f74216079ccb3", [:mix], [{:base62, "~> 1.2", [hex: :base62, repo: "hexpm", optional: false]}, {:ecto, ">= 2.0.0", [hex: :ecto, repo: "hexpm", optional: true]}], "hexpm", "31fc8090fde1acd267c07c36ea7365b8604055f897d3a53dd967658c691bd827"},
"floki": {:hex, :floki, "0.27.0", "6b29a14283f1e2e8fad824bc930eaa9477c462022075df6bea8f0ad811c13599", [:mix], [{:html_entities, "~> 0.5.0", [hex: :html_entities, repo: "hexpm", optional: false]}], "hexpm", "583b8c13697c37179f1f82443bcc7ad2f76fbc0bf4c186606eebd658f7f2631b"},
"gen_smtp": {:hex, :gen_smtp, "0.15.0", "9f51960c17769b26833b50df0b96123605a8024738b62db747fece14eb2fbfcc", [:rebar3], [], "hexpm", "29bd14a88030980849c7ed2447b8db6d6c9278a28b11a44cafe41b791205440f"},
@@ -76,6 +76,7 @@
"mox": {:hex, :mox, "0.5.2", "55a0a5ba9ccc671518d068c8dddd20eeb436909ea79d1799e2209df7eaa98b6c", [:mix], [], "hexpm", "df4310628cd628ee181df93f50ddfd07be3e5ecc30232d3b6aadf30bdfe6092b"},
"myhtmlex": {:git, "https://git.pleroma.social/pleroma/myhtmlex.git", "ad0097e2f61d4953bfef20fb6abddf23b87111e6", [ref: "ad0097e2f61d4953bfef20fb6abddf23b87111e6", submodules: true]},
"nimble_parsec": {:hex, :nimble_parsec, "0.6.0", "32111b3bf39137144abd7ba1cce0914533b2d16ef35e8abc5ec8be6122944263", [:mix], [], "hexpm", "27eac315a94909d4dc68bc07a4a83e06c8379237c5ea528a9acff4ca1c873c52"},
+ "nimble_pool": {:hex, :nimble_pool, "0.1.0", "ffa9d5be27eee2b00b0c634eb649aa27f97b39186fec3c493716c2a33e784ec6", [:mix], [], "hexpm", "343a1eaa620ddcf3430a83f39f2af499fe2370390d4f785cd475b4df5acaf3f9"},
"nodex": {:git, "https://git.pleroma.social/pleroma/nodex", "cb6730f943cfc6aad674c92161be23a8411f15d1", [ref: "cb6730f943cfc6aad674c92161be23a8411f15d1"]},
"oban": {:hex, :oban, "2.0.0", "e6ce70d94dd46815ec0882a1ffb7356df9a9d5b8a40a64ce5c2536617a447379", [:mix], [{:ecto_sql, ">= 3.4.3", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.14", [hex: :postgrex, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "cf574813bd048b98a698aa587c21367d2e06842d4e1b1993dcd6a696e9e633bd"},
"open_api_spex": {:git, "https://git.pleroma.social/pleroma/elixir-libraries/open_api_spex.git", "f296ac0924ba3cf79c7a588c4c252889df4c2edd", [ref: "f296ac0924ba3cf79c7a588c4c252889df4c2edd"]},
diff --git a/priv/repo/migrations/20200802170532_fix_legacy_tags.exs b/priv/repo/migrations/20200802170532_fix_legacy_tags.exs
index f7274b44e..ca82fac42 100644
--- a/priv/repo/migrations/20200802170532_fix_legacy_tags.exs
+++ b/priv/repo/migrations/20200802170532_fix_legacy_tags.exs
@@ -18,8 +18,11 @@ defmodule Pleroma.Repo.Migrations.FixLegacyTags do
def change do
legacy_tags = Map.keys(@old_new_map)
- from(u in User, where: fragment("? && ?", u.tags, ^legacy_tags))
- |> Repo.all()
+ from(u in User,
+ where: fragment("? && ?", u.tags, ^legacy_tags),
+ select: struct(u, [:tags, :id])
+ )
+ |> Repo.chunk_stream(100)
|> Enum.each(fn user ->
fix_tags_changeset(user)
|> Repo.update()
diff --git a/priv/repo/migrations/20200808173046_only_expire_creates.exs b/priv/repo/migrations/20200808173046_only_expire_creates.exs
new file mode 100644
index 000000000..9df52956f
--- /dev/null
+++ b/priv/repo/migrations/20200808173046_only_expire_creates.exs
@@ -0,0 +1,19 @@
+defmodule Pleroma.Repo.Migrations.OnlyExpireCreates do
+ use Ecto.Migration
+
+ def up do
+ statement = """
+ DELETE FROM
+ activity_expirations a_exp USING activities a, objects o
+ WHERE
+ a_exp.activity_id = a.id AND (o.data->>'id') = COALESCE(a.data->'object'->>'id', a.data->>'object')
+ AND (a.data->>'type' != 'Create' OR o.data->>'type' != 'Note');
+ """
+
+ execute(statement)
+ end
+
+ def down do
+ :ok
+ end
+end
diff --git a/priv/repo/migrations/20200811125613_set_defaults_to_user_approval_pending.exs b/priv/repo/migrations/20200811125613_set_defaults_to_user_approval_pending.exs
new file mode 100644
index 000000000..eec7da03f
--- /dev/null
+++ b/priv/repo/migrations/20200811125613_set_defaults_to_user_approval_pending.exs
@@ -0,0 +1,15 @@
+defmodule Pleroma.Repo.Migrations.SetDefaultsToUserApprovalPending do
+ use Ecto.Migration
+
+ def up do
+ execute("UPDATE users SET approval_pending = false WHERE approval_pending IS NULL")
+
+ alter table(:users) do
+ modify(:approval_pending, :boolean, default: false, null: false)
+ end
+ end
+
+ def down do
+ :ok
+ end
+end
diff --git a/priv/repo/migrations/20200811143147_ap_id_not_null.exs b/priv/repo/migrations/20200811143147_ap_id_not_null.exs
new file mode 100644
index 000000000..df649c7ca
--- /dev/null
+++ b/priv/repo/migrations/20200811143147_ap_id_not_null.exs
@@ -0,0 +1,19 @@
+defmodule Pleroma.Repo.Migrations.ApIdNotNull do
+ use Ecto.Migration
+
+ require Logger
+
+ def up do
+ Logger.warn(
+ "If this migration fails please open an issue at https://git.pleroma.social/pleroma/pleroma/-/issues/new \n"
+ )
+
+ alter table(:users) do
+ modify(:ap_id, :string, null: false)
+ end
+ end
+
+ def down do
+ :ok
+ end
+end
diff --git a/priv/repo/migrations/20200817120935_add_invisible_index_to_users.exs b/priv/repo/migrations/20200817120935_add_invisible_index_to_users.exs
new file mode 100644
index 000000000..2417d366e
--- /dev/null
+++ b/priv/repo/migrations/20200817120935_add_invisible_index_to_users.exs
@@ -0,0 +1,7 @@
+defmodule Pleroma.Repo.Migrations.AddInvisibleIndexToUsers do
+ use Ecto.Migration
+
+ def change do
+ create(index(:users, [:invisible]))
+ end
+end
diff --git a/priv/static/adminfe/app.01bdb34a.css b/priv/static/adminfe/app.61bb0915.css
similarity index 77%
rename from priv/static/adminfe/app.01bdb34a.css
rename to priv/static/adminfe/app.61bb0915.css
index 1b83a8a39..9d74d13dc 100644
Binary files a/priv/static/adminfe/app.01bdb34a.css and b/priv/static/adminfe/app.61bb0915.css differ
diff --git a/priv/static/adminfe/chunk-0171.8dc0d9da.css b/priv/static/adminfe/chunk-0171.8dc0d9da.css
new file mode 100644
index 000000000..824bddc85
Binary files /dev/null and b/priv/static/adminfe/chunk-0171.8dc0d9da.css differ
diff --git a/priv/static/adminfe/chunk-0cbc.60bba79b.css b/priv/static/adminfe/chunk-0cbc.60bba79b.css
deleted file mode 100644
index c6280f7ef..000000000
Binary files a/priv/static/adminfe/chunk-0cbc.60bba79b.css and /dev/null differ
diff --git a/priv/static/adminfe/chunk-176e.5d7d957b.css b/priv/static/adminfe/chunk-176e.4d21033f.css
similarity index 100%
rename from priv/static/adminfe/chunk-176e.5d7d957b.css
rename to priv/static/adminfe/chunk-176e.4d21033f.css
diff --git a/priv/static/adminfe/chunk-143c.43ada4fc.css b/priv/static/adminfe/chunk-2d97.7053ff89.css
similarity index 53%
rename from priv/static/adminfe/chunk-143c.43ada4fc.css
rename to priv/static/adminfe/chunk-2d97.7053ff89.css
index b580e0699..f6e28e1fb 100644
Binary files a/priv/static/adminfe/chunk-143c.43ada4fc.css and b/priv/static/adminfe/chunk-2d97.7053ff89.css differ
diff --git a/priv/static/adminfe/chunk-40a4.2fe71f6c.css b/priv/static/adminfe/chunk-40a4.2fe71f6c.css
new file mode 100644
index 000000000..83fefcb55
Binary files /dev/null and b/priv/static/adminfe/chunk-40a4.2fe71f6c.css differ
diff --git a/priv/static/adminfe/chunk-43ca.af749c6c.css b/priv/static/adminfe/chunk-43ca.af749c6c.css
deleted file mode 100644
index 504affb93..000000000
Binary files a/priv/static/adminfe/chunk-43ca.af749c6c.css and /dev/null differ
diff --git a/priv/static/adminfe/chunk-565e.33809ac8.css b/priv/static/adminfe/chunk-565e.33809ac8.css
new file mode 100644
index 000000000..063b0b35d
Binary files /dev/null and b/priv/static/adminfe/chunk-565e.33809ac8.css differ
diff --git a/priv/static/adminfe/chunk-60a9.a80ec218.css b/priv/static/adminfe/chunk-60a9.a80ec218.css
new file mode 100644
index 000000000..d45d79f4c
Binary files /dev/null and b/priv/static/adminfe/chunk-60a9.a80ec218.css differ
diff --git a/priv/static/adminfe/chunk-1609.408dae86.css b/priv/static/adminfe/chunk-654e.e105ec9c.css
similarity index 100%
rename from priv/static/adminfe/chunk-1609.408dae86.css
rename to priv/static/adminfe/chunk-654e.e105ec9c.css
diff --git a/priv/static/adminfe/chunk-070d.d2dd6533.css b/priv/static/adminfe/chunk-68ea.be16aa5f.css
similarity index 100%
rename from priv/static/adminfe/chunk-070d.d2dd6533.css
rename to priv/static/adminfe/chunk-68ea.be16aa5f.css
diff --git a/priv/static/adminfe/chunk-6e81.ca3b222f.css b/priv/static/adminfe/chunk-6e81.7f126ac7.css
similarity index 100%
rename from priv/static/adminfe/chunk-6e81.ca3b222f.css
rename to priv/static/adminfe/chunk-6e81.7f126ac7.css
diff --git a/priv/static/adminfe/chunk-5882.f65db7f2.css b/priv/static/adminfe/chunk-6e8c.f7407fd4.css
similarity index 65%
rename from priv/static/adminfe/chunk-5882.f65db7f2.css
rename to priv/static/adminfe/chunk-6e8c.f7407fd4.css
index b5e2a00b0..6936755b9 100644
Binary files a/priv/static/adminfe/chunk-5882.f65db7f2.css and b/priv/static/adminfe/chunk-6e8c.f7407fd4.css differ
diff --git a/priv/static/adminfe/chunk-7506.f01f6c2a.css b/priv/static/adminfe/chunk-7503.c75b68df.css
similarity index 100%
rename from priv/static/adminfe/chunk-7506.f01f6c2a.css
rename to priv/static/adminfe/chunk-7503.c75b68df.css
diff --git a/priv/static/adminfe/chunk-7c6b.d9e7180a.css b/priv/static/adminfe/chunk-7c6b.4c8fa90a.css
similarity index 100%
rename from priv/static/adminfe/chunk-7c6b.d9e7180a.css
rename to priv/static/adminfe/chunk-7c6b.4c8fa90a.css
diff --git a/priv/static/adminfe/chunk-c5f4.b1112f18.css b/priv/static/adminfe/chunk-97e2.b21a8915.css
similarity index 100%
rename from priv/static/adminfe/chunk-c5f4.b1112f18.css
rename to priv/static/adminfe/chunk-97e2.b21a8915.css
diff --git a/priv/static/adminfe/chunk-4e7e.5afe1978.css b/priv/static/adminfe/chunk-9a72.3e577534.css
similarity index 100%
rename from priv/static/adminfe/chunk-4e7e.5afe1978.css
rename to priv/static/adminfe/chunk-9a72.3e577534.css
diff --git a/priv/static/adminfe/chunk-commons.7f6d2d11.css b/priv/static/adminfe/chunk-commons.67f053f7.css
similarity index 100%
rename from priv/static/adminfe/chunk-commons.7f6d2d11.css
rename to priv/static/adminfe/chunk-commons.67f053f7.css
diff --git a/priv/static/adminfe/chunk-e404.a56021ae.css b/priv/static/adminfe/chunk-e404.a56021ae.css
deleted file mode 100644
index 7d8596ef6..000000000
Binary files a/priv/static/adminfe/chunk-e404.a56021ae.css and /dev/null differ
diff --git a/priv/static/adminfe/chunk-libs.686b5876.css b/priv/static/adminfe/chunk-libs.5cf7f50a.css
similarity index 100%
rename from priv/static/adminfe/chunk-libs.686b5876.css
rename to priv/static/adminfe/chunk-libs.5cf7f50a.css
diff --git a/priv/static/adminfe/index.html b/priv/static/adminfe/index.html
index 22b3143d2..5214cc94f 100644
--- a/priv/static/adminfe/index.html
+++ b/priv/static/adminfe/index.html
@@ -1 +1 @@
-Admin FE
\ No newline at end of file
+Admin FE
\ No newline at end of file
diff --git a/priv/static/adminfe/static/js/ZhIB.861df339.js b/priv/static/adminfe/static/js/ZhIB.861df339.js
deleted file mode 100644
index aeec873c8..000000000
Binary files a/priv/static/adminfe/static/js/ZhIB.861df339.js and /dev/null differ
diff --git a/priv/static/adminfe/static/js/ZhIB.861df339.js.map b/priv/static/adminfe/static/js/ZhIB.861df339.js.map
deleted file mode 100644
index ff11a2e71..000000000
Binary files a/priv/static/adminfe/static/js/ZhIB.861df339.js.map and /dev/null differ
diff --git a/priv/static/adminfe/static/js/app.86bfcdf3.js b/priv/static/adminfe/static/js/app.86bfcdf3.js
new file mode 100644
index 000000000..083555948
Binary files /dev/null and b/priv/static/adminfe/static/js/app.86bfcdf3.js differ
diff --git a/priv/static/adminfe/static/js/app.86bfcdf3.js.map b/priv/static/adminfe/static/js/app.86bfcdf3.js.map
new file mode 100644
index 000000000..1e35d9d3d
Binary files /dev/null and b/priv/static/adminfe/static/js/app.86bfcdf3.js.map differ
diff --git a/priv/static/adminfe/static/js/app.f220ac13.js b/priv/static/adminfe/static/js/app.f220ac13.js
deleted file mode 100644
index e5e1eda91..000000000
Binary files a/priv/static/adminfe/static/js/app.f220ac13.js and /dev/null differ
diff --git a/priv/static/adminfe/static/js/app.f220ac13.js.map b/priv/static/adminfe/static/js/app.f220ac13.js.map
deleted file mode 100644
index 90c22121e..000000000
Binary files a/priv/static/adminfe/static/js/app.f220ac13.js.map and /dev/null differ
diff --git a/priv/static/adminfe/static/js/chunk-0171.9ad03c0e.js b/priv/static/adminfe/static/js/chunk-0171.9ad03c0e.js
new file mode 100644
index 000000000..070fe2201
Binary files /dev/null and b/priv/static/adminfe/static/js/chunk-0171.9ad03c0e.js differ
diff --git a/priv/static/adminfe/static/js/chunk-0171.9ad03c0e.js.map b/priv/static/adminfe/static/js/chunk-0171.9ad03c0e.js.map
new file mode 100644
index 000000000..4696152ee
Binary files /dev/null and b/priv/static/adminfe/static/js/chunk-0171.9ad03c0e.js.map differ
diff --git a/priv/static/adminfe/static/js/chunk-0cbc.2b0f8802.js b/priv/static/adminfe/static/js/chunk-0cbc.2b0f8802.js
deleted file mode 100644
index d29070b62..000000000
Binary files a/priv/static/adminfe/static/js/chunk-0cbc.2b0f8802.js and /dev/null differ
diff --git a/priv/static/adminfe/static/js/chunk-0cbc.2b0f8802.js.map b/priv/static/adminfe/static/js/chunk-0cbc.2b0f8802.js.map
deleted file mode 100644
index 7c99d9d48..000000000
Binary files a/priv/static/adminfe/static/js/chunk-0cbc.2b0f8802.js.map and /dev/null differ
diff --git a/priv/static/adminfe/static/js/chunk-143c.fc1825bf.js b/priv/static/adminfe/static/js/chunk-143c.fc1825bf.js
deleted file mode 100644
index 6fbc5b1ed..000000000
Binary files a/priv/static/adminfe/static/js/chunk-143c.fc1825bf.js and /dev/null differ
diff --git a/priv/static/adminfe/static/js/chunk-143c.fc1825bf.js.map b/priv/static/adminfe/static/js/chunk-143c.fc1825bf.js.map
deleted file mode 100644
index 425a7427a..000000000
Binary files a/priv/static/adminfe/static/js/chunk-143c.fc1825bf.js.map and /dev/null differ
diff --git a/priv/static/adminfe/static/js/chunk-176e.c4995511.js b/priv/static/adminfe/static/js/chunk-176e.fe016b36.js
similarity index 99%
rename from priv/static/adminfe/static/js/chunk-176e.c4995511.js
rename to priv/static/adminfe/static/js/chunk-176e.fe016b36.js
index 80474b904..eb57c5863 100644
Binary files a/priv/static/adminfe/static/js/chunk-176e.c4995511.js and b/priv/static/adminfe/static/js/chunk-176e.fe016b36.js differ
diff --git a/priv/static/adminfe/static/js/chunk-176e.c4995511.js.map b/priv/static/adminfe/static/js/chunk-176e.fe016b36.js.map
similarity index 99%
rename from priv/static/adminfe/static/js/chunk-176e.c4995511.js.map
rename to priv/static/adminfe/static/js/chunk-176e.fe016b36.js.map
index f0caa5f62..b3d84706b 100644
Binary files a/priv/static/adminfe/static/js/chunk-176e.c4995511.js.map and b/priv/static/adminfe/static/js/chunk-176e.fe016b36.js.map differ
diff --git a/priv/static/adminfe/static/js/chunk-2d97.931fa130.js b/priv/static/adminfe/static/js/chunk-2d97.931fa130.js
new file mode 100644
index 000000000..d5ba28881
Binary files /dev/null and b/priv/static/adminfe/static/js/chunk-2d97.931fa130.js differ
diff --git a/priv/static/adminfe/static/js/chunk-2d97.931fa130.js.map b/priv/static/adminfe/static/js/chunk-2d97.931fa130.js.map
new file mode 100644
index 000000000..69c447abc
Binary files /dev/null and b/priv/static/adminfe/static/js/chunk-2d97.931fa130.js.map differ
diff --git a/priv/static/adminfe/static/js/chunk-40a4.e7e37fc4.js b/priv/static/adminfe/static/js/chunk-40a4.e7e37fc4.js
new file mode 100644
index 000000000..7e3de73d2
Binary files /dev/null and b/priv/static/adminfe/static/js/chunk-40a4.e7e37fc4.js differ
diff --git a/priv/static/adminfe/static/js/chunk-40a4.e7e37fc4.js.map b/priv/static/adminfe/static/js/chunk-40a4.e7e37fc4.js.map
new file mode 100644
index 000000000..935c150cc
Binary files /dev/null and b/priv/static/adminfe/static/js/chunk-40a4.e7e37fc4.js.map differ
diff --git a/priv/static/adminfe/static/js/chunk-43ca.aceb457c.js b/priv/static/adminfe/static/js/chunk-43ca.aceb457c.js
deleted file mode 100644
index f9fcbc288..000000000
Binary files a/priv/static/adminfe/static/js/chunk-43ca.aceb457c.js and /dev/null differ
diff --git a/priv/static/adminfe/static/js/chunk-43ca.aceb457c.js.map b/priv/static/adminfe/static/js/chunk-43ca.aceb457c.js.map
deleted file mode 100644
index 3c71ad178..000000000
Binary files a/priv/static/adminfe/static/js/chunk-43ca.aceb457c.js.map and /dev/null differ
diff --git a/priv/static/adminfe/static/js/chunk-565e.32b3b7b0.js b/priv/static/adminfe/static/js/chunk-565e.32b3b7b0.js
new file mode 100644
index 000000000..b72017611
Binary files /dev/null and b/priv/static/adminfe/static/js/chunk-565e.32b3b7b0.js differ
diff --git a/priv/static/adminfe/static/js/chunk-565e.32b3b7b0.js.map b/priv/static/adminfe/static/js/chunk-565e.32b3b7b0.js.map
new file mode 100644
index 000000000..a2bc8a3cd
Binary files /dev/null and b/priv/static/adminfe/static/js/chunk-565e.32b3b7b0.js.map differ
diff --git a/priv/static/adminfe/static/js/chunk-5882.7cbc4c1b.js b/priv/static/adminfe/static/js/chunk-5882.7cbc4c1b.js
deleted file mode 100644
index a29b6daab..000000000
Binary files a/priv/static/adminfe/static/js/chunk-5882.7cbc4c1b.js and /dev/null differ
diff --git a/priv/static/adminfe/static/js/chunk-5882.7cbc4c1b.js.map b/priv/static/adminfe/static/js/chunk-5882.7cbc4c1b.js.map
deleted file mode 100644
index d1aa2037f..000000000
Binary files a/priv/static/adminfe/static/js/chunk-5882.7cbc4c1b.js.map and /dev/null differ
diff --git a/priv/static/adminfe/static/js/chunk-60a9.15f68a0f.js b/priv/static/adminfe/static/js/chunk-60a9.15f68a0f.js
new file mode 100644
index 000000000..7b3e2e46c
Binary files /dev/null and b/priv/static/adminfe/static/js/chunk-60a9.15f68a0f.js differ
diff --git a/priv/static/adminfe/static/js/chunk-60a9.15f68a0f.js.map b/priv/static/adminfe/static/js/chunk-60a9.15f68a0f.js.map
new file mode 100644
index 000000000..a1bd1aa43
Binary files /dev/null and b/priv/static/adminfe/static/js/chunk-60a9.15f68a0f.js.map differ
diff --git a/priv/static/adminfe/static/js/chunk-1609.98da6b01.js b/priv/static/adminfe/static/js/chunk-654e.d523dfc3.js
similarity index 98%
rename from priv/static/adminfe/static/js/chunk-1609.98da6b01.js
rename to priv/static/adminfe/static/js/chunk-654e.d523dfc3.js
index 29dbad261..44c2c61c8 100644
Binary files a/priv/static/adminfe/static/js/chunk-1609.98da6b01.js and b/priv/static/adminfe/static/js/chunk-654e.d523dfc3.js differ
diff --git a/priv/static/adminfe/static/js/chunk-1609.98da6b01.js.map b/priv/static/adminfe/static/js/chunk-654e.d523dfc3.js.map
similarity index 99%
rename from priv/static/adminfe/static/js/chunk-1609.98da6b01.js.map
rename to priv/static/adminfe/static/js/chunk-654e.d523dfc3.js.map
index f287a503a..00f04d1d4 100644
Binary files a/priv/static/adminfe/static/js/chunk-1609.98da6b01.js.map and b/priv/static/adminfe/static/js/chunk-654e.d523dfc3.js.map differ
diff --git a/priv/static/adminfe/static/js/chunk-070d.7e10a520.js b/priv/static/adminfe/static/js/chunk-68ea.a283cad8.js
similarity index 94%
rename from priv/static/adminfe/static/js/chunk-070d.7e10a520.js
rename to priv/static/adminfe/static/js/chunk-68ea.a283cad8.js
index 8726dbcd3..bb7cbff96 100644
Binary files a/priv/static/adminfe/static/js/chunk-070d.7e10a520.js and b/priv/static/adminfe/static/js/chunk-68ea.a283cad8.js differ
diff --git a/priv/static/adminfe/static/js/chunk-070d.7e10a520.js.map b/priv/static/adminfe/static/js/chunk-68ea.a283cad8.js.map
similarity index 99%
rename from priv/static/adminfe/static/js/chunk-070d.7e10a520.js.map
rename to priv/static/adminfe/static/js/chunk-68ea.a283cad8.js.map
index 6b75a215e..201d8eaa9 100644
Binary files a/priv/static/adminfe/static/js/chunk-070d.7e10a520.js.map and b/priv/static/adminfe/static/js/chunk-68ea.a283cad8.js.map differ
diff --git a/priv/static/adminfe/static/js/chunk-6e81.6efb01f4.js b/priv/static/adminfe/static/js/chunk-6e81.b4ee7cf5.js
similarity index 97%
rename from priv/static/adminfe/static/js/chunk-6e81.6efb01f4.js
rename to priv/static/adminfe/static/js/chunk-6e81.b4ee7cf5.js
index f40d31879..32ede5eff 100644
Binary files a/priv/static/adminfe/static/js/chunk-6e81.6efb01f4.js and b/priv/static/adminfe/static/js/chunk-6e81.b4ee7cf5.js differ
diff --git a/priv/static/adminfe/static/js/chunk-6e81.6efb01f4.js.map b/priv/static/adminfe/static/js/chunk-6e81.b4ee7cf5.js.map
similarity index 98%
rename from priv/static/adminfe/static/js/chunk-6e81.6efb01f4.js.map
rename to priv/static/adminfe/static/js/chunk-6e81.b4ee7cf5.js.map
index 0390c3309..7301b6957 100644
Binary files a/priv/static/adminfe/static/js/chunk-6e81.6efb01f4.js.map and b/priv/static/adminfe/static/js/chunk-6e81.b4ee7cf5.js.map differ
diff --git a/priv/static/adminfe/static/js/chunk-6e8c.46fda72d.js b/priv/static/adminfe/static/js/chunk-6e8c.46fda72d.js
new file mode 100644
index 000000000..f6175a4b5
Binary files /dev/null and b/priv/static/adminfe/static/js/chunk-6e8c.46fda72d.js differ
diff --git a/priv/static/adminfe/static/js/chunk-6e8c.46fda72d.js.map b/priv/static/adminfe/static/js/chunk-6e8c.46fda72d.js.map
new file mode 100644
index 000000000..159876ea9
Binary files /dev/null and b/priv/static/adminfe/static/js/chunk-6e8c.46fda72d.js.map differ
diff --git a/priv/static/adminfe/static/js/chunk-7503.ee7af549.js b/priv/static/adminfe/static/js/chunk-7503.ee7af549.js
new file mode 100644
index 000000000..6126d904d
Binary files /dev/null and b/priv/static/adminfe/static/js/chunk-7503.ee7af549.js differ
diff --git a/priv/static/adminfe/static/js/chunk-7503.ee7af549.js.map b/priv/static/adminfe/static/js/chunk-7503.ee7af549.js.map
new file mode 100644
index 000000000..cf893c61f
Binary files /dev/null and b/priv/static/adminfe/static/js/chunk-7503.ee7af549.js.map differ
diff --git a/priv/static/adminfe/static/js/chunk-7506.a3364e53.js b/priv/static/adminfe/static/js/chunk-7506.a3364e53.js
deleted file mode 100644
index d4eaa356a..000000000
Binary files a/priv/static/adminfe/static/js/chunk-7506.a3364e53.js and /dev/null differ
diff --git a/priv/static/adminfe/static/js/chunk-7506.a3364e53.js.map b/priv/static/adminfe/static/js/chunk-7506.a3364e53.js.map
deleted file mode 100644
index c8e9db8e0..000000000
Binary files a/priv/static/adminfe/static/js/chunk-7506.a3364e53.js.map and /dev/null differ
diff --git a/priv/static/adminfe/static/js/chunk-7c6b.e63ae1da.js b/priv/static/adminfe/static/js/chunk-7c6b.7c4844a9.js
similarity index 97%
rename from priv/static/adminfe/static/js/chunk-7c6b.e63ae1da.js
rename to priv/static/adminfe/static/js/chunk-7c6b.7c4844a9.js
index 27478ddb1..a349860a8 100644
Binary files a/priv/static/adminfe/static/js/chunk-7c6b.e63ae1da.js and b/priv/static/adminfe/static/js/chunk-7c6b.7c4844a9.js differ
diff --git a/priv/static/adminfe/static/js/chunk-7c6b.e63ae1da.js.map b/priv/static/adminfe/static/js/chunk-7c6b.7c4844a9.js.map
similarity index 98%
rename from priv/static/adminfe/static/js/chunk-7c6b.e63ae1da.js.map
rename to priv/static/adminfe/static/js/chunk-7c6b.7c4844a9.js.map
index 2114a3c52..632e5750e 100644
Binary files a/priv/static/adminfe/static/js/chunk-7c6b.e63ae1da.js.map and b/priv/static/adminfe/static/js/chunk-7c6b.7c4844a9.js.map differ
diff --git a/priv/static/adminfe/static/js/chunk-c5f4.cf269f9b.js b/priv/static/adminfe/static/js/chunk-97e2.5baa6e73.js
similarity index 99%
rename from priv/static/adminfe/static/js/chunk-c5f4.cf269f9b.js
rename to priv/static/adminfe/static/js/chunk-97e2.5baa6e73.js
index 2d5308031..a3b706d5d 100644
Binary files a/priv/static/adminfe/static/js/chunk-c5f4.cf269f9b.js and b/priv/static/adminfe/static/js/chunk-97e2.5baa6e73.js differ
diff --git a/priv/static/adminfe/static/js/chunk-c5f4.cf269f9b.js.map b/priv/static/adminfe/static/js/chunk-97e2.5baa6e73.js.map
similarity index 99%
rename from priv/static/adminfe/static/js/chunk-c5f4.cf269f9b.js.map
rename to priv/static/adminfe/static/js/chunk-97e2.5baa6e73.js.map
index d5fc047ee..b7a392337 100644
Binary files a/priv/static/adminfe/static/js/chunk-c5f4.cf269f9b.js.map and b/priv/static/adminfe/static/js/chunk-97e2.5baa6e73.js.map differ
diff --git a/priv/static/adminfe/static/js/chunk-4e7e.91b5e73a.js b/priv/static/adminfe/static/js/chunk-9a72.7b2fc06e.js
similarity index 97%
rename from priv/static/adminfe/static/js/chunk-4e7e.91b5e73a.js
rename to priv/static/adminfe/static/js/chunk-9a72.7b2fc06e.js
index 0fdf0de50..0dc8e9b68 100644
Binary files a/priv/static/adminfe/static/js/chunk-4e7e.91b5e73a.js and b/priv/static/adminfe/static/js/chunk-9a72.7b2fc06e.js differ
diff --git a/priv/static/adminfe/static/js/chunk-4e7e.91b5e73a.js.map b/priv/static/adminfe/static/js/chunk-9a72.7b2fc06e.js.map
similarity index 99%
rename from priv/static/adminfe/static/js/chunk-4e7e.91b5e73a.js.map
rename to priv/static/adminfe/static/js/chunk-9a72.7b2fc06e.js.map
index 7a6751cf8..c351b689e 100644
Binary files a/priv/static/adminfe/static/js/chunk-4e7e.91b5e73a.js.map and b/priv/static/adminfe/static/js/chunk-9a72.7b2fc06e.js.map differ
diff --git a/priv/static/adminfe/static/js/chunk-commons.5a106955.js b/priv/static/adminfe/static/js/chunk-commons.38728553.js
similarity index 99%
rename from priv/static/adminfe/static/js/chunk-commons.5a106955.js
rename to priv/static/adminfe/static/js/chunk-commons.38728553.js
index a6cf2ce52..0f2ffce9f 100644
Binary files a/priv/static/adminfe/static/js/chunk-commons.5a106955.js and b/priv/static/adminfe/static/js/chunk-commons.38728553.js differ
diff --git a/priv/static/adminfe/static/js/chunk-commons.5a106955.js.map b/priv/static/adminfe/static/js/chunk-commons.38728553.js.map
similarity index 99%
rename from priv/static/adminfe/static/js/chunk-commons.5a106955.js.map
rename to priv/static/adminfe/static/js/chunk-commons.38728553.js.map
index d924490e5..048f21e43 100644
Binary files a/priv/static/adminfe/static/js/chunk-commons.5a106955.js.map and b/priv/static/adminfe/static/js/chunk-commons.38728553.js.map differ
diff --git a/priv/static/adminfe/static/js/chunk-e404.554bc2e3.js b/priv/static/adminfe/static/js/chunk-e404.554bc2e3.js
deleted file mode 100644
index 769e9f4f9..000000000
Binary files a/priv/static/adminfe/static/js/chunk-e404.554bc2e3.js and /dev/null differ
diff --git a/priv/static/adminfe/static/js/chunk-e404.554bc2e3.js.map b/priv/static/adminfe/static/js/chunk-e404.554bc2e3.js.map
deleted file mode 100644
index e8214adbb..000000000
Binary files a/priv/static/adminfe/static/js/chunk-e404.554bc2e3.js.map and /dev/null differ
diff --git a/priv/static/adminfe/static/js/chunk-elementUI.fba0efec.js b/priv/static/adminfe/static/js/chunk-elementUI.2de79b84.js
similarity index 99%
rename from priv/static/adminfe/static/js/chunk-elementUI.fba0efec.js
rename to priv/static/adminfe/static/js/chunk-elementUI.2de79b84.js
index f106931f5..c76b0430b 100644
Binary files a/priv/static/adminfe/static/js/chunk-elementUI.fba0efec.js and b/priv/static/adminfe/static/js/chunk-elementUI.2de79b84.js differ
diff --git a/priv/static/adminfe/static/js/chunk-elementUI.fba0efec.js.map b/priv/static/adminfe/static/js/chunk-elementUI.2de79b84.js.map
similarity index 99%
rename from priv/static/adminfe/static/js/chunk-elementUI.fba0efec.js.map
rename to priv/static/adminfe/static/js/chunk-elementUI.2de79b84.js.map
index a1f726fde..fa9dc12f0 100644
Binary files a/priv/static/adminfe/static/js/chunk-elementUI.fba0efec.js.map and b/priv/static/adminfe/static/js/chunk-elementUI.2de79b84.js.map differ
diff --git a/priv/static/adminfe/static/js/chunk-libs.b8c453ab.js b/priv/static/adminfe/static/js/chunk-libs.76802be9.js
similarity index 80%
rename from priv/static/adminfe/static/js/chunk-libs.b8c453ab.js
rename to priv/static/adminfe/static/js/chunk-libs.76802be9.js
index 2af35eb62..984b5ad40 100644
Binary files a/priv/static/adminfe/static/js/chunk-libs.b8c453ab.js and b/priv/static/adminfe/static/js/chunk-libs.76802be9.js differ
diff --git a/priv/static/adminfe/static/js/chunk-libs.76802be9.js.map b/priv/static/adminfe/static/js/chunk-libs.76802be9.js.map
new file mode 100644
index 000000000..d4680796a
Binary files /dev/null and b/priv/static/adminfe/static/js/chunk-libs.76802be9.js.map differ
diff --git a/priv/static/adminfe/static/js/chunk-libs.b8c453ab.js.map b/priv/static/adminfe/static/js/chunk-libs.b8c453ab.js.map
deleted file mode 100644
index 9c9d9acde..000000000
Binary files a/priv/static/adminfe/static/js/chunk-libs.b8c453ab.js.map and /dev/null differ
diff --git a/priv/static/adminfe/static/js/runtime.0a70a9f5.js b/priv/static/adminfe/static/js/runtime.0a70a9f5.js
deleted file mode 100644
index a99d1d369..000000000
Binary files a/priv/static/adminfe/static/js/runtime.0a70a9f5.js and /dev/null differ
diff --git a/priv/static/adminfe/static/js/runtime.0a70a9f5.js.map b/priv/static/adminfe/static/js/runtime.0a70a9f5.js.map
deleted file mode 100644
index 62e726b22..000000000
Binary files a/priv/static/adminfe/static/js/runtime.0a70a9f5.js.map and /dev/null differ
diff --git a/priv/static/adminfe/static/js/runtime.ba9393f3.js b/priv/static/adminfe/static/js/runtime.ba9393f3.js
new file mode 100644
index 000000000..c66462ab6
Binary files /dev/null and b/priv/static/adminfe/static/js/runtime.ba9393f3.js differ
diff --git a/priv/static/adminfe/static/js/runtime.ba9393f3.js.map b/priv/static/adminfe/static/js/runtime.ba9393f3.js.map
new file mode 100644
index 000000000..c167edf90
Binary files /dev/null and b/priv/static/adminfe/static/js/runtime.ba9393f3.js.map differ
diff --git a/priv/static/index.html b/priv/static/index.html
index 2257dec35..7dd080b2d 100644
--- a/priv/static/index.html
+++ b/priv/static/index.html
@@ -1 +1 @@
-Pleroma To use Pleroma, please enable JavaScript.
\ No newline at end of file
+Pleroma To use Pleroma, please enable JavaScript.
\ No newline at end of file
diff --git a/priv/static/static/css/app.6dbc7dea4fc148c85860.css b/priv/static/static/css/app.77b1644622e3bae24b6b.css
similarity index 99%
rename from priv/static/static/css/app.6dbc7dea4fc148c85860.css
rename to priv/static/static/css/app.77b1644622e3bae24b6b.css
index 3927e3b77..8038882c0 100644
Binary files a/priv/static/static/css/app.6dbc7dea4fc148c85860.css and b/priv/static/static/css/app.77b1644622e3bae24b6b.css differ
diff --git a/priv/static/static/css/app.6dbc7dea4fc148c85860.css.map b/priv/static/static/css/app.77b1644622e3bae24b6b.css.map
similarity index 99%
rename from priv/static/static/css/app.6dbc7dea4fc148c85860.css.map
rename to priv/static/static/css/app.77b1644622e3bae24b6b.css.map
index 963d5b3b8..4b042ef35 100644
--- a/priv/static/static/css/app.6dbc7dea4fc148c85860.css.map
+++ b/priv/static/static/css/app.77b1644622e3bae24b6b.css.map
@@ -1 +1 @@
-{"version":3,"sources":["webpack:///./src/components/tab_switcher/tab_switcher.scss","webpack:///./src/hocs/with_load_more/with_load_more.scss"],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,C;ACtOA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,C","file":"static/css/app.6dbc7dea4fc148c85860.css","sourcesContent":[".tab-switcher {\n display: -ms-flexbox;\n display: flex;\n}\n.tab-switcher .tab-icon {\n font-size: 2em;\n display: block;\n}\n.tab-switcher.top-tabs {\n -ms-flex-direction: column;\n flex-direction: column;\n}\n.tab-switcher.top-tabs > .tabs {\n width: 100%;\n overflow-y: hidden;\n overflow-x: auto;\n padding-top: 5px;\n -ms-flex-direction: row;\n flex-direction: row;\n}\n.tab-switcher.top-tabs > .tabs::after, .tab-switcher.top-tabs > .tabs::before {\n content: \"\";\n -ms-flex: 1 1 auto;\n flex: 1 1 auto;\n border-bottom: 1px solid;\n border-bottom-color: #222;\n border-bottom-color: var(--border, #222);\n}\n.tab-switcher.top-tabs > .tabs .tab-wrapper {\n height: 28px;\n}\n.tab-switcher.top-tabs > .tabs .tab-wrapper:not(.active)::after {\n left: 0;\n right: 0;\n bottom: 0;\n border-bottom: 1px solid;\n border-bottom-color: #222;\n border-bottom-color: var(--border, #222);\n}\n.tab-switcher.top-tabs > .tabs .tab {\n width: 100%;\n min-width: 1px;\n border-bottom-left-radius: 0;\n border-bottom-right-radius: 0;\n padding-bottom: 99px;\n margin-bottom: -93px;\n}\n.tab-switcher.top-tabs .contents.scrollable-tabs {\n -ms-flex-preferred-size: 0;\n flex-basis: 0;\n}\n.tab-switcher.side-tabs {\n -ms-flex-direction: row;\n flex-direction: row;\n}\n@media all and (max-width: 800px) {\n .tab-switcher.side-tabs {\n overflow-x: auto;\n }\n}\n.tab-switcher.side-tabs > .contents {\n -ms-flex: 1 1 auto;\n flex: 1 1 auto;\n}\n.tab-switcher.side-tabs > .tabs {\n -ms-flex: 0 0 auto;\n flex: 0 0 auto;\n overflow-y: auto;\n overflow-x: hidden;\n -ms-flex-direction: column;\n flex-direction: column;\n}\n.tab-switcher.side-tabs > .tabs::after, .tab-switcher.side-tabs > .tabs::before {\n -ms-flex-negative: 0;\n flex-shrink: 0;\n -ms-flex-preferred-size: 0.5em;\n flex-basis: 0.5em;\n content: \"\";\n border-right: 1px solid;\n border-right-color: #222;\n border-right-color: var(--border, #222);\n}\n.tab-switcher.side-tabs > .tabs::after {\n -ms-flex-positive: 1;\n flex-grow: 1;\n}\n.tab-switcher.side-tabs > .tabs::before {\n -ms-flex-positive: 0;\n flex-grow: 0;\n}\n.tab-switcher.side-tabs > .tabs .tab-wrapper {\n min-width: 10em;\n display: -ms-flexbox;\n display: flex;\n -ms-flex-direction: column;\n flex-direction: column;\n}\n@media all and (max-width: 800px) {\n .tab-switcher.side-tabs > .tabs .tab-wrapper {\n min-width: 1em;\n }\n}\n.tab-switcher.side-tabs > .tabs .tab-wrapper:not(.active)::after {\n top: 0;\n right: 0;\n bottom: 0;\n border-right: 1px solid;\n border-right-color: #222;\n border-right-color: var(--border, #222);\n}\n.tab-switcher.side-tabs > .tabs .tab-wrapper::before {\n -ms-flex: 0 0 6px;\n flex: 0 0 6px;\n content: \"\";\n border-right: 1px solid;\n border-right-color: #222;\n border-right-color: var(--border, #222);\n}\n.tab-switcher.side-tabs > .tabs .tab-wrapper:last-child .tab {\n margin-bottom: 0;\n}\n.tab-switcher.side-tabs > .tabs .tab {\n -ms-flex: 1;\n flex: 1;\n box-sizing: content-box;\n min-width: 10em;\n min-width: 1px;\n border-top-right-radius: 0;\n border-bottom-right-radius: 0;\n padding-left: 1em;\n padding-right: calc(1em + 200px);\n margin-right: -200px;\n margin-left: 1em;\n}\n@media all and (max-width: 800px) {\n .tab-switcher.side-tabs > .tabs .tab {\n padding-left: 0.25em;\n padding-right: calc(.25em + 200px);\n margin-right: calc(.25em - 200px);\n margin-left: 0.25em;\n }\n .tab-switcher.side-tabs > .tabs .tab .text {\n display: none;\n }\n}\n.tab-switcher .contents {\n -ms-flex: 1 0 auto;\n flex: 1 0 auto;\n min-height: 0px;\n}\n.tab-switcher .contents .hidden {\n display: none;\n}\n.tab-switcher .contents .full-height:not(.hidden) {\n height: 100%;\n display: -ms-flexbox;\n display: flex;\n -ms-flex-direction: column;\n flex-direction: column;\n}\n.tab-switcher .contents .full-height:not(.hidden) > *:not(.mobile-label) {\n -ms-flex: 1;\n flex: 1;\n}\n.tab-switcher .contents.scrollable-tabs {\n overflow-y: auto;\n}\n.tab-switcher .tab {\n position: relative;\n white-space: nowrap;\n padding: 6px 1em;\n background-color: #182230;\n background-color: var(--tab, #182230);\n}\n.tab-switcher .tab, .tab-switcher .tab:active .tab-icon {\n color: #b9b9ba;\n color: var(--tabText, #b9b9ba);\n}\n.tab-switcher .tab:not(.active) {\n z-index: 4;\n}\n.tab-switcher .tab:not(.active):hover {\n z-index: 6;\n}\n.tab-switcher .tab.active {\n background: transparent;\n z-index: 5;\n color: #b9b9ba;\n color: var(--tabActiveText, #b9b9ba);\n}\n.tab-switcher .tab img {\n max-height: 26px;\n vertical-align: top;\n margin-top: -5px;\n}\n.tab-switcher .tabs {\n display: -ms-flexbox;\n display: flex;\n position: relative;\n box-sizing: border-box;\n}\n.tab-switcher .tabs::after, .tab-switcher .tabs::before {\n display: block;\n -ms-flex: 1 1 auto;\n flex: 1 1 auto;\n}\n.tab-switcher .tab-wrapper {\n position: relative;\n display: -ms-flexbox;\n display: flex;\n -ms-flex: 0 0 auto;\n flex: 0 0 auto;\n}\n.tab-switcher .tab-wrapper:not(.active)::after {\n content: \"\";\n position: absolute;\n z-index: 7;\n}\n.tab-switcher .mobile-label {\n padding-left: 0.3em;\n padding-bottom: 0.25em;\n margin-top: 0.5em;\n margin-left: 0.2em;\n margin-bottom: 0.25em;\n border-bottom: 1px solid var(--border, #222);\n}\n@media all and (min-width: 800px) {\n .tab-switcher .mobile-label {\n display: none;\n }\n}",".with-load-more-footer {\n padding: 10px;\n text-align: center;\n border-top: 1px solid;\n border-top-color: #222;\n border-top-color: var(--border, #222);\n}\n.with-load-more-footer .error {\n font-size: 14px;\n}\n.with-load-more-footer a {\n cursor: pointer;\n}"],"sourceRoot":""}
\ No newline at end of file
+{"version":3,"sources":["webpack:///./src/components/tab_switcher/tab_switcher.scss","webpack:///./src/hocs/with_load_more/with_load_more.scss"],"names":[],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,C;ACtOA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,C","file":"static/css/app.77b1644622e3bae24b6b.css","sourcesContent":[".tab-switcher {\n display: -ms-flexbox;\n display: flex;\n}\n.tab-switcher .tab-icon {\n font-size: 2em;\n display: block;\n}\n.tab-switcher.top-tabs {\n -ms-flex-direction: column;\n flex-direction: column;\n}\n.tab-switcher.top-tabs > .tabs {\n width: 100%;\n overflow-y: hidden;\n overflow-x: auto;\n padding-top: 5px;\n -ms-flex-direction: row;\n flex-direction: row;\n}\n.tab-switcher.top-tabs > .tabs::after, .tab-switcher.top-tabs > .tabs::before {\n content: \"\";\n -ms-flex: 1 1 auto;\n flex: 1 1 auto;\n border-bottom: 1px solid;\n border-bottom-color: #222;\n border-bottom-color: var(--border, #222);\n}\n.tab-switcher.top-tabs > .tabs .tab-wrapper {\n height: 28px;\n}\n.tab-switcher.top-tabs > .tabs .tab-wrapper:not(.active)::after {\n left: 0;\n right: 0;\n bottom: 0;\n border-bottom: 1px solid;\n border-bottom-color: #222;\n border-bottom-color: var(--border, #222);\n}\n.tab-switcher.top-tabs > .tabs .tab {\n width: 100%;\n min-width: 1px;\n border-bottom-left-radius: 0;\n border-bottom-right-radius: 0;\n padding-bottom: 99px;\n margin-bottom: -93px;\n}\n.tab-switcher.top-tabs .contents.scrollable-tabs {\n -ms-flex-preferred-size: 0;\n flex-basis: 0;\n}\n.tab-switcher.side-tabs {\n -ms-flex-direction: row;\n flex-direction: row;\n}\n@media all and (max-width: 800px) {\n .tab-switcher.side-tabs {\n overflow-x: auto;\n }\n}\n.tab-switcher.side-tabs > .contents {\n -ms-flex: 1 1 auto;\n flex: 1 1 auto;\n}\n.tab-switcher.side-tabs > .tabs {\n -ms-flex: 0 0 auto;\n flex: 0 0 auto;\n overflow-y: auto;\n overflow-x: hidden;\n -ms-flex-direction: column;\n flex-direction: column;\n}\n.tab-switcher.side-tabs > .tabs::after, .tab-switcher.side-tabs > .tabs::before {\n -ms-flex-negative: 0;\n flex-shrink: 0;\n -ms-flex-preferred-size: 0.5em;\n flex-basis: 0.5em;\n content: \"\";\n border-right: 1px solid;\n border-right-color: #222;\n border-right-color: var(--border, #222);\n}\n.tab-switcher.side-tabs > .tabs::after {\n -ms-flex-positive: 1;\n flex-grow: 1;\n}\n.tab-switcher.side-tabs > .tabs::before {\n -ms-flex-positive: 0;\n flex-grow: 0;\n}\n.tab-switcher.side-tabs > .tabs .tab-wrapper {\n min-width: 10em;\n display: -ms-flexbox;\n display: flex;\n -ms-flex-direction: column;\n flex-direction: column;\n}\n@media all and (max-width: 800px) {\n .tab-switcher.side-tabs > .tabs .tab-wrapper {\n min-width: 1em;\n }\n}\n.tab-switcher.side-tabs > .tabs .tab-wrapper:not(.active)::after {\n top: 0;\n right: 0;\n bottom: 0;\n border-right: 1px solid;\n border-right-color: #222;\n border-right-color: var(--border, #222);\n}\n.tab-switcher.side-tabs > .tabs .tab-wrapper::before {\n -ms-flex: 0 0 6px;\n flex: 0 0 6px;\n content: \"\";\n border-right: 1px solid;\n border-right-color: #222;\n border-right-color: var(--border, #222);\n}\n.tab-switcher.side-tabs > .tabs .tab-wrapper:last-child .tab {\n margin-bottom: 0;\n}\n.tab-switcher.side-tabs > .tabs .tab {\n -ms-flex: 1;\n flex: 1;\n box-sizing: content-box;\n min-width: 10em;\n min-width: 1px;\n border-top-right-radius: 0;\n border-bottom-right-radius: 0;\n padding-left: 1em;\n padding-right: calc(1em + 200px);\n margin-right: -200px;\n margin-left: 1em;\n}\n@media all and (max-width: 800px) {\n .tab-switcher.side-tabs > .tabs .tab {\n padding-left: 0.25em;\n padding-right: calc(.25em + 200px);\n margin-right: calc(.25em - 200px);\n margin-left: 0.25em;\n }\n .tab-switcher.side-tabs > .tabs .tab .text {\n display: none;\n }\n}\n.tab-switcher .contents {\n -ms-flex: 1 0 auto;\n flex: 1 0 auto;\n min-height: 0px;\n}\n.tab-switcher .contents .hidden {\n display: none;\n}\n.tab-switcher .contents .full-height:not(.hidden) {\n height: 100%;\n display: -ms-flexbox;\n display: flex;\n -ms-flex-direction: column;\n flex-direction: column;\n}\n.tab-switcher .contents .full-height:not(.hidden) > *:not(.mobile-label) {\n -ms-flex: 1;\n flex: 1;\n}\n.tab-switcher .contents.scrollable-tabs {\n overflow-y: auto;\n}\n.tab-switcher .tab {\n position: relative;\n white-space: nowrap;\n padding: 6px 1em;\n background-color: #182230;\n background-color: var(--tab, #182230);\n}\n.tab-switcher .tab, .tab-switcher .tab:active .tab-icon {\n color: #b9b9ba;\n color: var(--tabText, #b9b9ba);\n}\n.tab-switcher .tab:not(.active) {\n z-index: 4;\n}\n.tab-switcher .tab:not(.active):hover {\n z-index: 6;\n}\n.tab-switcher .tab.active {\n background: transparent;\n z-index: 5;\n color: #b9b9ba;\n color: var(--tabActiveText, #b9b9ba);\n}\n.tab-switcher .tab img {\n max-height: 26px;\n vertical-align: top;\n margin-top: -5px;\n}\n.tab-switcher .tabs {\n display: -ms-flexbox;\n display: flex;\n position: relative;\n box-sizing: border-box;\n}\n.tab-switcher .tabs::after, .tab-switcher .tabs::before {\n display: block;\n -ms-flex: 1 1 auto;\n flex: 1 1 auto;\n}\n.tab-switcher .tab-wrapper {\n position: relative;\n display: -ms-flexbox;\n display: flex;\n -ms-flex: 0 0 auto;\n flex: 0 0 auto;\n}\n.tab-switcher .tab-wrapper:not(.active)::after {\n content: \"\";\n position: absolute;\n z-index: 7;\n}\n.tab-switcher .mobile-label {\n padding-left: 0.3em;\n padding-bottom: 0.25em;\n margin-top: 0.5em;\n margin-left: 0.2em;\n margin-bottom: 0.25em;\n border-bottom: 1px solid var(--border, #222);\n}\n@media all and (min-width: 800px) {\n .tab-switcher .mobile-label {\n display: none;\n }\n}",".with-load-more-footer {\n padding: 10px;\n text-align: center;\n border-top: 1px solid;\n border-top-color: #222;\n border-top-color: var(--border, #222);\n}\n.with-load-more-footer .error {\n font-size: 14px;\n}\n.with-load-more-footer a {\n cursor: pointer;\n}"],"sourceRoot":""}
\ No newline at end of file
diff --git a/priv/static/static/font/fontello.1594823398494.woff2 b/priv/static/static/font/fontello.1594823398494.woff2
deleted file mode 100644
index c61bf111a..000000000
Binary files a/priv/static/static/font/fontello.1594823398494.woff2 and /dev/null differ
diff --git a/priv/static/static/font/fontello.1594823398494.eot b/priv/static/static/font/fontello.1597327457363.eot
similarity index 99%
rename from priv/static/static/font/fontello.1594823398494.eot
rename to priv/static/static/font/fontello.1597327457363.eot
index 12e6beabf..af2c39275 100644
Binary files a/priv/static/static/font/fontello.1594823398494.eot and b/priv/static/static/font/fontello.1597327457363.eot differ
diff --git a/priv/static/static/font/fontello.1594823398494.svg b/priv/static/static/font/fontello.1597327457363.svg
similarity index 100%
rename from priv/static/static/font/fontello.1594823398494.svg
rename to priv/static/static/font/fontello.1597327457363.svg
diff --git a/priv/static/static/font/fontello.1594823398494.ttf b/priv/static/static/font/fontello.1597327457363.ttf
similarity index 99%
rename from priv/static/static/font/fontello.1594823398494.ttf
rename to priv/static/static/font/fontello.1597327457363.ttf
index 6f21845a8..1d5640d5d 100644
Binary files a/priv/static/static/font/fontello.1594823398494.ttf and b/priv/static/static/font/fontello.1597327457363.ttf differ
diff --git a/priv/static/static/font/fontello.1594823398494.woff b/priv/static/static/font/fontello.1597327457363.woff
similarity index 98%
rename from priv/static/static/font/fontello.1594823398494.woff
rename to priv/static/static/font/fontello.1597327457363.woff
index a7cd098f4..c04735bf5 100644
Binary files a/priv/static/static/font/fontello.1594823398494.woff and b/priv/static/static/font/fontello.1597327457363.woff differ
diff --git a/priv/static/static/font/fontello.1597327457363.woff2 b/priv/static/static/font/fontello.1597327457363.woff2
new file mode 100644
index 000000000..f53414761
Binary files /dev/null and b/priv/static/static/font/fontello.1597327457363.woff2 differ
diff --git a/priv/static/static/fontello.1597327457363.css b/priv/static/static/fontello.1597327457363.css
new file mode 100644
index 000000000..22d148873
Binary files /dev/null and b/priv/static/static/fontello.1597327457363.css differ
diff --git a/priv/static/static/js/10.5ef4671883649cf93524.js b/priv/static/static/js/10.8c5b75840b696a152c7e.js
similarity index 99%
rename from priv/static/static/js/10.5ef4671883649cf93524.js
rename to priv/static/static/js/10.8c5b75840b696a152c7e.js
index 6819c854b..eb95d66d1 100644
Binary files a/priv/static/static/js/10.5ef4671883649cf93524.js and b/priv/static/static/js/10.8c5b75840b696a152c7e.js differ
diff --git a/priv/static/static/js/10.5ef4671883649cf93524.js.map b/priv/static/static/js/10.8c5b75840b696a152c7e.js.map
similarity index 56%
rename from priv/static/static/js/10.5ef4671883649cf93524.js.map
rename to priv/static/static/js/10.8c5b75840b696a152c7e.js.map
index 95fa2207e..b390fbeaf 100644
Binary files a/priv/static/static/js/10.5ef4671883649cf93524.js.map and b/priv/static/static/js/10.8c5b75840b696a152c7e.js.map differ
diff --git a/priv/static/static/js/11.c5b938b4349f87567338.js b/priv/static/static/js/11.bfcde1c26c4d54b84ee4.js
similarity index 99%
rename from priv/static/static/js/11.c5b938b4349f87567338.js
rename to priv/static/static/js/11.bfcde1c26c4d54b84ee4.js
index b97f69bf3..0dea63f5a 100644
Binary files a/priv/static/static/js/11.c5b938b4349f87567338.js and b/priv/static/static/js/11.bfcde1c26c4d54b84ee4.js differ
diff --git a/priv/static/static/js/11.c5b938b4349f87567338.js.map b/priv/static/static/js/11.bfcde1c26c4d54b84ee4.js.map
similarity index 56%
rename from priv/static/static/js/11.c5b938b4349f87567338.js.map
rename to priv/static/static/js/11.bfcde1c26c4d54b84ee4.js.map
index 5ccf83b1d..2b2305773 100644
Binary files a/priv/static/static/js/11.c5b938b4349f87567338.js.map and b/priv/static/static/js/11.bfcde1c26c4d54b84ee4.js.map differ
diff --git a/priv/static/static/js/12.76095ee23394e0ef65bb.js b/priv/static/static/js/12.76095ee23394e0ef65bb.js
new file mode 100644
index 000000000..6c34e2da2
Binary files /dev/null and b/priv/static/static/js/12.76095ee23394e0ef65bb.js differ
diff --git a/priv/static/static/js/12.ab82f9512fa85e78c114.js.map b/priv/static/static/js/12.76095ee23394e0ef65bb.js.map
similarity index 56%
rename from priv/static/static/js/12.ab82f9512fa85e78c114.js.map
rename to priv/static/static/js/12.76095ee23394e0ef65bb.js.map
index 23335ae23..e00137a2b 100644
Binary files a/priv/static/static/js/12.ab82f9512fa85e78c114.js.map and b/priv/static/static/js/12.76095ee23394e0ef65bb.js.map differ
diff --git a/priv/static/static/js/12.ab82f9512fa85e78c114.js b/priv/static/static/js/12.ab82f9512fa85e78c114.js
deleted file mode 100644
index 100d72b33..000000000
Binary files a/priv/static/static/js/12.ab82f9512fa85e78c114.js and /dev/null differ
diff --git a/priv/static/static/js/13.40e59c5015d3307b94ad.js b/priv/static/static/js/13.40e59c5015d3307b94ad.js
deleted file mode 100644
index 2088bb6b7..000000000
Binary files a/priv/static/static/js/13.40e59c5015d3307b94ad.js and /dev/null differ
diff --git a/priv/static/static/js/13.957b04ac11d6cde66f5b.js b/priv/static/static/js/13.957b04ac11d6cde66f5b.js
new file mode 100644
index 000000000..917b6a58b
Binary files /dev/null and b/priv/static/static/js/13.957b04ac11d6cde66f5b.js differ
diff --git a/priv/static/static/js/13.40e59c5015d3307b94ad.js.map b/priv/static/static/js/13.957b04ac11d6cde66f5b.js.map
similarity index 56%
rename from priv/static/static/js/13.40e59c5015d3307b94ad.js.map
rename to priv/static/static/js/13.957b04ac11d6cde66f5b.js.map
index 3931b5ef9..25434f73b 100644
Binary files a/priv/static/static/js/13.40e59c5015d3307b94ad.js.map and b/priv/static/static/js/13.957b04ac11d6cde66f5b.js.map differ
diff --git a/priv/static/static/js/14.de791a47ee5249a526b1.js b/priv/static/static/js/14.aae5a904931591edfaa7.js
similarity index 54%
rename from priv/static/static/js/14.de791a47ee5249a526b1.js
rename to priv/static/static/js/14.aae5a904931591edfaa7.js
index 0e341275e..001914ad7 100644
Binary files a/priv/static/static/js/14.de791a47ee5249a526b1.js and b/priv/static/static/js/14.aae5a904931591edfaa7.js differ
diff --git a/priv/static/static/js/14.aae5a904931591edfaa7.js.map b/priv/static/static/js/14.aae5a904931591edfaa7.js.map
new file mode 100644
index 000000000..24719fee8
Binary files /dev/null and b/priv/static/static/js/14.aae5a904931591edfaa7.js.map differ
diff --git a/priv/static/static/js/14.de791a47ee5249a526b1.js.map b/priv/static/static/js/14.de791a47ee5249a526b1.js.map
deleted file mode 100644
index 4bef54546..000000000
Binary files a/priv/static/static/js/14.de791a47ee5249a526b1.js.map and /dev/null differ
diff --git a/priv/static/static/js/15.139f5de3950adc3b66df.js b/priv/static/static/js/15.139f5de3950adc3b66df.js
new file mode 100644
index 000000000..303e00130
Binary files /dev/null and b/priv/static/static/js/15.139f5de3950adc3b66df.js differ
diff --git a/priv/static/static/js/15.139f5de3950adc3b66df.js.map b/priv/static/static/js/15.139f5de3950adc3b66df.js.map
new file mode 100644
index 000000000..d5a3c800d
Binary files /dev/null and b/priv/static/static/js/15.139f5de3950adc3b66df.js.map differ
diff --git a/priv/static/static/js/15.e24854297ad682aec45a.js b/priv/static/static/js/15.e24854297ad682aec45a.js
deleted file mode 100644
index 671370192..000000000
Binary files a/priv/static/static/js/15.e24854297ad682aec45a.js and /dev/null differ
diff --git a/priv/static/static/js/15.e24854297ad682aec45a.js.map b/priv/static/static/js/15.e24854297ad682aec45a.js.map
deleted file mode 100644
index 89789a542..000000000
Binary files a/priv/static/static/js/15.e24854297ad682aec45a.js.map and /dev/null differ
diff --git a/priv/static/static/js/16.7b8466d62084c04f6671.js b/priv/static/static/js/16.7b8466d62084c04f6671.js
new file mode 100644
index 000000000..587b41dd0
Binary files /dev/null and b/priv/static/static/js/16.7b8466d62084c04f6671.js differ
diff --git a/priv/static/static/js/16.7b8466d62084c04f6671.js.map b/priv/static/static/js/16.7b8466d62084c04f6671.js.map
new file mode 100644
index 000000000..22818639f
Binary files /dev/null and b/priv/static/static/js/16.7b8466d62084c04f6671.js.map differ
diff --git a/priv/static/static/js/16.b7b0e4b8227a50fcb9bb.js b/priv/static/static/js/16.b7b0e4b8227a50fcb9bb.js
deleted file mode 100644
index 6a3ea9513..000000000
Binary files a/priv/static/static/js/16.b7b0e4b8227a50fcb9bb.js and /dev/null differ
diff --git a/priv/static/static/js/16.b7b0e4b8227a50fcb9bb.js.map b/priv/static/static/js/16.b7b0e4b8227a50fcb9bb.js.map
deleted file mode 100644
index fec45b087..000000000
Binary files a/priv/static/static/js/16.b7b0e4b8227a50fcb9bb.js.map and /dev/null differ
diff --git a/priv/static/static/js/17.c98118b6bb84ee3b5b08.js.map b/priv/static/static/js/17.c98118b6bb84ee3b5b08.js.map
deleted file mode 100644
index 0c20fc89b..000000000
Binary files a/priv/static/static/js/17.c98118b6bb84ee3b5b08.js.map and /dev/null differ
diff --git a/priv/static/static/js/17.c98118b6bb84ee3b5b08.js b/priv/static/static/js/17.e8ec1f5666cb4e28784a.js
similarity index 94%
rename from priv/static/static/js/17.c98118b6bb84ee3b5b08.js
rename to priv/static/static/js/17.e8ec1f5666cb4e28784a.js
index c41f0b6b8..03a7d28e5 100644
Binary files a/priv/static/static/js/17.c98118b6bb84ee3b5b08.js and b/priv/static/static/js/17.e8ec1f5666cb4e28784a.js differ
diff --git a/priv/static/static/js/17.e8ec1f5666cb4e28784a.js.map b/priv/static/static/js/17.e8ec1f5666cb4e28784a.js.map
new file mode 100644
index 000000000..0fe92287e
Binary files /dev/null and b/priv/static/static/js/17.e8ec1f5666cb4e28784a.js.map differ
diff --git a/priv/static/static/js/18.89c20aa67a4dd067ea37.js.map b/priv/static/static/js/18.89c20aa67a4dd067ea37.js.map
deleted file mode 100644
index 72cdf0e0e..000000000
Binary files a/priv/static/static/js/18.89c20aa67a4dd067ea37.js.map and /dev/null differ
diff --git a/priv/static/static/js/18.89c20aa67a4dd067ea37.js b/priv/static/static/js/18.d32389579b85948022b8.js
similarity index 57%
rename from priv/static/static/js/18.89c20aa67a4dd067ea37.js
rename to priv/static/static/js/18.d32389579b85948022b8.js
index db1c78a49..477f6e06f 100644
Binary files a/priv/static/static/js/18.89c20aa67a4dd067ea37.js and b/priv/static/static/js/18.d32389579b85948022b8.js differ
diff --git a/priv/static/static/js/18.d32389579b85948022b8.js.map b/priv/static/static/js/18.d32389579b85948022b8.js.map
new file mode 100644
index 000000000..62fc5b84f
Binary files /dev/null and b/priv/static/static/js/18.d32389579b85948022b8.js.map differ
diff --git a/priv/static/static/js/19.6e13bad8131c4501c1c5.js b/priv/static/static/js/19.6e13bad8131c4501c1c5.js
deleted file mode 100644
index 8b32827cc..000000000
Binary files a/priv/static/static/js/19.6e13bad8131c4501c1c5.js and /dev/null differ
diff --git a/priv/static/static/js/19.6e13bad8131c4501c1c5.js.map b/priv/static/static/js/19.6e13bad8131c4501c1c5.js.map
deleted file mode 100644
index 762d85e27..000000000
Binary files a/priv/static/static/js/19.6e13bad8131c4501c1c5.js.map and /dev/null differ
diff --git a/priv/static/static/js/19.d180c594b843c17c80fa.js b/priv/static/static/js/19.d180c594b843c17c80fa.js
new file mode 100644
index 000000000..c30dc75c2
Binary files /dev/null and b/priv/static/static/js/19.d180c594b843c17c80fa.js differ
diff --git a/priv/static/static/js/19.d180c594b843c17c80fa.js.map b/priv/static/static/js/19.d180c594b843c17c80fa.js.map
new file mode 100644
index 000000000..e90081dd9
Binary files /dev/null and b/priv/static/static/js/19.d180c594b843c17c80fa.js.map differ
diff --git a/priv/static/static/js/2.5ecefab707beea40b7f0.js b/priv/static/static/js/2.5ecefab707beea40b7f0.js
new file mode 100644
index 000000000..bf563c79f
Binary files /dev/null and b/priv/static/static/js/2.5ecefab707beea40b7f0.js differ
diff --git a/priv/static/static/js/2.5ecefab707beea40b7f0.js.map b/priv/static/static/js/2.5ecefab707beea40b7f0.js.map
new file mode 100644
index 000000000..7452e1f6e
Binary files /dev/null and b/priv/static/static/js/2.5ecefab707beea40b7f0.js.map differ
diff --git a/priv/static/static/js/2.78a48aa26599b00c3b8d.js b/priv/static/static/js/2.78a48aa26599b00c3b8d.js
deleted file mode 100644
index ecb27aa9c..000000000
Binary files a/priv/static/static/js/2.78a48aa26599b00c3b8d.js and /dev/null differ
diff --git a/priv/static/static/js/2.78a48aa26599b00c3b8d.js.map b/priv/static/static/js/2.78a48aa26599b00c3b8d.js.map
deleted file mode 100644
index 167cfa1c6..000000000
Binary files a/priv/static/static/js/2.78a48aa26599b00c3b8d.js.map and /dev/null differ
diff --git a/priv/static/static/js/20.3615c3cea2e1c2707a4f.js b/priv/static/static/js/20.27e04f2209628de3092b.js
similarity index 99%
rename from priv/static/static/js/20.3615c3cea2e1c2707a4f.js
rename to priv/static/static/js/20.27e04f2209628de3092b.js
index 74f89016c..e41b60066 100644
Binary files a/priv/static/static/js/20.3615c3cea2e1c2707a4f.js and b/priv/static/static/js/20.27e04f2209628de3092b.js differ
diff --git a/priv/static/static/js/20.27e04f2209628de3092b.js.map b/priv/static/static/js/20.27e04f2209628de3092b.js.map
new file mode 100644
index 000000000..4009ef5b9
Binary files /dev/null and b/priv/static/static/js/20.27e04f2209628de3092b.js.map differ
diff --git a/priv/static/static/js/20.3615c3cea2e1c2707a4f.js.map b/priv/static/static/js/20.3615c3cea2e1c2707a4f.js.map
deleted file mode 100644
index acddecea7..000000000
Binary files a/priv/static/static/js/20.3615c3cea2e1c2707a4f.js.map and /dev/null differ
diff --git a/priv/static/static/js/21.64dedfc646e13e6f7915.js b/priv/static/static/js/21.641aba6f96885c381070.js
similarity index 99%
rename from priv/static/static/js/21.64dedfc646e13e6f7915.js
rename to priv/static/static/js/21.641aba6f96885c381070.js
index 407e6665e..d80f64e11 100644
Binary files a/priv/static/static/js/21.64dedfc646e13e6f7915.js and b/priv/static/static/js/21.641aba6f96885c381070.js differ
diff --git a/priv/static/static/js/21.641aba6f96885c381070.js.map b/priv/static/static/js/21.641aba6f96885c381070.js.map
new file mode 100644
index 000000000..8f6253113
Binary files /dev/null and b/priv/static/static/js/21.641aba6f96885c381070.js.map differ
diff --git a/priv/static/static/js/21.64dedfc646e13e6f7915.js.map b/priv/static/static/js/21.64dedfc646e13e6f7915.js.map
deleted file mode 100644
index 8e3432668..000000000
Binary files a/priv/static/static/js/21.64dedfc646e13e6f7915.js.map and /dev/null differ
diff --git a/priv/static/static/js/22.6fa63bc6a054b7638e9e.js.map b/priv/static/static/js/22.6fa63bc6a054b7638e9e.js.map
deleted file mode 100644
index 1c556f040..000000000
Binary files a/priv/static/static/js/22.6fa63bc6a054b7638e9e.js.map and /dev/null differ
diff --git a/priv/static/static/js/22.6fa63bc6a054b7638e9e.js b/priv/static/static/js/22.cbe4790c7601004ed96f.js
similarity index 99%
rename from priv/static/static/js/22.6fa63bc6a054b7638e9e.js
rename to priv/static/static/js/22.cbe4790c7601004ed96f.js
index 4a8740c99..0e9c6ab97 100644
Binary files a/priv/static/static/js/22.6fa63bc6a054b7638e9e.js and b/priv/static/static/js/22.cbe4790c7601004ed96f.js differ
diff --git a/priv/static/static/js/22.cbe4790c7601004ed96f.js.map b/priv/static/static/js/22.cbe4790c7601004ed96f.js.map
new file mode 100644
index 000000000..8de20817c
Binary files /dev/null and b/priv/static/static/js/22.cbe4790c7601004ed96f.js.map differ
diff --git a/priv/static/static/js/23.e0ddea2b6e049d221ee7.js b/priv/static/static/js/23.96b5bf8d37de3bf02a17.js
similarity index 99%
rename from priv/static/static/js/23.e0ddea2b6e049d221ee7.js
rename to priv/static/static/js/23.96b5bf8d37de3bf02a17.js
index 51fe36368..6a78c71fd 100644
Binary files a/priv/static/static/js/23.e0ddea2b6e049d221ee7.js and b/priv/static/static/js/23.96b5bf8d37de3bf02a17.js differ
diff --git a/priv/static/static/js/23.96b5bf8d37de3bf02a17.js.map b/priv/static/static/js/23.96b5bf8d37de3bf02a17.js.map
new file mode 100644
index 000000000..12929720a
Binary files /dev/null and b/priv/static/static/js/23.96b5bf8d37de3bf02a17.js.map differ
diff --git a/priv/static/static/js/23.e0ddea2b6e049d221ee7.js.map b/priv/static/static/js/23.e0ddea2b6e049d221ee7.js.map
deleted file mode 100644
index 36bae2bf4..000000000
Binary files a/priv/static/static/js/23.e0ddea2b6e049d221ee7.js.map and /dev/null differ
diff --git a/priv/static/static/js/24.38e3b9d44e9ee703ebf6.js.map b/priv/static/static/js/24.38e3b9d44e9ee703ebf6.js.map
deleted file mode 100644
index 09f3c19d0..000000000
Binary files a/priv/static/static/js/24.38e3b9d44e9ee703ebf6.js.map and /dev/null differ
diff --git a/priv/static/static/js/24.38e3b9d44e9ee703ebf6.js b/priv/static/static/js/24.5e5eea3542b0e17c6479.js
similarity index 99%
rename from priv/static/static/js/24.38e3b9d44e9ee703ebf6.js
rename to priv/static/static/js/24.5e5eea3542b0e17c6479.js
index e5abf0af6..45787dddd 100644
Binary files a/priv/static/static/js/24.38e3b9d44e9ee703ebf6.js and b/priv/static/static/js/24.5e5eea3542b0e17c6479.js differ
diff --git a/priv/static/static/js/24.5e5eea3542b0e17c6479.js.map b/priv/static/static/js/24.5e5eea3542b0e17c6479.js.map
new file mode 100644
index 000000000..1938ee57a
Binary files /dev/null and b/priv/static/static/js/24.5e5eea3542b0e17c6479.js.map differ
diff --git a/priv/static/static/js/25.696b41c0a8660e1f85af.js b/priv/static/static/js/25.696b41c0a8660e1f85af.js
deleted file mode 100644
index b114890fc..000000000
Binary files a/priv/static/static/js/25.696b41c0a8660e1f85af.js and /dev/null differ
diff --git a/priv/static/static/js/25.696b41c0a8660e1f85af.js.map b/priv/static/static/js/25.696b41c0a8660e1f85af.js.map
deleted file mode 100644
index f6d208812..000000000
Binary files a/priv/static/static/js/25.696b41c0a8660e1f85af.js.map and /dev/null differ
diff --git a/priv/static/static/js/25.dd8471a33b5a4d256564.js b/priv/static/static/js/25.dd8471a33b5a4d256564.js
new file mode 100644
index 000000000..b30f01f9b
Binary files /dev/null and b/priv/static/static/js/25.dd8471a33b5a4d256564.js differ
diff --git a/priv/static/static/js/25.dd8471a33b5a4d256564.js.map b/priv/static/static/js/25.dd8471a33b5a4d256564.js.map
new file mode 100644
index 000000000..e6a6bf3a0
Binary files /dev/null and b/priv/static/static/js/25.dd8471a33b5a4d256564.js.map differ
diff --git a/priv/static/static/js/26.1168f22384be75dc5492.js.map b/priv/static/static/js/26.1168f22384be75dc5492.js.map
deleted file mode 100644
index c9b0d8495..000000000
Binary files a/priv/static/static/js/26.1168f22384be75dc5492.js.map and /dev/null differ
diff --git a/priv/static/static/js/26.1168f22384be75dc5492.js b/priv/static/static/js/26.91a9c2effdd1a423a79f.js
similarity index 99%
rename from priv/static/static/js/26.1168f22384be75dc5492.js
rename to priv/static/static/js/26.91a9c2effdd1a423a79f.js
index b77a4d30f..f30ff939a 100644
Binary files a/priv/static/static/js/26.1168f22384be75dc5492.js and b/priv/static/static/js/26.91a9c2effdd1a423a79f.js differ
diff --git a/priv/static/static/js/26.91a9c2effdd1a423a79f.js.map b/priv/static/static/js/26.91a9c2effdd1a423a79f.js.map
new file mode 100644
index 000000000..ae4781108
Binary files /dev/null and b/priv/static/static/js/26.91a9c2effdd1a423a79f.js.map differ
diff --git a/priv/static/static/js/27.3c0cfbb2a898b35486dd.js.map b/priv/static/static/js/27.3c0cfbb2a898b35486dd.js.map
deleted file mode 100644
index 0cc5f46b2..000000000
Binary files a/priv/static/static/js/27.3c0cfbb2a898b35486dd.js.map and /dev/null differ
diff --git a/priv/static/static/js/27.3c0cfbb2a898b35486dd.js b/priv/static/static/js/27.949d608895f6e29a2fc2.js
similarity index 94%
rename from priv/static/static/js/27.3c0cfbb2a898b35486dd.js
rename to priv/static/static/js/27.949d608895f6e29a2fc2.js
index a0765356f..f735c1a04 100644
Binary files a/priv/static/static/js/27.3c0cfbb2a898b35486dd.js and b/priv/static/static/js/27.949d608895f6e29a2fc2.js differ
diff --git a/priv/static/static/js/27.949d608895f6e29a2fc2.js.map b/priv/static/static/js/27.949d608895f6e29a2fc2.js.map
new file mode 100644
index 000000000..9f75161dd
Binary files /dev/null and b/priv/static/static/js/27.949d608895f6e29a2fc2.js.map differ
diff --git a/priv/static/static/js/28.926c71d6f1813e177271.js b/priv/static/static/js/28.1e879ccb6222c26ee837.js
similarity index 99%
rename from priv/static/static/js/28.926c71d6f1813e177271.js
rename to priv/static/static/js/28.1e879ccb6222c26ee837.js
index 55cf840f2..64e286799 100644
Binary files a/priv/static/static/js/28.926c71d6f1813e177271.js and b/priv/static/static/js/28.1e879ccb6222c26ee837.js differ
diff --git a/priv/static/static/js/28.1e879ccb6222c26ee837.js.map b/priv/static/static/js/28.1e879ccb6222c26ee837.js.map
new file mode 100644
index 000000000..123aae91b
Binary files /dev/null and b/priv/static/static/js/28.1e879ccb6222c26ee837.js.map differ
diff --git a/priv/static/static/js/28.926c71d6f1813e177271.js.map b/priv/static/static/js/28.926c71d6f1813e177271.js.map
deleted file mode 100644
index 1ae8f08cb..000000000
Binary files a/priv/static/static/js/28.926c71d6f1813e177271.js.map and /dev/null differ
diff --git a/priv/static/static/js/29.187064ebed099ae45749.js.map b/priv/static/static/js/29.187064ebed099ae45749.js.map
deleted file mode 100644
index b5dd63f96..000000000
Binary files a/priv/static/static/js/29.187064ebed099ae45749.js.map and /dev/null differ
diff --git a/priv/static/static/js/29.187064ebed099ae45749.js b/priv/static/static/js/29.a0eb0eee98462dc00d86.js
similarity index 99%
rename from priv/static/static/js/29.187064ebed099ae45749.js
rename to priv/static/static/js/29.a0eb0eee98462dc00d86.js
index 6eaae0226..740e150ca 100644
Binary files a/priv/static/static/js/29.187064ebed099ae45749.js and b/priv/static/static/js/29.a0eb0eee98462dc00d86.js differ
diff --git a/priv/static/static/js/29.a0eb0eee98462dc00d86.js.map b/priv/static/static/js/29.a0eb0eee98462dc00d86.js.map
new file mode 100644
index 000000000..357679d53
Binary files /dev/null and b/priv/static/static/js/29.a0eb0eee98462dc00d86.js.map differ
diff --git a/priv/static/static/js/3.56898c1005d9ba1b8d4a.js b/priv/static/static/js/3.44ee95fa34170fe38ef7.js
similarity index 99%
rename from priv/static/static/js/3.56898c1005d9ba1b8d4a.js
rename to priv/static/static/js/3.44ee95fa34170fe38ef7.js
index 6b20ecb04..ad2b9294c 100644
Binary files a/priv/static/static/js/3.56898c1005d9ba1b8d4a.js and b/priv/static/static/js/3.44ee95fa34170fe38ef7.js differ
diff --git a/priv/static/static/js/3.56898c1005d9ba1b8d4a.js.map b/priv/static/static/js/3.44ee95fa34170fe38ef7.js.map
similarity index 99%
rename from priv/static/static/js/3.56898c1005d9ba1b8d4a.js.map
rename to priv/static/static/js/3.44ee95fa34170fe38ef7.js.map
index 594d9047b..7efe5d6a5 100644
Binary files a/priv/static/static/js/3.56898c1005d9ba1b8d4a.js.map and b/priv/static/static/js/3.44ee95fa34170fe38ef7.js.map differ
diff --git a/priv/static/static/js/30.d78855ca19bf749be905.js b/priv/static/static/js/30.73f0507f6b66caa1b632.js
similarity index 99%
rename from priv/static/static/js/30.d78855ca19bf749be905.js
rename to priv/static/static/js/30.73f0507f6b66caa1b632.js
index 9202d19d3..0f1beeb58 100644
Binary files a/priv/static/static/js/30.d78855ca19bf749be905.js and b/priv/static/static/js/30.73f0507f6b66caa1b632.js differ
diff --git a/priv/static/static/js/30.73f0507f6b66caa1b632.js.map b/priv/static/static/js/30.73f0507f6b66caa1b632.js.map
new file mode 100644
index 000000000..e73f818cd
Binary files /dev/null and b/priv/static/static/js/30.73f0507f6b66caa1b632.js.map differ
diff --git a/priv/static/static/js/30.d78855ca19bf749be905.js.map b/priv/static/static/js/30.d78855ca19bf749be905.js.map
deleted file mode 100644
index b9f39664d..000000000
Binary files a/priv/static/static/js/30.d78855ca19bf749be905.js.map and /dev/null differ
diff --git a/priv/static/static/js/4.2d3bef896b463484e6eb.js b/priv/static/static/js/4.77639012e321d98c064c.js
similarity index 80%
rename from priv/static/static/js/4.2d3bef896b463484e6eb.js
rename to priv/static/static/js/4.77639012e321d98c064c.js
index 4a611feb4..e8d35a81d 100644
Binary files a/priv/static/static/js/4.2d3bef896b463484e6eb.js and b/priv/static/static/js/4.77639012e321d98c064c.js differ
diff --git a/priv/static/static/js/4.2d3bef896b463484e6eb.js.map b/priv/static/static/js/4.77639012e321d98c064c.js.map
similarity index 99%
rename from priv/static/static/js/4.2d3bef896b463484e6eb.js.map
rename to priv/static/static/js/4.77639012e321d98c064c.js.map
index ebcc883e5..1a0373e08 100644
Binary files a/priv/static/static/js/4.2d3bef896b463484e6eb.js.map and b/priv/static/static/js/4.77639012e321d98c064c.js.map differ
diff --git a/priv/static/static/js/5.84f3dce298bc720719c7.js b/priv/static/static/js/5.abcc811ac6e85e621b0d.js
similarity index 98%
rename from priv/static/static/js/5.84f3dce298bc720719c7.js
rename to priv/static/static/js/5.abcc811ac6e85e621b0d.js
index 242b2a525..1575d2a95 100644
Binary files a/priv/static/static/js/5.84f3dce298bc720719c7.js and b/priv/static/static/js/5.abcc811ac6e85e621b0d.js differ
diff --git a/priv/static/static/js/5.84f3dce298bc720719c7.js.map b/priv/static/static/js/5.abcc811ac6e85e621b0d.js.map
similarity index 57%
rename from priv/static/static/js/5.84f3dce298bc720719c7.js.map
rename to priv/static/static/js/5.abcc811ac6e85e621b0d.js.map
index 4fcc32982..03251d1d8 100644
Binary files a/priv/static/static/js/5.84f3dce298bc720719c7.js.map and b/priv/static/static/js/5.abcc811ac6e85e621b0d.js.map differ
diff --git a/priv/static/static/js/6.389907251866808cf2c4.js b/priv/static/static/js/6.389907251866808cf2c4.js
new file mode 100644
index 000000000..def098eda
Binary files /dev/null and b/priv/static/static/js/6.389907251866808cf2c4.js differ
diff --git a/priv/static/static/js/6.b9497e1d403b901a664e.js.map b/priv/static/static/js/6.389907251866808cf2c4.js.map
similarity index 57%
rename from priv/static/static/js/6.b9497e1d403b901a664e.js.map
rename to priv/static/static/js/6.389907251866808cf2c4.js.map
index 5af0576c7..7b96d2998 100644
Binary files a/priv/static/static/js/6.b9497e1d403b901a664e.js.map and b/priv/static/static/js/6.389907251866808cf2c4.js.map differ
diff --git a/priv/static/static/js/6.b9497e1d403b901a664e.js b/priv/static/static/js/6.b9497e1d403b901a664e.js
deleted file mode 100644
index 8c66e9062..000000000
Binary files a/priv/static/static/js/6.b9497e1d403b901a664e.js and /dev/null differ
diff --git a/priv/static/static/js/7.455b574116ce3f004ffb.js b/priv/static/static/js/7.33e3cc5c9abab3f21825.js
similarity index 65%
rename from priv/static/static/js/7.455b574116ce3f004ffb.js
rename to priv/static/static/js/7.33e3cc5c9abab3f21825.js
index 0e35f6904..6a4e332e9 100644
Binary files a/priv/static/static/js/7.455b574116ce3f004ffb.js and b/priv/static/static/js/7.33e3cc5c9abab3f21825.js differ
diff --git a/priv/static/static/js/7.455b574116ce3f004ffb.js.map b/priv/static/static/js/7.33e3cc5c9abab3f21825.js.map
similarity index 57%
rename from priv/static/static/js/7.455b574116ce3f004ffb.js.map
rename to priv/static/static/js/7.33e3cc5c9abab3f21825.js.map
index 971b570e1..a04c36f4c 100644
Binary files a/priv/static/static/js/7.455b574116ce3f004ffb.js.map and b/priv/static/static/js/7.33e3cc5c9abab3f21825.js.map differ
diff --git a/priv/static/static/js/8.5e0b07052c330e85bead.js b/priv/static/static/js/8.5e0b07052c330e85bead.js
new file mode 100644
index 000000000..7fd0ec5a1
Binary files /dev/null and b/priv/static/static/js/8.5e0b07052c330e85bead.js differ
diff --git a/priv/static/static/js/8.8db9f2dcc5ed429777f7.js.map b/priv/static/static/js/8.5e0b07052c330e85bead.js.map
similarity index 57%
rename from priv/static/static/js/8.8db9f2dcc5ed429777f7.js.map
rename to priv/static/static/js/8.5e0b07052c330e85bead.js.map
index e193375de..d324ed4b0 100644
Binary files a/priv/static/static/js/8.8db9f2dcc5ed429777f7.js.map and b/priv/static/static/js/8.5e0b07052c330e85bead.js.map differ
diff --git a/priv/static/static/js/8.8db9f2dcc5ed429777f7.js b/priv/static/static/js/8.8db9f2dcc5ed429777f7.js
deleted file mode 100644
index 79082fc7c..000000000
Binary files a/priv/static/static/js/8.8db9f2dcc5ed429777f7.js and /dev/null differ
diff --git a/priv/static/static/js/9.da3973d058660aa9612f.js b/priv/static/static/js/9.da3973d058660aa9612f.js
deleted file mode 100644
index 50d977f67..000000000
Binary files a/priv/static/static/js/9.da3973d058660aa9612f.js and /dev/null differ
diff --git a/priv/static/static/js/9.da3973d058660aa9612f.js.map b/priv/static/static/js/9.da3973d058660aa9612f.js.map
deleted file mode 100644
index 4c8f70599..000000000
Binary files a/priv/static/static/js/9.da3973d058660aa9612f.js.map and /dev/null differ
diff --git a/priv/static/static/js/9.f8e3aa590f4a66aedc3f.js b/priv/static/static/js/9.f8e3aa590f4a66aedc3f.js
new file mode 100644
index 000000000..353737ab0
Binary files /dev/null and b/priv/static/static/js/9.f8e3aa590f4a66aedc3f.js differ
diff --git a/priv/static/static/js/9.f8e3aa590f4a66aedc3f.js.map b/priv/static/static/js/9.f8e3aa590f4a66aedc3f.js.map
new file mode 100644
index 000000000..452afcc41
Binary files /dev/null and b/priv/static/static/js/9.f8e3aa590f4a66aedc3f.js.map differ
diff --git a/priv/static/static/js/app.032cb80dafd1f208df1c.js b/priv/static/static/js/app.032cb80dafd1f208df1c.js
new file mode 100644
index 000000000..c4b099811
Binary files /dev/null and b/priv/static/static/js/app.032cb80dafd1f208df1c.js differ
diff --git a/priv/static/static/js/app.032cb80dafd1f208df1c.js.map b/priv/static/static/js/app.032cb80dafd1f208df1c.js.map
new file mode 100644
index 000000000..397fbfbe8
Binary files /dev/null and b/priv/static/static/js/app.032cb80dafd1f208df1c.js.map differ
diff --git a/priv/static/static/js/app.31bba9f1e242ff273dcb.js b/priv/static/static/js/app.31bba9f1e242ff273dcb.js
deleted file mode 100644
index 22413689c..000000000
Binary files a/priv/static/static/js/app.31bba9f1e242ff273dcb.js and /dev/null differ
diff --git a/priv/static/static/js/app.31bba9f1e242ff273dcb.js.map b/priv/static/static/js/app.31bba9f1e242ff273dcb.js.map
deleted file mode 100644
index 8ff7a00c6..000000000
Binary files a/priv/static/static/js/app.31bba9f1e242ff273dcb.js.map and /dev/null differ
diff --git a/priv/static/static/js/vendors~app.9e24ed238da5a8538f50.js b/priv/static/static/js/vendors~app.811c8482146cad566f7e.js
similarity index 92%
rename from priv/static/static/js/vendors~app.9e24ed238da5a8538f50.js
rename to priv/static/static/js/vendors~app.811c8482146cad566f7e.js
index 76c8a8dc1..c2114925d 100644
Binary files a/priv/static/static/js/vendors~app.9e24ed238da5a8538f50.js and b/priv/static/static/js/vendors~app.811c8482146cad566f7e.js differ
diff --git a/priv/static/static/js/vendors~app.9e24ed238da5a8538f50.js.map b/priv/static/static/js/vendors~app.811c8482146cad566f7e.js.map
similarity index 99%
rename from priv/static/static/js/vendors~app.9e24ed238da5a8538f50.js.map
rename to priv/static/static/js/vendors~app.811c8482146cad566f7e.js.map
index f3c067c15..858078059 100644
Binary files a/priv/static/static/js/vendors~app.9e24ed238da5a8538f50.js.map and b/priv/static/static/js/vendors~app.811c8482146cad566f7e.js.map differ
diff --git a/priv/static/sw-pleroma.js b/priv/static/sw-pleroma.js
index 9b7d127fd..5aabeb744 100644
Binary files a/priv/static/sw-pleroma.js and b/priv/static/sw-pleroma.js differ
diff --git a/priv/static/sw-pleroma.js.map b/priv/static/sw-pleroma.js.map
index 5749809d5..20dac11d0 100644
Binary files a/priv/static/sw-pleroma.js.map and b/priv/static/sw-pleroma.js.map differ
diff --git a/test/activity_expiration_test.exs b/test/activity_expiration_test.exs
index d75c06cc7..f86d79826 100644
--- a/test/activity_expiration_test.exs
+++ b/test/activity_expiration_test.exs
@@ -11,7 +11,10 @@ defmodule Pleroma.ActivityExpirationTest do
test "finds activities due to be deleted only" do
activity = insert(:note_activity)
- expiration_due = insert(:expiration_in_the_past, %{activity_id: activity.id})
+
+ expiration_due =
+ insert(:expiration_in_the_past, %{activity_id: activity.id}) |> Repo.preload(:activity)
+
activity2 = insert(:note_activity)
insert(:expiration_in_the_future, %{activity_id: activity2.id})
diff --git a/test/emails/mailer_test.exs b/test/emails/mailer_test.exs
index e6e34cba8..9e232d2a0 100644
--- a/test/emails/mailer_test.exs
+++ b/test/emails/mailer_test.exs
@@ -14,11 +14,12 @@ defmodule Pleroma.Emails.MailerTest do
subject: "Pleroma test email",
to: [{"Test User", "user1@example.com"}]
}
- setup do: clear_config([Pleroma.Emails.Mailer, :enabled])
+ setup do: clear_config([Pleroma.Emails.Mailer, :enabled], true)
test "not send email when mailer is disabled" do
- Pleroma.Config.put([Pleroma.Emails.Mailer, :enabled], false)
+ clear_config([Pleroma.Emails.Mailer, :enabled], false)
Mailer.deliver(@email)
+ :timer.sleep(100)
refute_email_sent(
from: {"Pleroma", "noreply@example.com"},
@@ -30,6 +31,7 @@ test "not send email when mailer is disabled" do
test "send email" do
Mailer.deliver(@email)
+ :timer.sleep(100)
assert_email_sent(
from: {"Pleroma", "noreply@example.com"},
@@ -41,6 +43,7 @@ test "send email" do
test "perform" do
Mailer.perform(:deliver_async, @email, [])
+ :timer.sleep(100)
assert_email_sent(
from: {"Pleroma", "noreply@example.com"},
diff --git a/test/fixtures/mastodon-question-activity.json b/test/fixtures/mastodon-question-activity.json
index ac329c7d5..3648b9f90 100644
--- a/test/fixtures/mastodon-question-activity.json
+++ b/test/fixtures/mastodon-question-activity.json
@@ -49,7 +49,6 @@
"en": "Why is Tenshi eating a corndog so cute?
"
},
"endTime": "2019-05-11T09:03:36Z",
- "closed": "2019-05-11T09:03:36Z",
"attachment": [],
"tag": [],
"replies": {
diff --git a/test/fixtures/tesla_mock/funkwhale_create_audio.json b/test/fixtures/tesla_mock/funkwhale_create_audio.json
new file mode 100644
index 000000000..fe6059cbf
--- /dev/null
+++ b/test/fixtures/tesla_mock/funkwhale_create_audio.json
@@ -0,0 +1,58 @@
+{
+ "@context": [
+ "https://www.w3.org/ns/activitystreams",
+ "https://w3id.org/security/v1",
+ "https://funkwhale.audio/ns",
+ {
+ "manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
+ "Hashtag": "as:Hashtag"
+ }
+ ],
+ "type": "Create",
+ "id": "https://channels.tests.funkwhale.audio/federation/music/uploads/42342395-0208-4fee-a38d-259a6dae0871/activity",
+ "actor": "https://channels.tests.funkwhale.audio/federation/actors/compositions",
+ "object": {
+ "id": "https://channels.tests.funkwhale.audio/federation/music/uploads/42342395-0208-4fee-a38d-259a6dae0871",
+ "type": "Audio",
+ "name": "Compositions - Test Audio for Pleroma",
+ "attributedTo": "https://channels.tests.funkwhale.audio/federation/actors/compositions",
+ "published": "2020-03-11T10:01:52.714918+00:00",
+ "to": "https://www.w3.org/ns/activitystreams#Public",
+ "url": [
+ {
+ "type": "Link",
+ "mimeType": "audio/ogg",
+ "href": "https://channels.tests.funkwhale.audio/api/v1/listen/3901e5d8-0445-49d5-9711-e096cf32e515/?upload=42342395-0208-4fee-a38d-259a6dae0871&download=false"
+ },
+ {
+ "type": "Link",
+ "mimeType": "text/html",
+ "href": "https://channels.tests.funkwhale.audio/library/tracks/74"
+ }
+ ],
+ "content": "This is a test Audio for Pleroma.
",
+ "mediaType": "text/html",
+ "tag": [
+ {
+ "type": "Hashtag",
+ "name": "#funkwhale"
+ },
+ {
+ "type": "Hashtag",
+ "name": "#test"
+ },
+ {
+ "type": "Hashtag",
+ "name": "#tests"
+ }
+ ],
+ "summary": "#funkwhale #test #tests",
+ "@context": [
+ "https://www.w3.org/ns/activitystreams",
+ "https://w3id.org/security/v1",
+ {
+ "manuallyApprovesFollowers": "as:manuallyApprovesFollowers"
+ }
+ ]
+ }
+}
diff --git a/test/fixtures/tesla_mock/poll_attachment.json b/test/fixtures/tesla_mock/poll_attachment.json
new file mode 100644
index 000000000..92e822dc8
--- /dev/null
+++ b/test/fixtures/tesla_mock/poll_attachment.json
@@ -0,0 +1,99 @@
+{
+ "@context": [
+ "https://www.w3.org/ns/activitystreams",
+ "https://patch.cx/schemas/litepub-0.1.jsonld",
+ {
+ "@language": "und"
+ }
+ ],
+ "actor": "https://patch.cx/users/rin",
+ "anyOf": [],
+ "attachment": [
+ {
+ "mediaType": "image/jpeg",
+ "name": "screenshot_mpv:Totoro@01:18:44.345.jpg",
+ "type": "Document",
+ "url": "https://shitposter.club/media/3bb4c4d402f8fdcc7f80963c3d7cf6f10f936897fd374922ade33199d2f86d87.jpg?name=screenshot_mpv%3ATotoro%4001%3A18%3A44.345.jpg"
+ }
+ ],
+ "attributedTo": "https://patch.cx/users/rin",
+ "cc": [
+ "https://patch.cx/users/rin/followers"
+ ],
+ "closed": "2020-06-19T23:22:02.754678Z",
+ "content": "@rinpatch Mobilizon Launching Party
Mobilizon is now federated! 🎉
You can view this event from other instances if they are subscribed to mobilizon.org, and soon directly from Mastodon and Pleroma. It is possible that you may see some comments from other instances, including Mastodon ones, just below.
With a Mobilizon account on an instance, you may participate at events from other instances and add comments on events.
Of course, it's still a work in progress : if reports made from an instance on events and comments can be federated, you can't block people right now, and moderators actions are rather limited, but this will definitely get fixed over time until first stable version next year.
Anyway, if you want to come up with some feedback, head over to our forum or - if you feel you have technical skills and are familiar with it - on our Gitlab repository.
Also, to people that want to set Mobilizon themselves even though we really don't advise to do that for now, we have a little documentation but it's quite the early days and you'll probably need some help. No worries, you can chat with us on our Forum or though our Matrix channel.
Check our website for more informations and follow us on Twitter or Mastodon.
"
end
describe "build_tags/1" do
diff --git a/test/web/metadata/rel_me_test.exs b/test/web/metadata/rel_me_test.exs
index 4107a8459..2293d6e13 100644
--- a/test/web/metadata/rel_me_test.exs
+++ b/test/web/metadata/rel_me_test.exs
@@ -9,13 +9,12 @@ defmodule Pleroma.Web.Metadata.Providers.RelMeTest do
test "it renders all links with rel='me' from user bio" do
bio =
- ~s(https://some-link.com https://another-link.com
- https://another-link.com