CHANGELOG.md

@@ -14,44 +14,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Removed
 
-## 2.5.2
-
-### Security
-- `/proxy` endpoint now sets a Content-Security-Policy (sandbox)
-- WebSocket endpoint now respects unauthenticated restrictions for streams of public posts
-- OEmbed HTML tags are now filtered
-
-### Changed
-- docs: Be more explicit about the level of compatibility of OTP releases
-- Set default background worker timeout to 15 minutes
-
-### Fixed
-- Atom/RSS formatting (HTML truncation, published, missing summary)
-- Remove `static_fe` pipeline for `/users/:nickname/feed`
-- Stop oban from retrying if validating errors occur when processing incoming data
-- Make sure object refetching as used by already received polls follows MRF rules
-
-### Removed
-- BREAKING: Support for passwords generated with `crypt(3)` (Gnu Social migration artifact)
-
-## 2.5.1
-
-### Added
-- Allow customizing instance languages
-
-### Fixed
-- Security: uploading HTTP endpoint can no longer create directories in the upload dir (internal APIs, like backup, still can do it.)
-- ~ character in urls in Markdown posts are handled properly
-- Exiftool upload filter will now ignore SVG files
-- Fix `block_from_stranger` setting
-- Fix rel="me"
-- Docker images will now run properly
-- Fix inproper content being cached in report content
-- Notification filter on object content will not operate on the ones that inherently have no content
-- ZWNJ and double dots in links are parsed properly for Plain-text posts
-- OTP releases will work on systems with a newer libcrypt
-- Errors when running Exiftool.ReadDescription filter will not be filled into the image description
-
 ## 2.5.0 - 2022-12-23
 
 ### Removed

Dockerfile

@@ -1,8 +1,4 @@
-ARG ELIXIR_VER=1.11.4
-ARG ERLANG_VER=24.2.1
-ARG ALPINE_VER=3.17.0
-
-FROM hexpm/elixir:${ELIXIR_VER}-erlang-${ERLANG_VER}-alpine-${ALPINE_VER} as build
+FROM elixir:1.11.4-alpine as build
 
 COPY . .
 
@@ -16,7 +12,7 @@ RUN apk add git gcc g++ musl-dev make cmake file-dev &&\
 	mkdir release &&\
 	mix release --path release
 
-FROM alpine:${ALPINE_VER}
+FROM alpine
 
 ARG BUILD_DATE
 ARG VCS_REF

changelog.d/3126.fix

@@ -1 +0,0 @@
-MediaProxy responses now return a sandbox CSP header

changelog.d/3883.fix

@@ -1 +0,0 @@
-Fix abnormal behaviour when refetching a poll

changelog.d/3891.fix

@@ -1 +0,0 @@
-OEmbed HTML tags are now filtered

changelog.d/fix-object-test.fix

@@ -1 +0,0 @@
-Correctly handle the situation when a poll has both "anyOf" and "oneOf" but one of them being empty

config/description.exs

@@ -1052,15 +1052,6 @@
         description:
           "Minimum required age (in days) for users to create account. Only used if birthday is required.",
         suggestions: [6570]
-      },
-      %{
-        key: :languages,
-        type: {:list, :string},
-        description:
-          "Languages to be exposed in /api/v1/instance. Should be in the format of BCP47 language codes.",
-        suggestions: [
-          "en"
-        ]
       }
     ]
   },

docs/installation/otp_en.md

@@ -2,16 +2,15 @@
 
 {! backend/installation/otp_vs_from_source.include !}
 
-This guide covers a installation using OTP releases as built by the Pleroma project, it is meant as a fallback to distribution packages/recipes which are the preferred installation method.  
-To install Pleroma from source, please check out the corresponding guide for your distro.
+This guide covers a installation using an OTP release. To install Pleroma from source, please check out the corresponding guide for your distro.
 
 ## Pre-requisites
-* A machine you have root access to running Debian GNU/Linux or compatible (eg. Ubuntu), or Alpine on `x86_64`, `aarch64` or `armv7l` CPU. If you are not sure what you are running see [Detecting flavour section](#detecting-flavour) below
+* A machine running Linux with GNU (e.g. Debian, Ubuntu) or musl (e.g. Alpine) libc and `x86_64`, `aarch64` or `armv7l` CPU, you have root access to. If you are not sure if it's compatible see [Detecting flavour section](#detecting-flavour) below
 * A (sub)domain pointed to the machine
 
-You will be running commands as root. If you aren't root already, please elevate your privileges by executing `sudo -i`/`su`.
+You will be running commands as root. If you aren't root already, please elevate your privileges by executing `sudo su`/`su`.
 
-Similarly to other binaries, OTP releases tend to be only compatible with the distro they are built on, as such this guide focuses only on Debian/Ubuntu and Alpine.
+While in theory OTP releases are possbile to install on any compatible machine, for the sake of simplicity this guide focuses only on Debian/Ubuntu and Alpine.
 
 ### Detecting flavour
 
@@ -20,7 +19,7 @@ Paste the following into the shell:
 arch="$(uname -m)";if [ "$arch" = "x86_64" ];then arch="amd64";elif [ "$arch" = "armv7l" ];then arch="arm";elif [ "$arch" = "aarch64" ];then arch="arm64";else echo "Unsupported arch: $arch">&2;fi;if getconf GNU_LIBC_VERSION>/dev/null;then libc_postfix="";elif [ "$(ldd 2>&1|head -c 9)" = "musl libc" ];then libc_postfix="-musl";elif [ "$(find /lib/libc.musl*|wc -l)" ];then libc_postfix="-musl";else echo "Unsupported libc">&2;fi;echo "$arch$libc_postfix"
 ```
 
-This should give your flavour string. If not this just means that we don't build releases for your platform, you can still try installing from source.
+If your platform is supported the output will contain the flavour string, you will need it later. If not, this just means that we don't build releases for your platform, you can still try installing from source.
 
 ### Installing the required packages
 

lib/pleroma/application.ex

@@ -209,8 +209,7 @@ defp cachex_children do
       build_cachex("chat_message_id_idempotency_key",
         expiration: chat_message_id_idempotency_key_expiration(),
         limit: 500_000
-      ),
-      build_cachex("rel_me", limit: 2500)
+      )
     ]
   end
 

lib/pleroma/notification.ex

@@ -178,7 +178,6 @@ defp exclude_filtered(query, user) do
         from([_n, a, o] in query,
           where:
             fragment("not(?->>'content' ~* ?)", o.data, ^regex) or
-              fragment("?->>'content' is null", o.data) or
               fragment("?->>'actor' = ?", o.data, ^user.ap_id)
         )
     end
@@ -680,7 +679,7 @@ def skip?(
     cond do
       opts[:type] == "poll" -> false
       user.ap_id == actor -> false
-      !User.following?(user, follower) -> true
+      !User.following?(follower, user) -> true
       true -> false
     end
   end

lib/pleroma/object/fetcher.ex

@@ -8,30 +8,77 @@ defmodule Pleroma.Object.Fetcher do
   alias Pleroma.Maps
   alias Pleroma.Object
   alias Pleroma.Object.Containment
+  alias Pleroma.Repo
   alias Pleroma.Signature
   alias Pleroma.Web.ActivityPub.InternalFetchActor
-  alias Pleroma.Web.ActivityPub.MRF
   alias Pleroma.Web.ActivityPub.ObjectValidator
-  alias Pleroma.Web.ActivityPub.Pipeline
   alias Pleroma.Web.ActivityPub.Transmogrifier
   alias Pleroma.Web.Federator
 
   require Logger
   require Pleroma.Constants
 
+  defp touch_changeset(changeset) do
+    updated_at =
+      NaiveDateTime.utc_now()
+      |> NaiveDateTime.truncate(:second)
+
+    Ecto.Changeset.put_change(changeset, :updated_at, updated_at)
+  end
+
+  defp maybe_reinject_internal_fields(%{data: %{} = old_data}, new_data) do
+    has_history? = fn
+      %{"formerRepresentations" => %{"orderedItems" => list}} when is_list(list) -> true
+      _ -> false
+    end
+
+    internal_fields = Map.take(old_data, Pleroma.Constants.object_internal_fields())
+
+    remote_history_exists? = has_history?.(new_data)
+
+    # If the remote history exists, we treat that as the only source of truth.
+    new_data =
+      if has_history?.(old_data) and not remote_history_exists? do
+        Map.put(new_data, "formerRepresentations", old_data["formerRepresentations"])
+      else
+        new_data
+      end
+
+    # If the remote does not have history information, we need to manage it ourselves
+    new_data =
+      if not remote_history_exists? do
+        changed? =
+          Pleroma.Constants.status_updatable_fields()
+          |> Enum.any?(fn field -> Map.get(old_data, field) != Map.get(new_data, field) end)
+
+        %{updated_object: updated_object} =
+          new_data
+          |> Object.Updater.maybe_update_history(old_data,
+            updated: changed?,
+            use_history_in_new_object?: false
+          )
+
+        updated_object
+      else
+        new_data
+      end
+
+    Map.merge(new_data, internal_fields)
+  end
+
+  defp maybe_reinject_internal_fields(_, new_data), do: new_data
+
   @spec reinject_object(struct(), map()) :: {:ok, Object.t()} | {:error, any()}
-  defp reinject_object(%Object{data: %{}} = object, new_data) do
+  defp reinject_object(%Object{data: %{"type" => "Question"}} = object, new_data) do
     Logger.debug("Reinjecting object #{new_data["id"]}")
 
-    with {:ok, new_data, _} <- ObjectValidator.validate(new_data, %{}),
-         {:ok, new_data} <- MRF.filter(new_data),
-         {:ok, new_object, _} <-
-           Object.Updater.do_update_and_invalidate_cache(
-             object,
-             new_data,
-             _touch_changeset? = true
-           ) do
-      {:ok, new_object}
+    with data <- maybe_reinject_internal_fields(object, new_data),
+         {:ok, data, _} <- ObjectValidator.validate(data, %{}),
+         changeset <- Object.change(object, %{data: data}),
+         changeset <- touch_changeset(changeset),
+         {:ok, object} <- Repo.insert_or_update(changeset),
+         {:ok, object} <- Object.set_cache(object) do
+      {:ok, object}
     else
       e ->
         Logger.error("Error while processing object: #{inspect(e)}")
@@ -39,11 +86,20 @@ defp reinject_object(%Object{data: %{}} = object, new_data) do
     end
   end
 
-  defp reinject_object(_, new_data) do
-    with {:ok, object, _} <- Pipeline.common_pipeline(new_data, local: false) do
+  defp reinject_object(%Object{} = object, new_data) do
+    Logger.debug("Reinjecting object #{new_data["id"]}")
+
+    with new_data <- Transmogrifier.fix_object(new_data),
+         data <- maybe_reinject_internal_fields(object, new_data),
+         changeset <- Object.change(object, %{data: data}),
+         changeset <- touch_changeset(changeset),
+         {:ok, object} <- Repo.insert_or_update(changeset),
+         {:ok, object} <- Object.set_cache(object) do
       {:ok, object}
     else
-      e -> e
+      e ->
+        Logger.error("Error while processing object: #{inspect(e)}")
+        {:error, e}
     end
   end
 

lib/pleroma/object/updater.ex

@@ -5,9 +5,6 @@
 defmodule Pleroma.Object.Updater do
   require Pleroma.Constants
 
-  alias Pleroma.Object
-  alias Pleroma.Repo
-
   def update_content_fields(orig_object_data, updated_object) do
     Pleroma.Constants.status_updatable_fields()
     |> Enum.reduce(
@@ -100,14 +97,12 @@ def maybe_update_history(
   end
 
   defp maybe_update_poll(to_be_updated, updated_object) do
-    choice_key = fn
-      %{"anyOf" => [_ | _]} -> "anyOf"
-      %{"oneOf" => [_ | _]} -> "oneOf"
-      _ -> nil
+    choice_key = fn data ->
+      if Map.has_key?(data, "anyOf"), do: "anyOf", else: "oneOf"
     end
 
     with true <- to_be_updated["type"] == "Question",
-         key when not is_nil(key) <- choice_key.(updated_object),
+         key <- choice_key.(updated_object),
          true <- key == choice_key.(to_be_updated),
          orig_choices <- to_be_updated[key] |> Enum.map(&Map.drop(&1, ["replies"])),
          new_choices <- updated_object[key] |> Enum.map(&Map.drop(&1, ["replies"])),
@@ -242,49 +237,4 @@ def do_with_history(object, fun) do
       {:history_items, e} -> e
     end
   end
-
-  defp maybe_touch_changeset(changeset, true) do
-    updated_at =
-      NaiveDateTime.utc_now()
-      |> NaiveDateTime.truncate(:second)
-
-    Ecto.Changeset.put_change(changeset, :updated_at, updated_at)
-  end
-
-  defp maybe_touch_changeset(changeset, _), do: changeset
-
-  def do_update_and_invalidate_cache(orig_object, updated_object, touch_changeset? \\ false) do
-    orig_object_ap_id = updated_object["id"]
-    orig_object_data = orig_object.data
-
-    %{
-      updated_data: updated_object_data,
-      updated: updated,
-      used_history_in_new_object?: used_history_in_new_object?
-    } = make_new_object_data_from_update_object(orig_object_data, updated_object)
-
-    changeset =
-      orig_object
-      |> Repo.preload(:hashtags)
-      |> Object.change(%{data: updated_object_data})
-      |> maybe_touch_changeset(touch_changeset?)
-
-    with {:ok, new_object} <- Repo.update(changeset),
-         {:ok, _} <- Object.invalid_object_cache(new_object),
-         {:ok, _} <- Object.set_cache(new_object),
-         # The metadata/utils.ex uses the object id for the cache.
-         {:ok, _} <- Pleroma.Activity.HTML.invalidate_cache_for(new_object.id) do
-      if used_history_in_new_object? do
-        with create_activity when not is_nil(create_activity) <-
-               Pleroma.Activity.get_create_by_object_ap_id(orig_object_ap_id),
-             {:ok, _} <- Pleroma.Activity.HTML.invalidate_cache_for(create_activity.id) do
-          nil
-        else
-          _ -> nil
-        end
-      end
-
-      {:ok, new_object, updated}
-    end
-  end
 end

lib/pleroma/upload/filter/exiftool/read_description.ex

@@ -33,10 +33,7 @@ defp read_when_empty(current_description, _, _) when is_binary(current_descripti
   defp read_when_empty(_, file, tag) do
     try do
       {tag_content, 0} =
-        System.cmd("exiftool", ["-b", "-s3", tag, file],
-          stderr_to_stdout: false,
-          parallelism: true
-        )
+        System.cmd("exiftool", ["-b", "-s3", tag, file], stderr_to_stdout: true, parallelism: true)
 
       tag_content = String.trim(tag_content)
 

lib/pleroma/upload/filter/exiftool/strip_location.ex

@@ -14,7 +14,6 @@ defmodule Pleroma.Upload.Filter.Exiftool.StripLocation do
   # Formats not compatible with exiftool at this time
   def filter(%Pleroma.Upload{content_type: "image/heic"}), do: {:ok, :noop}
   def filter(%Pleroma.Upload{content_type: "image/webp"}), do: {:ok, :noop}
-  def filter(%Pleroma.Upload{content_type: "image/svg" <> _}), do: {:ok, :noop}
 
   def filter(%Pleroma.Upload{tempfile: file, content_type: "image" <> _}) do
     try do

lib/pleroma/web/activity_pub/activity_pub.ex

@@ -1453,22 +1453,13 @@ def fetch_activities_bounded(
 
   @spec upload(Upload.source(), keyword()) :: {:ok, Object.t()} | {:error, any()}
   def upload(file, opts \\ []) do
-    with {:ok, data} <- Upload.store(sanitize_upload_file(file), opts) do
+    with {:ok, data} <- Upload.store(file, opts) do
       obj_data = Maps.put_if_present(data, "actor", opts[:actor])
 
       Repo.insert(%Object{data: obj_data})
     end
   end
 
-  defp sanitize_upload_file(%Plug.Upload{filename: filename} = upload) when is_binary(filename) do
-    %Plug.Upload{
-      upload
-      | filename: Path.basename(filename)
-    }
-  end
-
-  defp sanitize_upload_file(upload), do: upload
-
   @spec get_actor_url(any()) :: binary() | nil
   defp get_actor_url(url) when is_binary(url), do: url
   defp get_actor_url(%{"href" => href}) when is_binary(href), do: href

lib/pleroma/web/activity_pub/side_effects.ex

@@ -428,13 +428,37 @@ defp handle_update_object(
       end
 
     if orig_object_data["type"] in Pleroma.Constants.updatable_object_types() do
-      {:ok, _, updated} =
-        Object.Updater.do_update_and_invalidate_cache(orig_object, updated_object)
+      %{
+        updated_data: updated_object_data,
+        updated: updated,
+        used_history_in_new_object?: used_history_in_new_object?
+      } = Object.Updater.make_new_object_data_from_update_object(orig_object_data, updated_object)
 
-      if updated do
-        object
-        |> Activity.normalize()
-        |> ActivityPub.notify_and_stream()
+      changeset =
+        orig_object
+        |> Repo.preload(:hashtags)
+        |> Object.change(%{data: updated_object_data})
+
+      with {:ok, new_object} <- Repo.update(changeset),
+           {:ok, _} <- Object.invalid_object_cache(new_object),
+           {:ok, _} <- Object.set_cache(new_object),
+           # The metadata/utils.ex uses the object id for the cache.
+           {:ok, _} <- Pleroma.Activity.HTML.invalidate_cache_for(new_object.id) do
+        if used_history_in_new_object? do
+          with create_activity when not is_nil(create_activity) <-
+                 Pleroma.Activity.get_create_by_object_ap_id(orig_object_ap_id),
+               {:ok, _} <- Pleroma.Activity.HTML.invalidate_cache_for(create_activity.id) do
+            nil
+          else
+            _ -> nil
+          end
+        end
+
+        if updated do
+          object
+          |> Activity.normalize()
+          |> ActivityPub.notify_and_stream()
+        end
       end
     end
 

lib/pleroma/web/admin_api/report.ex

@@ -31,7 +31,7 @@ def extract_report_info(
 
   defp make_fake_activity(act, user) do
     %Activity{
-      id: "pleroma:fake:#{act["id"]}",
+      id: "pleroma:fake",
       data: %{
         "actor" => user.ap_id,
         "type" => "Create",

lib/pleroma/web/feed/feed_view.ex

@@ -6,6 +6,7 @@ defmodule Pleroma.Web.Feed.FeedView do
   use Phoenix.HTML
   use Pleroma.Web, :view
 
+  alias Pleroma.Formatter
   alias Pleroma.Object
   alias Pleroma.User
   alias Pleroma.Web.Gettext
@@ -71,9 +72,7 @@ def logo(user) do
 
   def last_activity(activities), do: List.last(activities)
 
-  def activity_title(%{"content" => content} = data, opts \\ %{}) do
-    summary = Map.get(data, "summary", "")
-
+  def activity_title(%{"content" => content, "summary" => summary} = data, opts \\ %{}) do
     title =
       cond do
         summary != "" -> summary
@@ -82,8 +81,9 @@ def activity_title(%{"content" => content} = data, opts \\ %{}) do
       end
 
     title
-    |> Pleroma.Web.Metadata.Utils.scrub_html_and_truncate(opts[:max_length], opts[:omission])
-    |> HtmlEntities.encode()
+    |> Pleroma.Web.Metadata.Utils.scrub_html()
+    |> Pleroma.Emoji.Formatter.demojify()
+    |> Formatter.truncate(opts[:max_length], opts[:omission])
   end
 
   def activity_description(data) do

lib/pleroma/web/mastodon_api/views/instance_view.ex

@@ -27,7 +27,7 @@ def render("show.json", _) do
       thumbnail:
         URI.merge(Pleroma.Web.Endpoint.url(), Keyword.get(instance, :instance_thumbnail))
         |> to_string,
-      languages: Keyword.get(instance, :languages, ["en"]),
+      languages: ["en"],
       registrations: Keyword.get(instance, :registrations_open),
       approval_required: Keyword.get(instance, :account_approval_required),
       # Extra (not present in Mastodon):

lib/pleroma/web/media_proxy/media_proxy_controller.ex

@@ -12,8 +12,6 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyController do
   alias Pleroma.Web.MediaProxy
   alias Plug.Conn
 
-  plug(:sandbox)
-
   def remote(conn, %{"sig" => sig64, "url" => url64}) do
     with {_, true} <- {:enabled, MediaProxy.enabled?()},
          {:ok, url} <- MediaProxy.decode_url(sig64, url64),
@@ -204,9 +202,4 @@ defp media_preview_proxy_config do
   defp media_proxy_opts do
     Config.get([:media_proxy, :proxy_opts], [])
   end
-
-  defp sandbox(conn, _params) do
-    conn
-    |> merge_resp_headers([{"content-security-policy", "sandbox;"}])
-  end
 end

lib/pleroma/web/metadata/utils.ex

@@ -30,13 +30,12 @@ def scrub_html_and_truncate(%{data: %{"content" => content}} = object) do
     |> scrub_html_and_truncate_object_field(object)
   end
 
-  def scrub_html_and_truncate(content, max_length \\ 200, omission \\ "...")
-      when is_binary(content) do
+  def scrub_html_and_truncate(content, max_length \\ 200) when is_binary(content) do
     content
     |> scrub_html
     |> Emoji.Formatter.demojify()
     |> HtmlEntities.decode()
-    |> Formatter.truncate(max_length, omission)
+    |> Formatter.truncate(max_length)
   end
 
   def scrub_html(content) when is_binary(content) do

lib/pleroma/web/plugs/authentication_plug.ex

@@ -38,6 +38,10 @@ def call(
 
   def call(conn, _), do: conn
 
+  def checkpw(password, "$6" <> _ = password_hash) do
+    :crypt.crypt(password, password_hash) == password_hash
+  end
+
   def checkpw(password, "$2" <> _ = password_hash) do
     # Handle bcrypt passwords for Mastodon migration
     Bcrypt.verify_pass(password, password_hash)
@@ -56,6 +60,10 @@ def maybe_update_password(%User{password_hash: "$2" <> _} = user, password) do
     do_update_password(user, password)
   end
 
+  def maybe_update_password(%User{password_hash: "$6" <> _} = user, password) do
+    do_update_password(user, password)
+  end
+
   def maybe_update_password(user, _), do: {:ok, user}
 
   defp do_update_password(user, password) do

lib/pleroma/web/rel_me.ex

@@ -9,13 +9,17 @@ defmodule Pleroma.Web.RelMe do
     recv_timeout: 2_000
   ]
 
-  @cachex Pleroma.Config.get([:cachex, :provider], Cachex)
-  def parse(url) when is_binary(url) do
-    @cachex.fetch!(:rel_me_cache, url, fn _ ->
-      {:commit, parse_url(url)}
-    end)
-  rescue
-    e -> {:error, "Cachex error: #{inspect(e)}"}
+  if Pleroma.Config.get(:env) == :test do
+    def parse(url) when is_binary(url), do: parse_url(url)
+  else
+    @cachex Pleroma.Config.get([:cachex, :provider], Cachex)
+    def parse(url) when is_binary(url) do
+      @cachex.fetch!(:rel_me_cache, url, fn _ ->
+        {:commit, parse_url(url)}
+      end)
+    rescue
+      e -> {:error, "Cachex error: #{inspect(e)}"}
+    end
   end
 
   def parse(_), do: {:error, "No URL provided"}

lib/pleroma/web/rich_media/parsers/o_embed.ex

@@ -6,8 +6,8 @@ defmodule Pleroma.Web.RichMedia.Parsers.OEmbed do
   def parse(html, _data) do
     with elements = [_ | _] <- get_discovery_data(html),
          oembed_url when is_binary(oembed_url) <- get_oembed_url(elements),
-         {:ok, oembed_data = %{"html" => html}} <- get_oembed_data(oembed_url) do
-      %{oembed_data | "html" => Pleroma.HTML.filter_tags(html)}
+         {:ok, oembed_data} <- get_oembed_data(oembed_url) do
+      oembed_data
     else
       _e -> %{}
     end

lib/pleroma/web/router.ex

@@ -835,7 +835,8 @@ defmodule Pleroma.Web.Router do
   end
 
   scope "/", Pleroma.Web do
-    pipe_through([:accepts_html_xml])
+    # Note: html format is supported only if static FE is enabled
+    pipe_through([:accepts_html_xml, :static_fe])
 
     get("/users/:nickname/feed", Feed.UserController, :feed, as: :user_feed)
   end

lib/pleroma/web/streamer.ex

@@ -25,7 +25,6 @@ defmodule Pleroma.Web.Streamer do
   def registry, do: @registry
 
   @public_streams ["public", "public:local", "public:media", "public:local:media"]
-  @local_streams ["public:local", "public:local:media"]
   @user_streams ["user", "user:notification", "direct", "user:pleroma_chat"]
 
   @doc "Expands and authorizes a stream, and registers the process for streaming."
@@ -42,37 +41,14 @@ def get_topic_and_add_socket(stream, user, oauth_token, params \\ %{}) do
     end
   end
 
-  defp can_access_stream(user, oauth_token, kind) do
-    with {_, true} <- {:restrict?, Config.restrict_unauthenticated_access?(:timelines, kind)},
-         {_, %User{id: user_id}, %Token{user_id: user_id}} <- {:user, user, oauth_token},
-         {_, true} <-
-           {:scopes,
-            OAuthScopesPlug.filter_descendants(["read:statuses"], oauth_token.scopes) != []} do
-      true
-    else
-      {:restrict?, _} ->
-        true
-
-      _ ->
-        false
-    end
-  end
-
   @doc "Expand and authorizes a stream"
   @spec get_topic(stream :: String.t(), User.t() | nil, Token.t() | nil, Map.t()) ::
           {:ok, topic :: String.t()} | {:error, :bad_topic}
   def get_topic(stream, user, oauth_token, params \\ %{})
 
-  # Allow all public steams if the instance allows unauthenticated access.
-  # Otherwise, only allow users with valid oauth tokens.
-  def get_topic(stream, user, oauth_token, _params) when stream in @public_streams do
-    kind = if stream in @local_streams, do: :local, else: :federated
-
-    if can_access_stream(user, oauth_token, kind) do
-      {:ok, stream}
-    else
-      {:error, :unauthorized}
-    end
+  # Allow all public steams.
+  def get_topic(stream, _user, _oauth_token, _params) when stream in @public_streams do
+    {:ok, stream}
   end
 
   # Allow all hashtags streams.
@@ -81,20 +57,12 @@ def get_topic("hashtag", _user, _oauth_token, %{"tag" => tag} = _params) do
   end
 
   # Allow remote instance streams.
-  def get_topic("public:remote", user, oauth_token, %{"instance" => instance} = _params) do
-    if can_access_stream(user, oauth_token, :federated) do
-      {:ok, "public:remote:" <> instance}
-    else
-      {:error, :unauthorized}
-    end
+  def get_topic("public:remote", _user, _oauth_token, %{"instance" => instance} = _params) do
+    {:ok, "public:remote:" <> instance}
   end
 
-  def get_topic("public:remote:media", user, oauth_token, %{"instance" => instance} = _params) do
-    if can_access_stream(user, oauth_token, :federated) do
-      {:ok, "public:remote:media:" <> instance}
-    else
-      {:error, :unauthorized}
-    end
+  def get_topic("public:remote:media", _user, _oauth_token, %{"instance" => instance} = _params) do
+    {:ok, "public:remote:media:" <> instance}
   end
 
   # Expand user streams.

lib/pleroma/web/templates/feed/feed/_activity.atom.eex

@@ -4,8 +4,8 @@
   <id><%= @data["id"] %></id>
   <title><%= activity_title(@data, Keyword.get(@feed_config, :post_title, %{})) %></title>
   <content type="html"><%= activity_description(@data) %></content>
-  <published><%= to_rfc3339(@data["published"]) %></published>
-  <updated><%= to_rfc3339(@data["published"]) %></updated>
+  <published><%= to_rfc3339(@activity.data["published"]) %></published>
+  <updated><%= to_rfc3339(@activity.data["published"]) %></updated>
   <ostatus:conversation ref="<%= activity_context(@activity) %>">
     <%= activity_context(@activity) %>
   </ostatus:conversation>

lib/pleroma/web/templates/feed/feed/_activity.rss.eex

@@ -4,7 +4,7 @@
   <guid><%= @data["id"] %></guid>
   <title><%= activity_title(@data, Keyword.get(@feed_config, :post_title, %{})) %></title>
   <description><%= activity_description(@data) %></description>
-  <pubDate><%= to_rfc2822(@data["published"]) %></pubDate>
+  <pubDate><%= to_rfc2822(@activity.data["published"]) %></pubDate>
   <ostatus:conversation ref="<%= activity_context(@activity) %>">
     <%= activity_context(@activity) %>
   </ostatus:conversation>

lib/pleroma/web/templates/feed/feed/_tag_activity.atom.eex

@@ -7,8 +7,8 @@
   <id><%= @data["id"] %></id>
   <title><%= activity_title(@data, Keyword.get(@feed_config, :post_title, %{})) %></title>
   <content type="html"><%= activity_description(@data) %></content>
-  <published><%= to_rfc3339(@data["published"]) %></published>
-  <updated><%= to_rfc3339(@data["published"]) %></updated>
+  <published><%= to_rfc3339(@activity.data["published"]) %></published>
+  <updated><%= to_rfc3339(@activity.data["published"]) %></updated>
   <ostatus:conversation ref="<%= activity_context(@activity) %>">
     <%= activity_context(@activity) %>
   </ostatus:conversation>

lib/pleroma/web/templates/feed/feed/_tag_activity.xml.eex

@@ -4,7 +4,7 @@
 
   <guid isPermalink="true"><%= activity_context(@activity) %></guid>
   <link><%= activity_context(@activity) %></link>
-  <pubDate><%= to_rfc2822(@data["published"]) %></pubDate>
+  <pubDate><%= to_rfc2822(@activity.data["published"]) %></pubDate>
 
   <description><%= activity_description(@data) %></description>
   <%= for attachment <- @data["attachment"] || [] do %>

lib/pleroma/workers/background_worker.ex

@@ -45,5 +45,5 @@ def perform(%Job{args: %{"op" => "delete_instance", "host" => host}}) do
   end
 
   @impl Oban.Worker
-  def timeout(_job), do: :timer.seconds(900)
+  def timeout(_job), do: :timer.seconds(5)
 end

lib/pleroma/workers/receiver_worker.ex

@@ -13,9 +13,6 @@ def perform(%Job{args: %{"op" => "incoming_ap_doc", "params" => params}}) do
       {:ok, res}
     else
       {:error, :origin_containment_failed} -> {:cancel, :origin_containment_failed}
-      {:error, :already_present} -> {:cancel, :already_present}
-      {:error, {:validate_object, reason}} -> {:cancel, reason}
-      {:error, {:error, {:validate, reason}}} -> {:cancel, reason}
       {:error, {:reject, reason}} -> {:cancel, reason}
       e -> e
     end

mix.exs

@@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do
   def project do
     [
       app: :pleroma,
-      version: version("2.5.2"),
+      version: version("2.5.0"),
       elixir: "~> 1.11",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: [:phoenix, :gettext] ++ Mix.compilers(),
@@ -148,8 +148,11 @@ defp deps do
       {:ex_aws, "~> 2.1.6"},
       {:ex_aws_s3, "~> 2.0"},
       {:sweet_xml, "~> 0.7.2"},
-      {:earmark, "~> 1.4.22"},
+      {:earmark, "~> 1.4.15"},
       {:bbcode_pleroma, "~> 0.2.0"},
+      {:crypt,
+       git: "https://github.com/msantos/crypt.git",
+       ref: "f75cd55325e33cbea198fb41fe41871392f8fb76"},
       {:cors_plug, "~> 2.0"},
       {:web_push_encryption, "~> 0.3.1"},
       {:swoosh, "~> 1.0"},
@@ -159,7 +162,7 @@ defp deps do
       {:floki, "~> 0.27"},
       {:timex, "~> 3.6"},
       {:ueberauth, "~> 0.4"},
-      {:linkify, "~> 0.5.3"},
+      {:linkify, "~> 0.5.2"},
       {:http_signatures, "~> 0.1.1"},
       {:telemetry, "~> 1.0.0", override: true},
       {:poolboy, "~> 1.5"},

mix.lock

@@ -21,12 +21,13 @@
   "cowlib": {:hex, :cowlib, "2.11.0", "0b9ff9c346629256c42ebe1eeb769a83c6cb771a6ee5960bd110ab0b9b872063", [:make, :rebar3], [], "hexpm", "2b3e9da0b21c4565751a6d4901c20d1b4cc25cbb7fd50d91d2ab6dd287bc86a9"},
   "credo": {:hex, :credo, "1.6.7", "323f5734350fd23a456f2688b9430e7d517afb313fbd38671b8a4449798a7854", [:mix], [{:bunt, "~> 0.2.1", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2.8", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "41e110bfb007f7eda7f897c10bf019ceab9a0b269ce79f015d54b0dcf4fc7dd3"},
   "crontab": {:hex, :crontab, "1.1.8", "2ce0e74777dfcadb28a1debbea707e58b879e6aa0ffbf9c9bb540887bce43617", [:mix], [{:ecto, "~> 1.0 or ~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}], "hexpm"},
+  "crypt": {:git, "https://github.com/msantos/crypt.git", "f75cd55325e33cbea198fb41fe41871392f8fb76", [ref: "f75cd55325e33cbea198fb41fe41871392f8fb76"]},
   "custom_base": {:hex, :custom_base, "0.2.1", "4a832a42ea0552299d81652aa0b1f775d462175293e99dfbe4d7dbaab785a706", [:mix], [], "hexpm", "8df019facc5ec9603e94f7270f1ac73ddf339f56ade76a721eaa57c1493ba463"},
   "db_connection": {:hex, :db_connection, "2.4.2", "f92e79aff2375299a16bcb069a14ee8615c3414863a6fef93156aee8e86c2ff3", [:mix], [{:connection, "~> 1.0", [hex: :connection, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "4fe53ca91b99f55ea249693a0229356a08f4d1a7931d8ffa79289b145fe83668"},
   "decimal": {:hex, :decimal, "2.0.0", "a78296e617b0f5dd4c6caf57c714431347912ffb1d0842e998e9792b5642d697", [:mix], [], "hexpm", "34666e9c55dea81013e77d9d87370fe6cb6291d1ef32f46a1600230b1d44f577"},
   "deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm", "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"},
-  "earmark": {:hex, :earmark, "1.4.22", "ea3e45c6359446dc308be0a64ce82a03260d973de7d0625a762e6d352ff57958", [:mix], [{:earmark_parser, "~> 1.4.23", [hex: :earmark_parser, repo: "hexpm", optional: false]}], "hexpm", "1caf5145665a42fd76d5317286b0c171861fb1c04f86ab103dde76868814fdfb"},
-  "earmark_parser": {:hex, :earmark_parser, "1.4.29", "149d50dcb3a93d9f3d6f3ecf18c918fb5a2d3c001b5d3305c926cddfbd33355b", [:mix], [], "hexpm", "4902af1b3eb139016aed210888748db8070b8125c2342ce3dcae4f38dcc63503"},
+  "earmark": {:hex, :earmark, "1.4.18", "618c4ff1563450d1832b7fb41dc6755e470f91a6fd4c70f350a58b14f64a7db8", [:mix], [{:earmark_parser, ">= 1.4.17", [hex: :earmark_parser, repo: "hexpm", optional: false]}], "hexpm", "57ac3b6da3958ed09c669a9b159e86377fcccda56bacde8a209fa4dcdef52560"},
+  "earmark_parser": {:hex, :earmark_parser, "1.4.17", "6f3c7e94170377ba45241d394389e800fb15adc5de51d0a3cd52ae766aafd63f", [:mix], [], "hexpm", "f93ac89c9feca61c165b264b5837bf82344d13bebc634cd575cb711e2e342023"},
   "eblurhash": {:hex, :eblurhash, "1.2.2", "7da4255aaea984b31bb71155f673257353b0e0554d0d30dcf859547e74602582", [:rebar3], [], "hexpm", "8c20ca00904de023a835a9dcb7b7762fed32264c85a80c3cafa85288e405044c"},
   "ecto": {:hex, :ecto, "3.9.2", "017db3bc786ff64271108522c01a5d3f6ba0aea5c84912cfb0dd73bf13684108", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "21466d5177e09e55289ac7eade579a642578242c7a3a9f91ad5c6583337a9d15"},
   "ecto_enum": {:hex, :ecto_enum, "1.4.0", "d14b00e04b974afc69c251632d1e49594d899067ee2b376277efd8233027aec8", [:mix], [{:ecto, ">= 3.0.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "> 3.0.0", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:mariaex, ">= 0.0.0", [hex: :mariaex, repo: "hexpm", optional: true]}, {:postgrex, ">= 0.0.0", [hex: :postgrex, repo: "hexpm", optional: true]}], "hexpm", "8fb55c087181c2b15eee406519dc22578fa60dd82c088be376d0010172764ee4"},
@@ -63,7 +64,7 @@
   "joken": {:hex, :joken, "2.3.0", "62a979c46f2c81dcb8ddc9150453b60d3757d1ac393c72bb20fc50a7b0827dc6", [:mix], [{:jose, "~> 1.10", [hex: :jose, repo: "hexpm", optional: false]}], "hexpm", "57b263a79c0ec5d536ac02d569c01e6b4de91bd1cb825625fe90eab4feb7bc1e"},
   "jose": {:hex, :jose, "1.11.1", "59da64010c69aad6cde2f5b9248b896b84472e99bd18f246085b7b9fe435dcdb", [:mix, :rebar3], [], "hexpm", "078f6c9fb3cd2f4cfafc972c814261a7d1e8d2b3685c0a76eb87e158efff1ac5"},
   "jumper": {:hex, :jumper, "1.0.1", "3c00542ef1a83532b72269fab9f0f0c82bf23a35e27d278bfd9ed0865cecabff", [:mix], [], "hexpm", "318c59078ac220e966d27af3646026db9b5a5e6703cb2aa3e26bcfaba65b7433"},
-  "linkify": {:hex, :linkify, "0.5.3", "5f8143d8f61f5ff08d3aeeff47ef6509492b4948d8f08007fbf66e4d2246a7f2", [:mix], [], "hexpm", "3ef35a1377d47c25506e07c1c005ea9d38d700699d92ee92825f024434258177"},
+  "linkify": {:hex, :linkify, "0.5.2", "fb66be139fdf1656ecb31f78a93592724d1b78d960a1b3598bd661013ea0e3c7", [:mix], [], "hexpm", "8d71ac690218d8952c90cbeb63cb8cc33738bb230d8a56d487d9447f2a5eab86"},
   "majic": {:hex, :majic, "1.0.0", "37e50648db5f5c2ff0c9fb46454d034d11596c03683807b9fb3850676ffdaab3", [:make, :mix], [{:elixir_make, "~> 0.6.1", [hex: :elixir_make, repo: "hexpm", optional: false]}, {:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}, {:nimble_pool, "~> 0.2", [hex: :nimble_pool, repo: "hexpm", optional: false]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "7905858f76650d49695f14ea55cd9aaaee0c6654fa391671d4cf305c275a0a9e"},
   "makeup": {:hex, :makeup, "1.0.5", "d5a830bc42c9800ce07dd97fa94669dfb93d3bf5fcf6ea7a0c67b2e0e4a7f26c", [:mix], [{:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "cfa158c02d3f5c0c665d0af11512fed3fba0144cf1aadee0f2ce17747fba2ca9"},
   "makeup_elixir": {:hex, :makeup_elixir, "0.14.1", "4f0e96847c63c17841d42c08107405a005a2680eb9c7ccadfd757bd31dabccfb", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "f2438b1a80eaec9ede832b5c41cd4f373b38fd7aa33e3b22d9db79e640cbde11"},

priv/static/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><script defer=defer src=/static/js/2724.e4840c73281069ba54ab.js></script><script defer=defer src=/static/js/app.8d2126d35dba9482db51.js></script><link href=/static/css/app.48e52505beba5b9ab69b.css rel=stylesheet></head><body class=hidden><noscript>To use Pleroma, please enable JavaScript.</noscript><div id=app></div><div id=modal></div><div id=popovers></body></html>
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><script defer=defer src=/static/js/9169.335214f6ab57538eae0b.js></script><script defer=defer src=/static/js/app.4c23e08cf351a54f4177.js></script><link href=/static/css/app.86977512e08af1f17d78.css rel=stylesheet></head><body class=hidden><noscript>To use Pleroma, please enable JavaScript.</noscript><div id=app></div><div id=popovers></body></html>

priv/static/static/css/1325.715a7f40cdd53f460ef4.css.map

@@ -0,0 +1 @@
+{"version":3,"file":"static/css/1325.715a7f40cdd53f460ef4.css","mappings":"AACA,uBAGE,mBAFA,aACA,YAEA,uBACA,4BACE,YACA,iBCPJ,gBACE,gBAEA,2DAEE,qBACA,iBACA,iEACE,mBAEF,mFACE,gBAKF,2CASE,8CAEA,yBAXF,2CAeI,yCAKN,sCAOE,YADA,eALA,gBACA,qBAEA,wBADA,uCAEA,YAEA,CAEA,yBATF,sCAWI,YADA,eACA,EAGF,kDACE,YACA,kBAEA,uDACE,eACA,eACA,cAKN,iCACE,aACA,mCACE,kBAGF,gDACE,aACA","sources":["webpack://pleroma_fe/./src/components/async_component_error/async_component_error.vue","webpack://pleroma_fe/./src/components/settings_modal/settings_modal.scss"],"sourcesContent":["\n.async-component-error {\n  display: flex;\n  height: 100%;\n  align-items: center;\n  justify-content: center;\n  .btn {\n    margin: .5em;\n    padding: .5em 2em;\n  }\n}\n","@import 'src/_variables.scss';\n.settings-modal {\n  overflow: hidden;\n\n  .setting-list,\n  .option-list {\n    list-style-type: none;\n    padding-left: 2em;\n    li {\n      margin-bottom: 0.5em;\n    }\n    .suboptions {\n      margin-top: 0.3em\n    }\n  }\n\n  &.peek {\n    .settings-modal-panel {\n      /* Explanation:\n       * Modal is positioned vertically centered.\n       * 100vh - 100% = Distance between modal's top+bottom boundaries and screen\n       * (100vh - 100%) / 2 = Distance between bottom (or top) boundary and screen\n       * + 100% - we move modal completely off-screen, it's top boundary touches\n       *   bottom of the screen\n       * - 50px - leaving tiny amount of space so that titlebar + tiny amount of modal is visible\n       */\n      transform: translateY(calc(((100vh - 100%) / 2 + 100%) - 50px));\n\n      @media all and (max-width: 800px) {\n        /* For mobile, the modal takes 100% of the available screen.\n           This ensures the minimized modal is always 50px above the browser bottom bar regardless of whether or not it is visible.\n        */\n        transform: translateY(calc(100% - 50px));\n      }\n    }\n  }\n\n  .settings-modal-panel {\n    overflow: hidden;\n    transition: transform;\n    transition-timing-function: ease-in-out;\n    transition-duration: 300ms;\n    width: 1000px;\n    max-width: 90vw;\n    height: 90vh;\n\n    @media all and (max-width: 800px) {\n      max-width: 100vw;\n      height: 100%;\n    }\n\n    >.panel-body {\n      height: 100%;\n      overflow-y: hidden;\n\n      .btn {\n        min-height: 2em;\n        min-width: 10em;\n        padding: 0 2em;\n      }\n    }\n  }\n\n  .settings-footer {\n    display: flex;\n    >* {\n      margin-right: 0.5em;\n    }\n\n    .extra-content {\n      display: flex;\n      flex-grow: 1;\n    }\n  }\n}\n"],"names":[],"sourceRoot":""}

priv/static/static/css/159.1d523a00378ebd68c5b3.css.map

@@ -1 +0,0 @@
-{"version":3,"file":"static/css/159.1d523a00378ebd68c5b3.css","mappings":"AAGA,gBACE,WAEA,0BACE,iBAEA,kDACE,aACA,eACA,cAEA,2DACE,aACA,cAGA,YAFA,WACA,UACA,CAEA,+DACE,YAEA,qEACE","sources":["webpack://pleroma_fe/./src/components/sticker_picker/sticker_picker.vue"],"sourcesContent":["\n@import \"../../variables\";\n\n.sticker-picker {\n  width: 100%;\n\n  .contents {\n    min-height: 250px;\n\n    .sticker-picker-content {\n      display: flex;\n      flex-wrap: wrap;\n      padding: 0 4px;\n\n      .sticker {\n        display: flex;\n        flex: 1 1 auto;\n        margin: 4px;\n        width: 56px;\n        height: 56px;\n\n        img {\n          height: 100%;\n\n          &:hover {\n            filter: drop-shadow(0 0 5px var(--accent, $fallback--link));\n          }\n        }\n      }\n    }\n  }\n}\n\n"],"names":[],"sourceRoot":""}

priv/static/static/css/5948.06d2a0d84620cba6a4fb.css.map

@@ -1 +0,0 @@
-{"version":3,"file":"static/css/5948.06d2a0d84620cba6a4fb.css","mappings":"AACA,uBAGE,mBAFA,aACA,YAEA,uBAEA,4BACE,YACA,iBCPJ,gBACE,gBAEA,2DAEE,qBACA,iBAEA,iEACE,mBAGF,mFACE,gBAIJ,sCAOE,YADA,eALA,gBACA,qBAEA,wBADA,uCAEA,YAEA,CAEA,yBATF,sCAWI,YADA,eACA,EAGF,kDACE,YACA,kBAEA,uDACE,eACA,eACA,cAKN,iCACE,aAEA,mCACE,kBAGF,gDACE,aACA,YAKF,2CASE,8CAEA,yBAXF,2CAgBI","sources":["webpack://pleroma_fe/./src/components/async_component_error/async_component_error.vue","webpack://pleroma_fe/./src/components/settings_modal/settings_modal.scss"],"sourcesContent":["\n.async-component-error {\n  display: flex;\n  height: 100%;\n  align-items: center;\n  justify-content: center;\n\n  .btn {\n    margin: 0.5em;\n    padding: 0.5em 2em;\n  }\n}\n","@import \"src/variables\";\n\n.settings-modal {\n  overflow: hidden;\n\n  .setting-list,\n  .option-list {\n    list-style-type: none;\n    padding-left: 2em;\n\n    li {\n      margin-bottom: 0.5em;\n    }\n\n    .suboptions {\n      margin-top: 0.3em;\n    }\n  }\n\n  .settings-modal-panel {\n    overflow: hidden;\n    transition: transform;\n    transition-timing-function: ease-in-out;\n    transition-duration: 300ms;\n    width: 1000px;\n    max-width: 90vw;\n    height: 90vh;\n\n    @media all and (max-width: 800px) {\n      max-width: 100vw;\n      height: 100%;\n    }\n\n    >.panel-body {\n      height: 100%;\n      overflow-y: hidden;\n\n      .btn {\n        min-height: 2em;\n        min-width: 10em;\n        padding: 0 2em;\n      }\n    }\n  }\n\n  .settings-footer {\n    display: flex;\n\n    >* {\n      margin-right: 0.5em;\n    }\n\n    .extra-content {\n      display: flex;\n      flex-grow: 1;\n    }\n  }\n\n  &.peek {\n    .settings-modal-panel {\n      /* Explanation:\n       * Modal is positioned vertically centered.\n       * 100vh - 100% = Distance between modal's top+bottom boundaries and screen\n       * (100vh - 100%) / 2 = Distance between bottom (or top) boundary and screen\n       * + 100% - we move modal completely off-screen, it's top boundary touches\n       *   bottom of the screen\n       * - 50px - leaving tiny amount of space so that titlebar + tiny amount of modal is visible\n       */\n      transform: translateY(calc(((100vh - 100%) / 2 + 100%) - 50px));\n\n      @media all and (max-width: 800px) {\n        /* For mobile, the modal takes 100% of the available screen.\n           This ensures the minimized modal is always 50px above the browser bottom\n           bar regardless of whether or not it is visible.\n        */\n        transform: translateY(calc(100% - 50px));\n      }\n    }\n  }\n}\n"],"names":[],"sourceRoot":""}

priv/static/static/css/6464.169260b661120cc50815.css.map

@@ -1 +0,0 @@
-{"version":3,"file":"static/css/6464.169260b661120cc50815.css","mappings":"AAEA,oBACE,gBAGF,yBACE,mBAAoB,CACpB,sBAAuB,CACvB,oBAAqB,CAErB,eACA,kBACA,qBAEA,wBADA,sCACA,CAEA,+BACE,eACA,iBAGF,yBAhBF,yBAqBI,aAGF,0BAxBF,yBAyBI,cAGF,kCAGE,8CACA,4CAFA,wCADA,eAGA,CAGE,iDACE,oCAKN,qCAGE,gCADA,mBADA,oBAEA,CAGF,uCAGE,eACA,2BAFA,kBADA,UAGA,CAGF,sCAWE,gDAJA,YANA,qCACA,2CAUA,oBAHA,kBACA,kBAPA,+DAEA,wBADA,uCAEA,WAEA,UAIA,CAGF,qCACE,+BAGF,wCACE,kCAGF,2CAKE,6GACE,CADF,sGADA,gBAHA,qCAEA,wBADA,kCAIE,CAIJ,qCACE,iBAGF,+BAKE,uCAEA,4CACE,YAEA,0BADA,UACA,CAGF,iDACE","sources":["webpack://pleroma_fe/./src/components/update_notification/update_notification.scss"],"sourcesContent":["@import \"src/variables\";\n\n.UpdateNotification {\n  overflow: hidden;\n}\n\n.UpdateNotificationModal {\n  --__top-fringe: 15em; // how much pleroma-tan should stick her head above\n  --__bottom-fringe: 80em; // just reserving as much as we can, number is mostly irrelevant\n  --__right-fringe: 8em;\n\n  font-size: 15px;\n  position: relative;\n  transition: transform;\n  transition-timing-function: ease-in-out;\n  transition-duration: 500ms;\n\n  .text {\n    max-width: 40em;\n    padding-left: 1em;\n  }\n\n  @media all and (max-width: 800px) {\n    /* For mobile, the modal takes 100% of the available screen.\n       This ensures the minimized modal is always 50px above the browser\n       bottom bar regardless of whether or not it is visible.\n   */\n    width: 100vw;\n  }\n\n  @media all and (max-height: 600px) {\n    display: none;\n  }\n\n  .content {\n    overflow: hidden;\n    margin-top: calc(-1 * var(--__top-fringe));\n    margin-bottom: calc(-1 * var(--__bottom-fringe));\n    margin-right: calc(-1 * var(--__right-fringe));\n\n    &.-noImage {\n      .text {\n        padding-right: var(--__right-fringe);\n      }\n    }\n  }\n\n  .panel-body {\n    border-width: 0 0 1px;\n    border-style: solid;\n    border-color: var(--border, $fallback--border);\n  }\n\n  .panel-footer {\n    z-index: 22;\n    position: relative;\n    border-width: 0;\n    grid-template-columns: auto;\n  }\n\n  .pleroma-tan {\n    object-fit: cover;\n    object-position: top;\n    transition: position, left, right, top, bottom, max-width, max-height;\n    transition-timing-function: ease-in-out;\n    transition-duration: 500ms;\n    width: 25em;\n    float: right;\n    z-index: 20;\n    position: relative;\n    shape-margin: 0.5em;\n    filter: drop-shadow(5px 5px 10px rgb(0 0 0 / 50%));\n    pointer-events: none;\n  }\n\n  .spacer-top {\n    min-height: var(--__top-fringe);\n  }\n\n  .spacer-bottom {\n    min-height: var(--__bottom-fringe);\n  }\n\n  .extra-info-group {\n    transition: max-height, padding, height;\n    transition-timing-function: ease-in;\n    transition-duration: 700ms;\n    max-height: 70vh;\n    mask:\n      linear-gradient(to top, white, transparent) bottom/100% 2px no-repeat,\n      linear-gradient(to top, white, white);\n  }\n\n  .art-credit {\n    text-align: right;\n  }\n\n  &.-peek {\n    /* Explanation:\n   * 100vh - 100% = Distance between modal's top+bottom boundaries and screen\n   * (100vh - 100%) / 2 = Distance between bottom (or top) boundary and screen\n   */\n    transform: translateY(calc(((100vh - 100%) / 2)));\n\n    .pleroma-tan {\n      float: right;\n      z-index: 10;\n      shape-image-threshold: 70%;\n    }\n\n    .extra-info-group {\n      max-height: 0;\n    }\n  }\n}\n"],"names":[],"sourceRoot":""}

priv/static/static/css/6464.2fa2e5f1fa93842c62b1.css.map

@@ -0,0 +1 @@
+{"version":3,"file":"static/css/6464.2fa2e5f1fa93842c62b1.css","mappings":"AACA,oBACE,gBAGF,yBACE,mBAAoB,CACpB,sBAAuB,CACvB,oBAAqB,CAErB,eACA,kBACA,qBAEA,wBADA,sCACA,CAEA,+BACE,eACA,iBAGF,yBAhBF,yBAoBI,aAGF,0BAvBF,yBAwBI,cAGF,kCAGE,8CACA,4CAFA,wCADA,eAGA,CAGE,iDACE,oCAKN,qCAGE,gCADA,mBADA,oBAEA,CAGF,uCAGE,eACA,2BAFA,kBADA,UAGA,CAGF,sCAWE,gDAJA,YANA,qCACA,2CAUA,oBAHA,kBACA,kBAPA,+DAEA,wBADA,uCAEA,WAEA,UAIA,CAGF,qCACE,+BAGF,wCACE,kCAGF,2CAKE,6GACE,CADF,sGADA,gBAHA,qCAEA,wBADA,kCAIE,CAIJ,qCACE,iBAGF,+BAKE,uCAEA,4CACE,YAEA,yBADA,UACA,CAGF,iDACE","sources":["webpack://pleroma_fe/./src/components/update_notification/update_notification.scss"],"sourcesContent":["@import 'src/_variables.scss';\n.UpdateNotification {\n  overflow: hidden;\n}\n\n.UpdateNotificationModal {\n  --__top-fringe: 15em; // how much pleroma-tan should stick her head above\n  --__bottom-fringe: 80em; // just reserving as much as we can, number is mostly irrelevant\n  --__right-fringe: 8em;\n\n  font-size: 15px;\n  position: relative;\n  transition: transform;\n  transition-timing-function: ease-in-out;\n  transition-duration: 500ms;\n\n  .text {\n    max-width: 40em;\n    padding-left: 1em;\n  }\n\n  @media all and (max-width: 800px) {\n    /* For mobile, the modal takes 100% of the available screen.\n    This ensures the minimized modal is always 50px above the browser bottom bar regardless of whether or not it is visible.\n   */\n    width: 100vw;\n  }\n\n  @media all and (max-height: 600px) {\n    display: none;\n  }\n\n  .content {\n    overflow: hidden;\n    margin-top: calc(-1 * var(--__top-fringe));\n    margin-bottom: calc(-1 * var(--__bottom-fringe));\n    margin-right: calc(-1 * var(--__right-fringe));\n\n    &.-noImage {\n      .text {\n        padding-right: var(--__right-fringe);\n      }\n    }\n  }\n\n  .panel-body {\n    border-width: 0 0 1px 0;\n    border-style: solid;\n    border-color: var(--border, $fallback--border);\n  }\n\n  .panel-footer {\n    z-index: 22;\n    position: relative;\n    border-width: 0;\n    grid-template-columns: auto;\n  }\n\n  .pleroma-tan {\n    object-fit: cover;\n    object-position: top;\n    transition: position, left, right, top, bottom, max-width, max-height;\n    transition-timing-function: ease-in-out;\n    transition-duration: 500ms;\n    width: 25em;\n    float: right;\n    z-index: 20;\n    position: relative;\n    shape-margin: 0.5em;\n    filter: drop-shadow(5px 5px 10px rgba(0,0,0,0.5));\n    pointer-events: none;\n  }\n\n  .spacer-top {\n    min-height: var(--__top-fringe);\n  }\n\n  .spacer-bottom {\n    min-height: var(--__bottom-fringe);\n  }\n\n  .extra-info-group {\n    transition: max-height, padding, height;\n    transition-timing-function: ease-in;\n    transition-duration: 700ms;\n    max-height: 70vh;\n    mask:\n      linear-gradient(to top, white, transparent) bottom/100% 2px no-repeat,\n      linear-gradient(to top, white, white);\n  }\n\n  .art-credit {\n    text-align: right;\n  }\n\n  &.-peek {\n  /* Explanation:\n   * 100vh - 100% = Distance between modal's top+bottom boundaries and screen\n   * (100vh - 100%) / 2 = Distance between bottom (or top) boundary and screen\n   */\n    transform: translateY(calc(((100vh - 100%) / 2)));\n\n    .pleroma-tan {\n      float: right;\n      z-index: 10;\n      shape-image-threshold: 0.7;\n    }\n\n    .extra-info-group {\n      max-height: 0;\n    }\n  }\n}\n"],"names":[],"sourceRoot":""}

priv/static/static/css/8532.88b90ac86f3060a3144e.css.map

@@ -0,0 +1 @@
+{"version":3,"file":"static/css/8532.88b90ac86f3060a3144e.css","mappings":"AAGA,gBACE,WACA,0BACE,iBACA,kDACE,aACA,eACA,cACA,2DACE,aACA,cAGA,YAFA,WACA,UACA,CACA,+DACE,YACA,qEACE","sources":["webpack://pleroma_fe/./src/components/sticker_picker/sticker_picker.vue"],"sourcesContent":["\n@import '../../_variables.scss';\n\n.sticker-picker {\n  width: 100%;\n  .contents {\n    min-height: 250px;\n    .sticker-picker-content {\n      display: flex;\n      flex-wrap: wrap;\n      padding: 0 4px;\n      .sticker {\n        display: flex;\n        flex: 1 1 auto;\n        margin: 4px;\n        width: 56px;\n        height: 56px;\n        img {\n          height: 100%;\n          &:hover {\n            filter: drop-shadow(0 0 5px var(--accent, $fallback--link));\n          }\n        }\n      }\n    }\n  }\n}\n\n"],"names":[],"sourceRoot":""}

priv/static/static/js/9169.335214f6ab57538eae0b.js.LICENSE.txt

@@ -33,6 +33,12 @@
 
 /*! (c) Andrea Giammarchi - ISC */
 
+/*! https://mths.be/punycode v1.3.2 by @mathias */
+
 /*! js-cookie v3.0.1 | MIT */
 
+/*! lozad.js - v1.16.0 - 2020-09-06
+* https://github.com/ApoorvSaxena/lozad.js
+* Copyright (c) 2020 Apoorv Saxena; Licensed MIT */
+
 /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */