From a60242464e6a92bf6de46a1cf7877799de27a3ce Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 19 Nov 2020 16:12:01 +0100
Subject: [PATCH 01/22] Search: Add option to search with the websearch
 function

---
 lib/pleroma/activity/search.ex        | 31 ++++++++++++++++--
 test/pleroma/activity/search_test.exs | 45 +++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 test/pleroma/activity/search_test.exs

diff --git a/lib/pleroma/activity/search.ex b/lib/pleroma/activity/search.ex
index ceb365bb3..8449b9b00 100644
--- a/lib/pleroma/activity/search.ex
+++ b/lib/pleroma/activity/search.ex
@@ -19,11 +19,13 @@ def search(user, search_query, options \\ []) do
     offset = Keyword.get(options, :offset, 0)
     author = Keyword.get(options, :author)
 
+    search_function = Pleroma.Config.get([:instance, :search_function], :plain)
+
     Activity
     |> Activity.with_preloaded_object()
     |> Activity.restrict_deactivated_users()
     |> restrict_public()
-    |> query_with(index_type, search_query)
+    |> query_with(index_type, search_query, search_function)
     |> maybe_restrict_local(user)
     |> maybe_restrict_author(author)
     |> maybe_restrict_blocked(user)
@@ -50,7 +52,7 @@ defp restrict_public(q) do
     )
   end
 
-  defp query_with(q, :gin, search_query) do
+  defp query_with(q, :gin, search_query, :plain) do
     from([a, o] in q,
       where:
         fragment(
@@ -61,7 +63,18 @@ defp query_with(q, :gin, search_query) do
     )
   end
 
-  defp query_with(q, :rum, search_query) do
+  defp query_with(q, :gin, search_query, :websearch) do
+    from([a, o] in q,
+      where:
+        fragment(
+          "to_tsvector('english', ?->>'content') @@ websearch_to_tsquery('english', ?)",
+          o.data,
+          ^search_query
+        )
+    )
+  end
+
+  defp query_with(q, :rum, search_query, :plain) do
     from([a, o] in q,
       where:
         fragment(
@@ -73,6 +86,18 @@ defp query_with(q, :rum, search_query) do
     )
   end
 
+  defp query_with(q, :rum, search_query, :websearch) do
+    from([a, o] in q,
+      where:
+        fragment(
+          "? @@ websearch_to_tsquery('english', ?)",
+          o.fts_content,
+          ^search_query
+        ),
+      order_by: [fragment("? <=> now()::date", o.inserted_at)]
+    )
+  end
+
   defp maybe_restrict_local(q, user) do
     limit = Pleroma.Config.get([:instance, :limit_to_local_content], :unauthenticated)
 
diff --git a/test/pleroma/activity/search_test.exs b/test/pleroma/activity/search_test.exs
new file mode 100644
index 000000000..ba3257d64
--- /dev/null
+++ b/test/pleroma/activity/search_test.exs
@@ -0,0 +1,45 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Activity.SearchTest do
+  use Pleroma.DataCase
+
+  import Pleroma.Factory
+  alias Pleroma.Web.CommonAPI
+  alias Pleroma.Activity.Search
+
+  test "it finds something" do
+    user = insert(:user)
+    {:ok, post} = CommonAPI.post(user, %{status: "it's wednesday my dudes"})
+
+    [result] = Search.search(nil, "wednesday")
+
+    assert result.id == post.id
+  end
+
+  test "using plainto_tsquery" do
+    clear_config([:instance, :search_function], :plain)
+
+    user = insert(:user)
+    {:ok, post} = CommonAPI.post(user, %{status: "it's wednesday my dudes"})
+    {:ok, _post2} = CommonAPI.post(user, %{status: "it's wednesday my bros"})
+
+    # plainto doesn't understand complex queries
+    assert [result] = Search.search(nil, "wednesday -dudes")
+
+    assert result.id == post.id
+  end
+
+  test "using websearch_to_tsquery" do
+    clear_config([:instance, :search_function], :websearch)
+
+    user = insert(:user)
+    {:ok, _post} = CommonAPI.post(user, %{status: "it's wednesday my dudes"})
+    {:ok, other_post} = CommonAPI.post(user, %{status: "it's wednesday my bros"})
+
+    assert [result] = Search.search(nil, "wednesday -dudes")
+
+    assert result.id == other_post.id
+  end
+end

From 1bad91cba207a9ffb900024cb4759cb5a6aa761a Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 19 Nov 2020 16:13:53 +0100
Subject: [PATCH 02/22] Changelog: Add info about the websearch option

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8658d5440..e3349a213 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Configuration: Add `:instance, autofollowing_nicknames` setting to provide a way to make accounts automatically follow new users that register on the local Pleroma instance.
 - Ability to view remote timelines, with ex. `/api/v1/timelines/public?instance=lain.com` and streams `public:remote` and `public:remote:media`.
 - The site title is now injected as a `title` tag like preloads or metadata.
+- Added a configuration option to use the postgresql `websearch` function for more complicated search queries.
 
 <details>
   <summary>API Changes</summary>

From 1c16c67c21236d924901c5b6d65b57f7db6a2783 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 19 Nov 2020 16:16:55 +0100
Subject: [PATCH 03/22] Cheatsheet: Add info about search_function

---
 docs/configuration/cheatsheet.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md
index 4d18ac30a..fa59a27e3 100644
--- a/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@ -63,6 +63,7 @@ To add configuration to your config file, you can copy it from the base config.
 * `external_user_synchronization`: Enabling following/followers counters synchronization for external users.
 * `cleanup_attachments`: Remove attachments along with statuses. Does not affect duplicate files and attachments without status. Enabling this will increase load to database when deleting statuses on larger instances.
 * `show_reactions`: Let favourites and emoji reactions be viewed through the API (default: `true`).
+* `search_function`: What search function to use for fulltext search. Possible values are `:websearch` and `:plain`. `:websearch` enables more complex search queries, but requires at least PostgreSQL 11. (default: `websearch`)
 
 ## Welcome
 * `direct_message`: - welcome message sent as a direct message.

From 4a5ab690ef54f83e34edacd5089ce53844ffbee5 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 19 Nov 2020 16:17:14 +0100
Subject: [PATCH 04/22] Config: Set search_function to `websearch` by default

---
 config/config.exs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/config.exs b/config/config.exs
index 1ac140ed0..47eb18442 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -263,7 +263,8 @@
       length: 16
     ]
   ],
-  show_reactions: true
+  show_reactions: true,
+  search_function: :websearch
 
 config :pleroma, :welcome,
   direct_message: [

From 3b86ad0744558676be8de19cb3ff9ad83295aa7a Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 19 Nov 2020 16:26:17 +0100
Subject: [PATCH 05/22] Changelog: Document breaking change.

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3349a213..8b41e2272 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - Polls now always return a `voters_count`, even if they are single-choice.
 - Admin Emails: The ap id is used as the user link in emails now.
+- *Breaking* Configuration: Use `websearch` function by default. If you're using a PostgreSQL version below 11, set `:instance, :search_function` to `:plain` in your configuration.
 
 ### Added
 

From 81b6f02a5ee0dfd734f6cadf917161bdfd1b8195 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 19 Nov 2020 16:48:51 +0100
Subject: [PATCH 06/22] Search Test: linting

---
 test/pleroma/activity/search_test.exs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/pleroma/activity/search_test.exs b/test/pleroma/activity/search_test.exs
index ba3257d64..15591b726 100644
--- a/test/pleroma/activity/search_test.exs
+++ b/test/pleroma/activity/search_test.exs
@@ -3,11 +3,11 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Activity.SearchTest do
-  use Pleroma.DataCase
-
-  import Pleroma.Factory
-  alias Pleroma.Web.CommonAPI
   alias Pleroma.Activity.Search
+  alias Pleroma.Web.CommonAPI
+  import Pleroma.Factory
+
+  use Pleroma.DataCase
 
   test "it finds something" do
     user = insert(:user)

From 783fa797bbe356611aa5d61e22e62b2b4bd6dbe6 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 19 Nov 2020 16:53:26 +0100
Subject: [PATCH 07/22] SearchController Test: Fix test

---
 .../web/mastodon_api/controllers/search_controller_test.exs     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/pleroma/web/mastodon_api/controllers/search_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/search_controller_test.exs
index 04dc6f445..b77614b7c 100644
--- a/test/pleroma/web/mastodon_api/controllers/search_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/search_controller_test.exs
@@ -279,6 +279,8 @@ test "search", %{conn: conn} do
     end
 
     test "search fetches remote statuses and prefers them over other results", %{conn: conn} do
+      clear_config([:instance, :search_function], :plain)
+
       capture_log(fn ->
         {:ok, %{id: activity_id}} =
           CommonAPI.post(insert(:user), %{

From b38c3de411a863e51f4e00cb34f4ce59c8d333ea Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 19 Nov 2020 17:15:05 +0100
Subject: [PATCH 08/22] Gitlab CI: Update postgres

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9a754ed78..1b05e4a08 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -57,7 +57,7 @@ unit-testing:
     policy: pull
 
   services:
-  - name: postgres:9.6
+  - name: postgres:13
     alias: postgres
     command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
   script:

From a407e33c78121abf880f257d291f45ed28b55eeb Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Fri, 20 Nov 2020 16:26:22 +0100
Subject: [PATCH 09/22] Application: Save postgres version in the environment

---
 lib/pleroma/application.ex | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index 8f08a6222..f2a8c7825 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -109,7 +109,28 @@ def start(_type, _args) do
     # See http://elixir-lang.org/docs/stable/elixir/Supervisor.html
     # for other strategies and supported options
     opts = [strategy: :one_for_one, name: Pleroma.Supervisor]
-    Supervisor.start_link(children, opts)
+    result = Supervisor.start_link(children, opts)
+
+    set_postgres_server_version()
+
+    result
+  end
+
+  defp set_postgres_server_version() do
+    version =
+      with %{rows: [[version]]} <- Ecto.Adapters.SQL.query!(Pleroma.Repo, "show server_version"),
+           {num, _} <- Float.parse(version) do
+        num
+      else
+        e ->
+          Logger.warn(
+            "Could not get the postgres version: #{inspect(e)}.\nSetting the default value of 9.6"
+          )
+
+          9.6
+      end
+
+    Application.put_env(:postgres, :version, version)
   end
 
   def load_custom_modules do

From 9a1e5f5d48ef9f3b5a817c02dc8820aa99a6f693 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Fri, 20 Nov 2020 16:26:43 +0100
Subject: [PATCH 10/22] Search: Change search method based on detected pg
 version

---
 lib/pleroma/activity/search.ex        | 7 ++++++-
 test/pleroma/activity/search_test.exs | 9 +++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/pleroma/activity/search.ex b/lib/pleroma/activity/search.ex
index cc98e2d06..ea9783225 100644
--- a/lib/pleroma/activity/search.ex
+++ b/lib/pleroma/activity/search.ex
@@ -19,7 +19,12 @@ def search(user, search_query, options \\ []) do
     offset = Keyword.get(options, :offset, 0)
     author = Keyword.get(options, :author)
 
-    search_function = Pleroma.Config.get([:instance, :search_function], :plain)
+    search_function =
+      if Application.get_env(:postgres, :version) >= 11 do
+        :websearch
+      else
+        :plain
+      end
 
     Activity
     |> Activity.with_preloaded_object()
diff --git a/test/pleroma/activity/search_test.exs b/test/pleroma/activity/search_test.exs
index 15591b726..37c0feeea 100644
--- a/test/pleroma/activity/search_test.exs
+++ b/test/pleroma/activity/search_test.exs
@@ -18,8 +18,9 @@ test "it finds something" do
     assert result.id == post.id
   end
 
-  test "using plainto_tsquery" do
-    clear_config([:instance, :search_function], :plain)
+  test "using plainto_tsquery on postgres < 11" do
+    old_config = Application.get_env(:postgres, :version)
+    Application.put_env(:postgres, :version, 10.0)
 
     user = insert(:user)
     {:ok, post} = CommonAPI.post(user, %{status: "it's wednesday my dudes"})
@@ -29,11 +30,11 @@ test "using plainto_tsquery" do
     assert [result] = Search.search(nil, "wednesday -dudes")
 
     assert result.id == post.id
+
+    Application.put_env(:postgres, :version, old_config)
   end
 
   test "using websearch_to_tsquery" do
-    clear_config([:instance, :search_function], :websearch)
-
     user = insert(:user)
     {:ok, _post} = CommonAPI.post(user, %{status: "it's wednesday my dudes"})
     {:ok, other_post} = CommonAPI.post(user, %{status: "it's wednesday my bros"})

From cc52f0356675b9200f0ecef2b5cc96d16c6fb704 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Fri, 20 Nov 2020 16:28:00 +0100
Subject: [PATCH 11/22] Changelog: Add info about search changes

---
 CHANGELOG.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a682036f4..598fd59e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - Polls now always return a `voters_count`, even if they are single-choice.
 - Admin Emails: The ap id is used as the user link in emails now.
-- *Breaking* Configuration: Use `websearch` function by default. If you're using a PostgreSQL version below 11, set `:instance, :search_function` to `:plain` in your configuration.
+- Search: When using Postgres 11+, Pleroma will use the `websearch_to_tsvector` function to parse search queries.
 
 ### Added
 
@@ -23,7 +23,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Ability to view remote timelines, with ex. `/api/v1/timelines/public?instance=lain.com` and streams `public:remote` and `public:remote:media`.
 - The site title is now injected as a `title` tag like preloads or metadata.
 - Password reset tokens now are not accepted after a certain age.
-- Added a configuration option to use the postgresql `websearch` function for more complicated search queries.
 
 <details>
   <summary>API Changes</summary>

From 8532325d65ccf3dccdfc129fe0a49d1fb2cb580f Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Fri, 20 Nov 2020 16:29:11 +0100
Subject: [PATCH 12/22] SearchController Test: Fix test.

---
 .../web/mastodon_api/controllers/search_controller_test.exs  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/pleroma/web/mastodon_api/controllers/search_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/search_controller_test.exs
index b77614b7c..2b2579857 100644
--- a/test/pleroma/web/mastodon_api/controllers/search_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/search_controller_test.exs
@@ -279,7 +279,8 @@ test "search", %{conn: conn} do
     end
 
     test "search fetches remote statuses and prefers them over other results", %{conn: conn} do
-      clear_config([:instance, :search_function], :plain)
+      old_config = Application.get_env(:postgres, :version)
+      Application.put_env(:postgres, :version, 10.0)
 
       capture_log(fn ->
         {:ok, %{id: activity_id}} =
@@ -297,6 +298,8 @@ test "search fetches remote statuses and prefers them over other results", %{con
                  %{"id" => ^activity_id}
                ] = results["statuses"]
       end)
+
+      Application.put_env(:postgres, :version, old_config)
     end
 
     test "search doesn't show statuses that it shouldn't", %{conn: conn} do

From 25a03a9b5b8b37e3ac5bd69f4b520695e4b148bb Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Fri, 20 Nov 2020 16:33:11 +0100
Subject: [PATCH 13/22] Config, Docs: Remove search_function

---
 config/config.exs                | 3 +--
 docs/configuration/cheatsheet.md | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/config/config.exs b/config/config.exs
index 8d0545704..be5257663 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -264,8 +264,7 @@
     ]
   ],
   show_reactions: true,
-  password_reset_token_validity: 60 * 60 * 24,
-  search_function: :websearch
+  password_reset_token_validity: 60 * 60 * 24
 
 config :pleroma, :welcome,
   direct_message: [
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md
index 1b321d103..85551362c 100644
--- a/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@ -64,7 +64,6 @@ To add configuration to your config file, you can copy it from the base config.
 * `cleanup_attachments`: Remove attachments along with statuses. Does not affect duplicate files and attachments without status. Enabling this will increase load to database when deleting statuses on larger instances.
 * `show_reactions`: Let favourites and emoji reactions be viewed through the API (default: `true`).
 * `password_reset_token_validity`: The time after which reset tokens aren't accepted anymore, in seconds (default: one day).
-* `search_function`: What search function to use for fulltext search. Possible values are `:websearch` and `:plain`. `:websearch` enables more complex search queries, but requires at least PostgreSQL 11. (default: `websearch`)
 
 ## Welcome
 * `direct_message`: - welcome message sent as a direct message.

From e4289792d28cb38c520e03df2ed82f6f30eb4c51 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Fri, 20 Nov 2020 16:38:05 +0100
Subject: [PATCH 14/22] Linting.

---
 lib/pleroma/application.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index f2a8c7825..17a241cdf 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -116,7 +116,7 @@ def start(_type, _args) do
     result
   end
 
-  defp set_postgres_server_version() do
+  defp set_postgres_server_version do
     version =
       with %{rows: [[version]]} <- Ecto.Adapters.SQL.query!(Pleroma.Repo, "show server_version"),
            {num, _} <- Float.parse(version) do

From e6af7dc77721f487723a6677e37c15c2d996b445 Mon Sep 17 00:00:00 2001
From: Guy Sheffer <guysoft@gmail.com>
Date: Sat, 21 Nov 2020 19:57:38 +0200
Subject: [PATCH 15/22] Add missing libmagic for image upload

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 0f4fcd0bb..6a328c88a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -33,7 +33,7 @@ ARG DATA=/var/lib/pleroma
 
 RUN echo "http://nl.alpinelinux.org/alpine/latest-stable/community" >> /etc/apk/repositories &&\
 	apk update &&\
-	apk add exiftool imagemagick ncurses postgresql-client &&\
+	apk add exiftool imagemagick libmagic ncurses postgresql-client &&\
 	adduser --system --shell /bin/false --home ${HOME} pleroma &&\
 	mkdir -p ${DATA}/uploads &&\
 	mkdir -p ${DATA}/static &&\

From d5f5d0149533b94b1065c19f31a75134e48c492f Mon Sep 17 00:00:00 2001
From: Guy Sheffer <guysoft@gmail.com>
Date: Fri, 20 Nov 2020 16:09:10 +0000
Subject: [PATCH 16/22] Translated using Weblate (Hebrew)

Currently translated at 100.0% (106 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/he/
---
 priv/gettext/he/LC_MESSAGES/errors.po | 259 +++++++++++++-------------
 1 file changed, 131 insertions(+), 128 deletions(-)

diff --git a/priv/gettext/he/LC_MESSAGES/errors.po b/priv/gettext/he/LC_MESSAGES/errors.po
index 6d97b620f..7e251383f 100644
--- a/priv/gettext/he/LC_MESSAGES/errors.po
+++ b/priv/gettext/he/LC_MESSAGES/errors.po
@@ -3,14 +3,17 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-11-10 13:39+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2020-11-21 04:42+0000\n"
+"Last-Translator: Guy Sheffer <guysoft@gmail.com>\n"
+"Language-Team: Hebrew <https://translate.pleroma.social/projects/pleroma/"
+"pleroma/he/>\n"
 "Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 2.5.1\n"
+"Plural-Forms: nplurals=4; plural=(n == 1) ? 0 : ((n == 2) ? 1 : ((n > 10 && "
+"n % 10 == 0) ? 2 : 3));\n"
+"X-Generator: Weblate 4.0.4\n"
 
 ## This file is a PO Template file.
 ##
@@ -23,264 +26,264 @@ msgstr ""
 ## effect: edit them in PO (`.po`) files instead.
 ## From Ecto.Changeset.cast/4
 msgid "can't be blank"
-msgstr ""
+msgstr "לא יכול להיות ריק"
 
 ## From Ecto.Changeset.unique_constraint/3
 msgid "has already been taken"
-msgstr ""
+msgstr "כבר נלקח"
 
 ## From Ecto.Changeset.put_change/3
 msgid "is invalid"
-msgstr ""
+msgstr "אינו תקני"
 
 ## From Ecto.Changeset.validate_format/3
 msgid "has invalid format"
-msgstr ""
+msgstr "תבנית אינה תקנית"
 
 ## From Ecto.Changeset.validate_subset/3
 msgid "has an invalid entry"
-msgstr ""
+msgstr "בעל.ה רשומה לא חוקית"
 
 ## From Ecto.Changeset.validate_exclusion/3
 msgid "is reserved"
-msgstr ""
+msgstr "הינו שמור"
 
 ## From Ecto.Changeset.validate_confirmation/3
 msgid "does not match confirmation"
-msgstr ""
+msgstr "אינו תורם את האימות"
 
 ## From Ecto.Changeset.no_assoc_constraint/3
 msgid "is still associated with this entry"
-msgstr ""
+msgstr "עדיין משויך לרשומה זו"
 
 msgid "are still associated with this entry"
-msgstr ""
+msgstr "עדיין משויכים לרשומה זו"
 
 ## From Ecto.Changeset.validate_length/3
 msgid "should be %{count} character(s)"
 msgid_plural "should be %{count} character(s)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "אחד"
+msgstr[1] "שני"
+msgstr[2] "בודדים"
+msgstr[3] "אחר"
 
 msgid "should have %{count} item(s)"
 msgid_plural "should have %{count} item(s)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "אחד"
+msgstr[1] "שני"
+msgstr[2] "בודדים"
+msgstr[3] "אחר"
 
 msgid "should be at least %{count} character(s)"
 msgid_plural "should be at least %{count} character(s)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "אחד"
+msgstr[1] "שנים"
+msgstr[2] "בודדים"
+msgstr[3] "אחר"
 
 msgid "should have at least %{count} item(s)"
 msgid_plural "should have at least %{count} item(s)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "אחד"
+msgstr[1] "שניים"
+msgstr[2] "בודדים"
+msgstr[3] "אחר"
 
 msgid "should be at most %{count} character(s)"
 msgid_plural "should be at most %{count} character(s)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "אחד"
+msgstr[1] "שניים"
+msgstr[2] "בודדים"
+msgstr[3] "אחר"
 
 msgid "should have at most %{count} item(s)"
 msgid_plural "should have at most %{count} item(s)"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
+msgstr[0] "אחד"
+msgstr[1] "שניים"
+msgstr[2] "בודדים"
+msgstr[3] "אחר"
 
 ## From Ecto.Changeset.validate_number/3
 msgid "must be less than %{number}"
-msgstr ""
+msgstr "חייב להיות מתחת ל-%{number}"
 
 msgid "must be greater than %{number}"
-msgstr ""
+msgstr "חייב להיות מעל ל-%{number}"
 
 msgid "must be less than or equal to %{number}"
-msgstr ""
+msgstr "חייב להיות שווה ל-%{number}"
 
 msgid "must be greater than or equal to %{number}"
-msgstr ""
+msgstr "חייב להיות גדול או שווה ל-%{number}"
 
 msgid "must be equal to %{number}"
-msgstr ""
+msgstr "חייב להיות שווה ל-%{number}"
 
 #: lib/pleroma/web/common_api/common_api.ex:505
 #, elixir-format
 msgid "Account not found"
-msgstr ""
+msgstr "חשבון לא נמצא"
 
 #: lib/pleroma/web/common_api/common_api.ex:339
 #, elixir-format
 msgid "Already voted"
-msgstr ""
+msgstr "הצבעה כבר התבצעה"
 
 #: lib/pleroma/web/oauth/oauth_controller.ex:359
 #, elixir-format
 msgid "Bad request"
-msgstr ""
+msgstr "בקשה שגוייה"
 
 #: lib/pleroma/web/activity_pub/activity_pub_controller.ex:426
 #, elixir-format
 msgid "Can't delete object"
-msgstr ""
+msgstr "לא ניתן למחוק אובייקט"
 
 #: lib/pleroma/web/controller_helper.ex:105
 #: lib/pleroma/web/controller_helper.ex:111
 #, elixir-format
 msgid "Can't display this activity"
-msgstr ""
+msgstr "לא ניתן להציג פעילות"
 
 #: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:285
 #, elixir-format
 msgid "Can't find user"
-msgstr ""
+msgstr "לא ניתן למצוא משתמש"
 
 #: lib/pleroma/web/pleroma_api/controllers/account_controller.ex:61
 #, elixir-format
 msgid "Can't get favorites"
-msgstr ""
+msgstr "לא ניתן למצוא מועדפים"
 
 #: lib/pleroma/web/activity_pub/activity_pub_controller.ex:438
 #, elixir-format
 msgid "Can't like object"
-msgstr ""
+msgstr "לא ניתן לעשות לחבב אובייקט"
 
 #: lib/pleroma/web/common_api/utils.ex:563
 #, elixir-format
 msgid "Cannot post an empty status without attachments"
-msgstr ""
+msgstr "לא ניתן לשלוח סטטוס ריק ללא קבצים מצורפים"
 
 #: lib/pleroma/web/common_api/utils.ex:511
 #, elixir-format
 msgid "Comment must be up to %{max_size} characters"
-msgstr ""
+msgstr "תגובה חייבת להיות עד %{max_size} תווים"
 
 #: lib/pleroma/config/config_db.ex:191
 #, elixir-format
 msgid "Config with params %{params} not found"
-msgstr ""
+msgstr "הגדרה עם פרמטר %{params} לא נמצאה"
 
 #: lib/pleroma/web/common_api/common_api.ex:181
 #: lib/pleroma/web/common_api/common_api.ex:185
 #, elixir-format
 msgid "Could not delete"
-msgstr ""
+msgstr "לא ניתן למחוק"
 
 #: lib/pleroma/web/common_api/common_api.ex:231
 #, elixir-format
 msgid "Could not favorite"
-msgstr ""
+msgstr "לא ניתן לחבב"
 
 #: lib/pleroma/web/common_api/common_api.ex:453
 #, elixir-format
 msgid "Could not pin"
-msgstr ""
+msgstr "לא ניתן לנעוץ"
 
 #: lib/pleroma/web/common_api/common_api.ex:278
 #, elixir-format
 msgid "Could not unfavorite"
-msgstr ""
+msgstr "לא ניתן להסיר חיבוב"
 
 #: lib/pleroma/web/common_api/common_api.ex:463
 #, elixir-format
 msgid "Could not unpin"
-msgstr ""
+msgstr "לא ניתן לבטל נעיצה"
 
 #: lib/pleroma/web/common_api/common_api.ex:216
 #, elixir-format
 msgid "Could not unrepeat"
-msgstr ""
+msgstr "לא ניתן לבטל חזרה"
 
 #: lib/pleroma/web/common_api/common_api.ex:512
 #: lib/pleroma/web/common_api/common_api.ex:521
 #, elixir-format
 msgid "Could not update state"
-msgstr ""
+msgstr "לא ניתן לעדכן מצב"
 
 #: lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex:207
 #, elixir-format
 msgid "Error."
-msgstr ""
+msgstr "שגיאה."
 
 #: lib/pleroma/web/twitter_api/twitter_api.ex:106
 #, elixir-format
 msgid "Invalid CAPTCHA"
-msgstr ""
+msgstr "CAPTCHA לא תקין"
 
 #: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:116
 #: lib/pleroma/web/oauth/oauth_controller.ex:568
 #, elixir-format
 msgid "Invalid credentials"
-msgstr ""
+msgstr "נתוני אימות לא נכונים"
 
 #: lib/pleroma/plugs/ensure_authenticated_plug.ex:38
 #, elixir-format
 msgid "Invalid credentials."
-msgstr ""
+msgstr "נתוני אימות לא נכונים."
 
 #: lib/pleroma/web/common_api/common_api.ex:355
 #, elixir-format
 msgid "Invalid indices"
-msgstr ""
+msgstr "אינדקס לא תקין"
 
 #: lib/pleroma/web/admin_api/controllers/fallback_controller.ex:29
 #, elixir-format
 msgid "Invalid parameters"
-msgstr ""
+msgstr "פרמטרים לא תקינים"
 
 #: lib/pleroma/web/common_api/utils.ex:414
 #, elixir-format
 msgid "Invalid password."
-msgstr ""
+msgstr "סיסמה לא תקינה."
 
 #: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:220
 #, elixir-format
 msgid "Invalid request"
-msgstr ""
+msgstr "בקשה לא תקינה"
 
 #: lib/pleroma/web/twitter_api/twitter_api.ex:109
 #, elixir-format
 msgid "Kocaptcha service unavailable"
-msgstr ""
+msgstr "שירות Kocaptcha לא זמין"
 
 #: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:112
 #, elixir-format
 msgid "Missing parameters"
-msgstr ""
+msgstr "פרמטרים חסרים"
 
 #: lib/pleroma/web/common_api/utils.ex:547
 #, elixir-format
 msgid "No such conversation"
-msgstr ""
+msgstr "שיחה לא קיימת"
 
 #: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:388
 #: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:414 lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:456
 #, elixir-format
 msgid "No such permission_group"
-msgstr ""
+msgstr "permission_group לא קיים"
 
 #: lib/pleroma/plugs/uploaded_media.ex:84
 #: lib/pleroma/web/activity_pub/activity_pub_controller.ex:486 lib/pleroma/web/admin_api/controllers/fallback_controller.ex:11
 #: lib/pleroma/web/feed/user_controller.ex:71 lib/pleroma/web/ostatus/ostatus_controller.ex:143
 #, elixir-format
 msgid "Not found"
-msgstr ""
+msgstr "לא נמצא"
 
 #: lib/pleroma/web/common_api/common_api.ex:331
 #, elixir-format
 msgid "Poll's author can't vote"
-msgstr ""
+msgstr "מחבר הסקר לא יכול.ה להצביע"
 
 #: lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex:20
 #: lib/pleroma/web/mastodon_api/controllers/poll_controller.ex:37 lib/pleroma/web/mastodon_api/controllers/poll_controller.ex:49
@@ -288,215 +291,215 @@ msgstr ""
 #: lib/pleroma/web/mastodon_api/controllers/subscription_controller.ex:71
 #, elixir-format
 msgid "Record not found"
-msgstr ""
+msgstr "רשומה לא נמצאה"
 
 #: lib/pleroma/web/admin_api/controllers/fallback_controller.ex:35
 #: lib/pleroma/web/feed/user_controller.ex:77 lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex:36
 #: lib/pleroma/web/ostatus/ostatus_controller.ex:149
 #, elixir-format
 msgid "Something went wrong"
-msgstr ""
+msgstr "משהו השתבש"
 
 #: lib/pleroma/web/common_api/activity_draft.ex:107
 #, elixir-format
 msgid "The message visibility must be direct"
-msgstr ""
+msgstr "הנראות של ההודעה חייבת להיות ישירה"
 
 #: lib/pleroma/web/common_api/utils.ex:573
 #, elixir-format
 msgid "The status is over the character limit"
-msgstr ""
+msgstr "הסטטוס מעל להגבלת התווים"
 
 #: lib/pleroma/plugs/ensure_public_or_authenticated_plug.ex:31
 #, elixir-format
 msgid "This resource requires authentication."
-msgstr ""
+msgstr "המשאב הזה דורש הרשאה."
 
 #: lib/pleroma/plugs/rate_limiter/rate_limiter.ex:206
 #, elixir-format
 msgid "Throttled"
-msgstr ""
+msgstr "מושנק"
 
 #: lib/pleroma/web/common_api/common_api.ex:356
 #, elixir-format
 msgid "Too many choices"
-msgstr ""
+msgstr "יותר מדיי אפשרויות"
 
 #: lib/pleroma/web/activity_pub/activity_pub_controller.ex:443
 #, elixir-format
 msgid "Unhandled activity type"
-msgstr ""
+msgstr "אין התמודדות לסוג הפעילות"
 
 #: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:485
 #, elixir-format
 msgid "You can't revoke your own admin status."
-msgstr ""
+msgstr "לא ניתן לבטל את הרשאת המנהל של עצמך."
 
 #: lib/pleroma/web/oauth/oauth_controller.ex:221
 #: lib/pleroma/web/oauth/oauth_controller.ex:308
 #, elixir-format
 msgid "Your account is currently disabled"
-msgstr ""
+msgstr "החשבון שלך כרגע מבוטל"
 
 #: lib/pleroma/web/oauth/oauth_controller.ex:183
 #: lib/pleroma/web/oauth/oauth_controller.ex:331
 #, elixir-format
 msgid "Your login is missing a confirmed e-mail address"
-msgstr ""
+msgstr "חסר לחשבון שלך כתובת דואר אלקטרוני מאושר"
 
 #: lib/pleroma/web/activity_pub/activity_pub_controller.ex:390
 #, elixir-format
 msgid "can't read inbox of %{nickname} as %{as_nickname}"
-msgstr ""
+msgstr "לא ניתן לקרוא את הדואר הנכנס של %{nickname} בתור %{as_nickname}"
 
 #: lib/pleroma/web/activity_pub/activity_pub_controller.ex:473
 #, elixir-format
 msgid "can't update outbox of %{nickname} as %{as_nickname}"
-msgstr ""
+msgstr "לא ניתן לעדכן את חשבון הדואר היוצא של %{nickname} בתור %{as_nickname}"
 
 #: lib/pleroma/web/common_api/common_api.ex:471
 #, elixir-format
 msgid "conversation is already muted"
-msgstr ""
+msgstr "שיחה כבר הושתקה"
 
 #: lib/pleroma/web/activity_pub/activity_pub_controller.ex:314
 #: lib/pleroma/web/activity_pub/activity_pub_controller.ex:492
 #, elixir-format
 msgid "error"
-msgstr ""
+msgstr "שגיאה"
 
 #: lib/pleroma/web/pleroma_api/controllers/mascot_controller.ex:32
 #, elixir-format
 msgid "mascots can only be images"
-msgstr ""
+msgstr "קמע יכול להיות רק תמונות"
 
 #: lib/pleroma/web/activity_pub/activity_pub_controller.ex:62
 #, elixir-format
 msgid "not found"
-msgstr ""
+msgstr "לא נמצא"
 
 #: lib/pleroma/web/oauth/oauth_controller.ex:394
 #, elixir-format
 msgid "Bad OAuth request."
-msgstr ""
+msgstr "בקשת OAuth שגוייה."
 
 #: lib/pleroma/web/twitter_api/twitter_api.ex:115
 #, elixir-format
 msgid "CAPTCHA already used"
-msgstr ""
+msgstr "כבר נעשה שימוש ב-CAPTCHA הזה"
 
 #: lib/pleroma/web/twitter_api/twitter_api.ex:112
 #, elixir-format
 msgid "CAPTCHA expired"
-msgstr ""
+msgstr "פג תוקף CAPTCHA"
 
 #: lib/pleroma/plugs/uploaded_media.ex:57
 #, elixir-format
 msgid "Failed"
-msgstr ""
+msgstr "נכשל"
 
 #: lib/pleroma/web/oauth/oauth_controller.ex:410
 #, elixir-format
 msgid "Failed to authenticate: %{message}."
-msgstr ""
+msgstr "נכשל האימות: %{message}."
 
 #: lib/pleroma/web/oauth/oauth_controller.ex:441
 #, elixir-format
 msgid "Failed to set up user account."
-msgstr ""
+msgstr "הגדרת חשבון משתמש נכשלה."
 
 #: lib/pleroma/plugs/oauth_scopes_plug.ex:38
 #, elixir-format
 msgid "Insufficient permissions: %{permissions}."
-msgstr ""
+msgstr "אין מספיק הרשאות: %{permissions}."
 
 #: lib/pleroma/plugs/uploaded_media.ex:104
 #, elixir-format
 msgid "Internal Error"
-msgstr ""
+msgstr "שגיאה פנימית"
 
 #: lib/pleroma/web/oauth/fallback_controller.ex:22
 #: lib/pleroma/web/oauth/fallback_controller.ex:29
 #, elixir-format
 msgid "Invalid Username/Password"
-msgstr ""
+msgstr "שם משתמש/סיסמה שגויים"
 
 #: lib/pleroma/web/twitter_api/twitter_api.ex:118
 #, elixir-format
 msgid "Invalid answer data"
-msgstr ""
+msgstr "תשובה שגוייה למידע"
 
 #: lib/pleroma/web/nodeinfo/nodeinfo_controller.ex:33
 #, elixir-format
 msgid "Nodeinfo schema version not handled"
-msgstr ""
+msgstr "Nodeinfo של של גרסת הסכמה לא ניתן לטיפול"
 
 #: lib/pleroma/web/oauth/oauth_controller.ex:172
 #, elixir-format
 msgid "This action is outside the authorized scopes"
-msgstr ""
+msgstr "הפעולה הזו מחוץ לתחומי ההרשאות"
 
 #: lib/pleroma/web/oauth/fallback_controller.ex:14
 #, elixir-format
 msgid "Unknown error, please check the details and try again."
-msgstr ""
+msgstr "שגיאה לא ידועה, יש לבדוק את פרטים ולנסות שוב."
 
 #: lib/pleroma/web/oauth/oauth_controller.ex:119
 #: lib/pleroma/web/oauth/oauth_controller.ex:158
 #, elixir-format
 msgid "Unlisted redirect_uri."
-msgstr ""
+msgstr "ניתב redirect_uri לא רשום."
 
 #: lib/pleroma/web/oauth/oauth_controller.ex:390
 #, elixir-format
 msgid "Unsupported OAuth provider: %{provider}."
-msgstr ""
+msgstr "ספק OAuth לא נתמך: %{provider}."
 
 #: lib/pleroma/uploaders/uploader.ex:72
 #, elixir-format
 msgid "Uploader callback timeout"
-msgstr ""
+msgstr "קריאה חזרה של מעלה עברה את הזמן הקצוב"
 
 #: lib/pleroma/web/uploader_controller.ex:23
 #, elixir-format
 msgid "bad request"
-msgstr ""
+msgstr "בקשה שגוייה"
 
 #: lib/pleroma/web/twitter_api/twitter_api.ex:103
 #, elixir-format
 msgid "CAPTCHA Error"
-msgstr ""
+msgstr "שגיאת CAPTCHA"
 
 #: lib/pleroma/web/common_api/common_api.ex:290
 #, elixir-format
 msgid "Could not add reaction emoji"
-msgstr ""
+msgstr "לא ניתן להוסיף סמלון תגובה"
 
 #: lib/pleroma/web/common_api/common_api.ex:301
 #, elixir-format
 msgid "Could not remove reaction emoji"
-msgstr ""
+msgstr "לא ניתן להסיר סמלון תגובה"
 
 #: lib/pleroma/web/twitter_api/twitter_api.ex:129
 #, elixir-format
 msgid "Invalid CAPTCHA (Missing parameter: %{name})"
-msgstr ""
+msgstr "CAPTCHA לא תקני (חסר פרמטר: %{name})"
 
 #: lib/pleroma/web/mastodon_api/controllers/list_controller.ex:92
 #, elixir-format
 msgid "List not found"
-msgstr ""
+msgstr "רשימה לא נמצאה"
 
 #: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:123
 #, elixir-format
 msgid "Missing parameter: %{name}"
-msgstr ""
+msgstr "חסר פרמטר: %{name}"
 
 #: lib/pleroma/web/oauth/oauth_controller.ex:210
 #: lib/pleroma/web/oauth/oauth_controller.ex:321
 #, elixir-format
 msgid "Password reset is required"
-msgstr ""
+msgstr "נדרש איפוס סיסמה"
 
 #: lib/pleroma/tests/auth_test_controller.ex:9
 #: lib/pleroma/web/activity_pub/activity_pub_controller.ex:6 lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:6
@@ -533,64 +536,64 @@ msgstr ""
 #: lib/pleroma/web/uploader_controller.ex:6 lib/pleroma/web/web_finger/web_finger_controller.ex:6
 #, elixir-format
 msgid "Security violation: OAuth scopes check was neither handled nor explicitly skipped."
-msgstr ""
+msgstr "הפרת אבטחה: OAuth בבדיקת המתחם לא נבדקה או דולגה במכוון."
 
 #: lib/pleroma/plugs/ensure_authenticated_plug.ex:28
 #, elixir-format
 msgid "Two-factor authentication enabled, you must use a access token."
-msgstr ""
+msgstr "אימות דו-שלבי הופעל, יש להזין אסימון כניסה."
 
 #: lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex:210
 #, elixir-format
 msgid "Unexpected error occurred while adding file to pack."
-msgstr ""
+msgstr "אירעה שגיאה לא צפויה בזמן הוספת הקובץ לחבילה."
 
 #: lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex:138
 #, elixir-format
 msgid "Unexpected error occurred while creating pack."
-msgstr ""
+msgstr "אירעה שגיאה לא צפויה בזמן יצירת חבילה."
 
 #: lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex:278
 #, elixir-format
 msgid "Unexpected error occurred while removing file from pack."
-msgstr ""
+msgstr "אירעה שגיאה לא צפויה בזמן הסרת הקובץ מהחבילה."
 
 #: lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex:250
 #, elixir-format
 msgid "Unexpected error occurred while updating file in pack."
-msgstr ""
+msgstr "אירעה שגיאה לא צפויה בזמן עדכון הקובץ מהחבילה."
 
 #: lib/pleroma/web/pleroma_api/controllers/emoji_pack_controller.ex:179
 #, elixir-format
 msgid "Unexpected error occurred while updating pack metadata."
-msgstr ""
+msgstr "אירעה שגיאה לא צפויה בזמן עדכון מטא-דאטה של החבילה."
 
 #: lib/pleroma/web/mastodon_api/controllers/subscription_controller.ex:61
 #, elixir-format
 msgid "Web push subscription is disabled on this Pleroma instance"
-msgstr ""
+msgstr "הרשמה לעדכון ווב בדחיפה מבוטלת בשרת פלרומה זה"
 
 #: lib/pleroma/web/admin_api/controllers/admin_api_controller.ex:451
 #, elixir-format
 msgid "You can't revoke your own admin/moderator status."
-msgstr ""
+msgstr "לא ניתן לשלול את סטטוס האדמין/מנהל של עצמך."
 
 #: lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex:126
 #, elixir-format
 msgid "authorization required for timeline view"
-msgstr ""
+msgstr "הרשאה דרושה על מנת לצפות בציר הזמן"
 
 #: lib/pleroma/web/mastodon_api/controllers/fallback_controller.ex:24
 #, elixir-format
 msgid "Access denied"
-msgstr ""
+msgstr "גישה נדחית"
 
 #: lib/pleroma/web/mastodon_api/controllers/account_controller.ex:282
 #, elixir-format
 msgid "This API requires an authenticated user"
-msgstr ""
+msgstr "ה-API דורש הרשאת משתמש"
 
 #: lib/pleroma/plugs/user_is_admin_plug.ex:21
 #, elixir-format
 msgid "User is not an admin."
-msgstr ""
+msgstr "משתמש אינו מנהל."

From 67b15cc033fd1154d1e6a96a5c5f141921c2e688 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Mon, 23 Nov 2020 15:29:55 +0100
Subject: [PATCH 17/22] Search: Save detected pg version in a persistent term.

---
 lib/pleroma/activity/search.ex                              | 2 +-
 lib/pleroma/application.ex                                  | 2 +-
 test/pleroma/activity/search_test.exs                       | 6 +++---
 .../web/mastodon_api/controllers/search_controller_test.exs | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/pleroma/activity/search.ex b/lib/pleroma/activity/search.ex
index ea9783225..babf9520b 100644
--- a/lib/pleroma/activity/search.ex
+++ b/lib/pleroma/activity/search.ex
@@ -20,7 +20,7 @@ def search(user, search_query, options \\ []) do
     author = Keyword.get(options, :author)
 
     search_function =
-      if Application.get_env(:postgres, :version) >= 11 do
+      if :persistent_term.get({Pleroma.Repo, :postgres_version}) >= 11 do
         :websearch
       else
         :plain
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index 22936bd7f..bd568d858 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -131,7 +131,7 @@ defp set_postgres_server_version do
           9.6
       end
 
-    Application.put_env(:postgres, :version, version)
+    :persistent_term.put({Pleroma.Repo, :postgres_version}, version)
   end
 
   def load_custom_modules do
diff --git a/test/pleroma/activity/search_test.exs b/test/pleroma/activity/search_test.exs
index 37c0feeea..988949154 100644
--- a/test/pleroma/activity/search_test.exs
+++ b/test/pleroma/activity/search_test.exs
@@ -19,8 +19,8 @@ test "it finds something" do
   end
 
   test "using plainto_tsquery on postgres < 11" do
-    old_config = Application.get_env(:postgres, :version)
-    Application.put_env(:postgres, :version, 10.0)
+    old_version = :persistent_term.get({Pleroma.Repo, :postgres_version})
+    :persistent_term.put({Pleroma.Repo, :postgres_version}, 10.0)
 
     user = insert(:user)
     {:ok, post} = CommonAPI.post(user, %{status: "it's wednesday my dudes"})
@@ -31,7 +31,7 @@ test "using plainto_tsquery on postgres < 11" do
 
     assert result.id == post.id
 
-    Application.put_env(:postgres, :version, old_config)
+    :persistent_term.put({Pleroma.Repo, :postgres_version}, old_version)
   end
 
   test "using websearch_to_tsquery" do
diff --git a/test/pleroma/web/mastodon_api/controllers/search_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/search_controller_test.exs
index 2b2579857..2f0bce450 100644
--- a/test/pleroma/web/mastodon_api/controllers/search_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/search_controller_test.exs
@@ -279,8 +279,8 @@ test "search", %{conn: conn} do
     end
 
     test "search fetches remote statuses and prefers them over other results", %{conn: conn} do
-      old_config = Application.get_env(:postgres, :version)
-      Application.put_env(:postgres, :version, 10.0)
+      old_version = :persistent_term.get({Pleroma.Repo, :postgres_version})
+      :persistent_term.put({Pleroma.Repo, :postgres_version}, 10.0)
 
       capture_log(fn ->
         {:ok, %{id: activity_id}} =
@@ -299,7 +299,7 @@ test "search fetches remote statuses and prefers them over other results", %{con
                ] = results["statuses"]
       end)
 
-      Application.put_env(:postgres, :version, old_config)
+      :persistent_term.put({Pleroma.Repo, :postgres_version}, old_version)
     end
 
     test "search doesn't show statuses that it shouldn't", %{conn: conn} do

From 60c8c5402c0475306e4c791dcd74d36553f7c552 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Mon, 23 Nov 2020 11:22:50 -0600
Subject: [PATCH 18/22] Update Linkify to 0.3.0

Added

- Support returning result as iodata and as safe iodata

Fixed

- Hashtags followed by HTML tags "a", "code" and "pre" were not detected
- Incorrect parsing of HTML links inside HTML tags
- Punctuation marks in the end of urls were included in the html links
- Incorrect parsing of mentions with symbols before them
---
 mix.exs  | 2 +-
 mix.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mix.exs b/mix.exs
index be7fe29d8..36e8a936e 100644
--- a/mix.exs
+++ b/mix.exs
@@ -157,7 +157,7 @@ defp deps do
       {:floki, "~> 0.27"},
       {:timex, "~> 3.6"},
       {:ueberauth, "~> 0.4"},
-      {:linkify, "~> 0.2.0"},
+      {:linkify, "~> 0.3.0"},
       {:http_signatures, "~> 0.1.0"},
       {:telemetry, "~> 0.3"},
       {:poolboy, "~> 1.5"},
diff --git a/mix.lock b/mix.lock
index 5989c675b..94df2a9b1 100644
--- a/mix.lock
+++ b/mix.lock
@@ -65,7 +65,7 @@
   "jose": {:hex, :jose, "1.10.1", "16d8e460dae7203c6d1efa3f277e25b5af8b659febfc2f2eb4bacf87f128b80a", [:mix, :rebar3], [], "hexpm", "3c7ddc8a9394b92891db7c2771da94bf819834a1a4c92e30857b7d582e2f8257"},
   "jumper": {:hex, :jumper, "1.0.1", "3c00542ef1a83532b72269fab9f0f0c82bf23a35e27d278bfd9ed0865cecabff", [:mix], [], "hexpm", "318c59078ac220e966d27af3646026db9b5a5e6703cb2aa3e26bcfaba65b7433"},
   "libring": {:hex, :libring, "1.4.0", "41246ba2f3fbc76b3971f6bce83119dfec1eee17e977a48d8a9cfaaf58c2a8d6", [:mix], [], "hexpm"},
-  "linkify": {:hex, :linkify, "0.2.0", "2518bbbea21d2caa9d372424e1ad845b640c6630e2d016f1bd1f518f9ebcca28", [:mix], [], "hexpm", "b8ca8a68b79e30b7938d6c996085f3db14939f29538a59ca5101988bb7f917f6"},
+  "linkify": {:hex, :linkify, "0.3.0", "0786296f06c3cc5455c3cbc786e575e5c381f76f8c7cb79eba495eef66617aeb", [:mix], [], "hexpm", "47e6a6e2c98815b238017331c3fbcf04aaa0644e323e6c260ee0111ed43f696c"},
   "majic": {:git, "https://git.pleroma.social/pleroma/elixir-libraries/majic.git", "4c692e544b28d1f5e543fb8a44be090f8cd96f80", [branch: "develop"]},
   "makeup": {:hex, :makeup, "1.0.3", "e339e2f766d12e7260e6672dd4047405963c5ec99661abdc432e6ec67d29ef95", [:mix], [{:nimble_parsec, "~> 0.5", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "2e9b4996d11832947731f7608fed7ad2f9443011b3b479ae288011265cdd3dad"},
   "makeup_elixir": {:hex, :makeup_elixir, "0.14.1", "4f0e96847c63c17841d42c08107405a005a2680eb9c7ccadfd757bd31dabccfb", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "f2438b1a80eaec9ede832b5c41cd4f373b38fd7aa33e3b22d9db79e640cbde11"},

From 3283d0805f15d7e108c7f9b5e02de486c69a5c66 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Mon, 23 Nov 2020 13:28:55 -0600
Subject: [PATCH 19/22] Use Jason instead of Poison in tests

---
 .../activity_pub_controller_test.exs          | 14 +++++------
 .../mrf/object_age_policy_test.exs            |  2 +-
 .../transmogrifier/accept_handling_test.exs   |  6 ++---
 .../transmogrifier/announce_handling_test.exs | 12 +++++-----
 .../transmogrifier/answer_handling_test.exs   |  4 ++--
 .../transmogrifier/audio_handling_test.exs    |  2 +-
 .../transmogrifier/block_handling_test.exs    |  4 ++--
 .../transmogrifier/chat_message_test.exs      | 12 +++++-----
 .../transmogrifier/delete_handling_test.exs   | 10 ++++----
 .../emoji_react_handling_test.exs             |  6 ++---
 .../transmogrifier/follow_handling_test.exs   | 18 +++++++-------
 .../transmogrifier/like_handling_test.exs     |  6 ++---
 .../transmogrifier/question_handling_test.exs | 10 ++++----
 .../transmogrifier/reject_handling_test.exs   |  6 ++---
 .../transmogrifier/undo_handling_test.exs     | 24 +++++++++----------
 .../user_update_handling_test.exs             |  8 +++----
 .../web/activity_pub/transmogrifier_test.exs  |  4 ++--
 test/pleroma/web/federator_test.exs           |  2 +-
 .../web/o_auth/o_auth_controller_test.exs     |  8 +++----
 test/pleroma/web/streamer_test.exs            |  2 +-
 test/support/helpers.ex                       |  4 ++--
 21 files changed, 82 insertions(+), 82 deletions(-)

diff --git a/test/pleroma/web/activity_pub/activity_pub_controller_test.exs b/test/pleroma/web/activity_pub/activity_pub_controller_test.exs
index b577e25dd..c9b421489 100644
--- a/test/pleroma/web/activity_pub/activity_pub_controller_test.exs
+++ b/test/pleroma/web/activity_pub/activity_pub_controller_test.exs
@@ -431,7 +431,7 @@ test "cached purged after activity deletion", %{conn: conn} do
 
   describe "/inbox" do
     test "it inserts an incoming activity into the database", %{conn: conn} do
-      data = File.read!("test/fixtures/mastodon-post-activity.json") |> Poison.decode!()
+      data = File.read!("test/fixtures/mastodon-post-activity.json") |> Jason.decode!()
 
       conn =
         conn
@@ -459,7 +459,7 @@ test "it inserts an incoming activity into the database" <>
 
       data =
         File.read!("test/fixtures/mastodon-post-activity.json")
-        |> Poison.decode!()
+        |> Jason.decode!()
         |> Map.put("actor", user.ap_id)
         |> put_in(["object", "attridbutedTo"], user.ap_id)
 
@@ -476,7 +476,7 @@ test "it inserts an incoming activity into the database" <>
     end
 
     test "it clears `unreachable` federation status of the sender", %{conn: conn} do
-      data = File.read!("test/fixtures/mastodon-post-activity.json") |> Poison.decode!()
+      data = File.read!("test/fixtures/mastodon-post-activity.json") |> Jason.decode!()
 
       sender_url = data["actor"]
       Instances.set_consistently_unreachable(sender_url)
@@ -534,8 +534,8 @@ test "accept follow activity", %{conn: conn} do
     test "without valid signature, " <>
            "it only accepts Create activities and requires enabled federation",
          %{conn: conn} do
-      data = File.read!("test/fixtures/mastodon-post-activity.json") |> Poison.decode!()
-      non_create_data = File.read!("test/fixtures/mastodon-announce.json") |> Poison.decode!()
+      data = File.read!("test/fixtures/mastodon-post-activity.json") |> Jason.decode!()
+      non_create_data = File.read!("test/fixtures/mastodon-announce.json") |> Jason.decode!()
 
       conn = put_req_header(conn, "content-type", "application/activity+json")
 
@@ -564,7 +564,7 @@ test "without valid signature, " <>
     setup do
       data =
         File.read!("test/fixtures/mastodon-post-activity.json")
-        |> Poison.decode!()
+        |> Jason.decode!()
 
       [data: data]
     end
@@ -747,7 +747,7 @@ test "it removes all follower collections but actor's", %{conn: conn} do
 
       data =
         File.read!("test/fixtures/activitypub-client-post-activity.json")
-        |> Poison.decode!()
+        |> Jason.decode!()
 
       object = Map.put(data["object"], "attributedTo", actor.ap_id)
 
diff --git a/test/pleroma/web/activity_pub/mrf/object_age_policy_test.exs b/test/pleroma/web/activity_pub/mrf/object_age_policy_test.exs
index cf6acc9a2..e8317b2af 100644
--- a/test/pleroma/web/activity_pub/mrf/object_age_policy_test.exs
+++ b/test/pleroma/web/activity_pub/mrf/object_age_policy_test.exs
@@ -22,7 +22,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.ObjectAgePolicyTest do
 
   defp get_old_message do
     File.read!("test/fixtures/mastodon-post-activity.json")
-    |> Poison.decode!()
+    |> Jason.decode!()
   end
 
   defp get_new_message do
diff --git a/test/pleroma/web/activity_pub/transmogrifier/accept_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/accept_handling_test.exs
index c6ff96f08..0d431df18 100644
--- a/test/pleroma/web/activity_pub/transmogrifier/accept_handling_test.exs
+++ b/test/pleroma/web/activity_pub/transmogrifier/accept_handling_test.exs
@@ -22,7 +22,7 @@ test "it works for incoming accepts which were pre-accepted" do
 
     accept_data =
       File.read!("test/fixtures/mastodon-accept-activity.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("actor", followed.ap_id)
 
     object =
@@ -52,7 +52,7 @@ test "it works for incoming accepts which are referenced by IRI only" do
 
     accept_data =
       File.read!("test/fixtures/mastodon-accept-activity.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("actor", followed.ap_id)
       |> Map.put("object", follow_activity.data["id"])
 
@@ -76,7 +76,7 @@ test "it fails for incoming accepts which cannot be correlated" do
 
     accept_data =
       File.read!("test/fixtures/mastodon-accept-activity.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("actor", followed.ap_id)
 
     accept_data =
diff --git a/test/pleroma/web/activity_pub/transmogrifier/announce_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/announce_handling_test.exs
index 99c296c74..c06bbc5e9 100644
--- a/test/pleroma/web/activity_pub/transmogrifier/announce_handling_test.exs
+++ b/test/pleroma/web/activity_pub/transmogrifier/announce_handling_test.exs
@@ -36,7 +36,7 @@ test "it works for incoming honk announces" do
   end
 
   test "it works for incoming announces with actor being inlined (kroeg)" do
-    data = File.read!("test/fixtures/kroeg-announce-with-inline-actor.json") |> Poison.decode!()
+    data = File.read!("test/fixtures/kroeg-announce-with-inline-actor.json") |> Jason.decode!()
 
     _user = insert(:user, local: false, ap_id: data["actor"]["id"])
     other_user = insert(:user)
@@ -55,7 +55,7 @@ test "it works for incoming announces with actor being inlined (kroeg)" do
   test "it works for incoming announces, fetching the announced object" do
     data =
       File.read!("test/fixtures/mastodon-announce.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("object", "http://mastodon.example.org/users/admin/statuses/99541947525187367")
 
     Tesla.Mock.mock(fn
@@ -90,7 +90,7 @@ test "it works for incoming announces with an existing activity" do
 
     data =
       File.read!("test/fixtures/mastodon-announce.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("object", activity.data["object"])
 
     _user = insert(:user, local: false, ap_id: data["actor"])
@@ -113,7 +113,7 @@ test "it works for incoming announces with an existing activity" do
   test "it works for incoming announces with an inlined activity" do
     data =
       File.read!("test/fixtures/mastodon-announce-private.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
 
     _user =
       insert(:user,
@@ -144,7 +144,7 @@ test "it rejects incoming announces with an inlined activity from another origin
 
     data =
       File.read!("test/fixtures/bogus-mastodon-announce.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
 
     _user = insert(:user, local: false, ap_id: data["actor"])
 
@@ -157,7 +157,7 @@ test "it does not clobber the addressing on announce activities" do
 
     data =
       File.read!("test/fixtures/mastodon-announce.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("object", Object.normalize(activity).data["id"])
       |> Map.put("to", ["http://mastodon.example.org/users/admin/followers"])
       |> Map.put("cc", [])
diff --git a/test/pleroma/web/activity_pub/transmogrifier/answer_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/answer_handling_test.exs
index e7d85a2c5..a1c2ba28a 100644
--- a/test/pleroma/web/activity_pub/transmogrifier/answer_handling_test.exs
+++ b/test/pleroma/web/activity_pub/transmogrifier/answer_handling_test.exs
@@ -31,7 +31,7 @@ test "incoming, rewrites Note to Answer and increments vote counters" do
 
     data =
       File.read!("test/fixtures/mastodon-vote.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Kernel.put_in(["to"], user.ap_id)
       |> Kernel.put_in(["object", "inReplyTo"], object.data["id"])
       |> Kernel.put_in(["object", "to"], user.ap_id)
@@ -66,7 +66,7 @@ test "outgoing, rewrites Answer to Note" do
     # TODO: Replace with CommonAPI vote creation when implemented
     data =
       File.read!("test/fixtures/mastodon-vote.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Kernel.put_in(["to"], user.ap_id)
       |> Kernel.put_in(["object", "inReplyTo"], poll_object.data["id"])
       |> Kernel.put_in(["object", "to"], user.ap_id)
diff --git a/test/pleroma/web/activity_pub/transmogrifier/audio_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/audio_handling_test.exs
index 6eeb1c863..7a2ac5d4d 100644
--- a/test/pleroma/web/activity_pub/transmogrifier/audio_handling_test.exs
+++ b/test/pleroma/web/activity_pub/transmogrifier/audio_handling_test.exs
@@ -53,7 +53,7 @@ test "Funkwhale Audio object" do
         }
     end)
 
-    data = File.read!("test/fixtures/tesla_mock/funkwhale_create_audio.json") |> Poison.decode!()
+    data = File.read!("test/fixtures/tesla_mock/funkwhale_create_audio.json") |> Jason.decode!()
 
     {:ok, %Activity{local: false} = activity} = Transmogrifier.handle_incoming(data)
 
diff --git a/test/pleroma/web/activity_pub/transmogrifier/block_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/block_handling_test.exs
index 71f1a0ed5..b8e4ad827 100644
--- a/test/pleroma/web/activity_pub/transmogrifier/block_handling_test.exs
+++ b/test/pleroma/web/activity_pub/transmogrifier/block_handling_test.exs
@@ -16,7 +16,7 @@ test "it works for incoming blocks" do
 
     data =
       File.read!("test/fixtures/mastodon-block-activity.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("object", user.ap_id)
 
     blocker = insert(:user, ap_id: data["actor"])
@@ -36,7 +36,7 @@ test "incoming blocks successfully tear down any follow relationship" do
 
     data =
       File.read!("test/fixtures/mastodon-block-activity.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("object", blocked.ap_id)
       |> Map.put("actor", blocker.ap_id)
 
diff --git a/test/pleroma/web/activity_pub/transmogrifier/chat_message_test.exs b/test/pleroma/web/activity_pub/transmogrifier/chat_message_test.exs
index 31274c067..2adaa1ade 100644
--- a/test/pleroma/web/activity_pub/transmogrifier/chat_message_test.exs
+++ b/test/pleroma/web/activity_pub/transmogrifier/chat_message_test.exs
@@ -53,7 +53,7 @@ test "handles chonks with attachment" do
     test "it rejects messages that don't contain content" do
       data =
         File.read!("test/fixtures/create-chat-message.json")
-        |> Poison.decode!()
+        |> Jason.decode!()
 
       object =
         data["object"]
@@ -79,7 +79,7 @@ test "it rejects messages that don't contain content" do
     test "it rejects messages that don't concern local users" do
       data =
         File.read!("test/fixtures/create-chat-message.json")
-        |> Poison.decode!()
+        |> Jason.decode!()
 
       _author =
         insert(:user, ap_id: data["actor"], local: false, last_refreshed_at: DateTime.utc_now())
@@ -97,7 +97,7 @@ test "it rejects messages that don't concern local users" do
     test "it rejects messages where the `to` field of activity and object don't match" do
       data =
         File.read!("test/fixtures/create-chat-message.json")
-        |> Poison.decode!()
+        |> Jason.decode!()
 
       author = insert(:user, ap_id: data["actor"])
       _recipient = insert(:user, ap_id: List.first(data["to"]))
@@ -115,7 +115,7 @@ test "it fetches the actor if they aren't in our system" do
 
       data =
         File.read!("test/fixtures/create-chat-message.json")
-        |> Poison.decode!()
+        |> Jason.decode!()
         |> Map.put("actor", "http://mastodon.example.org/users/admin")
         |> put_in(["object", "actor"], "http://mastodon.example.org/users/admin")
 
@@ -127,7 +127,7 @@ test "it fetches the actor if they aren't in our system" do
     test "it doesn't work for deactivated users" do
       data =
         File.read!("test/fixtures/create-chat-message.json")
-        |> Poison.decode!()
+        |> Jason.decode!()
 
       _author =
         insert(:user,
@@ -145,7 +145,7 @@ test "it doesn't work for deactivated users" do
     test "it inserts it and creates a chat" do
       data =
         File.read!("test/fixtures/create-chat-message.json")
-        |> Poison.decode!()
+        |> Jason.decode!()
 
       author =
         insert(:user, ap_id: data["actor"], local: false, last_refreshed_at: DateTime.utc_now())
diff --git a/test/pleroma/web/activity_pub/transmogrifier/delete_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/delete_handling_test.exs
index c9a53918c..cffaa7c44 100644
--- a/test/pleroma/web/activity_pub/transmogrifier/delete_handling_test.exs
+++ b/test/pleroma/web/activity_pub/transmogrifier/delete_handling_test.exs
@@ -25,7 +25,7 @@ test "it works for incoming deletes" do
 
     data =
       File.read!("test/fixtures/mastodon-delete.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("actor", deleting_user.ap_id)
       |> put_in(["object", "id"], activity.data["object"])
 
@@ -57,7 +57,7 @@ test "it works for incoming when the object has been pruned" do
 
     data =
       File.read!("test/fixtures/mastodon-delete.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("actor", deleting_user.ap_id)
       |> put_in(["object", "id"], activity.data["object"])
 
@@ -78,7 +78,7 @@ test "it fails for incoming deletes with spoofed origin" do
 
     data =
       File.read!("test/fixtures/mastodon-delete.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("actor", ap_id)
       |> put_in(["object", "id"], activity.data["object"])
 
@@ -91,7 +91,7 @@ test "it works for incoming user deletes" do
 
     data =
       File.read!("test/fixtures/mastodon-delete-user.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
 
     {:ok, _} = Transmogrifier.handle_incoming(data)
     ObanHelpers.perform_all()
@@ -104,7 +104,7 @@ test "it fails for incoming user deletes with spoofed origin" do
 
     data =
       File.read!("test/fixtures/mastodon-delete-user.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("actor", ap_id)
 
     assert match?({:error, _}, Transmogrifier.handle_incoming(data))
diff --git a/test/pleroma/web/activity_pub/transmogrifier/emoji_react_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/emoji_react_handling_test.exs
index 0fb056b50..aea4ed6f8 100644
--- a/test/pleroma/web/activity_pub/transmogrifier/emoji_react_handling_test.exs
+++ b/test/pleroma/web/activity_pub/transmogrifier/emoji_react_handling_test.exs
@@ -19,7 +19,7 @@ test "it works for incoming emoji reactions" do
 
     data =
       File.read!("test/fixtures/emoji-reaction.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("object", activity.data["object"])
       |> Map.put("actor", other_user.ap_id)
 
@@ -44,7 +44,7 @@ test "it reject invalid emoji reactions" do
 
     data =
       File.read!("test/fixtures/emoji-reaction-too-long.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("object", activity.data["object"])
       |> Map.put("actor", other_user.ap_id)
 
@@ -52,7 +52,7 @@ test "it reject invalid emoji reactions" do
 
     data =
       File.read!("test/fixtures/emoji-reaction-no-emoji.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("object", activity.data["object"])
       |> Map.put("actor", other_user.ap_id)
 
diff --git a/test/pleroma/web/activity_pub/transmogrifier/follow_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/follow_handling_test.exs
index 4ef8210ad..985c26def 100644
--- a/test/pleroma/web/activity_pub/transmogrifier/follow_handling_test.exs
+++ b/test/pleroma/web/activity_pub/transmogrifier/follow_handling_test.exs
@@ -28,7 +28,7 @@ test "it works for osada follow request" do
 
       data =
         File.read!("test/fixtures/osada-follow-activity.json")
-        |> Poison.decode!()
+        |> Jason.decode!()
         |> Map.put("object", user.ap_id)
 
       {:ok, %Activity{data: data, local: false} = activity} = Transmogrifier.handle_incoming(data)
@@ -47,7 +47,7 @@ test "it works for incoming follow requests" do
 
       data =
         File.read!("test/fixtures/mastodon-follow-activity.json")
-        |> Poison.decode!()
+        |> Jason.decode!()
         |> Map.put("object", user.ap_id)
 
       {:ok, %Activity{data: data, local: false} = activity} = Transmogrifier.handle_incoming(data)
@@ -69,7 +69,7 @@ test "with locked accounts, it does create a Follow, but not an Accept" do
 
       data =
         File.read!("test/fixtures/mastodon-follow-activity.json")
-        |> Poison.decode!()
+        |> Jason.decode!()
         |> Map.put("object", user.ap_id)
 
       {:ok, %Activity{data: data, local: false}} = Transmogrifier.handle_incoming(data)
@@ -100,7 +100,7 @@ test "it works for follow requests when you are already followed, creating a new
 
       data =
         File.read!("test/fixtures/mastodon-follow-activity.json")
-        |> Poison.decode!()
+        |> Jason.decode!()
         |> Map.put("object", user.ap_id)
 
       {:ok, %Activity{local: false}} = Transmogrifier.handle_incoming(data)
@@ -116,7 +116,7 @@ test "it works for follow requests when you are already followed, creating a new
 
       data =
         File.read!("test/fixtures/mastodon-follow-activity.json")
-        |> Poison.decode!()
+        |> Jason.decode!()
         |> Map.put("id", String.replace(data["id"], "2", "3"))
         |> Map.put("object", user.ap_id)
 
@@ -142,7 +142,7 @@ test "it rejects incoming follow requests from blocked users when deny_follow_bl
 
       data =
         File.read!("test/fixtures/mastodon-follow-activity.json")
-        |> Poison.decode!()
+        |> Jason.decode!()
         |> Map.put("object", user.ap_id)
 
       {:ok, %Activity{data: %{"id" => id}}} = Transmogrifier.handle_incoming(data)
@@ -157,7 +157,7 @@ test "it rejects incoming follow requests if the following errors for some reaso
 
       data =
         File.read!("test/fixtures/mastodon-follow-activity.json")
-        |> Poison.decode!()
+        |> Jason.decode!()
         |> Map.put("object", user.ap_id)
 
       with_mock Pleroma.User, [:passthrough], follow: fn _, _, _ -> {:error, :testing} end do
@@ -174,7 +174,7 @@ test "it works for incoming follow requests from hubzilla" do
 
       data =
         File.read!("test/fixtures/hubzilla-follow-activity.json")
-        |> Poison.decode!()
+        |> Jason.decode!()
         |> Map.put("object", user.ap_id)
         |> Utils.normalize_params()
 
@@ -192,7 +192,7 @@ test "it works for incoming follows to locked account" do
 
       data =
         File.read!("test/fixtures/mastodon-follow-activity.json")
-        |> Poison.decode!()
+        |> Jason.decode!()
         |> Map.put("object", user.ap_id)
 
       {:ok, %Activity{data: data, local: false}} = Transmogrifier.handle_incoming(data)
diff --git a/test/pleroma/web/activity_pub/transmogrifier/like_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/like_handling_test.exs
index 53fe1d550..967bad151 100644
--- a/test/pleroma/web/activity_pub/transmogrifier/like_handling_test.exs
+++ b/test/pleroma/web/activity_pub/transmogrifier/like_handling_test.exs
@@ -18,7 +18,7 @@ test "it works for incoming likes" do
 
     data =
       File.read!("test/fixtures/mastodon-like.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("object", activity.data["object"])
 
     _actor = insert(:user, ap_id: data["actor"], local: false)
@@ -40,7 +40,7 @@ test "it works for incoming misskey likes, turning them into EmojiReacts" do
 
     data =
       File.read!("test/fixtures/misskey-like.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("object", activity.data["object"])
 
     _actor = insert(:user, ap_id: data["actor"], local: false)
@@ -61,7 +61,7 @@ test "it works for incoming misskey likes that contain unicode emojis, turning t
 
     data =
       File.read!("test/fixtures/misskey-like.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("object", activity.data["object"])
       |> Map.put("_misskey_reaction", "⭐")
 
diff --git a/test/pleroma/web/activity_pub/transmogrifier/question_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/question_handling_test.exs
index d2822ce75..47f92cf4d 100644
--- a/test/pleroma/web/activity_pub/transmogrifier/question_handling_test.exs
+++ b/test/pleroma/web/activity_pub/transmogrifier/question_handling_test.exs
@@ -18,7 +18,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.QuestionHandlingTest do
   end
 
   test "Mastodon Question activity" do
-    data = File.read!("test/fixtures/mastodon-question-activity.json") |> Poison.decode!()
+    data = File.read!("test/fixtures/mastodon-question-activity.json") |> Jason.decode!()
 
     {:ok, %Activity{local: false} = activity} = Transmogrifier.handle_incoming(data)
 
@@ -97,7 +97,7 @@ test "Mastodon Question activity with HTML tags in plaintext" do
 
     data =
       File.read!("test/fixtures/mastodon-question-activity.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Kernel.put_in(["object", "oneOf"], options)
 
     {:ok, %Activity{local: false} = activity} = Transmogrifier.handle_incoming(data)
@@ -142,7 +142,7 @@ test "Mastodon Question activity with custom emojis" do
 
     data =
       File.read!("test/fixtures/mastodon-question-activity.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Kernel.put_in(["object", "oneOf"], options)
       |> Kernel.put_in(["object", "tag"], tag)
 
@@ -158,7 +158,7 @@ test "Mastodon Question activity with custom emojis" do
   end
 
   test "returns same activity if received a second time" do
-    data = File.read!("test/fixtures/mastodon-question-activity.json") |> Poison.decode!()
+    data = File.read!("test/fixtures/mastodon-question-activity.json") |> Jason.decode!()
 
     assert {:ok, %Activity{local: false} = activity} = Transmogrifier.handle_incoming(data)
 
@@ -168,7 +168,7 @@ test "returns same activity if received a second time" do
   test "accepts a Question with no content" do
     data =
       File.read!("test/fixtures/mastodon-question-activity.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Kernel.put_in(["object", "content"], "")
 
     assert {:ok, %Activity{local: false}} = Transmogrifier.handle_incoming(data)
diff --git a/test/pleroma/web/activity_pub/transmogrifier/reject_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/reject_handling_test.exs
index 5c1451def..cc28eb7ef 100644
--- a/test/pleroma/web/activity_pub/transmogrifier/reject_handling_test.exs
+++ b/test/pleroma/web/activity_pub/transmogrifier/reject_handling_test.exs
@@ -18,7 +18,7 @@ test "it fails for incoming rejects which cannot be correlated" do
 
     accept_data =
       File.read!("test/fixtures/mastodon-reject-activity.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("actor", followed.ap_id)
 
     accept_data =
@@ -42,7 +42,7 @@ test "it works for incoming rejects which are referenced by IRI only" do
 
     reject_data =
       File.read!("test/fixtures/mastodon-reject-activity.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("actor", followed.ap_id)
       |> Map.put("object", follow_activity.data["id"])
 
@@ -58,7 +58,7 @@ test "it rejects activities without a valid ID" do
 
     data =
       File.read!("test/fixtures/mastodon-follow-activity.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("object", user.ap_id)
       |> Map.put("id", "")
 
diff --git a/test/pleroma/web/activity_pub/transmogrifier/undo_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/undo_handling_test.exs
index 8683f7135..fcfc7b4b6 100644
--- a/test/pleroma/web/activity_pub/transmogrifier/undo_handling_test.exs
+++ b/test/pleroma/web/activity_pub/transmogrifier/undo_handling_test.exs
@@ -21,7 +21,7 @@ test "it works for incoming emoji reaction undos" do
 
     data =
       File.read!("test/fixtures/mastodon-undo-like.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("object", reaction_activity.data["id"])
       |> Map.put("actor", user.ap_id)
 
@@ -38,7 +38,7 @@ test "it returns an error for incoming unlikes wihout a like activity" do
 
     data =
       File.read!("test/fixtures/mastodon-undo-like.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("object", activity.data["object"])
 
     assert Transmogrifier.handle_incoming(data) == :error
@@ -50,7 +50,7 @@ test "it works for incoming unlikes with an existing like activity" do
 
     like_data =
       File.read!("test/fixtures/mastodon-like.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("object", activity.data["object"])
 
     _liker = insert(:user, ap_id: like_data["actor"], local: false)
@@ -59,7 +59,7 @@ test "it works for incoming unlikes with an existing like activity" do
 
     data =
       File.read!("test/fixtures/mastodon-undo-like.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("object", like_data)
       |> Map.put("actor", like_data["actor"])
 
@@ -81,7 +81,7 @@ test "it works for incoming unlikes with an existing like activity and a compact
 
     like_data =
       File.read!("test/fixtures/mastodon-like.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("object", activity.data["object"])
 
     _liker = insert(:user, ap_id: like_data["actor"], local: false)
@@ -90,7 +90,7 @@ test "it works for incoming unlikes with an existing like activity and a compact
 
     data =
       File.read!("test/fixtures/mastodon-undo-like.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("object", like_data["id"])
       |> Map.put("actor", like_data["actor"])
 
@@ -108,7 +108,7 @@ test "it works for incoming unannounces with an existing notice" do
 
     announce_data =
       File.read!("test/fixtures/mastodon-announce.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("object", activity.data["object"])
 
     _announcer = insert(:user, ap_id: announce_data["actor"], local: false)
@@ -118,7 +118,7 @@ test "it works for incoming unannounces with an existing notice" do
 
     data =
       File.read!("test/fixtures/mastodon-undo-announce.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("object", announce_data)
       |> Map.put("actor", announce_data["actor"])
 
@@ -135,7 +135,7 @@ test "it works for incoming unfollows with an existing follow" do
 
     follow_data =
       File.read!("test/fixtures/mastodon-follow-activity.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("object", user.ap_id)
 
     _follower = insert(:user, ap_id: follow_data["actor"], local: false)
@@ -144,7 +144,7 @@ test "it works for incoming unfollows with an existing follow" do
 
     data =
       File.read!("test/fixtures/mastodon-unfollow-activity.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("object", follow_data)
 
     {:ok, %Activity{data: data, local: false}} = Transmogrifier.handle_incoming(data)
@@ -162,7 +162,7 @@ test "it works for incoming unblocks with an existing block" do
 
     block_data =
       File.read!("test/fixtures/mastodon-block-activity.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("object", user.ap_id)
 
     _blocker = insert(:user, ap_id: block_data["actor"], local: false)
@@ -171,7 +171,7 @@ test "it works for incoming unblocks with an existing block" do
 
     data =
       File.read!("test/fixtures/mastodon-unblock-activity.json")
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("object", block_data)
 
     {:ok, %Activity{data: data, local: false}} = Transmogrifier.handle_incoming(data)
diff --git a/test/pleroma/web/activity_pub/transmogrifier/user_update_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/user_update_handling_test.exs
index 7c4d16db7..c62d5e139 100644
--- a/test/pleroma/web/activity_pub/transmogrifier/user_update_handling_test.exs
+++ b/test/pleroma/web/activity_pub/transmogrifier/user_update_handling_test.exs
@@ -14,7 +14,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.UserUpdateHandlingTest do
   test "it works for incoming update activities" do
     user = insert(:user, local: false)
 
-    update_data = File.read!("test/fixtures/mastodon-update.json") |> Poison.decode!()
+    update_data = File.read!("test/fixtures/mastodon-update.json") |> Jason.decode!()
 
     object =
       update_data["object"]
@@ -58,7 +58,7 @@ test "it works with alsoKnownAs" do
     {:ok, _activity} =
       "test/fixtures/mastodon-update.json"
       |> File.read!()
-      |> Poison.decode!()
+      |> Jason.decode!()
       |> Map.put("actor", actor)
       |> Map.update!("object", fn object ->
         object
@@ -82,7 +82,7 @@ test "it works with custom profile fields" do
 
     assert user.fields == []
 
-    update_data = File.read!("test/fixtures/mastodon-update.json") |> Poison.decode!()
+    update_data = File.read!("test/fixtures/mastodon-update.json") |> Jason.decode!()
 
     object =
       update_data["object"]
@@ -138,7 +138,7 @@ test "it works with custom profile fields" do
   test "it works for incoming update activities which lock the account" do
     user = insert(:user, local: false)
 
-    update_data = File.read!("test/fixtures/mastodon-update.json") |> Poison.decode!()
+    update_data = File.read!("test/fixtures/mastodon-update.json") |> Jason.decode!()
 
     object =
       update_data["object"]
diff --git a/test/pleroma/web/activity_pub/transmogrifier_test.exs b/test/pleroma/web/activity_pub/transmogrifier_test.exs
index 333bb4f9b..66ea7664a 100644
--- a/test/pleroma/web/activity_pub/transmogrifier_test.exs
+++ b/test/pleroma/web/activity_pub/transmogrifier_test.exs
@@ -31,14 +31,14 @@ test "it works for incoming unfollows with an existing follow" do
 
       follow_data =
         File.read!("test/fixtures/mastodon-follow-activity.json")
-        |> Poison.decode!()
+        |> Jason.decode!()
         |> Map.put("object", user.ap_id)
 
       {:ok, %Activity{data: _, local: false}} = Transmogrifier.handle_incoming(follow_data)
 
       data =
         File.read!("test/fixtures/mastodon-unfollow-activity.json")
-        |> Poison.decode!()
+        |> Jason.decode!()
         |> Map.put("object", follow_data)
 
       {:ok, %Activity{data: data, local: false}} = Transmogrifier.handle_incoming(data)
diff --git a/test/pleroma/web/federator_test.exs b/test/pleroma/web/federator_test.exs
index 592fdccd1..67001add7 100644
--- a/test/pleroma/web/federator_test.exs
+++ b/test/pleroma/web/federator_test.exs
@@ -164,7 +164,7 @@ test "it does not crash if MRF rejects the post" do
 
       params =
         File.read!("test/fixtures/mastodon-post-activity.json")
-        |> Poison.decode!()
+        |> Jason.decode!()
 
       assert {:ok, job} = Federator.incoming_ap_doc(params)
       assert {:error, _} = ObanHelpers.perform(job)
diff --git a/test/pleroma/web/o_auth/o_auth_controller_test.exs b/test/pleroma/web/o_auth/o_auth_controller_test.exs
index a00df8cc7..c6526d8c9 100644
--- a/test/pleroma/web/o_auth/o_auth_controller_test.exs
+++ b/test/pleroma/web/o_auth/o_auth_controller_test.exs
@@ -81,7 +81,7 @@ test "GET /oauth/prepare_request encodes parameters as `state` and redirects", %
 
       redirect_query = URI.parse(redirected_to(conn)).query
       assert %{"state" => state_param} = URI.decode_query(redirect_query)
-      assert {:ok, state_components} = Poison.decode(state_param)
+      assert {:ok, state_components} = Jason.decode(state_param)
 
       expected_client_id = app.client_id
       expected_redirect_uri = app.redirect_uris
@@ -115,7 +115,7 @@ test "with user-bound registration, GET /oauth/<provider>/callback redirects to
             "oauth_token" => "G-5a3AAAAAAAwMH9AAABaektfSM",
             "oauth_verifier" => "QZl8vUqNvXMTKpdmUnGejJxuHG75WWWs",
             "provider" => "twitter",
-            "state" => Poison.encode!(state_params)
+            "state" => Jason.encode!(state_params)
           }
         )
 
@@ -147,7 +147,7 @@ test "with user-unbound registration, GET /oauth/<provider>/callback renders reg
             "oauth_token" => "G-5a3AAAAAAAwMH9AAABaektfSM",
             "oauth_verifier" => "QZl8vUqNvXMTKpdmUnGejJxuHG75WWWs",
             "provider" => "twitter",
-            "state" => Poison.encode!(state_params)
+            "state" => Jason.encode!(state_params)
           }
         )
 
@@ -178,7 +178,7 @@ test "on authentication error, GET /oauth/<provider>/callback redirects to `redi
             "oauth_token" => "G-5a3AAAAAAAwMH9AAABaektfSM",
             "oauth_verifier" => "QZl8vUqNvXMTKpdmUnGejJxuHG75WWWs",
             "provider" => "twitter",
-            "state" => Poison.encode!(state_params)
+            "state" => Jason.encode!(state_params)
           }
         )
 
diff --git a/test/pleroma/web/streamer_test.exs b/test/pleroma/web/streamer_test.exs
index 0d89e01d0..dd210c3b5 100644
--- a/test/pleroma/web/streamer_test.exs
+++ b/test/pleroma/web/streamer_test.exs
@@ -222,7 +222,7 @@ test "it streams boosts of mastodon user in the 'user' stream", %{
 
       data =
         File.read!("test/fixtures/mastodon-announce.json")
-        |> Poison.decode!()
+        |> Jason.decode!()
         |> Map.put("object", activity.data["object"])
         |> Map.put("actor", user.ap_id)
 
diff --git a/test/support/helpers.ex b/test/support/helpers.ex
index ecd4b1e18..224034521 100644
--- a/test/support/helpers.ex
+++ b/test/support/helpers.ex
@@ -85,8 +85,8 @@ def render_json(view, template, assigns) do
         assigns = Map.new(assigns)
 
         view.render(template, assigns)
-        |> Poison.encode!()
-        |> Poison.decode!()
+        |> Jason.encode!()
+        |> Jason.decode!()
       end
 
       def stringify_keys(nil), do: nil

From 54df44d380ce6f1cb116abe96eb971158e3b50b6 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Mon, 23 Nov 2020 14:48:14 -0600
Subject: [PATCH 20/22] Fix badly formatted JSON fixtures which causes Jason to
 erroneously detect control characters

---
 test/fixtures/mastodon-delete.json       |  9 +--
 test/fixtures/osada-follow-activity.json | 76 +++++++++++-------------
 2 files changed, 39 insertions(+), 46 deletions(-)

diff --git a/test/fixtures/mastodon-delete.json b/test/fixtures/mastodon-delete.json
index 87a582002..8559f724e 100644
--- a/test/fixtures/mastodon-delete.json
+++ b/test/fixtures/mastodon-delete.json
@@ -2,12 +2,9 @@
   "type": "Delete",
   "signature": {
     "type": "RsaSignature2017",
-    "signatureValue": "cw0RlfNREf+5VdsOYcCBDrv521eiLsDTAYNHKffjF0bozhCnOh+wHkFik7WamUk$
-uEiN4L2H6vPlGRprAZGRhEwgy+A7rIFQNmLrpW5qV5UNVI/2F7kngEHqZQgbQYj9hW+5GMYmPkHdv3D72ZefGw$
-4Xa2NBLGFpAjQllfzt7kzZLKKY2DM99FdUa64I2Wj3iD04Hs23SbrUdAeuGk/c1Cg6bwGNG4vxoiwn1jikgJLA$
-NAlSGjsRGdR7LfbC7GqWWsW3cSNsLFPoU6FyALjgTrrYoHiXe0QHggw+L3yMLfzB2S/L46/VRbyb+WDKMBIXUL$
-5owmzHSi6e/ZtCI3w==",
-    "creator": "http://mastodon.example.org/users/gargron#main-key",                       "created": "2018-03-03T16:24:11Z"
+    "signatureValue": "cw0RlfNREf+5VdsOYcCBDrv521eiLsDTAYNHKffjF0bozhCnOh+wHkFik7WamUk$uEiN4L2H6vPlGRprAZGRhEwgy+A7rIFQNmLrpW5qV5UNVI/2F7kngEHqZQgbQYj9hW+5GMYmPkHdv3D72ZefGw$4Xa2NBLGFpAjQllfzt7kzZLKKY2DM99FdUa64I2Wj3iD04Hs23SbrUdAeuGk/c1Cg6bwGNG4vxoiwn1jikgJLA$NAlSGjsRGdR7LfbC7GqWWsW3cSNsLFPoU6FyALjgTrrYoHiXe0QHggw+L3yMLfzB2S/L46/VRbyb+WDKMBIXUL$5owmzHSi6e/ZtCI3w==",
+    "creator": "http://mastodon.example.org/users/gargron#main-key",
+    "created": "2018-03-03T16:24:11Z"
   },
   "object": {
     "type": "Tombstone",
diff --git a/test/fixtures/osada-follow-activity.json b/test/fixtures/osada-follow-activity.json
index b991eea36..be10ce88f 100644
--- a/test/fixtures/osada-follow-activity.json
+++ b/test/fixtures/osada-follow-activity.json
@@ -1,56 +1,52 @@
 {
-  "@context":[
+  "@context": [
     "https://www.w3.org/ns/activitystreams",
     "https://w3id.org/security/v1",
     "https://apfed.club/apschema/v1.4"
   ],
-  "id":"https://apfed.club/follow/9",
-  "type":"Follow",
-  "actor":{
-    "type":"Person",
-    "id":"https://apfed.club/channel/indio",
-    "preferredUsername":"indio",
-    "name":"Indio",
-    "updated":"2019-08-20T23:52:34Z",
-    "icon":{
-      "type":"Image",
-      "mediaType":"image/jpeg",
-      "updated":"2019-08-20T23:53:37Z",
-      "url":"https://apfed.club/photo/profile/l/2",
-      "height":300,
-      "width":300
+  "id": "https://apfed.club/follow/9",
+  "type": "Follow",
+  "actor": {
+    "type": "Person",
+    "id": "https://apfed.club/channel/indio",
+    "preferredUsername": "indio",
+    "name": "Indio",
+    "updated": "2019-08-20T23:52:34Z",
+    "icon": {
+      "type": "Image",
+      "mediaType": "image/jpeg",
+      "updated": "2019-08-20T23:53:37Z",
+      "url": "https://apfed.club/photo/profile/l/2",
+      "height": 300,
+      "width": 300
     },
-    "url":"https://apfed.club/channel/indio",
-    "inbox":"https://apfed.club/inbox/indio",
-    "outbox":"https://apfed.club/outbox/indio",
-    "followers":"https://apfed.club/followers/indio",
-    "following":"https://apfed.club/following/indio",
-    "endpoints":{
-      "sharedInbox":"https://apfed.club/inbox"
+    "url": "https://apfed.club/channel/indio",
+    "inbox": "https://apfed.club/inbox/indio",
+    "outbox": "https://apfed.club/outbox/indio",
+    "followers": "https://apfed.club/followers/indio",
+    "following": "https://apfed.club/following/indio",
+    "endpoints": {
+      "sharedInbox": "https://apfed.club/inbox"
     },
-    "publicKey":{
-      "id":"https://apfed.club/channel/indio",
-      "owner":"https://apfed.club/channel/indio",
-      "publicKeyPem":"-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA77TIR1VuSYFnmDRFGHHb\n4vaGdx9ranzRX4bfOKAqa++Ch5L4EqJpPy08RuM+NrYCYiYl4QQFDSSDXAEgb5g9\nC1TgWTfI7q/E0UBX2Vr0mU6X4i1ztv0tuQvegRjcSJ7l1AvoBs8Ip4MEJ3OPEQhB\ngJqAACB3Gnps4zi2I0yavkxUfGVKr6zKT3BxWh5hTpKC7Do+ChIrVZC2EwxND9K6
-\nsAnQHThcb5EQuvuzUQZKeS7IEOsd0JpZDmJjbfMGrAWE81pLIfEeeA2joCJiBBTO\nglDsW+juvZ+lWqJpMr2hMWpvfrFjJeUawNJCIzsLdVIZR+aKj5yy6yqoS8hkN9Ha\n1MljZpsXl+EmwcwAIqim1YeLwERCEAQ/JWbSt8pQTQbzZ6ibwQ4mchCxacrRbIVR
-\nnL59fWMBassJcbY0VwrTugm2SBsYbDjESd55UZV03Rwr8qseGTyi+hH8O7w2SIaY\nzjN6AdZiPmsh00YflzlCk8MSLOHMol1vqIUzXxU8CdXn9+KsuQdZGrTz0YKN/db4\naVwUGJatz2Tsvf7R1tJBjJfeQWOWbbn3pycLVH86LjZ83qngp9ZVnAveUnUqz0yS
-\nhe+buZ6UMsfGzbIYon2bKNlz6gYTH0YPcr+cLe+29drtt0GZiXha1agbpo4RB8zE
-\naNL2fucF5YT0yNpbd/5WoV0CAwEAAQ==\n-----END PUBLIC KEY-----\n"
+    "publicKey": {
+      "id": "https://apfed.club/channel/indio",
+      "owner": "https://apfed.club/channel/indio",
+      "publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA77TIR1VuSYFnmDRFGHHb\n4vaGdx9ranzRX4bfOKAqa++Ch5L4EqJpPy08RuM+NrYCYiYl4QQFDSSDXAEgb5g9\nC1TgWTfI7q/E0UBX2Vr0mU6X4i1ztv0tuQvegRjcSJ7l1AvoBs8Ip4MEJ3OPEQhB\ngJqAACB3Gnps4zi2I0yavkxUfGVKr6zKT3BxWh5hTpKC7Do+ChIrVZC2EwxND9K6\nsAnQHThcb5EQuvuzUQZKeS7IEOsd0JpZDmJjbfMGrAWE81pLIfEeeA2joCJiBBTO\nglDsW+juvZ+lWqJpMr2hMWpvfrFjJeUawNJCIzsLdVIZR+aKj5yy6yqoS8hkN9Ha\n1MljZpsXl+EmwcwAIqim1YeLwERCEAQ/JWbSt8pQTQbzZ6ibwQ4mchCxacrRbIVR\nnL59fWMBassJcbY0VwrTugm2SBsYbDjESd55UZV03Rwr8qseGTyi+hH8O7w2SIaY\nzjN6AdZiPmsh00YflzlCk8MSLOHMol1vqIUzXxU8CdXn9+KsuQdZGrTz0YKN/db4\naVwUGJatz2Tsvf7R1tJBjJfeQWOWbbn3pycLVH86LjZ83qngp9ZVnAveUnUqz0yS\nhe+buZ6UMsfGzbIYon2bKNlz6gYTH0YPcr+cLe+29drtt0GZiXha1agbpo4RB8zE\naNL2fucF5YT0yNpbd/5WoV0CAwEAAQ==\n-----END PUBLIC KEY-----\n"
     }
   },
-  "object":"https://pleroma.site/users/kaniini",
-  "to":[
+  "object": "https://pleroma.site/users/kaniini",
+  "to": [
     "https://pleroma.site/users/kaniini"
   ],
-  "signature":{
-    "@context":[
+  "signature": {
+    "@context": [
       "https://www.w3.org/ns/activitystreams",
       "https://w3id.org/security/v1"
     ],
-    "type":"RsaSignature2017",
-    "nonce":"52c035e0a9e81dce8b486159204e97c22637e91f75cdfad5378de91de68e9117",
-    "creator":"https://apfed.club/channel/indio/public_key_pem",
-    "created":"2019-08-22T03:38:02Z",
-    "signatureValue":"oVliRCIqNIh6yUp851dYrF0y21aHp3Rz6VkIpW1pFMWfXuzExyWSfcELpyLseeRmsw5bUu9zJkH44B4G2LiJQKA9UoEQDjrDMZBmbeUpiQqq3DVUzkrBOI8bHZ7xyJ/CjSZcNHHh0MHhSKxswyxWMGi4zIqzkAZG3vRRgoPVHdjPm00sR3B8jBLw1cjoffv+KKeM/zEUpe13gqX9qHAWHHqZepxgSWmq+EKOkRvHUPBXiEJZfXzc5uW+vZ09F3WBYmaRoy8Y0e1P29fnRLqSy7EEINdrHaGclRqoUZyiawpkgy3lWWlynesV/HiLBR7EXT79eKstxf4wfTDaPKBCfTCsOWuMWHr7Genu37ew2/t7eiBGqCwwW12ylhml/OLHgNK3LOhmRABhtfpaFZSxfDVnlXfaLpY1xekVOj2oC0FpBtnoxVKLpIcyLw6dkfSil5ANd+hl59W/bpPA8KT90ii1fSNCo3+FcwQVx0YsPznJNA60XfFuVsme7zNcOst6393e1WriZxBanFpfB63zVQc9u1fjyfktx/yiUNxIlre+sz9OCc0AACn94iRhBYh4bbzdleUOTnM7lnD4Dj2FP+xeDIP8CA8wXUeq5+9kopSp2kAmlUEyFUdg4no7naIeu1SZnopfUg56PsVCp9JHiUK1SYAyWbdC+FbUECu5CvI="
+    "type": "RsaSignature2017",
+    "nonce": "52c035e0a9e81dce8b486159204e97c22637e91f75cdfad5378de91de68e9117",
+    "creator": "https://apfed.club/channel/indio/public_key_pem",
+    "created": "2019-08-22T03:38:02Z",
+    "signatureValue": "oVliRCIqNIh6yUp851dYrF0y21aHp3Rz6VkIpW1pFMWfXuzExyWSfcELpyLseeRmsw5bUu9zJkH44B4G2LiJQKA9UoEQDjrDMZBmbeUpiQqq3DVUzkrBOI8bHZ7xyJ/CjSZcNHHh0MHhSKxswyxWMGi4zIqzkAZG3vRRgoPVHdjPm00sR3B8jBLw1cjoffv+KKeM/zEUpe13gqX9qHAWHHqZepxgSWmq+EKOkRvHUPBXiEJZfXzc5uW+vZ09F3WBYmaRoy8Y0e1P29fnRLqSy7EEINdrHaGclRqoUZyiawpkgy3lWWlynesV/HiLBR7EXT79eKstxf4wfTDaPKBCfTCsOWuMWHr7Genu37ew2/t7eiBGqCwwW12ylhml/OLHgNK3LOhmRABhtfpaFZSxfDVnlXfaLpY1xekVOj2oC0FpBtnoxVKLpIcyLw6dkfSil5ANd+hl59W/bpPA8KT90ii1fSNCo3+FcwQVx0YsPznJNA60XfFuVsme7zNcOst6393e1WriZxBanFpfB63zVQc9u1fjyfktx/yiUNxIlre+sz9OCc0AACn94iRhBYh4bbzdleUOTnM7lnD4Dj2FP+xeDIP8CA8wXUeq5+9kopSp2kAmlUEyFUdg4no7naIeu1SZnopfUg56PsVCp9JHiUK1SYAyWbdC+FbUECu5CvI="
   }
 }

From 3cfc20083ecc804713eb90cae6e4dec60d353fa5 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Wed, 25 Nov 2020 00:36:46 +0100
Subject: [PATCH 21/22] scrubbers/default: Add ruby element and it's childs

This allows to format Japanese furigana (aka ruby) notation.

Present in XHTML 1.1, HTML 5 and later. Absent in XHTML 1.0, HTML 4 and earlier.

See https://www.w3.org/TR/ruby/
---
 priv/scrubbers/default.ex | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/priv/scrubbers/default.ex b/priv/scrubbers/default.ex
index ea0480dcd..7b06994de 100644
--- a/priv/scrubbers/default.ex
+++ b/priv/scrubbers/default.ex
@@ -47,6 +47,11 @@ defmodule Pleroma.HTML.Scrubber.Default do
   Meta.allow_tag_with_these_attributes(:strong, [])
   Meta.allow_tag_with_these_attributes(:sub, [])
   Meta.allow_tag_with_these_attributes(:sup, [])
+  Meta.allow_tag_with_these_attributes(:ruby, [])
+  Meta.allow_tag_with_these_attributes(:rb, [])
+  Meta.allow_tag_with_these_attributes(:rp, [])
+  Meta.allow_tag_with_these_attributes(:rt, [])
+  Meta.allow_tag_with_these_attributes(:rtc, [])
   Meta.allow_tag_with_these_attributes(:u, [])
   Meta.allow_tag_with_these_attributes(:ul, [])
 

From 5eef4988bf968e12329e6e4ee89beccee19a66ce Mon Sep 17 00:00:00 2001
From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Tue, 24 Nov 2020 18:44:48 +0300
Subject: [PATCH 22/22] fix for elixir 1.11

load runtime configs in releases with config provider
---
 config/releases.exs                           | 31 ------------
 lib/pleroma/config/holder.ex                  | 19 ++++---
 .../config/release_runtime_provider.ex        | 50 +++++++++++++++++++
 mix.exs                                       |  3 +-
 4 files changed, 65 insertions(+), 38 deletions(-)
 delete mode 100644 config/releases.exs
 create mode 100644 lib/pleroma/config/release_runtime_provider.ex

diff --git a/config/releases.exs b/config/releases.exs
deleted file mode 100644
index 19636765f..000000000
--- a/config/releases.exs
+++ /dev/null
@@ -1,31 +0,0 @@
-import Config
-
-config :pleroma, :instance, static_dir: "/var/lib/pleroma/static"
-config :pleroma, Pleroma.Uploaders.Local, uploads: "/var/lib/pleroma/uploads"
-config :pleroma, :modules, runtime_dir: "/var/lib/pleroma/modules"
-
-config_path = System.get_env("PLEROMA_CONFIG_PATH") || "/etc/pleroma/config.exs"
-
-config :pleroma, release: true, config_path: config_path
-
-if File.exists?(config_path) do
-  import_config config_path
-else
-  warning = [
-    IO.ANSI.red(),
-    IO.ANSI.bright(),
-    "!!! #{config_path} not found! Please ensure it exists and that PLEROMA_CONFIG_PATH is unset or points to an existing file",
-    IO.ANSI.reset()
-  ]
-
-  IO.puts(warning)
-end
-
-exported_config =
-  config_path
-  |> Path.dirname()
-  |> Path.join("prod.exported_from_db.secret.exs")
-
-if File.exists?(exported_config) do
-  import_config exported_config
-end
diff --git a/lib/pleroma/config/holder.ex b/lib/pleroma/config/holder.ex
index f037d5d48..a99fc0471 100644
--- a/lib/pleroma/config/holder.ex
+++ b/lib/pleroma/config/holder.ex
@@ -9,12 +9,7 @@ defmodule Pleroma.Config.Holder do
   def save_default do
     default_config =
       if System.get_env("RELEASE_NAME") do
-        release_config =
-          [:code.root_dir(), "releases", System.get_env("RELEASE_VSN"), "releases.exs"]
-          |> Path.join()
-          |> Pleroma.Config.Loader.read()
-
-        Pleroma.Config.Loader.merge(@config, release_config)
+        Pleroma.Config.Loader.merge(@config, release_defaults())
       else
         @config
       end
@@ -32,4 +27,16 @@ def default_config(group), do: Keyword.get(get_default(), group)
   def default_config(group, key), do: get_in(get_default(), [group, key])
 
   defp get_default, do: Pleroma.Config.get(:default_config)
+
+  @spec release_defaults() :: keyword()
+  def release_defaults do
+    [
+      pleroma: [
+        {:instance, [static_dir: "/var/lib/pleroma/static"]},
+        {Pleroma.Uploaders.Local, [uploads: "/var/lib/pleroma/uploads"]},
+        {:modules, [runtime_dir: "/var/lib/pleroma/modules"]},
+        {:release, true}
+      ]
+    ]
+  end
 end
diff --git a/lib/pleroma/config/release_runtime_provider.ex b/lib/pleroma/config/release_runtime_provider.ex
new file mode 100644
index 000000000..8227195dc
--- /dev/null
+++ b/lib/pleroma/config/release_runtime_provider.ex
@@ -0,0 +1,50 @@
+defmodule Pleroma.Config.ReleaseRuntimeProvider do
+  @moduledoc """
+  Imports `runtime.exs` and `{env}.exported_from_db.secret.exs` for elixir releases.
+  """
+  @behaviour Config.Provider
+
+  @impl true
+  def init(opts), do: opts
+
+  @impl true
+  def load(config, _opts) do
+    with_defaults = Config.Reader.merge(config, Pleroma.Config.Holder.release_defaults())
+
+    config_path = System.get_env("PLEROMA_CONFIG_PATH") || "/etc/pleroma/config.exs"
+
+    with_runtime_config =
+      if File.exists?(config_path) do
+        runtime_config = Config.Reader.read!(config_path)
+
+        with_defaults
+        |> Config.Reader.merge(pleroma: [config_path: config_path])
+        |> Config.Reader.merge(runtime_config)
+      else
+        warning = [
+          IO.ANSI.red(),
+          IO.ANSI.bright(),
+          "!!! #{config_path} not found! Please ensure it exists and that PLEROMA_CONFIG_PATH is unset or points to an existing file",
+          IO.ANSI.reset()
+        ]
+
+        IO.puts(warning)
+        with_defaults
+      end
+
+    exported_config_path =
+      config_path
+      |> Path.dirname()
+      |> Path.join("prod.exported_from_db.secret.exs")
+
+    with_exported =
+      if File.exists?(exported_config_path) do
+        exported_config = Config.Reader.read!(with_runtime_config)
+        Config.Reader.merge(with_runtime_config, exported_config)
+      else
+        with_runtime_config
+      end
+
+    with_exported
+  end
+end
diff --git a/mix.exs b/mix.exs
index 36e8a936e..7f6dae813 100644
--- a/mix.exs
+++ b/mix.exs
@@ -37,7 +37,8 @@ def project do
         pleroma: [
           include_executables_for: [:unix],
           applications: [ex_syslogger: :load, syslog: :load, eldap: :transient],
-          steps: [:assemble, &put_otp_version/1, &copy_files/1, &copy_nginx_config/1]
+          steps: [:assemble, &put_otp_version/1, &copy_files/1, &copy_nginx_config/1],
+          config_providers: [{Pleroma.Config.ReleaseRuntimeProvider, nil}]
         ]
       ]
     ]