/, " ")
|> HTML.strip_tags()
|> Formatter.demojify()
- |> Formatter.truncate()
+ |> Formatter.truncate(max_length)
end
def attachment_url(url) do
diff --git a/lib/pleroma/web/nodeinfo/nodeinfo.ex b/lib/pleroma/web/nodeinfo/nodeinfo.ex
deleted file mode 100644
index 8b1378917..000000000
--- a/lib/pleroma/web/nodeinfo/nodeinfo.ex
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
index f4867d05b..8c775ce24 100644
--- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
+++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
@@ -6,7 +6,6 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
use Pleroma.Web, :controller
alias Pleroma.Config
- alias Pleroma.Repo
alias Pleroma.Stats
alias Pleroma.User
alias Pleroma.Web
@@ -86,8 +85,7 @@ def raw_nodeinfo do
end
staff_accounts =
- User.moderator_user_query()
- |> Repo.all()
+ User.all_superusers()
|> Enum.map(fn u -> u.ap_id end)
mrf_user_allowlist =
diff --git a/lib/pleroma/web/oauth/authorization.ex b/lib/pleroma/web/oauth/authorization.ex
index d37c2cb83..a80543adf 100644
--- a/lib/pleroma/web/oauth/authorization.ex
+++ b/lib/pleroma/web/oauth/authorization.ex
@@ -5,10 +5,10 @@
defmodule Pleroma.Web.OAuth.Authorization do
use Ecto.Schema
- alias Pleroma.User
alias Pleroma.Repo
- alias Pleroma.Web.OAuth.Authorization
+ alias Pleroma.User
alias Pleroma.Web.OAuth.App
+ alias Pleroma.Web.OAuth.Authorization
import Ecto.Changeset
import Ecto.Query
diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex
index 7c1a3adbd..d151efe9e 100644
--- a/lib/pleroma/web/oauth/oauth_controller.ex
+++ b/lib/pleroma/web/oauth/oauth_controller.ex
@@ -5,12 +5,12 @@
defmodule Pleroma.Web.OAuth.OAuthController do
use Pleroma.Web, :controller
- alias Pleroma.Web.OAuth.Authorization
- alias Pleroma.Web.OAuth.Token
- alias Pleroma.Web.OAuth.App
alias Pleroma.Repo
alias Pleroma.User
- alias Comeonin.Pbkdf2
+ alias Pleroma.Web.Auth.Authenticator
+ alias Pleroma.Web.OAuth.App
+ alias Pleroma.Web.OAuth.Authorization
+ alias Pleroma.Web.OAuth.Token
import Pleroma.Web.ControllerHelper, only: [oauth_scopes: 2]
@@ -24,27 +24,25 @@ def authorize(conn, params) do
available_scopes = (app && app.scopes) || []
scopes = oauth_scopes(params, nil) || available_scopes
- render(conn, "show.html", %{
+ render(conn, Authenticator.auth_template(), %{
response_type: params["response_type"],
client_id: params["client_id"],
available_scopes: available_scopes,
scopes: scopes,
redirect_uri: params["redirect_uri"],
- state: params["state"]
+ state: params["state"],
+ params: params
})
end
def create_authorization(conn, %{
"authorization" =>
%{
- "name" => name,
- "password" => password,
"client_id" => client_id,
"redirect_uri" => redirect_uri
} = auth_params
}) do
- with %User{} = user <- User.get_by_nickname_or_email(name),
- true <- Pbkdf2.checkpw(password, user.password_hash),
+ with {_, {:ok, %User{} = user}} <- {:get_user, Authenticator.get_user(conn)},
%App{} = app <- Repo.get_by(App, client_id: client_id),
true <- redirect_uri in String.split(app.redirect_uris),
scopes <- oauth_scopes(auth_params, []),
@@ -53,9 +51,9 @@ def create_authorization(conn, %{
{:missing_scopes, false} <- {:missing_scopes, scopes == []},
{:auth_active, true} <- {:auth_active, User.auth_active?(user)},
{:ok, auth} <- Authorization.create_authorization(app, user, scopes) do
- # Special case: Local MastodonFE.
redirect_uri =
if redirect_uri == "." do
+ # Special case: Local MastodonFE
mastodon_api_url(conn, :login)
else
redirect_uri
@@ -97,7 +95,7 @@ def create_authorization(conn, %{
|> authorize(auth_params)
error ->
- error
+ Authenticator.handle_error(conn, error)
end
end
@@ -106,6 +104,7 @@ def token_exchange(conn, %{"grant_type" => "authorization_code"} = params) do
fixed_token = fix_padding(params["code"]),
%Authorization{} = auth <-
Repo.get_by(Authorization, token: fixed_token, app_id: app.id),
+ %User{} = user <- Repo.get(User, auth.user_id),
{:ok, token} <- Token.exchange_token(app, auth),
{:ok, inserted_at} <- DateTime.from_naive(token.inserted_at, "Etc/UTC") do
response = %{
@@ -114,7 +113,8 @@ def token_exchange(conn, %{"grant_type" => "authorization_code"} = params) do
refresh_token: token.refresh_token,
created_at: DateTime.to_unix(inserted_at),
expires_in: 60 * 10,
- scope: Enum.join(token.scopes)
+ scope: Enum.join(token.scopes, " "),
+ me: user.ap_id
}
json(conn, response)
@@ -127,11 +127,10 @@ def token_exchange(conn, %{"grant_type" => "authorization_code"} = params) do
def token_exchange(
conn,
- %{"grant_type" => "password", "username" => name, "password" => password} = params
+ %{"grant_type" => "password"} = params
) do
- with %App{} = app <- get_app_from_request(conn, params),
- %User{} = user <- User.get_by_nickname_or_email(name),
- true <- Pbkdf2.checkpw(password, user.password_hash),
+ with {_, {:ok, %User{} = user}} <- {:get_user, Authenticator.get_user(conn)},
+ %App{} = app <- get_app_from_request(conn, params),
{:auth_active, true} <- {:auth_active, User.auth_active?(user)},
scopes <- oauth_scopes(params, app.scopes),
[] <- scopes -- app.scopes,
@@ -143,7 +142,8 @@ def token_exchange(
access_token: token.token,
refresh_token: token.refresh_token,
expires_in: 60 * 10,
- scope: Enum.join(token.scopes, " ")
+ scope: Enum.join(token.scopes, " "),
+ me: user.ap_id
}
json(conn, response)
diff --git a/lib/pleroma/web/oauth/token.ex b/lib/pleroma/web/oauth/token.ex
index ca67632ba..2b074b470 100644
--- a/lib/pleroma/web/oauth/token.ex
+++ b/lib/pleroma/web/oauth/token.ex
@@ -7,11 +7,11 @@ defmodule Pleroma.Web.OAuth.Token do
import Ecto.Query
- alias Pleroma.User
alias Pleroma.Repo
- alias Pleroma.Web.OAuth.Token
+ alias Pleroma.User
alias Pleroma.Web.OAuth.App
alias Pleroma.Web.OAuth.Authorization
+ alias Pleroma.Web.OAuth.Token
schema "oauth_tokens" do
field(:token, :string)
diff --git a/lib/pleroma/web/ostatus/activity_representer.ex b/lib/pleroma/web/ostatus/activity_representer.ex
index 9e1f24bc4..1a1b74bb0 100644
--- a/lib/pleroma/web/ostatus/activity_representer.ex
+++ b/lib/pleroma/web/ostatus/activity_representer.ex
@@ -4,8 +4,8 @@
defmodule Pleroma.Web.OStatus.ActivityRepresenter do
alias Pleroma.Activity
- alias Pleroma.User
alias Pleroma.Object
+ alias Pleroma.User
alias Pleroma.Web.OStatus.UserRepresenter
require Logger
diff --git a/lib/pleroma/web/ostatus/feed_representer.ex b/lib/pleroma/web/ostatus/feed_representer.ex
index 025d4731c..b7b97e505 100644
--- a/lib/pleroma/web/ostatus/feed_representer.ex
+++ b/lib/pleroma/web/ostatus/feed_representer.ex
@@ -4,8 +4,8 @@
defmodule Pleroma.Web.OStatus.FeedRepresenter do
alias Pleroma.User
- alias Pleroma.Web.OStatus
alias Pleroma.Web.MediaProxy
+ alias Pleroma.Web.OStatus
alias Pleroma.Web.OStatus.ActivityRepresenter
alias Pleroma.Web.OStatus.UserRepresenter
diff --git a/lib/pleroma/web/ostatus/handlers/delete_handler.ex b/lib/pleroma/web/ostatus/handlers/delete_handler.ex
index 01b52f08f..b2f9f3946 100644
--- a/lib/pleroma/web/ostatus/handlers/delete_handler.ex
+++ b/lib/pleroma/web/ostatus/handlers/delete_handler.ex
@@ -4,9 +4,9 @@
defmodule Pleroma.Web.OStatus.DeleteHandler do
require Logger
- alias Pleroma.Web.XML
alias Pleroma.Object
alias Pleroma.Web.ActivityPub.ActivityPub
+ alias Pleroma.Web.XML
def handle_delete(entry, _doc \\ nil) do
with id <- XML.string_from_xpath("//id", entry),
diff --git a/lib/pleroma/web/ostatus/handlers/follow_handler.ex b/lib/pleroma/web/ostatus/handlers/follow_handler.ex
index 91ad4bc40..263d3b2dc 100644
--- a/lib/pleroma/web/ostatus/handlers/follow_handler.ex
+++ b/lib/pleroma/web/ostatus/handlers/follow_handler.ex
@@ -3,10 +3,10 @@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.OStatus.FollowHandler do
- alias Pleroma.Web.XML
- alias Pleroma.Web.OStatus
- alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.User
+ alias Pleroma.Web.ActivityPub.ActivityPub
+ alias Pleroma.Web.OStatus
+ alias Pleroma.Web.XML
def handle(entry, doc) do
with {:ok, actor} <- OStatus.find_make_or_update_user(doc),
diff --git a/lib/pleroma/web/ostatus/handlers/note_handler.ex b/lib/pleroma/web/ostatus/handlers/note_handler.ex
index c2e585cac..770a71a0a 100644
--- a/lib/pleroma/web/ostatus/handlers/note_handler.ex
+++ b/lib/pleroma/web/ostatus/handlers/note_handler.ex
@@ -4,13 +4,14 @@
defmodule Pleroma.Web.OStatus.NoteHandler do
require Logger
- alias Pleroma.Web.OStatus
- alias Pleroma.Web.XML
+
alias Pleroma.Activity
alias Pleroma.Object
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.Utils
alias Pleroma.Web.CommonAPI
+ alias Pleroma.Web.OStatus
+ alias Pleroma.Web.XML
@doc """
Get the context for this note. Uses this:
@@ -18,13 +19,13 @@ defmodule Pleroma.Web.OStatus.NoteHandler do
2. The conversation reference in the ostatus xml
3. A newly generated context id.
"""
- def get_context(entry, inReplyTo) do
+ def get_context(entry, in_reply_to) do
context =
(XML.string_from_xpath("//ostatus:conversation[1]", entry) ||
XML.string_from_xpath("//ostatus:conversation[1]/@ref", entry) || "")
|> String.trim()
- with %{data: %{"context" => context}} <- Object.get_cached_by_ap_id(inReplyTo) do
+ with %{data: %{"context" => context}} <- Object.get_cached_by_ap_id(in_reply_to) do
context
else
_e ->
@@ -87,14 +88,14 @@ def add_external_url(note, entry) do
Map.put(note, "external_url", url)
end
- def fetch_replied_to_activity(entry, inReplyTo) do
- with %Activity{} = activity <- Activity.get_create_by_object_ap_id(inReplyTo) do
+ def fetch_replied_to_activity(entry, in_reply_to) do
+ with %Activity{} = activity <- Activity.get_create_by_object_ap_id(in_reply_to) do
activity
else
_e ->
- with inReplyToHref when not is_nil(inReplyToHref) <-
+ with in_reply_to_href when not is_nil(in_reply_to_href) <-
XML.string_from_xpath("//thr:in-reply-to[1]/@href", entry),
- {:ok, [activity | _]} <- OStatus.fetch_activity_from_url(inReplyToHref) do
+ {:ok, [activity | _]} <- OStatus.fetch_activity_from_url(in_reply_to_href) do
activity
else
_e -> nil
@@ -110,11 +111,12 @@ def handle_note(entry, doc \\ nil) do
{:ok, actor} <- OStatus.find_make_or_update_user(author),
content_html <- OStatus.get_content(entry),
cw <- OStatus.get_cw(entry),
- inReplyTo <- XML.string_from_xpath("//thr:in-reply-to[1]/@ref", entry),
- inReplyToActivity <- fetch_replied_to_activity(entry, inReplyTo),
- inReplyTo <- (inReplyToActivity && inReplyToActivity.data["object"]["id"]) || inReplyTo,
+ in_reply_to <- XML.string_from_xpath("//thr:in-reply-to[1]/@ref", entry),
+ in_reply_to_activity <- fetch_replied_to_activity(entry, in_reply_to),
+ in_reply_to <-
+ (in_reply_to_activity && in_reply_to_activity.data["object"]["id"]) || in_reply_to,
attachments <- OStatus.get_attachments(entry),
- context <- get_context(entry, inReplyTo),
+ context <- get_context(entry, in_reply_to),
tags <- OStatus.get_tags(entry),
mentions <- get_mentions(entry),
to <- make_to_list(actor, mentions),
@@ -128,7 +130,7 @@ def handle_note(entry, doc \\ nil) do
context,
content_html,
attachments,
- inReplyToActivity,
+ in_reply_to_activity,
[],
cw
),
@@ -140,8 +142,8 @@ def handle_note(entry, doc \\ nil) do
# TODO: Handle this case in make_note_data
note <-
if(
- inReplyTo && !inReplyToActivity,
- do: note |> Map.put("inReplyTo", inReplyTo),
+ in_reply_to && !in_reply_to_activity,
+ do: note |> Map.put("inReplyTo", in_reply_to),
else: note
) do
ActivityPub.create(%{
diff --git a/lib/pleroma/web/ostatus/handlers/unfollow_handler.ex b/lib/pleroma/web/ostatus/handlers/unfollow_handler.ex
index c9085894d..6596ada3b 100644
--- a/lib/pleroma/web/ostatus/handlers/unfollow_handler.ex
+++ b/lib/pleroma/web/ostatus/handlers/unfollow_handler.ex
@@ -3,10 +3,10 @@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.OStatus.UnfollowHandler do
- alias Pleroma.Web.XML
- alias Pleroma.Web.OStatus
- alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.User
+ alias Pleroma.Web.ActivityPub.ActivityPub
+ alias Pleroma.Web.OStatus
+ alias Pleroma.Web.XML
def handle(entry, doc) do
with {:ok, actor} <- OStatus.find_make_or_update_user(doc),
diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex
index b4f5761ac..266f86bf4 100644
--- a/lib/pleroma/web/ostatus/ostatus.ex
+++ b/lib/pleroma/web/ostatus/ostatus.ex
@@ -9,19 +9,19 @@ defmodule Pleroma.Web.OStatus do
import Pleroma.Web.XML
require Logger
+ alias Pleroma.Activity
+ alias Pleroma.Object
alias Pleroma.Repo
alias Pleroma.User
alias Pleroma.Web
- alias Pleroma.Object
- alias Pleroma.Activity
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.Transmogrifier
+ alias Pleroma.Web.OStatus.DeleteHandler
+ alias Pleroma.Web.OStatus.FollowHandler
+ alias Pleroma.Web.OStatus.NoteHandler
+ alias Pleroma.Web.OStatus.UnfollowHandler
alias Pleroma.Web.WebFinger
alias Pleroma.Web.Websub
- alias Pleroma.Web.OStatus.FollowHandler
- alias Pleroma.Web.OStatus.UnfollowHandler
- alias Pleroma.Web.OStatus.NoteHandler
- alias Pleroma.Web.OStatus.DeleteHandler
def is_representable?(%Activity{data: data}) do
object = Object.normalize(data["object"])
diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex
index 4e963774a..0579a5f3d 100644
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
@@ -9,13 +9,13 @@ defmodule Pleroma.Web.OStatus.OStatusController do
alias Pleroma.Object
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
- alias Pleroma.Web.ActivityPub.Visibility
alias Pleroma.Web.ActivityPub.ActivityPubController
alias Pleroma.Web.ActivityPub.ObjectView
- alias Pleroma.Web.OStatus.ActivityRepresenter
- alias Pleroma.Web.OStatus.FeedRepresenter
+ alias Pleroma.Web.ActivityPub.Visibility
alias Pleroma.Web.Federator
alias Pleroma.Web.OStatus
+ alias Pleroma.Web.OStatus.ActivityRepresenter
+ alias Pleroma.Web.OStatus.FeedRepresenter
alias Pleroma.Web.XML
plug(Pleroma.Web.FederatingPlug when action in [:salmon_incoming])
diff --git a/lib/pleroma/web/push/impl.ex b/lib/pleroma/web/push/impl.ex
new file mode 100644
index 000000000..863573185
--- /dev/null
+++ b/lib/pleroma/web/push/impl.ex
@@ -0,0 +1,133 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors
-
Pleroma
+ <%= Application.get_env(:pleroma, :instance)[:name] %>
<%= render @view_module, @view_template, assigns %>
diff --git a/lib/pleroma/web/templates/o_auth/o_auth/show.html.eex b/lib/pleroma/web/templates/o_auth/o_auth/show.html.eex
index f50599bdb..161333847 100644
--- a/lib/pleroma/web/templates/o_auth/o_auth/show.html.eex
+++ b/lib/pleroma/web/templates/o_auth/o_auth/show.html.eex
@@ -6,23 +6,26 @@
<% end %>
OAuth Authorization
<%= form_for @conn, o_auth_path(@conn, :authorize), [as: "authorization"], fn f -> %>
-<%= label f, :name, "Name or email" %>
-<%= text_input f, :name %>
-
+ <%= label f, :name, "Name or email" %>
+ <%= text_input f, :name %>
+
+
+ <%= label f, :password, "Password" %>
+ <%= password_input f, :password %>
+
+
<%= hidden_input f, :client_id, value: @client_id %>
<%= hidden_input f, :response_type, value: @response_type %>
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
index e2fdedb25..320ec778c 100644
--- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
+++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@ -9,14 +9,15 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
alias Comeonin.Pbkdf2
alias Pleroma.Emoji
+ alias Pleroma.Notification
alias Pleroma.PasswordResetToken
- alias Pleroma.User
alias Pleroma.Repo
+ alias Pleroma.User
alias Pleroma.Web
+ alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.OStatus
alias Pleroma.Web.WebFinger
- alias Pleroma.Web.ActivityPub.ActivityPub
def show_password_reset(conn, %{"token" => token}) do
with %{used: false} = token <- Repo.get_by(PasswordResetToken, %{token: token}),
@@ -142,6 +143,17 @@ def do_remote_follow(%{assigns: %{user: user}} = conn, %{"user" => %{"id" => id}
end
end
+ def notifications_read(%{assigns: %{user: user}} = conn, %{"id" => notification_id}) do
+ with {:ok, _} <- Notification.read_one(user, notification_id) do
+ json(conn, %{status: "success"})
+ else
+ {:error, message} ->
+ conn
+ |> put_resp_content_type("application/json")
+ |> send_resp(403, Jason.encode!(%{"error" => message}))
+ end
+ end
+
def config(conn, _params) do
instance = Pleroma.Config.get(:instance)
instance_fe = Pleroma.Config.get(:fe)
diff --git a/lib/pleroma/web/twitter_api/representers/activity_representer.ex b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
index 192ab7334..55c612ddd 100644
--- a/lib/pleroma/web/twitter_api/representers/activity_representer.ex
+++ b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
@@ -6,247 +6,10 @@
# THIS MODULE IS DEPRECATED! DON'T USE IT!
# USE THE Pleroma.Web.TwitterAPI.Views.ActivityView MODULE!
defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
- use Pleroma.Web.TwitterAPI.Representers.BaseRepresenter
- alias Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter
- alias Pleroma.Activity
- alias Pleroma.Formatter
- alias Pleroma.HTML
- alias Pleroma.User
- alias Pleroma.Web.TwitterAPI.ActivityView
- alias Pleroma.Web.TwitterAPI.TwitterAPI
- alias Pleroma.Web.TwitterAPI.UserView
- alias Pleroma.Web.CommonAPI.Utils
- alias Pleroma.Web.MastodonAPI.StatusView
-
- defp user_by_ap_id(user_list, ap_id) do
- Enum.find(user_list, fn %{ap_id: user_id} -> ap_id == user_id end)
- end
-
- def to_map(
- %Activity{data: %{"type" => "Announce", "actor" => actor, "published" => created_at}} =
- activity,
- %{users: users, announced_activity: announced_activity} = opts
- ) do
- user = user_by_ap_id(users, actor)
- created_at = created_at |> Utils.date_to_asctime()
-
- text = "#{user.nickname} retweeted a status."
-
- announced_user = user_by_ap_id(users, announced_activity.data["actor"])
- retweeted_status = to_map(announced_activity, Map.merge(%{user: announced_user}, opts))
-
- %{
- "id" => activity.id,
- "user" => UserView.render("show.json", %{user: user, for: opts[:for]}),
- "statusnet_html" => text,
- "text" => text,
- "is_local" => activity.local,
- "is_post_verb" => false,
- "uri" => "tag:#{activity.data["id"]}:objectType=note",
- "created_at" => created_at,
- "retweeted_status" => retweeted_status,
- "statusnet_conversation_id" => conversation_id(announced_activity),
- "external_url" => activity.data["id"],
- "activity_type" => "repeat"
- }
- end
-
- def to_map(
- %Activity{data: %{"type" => "Like", "published" => created_at}} = activity,
- %{user: user, liked_activity: liked_activity} = opts
- ) do
- created_at = created_at |> Utils.date_to_asctime()
-
- text = "#{user.nickname} favorited a status."
-
- %{
- "id" => activity.id,
- "user" => UserView.render("show.json", %{user: user, for: opts[:for]}),
- "statusnet_html" => text,
- "text" => text,
- "is_local" => activity.local,
- "is_post_verb" => false,
- "uri" => "tag:#{activity.data["id"]}:objectType=Favourite",
- "created_at" => created_at,
- "in_reply_to_status_id" => liked_activity.id,
- "external_url" => activity.data["id"],
- "activity_type" => "like"
- }
- end
-
- def to_map(
- %Activity{data: %{"type" => "Follow", "object" => followed_id}} = activity,
- %{user: user} = opts
- ) do
- created_at = activity.data["published"] || DateTime.to_iso8601(activity.inserted_at)
- created_at = created_at |> Utils.date_to_asctime()
-
- followed = User.get_cached_by_ap_id(followed_id)
- text = "#{user.nickname} started following #{followed.nickname}"
-
- %{
- "id" => activity.id,
- "user" => UserView.render("show.json", %{user: user, for: opts[:for]}),
- "attentions" => [],
- "statusnet_html" => text,
- "text" => text,
- "is_local" => activity.local,
- "is_post_verb" => false,
- "created_at" => created_at,
- "in_reply_to_status_id" => nil,
- "external_url" => activity.data["id"],
- "activity_type" => "follow"
- }
- end
-
- # TODO:
- # Make this more proper. Just a placeholder to not break the frontend.
- def to_map(
- %Activity{
- data: %{"type" => "Undo", "published" => created_at, "object" => undid_activity}
- } = activity,
- %{user: user} = opts
- ) do
- created_at = created_at |> Utils.date_to_asctime()
-
- text = "#{user.nickname} undid the action at #{undid_activity["id"]}"
-
- %{
- "id" => activity.id,
- "user" => UserView.render("show.json", %{user: user, for: opts[:for]}),
- "attentions" => [],
- "statusnet_html" => text,
- "text" => text,
- "is_local" => activity.local,
- "is_post_verb" => false,
- "created_at" => created_at,
- "in_reply_to_status_id" => nil,
- "external_url" => activity.data["id"],
- "activity_type" => "undo"
- }
- end
-
- def to_map(
- %Activity{data: %{"type" => "Delete", "published" => created_at, "object" => _}} =
- activity,
- %{user: user} = opts
- ) do
- created_at = created_at |> Utils.date_to_asctime()
-
- %{
- "id" => activity.id,
- "uri" => activity.data["object"],
- "user" => UserView.render("show.json", %{user: user, for: opts[:for]}),
- "attentions" => [],
- "statusnet_html" => "deleted notice {{tag",
- "text" => "deleted notice {{tag",
- "is_local" => activity.local,
- "is_post_verb" => false,
- "created_at" => created_at,
- "in_reply_to_status_id" => nil,
- "external_url" => activity.data["id"],
- "activity_type" => "delete"
- }
- end
-
- def to_map(
- %Activity{data: %{"object" => %{"content" => _content} = object}} = activity,
- %{user: user} = opts
- ) do
- created_at = object["published"] |> Utils.date_to_asctime()
- like_count = object["like_count"] || 0
- announcement_count = object["announcement_count"] || 0
- favorited = opts[:for] && opts[:for].ap_id in (object["likes"] || [])
- repeated = opts[:for] && opts[:for].ap_id in (object["announcements"] || [])
- pinned = activity.id in user.info.pinned_activities
-
- mentions = opts[:mentioned] || []
-
- attentions =
- []
- |> Utils.maybe_notify_to_recipients(activity)
- |> Utils.maybe_notify_mentioned_recipients(activity)
- |> Enum.map(fn ap_id -> Enum.find(mentions, fn user -> ap_id == user.ap_id end) end)
- |> Enum.filter(& &1)
- |> Enum.map(fn user -> UserView.render("show.json", %{user: user, for: opts[:for]}) end)
-
- conversation_id = conversation_id(activity)
-
- tags = activity.data["object"]["tag"] || []
- possibly_sensitive = activity.data["object"]["sensitive"] || Enum.member?(tags, "nsfw")
-
- tags = if possibly_sensitive, do: Enum.uniq(["nsfw" | tags]), else: tags
-
- {_summary, content} = ActivityView.render_content(object)
-
- html =
- HTML.filter_tags(content, User.html_filter_policy(opts[:for]))
- |> Formatter.emojify(object["emoji"])
-
- attachments = object["attachment"] || []
-
- reply_parent = Activity.get_in_reply_to_activity(activity)
-
- reply_user = reply_parent && User.get_cached_by_ap_id(reply_parent.actor)
-
- summary = HTML.strip_tags(object["summary"])
-
- card =
- StatusView.render(
- "card.json",
- Pleroma.Web.RichMedia.Helpers.fetch_data_for_activity(activity)
- )
-
- %{
- "id" => activity.id,
- "uri" => activity.data["object"]["id"],
- "user" => UserView.render("show.json", %{user: user, for: opts[:for]}),
- "statusnet_html" => html,
- "text" => HTML.strip_tags(content),
- "is_local" => activity.local,
- "is_post_verb" => true,
- "created_at" => created_at,
- "in_reply_to_status_id" => object["inReplyToStatusId"],
- "in_reply_to_screen_name" => reply_user && reply_user.nickname,
- "in_reply_to_profileurl" => User.profile_url(reply_user),
- "in_reply_to_ostatus_uri" => reply_user && reply_user.ap_id,
- "in_reply_to_user_id" => reply_user && reply_user.id,
- "statusnet_conversation_id" => conversation_id,
- "attachments" => attachments |> ObjectRepresenter.enum_to_list(opts),
- "attentions" => attentions,
- "fave_num" => like_count,
- "repeat_num" => announcement_count,
- "favorited" => to_boolean(favorited),
- "repeated" => to_boolean(repeated),
- "pinned" => pinned,
- "external_url" => object["external_url"] || object["id"],
- "tags" => tags,
- "activity_type" => "post",
- "possibly_sensitive" => possibly_sensitive,
- "visibility" => Pleroma.Web.MastodonAPI.StatusView.get_visibility(object),
- "summary" => summary,
- "summary_html" => summary |> Formatter.emojify(object["emoji"]),
- "card" => card
- }
- end
-
- def conversation_id(activity) do
- with context when not is_nil(context) <- activity.data["context"] do
- TwitterAPI.context_to_conversation_id(context)
- else
- _e -> nil
- end
- end
-
- defp to_boolean(false) do
- false
- end
-
- defp to_boolean(nil) do
- false
- end
-
- defp to_boolean(_) do
- true
+ def to_map(activity, opts) do
+ Pleroma.Web.TwitterAPI.ActivityView.render(
+ "activity.json",
+ Map.put(opts, :activity, activity)
+ )
end
end
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index efdd0bf43..d57100491 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -3,16 +3,16 @@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
- alias Pleroma.UserInviteToken
- alias Pleroma.User
alias Pleroma.Activity
- alias Pleroma.Repo
- alias Pleroma.Object
- alias Pleroma.UserEmail
alias Pleroma.Mailer
+ alias Pleroma.Object
+ alias Pleroma.Repo
+ alias Pleroma.User
+ alias Pleroma.UserEmail
+ alias Pleroma.UserInviteToken
alias Pleroma.Web.ActivityPub.ActivityPub
- alias Pleroma.Web.TwitterAPI.UserView
alias Pleroma.Web.CommonAPI
+ alias Pleroma.Web.TwitterAPI.UserView
import Ecto.Query
@@ -28,28 +28,15 @@ def delete(%User{} = user, id) do
end
def follow(%User{} = follower, params) do
- with {:ok, %User{} = followed} <- get_user(params),
- {:ok, follower} <- User.maybe_direct_follow(follower, followed),
- {:ok, activity} <- ActivityPub.follow(follower, followed),
- {:ok, follower, followed} <-
- User.wait_and_refresh(
- Pleroma.Config.get([:activitypub, :follow_handshake_timeout]),
- follower,
- followed
- ) do
- {:ok, follower, followed, activity}
- else
- err -> err
+ with {:ok, %User{} = followed} <- get_user(params) do
+ CommonAPI.follow(follower, followed)
end
end
def unfollow(%User{} = follower, params) do
with {:ok, %User{} = unfollowed} <- get_user(params),
- {:ok, follower, _follow_activity} <- User.unfollow(follower, unfollowed),
- {:ok, _activity} <- ActivityPub.unfollow(follower, unfollowed) do
+ {:ok, follower} <- CommonAPI.unfollow(follower, unfollowed) do
{:ok, follower, unfollowed}
- else
- err -> err
end
end
@@ -143,7 +130,7 @@ def upload(%Plug.Upload{} = file, %User{} = user, format \\ "xml") do
end
def register_user(params) do
- tokenString = params["token"]
+ token_string = params["token"]
params = %{
nickname: params["nickname"],
@@ -180,8 +167,8 @@ def register_user(params) do
# no need to query DB if registration is open
token =
- unless registrations_open || is_nil(tokenString) do
- Repo.get_by(UserInviteToken, %{token: tokenString})
+ unless registrations_open || is_nil(token_string) do
+ Repo.get_by(UserInviteToken, %{token: token_string})
end
cond do
@@ -229,18 +216,10 @@ def password_reset(nickname_or_email) do
end
end
- def get_by_id_or_nickname(id_or_nickname) do
- if !is_integer(id_or_nickname) && :error == Integer.parse(id_or_nickname) do
- Repo.get_by(User, nickname: id_or_nickname)
- else
- Repo.get(User, id_or_nickname)
- end
- end
-
def get_user(user \\ nil, params) do
case params do
%{"user_id" => user_id} ->
- case target = get_by_id_or_nickname(user_id) do
+ case target = User.get_cached_by_nickname_or_id(user_id) do
nil ->
{:error, "No user with such user_id"}
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index 0d74c30c3..6ea0b110b 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -8,23 +8,20 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
import Pleroma.Web.ControllerHelper, only: [json_response: 3]
alias Ecto.Changeset
- alias Pleroma.Web.TwitterAPI.{TwitterAPI, UserView, ActivityView, NotificationView, TokenView}
- alias Pleroma.Web.CommonAPI
- alias Pleroma.{Repo, Activity, Object, User, Notification}
- alias Pleroma.Web.OAuth.Token
- alias Pleroma.Web.ActivityPub.ActivityPub
- alias Pleroma.Web.ActivityPub.Visibility
- alias Pleroma.Web.ActivityPub.Utils
- alias Pleroma.Web.CommonAPI
- alias Pleroma.Web.TwitterAPI.ActivityView
- alias Pleroma.Web.TwitterAPI.NotificationView
- alias Pleroma.Web.TwitterAPI.TwitterAPI
- alias Pleroma.Web.TwitterAPI.UserView
alias Pleroma.Activity
- alias Pleroma.Object
alias Pleroma.Notification
+ alias Pleroma.Object
alias Pleroma.Repo
alias Pleroma.User
+ alias Pleroma.Web.ActivityPub.ActivityPub
+ alias Pleroma.Web.ActivityPub.Visibility
+ alias Pleroma.Web.CommonAPI
+ alias Pleroma.Web.OAuth.Token
+ alias Pleroma.Web.TwitterAPI.ActivityView
+ alias Pleroma.Web.TwitterAPI.NotificationView
+ alias Pleroma.Web.TwitterAPI.TokenView
+ alias Pleroma.Web.TwitterAPI.TwitterAPI
+ alias Pleroma.Web.TwitterAPI.UserView
require Logger
@@ -167,6 +164,7 @@ def mentions_timeline(%{assigns: %{user: user}} = conn, params) do
params
|> Map.put("type", ["Create", "Announce", "Follow", "Like"])
|> Map.put("blocking_user", user)
+ |> Map.put(:visibility, ~w[unlisted public private])
activities = ActivityPub.fetch_activities([user.ap_id], params)
@@ -176,13 +174,16 @@ def mentions_timeline(%{assigns: %{user: user}} = conn, params) do
end
def dm_timeline(%{assigns: %{user: user}} = conn, params) do
- query =
- ActivityPub.fetch_activities_query(
- [user.ap_id],
- Map.merge(params, %{"type" => "Create", "user" => user, visibility: "direct"})
- )
+ params =
+ params
+ |> Map.put("type", "Create")
+ |> Map.put("blocking_user", user)
+ |> Map.put("user", user)
+ |> Map.put(:visibility, "direct")
- activities = Repo.all(query)
+ activities =
+ ActivityPub.fetch_activities_query([user.ap_id], params)
+ |> Repo.all()
conn
|> put_view(ActivityView)
@@ -586,16 +587,7 @@ def friend_requests(conn, params) do
def approve_friend_request(conn, %{"user_id" => uid} = _params) do
with followed <- conn.assigns[:user],
%User{} = follower <- Repo.get(User, uid),
- {:ok, follower} <- User.maybe_follow(follower, followed),
- %Activity{} = follow_activity <- Utils.fetch_latest_follow(follower, followed),
- {:ok, follow_activity} <- Utils.update_follow_state(follow_activity, "accept"),
- {:ok, _activity} <-
- ActivityPub.accept(%{
- to: [follower.ap_id],
- actor: followed,
- object: follow_activity.data["id"],
- type: "Accept"
- }) do
+ {:ok, follower} <- CommonAPI.accept_follow_request(follower, followed) do
conn
|> put_view(UserView)
|> render("show.json", %{user: follower, for: followed})
@@ -607,15 +599,7 @@ def approve_friend_request(conn, %{"user_id" => uid} = _params) do
def deny_friend_request(conn, %{"user_id" => uid} = _params) do
with followed <- conn.assigns[:user],
%User{} = follower <- Repo.get(User, uid),
- %Activity{} = follow_activity <- Utils.fetch_latest_follow(follower, followed),
- {:ok, follow_activity} <- Utils.update_follow_state(follow_activity, "reject"),
- {:ok, _activity} <-
- ActivityPub.reject(%{
- to: [follower.ap_id],
- actor: followed,
- object: follow_activity.data["id"],
- type: "Reject"
- }) do
+ {:ok, follower} <- CommonAPI.reject_follow_request(follower, followed) do
conn
|> put_view(UserView)
|> render("show.json", %{user: follower, for: followed})
@@ -702,7 +686,7 @@ def search(%{assigns: %{user: user}} = conn, %{"q" => _query} = params) do
end
def search_user(%{assigns: %{user: user}} = conn, %{"query" => query}) do
- users = User.search(query, true, user)
+ users = User.search(query, resolve: true, for_user: user)
conn
|> put_view(UserView)
diff --git a/lib/pleroma/web/twitter_api/views/activity_view.ex b/lib/pleroma/web/twitter_api/views/activity_view.ex
index 661022afa..4926f007e 100644
--- a/lib/pleroma/web/twitter_api/views/activity_view.ex
+++ b/lib/pleroma/web/twitter_api/views/activity_view.ex
@@ -10,12 +10,13 @@ defmodule Pleroma.Web.TwitterAPI.ActivityView do
alias Pleroma.Object
alias Pleroma.Repo
alias Pleroma.User
+ alias Pleroma.Web.CommonAPI
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MastodonAPI.StatusView
alias Pleroma.Web.TwitterAPI.ActivityView
+ alias Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter
alias Pleroma.Web.TwitterAPI.TwitterAPI
alias Pleroma.Web.TwitterAPI.UserView
- alias Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter
import Ecto.Query
require Logger
@@ -309,7 +310,8 @@ def render(
"visibility" => StatusView.get_visibility(object),
"summary" => summary,
"summary_html" => summary |> Formatter.emojify(object["emoji"]),
- "card" => card
+ "card" => card,
+ "muted" => CommonAPI.thread_muted?(user, activity) || User.mutes?(opts[:for], user)
}
end
diff --git a/lib/pleroma/web/twitter_api/views/user_view.ex b/lib/pleroma/web/twitter_api/views/user_view.ex
index df7384476..0791ed760 100644
--- a/lib/pleroma/web/twitter_api/views/user_view.ex
+++ b/lib/pleroma/web/twitter_api/views/user_view.ex
@@ -118,7 +118,7 @@ defp do_render("user.json", %{user: user = %User{}} = assigns) do
"confirmation_pending" => user_info.confirmation_pending,
"tags" => user.tags
}
- |> maybe_with_follow_request_count(user, for_user)
+ |> maybe_with_activation_status(user, for_user)
}
data =
@@ -134,13 +134,11 @@ defp do_render("user.json", %{user: user = %User{}} = assigns) do
end
end
- defp maybe_with_follow_request_count(data, %User{id: id, info: %{locked: true}} = user, %User{
- id: id
- }) do
- Map.put(data, "follow_request_count", user.info.follow_request_count)
+ defp maybe_with_activation_status(data, user, %User{info: %{is_admin: true}}) do
+ Map.put(data, "deactivated", user.info.deactivated)
end
- defp maybe_with_follow_request_count(data, _, _), do: data
+ defp maybe_with_activation_status(data, _, _), do: data
defp maybe_with_role(data, %User{id: id} = user, %User{id: id}) do
Map.merge(data, %{"role" => role(user), "show_role" => user.info.show_role})
diff --git a/lib/pleroma/web/web.ex b/lib/pleroma/web/web.ex
index 853aa2a87..66813e4dd 100644
--- a/lib/pleroma/web/web.ex
+++ b/lib/pleroma/web/web.ex
@@ -26,6 +26,12 @@ def controller do
import Plug.Conn
import Pleroma.Web.Gettext
import Pleroma.Web.Router.Helpers
+
+ plug(:set_put_layout)
+
+ defp set_put_layout(conn, _) do
+ put_layout(conn, Pleroma.Config.get(:app_layout, "app.html"))
+ end
end
end
diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger/web_finger.ex
index 5ea5ae48e..32c3455f5 100644
--- a/lib/pleroma/web/web_finger/web_finger.ex
+++ b/lib/pleroma/web/web_finger/web_finger.ex
@@ -6,11 +6,11 @@ defmodule Pleroma.Web.WebFinger do
@httpoison Application.get_env(:pleroma, :httpoison)
alias Pleroma.User
- alias Pleroma.XmlBuilder
alias Pleroma.Web
- alias Pleroma.Web.XML
- alias Pleroma.Web.Salmon
alias Pleroma.Web.OStatus
+ alias Pleroma.Web.Salmon
+ alias Pleroma.Web.XML
+ alias Pleroma.XmlBuilder
require Jason
require Logger
diff --git a/lib/pleroma/web/websub/websub.ex b/lib/pleroma/web/websub/websub.ex
index c00ec0858..3ffa6b416 100644
--- a/lib/pleroma/web/websub/websub.ex
+++ b/lib/pleroma/web/websub/websub.ex
@@ -6,14 +6,14 @@ defmodule Pleroma.Web.Websub do
alias Ecto.Changeset
alias Pleroma.Instances
alias Pleroma.Repo
- alias Pleroma.Web.Websub.WebsubServerSubscription
- alias Pleroma.Web.Websub.WebsubClientSubscription
- alias Pleroma.Web.OStatus.FeedRepresenter
- alias Pleroma.Web.XML
alias Pleroma.Web.Endpoint
- alias Pleroma.Web.OStatus
- alias Pleroma.Web.Router.Helpers
alias Pleroma.Web.Federator
+ alias Pleroma.Web.OStatus
+ alias Pleroma.Web.OStatus.FeedRepresenter
+ alias Pleroma.Web.Router.Helpers
+ alias Pleroma.Web.Websub.WebsubClientSubscription
+ alias Pleroma.Web.Websub.WebsubServerSubscription
+ alias Pleroma.Web.XML
require Logger
import Ecto.Query
@@ -200,8 +200,8 @@ def gather_feed_data(topic, getter \\ &@httpoison.get/1) do
uri when not is_nil(uri) <- XML.string_from_xpath("/feed/author[1]/uri", doc),
hub when not is_nil(hub) <- XML.string_from_xpath(~S{/feed/link[@rel="hub"]/@href}, doc) do
name = XML.string_from_xpath("/feed/author[1]/name", doc)
- preferredUsername = XML.string_from_xpath("/feed/author[1]/poco:preferredUsername", doc)
- displayName = XML.string_from_xpath("/feed/author[1]/poco:displayName", doc)
+ preferred_username = XML.string_from_xpath("/feed/author[1]/poco:preferredUsername", doc)
+ display_name = XML.string_from_xpath("/feed/author[1]/poco:displayName", doc)
avatar = OStatus.make_avatar_object(doc)
bio = XML.string_from_xpath("/feed/author[1]/summary", doc)
@@ -209,8 +209,8 @@ def gather_feed_data(topic, getter \\ &@httpoison.get/1) do
%{
"uri" => uri,
"hub" => hub,
- "nickname" => preferredUsername || name,
- "name" => displayName || name,
+ "nickname" => preferred_username || name,
+ "name" => display_name || name,
"host" => URI.parse(uri).host,
"avatar" => avatar,
"bio" => bio
diff --git a/lib/pleroma/web/websub/websub_controller.ex b/lib/pleroma/web/websub/websub_controller.ex
index ad40f1b94..9e8b48b80 100644
--- a/lib/pleroma/web/websub/websub_controller.ex
+++ b/lib/pleroma/web/websub/websub_controller.ex
@@ -7,8 +7,8 @@ defmodule Pleroma.Web.Websub.WebsubController do
alias Pleroma.Repo
alias Pleroma.User
- alias Pleroma.Web.Websub
alias Pleroma.Web.Federator
+ alias Pleroma.Web.Websub
alias Pleroma.Web.Websub.WebsubClientSubscription
require Logger
diff --git a/mix.exs b/mix.exs
index d78825769..efdf15d3a 100644
--- a/mix.exs
+++ b/mix.exs
@@ -23,11 +23,14 @@ def project do
logo: "priv/static/static/logo.png",
extras: [
"README.md",
- "docs/config.md",
- "docs/Pleroma-API.md",
"docs/Admin-API.md",
"docs/Clients.md",
- "docs/Differences-in-MastodonAPI-Responses.md"
+ "docs/config.md",
+ "docs/Custom-Emoji.md",
+ "docs/Differences-in-MastodonAPI-Responses.md",
+ "docs/Message-Rewrite-Facility-configuration.md",
+ "docs/Pleroma-API.md",
+ "docs/static_dir.md"
],
main: "readme",
output: "priv/static/doc"
@@ -55,9 +58,8 @@ defp elixirc_paths(_), do: ["lib"]
# Type `mix help deps` for examples and options.
defp deps do
[
- # Until Phoenix 1.4.1 is released
- {:phoenix, github: "phoenixframework/phoenix", branch: "v1.4"},
- {:plug_cowboy, "~> 1.0"},
+ {:phoenix, "~> 1.4.1"},
+ {:plug_cowboy, "~> 2.0"},
{:phoenix_pubsub, "~> 1.1"},
{:phoenix_ecto, "~> 3.3"},
{:postgrex, ">= 0.13.5"},
@@ -77,7 +79,7 @@ defp deps do
{:ex_aws, "~> 2.0"},
{:ex_aws_s3, "~> 2.0"},
{:earmark, "~> 1.3"},
- {:ex_machina, "~> 2.2", only: :test},
+ {:ex_machina, "~> 2.3", only: :test},
{:credo, "~> 0.9.3", only: [:dev, :test]},
{:mock, "~> 0.3.1", only: :test},
{:crypt,
@@ -90,7 +92,10 @@ defp deps do
{:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test},
{:floki, "~> 0.20.0"},
{:ex_syslogger, github: "slashmili/ex_syslogger", tag: "1.4.0"},
- {:timex, "~> 3.5"}
+ {:timex, "~> 3.5"},
+ {:auto_linker,
+ git: "https://git.pleroma.social/pleroma/auto_linker.git",
+ ref: "94193ca5f97c1f9fdf3d1469653e2d46fac34bcd"}
]
end
diff --git a/mix.lock b/mix.lock
index 5ffaedd16..f43a18564 100644
--- a/mix.lock
+++ b/mix.lock
@@ -1,4 +1,5 @@
%{
+ "auto_linker": {:git, "https://git.pleroma.social/pleroma/auto_linker.git", "94193ca5f97c1f9fdf3d1469653e2d46fac34bcd", [ref: "94193ca5f97c1f9fdf3d1469653e2d46fac34bcd"]},
"base64url": {:hex, :base64url, "0.0.1", "36a90125f5948e3afd7be97662a1504b934dd5dac78451ca6e9abf85a10286be", [:rebar], [], "hexpm"},
"bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm"},
"cachex": {:hex, :cachex, "3.0.2", "1351caa4e26e29f7d7ec1d29b53d6013f0447630bbf382b4fb5d5bad0209f203", [:mix], [{:eternal, "~> 1.2", [hex: :eternal, repo: "hexpm", optional: false]}, {:unsafe, "~> 1.0", [hex: :unsafe, repo: "hexpm", optional: false]}], "hexpm"},
@@ -8,19 +9,19 @@
"comeonin": {:hex, :comeonin, "4.1.1", "c7304fc29b45b897b34142a91122bc72757bc0c295e9e824999d5179ffc08416", [:mix], [{:argon2_elixir, "~> 1.2", [hex: :argon2_elixir, repo: "hexpm", optional: true]}, {:bcrypt_elixir, "~> 0.12.1 or ~> 1.0", [hex: :bcrypt_elixir, repo: "hexpm", optional: true]}, {:pbkdf2_elixir, "~> 0.12", [hex: :pbkdf2_elixir, repo: "hexpm", optional: true]}], "hexpm"},
"connection": {:hex, :connection, "1.0.4", "a1cae72211f0eef17705aaededacac3eb30e6625b04a6117c1b2db6ace7d5976", [:mix], [], "hexpm"},
"cors_plug": {:hex, :cors_plug, "1.5.2", "72df63c87e4f94112f458ce9d25800900cc88608c1078f0e4faddf20933eda6e", [:mix], [{:plug, "~> 1.3 or ~> 1.4 or ~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
- "cowboy": {:hex, :cowboy, "1.1.2", "61ac29ea970389a88eca5a65601460162d370a70018afe6f949a29dca91f3bb0", [:rebar3], [{:cowlib, "~> 1.0.2", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "~> 1.3.2", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm"},
- "cowlib": {:hex, :cowlib, "1.0.2", "9d769a1d062c9c3ac753096f868ca121e2730b9a377de23dec0f7e08b1df84ee", [:make], [], "hexpm"},
+ "cowboy": {:hex, :cowboy, "2.6.1", "f2e06f757c337b3b311f9437e6e072b678fcd71545a7b2865bdaa154d078593f", [:rebar3], [{:cowlib, "~> 2.7.0", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "~> 1.7.1", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm"},
+ "cowlib": {:hex, :cowlib, "2.7.0", "3ef16e77562f9855a2605900cedb15c1462d76fb1be6a32fc3ae91973ee543d2", [:rebar3], [], "hexpm"},
"credo": {:hex, :credo, "0.9.3", "76fa3e9e497ab282e0cf64b98a624aa11da702854c52c82db1bf24e54ab7c97a", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:poison, ">= 0.0.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm"},
"crypt": {:git, "https://github.com/msantos/crypt", "1f2b58927ab57e72910191a7ebaeff984382a1d3", [ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"]},
"db_connection": {:hex, :db_connection, "1.1.3", "89b30ca1ef0a3b469b1c779579590688561d586694a3ce8792985d4d7e575a61", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, repo: "hexpm", optional: false]}, {:poolboy, "~> 1.5", [hex: :poolboy, repo: "hexpm", optional: true]}, {:sbroker, "~> 1.0", [hex: :sbroker, repo: "hexpm", optional: true]}], "hexpm"},
- "decimal": {:hex, :decimal, "1.6.0", "bfd84d90ff966e1f5d4370bdd3943432d8f65f07d3bab48001aebd7030590dcc", [:mix], [], "hexpm"},
+ "decimal": {:hex, :decimal, "1.7.0", "30d6b52c88541f9a66637359ddf85016df9eb266170d53105f02e4a67e00c5aa", [:mix], [], "hexpm"},
"earmark": {:hex, :earmark, "1.3.0", "17f0c38eaafb4800f746b457313af4b2442a8c2405b49c645768680f900be603", [:mix], [], "hexpm"},
- "ecto": {:hex, :ecto, "2.2.10", "e7366dc82f48f8dd78fcbf3ab50985ceeb11cb3dc93435147c6e13f2cda0992e", [:mix], [{:db_connection, "~> 1.1", [hex: :db_connection, repo: "hexpm", optional: true]}, {:decimal, "~> 1.2", [hex: :decimal, repo: "hexpm", optional: false]}, {:mariaex, "~> 0.8.0", [hex: :mariaex, repo: "hexpm", optional: true]}, {:poison, "~> 2.2 or ~> 3.0", [hex: :poison, repo: "hexpm", optional: true]}, {:poolboy, "~> 1.5", [hex: :poolboy, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.13.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:sbroker, "~> 1.0", [hex: :sbroker, repo: "hexpm", optional: true]}], "hexpm"},
+ "ecto": {:hex, :ecto, "2.2.11", "4bb8f11718b72ba97a2696f65d247a379e739a0ecabf6a13ad1face79844791c", [:mix], [{:db_connection, "~> 1.1", [hex: :db_connection, repo: "hexpm", optional: true]}, {:decimal, "~> 1.2", [hex: :decimal, repo: "hexpm", optional: false]}, {:mariaex, "~> 0.8.0", [hex: :mariaex, repo: "hexpm", optional: true]}, {:poison, "~> 2.2 or ~> 3.0", [hex: :poison, repo: "hexpm", optional: true]}, {:poolboy, "~> 1.5", [hex: :poolboy, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.13.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:sbroker, "~> 1.0", [hex: :sbroker, repo: "hexpm", optional: true]}], "hexpm"},
"eternal": {:hex, :eternal, "1.2.0", "e2a6b6ce3b8c248f7dc31451aefca57e3bdf0e48d73ae5043229380a67614c41", [:mix], [], "hexpm"},
"ex_aws": {:hex, :ex_aws, "2.1.0", "b92651527d6c09c479f9013caa9c7331f19cba38a650590d82ebf2c6c16a1d8a", [:mix], [{:configparser_ex, "~> 2.0", [hex: :configparser_ex, repo: "hexpm", optional: true]}, {:hackney, "1.6.3 or 1.6.5 or 1.7.1 or 1.8.6 or ~> 1.9", [hex: :hackney, repo: "hexpm", optional: true]}, {:jsx, "~> 2.8", [hex: :jsx, repo: "hexpm", optional: true]}, {:poison, ">= 1.2.0", [hex: :poison, repo: "hexpm", optional: true]}, {:sweet_xml, "~> 0.6", [hex: :sweet_xml, repo: "hexpm", optional: true]}, {:xml_builder, "~> 0.1.0", [hex: :xml_builder, repo: "hexpm", optional: true]}], "hexpm"},
"ex_aws_s3": {:hex, :ex_aws_s3, "2.0.1", "9e09366e77f25d3d88c5393824e613344631be8db0d1839faca49686e99b6704", [:mix], [{:ex_aws, "~> 2.0", [hex: :ex_aws, repo: "hexpm", optional: false]}, {:sweet_xml, ">= 0.0.0", [hex: :sweet_xml, repo: "hexpm", optional: true]}], "hexpm"},
"ex_doc": {:hex, :ex_doc, "0.19.1", "519bb9c19526ca51d326c060cb1778d4a9056b190086a8c6c115828eaccea6cf", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.7", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"},
- "ex_machina": {:hex, :ex_machina, "2.2.0", "fec496331e04fc2db2a1a24fe317c12c0c4a50d2beb8ebb3531ed1f0d84be0ed", [:mix], [{:ecto, "~> 2.1", [hex: :ecto, repo: "hexpm", optional: true]}], "hexpm"},
+ "ex_machina": {:hex, :ex_machina, "2.3.0", "92a5ad0a8b10ea6314b876a99c8c9e3f25f4dde71a2a835845b136b9adaf199a", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm"},
"ex_syslogger": {:git, "https://github.com/slashmili/ex_syslogger.git", "f3963399047af17e038897c69e20d552e6899e1d", [tag: "1.4.0"]},
"floki": {:hex, :floki, "0.20.4", "be42ac911fece24b4c72f3b5846774b6e61b83fe685c2fc9d62093277fb3bc86", [:mix], [{:html_entities, "~> 0.4.0", [hex: :html_entities, repo: "hexpm", optional: false]}, {:mochiweb, "~> 2.15", [hex: :mochiweb, repo: "hexpm", optional: false]}], "hexpm"},
"gen_smtp": {:hex, :gen_smtp, "0.13.0", "11f08504c4bdd831dc520b8f84a1dce5ce624474a797394e7aafd3c29f5dcd25", [:rebar3], [], "hexpm"},
@@ -44,17 +45,17 @@
"nimble_parsec": {:hex, :nimble_parsec, "0.4.0", "ee261bb53214943679422be70f1658fff573c5d0b0a1ecd0f18738944f818efe", [:mix], [], "hexpm"},
"parse_trans": {:hex, :parse_trans, "3.3.0", "09765507a3c7590a784615cfd421d101aec25098d50b89d7aa1d66646bc571c1", [:rebar3], [], "hexpm"},
"pbkdf2_elixir": {:hex, :pbkdf2_elixir, "0.12.3", "6706a148809a29c306062862c803406e88f048277f6e85b68faf73291e820b84", [:mix], [], "hexpm"},
- "phoenix": {:git, "https://github.com/phoenixframework/phoenix.git", "ea22dc50b574178a300ecd19253443960407df93", [branch: "v1.4"]},
+ "phoenix": {:hex, :phoenix, "1.4.1", "801f9d632808657f1f7c657c8bbe624caaf2ba91429123ebe3801598aea4c3d9", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 1.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 1.0 or ~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: true]}], "hexpm"},
"phoenix_ecto": {:hex, :phoenix_ecto, "3.3.0", "702f6e164512853d29f9d20763493f2b3bcfcb44f118af2bc37bb95d0801b480", [:mix], [{:ecto, "~> 2.1", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.9", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
"phoenix_html": {:hex, :phoenix_html, "2.13.1", "fa8f034b5328e2dfa0e4131b5569379003f34bc1fafdaa84985b0b9d2f12e68b", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
"phoenix_pubsub": {:hex, :phoenix_pubsub, "1.1.1", "6668d787e602981f24f17a5fbb69cc98f8ab085114ebfac6cc36e10a90c8e93c", [:mix], [], "hexpm"},
"plug": {:hex, :plug, "1.7.2", "d7b7db7fbd755e8283b6c0a50be71ec0a3d67d9213d74422d9372effc8e87fd1", [:mix], [{:mime, "~> 1.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}], "hexpm"},
- "plug_cowboy": {:hex, :plug_cowboy, "1.0.0", "2e2a7d3409746d335f451218b8bb0858301c3de6d668c3052716c909936eb57a", [:mix], [{:cowboy, "~> 1.0", [hex: :cowboy, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
+ "plug_cowboy": {:hex, :plug_cowboy, "2.0.1", "d798f8ee5acc86b7d42dbe4450b8b0dadf665ce588236eb0a751a132417a980e", [:mix], [{:cowboy, "~> 2.5", [hex: :cowboy, repo: "hexpm", optional: false]}, {:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm"},
"plug_crypto": {:hex, :plug_crypto, "1.0.0", "18e49317d3fa343f24620ed22795ec29d4a5e602d52d1513ccea0b07d8ea7d4d", [:mix], [], "hexpm"},
"poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], [], "hexpm"},
- "poolboy": {:hex, :poolboy, "1.5.1", "6b46163901cfd0a1b43d692657ed9d7e599853b3b21b95ae5ae0a777cf9b6ca8", [:rebar], [], "hexpm"},
+ "poolboy": {:hex, :poolboy, "1.5.2", "392b007a1693a64540cead79830443abf5762f5d30cf50bc95cb2c1aaafa006b", [:rebar3], [], "hexpm"},
"postgrex": {:hex, :postgrex, "0.13.5", "3d931aba29363e1443da167a4b12f06dcd171103c424de15e5f3fc2ba3e6d9c5", [:mix], [{:connection, "~> 1.0", [hex: :connection, repo: "hexpm", optional: false]}, {:db_connection, "~> 1.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm"},
- "ranch": {:hex, :ranch, "1.3.2", "e4965a144dc9fbe70e5c077c65e73c57165416a901bd02ea899cfd95aa890986", [:rebar3], [], "hexpm"},
+ "ranch": {:hex, :ranch, "1.7.1", "6b1fab51b49196860b733a49c07604465a47bdb78aa10c1c16a3d199f7f8c881", [:rebar3], [], "hexpm"},
"ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.4", "f0eafff810d2041e93f915ef59899c923f4568f4585904d010387ed74988e77b", [:make, :mix, :rebar3], [], "hexpm"},
"swoosh": {:hex, :swoosh, "0.20.0", "9a6c13822c9815993c03b6f8fccc370fcffb3c158d9754f67b1fdee6b3a5d928", [:mix], [{:cowboy, "~> 1.0.1 or ~> 1.1 or ~> 2.4", [hex: :cowboy, repo: "hexpm", optional: true]}, {:gen_smtp, "~> 0.12", [hex: :gen_smtp, repo: "hexpm", optional: true]}, {:hackney, "~> 1.9", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mime, "~> 1.1", [hex: :mime, repo: "hexpm", optional: false]}, {:plug, "~> 1.4", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm"},
"syslog": {:git, "https://github.com/Vagabond/erlang-syslog.git", "4a6c6f2c996483e86c1320e9553f91d337bcb6aa", [tag: "1.0.5"]},
diff --git a/priv/repo/migrations/20190301101154_add_default_tags_to_user.exs b/priv/repo/migrations/20190301101154_add_default_tags_to_user.exs
new file mode 100644
index 000000000..faeb8f1c6
--- /dev/null
+++ b/priv/repo/migrations/20190301101154_add_default_tags_to_user.exs
@@ -0,0 +1,9 @@
+defmodule Pleroma.Repo.Migrations.AddDefaultTagsToUser do
+ use Ecto.Migration
+
+ def up do
+ execute "UPDATE users SET tags = array[]::varchar[] where tags IS NULL"
+ end
+
+ def down, do: :noop
+end
diff --git a/priv/repo/migrations/20190303120636_update_user_note_counters.exs b/priv/repo/migrations/20190303120636_update_user_note_counters.exs
new file mode 100644
index 000000000..54e68f7c9
--- /dev/null
+++ b/priv/repo/migrations/20190303120636_update_user_note_counters.exs
@@ -0,0 +1,41 @@
+defmodule Pleroma.Repo.Migrations.UpdateUserNoteCounters do
+ use Ecto.Migration
+
+ @public "https://www.w3.org/ns/activitystreams#Public"
+
+ def up do
+ execute """
+ WITH public_note_count AS (
+ SELECT
+ data->>'actor' AS actor,
+ count(id) AS count
+ FROM objects
+ WHERE data->>'type' = 'Note' AND (
+ data->'cc' ? '#{@public}' OR data->'to' ? '#{@public}'
+ )
+ GROUP BY data->>'actor'
+ )
+ UPDATE users AS u
+ SET "info" = jsonb_set(u.info, '{note_count}', o.count::varchar::jsonb, true)
+ FROM public_note_count AS o
+ WHERE u.ap_id = o.actor
+ """
+ end
+
+ def down do
+ execute """
+ WITH public_note_count AS (
+ SELECT
+ data->>'actor' AS actor,
+ count(id) AS count
+ FROM objects
+ WHERE data->>'type' = 'Note'
+ GROUP BY data->>'actor'
+ )
+ UPDATE users AS u
+ SET "info" = jsonb_set(u.info, '{note_count}', o.count::varchar::jsonb, true)
+ FROM public_note_count AS o
+ WHERE u.ap_id = o.actor
+ """
+ end
+end
diff --git a/priv/static/index.html b/priv/static/index.html
index e646eb873..b452db22f 100644
--- a/priv/static/index.html
+++ b/priv/static/index.html
@@ -1 +1 @@
-Pleroma
\ No newline at end of file
+Pleroma
\ No newline at end of file
diff --git a/priv/static/packs/base_polyfills.js b/priv/static/packs/base_polyfills.js
index 30ba747ee..e9785984d 100644
Binary files a/priv/static/packs/base_polyfills.js and b/priv/static/packs/base_polyfills.js differ
diff --git a/priv/static/packs/base_polyfills.js.map b/priv/static/packs/base_polyfills.js.map
index 0ccd5b07f..74b73bdf6 100644
Binary files a/priv/static/packs/base_polyfills.js.map and b/priv/static/packs/base_polyfills.js.map differ
diff --git a/priv/static/packs/common.js b/priv/static/packs/common.js
index 27f0be3b6..af76dfcfb 100644
Binary files a/priv/static/packs/common.js and b/priv/static/packs/common.js differ
diff --git a/priv/static/packs/common.js.map b/priv/static/packs/common.js.map
index a92eb326a..3954ef655 100644
Binary files a/priv/static/packs/common.js.map and b/priv/static/packs/common.js.map differ
diff --git a/priv/static/packs/containers/media_container.js b/priv/static/packs/containers/media_container.js
index 4aa63542f..b2a9c08a8 100644
Binary files a/priv/static/packs/containers/media_container.js and b/priv/static/packs/containers/media_container.js differ
diff --git a/priv/static/packs/containers/media_container.js.map b/priv/static/packs/containers/media_container.js.map
index 603083a10..4b413637e 100644
Binary files a/priv/static/packs/containers/media_container.js.map and b/priv/static/packs/containers/media_container.js.map differ
diff --git a/priv/static/packs/core/admin.js b/priv/static/packs/core/admin.js
index 5e608953b..82f4b6e15 100644
Binary files a/priv/static/packs/core/admin.js and b/priv/static/packs/core/admin.js differ
diff --git a/priv/static/packs/core/common.js b/priv/static/packs/core/common.js
index 7799308aa..0893102bf 100644
Binary files a/priv/static/packs/core/common.js and b/priv/static/packs/core/common.js differ
diff --git a/priv/static/packs/core/common.js.map b/priv/static/packs/core/common.js.map
index 4b51079a7..d701b108a 100644
Binary files a/priv/static/packs/core/common.js.map and b/priv/static/packs/core/common.js.map differ
diff --git a/priv/static/packs/core/embed.js b/priv/static/packs/core/embed.js
index 69637f0fc..1b556c608 100644
Binary files a/priv/static/packs/core/embed.js and b/priv/static/packs/core/embed.js differ
diff --git a/priv/static/packs/core/mailer.js b/priv/static/packs/core/mailer.js
index 175fa8c51..930ece3d9 100644
Binary files a/priv/static/packs/core/mailer.js and b/priv/static/packs/core/mailer.js differ
diff --git a/priv/static/packs/core/modal.js b/priv/static/packs/core/modal.js
new file mode 100644
index 000000000..75096a0a6
Binary files /dev/null and b/priv/static/packs/core/modal.js differ
diff --git a/priv/static/packs/core/modal.js.map b/priv/static/packs/core/modal.js.map
new file mode 100644
index 000000000..ec28898cc
Binary files /dev/null and b/priv/static/packs/core/modal.js.map differ
diff --git a/priv/static/packs/core/public.js b/priv/static/packs/core/public.js
index 6eb3b12ac..e20f78dc7 100644
Binary files a/priv/static/packs/core/public.js and b/priv/static/packs/core/public.js differ
diff --git a/priv/static/packs/core/public.js.map b/priv/static/packs/core/public.js.map
index afe7f333a..90a7705fc 100644
Binary files a/priv/static/packs/core/public.js.map and b/priv/static/packs/core/public.js.map differ
diff --git a/priv/static/packs/core/settings.js b/priv/static/packs/core/settings.js
index cff0cc4b7..8cc351dd7 100644
Binary files a/priv/static/packs/core/settings.js and b/priv/static/packs/core/settings.js differ
diff --git a/priv/static/packs/core/settings.js.map b/priv/static/packs/core/settings.js.map
index 3ac024523..46fbb49c9 100644
Binary files a/priv/static/packs/core/settings.js.map and b/priv/static/packs/core/settings.js.map differ
diff --git a/priv/static/packs/emoji_picker.js b/priv/static/packs/emoji_picker.js
index ed51b54cf..ad8b66971 100644
Binary files a/priv/static/packs/emoji_picker.js and b/priv/static/packs/emoji_picker.js differ
diff --git a/priv/static/packs/extra_polyfills.js b/priv/static/packs/extra_polyfills.js
index 46a81e40e..01293447f 100644
Binary files a/priv/static/packs/extra_polyfills.js and b/priv/static/packs/extra_polyfills.js differ
diff --git a/priv/static/packs/features/account_gallery.js b/priv/static/packs/features/account_gallery.js
index 202a62ec4..741f7035d 100644
Binary files a/priv/static/packs/features/account_gallery.js and b/priv/static/packs/features/account_gallery.js differ
diff --git a/priv/static/packs/features/account_timeline.js b/priv/static/packs/features/account_timeline.js
index 4d239dbb4..fab3f2330 100644
Binary files a/priv/static/packs/features/account_timeline.js and b/priv/static/packs/features/account_timeline.js differ
diff --git a/priv/static/packs/features/blocks.js b/priv/static/packs/features/blocks.js
index a6809a428..b72e98bb5 100644
Binary files a/priv/static/packs/features/blocks.js and b/priv/static/packs/features/blocks.js differ
diff --git a/priv/static/packs/features/blocks.js.map b/priv/static/packs/features/blocks.js.map
index 43c9226a6..fb6ffe4be 100644
Binary files a/priv/static/packs/features/blocks.js.map and b/priv/static/packs/features/blocks.js.map differ
diff --git a/priv/static/packs/features/community_timeline.js b/priv/static/packs/features/community_timeline.js
index 7da4c241b..cddf9db93 100644
Binary files a/priv/static/packs/features/community_timeline.js and b/priv/static/packs/features/community_timeline.js differ
diff --git a/priv/static/packs/features/compose.js b/priv/static/packs/features/compose.js
index caf52266e..a30deefbf 100644
Binary files a/priv/static/packs/features/compose.js and b/priv/static/packs/features/compose.js differ
diff --git a/priv/static/packs/features/compose.js.map b/priv/static/packs/features/compose.js.map
index 541a8c6f5..9dcf487e8 100644
Binary files a/priv/static/packs/features/compose.js.map and b/priv/static/packs/features/compose.js.map differ
diff --git a/priv/static/packs/features/direct_timeline.js b/priv/static/packs/features/direct_timeline.js
index 70229f93e..2455980c6 100644
Binary files a/priv/static/packs/features/direct_timeline.js and b/priv/static/packs/features/direct_timeline.js differ
diff --git a/priv/static/packs/features/direct_timeline.js.map b/priv/static/packs/features/direct_timeline.js.map
index 0caf2661d..3bbf993b8 100644
Binary files a/priv/static/packs/features/direct_timeline.js.map and b/priv/static/packs/features/direct_timeline.js.map differ
diff --git a/priv/static/packs/features/domain_blocks.js b/priv/static/packs/features/domain_blocks.js
index ce1ddc6d2..c5e7661bf 100644
Binary files a/priv/static/packs/features/domain_blocks.js and b/priv/static/packs/features/domain_blocks.js differ
diff --git a/priv/static/packs/features/domain_blocks.js.map b/priv/static/packs/features/domain_blocks.js.map
index f571bf5fa..100ba7f90 100644
Binary files a/priv/static/packs/features/domain_blocks.js.map and b/priv/static/packs/features/domain_blocks.js.map differ
diff --git a/priv/static/packs/features/favourited_statuses.js b/priv/static/packs/features/favourited_statuses.js
index cf6b56bea..e8e4faef6 100644
Binary files a/priv/static/packs/features/favourited_statuses.js and b/priv/static/packs/features/favourited_statuses.js differ
diff --git a/priv/static/packs/features/favourites.js b/priv/static/packs/features/favourites.js
index 2c4fe799d..1fef56f8f 100644
Binary files a/priv/static/packs/features/favourites.js and b/priv/static/packs/features/favourites.js differ
diff --git a/priv/static/packs/features/follow_requests.js b/priv/static/packs/features/follow_requests.js
index 8a89520a0..98cba183d 100644
Binary files a/priv/static/packs/features/follow_requests.js and b/priv/static/packs/features/follow_requests.js differ
diff --git a/priv/static/packs/features/follow_requests.js.map b/priv/static/packs/features/follow_requests.js.map
index 8b2d5c0a3..5c39f2963 100644
Binary files a/priv/static/packs/features/follow_requests.js.map and b/priv/static/packs/features/follow_requests.js.map differ
diff --git a/priv/static/packs/features/followers.js b/priv/static/packs/features/followers.js
index 7bf90a7b3..7e4c1f999 100644
Binary files a/priv/static/packs/features/followers.js and b/priv/static/packs/features/followers.js differ
diff --git a/priv/static/packs/features/following.js b/priv/static/packs/features/following.js
index 9a61e75ca..a4b086a1c 100644
Binary files a/priv/static/packs/features/following.js and b/priv/static/packs/features/following.js differ
diff --git a/priv/static/packs/features/generic_not_found.js b/priv/static/packs/features/generic_not_found.js
index ebd0230b2..cf80056b5 100644
Binary files a/priv/static/packs/features/generic_not_found.js and b/priv/static/packs/features/generic_not_found.js differ
diff --git a/priv/static/packs/features/getting_started.js b/priv/static/packs/features/getting_started.js
index d2befe6fd..51c211d69 100644
Binary files a/priv/static/packs/features/getting_started.js and b/priv/static/packs/features/getting_started.js differ
diff --git a/priv/static/packs/features/getting_started.js.map b/priv/static/packs/features/getting_started.js.map
index 8c04c3c6a..eb53e5a7d 100644
Binary files a/priv/static/packs/features/getting_started.js.map and b/priv/static/packs/features/getting_started.js.map differ
diff --git a/priv/static/packs/features/glitch/async/list_adder.js b/priv/static/packs/features/glitch/async/list_adder.js
index bb5fa5a71..52493f3dd 100644
Binary files a/priv/static/packs/features/glitch/async/list_adder.js and b/priv/static/packs/features/glitch/async/list_adder.js differ
diff --git a/priv/static/packs/features/hashtag_timeline.js b/priv/static/packs/features/hashtag_timeline.js
index 068700319..69fcab9ca 100644
Binary files a/priv/static/packs/features/hashtag_timeline.js and b/priv/static/packs/features/hashtag_timeline.js differ
diff --git a/priv/static/packs/features/hashtag_timeline.js.map b/priv/static/packs/features/hashtag_timeline.js.map
index 9bfe82b2d..55c5a89f5 100644
Binary files a/priv/static/packs/features/hashtag_timeline.js.map and b/priv/static/packs/features/hashtag_timeline.js.map differ
diff --git a/priv/static/packs/features/home_timeline.js b/priv/static/packs/features/home_timeline.js
index d5d4fb17a..2109ffb56 100644
Binary files a/priv/static/packs/features/home_timeline.js and b/priv/static/packs/features/home_timeline.js differ
diff --git a/priv/static/packs/features/keyboard_shortcuts.js b/priv/static/packs/features/keyboard_shortcuts.js
index b0a64b919..0cd230b72 100644
Binary files a/priv/static/packs/features/keyboard_shortcuts.js and b/priv/static/packs/features/keyboard_shortcuts.js differ
diff --git a/priv/static/packs/features/list_adder.js b/priv/static/packs/features/list_adder.js
index ff08fb8df..789a85d51 100644
Binary files a/priv/static/packs/features/list_adder.js and b/priv/static/packs/features/list_adder.js differ
diff --git a/priv/static/packs/features/list_editor.js b/priv/static/packs/features/list_editor.js
index 5b4cbab10..014903f05 100644
Binary files a/priv/static/packs/features/list_editor.js and b/priv/static/packs/features/list_editor.js differ
diff --git a/priv/static/packs/features/list_editor.js.map b/priv/static/packs/features/list_editor.js.map
index 33a45f898..c6d84978c 100644
Binary files a/priv/static/packs/features/list_editor.js.map and b/priv/static/packs/features/list_editor.js.map differ
diff --git a/priv/static/packs/features/list_timeline.js b/priv/static/packs/features/list_timeline.js
index 7d44dbdfa..4a394a845 100644
Binary files a/priv/static/packs/features/list_timeline.js and b/priv/static/packs/features/list_timeline.js differ
diff --git a/priv/static/packs/features/lists.js b/priv/static/packs/features/lists.js
index 0a5035434..bc714ac2d 100644
Binary files a/priv/static/packs/features/lists.js and b/priv/static/packs/features/lists.js differ
diff --git a/priv/static/packs/features/mutes.js b/priv/static/packs/features/mutes.js
index 4f463f882..7ae4adf43 100644
Binary files a/priv/static/packs/features/mutes.js and b/priv/static/packs/features/mutes.js differ
diff --git a/priv/static/packs/features/mutes.js.map b/priv/static/packs/features/mutes.js.map
index 4b6aa40e3..afed0e51a 100644
Binary files a/priv/static/packs/features/mutes.js.map and b/priv/static/packs/features/mutes.js.map differ
diff --git a/priv/static/packs/features/notifications.js b/priv/static/packs/features/notifications.js
index 14cafefbb..367745083 100644
Binary files a/priv/static/packs/features/notifications.js and b/priv/static/packs/features/notifications.js differ
diff --git a/priv/static/packs/features/notifications.js.map b/priv/static/packs/features/notifications.js.map
index 13467e9f2..a7c7b1715 100644
Binary files a/priv/static/packs/features/notifications.js.map and b/priv/static/packs/features/notifications.js.map differ
diff --git a/priv/static/packs/features/pinned_statuses.js b/priv/static/packs/features/pinned_statuses.js
index d381bcda4..356a5fd9b 100644
Binary files a/priv/static/packs/features/pinned_statuses.js and b/priv/static/packs/features/pinned_statuses.js differ
diff --git a/priv/static/packs/features/public_timeline.js b/priv/static/packs/features/public_timeline.js
index 0eb40db3b..39866dc40 100644
Binary files a/priv/static/packs/features/public_timeline.js and b/priv/static/packs/features/public_timeline.js differ
diff --git a/priv/static/packs/features/public_timeline.js.map b/priv/static/packs/features/public_timeline.js.map
index f50aadaf1..2be0af1fa 100644
Binary files a/priv/static/packs/features/public_timeline.js.map and b/priv/static/packs/features/public_timeline.js.map differ
diff --git a/priv/static/packs/features/reblogs.js b/priv/static/packs/features/reblogs.js
index 5427909e4..4a0c84ffa 100644
Binary files a/priv/static/packs/features/reblogs.js and b/priv/static/packs/features/reblogs.js differ
diff --git a/priv/static/packs/features/status.js b/priv/static/packs/features/status.js
index 0c9c92435..6df2a6476 100644
Binary files a/priv/static/packs/features/status.js and b/priv/static/packs/features/status.js differ
diff --git a/priv/static/packs/features/status.js.map b/priv/static/packs/features/status.js.map
index 14ae6d9df..0b943292f 100644
Binary files a/priv/static/packs/features/status.js.map and b/priv/static/packs/features/status.js.map differ
diff --git a/priv/static/packs/flavours/glitch/about.js b/priv/static/packs/flavours/glitch/about.js
index 4dd2a7ed7..1bf07fab5 100644
Binary files a/priv/static/packs/flavours/glitch/about.js and b/priv/static/packs/flavours/glitch/about.js differ
diff --git a/priv/static/packs/flavours/glitch/about.js.map b/priv/static/packs/flavours/glitch/about.js.map
index 7524d33a0..2356326de 100644
Binary files a/priv/static/packs/flavours/glitch/about.js.map and b/priv/static/packs/flavours/glitch/about.js.map differ
diff --git a/priv/static/packs/flavours/glitch/admin.js b/priv/static/packs/flavours/glitch/admin.js
index 4e21e66b2..cce6b5cd3 100644
Binary files a/priv/static/packs/flavours/glitch/admin.js and b/priv/static/packs/flavours/glitch/admin.js differ
diff --git a/priv/static/packs/flavours/glitch/admin.js.map b/priv/static/packs/flavours/glitch/admin.js.map
index 4c5f49e3a..3fa61b37a 100644
Binary files a/priv/static/packs/flavours/glitch/admin.js.map and b/priv/static/packs/flavours/glitch/admin.js.map differ
diff --git a/priv/static/packs/flavours/glitch/async/account_gallery.js b/priv/static/packs/flavours/glitch/async/account_gallery.js
index 00a2813ba..8678a41d5 100644
Binary files a/priv/static/packs/flavours/glitch/async/account_gallery.js and b/priv/static/packs/flavours/glitch/async/account_gallery.js differ
diff --git a/priv/static/packs/flavours/glitch/async/account_timeline.js b/priv/static/packs/flavours/glitch/async/account_timeline.js
index b493affd9..d21346c36 100644
Binary files a/priv/static/packs/flavours/glitch/async/account_timeline.js and b/priv/static/packs/flavours/glitch/async/account_timeline.js differ
diff --git a/priv/static/packs/flavours/glitch/async/blocks.js b/priv/static/packs/flavours/glitch/async/blocks.js
index a47ba64c6..96c444e3e 100644
Binary files a/priv/static/packs/flavours/glitch/async/blocks.js and b/priv/static/packs/flavours/glitch/async/blocks.js differ
diff --git a/priv/static/packs/flavours/glitch/async/bookmarked_statuses.js b/priv/static/packs/flavours/glitch/async/bookmarked_statuses.js
index 2774ac135..344a22b8e 100644
Binary files a/priv/static/packs/flavours/glitch/async/bookmarked_statuses.js and b/priv/static/packs/flavours/glitch/async/bookmarked_statuses.js differ
diff --git a/priv/static/packs/flavours/glitch/async/community_timeline.js b/priv/static/packs/flavours/glitch/async/community_timeline.js
index 2e8edc3a2..d08f709cb 100644
Binary files a/priv/static/packs/flavours/glitch/async/community_timeline.js and b/priv/static/packs/flavours/glitch/async/community_timeline.js differ
diff --git a/priv/static/packs/flavours/glitch/async/direct_timeline.js b/priv/static/packs/flavours/glitch/async/direct_timeline.js
index b8b3a60ed..c8ed7efb0 100644
Binary files a/priv/static/packs/flavours/glitch/async/direct_timeline.js and b/priv/static/packs/flavours/glitch/async/direct_timeline.js differ
diff --git a/priv/static/packs/flavours/glitch/async/domain_blocks.js b/priv/static/packs/flavours/glitch/async/domain_blocks.js
index 43ff0336b..90052c836 100644
Binary files a/priv/static/packs/flavours/glitch/async/domain_blocks.js and b/priv/static/packs/flavours/glitch/async/domain_blocks.js differ
diff --git a/priv/static/packs/flavours/glitch/async/drawer.js b/priv/static/packs/flavours/glitch/async/drawer.js
index 25a53361c..a721cb99d 100644
Binary files a/priv/static/packs/flavours/glitch/async/drawer.js and b/priv/static/packs/flavours/glitch/async/drawer.js differ
diff --git a/priv/static/packs/flavours/glitch/async/embed_modal.js b/priv/static/packs/flavours/glitch/async/embed_modal.js
index 77b463c02..48be7d532 100644
Binary files a/priv/static/packs/flavours/glitch/async/embed_modal.js and b/priv/static/packs/flavours/glitch/async/embed_modal.js differ
diff --git a/priv/static/packs/flavours/glitch/async/embed_modal.js.map b/priv/static/packs/flavours/glitch/async/embed_modal.js.map
index 29e43c3f3..56a5e0010 100644
Binary files a/priv/static/packs/flavours/glitch/async/embed_modal.js.map and b/priv/static/packs/flavours/glitch/async/embed_modal.js.map differ
diff --git a/priv/static/packs/flavours/glitch/async/emoji_picker.js b/priv/static/packs/flavours/glitch/async/emoji_picker.js
index 1527f5504..303c95955 100644
Binary files a/priv/static/packs/flavours/glitch/async/emoji_picker.js and b/priv/static/packs/flavours/glitch/async/emoji_picker.js differ
diff --git a/priv/static/packs/flavours/glitch/async/favourited_statuses.js b/priv/static/packs/flavours/glitch/async/favourited_statuses.js
index 966f2a304..f4d4d6f33 100644
Binary files a/priv/static/packs/flavours/glitch/async/favourited_statuses.js and b/priv/static/packs/flavours/glitch/async/favourited_statuses.js differ
diff --git a/priv/static/packs/flavours/glitch/async/favourites.js b/priv/static/packs/flavours/glitch/async/favourites.js
index eb1ecde74..30d7bbbb6 100644
Binary files a/priv/static/packs/flavours/glitch/async/favourites.js and b/priv/static/packs/flavours/glitch/async/favourites.js differ
diff --git a/priv/static/packs/flavours/glitch/async/follow_requests.js b/priv/static/packs/flavours/glitch/async/follow_requests.js
index 891769291..6948d9436 100644
Binary files a/priv/static/packs/flavours/glitch/async/follow_requests.js and b/priv/static/packs/flavours/glitch/async/follow_requests.js differ
diff --git a/priv/static/packs/flavours/glitch/async/followers.js b/priv/static/packs/flavours/glitch/async/followers.js
index 3d73f3d6b..686064089 100644
Binary files a/priv/static/packs/flavours/glitch/async/followers.js and b/priv/static/packs/flavours/glitch/async/followers.js differ
diff --git a/priv/static/packs/flavours/glitch/async/following.js b/priv/static/packs/flavours/glitch/async/following.js
index 82e0aeb45..63291304e 100644
Binary files a/priv/static/packs/flavours/glitch/async/following.js and b/priv/static/packs/flavours/glitch/async/following.js differ
diff --git a/priv/static/packs/flavours/glitch/async/generic_not_found.js b/priv/static/packs/flavours/glitch/async/generic_not_found.js
index 46f835a14..f95326166 100644
Binary files a/priv/static/packs/flavours/glitch/async/generic_not_found.js and b/priv/static/packs/flavours/glitch/async/generic_not_found.js differ
diff --git a/priv/static/packs/flavours/glitch/async/getting_started.js b/priv/static/packs/flavours/glitch/async/getting_started.js
index 64cfd2ce0..a2e0ec26a 100644
Binary files a/priv/static/packs/flavours/glitch/async/getting_started.js and b/priv/static/packs/flavours/glitch/async/getting_started.js differ
diff --git a/priv/static/packs/flavours/glitch/async/getting_started.js.map b/priv/static/packs/flavours/glitch/async/getting_started.js.map
index 9798d47c8..c413a62cf 100644
Binary files a/priv/static/packs/flavours/glitch/async/getting_started.js.map and b/priv/static/packs/flavours/glitch/async/getting_started.js.map differ
diff --git a/priv/static/packs/flavours/glitch/async/getting_started_misc.js b/priv/static/packs/flavours/glitch/async/getting_started_misc.js
index e05d31813..7db4942f4 100644
Binary files a/priv/static/packs/flavours/glitch/async/getting_started_misc.js and b/priv/static/packs/flavours/glitch/async/getting_started_misc.js differ
diff --git a/priv/static/packs/flavours/glitch/async/hashtag_timeline.js b/priv/static/packs/flavours/glitch/async/hashtag_timeline.js
index e6d5e00a2..2d3e720d3 100644
Binary files a/priv/static/packs/flavours/glitch/async/hashtag_timeline.js and b/priv/static/packs/flavours/glitch/async/hashtag_timeline.js differ
diff --git a/priv/static/packs/flavours/glitch/async/hashtag_timeline.js.map b/priv/static/packs/flavours/glitch/async/hashtag_timeline.js.map
index b5ae9f62f..21504d3ff 100644
Binary files a/priv/static/packs/flavours/glitch/async/hashtag_timeline.js.map and b/priv/static/packs/flavours/glitch/async/hashtag_timeline.js.map differ
diff --git a/priv/static/packs/flavours/glitch/async/home_timeline.js b/priv/static/packs/flavours/glitch/async/home_timeline.js
index a5a2414e6..a42b48807 100644
Binary files a/priv/static/packs/flavours/glitch/async/home_timeline.js and b/priv/static/packs/flavours/glitch/async/home_timeline.js differ
diff --git a/priv/static/packs/flavours/glitch/async/keyboard_shortcuts.js b/priv/static/packs/flavours/glitch/async/keyboard_shortcuts.js
index 8e5f61751..8a06c80da 100644
Binary files a/priv/static/packs/flavours/glitch/async/keyboard_shortcuts.js and b/priv/static/packs/flavours/glitch/async/keyboard_shortcuts.js differ
diff --git a/priv/static/packs/flavours/glitch/async/list_editor.js b/priv/static/packs/flavours/glitch/async/list_editor.js
index b0321aeae..853bdad0c 100644
Binary files a/priv/static/packs/flavours/glitch/async/list_editor.js and b/priv/static/packs/flavours/glitch/async/list_editor.js differ
diff --git a/priv/static/packs/flavours/glitch/async/list_timeline.js b/priv/static/packs/flavours/glitch/async/list_timeline.js
index f9a8a09a8..9130dfd6d 100644
Binary files a/priv/static/packs/flavours/glitch/async/list_timeline.js and b/priv/static/packs/flavours/glitch/async/list_timeline.js differ
diff --git a/priv/static/packs/flavours/glitch/async/lists.js b/priv/static/packs/flavours/glitch/async/lists.js
index 71685ed8b..b985638b5 100644
Binary files a/priv/static/packs/flavours/glitch/async/lists.js and b/priv/static/packs/flavours/glitch/async/lists.js differ
diff --git a/priv/static/packs/flavours/glitch/async/mute_modal.js b/priv/static/packs/flavours/glitch/async/mute_modal.js
index 526989b44..48ab94923 100644
Binary files a/priv/static/packs/flavours/glitch/async/mute_modal.js and b/priv/static/packs/flavours/glitch/async/mute_modal.js differ
diff --git a/priv/static/packs/flavours/glitch/async/mutes.js b/priv/static/packs/flavours/glitch/async/mutes.js
index 4f67fcb4e..a222b8d03 100644
Binary files a/priv/static/packs/flavours/glitch/async/mutes.js and b/priv/static/packs/flavours/glitch/async/mutes.js differ
diff --git a/priv/static/packs/flavours/glitch/async/notifications.js b/priv/static/packs/flavours/glitch/async/notifications.js
index c1252cfce..baf65e972 100644
Binary files a/priv/static/packs/flavours/glitch/async/notifications.js and b/priv/static/packs/flavours/glitch/async/notifications.js differ
diff --git a/priv/static/packs/flavours/glitch/async/notifications.js.map b/priv/static/packs/flavours/glitch/async/notifications.js.map
index c840b71c7..67224ae21 100644
Binary files a/priv/static/packs/flavours/glitch/async/notifications.js.map and b/priv/static/packs/flavours/glitch/async/notifications.js.map differ
diff --git a/priv/static/packs/flavours/glitch/async/onboarding_modal.js b/priv/static/packs/flavours/glitch/async/onboarding_modal.js
index d3df97c43..f43dba921 100644
Binary files a/priv/static/packs/flavours/glitch/async/onboarding_modal.js and b/priv/static/packs/flavours/glitch/async/onboarding_modal.js differ
diff --git a/priv/static/packs/flavours/glitch/async/pinned_accounts_editor.js b/priv/static/packs/flavours/glitch/async/pinned_accounts_editor.js
index 139ab84c9..ff3a35ab1 100644
Binary files a/priv/static/packs/flavours/glitch/async/pinned_accounts_editor.js and b/priv/static/packs/flavours/glitch/async/pinned_accounts_editor.js differ
diff --git a/priv/static/packs/flavours/glitch/async/pinned_statuses.js b/priv/static/packs/flavours/glitch/async/pinned_statuses.js
index 462a7f520..a21329447 100644
Binary files a/priv/static/packs/flavours/glitch/async/pinned_statuses.js and b/priv/static/packs/flavours/glitch/async/pinned_statuses.js differ
diff --git a/priv/static/packs/flavours/glitch/async/public_timeline.js b/priv/static/packs/flavours/glitch/async/public_timeline.js
index 8cc63b1d3..ffe0645e6 100644
Binary files a/priv/static/packs/flavours/glitch/async/public_timeline.js and b/priv/static/packs/flavours/glitch/async/public_timeline.js differ
diff --git a/priv/static/packs/flavours/glitch/async/public_timeline.js.map b/priv/static/packs/flavours/glitch/async/public_timeline.js.map
index 9a6475001..a80cd197e 100644
Binary files a/priv/static/packs/flavours/glitch/async/public_timeline.js.map and b/priv/static/packs/flavours/glitch/async/public_timeline.js.map differ
diff --git a/priv/static/packs/flavours/glitch/async/reblogs.js b/priv/static/packs/flavours/glitch/async/reblogs.js
index 71753b0a3..1faf230dd 100644
Binary files a/priv/static/packs/flavours/glitch/async/reblogs.js and b/priv/static/packs/flavours/glitch/async/reblogs.js differ
diff --git a/priv/static/packs/flavours/glitch/async/report_modal.js b/priv/static/packs/flavours/glitch/async/report_modal.js
index ff8054b6f..9359262f7 100644
Binary files a/priv/static/packs/flavours/glitch/async/report_modal.js and b/priv/static/packs/flavours/glitch/async/report_modal.js differ
diff --git a/priv/static/packs/flavours/glitch/async/report_modal.js.map b/priv/static/packs/flavours/glitch/async/report_modal.js.map
index aba4939aa..79d88c4e8 100644
Binary files a/priv/static/packs/flavours/glitch/async/report_modal.js.map and b/priv/static/packs/flavours/glitch/async/report_modal.js.map differ
diff --git a/priv/static/packs/flavours/glitch/async/settings_modal.js b/priv/static/packs/flavours/glitch/async/settings_modal.js
index 42ce838ed..c212d745d 100644
Binary files a/priv/static/packs/flavours/glitch/async/settings_modal.js and b/priv/static/packs/flavours/glitch/async/settings_modal.js differ
diff --git a/priv/static/packs/flavours/glitch/async/status.js b/priv/static/packs/flavours/glitch/async/status.js
index 063dba813..2104e58fb 100644
Binary files a/priv/static/packs/flavours/glitch/async/status.js and b/priv/static/packs/flavours/glitch/async/status.js differ
diff --git a/priv/static/packs/flavours/glitch/async/status.js.map b/priv/static/packs/flavours/glitch/async/status.js.map
index 06c8880f4..ac72c2d92 100644
Binary files a/priv/static/packs/flavours/glitch/async/status.js.map and b/priv/static/packs/flavours/glitch/async/status.js.map differ
diff --git a/priv/static/packs/flavours/glitch/common.css b/priv/static/packs/flavours/glitch/common.css
index 3ded6b2d9..6cef1a48c 100644
Binary files a/priv/static/packs/flavours/glitch/common.css and b/priv/static/packs/flavours/glitch/common.css differ
diff --git a/priv/static/packs/flavours/glitch/common.css.map b/priv/static/packs/flavours/glitch/common.css.map
index 10088d1f0..2f6a3ec72 100644
--- a/priv/static/packs/flavours/glitch/common.css.map
+++ b/priv/static/packs/flavours/glitch/common.css.map
@@ -1 +1 @@
-{"version":3,"sources":["webpack:///./app/javascript/flavours/glitch/styles/index.scss"],"names":[],"mappings":"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","file":"flavours/glitch/common.css","sourcesContent":["@charset \"UTF-8\";@font-face{font-family:\"mastodon-font-sans-serif\";src:local(\"Roboto\"),url(/packs/roboto-italic-webfont-50efdad8c62f5f279e3f4f1f63a4f9bc.woff2) format(\"woff2\"),url(/packs/roboto-italic-webfont-927fdbf83b347742d39f0b00f3cfa99a.woff) format(\"woff\"),url(/packs/roboto-italic-webfont-4c71bd4a88468ea62f92e55cb4e33aef.ttf) format(\"truetype\"),url(/packs/roboto-italic-webfont-d88a9e8476fabedea3b87fd0ba2df3b3.svg#roboto-italic-webfont) format(\"svg\");font-weight:400;font-style:italic}@font-face{font-family:\"mastodon-font-sans-serif\";src:local(\"Roboto\"),url(/packs/roboto-bold-webfont-f633cb5c651ba4d50791e1adf55d3c18.woff2) format(\"woff2\"),url(/packs/roboto-bold-webfont-df0f5fd966b99c0f503ae50c064fbba8.woff) format(\"woff\"),url(/packs/roboto-bold-webfont-5bacc29257521cc73732f2597cc19c4b.ttf) format(\"truetype\"),url(/packs/roboto-bold-webfont-4cbd1966fc397282fa35d69070782b80.svg#roboto-bold-webfont) format(\"svg\");font-weight:700;font-style:normal}@font-face{font-family:\"mastodon-font-sans-serif\";src:local(\"Roboto\"),url(/packs/roboto-medium-webfont-69c55fc2fe77d38934ea98dc31642ce6.woff2) format(\"woff2\"),url(/packs/roboto-medium-webfont-6484794cd05bbf97f3f0c730cec21665.woff) format(\"woff\"),url(/packs/roboto-medium-webfont-7f0e4c7727a4bc5f37d95d804c6e0348.ttf) format(\"truetype\"),url(/packs/roboto-medium-webfont-f407ec033f15172c3c4acf75608dd11d.svg#roboto-medium-webfont) format(\"svg\");font-weight:500;font-style:normal}@font-face{font-family:\"mastodon-font-sans-serif\";src:local(\"Roboto\"),url(/packs/roboto-regular-webfont-3ec24f953ed5e859a6402cb3c030ea8b.woff2) format(\"woff2\"),url(/packs/roboto-regular-webfont-b06ad091cf548c38401f3e5883cb36a2.woff) format(\"woff\"),url(/packs/roboto-regular-webfont-42a434b9f3c8c7a57b83488483b2d08e.ttf) format(\"truetype\"),url(/packs/roboto-regular-webfont-77dc6a0145954a963b95d30773543105.svg#roboto-regular-webfont) format(\"svg\");font-weight:400;font-style:normal}@font-face{font-family:\"mastodon-font-monospace\";src:local(\"Roboto Mono\"),url(/packs/robotomono-regular-webfont-6c1ce30b90ee993b22618ec489585594.woff2) format(\"woff2\"),url(/packs/robotomono-regular-webfont-09e0ef66c9dee2fa2689f6e5f2437670.woff) format(\"woff\"),url(/packs/robotomono-regular-webfont-0ba95b3b2370e6bf1dcdb20aa3a54ff2.ttf) format(\"truetype\"),url(/packs/robotomono-regular-webfont-51e9ccf8c829f4894a7e5a0883e864fc.svg#roboto_monoregular) format(\"svg\");font-weight:400;font-style:normal}@font-face{font-family:mastodon-font-display;src:local(\"Montserrat\"),url(/packs/Montserrat-Regular-080422d4c1328f3407818d25c86cce51.woff2) format(\"woff2\"),url(/packs/Montserrat-Regular-b0322f2faed575161a052b5af953251a.woff) format(\"woff\"),url(/packs/Montserrat-Regular-6a18f75e59e23e7f23b8a4ef70d748cd.ttf) format(\"truetype\");font-weight:400;font-style:normal}@font-face{font-family:mastodon-font-display;src:local(\"Montserrat\"),url(/packs/Montserrat-Medium-5f797490f806b3b229299f0a66de89c9.ttf) format(\"truetype\");font-weight:500;font-style:normal}a,abbr,acronym,address,applet,article,aside,audio,b,big,blockquote,body,canvas,caption,center,cite,code,dd,del,details,dfn,div,dl,dt,em,embed,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,html,i,iframe,img,ins,kbd,label,legend,li,mark,menu,nav,object,ol,output,p,pre,q,ruby,s,samp,section,small,span,strike,strong,sub,summary,sup,table,tbody,td,tfoot,th,thead,time,tr,tt,u,ul,var,video{margin:0;padding:0;border:0;font-size:100%;font:inherit;vertical-align:baseline}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}body{line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:after,blockquote:before,q:after,q:before{content:\"\";content:none}table{border-collapse:collapse;border-spacing:0}html{scrollbar-color:#192432 rgba(0,0,0,.1)}::-webkit-scrollbar{width:12px;height:12px}::-webkit-scrollbar-thumb{background:#192432;border:0 #fff;border-radius:50px}::-webkit-scrollbar-thumb:hover{background:#1c2938}::-webkit-scrollbar-thumb:active{background:#192432}::-webkit-scrollbar-track{border:0 #fff;border-radius:0;background:rgba(0,0,0,.1)}::-webkit-scrollbar-track:active,::-webkit-scrollbar-track:hover{background:#121a24}::-webkit-scrollbar-corner{background:transparent}body{font-family:sans-serif;background:#040609;font-size:13px;line-height:18px;font-weight:400;color:#fff;text-rendering:optimizelegibility;-webkit-font-feature-settings:\"kern\";font-feature-settings:\"kern\";-webkit-text-size-adjust:none;-moz-text-size-adjust:none;-ms-text-size-adjust:none;text-size-adjust:none;-webkit-tap-highlight-color:rgba(0,0,0,0);-webkit-tap-highlight-color:transparent}body.system-font{font-family:system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif}body.app-body{position:absolute;width:100%;height:100%;padding:0;background:#121a24}body.app-body.with-modals--active{overflow-y:hidden}body.lighter{background:#121a24}body.with-modals{overflow-x:hidden;overflow-y:scroll}body.with-modals--active{overflow-y:hidden;margin-right:13px}body.embed{background:#192432;margin:0;padding-bottom:0}body.embed .container{position:absolute;width:100%;height:100%;overflow:hidden}body.admin{background:#0b1016;position:fixed}body.admin,body.error{width:100%;height:100%;padding:0}body.error{position:absolute;text-align:center;color:#9baec8;background:#121a24;display:flex;justify-content:center;align-items:center}body.error .dialog{vertical-align:middle;margin:20px}body.error .dialog img{display:block;max-width:470px;width:100%;height:auto;margin-top:-120px}body.error .dialog h1{font-size:20px;line-height:28px;font-weight:400}button{font-family:inherit;cursor:pointer}button:focus{outline:none}.app-holder,.app-holder>div{display:flex;width:100%;height:100%;align-items:center;justify-content:center;outline:0!important}.container-alt{width:700px;margin:40px auto 0}@media screen and (max-width:740px){.container-alt{width:100%;margin:0}}.logo-container{margin:100px auto 50px}@media screen and (max-width:400px){.logo-container{margin:30px auto 20px}}.logo-container h1{display:flex;justify-content:center;align-items:center}.logo-container h1 img{height:42px;margin-right:10px}.logo-container h1 a{display:flex;justify-content:center;align-items:center;color:#fff;text-decoration:none;outline:0;padding:12px 16px;line-height:32px;font-family:sans-serif;font-weight:500;font-size:14px}.compose-standalone .compose-form{width:400px;padding:20px 0;margin:40px auto 0;box-sizing:border-box}@media screen and (max-width:400px){.compose-standalone .compose-form{width:100%;margin-top:0;padding:20px}}.account-header{width:400px;display:flex;font-size:13px;line-height:18px;box-sizing:border-box;padding:20px 0 0;margin:40px auto -30px}@media screen and (max-width:440px){.account-header{width:100%;margin:0 0 10px;padding:20px 20px 0}}.account-header .avatar{width:40px;height:40px;background-size:40px 40px;margin-right:8px}.account-header .avatar img{width:100%;height:100%;display:block;margin:0;border-radius:4px;border-radius:8%;background:transparent no-repeat;background-position:50%;background-clip:padding-box}.account-header .name{flex:1 1 auto;color:#d9e1e8;width:calc(100% - 88px)}.account-header .name .username{display:block;font-weight:500;text-overflow:ellipsis;overflow:hidden}.account-header .logout-link{display:block;font-size:32px;line-height:40px;margin-left:8px}.grid-3{display:grid;grid-gap:10px;grid-template-columns:3fr 1fr;grid-auto-columns:25%;grid-auto-rows:-webkit-max-content;grid-auto-rows:max-content}.grid-3 .column-0{grid-column:1/3;grid-row:1}.grid-3 .column-1{grid-column:1;grid-row:2}.grid-3 .column-2{grid-column:2;grid-row:2}.grid-3 .column-3{grid-column:1/3;grid-row:3}.grid-3 .landing-page__call-to-action{min-height:100%}@media screen and (max-width:738px){.grid-3{grid-template-columns:minmax(0,50%) minmax(0,50%)}.grid-3 .landing-page__call-to-action{padding:20px;display:flex;align-items:center;justify-content:center}.grid-3 .row__information-board{width:100%;justify-content:center;align-items:center}.grid-3 .row__mascot{display:none}}@media screen and (max-width:415px){.grid-3{grid-gap:0;grid-template-columns:minmax(0,100%)}.grid-3 .column-0{grid-column:1}.grid-3 .column-1{grid-column:1;grid-row:3}.grid-3 .column-2{grid-column:1;grid-row:2}.grid-3 .column-3{grid-column:1;grid-row:4}}@media screen and (max-width:415px){.public-layout{padding-top:48px}}.public-layout .container{max-width:960px}@media screen and (max-width:415px){.public-layout .container{padding:0}}.public-layout .header{background:#202e3f;box-shadow:0 0 15px rgba(0,0,0,.2);border-radius:4px;height:48px;margin:10px 0;display:flex;align-items:stretch;justify-content:center;flex-wrap:nowrap;overflow:hidden}@media screen and (max-width:415px){.public-layout .header{position:fixed;width:100%;top:0;left:0;margin:0;border-radius:0;box-shadow:none;z-index:110}}.public-layout .header>div{flex:1 1 33.3%;min-height:1px}.public-layout .header .nav-left{display:flex;align-items:stretch;justify-content:flex-start;flex-wrap:nowrap}.public-layout .header .nav-center{display:flex;align-items:stretch;justify-content:center;flex-wrap:nowrap}.public-layout .header .nav-right{display:flex;align-items:stretch;justify-content:flex-end;flex-wrap:nowrap}.public-layout .header .brand{display:block;padding:15px}.public-layout .header .brand img{display:block;height:18px;width:auto;position:relative;bottom:-2px}@media screen and (max-width:415px){.public-layout .header .brand img{height:20px}}.public-layout .header .brand:active,.public-layout .header .brand:focus,.public-layout .header .brand:hover{background:#26374d}.public-layout .header .nav-link{display:flex;align-items:center;padding:0 1rem;font-size:12px;font-weight:500;text-decoration:none;color:#9baec8;white-space:nowrap;text-align:center}.public-layout .header .nav-link:active,.public-layout .header .nav-link:focus,.public-layout .header .nav-link:hover{text-decoration:underline;color:#fff}@media screen and (max-width:550px){.public-layout .header .nav-link.optional{display:none}}.public-layout .header .nav-button{background:#2d415a;margin:8px 8px 8px 0;border-radius:4px}.public-layout .header .nav-button:active,.public-layout .header .nav-button:focus,.public-layout .header .nav-button:hover{text-decoration:none;background:#344b68}.public-layout .grid{display:grid;grid-gap:10px;grid-template-columns:minmax(300px,3fr) minmax(298px,1fr);grid-auto-columns:25%;grid-auto-rows:-webkit-max-content;grid-auto-rows:max-content}.public-layout .grid .column-0{grid-row:1;grid-column:1}.public-layout .grid .column-1{grid-row:1;grid-column:2}@media screen and (max-width:600px){.public-layout .grid{grid-template-columns:100%;grid-gap:0}.public-layout .grid .column-1{display:none}}.public-layout .public-account-header{overflow:hidden;margin-bottom:10px;box-shadow:0 0 15px rgba(0,0,0,.2)}.public-layout .public-account-header.inactive{opacity:.5}.public-layout .public-account-header.inactive .avatar,.public-layout .public-account-header.inactive .public-account-header__image{-webkit-filter:grayscale(100%);filter:grayscale(100%)}.public-layout .public-account-header.inactive .logo-button{background-color:#d9e1e8}.public-layout .public-account-header.inactive .logo-button svg path:last-child{fill:#d9e1e8}.public-layout .public-account-header__image{border-radius:4px 4px 0 0;overflow:hidden;height:300px;position:relative;background:#000}.public-layout .public-account-header__image:after{content:\"\";display:block;position:absolute;width:100%;height:100%;box-shadow:inset 0 -1px 1px 1px rgba(0,0,0,.15);top:0;left:0}.public-layout .public-account-header__image img{-o-object-fit:cover;font-family:\"object-fit:cover\";object-fit:cover;display:block;width:100%;height:100%;margin:0;border-radius:4px 4px 0 0}@media screen and (max-width:600px){.public-layout .public-account-header__image{height:200px}}.public-layout .public-account-header--no-bar{margin-bottom:0}.public-layout .public-account-header--no-bar .public-account-header__image,.public-layout .public-account-header--no-bar .public-account-header__image img{border-radius:4px}@media screen and (max-width:415px){.public-layout .public-account-header--no-bar .public-account-header__image,.public-layout .public-account-header--no-bar .public-account-header__image img{border-radius:0}}@media screen and (max-width:415px){.public-layout .public-account-header{margin-bottom:0;box-shadow:none}.public-layout .public-account-header__image:after{display:none}.public-layout .public-account-header__image,.public-layout .public-account-header__image img{border-radius:0}}.public-layout .public-account-header__bar{position:relative;margin-top:-80px;display:flex;justify-content:flex-start}.public-layout .public-account-header__bar:before{content:\"\";display:block;background:#192432;position:absolute;bottom:0;left:0;right:0;height:60px;border-radius:0 0 4px 4px;z-index:-1}.public-layout .public-account-header__bar .avatar{display:block;width:120px;height:120px;background-size:120px 120px;padding-left:16px;flex:0 0 auto}.public-layout .public-account-header__bar .avatar img{display:block;width:100%;height:100%;margin:0;border-radius:50%;border:4px solid #192432;background:#040609;border-radius:8%;background:transparent no-repeat;background-position:50%;background-clip:padding-box}@media screen and (max-width:600px){.public-layout .public-account-header__bar{margin-top:0;background:#192432;border-radius:0 0 4px 4px;padding:5px}.public-layout .public-account-header__bar:before{display:none}.public-layout .public-account-header__bar .avatar{width:48px;height:48px;background-size:48px 48px;padding:7px 0 7px 10px}.public-layout .public-account-header__bar .avatar img{border:0;border-radius:4px;border-radius:8%;background:transparent no-repeat;background-position:50%;background-clip:padding-box}}@media screen and (max-width:600px) and (max-width:360px){.public-layout .public-account-header__bar .avatar{display:none}}@media screen and (max-width:415px){.public-layout .public-account-header__bar{border-radius:0}}@media screen and (max-width:600px){.public-layout .public-account-header__bar{flex-wrap:wrap}}.public-layout .public-account-header__tabs{flex:1 1 auto;margin-left:20px}.public-layout .public-account-header__tabs__name{padding-top:20px;padding-bottom:8px}.public-layout .public-account-header__tabs__name h1{font-size:20px;line-height:27px;color:#fff;font-weight:500;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;text-shadow:1px 1px 1px #000}.public-layout .public-account-header__tabs__name h1 small{display:block;font-size:14px;color:#fff;font-weight:400;overflow:hidden;text-overflow:ellipsis}@media screen and (max-width:600px){.public-layout .public-account-header__tabs{margin-left:15px;display:flex;justify-content:space-between;align-items:center}.public-layout .public-account-header__tabs__name{padding-top:0;padding-bottom:0}.public-layout .public-account-header__tabs__name h1{font-size:16px;line-height:24px;text-shadow:none}.public-layout .public-account-header__tabs__name h1 small{color:#9baec8}}.public-layout .public-account-header__tabs__tabs{display:flex;justify-content:flex-start;align-items:stretch;height:58px}.public-layout .public-account-header__tabs__tabs .details-counters{display:flex;flex-direction:row;min-width:300px}@media screen and (max-width:600px){.public-layout .public-account-header__tabs__tabs .details-counters{display:none}}.public-layout .public-account-header__tabs__tabs .counter{width:33.3%;box-sizing:border-box;flex:0 0 auto;color:#9baec8;padding:10px;border-right:1px solid #192432;cursor:default;text-align:center;position:relative}.public-layout .public-account-header__tabs__tabs .counter a{display:block}.public-layout .public-account-header__tabs__tabs .counter:last-child{border-right:0}.public-layout .public-account-header__tabs__tabs .counter:after{display:block;content:\"\";position:absolute;bottom:0;left:0;width:100%;border-bottom:4px solid #9baec8;opacity:.5;transition:all .4s ease}.public-layout .public-account-header__tabs__tabs .counter.active:after{border-bottom:4px solid #d8a070;opacity:1}.public-layout .public-account-header__tabs__tabs .counter.active.inactive:after{border-bottom-color:#d9e1e8}.public-layout .public-account-header__tabs__tabs .counter:hover:after{opacity:1;transition-duration:.1s}.public-layout .public-account-header__tabs__tabs .counter a{text-decoration:none;color:inherit}.public-layout .public-account-header__tabs__tabs .counter .counter-label{font-size:12px;display:block}.public-layout .public-account-header__tabs__tabs .counter .counter-number{font-weight:500;font-size:18px;margin-bottom:5px;color:#fff;font-family:sans-serif}.public-layout .public-account-header__tabs__tabs .spacer{flex:1 1 auto;height:1px}.public-layout .public-account-header__tabs__tabs__buttons{padding:7px 8px}.public-layout .public-account-header__extra{display:none;margin-top:4px}.public-layout .public-account-header__extra .public-account-bio{border-radius:0;box-shadow:none;background:transparent;margin:0 -5px}.public-layout .public-account-header__extra .public-account-bio .account__header__fields{border-top:1px solid #26374d}.public-layout .public-account-header__extra .public-account-bio .roles{display:none}.public-layout .public-account-header__extra__links{margin-top:-15px;font-size:14px;color:#9baec8}.public-layout .public-account-header__extra__links a{display:inline-block;color:#9baec8;text-decoration:none;padding:15px}.public-layout .public-account-header__extra__links a strong{font-weight:700;color:#fff}@media screen and (max-width:600px){.public-layout .public-account-header__extra{display:block;flex:100%}}.public-layout .account__section-headline{border-radius:4px 4px 0 0}@media screen and (max-width:415px){.public-layout .account__section-headline{border-radius:0}}.public-layout .detailed-status__meta{margin-top:25px}.public-layout .public-account-bio{background:#202e3f;box-shadow:0 0 15px rgba(0,0,0,.2);border-radius:4px;overflow:hidden;margin-bottom:10px}@media screen and (max-width:415px){.public-layout .public-account-bio{box-shadow:none;margin-bottom:0;border-radius:0}}.public-layout .public-account-bio .account__header__fields{margin:0;border-top:0}.public-layout .public-account-bio .account__header__fields a{color:#e1b590}.public-layout .public-account-bio .account__header__fields dl:first-child .verified{border-radius:0 4px 0 0}.public-layout .public-account-bio .account__header__fields .verified a{color:#79bd9a}.public-layout .public-account-bio .account__header__content{padding:20px 20px 0;color:#fff}.public-layout .public-account-bio .roles,.public-layout .public-account-bio__extra{padding:20px;font-size:14px;color:#9baec8}.public-layout .public-account-bio .roles{padding-bottom:0}.public-layout .static-icon-button{color:#3e5a7c;font-size:18px}.public-layout .static-icon-button>span{font-size:14px;font-weight:500}.public-layout .card-grid{display:flex;flex-wrap:wrap;min-width:100%;margin:0 -5px}.public-layout .card-grid>div{box-sizing:border-box;flex:1 0 auto;width:300px;padding:0 5px;margin-bottom:10px;max-width:33.333%}@media screen and (max-width:900px){.public-layout .card-grid>div{max-width:50%}}@media screen and (max-width:600px){.public-layout .card-grid>div{max-width:100%}}@media screen and (max-width:415px){.public-layout .card-grid{margin:0;border-top:1px solid #202e3f}.public-layout .card-grid>div{width:100%;padding:0;margin-bottom:0;border-bottom:1px solid #202e3f}.public-layout .card-grid>div:last-child{border-bottom:0}.public-layout .card-grid>div .card__bar{background:#121a24}.public-layout .card-grid>div .card__bar:active,.public-layout .card-grid>div .card__bar:focus,.public-layout .card-grid>div .card__bar:hover{background:#192432}}.no-list{list-style:none}.no-list li{display:inline-block;margin:0 5px}.recovery-codes{list-style:none;margin:0 auto}.recovery-codes li{font-size:125%;line-height:1.5;letter-spacing:1px}.modal-layout{background:#121a24 url('data:image/svg+xml;utf8,Blog
+
+
+
+ Lorem ipsum
+ Lorem ipsum dolor sit ameph, …
+ lain’s account
+
+
+
diff --git a/test/fixtures/rel_me_anchor_nofollow.html b/test/fixtures/rel_me_anchor_nofollow.html
new file mode 100644
index 000000000..c856f0091
--- /dev/null
+++ b/test/fixtures/rel_me_anchor_nofollow.html
@@ -0,0 +1,14 @@
+
+
+
+ Blog
+
+
+
+ Lorem ipsum
+ Lorem ipsum dolor sit ameph, …
+ lain’s account
+
+
+
diff --git a/test/fixtures/rel_me_link.html b/test/fixtures/rel_me_link.html
new file mode 100644
index 000000000..b9ff18f6e
--- /dev/null
+++ b/test/fixtures/rel_me_link.html
@@ -0,0 +1,14 @@
+
+
+
+ Blog
+
+ Lorem ipsum
+ Lorem ipsum dolor sit ameph, …
+
+
+
diff --git a/test/fixtures/rel_me_null.html b/test/fixtures/rel_me_null.html
new file mode 100644
index 000000000..5ab5f10c1
--- /dev/null
+++ b/test/fixtures/rel_me_null.html
@@ -0,0 +1,14 @@
+
+
+
+ Blog
+
+
+
+ Lorem ipsum
+ Lorem ipsum dolor sit ameph, …
+ lain’s account
+
+
+
diff --git a/test/formatter_test.exs b/test/formatter_test.exs
index f14077d25..7d8864bf4 100644
--- a/test/formatter_test.exs
+++ b/test/formatter_test.exs
@@ -21,22 +21,16 @@ test "turns hashtags into links" do
expected_text =
"I love #cofe and #2hu "
- tags = Formatter.parse_tags(text)
-
- assert expected_text ==
- Formatter.add_hashtag_links({[], text}, tags) |> Formatter.finalize()
+ assert {^expected_text, [], _tags} = Formatter.linkify(text)
end
test "does not turn html characters to tags" do
- text = "Fact #3: pleroma does what mastodon't"
+ text = "#fact_3: pleroma does what mastodon't"
expected_text =
- "Fact #3 : pleroma does what mastodon't"
+ "#fact_3 : pleroma does what mastodon't"
- tags = Formatter.parse_tags(text)
-
- assert expected_text ==
- Formatter.add_hashtag_links({[], text}, tags) |> Formatter.finalize()
+ assert {^expected_text, [], _tags} = Formatter.linkify(text)
end
end
@@ -47,79 +41,79 @@ test "turning urls into links" do
expected =
"Hey, check out https://www.youtube.com/watch?v=8Zg1-TufF%20zY?x=1&y=2#blabla ."
- assert Formatter.add_links({[], text}) |> Formatter.finalize() == expected
+ assert {^expected, [], []} = Formatter.linkify(text)
text = "https://mastodon.social/@lambadalambda"
expected =
"https://mastodon.social/@lambadalambda "
- assert Formatter.add_links({[], text}) |> Formatter.finalize() == expected
+ assert {^expected, [], []} = Formatter.linkify(text)
text = "https://mastodon.social:4000/@lambadalambda"
expected =
"https://mastodon.social:4000/@lambadalambda "
- assert Formatter.add_links({[], text}) |> Formatter.finalize() == expected
+ assert {^expected, [], []} = Formatter.linkify(text)
text = "@lambadalambda"
expected = "@lambadalambda"
- assert Formatter.add_links({[], text}) |> Formatter.finalize() == expected
+ assert {^expected, [], []} = Formatter.linkify(text)
text = "http://www.cs.vu.nl/~ast/intel/"
expected = "http://www.cs.vu.nl/~ast/intel/ "
- assert Formatter.add_links({[], text}) |> Formatter.finalize() == expected
+ assert {^expected, [], []} = Formatter.linkify(text)
text = "https://forum.zdoom.org/viewtopic.php?f=44&t=57087"
expected =
"https://forum.zdoom.org/viewtopic.php?f=44&t=57087 "
- assert Formatter.add_links({[], text}) |> Formatter.finalize() == expected
+ assert {^expected, [], []} = Formatter.linkify(text)
text = "https://en.wikipedia.org/wiki/Sophia_(Gnosticism)#Mythos_of_the_soul"
expected =
"https://en.wikipedia.org/wiki/Sophia_(Gnosticism)#Mythos_of_the_soul "
- assert Formatter.add_links({[], text}) |> Formatter.finalize() == expected
+ assert {^expected, [], []} = Formatter.linkify(text)
text = "https://www.google.co.jp/search?q=Nasim+Aghdam"
expected =
"https://www.google.co.jp/search?q=Nasim+Aghdam "
- assert Formatter.add_links({[], text}) |> Formatter.finalize() == expected
+ assert {^expected, [], []} = Formatter.linkify(text)
text = "https://en.wikipedia.org/wiki/Duff's_device"
expected =
"https://en.wikipedia.org/wiki/Duff's_device "
- assert Formatter.add_links({[], text}) |> Formatter.finalize() == expected
+ assert {^expected, [], []} = Formatter.linkify(text)
text = "https://pleroma.com https://pleroma.com/sucks"
expected =
"https://pleroma.com https://pleroma.com/sucks "
- assert Formatter.add_links({[], text}) |> Formatter.finalize() == expected
+ assert {^expected, [], []} = Formatter.linkify(text)
text = "xmpp:contact@hacktivis.me"
expected = "xmpp:contact@hacktivis.me "
- assert Formatter.add_links({[], text}) |> Formatter.finalize() == expected
+ assert {^expected, [], []} = Formatter.linkify(text)
text =
"magnet:?xt=urn:btih:7ec9d298e91d6e4394d1379caf073c77ff3e3136&tr=udp%3A%2F%2Fopentor.org%3A2710&tr=udp%3A%2F%2Ftracker.blackunicorn.xyz%3A6969&tr=udp%3A%2F%2Ftracker.ccc.de%3A80&tr=udp%3A%2F%2Ftracker.coppersurfer.tk%3A6969&tr=udp%3A%2F%2Ftracker.leechers-paradise.org%3A6969&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80&tr=wss%3A%2F%2Ftracker.btorrent.xyz&tr=wss%3A%2F%2Ftracker.fastcast.nz&tr=wss%3A%2F%2Ftracker.openwebtorrent.com"
expected = "#{text} "
- assert Formatter.add_links({[], text}) |> Formatter.finalize() == expected
+ assert {^expected, [], []} = Formatter.linkify(text)
end
end
@@ -136,12 +130,9 @@ test "gives a replacement for user links, using local nicknames in user links te
archaeme_remote = insert(:user, %{nickname: "archaeme@archae.me"})
- mentions = Pleroma.Formatter.parse_mentions(text)
+ {text, mentions, []} = Formatter.linkify(text)
- {subs, text} = Formatter.add_user_links({[], text}, mentions)
-
- assert length(subs) == 3
- Enum.each(subs, fn {uuid, _} -> assert String.contains?(text, uuid) end)
+ assert length(mentions) == 3
expected_text =
"@archaeme @mike @o this is in bold
this is a paragraph
this is a linebreakexample.com
+ this is a link with not allowed "rel" attribute: example.com
this is an image: this is a paragraph
this is a linebreakexample.com
+ this is a link with not allowed "rel" attribute: example.com
this is an image: this is in bold
this is a paragraph
this is a linebreakexample.com
+ this is a link with not allowed "rel" attribute: example.com
this is an image: #{bio} "
+ assert expected_text == User.parse_bio(bio, user)
+
+ bio = "http://example.org/rel_me/link"
+ expected_text = "#{bio} "
+ assert expected_text == User.parse_bio(bio, user)
+
+ bio = "http://example.org/rel_me/anchor"
+ expected_text = "#{bio} "
+ assert expected_text == User.parse_bio(bio, user)
+ end
end
test "bookmarks" do
diff --git a/test/web/activity_pub/activity_pub_controller_test.exs b/test/web/activity_pub/activity_pub_controller_test.exs
index 6bd4493f5..a1e83b380 100644
--- a/test/web/activity_pub/activity_pub_controller_test.exs
+++ b/test/web/activity_pub/activity_pub_controller_test.exs
@@ -5,13 +5,13 @@
defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
use Pleroma.Web.ConnCase
import Pleroma.Factory
- alias Pleroma.Web.ActivityPub.UserView
- alias Pleroma.Web.ActivityPub.ObjectView
+ alias Pleroma.Activity
+ alias Pleroma.Instances
alias Pleroma.Object
alias Pleroma.Repo
- alias Pleroma.Activity
alias Pleroma.User
- alias Pleroma.Instances
+ alias Pleroma.Web.ActivityPub.ObjectView
+ alias Pleroma.Web.ActivityPub.UserView
setup_all do
Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs
index 11262c523..035778218 100644
--- a/test/web/activity_pub/activity_pub_test.exs
+++ b/test/web/activity_pub/activity_pub_test.exs
@@ -4,14 +4,14 @@
defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
use Pleroma.DataCase
+ alias Pleroma.Activity
+ alias Pleroma.Builders.ActivityBuilder
+ alias Pleroma.Instances
+ alias Pleroma.Object
+ alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.Utils
alias Pleroma.Web.CommonAPI
- alias Pleroma.Activity
- alias Pleroma.Object
- alias Pleroma.User
- alias Pleroma.Instances
- alias Pleroma.Builders.ActivityBuilder
import Pleroma.Factory
import Tesla.Mock
@@ -55,6 +55,14 @@ test "it restricts by the appropriate visibility" do
ActivityPub.fetch_activities([], %{:visibility => "public", "actor_id" => user.ap_id})
assert activities == [public_activity]
+
+ activities =
+ ActivityPub.fetch_activities([], %{
+ :visibility => ~w[private public],
+ "actor_id" => user.ap_id
+ })
+
+ assert activities == [public_activity, private_activity]
end
end
@@ -205,6 +213,25 @@ test "removes doubled 'to' recipients" do
assert activity.actor == user.ap_id
assert activity.recipients == ["user1", "user2", user.ap_id]
end
+
+ test "increases user note count only for public activities" do
+ user = insert(:user)
+
+ {:ok, _} =
+ CommonAPI.post(Repo.get(User, user.id), %{"status" => "1", "visibility" => "public"})
+
+ {:ok, _} =
+ CommonAPI.post(Repo.get(User, user.id), %{"status" => "2", "visibility" => "unlisted"})
+
+ {:ok, _} =
+ CommonAPI.post(Repo.get(User, user.id), %{"status" => "2", "visibility" => "private"})
+
+ {:ok, _} =
+ CommonAPI.post(Repo.get(User, user.id), %{"status" => "3", "visibility" => "direct"})
+
+ user = Repo.get(User, user.id)
+ assert user.info.note_count == 2
+ end
end
describe "fetch activities for recipients" do
@@ -291,6 +318,13 @@ test "doesn't return muted activities" do
assert Enum.member?(activities, activity_three)
refute Enum.member?(activities, activity_one)
+ # Calling with 'with_muted' will deliver muted activities, too.
+ activities = ActivityPub.fetch_activities([], %{"muting_user" => user, "with_muted" => true})
+
+ assert Enum.member?(activities, activity_two)
+ assert Enum.member?(activities, activity_three)
+ assert Enum.member?(activities, activity_one)
+
{:ok, user} = User.unmute(user, %User{ap_id: activity_one.data["actor"]})
activities = ActivityPub.fetch_activities([], %{"muting_user" => user})
@@ -390,6 +424,19 @@ test "retrieves ids up to max_id" do
assert length(activities) == 20
assert last == last_expected
end
+
+ test "doesn't return reblogs for users for whom reblogs have been muted" do
+ activity = insert(:note_activity)
+ user = insert(:user)
+ booster = insert(:user)
+ {:ok, user} = CommonAPI.hide_reblogs(user, booster)
+
+ {:ok, activity, _} = CommonAPI.repeat(activity.id, booster)
+
+ activities = ActivityPub.fetch_activities([], %{"muting_user" => user})
+
+ refute Enum.member?(activities, activity)
+ end
end
describe "like an object" do
@@ -633,6 +680,51 @@ test "it creates a delete activity and deletes the original object" do
assert Repo.get(Object, object.id).data["type"] == "Tombstone"
end
+
+ test "decrements user note count only for public activities" do
+ user = insert(:user, info: %{note_count: 10})
+
+ {:ok, a1} =
+ CommonAPI.post(Repo.get(User, user.id), %{"status" => "yeah", "visibility" => "public"})
+
+ {:ok, a2} =
+ CommonAPI.post(Repo.get(User, user.id), %{"status" => "yeah", "visibility" => "unlisted"})
+
+ {:ok, a3} =
+ CommonAPI.post(Repo.get(User, user.id), %{"status" => "yeah", "visibility" => "private"})
+
+ {:ok, a4} =
+ CommonAPI.post(Repo.get(User, user.id), %{"status" => "yeah", "visibility" => "direct"})
+
+ {:ok, _} = a1.data["object"]["id"] |> Object.get_by_ap_id() |> ActivityPub.delete()
+ {:ok, _} = a2.data["object"]["id"] |> Object.get_by_ap_id() |> ActivityPub.delete()
+ {:ok, _} = a3.data["object"]["id"] |> Object.get_by_ap_id() |> ActivityPub.delete()
+ {:ok, _} = a4.data["object"]["id"] |> Object.get_by_ap_id() |> ActivityPub.delete()
+
+ user = Repo.get(User, user.id)
+ assert user.info.note_count == 10
+ end
+
+ test "it creates a delete activity and checks that it is also sent to users mentioned by the deleted object" do
+ user = insert(:user)
+ note = insert(:note_activity)
+
+ {:ok, object} =
+ Object.get_by_ap_id(note.data["object"]["id"])
+ |> Object.change(%{
+ data: %{
+ "actor" => note.data["object"]["actor"],
+ "id" => note.data["object"]["id"],
+ "to" => [user.ap_id],
+ "type" => "Note"
+ }
+ })
+ |> Object.update_and_set_cache()
+
+ {:ok, delete} = ActivityPub.delete(object)
+
+ assert user.ap_id in delete.data["to"]
+ end
end
describe "timeline post-processing" do
diff --git a/test/web/activity_pub/mrf/anti_followbot_policy_test.exs b/test/web/activity_pub/mrf/anti_followbot_policy_test.exs
index 2ea4f9d3f..37a7bfcf7 100644
--- a/test/web/activity_pub/mrf/anti_followbot_policy_test.exs
+++ b/test/web/activity_pub/mrf/anti_followbot_policy_test.exs
@@ -54,4 +54,19 @@ test "it allows non-followbots" do
{:ok, _} = AntiFollowbotPolicy.filter(message)
end
+
+ test "it gracefully handles nil display names" do
+ actor = insert(:user, %{name: nil})
+ target = insert(:user)
+
+ message = %{
+ "@context" => "https://www.w3.org/ns/activitystreams",
+ "type" => "Follow",
+ "actor" => actor.ap_id,
+ "object" => target.ap_id,
+ "id" => "https://example.com/activities/1234"
+ }
+
+ {:ok, _} = AntiFollowbotPolicy.filter(message)
+ end
end
diff --git a/test/web/activity_pub/transmogrifier_test.exs b/test/web/activity_pub/transmogrifier_test.exs
index 86c66deff..afb931934 100644
--- a/test/web/activity_pub/transmogrifier_test.exs
+++ b/test/web/activity_pub/transmogrifier_test.exs
@@ -4,13 +4,14 @@
defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
use Pleroma.DataCase
+ alias Pleroma.Activity
+ alias Pleroma.Object
+ alias Pleroma.Repo
+ alias Pleroma.User
+ alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.Transmogrifier
alias Pleroma.Web.ActivityPub.Utils
- alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.OStatus
- alias Pleroma.Activity
- alias Pleroma.User
- alias Pleroma.Repo
alias Pleroma.Web.Websub.WebsubClientSubscription
import Pleroma.Factory
@@ -764,6 +765,30 @@ test "it remaps video URLs as attachments if necessary" do
assert object.data["attachment"] == [attachment]
end
+
+ test "it accepts Flag activities" do
+ user = insert(:user)
+ other_user = insert(:user)
+
+ {:ok, activity} = CommonAPI.post(user, %{"status" => "test post"})
+ object = Object.normalize(activity.data["object"])
+
+ message = %{
+ "@context" => "https://www.w3.org/ns/activitystreams",
+ "cc" => [user.ap_id],
+ "object" => [user.ap_id, object.data["id"]],
+ "type" => "Flag",
+ "content" => "blocked AND reported!!!",
+ "actor" => other_user.ap_id
+ }
+
+ assert {:ok, activity} = Transmogrifier.handle_incoming(message)
+
+ assert activity.data["object"] == [user.ap_id, object.data["id"]]
+ assert activity.data["content"] == "blocked AND reported!!!"
+ assert activity.data["actor"] == other_user.ap_id
+ assert activity.data["cc"] == [user.ap_id]
+ end
end
describe "prepare outgoing" do
diff --git a/test/web/activity_pub/utils_test.exs b/test/web/activity_pub/utils_test.exs
index aeed0564c..2bd3ddf93 100644
--- a/test/web/activity_pub/utils_test.exs
+++ b/test/web/activity_pub/utils_test.exs
@@ -1,6 +1,9 @@
defmodule Pleroma.Web.ActivityPub.UtilsTest do
use Pleroma.DataCase
alias Pleroma.Web.ActivityPub.Utils
+ alias Pleroma.Web.CommonAPI
+
+ import Pleroma.Factory
describe "determine_explicit_mentions()" do
test "works with an object that has mentions" do
@@ -54,4 +57,116 @@ test "works with an object that has only IR tags" do
assert Utils.determine_explicit_mentions(object) == []
end
end
+
+ describe "make_like_data" do
+ setup do
+ user = insert(:user)
+ other_user = insert(:user)
+ third_user = insert(:user)
+ [user: user, other_user: other_user, third_user: third_user]
+ end
+
+ test "addresses actor's follower address if the activity is public", %{
+ user: user,
+ other_user: other_user,
+ third_user: third_user
+ } do
+ expected_to = Enum.sort([user.ap_id, other_user.follower_address])
+ expected_cc = Enum.sort(["https://www.w3.org/ns/activitystreams#Public", third_user.ap_id])
+
+ {:ok, activity} =
+ CommonAPI.post(user, %{
+ "status" =>
+ "hey @#{other_user.nickname}, @#{third_user.nickname} how about beering together this weekend?"
+ })
+
+ %{"to" => to, "cc" => cc} = Utils.make_like_data(other_user, activity, nil)
+ assert Enum.sort(to) == expected_to
+ assert Enum.sort(cc) == expected_cc
+ end
+
+ test "does not adress actor's follower address if the activity is not public", %{
+ user: user,
+ other_user: other_user,
+ third_user: third_user
+ } do
+ expected_to = Enum.sort([user.ap_id])
+ expected_cc = [third_user.ap_id]
+
+ {:ok, activity} =
+ CommonAPI.post(user, %{
+ "status" => "@#{other_user.nickname} @#{third_user.nickname} bought a new swimsuit!",
+ "visibility" => "private"
+ })
+
+ %{"to" => to, "cc" => cc} = Utils.make_like_data(other_user, activity, nil)
+ assert Enum.sort(to) == expected_to
+ assert Enum.sort(cc) == expected_cc
+ end
+ end
+
+ describe "fetch_ordered_collection" do
+ import Tesla.Mock
+
+ test "fetches the first OrderedCollectionPage when an OrderedCollection is encountered" do
+ mock(fn
+ %{method: :get, url: "http://mastodon.com/outbox"} ->
+ json(%{"type" => "OrderedCollection", "first" => "http://mastodon.com/outbox?page=true"})
+
+ %{method: :get, url: "http://mastodon.com/outbox?page=true"} ->
+ json(%{"type" => "OrderedCollectionPage", "orderedItems" => ["ok"]})
+ end)
+
+ assert Utils.fetch_ordered_collection("http://mastodon.com/outbox", 1) == ["ok"]
+ end
+
+ test "fetches several pages in the right order one after another, but only the specified amount" do
+ mock(fn
+ %{method: :get, url: "http://example.com/outbox"} ->
+ json(%{
+ "type" => "OrderedCollectionPage",
+ "orderedItems" => [0],
+ "next" => "http://example.com/outbox?page=1"
+ })
+
+ %{method: :get, url: "http://example.com/outbox?page=1"} ->
+ json(%{
+ "type" => "OrderedCollectionPage",
+ "orderedItems" => [1],
+ "next" => "http://example.com/outbox?page=2"
+ })
+
+ %{method: :get, url: "http://example.com/outbox?page=2"} ->
+ json(%{"type" => "OrderedCollectionPage", "orderedItems" => [2]})
+ end)
+
+ assert Utils.fetch_ordered_collection("http://example.com/outbox", 0) == [0]
+ assert Utils.fetch_ordered_collection("http://example.com/outbox", 1) == [0, 1]
+ end
+
+ test "returns an error if the url doesn't have an OrderedCollection/Page" do
+ mock(fn
+ %{method: :get, url: "http://example.com/not-an-outbox"} ->
+ json(%{"type" => "NotAnOutbox"})
+ end)
+
+ assert {:error, _} = Utils.fetch_ordered_collection("http://example.com/not-an-outbox", 1)
+ end
+
+ test "returns the what was collected if there are less pages than specified" do
+ mock(fn
+ %{method: :get, url: "http://example.com/outbox"} ->
+ json(%{
+ "type" => "OrderedCollectionPage",
+ "orderedItems" => [0],
+ "next" => "http://example.com/outbox?page=1"
+ })
+
+ %{method: :get, url: "http://example.com/outbox?page=1"} ->
+ json(%{"type" => "OrderedCollectionPage", "orderedItems" => [1]})
+ end)
+
+ assert Utils.fetch_ordered_collection("http://example.com/outbox", 5) == [0, 1]
+ end
+ end
end
diff --git a/test/web/activity_pub/views/object_view_test.exs b/test/web/activity_pub/views/object_view_test.exs
index d144a77fc..d939fc5a7 100644
--- a/test/web/activity_pub/views/object_view_test.exs
+++ b/test/web/activity_pub/views/object_view_test.exs
@@ -2,8 +2,8 @@ defmodule Pleroma.Web.ActivityPub.ObjectViewTest do
use Pleroma.DataCase
import Pleroma.Factory
- alias Pleroma.Web.CommonAPI
alias Pleroma.Web.ActivityPub.ObjectView
+ alias Pleroma.Web.CommonAPI
test "renders a note object" do
note = insert(:note)
diff --git a/test/web/activity_pub/visibilty_test.exs b/test/web/activity_pub/visibilty_test.exs
index 1172b7455..24b96c4aa 100644
--- a/test/web/activity_pub/visibilty_test.exs
+++ b/test/web/activity_pub/visibilty_test.exs
@@ -1,8 +1,8 @@
defmodule Pleroma.Web.ActivityPub.VisibilityTest do
use Pleroma.DataCase
- alias Pleroma.Web.CommonAPI
alias Pleroma.Web.ActivityPub.Visibility
+ alias Pleroma.Web.CommonAPI
import Pleroma.Factory
setup do
diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs
index 9fbaaba39..e50f0edde 100644
--- a/test/web/admin_api/admin_api_controller_test.exs
+++ b/test/web/admin_api/admin_api_controller_test.exs
@@ -330,4 +330,208 @@ test "/api/pleroma/admin/password_reset" do
assert conn.status == 200
end
+
+ describe "GET /api/pleroma/admin/users" do
+ test "renders users array for the first page" do
+ admin = insert(:user, info: %{is_admin: true})
+ user = insert(:user, local: false, tags: ["foo", "bar"])
+
+ conn =
+ build_conn()
+ |> assign(:user, admin)
+ |> get("/api/pleroma/admin/users?page=1")
+
+ assert json_response(conn, 200) == %{
+ "count" => 2,
+ "page_size" => 50,
+ "users" => [
+ %{
+ "deactivated" => admin.info.deactivated,
+ "id" => admin.id,
+ "nickname" => admin.nickname,
+ "roles" => %{"admin" => true, "moderator" => false},
+ "local" => true,
+ "tags" => []
+ },
+ %{
+ "deactivated" => user.info.deactivated,
+ "id" => user.id,
+ "nickname" => user.nickname,
+ "roles" => %{"admin" => false, "moderator" => false},
+ "local" => false,
+ "tags" => ["foo", "bar"]
+ }
+ ]
+ }
+ end
+
+ test "renders empty array for the second page" do
+ admin = insert(:user, info: %{is_admin: true})
+ insert(:user)
+
+ conn =
+ build_conn()
+ |> assign(:user, admin)
+ |> get("/api/pleroma/admin/users?page=2")
+
+ assert json_response(conn, 200) == %{
+ "count" => 2,
+ "page_size" => 50,
+ "users" => []
+ }
+ end
+
+ test "regular search" do
+ admin = insert(:user, info: %{is_admin: true})
+ user = insert(:user, nickname: "bob")
+
+ conn =
+ build_conn()
+ |> assign(:user, admin)
+ |> get("/api/pleroma/admin/users?query=bo")
+
+ assert json_response(conn, 200) == %{
+ "count" => 1,
+ "page_size" => 50,
+ "users" => [
+ %{
+ "deactivated" => user.info.deactivated,
+ "id" => user.id,
+ "nickname" => user.nickname,
+ "roles" => %{"admin" => false, "moderator" => false},
+ "local" => true,
+ "tags" => []
+ }
+ ]
+ }
+ end
+
+ test "regular search with page size" do
+ admin = insert(:user, info: %{is_admin: true})
+ user = insert(:user, nickname: "bob")
+ user2 = insert(:user, nickname: "bo")
+
+ conn =
+ build_conn()
+ |> assign(:user, admin)
+ |> get("/api/pleroma/admin/users?query=bo&page_size=1&page=1")
+
+ assert json_response(conn, 200) == %{
+ "count" => 2,
+ "page_size" => 1,
+ "users" => [
+ %{
+ "deactivated" => user.info.deactivated,
+ "id" => user.id,
+ "nickname" => user.nickname,
+ "roles" => %{"admin" => false, "moderator" => false},
+ "local" => true,
+ "tags" => []
+ }
+ ]
+ }
+
+ conn =
+ build_conn()
+ |> assign(:user, admin)
+ |> get("/api/pleroma/admin/users?query=bo&page_size=1&page=2")
+
+ assert json_response(conn, 200) == %{
+ "count" => 2,
+ "page_size" => 1,
+ "users" => [
+ %{
+ "deactivated" => user2.info.deactivated,
+ "id" => user2.id,
+ "nickname" => user2.nickname,
+ "roles" => %{"admin" => false, "moderator" => false},
+ "local" => true,
+ "tags" => []
+ }
+ ]
+ }
+ end
+
+ test "only local users" do
+ admin = insert(:user, info: %{is_admin: true}, nickname: "john")
+ user = insert(:user, nickname: "bob")
+
+ insert(:user, nickname: "bobb", local: false)
+
+ conn =
+ build_conn()
+ |> assign(:user, admin)
+ |> get("/api/pleroma/admin/users?query=bo&local_only=true")
+
+ assert json_response(conn, 200) == %{
+ "count" => 1,
+ "page_size" => 50,
+ "users" => [
+ %{
+ "deactivated" => user.info.deactivated,
+ "id" => user.id,
+ "nickname" => user.nickname,
+ "roles" => %{"admin" => false, "moderator" => false},
+ "local" => true,
+ "tags" => []
+ }
+ ]
+ }
+ end
+
+ test "only local users with no query" do
+ admin = insert(:user, info: %{is_admin: true}, nickname: "john")
+ user = insert(:user, nickname: "bob")
+
+ insert(:user, nickname: "bobb", local: false)
+
+ conn =
+ build_conn()
+ |> assign(:user, admin)
+ |> get("/api/pleroma/admin/users?local_only=true")
+
+ assert json_response(conn, 200) == %{
+ "count" => 2,
+ "page_size" => 50,
+ "users" => [
+ %{
+ "deactivated" => admin.info.deactivated,
+ "id" => admin.id,
+ "nickname" => admin.nickname,
+ "roles" => %{"admin" => true, "moderator" => false},
+ "local" => true,
+ "tags" => []
+ },
+ %{
+ "deactivated" => user.info.deactivated,
+ "id" => user.id,
+ "nickname" => user.nickname,
+ "roles" => %{"admin" => false, "moderator" => false},
+ "local" => true,
+ "tags" => []
+ }
+ ]
+ }
+ end
+ end
+
+ test "PATCH /api/pleroma/admin/users/:nickname/toggle_activation" do
+ admin = insert(:user, info: %{is_admin: true})
+ user = insert(:user)
+
+ conn =
+ build_conn()
+ |> assign(:user, admin)
+ |> patch("/api/pleroma/admin/users/#{user.nickname}/toggle_activation")
+
+ assert json_response(conn, 200) ==
+ %{
+ "deactivated" => !user.info.deactivated,
+ "id" => user.id,
+ "nickname" => user.nickname,
+ "roles" => %{"admin" => false, "moderator" => false},
+ "local" => true,
+ "tags" => []
+ }
+ end
end
diff --git a/test/web/common_api/common_api_test.exs b/test/web/common_api/common_api_test.exs
index 9ba320f59..f83f80b40 100644
--- a/test/web/common_api/common_api_test.exs
+++ b/test/web/common_api/common_api_test.exs
@@ -4,9 +4,9 @@
defmodule Pleroma.Web.CommonAPITest do
use Pleroma.DataCase
- alias Pleroma.Web.CommonAPI
- alias Pleroma.User
alias Pleroma.Activity
+ alias Pleroma.User
+ alias Pleroma.Web.CommonAPI
import Pleroma.Factory
@@ -221,4 +221,27 @@ test "creates a report" do
} = flag_activity
end
end
+
+ describe "reblog muting" do
+ setup do
+ muter = insert(:user)
+
+ muted = insert(:user)
+
+ [muter: muter, muted: muted]
+ end
+
+ test "add a reblog mute", %{muter: muter, muted: muted} do
+ {:ok, muter} = CommonAPI.hide_reblogs(muter, muted)
+
+ assert Pleroma.User.showing_reblogs?(muter, muted) == false
+ end
+
+ test "remove a reblog mute", %{muter: muter, muted: muted} do
+ {:ok, muter} = CommonAPI.hide_reblogs(muter, muted)
+ {:ok, muter} = CommonAPI.show_reblogs(muter, muted)
+
+ assert Pleroma.User.showing_reblogs?(muter, muted) == true
+ end
+ end
end
diff --git a/test/web/common_api/common_api_utils_test.exs b/test/web/common_api/common_api_utils_test.exs
index faed6b685..4c97b0d62 100644
--- a/test/web/common_api/common_api_utils_test.exs
+++ b/test/web/common_api/common_api_utils_test.exs
@@ -3,9 +3,9 @@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.CommonAPI.UtilsTest do
+ alias Pleroma.Builders.UserBuilder
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.Endpoint
- alias Pleroma.Builders.UserBuilder
use Pleroma.DataCase
test "it adds attachment links to a given text and attachment set" do
@@ -57,19 +57,19 @@ test "parses emoji from name and bio" do
assert expected == Utils.emoji_from_profile(user)
end
- describe "format_input/4" do
+ describe "format_input/3" do
test "works for bare text/plain" do
text = "hello world!"
expected = "hello world!"
- output = Utils.format_input(text, [], [], "text/plain")
+ {output, [], []} = Utils.format_input(text, "text/plain")
assert output == expected
text = "hello world!\n\nsecond paragraph!"
expected = "hello world!hello world!
"
expected = "hello world!
"
- output = Utils.format_input(text, [], [], "text/html")
+ {output, [], []} = Utils.format_input(text, "text/html")
assert output == expected
text = "hello world!
\n\nsecond paragraph
"
expected = "hello world!
\n\nsecond paragraph
"
- output = Utils.format_input(text, [], [], "text/html")
+ {output, [], []} = Utils.format_input(text, "text/html")
assert output == expected
end
@@ -94,14 +94,44 @@ test "works for bare text/markdown" do
text = "**hello world**"
expected = "hello world
\n"
- output = Utils.format_input(text, [], [], "text/markdown")
+ {output, [], []} = Utils.format_input(text, "text/markdown")
assert output == expected
text = "**hello world**\n\n*another paragraph*"
expected = "hello world
\nanother paragraph
\n"
- output = Utils.format_input(text, [], [], "text/markdown")
+ {output, [], []} = Utils.format_input(text, "text/markdown")
+
+ assert output == expected
+
+ text = """
+ > cool quote
+
+ by someone
+ """
+
+ expected = "cool quote
\nby someone
\n"
+
+ {output, [], []} = Utils.format_input(text, "text/markdown")
+
+ assert output == expected
+ end
+
+ test "works for text/markdown with mentions" do
+ {:ok, user} =
+ UserBuilder.insert(%{nickname: "user__test", ap_id: "http://foo.com/user__test"})
+
+ text = "**hello world**\n\n*another @user__test and @user__test google.com paragraph*"
+
+ expected =
+ "hello world
\nanother @user__test @user__test google.com paragraph
\n"
+
+ {output, _, _} = Utils.format_input(text, "text/markdown")
assert output == expected
end
diff --git a/test/web/federator_test.exs b/test/web/federator_test.exs
index 08279f230..52729eb50 100644
--- a/test/web/federator_test.exs
+++ b/test/web/federator_test.exs
@@ -3,9 +3,9 @@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.FederatorTest do
+ alias Pleroma.Instances
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.Federator
- alias Pleroma.Instances
use Pleroma.DataCase
import Pleroma.Factory
import Mock
diff --git a/test/web/instances/instance_test.exs b/test/web/instances/instance_test.exs
index a158c0a42..d28730994 100644
--- a/test/web/instances/instance_test.exs
+++ b/test/web/instances/instance_test.exs
@@ -3,8 +3,8 @@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Instances.InstanceTest do
- alias Pleroma.Repo
alias Pleroma.Instances.Instance
+ alias Pleroma.Repo
use Pleroma.DataCase
diff --git a/test/web/instances/instances_test.exs b/test/web/instances/instances_test.exs
index 2530c09fe..f0d84edea 100644
--- a/test/web/instances/instances_test.exs
+++ b/test/web/instances/instances_test.exs
@@ -102,7 +102,8 @@ test "returns error status on non-binary input" do
end
end
- # Note: implementation-specific (e.g. Instance) details of set_unreachable/1 should be tested in implementation-specific tests
+ # Note: implementation-specific (e.g. Instance) details of set_unreachable/1
+ # should be tested in implementation-specific tests
describe "set_unreachable/1" do
test "returns error status on non-binary input" do
assert {:error, _} = Instances.set_unreachable(nil)
diff --git a/test/web/mastodon_api/account_view_test.exs b/test/web/mastodon_api/account_view_test.exs
index f8cd68173..6dc60afe9 100644
--- a/test/web/mastodon_api/account_view_test.exs
+++ b/test/web/mastodon_api/account_view_test.exs
@@ -5,8 +5,8 @@
defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
use Pleroma.DataCase
import Pleroma.Factory
- alias Pleroma.Web.MastodonAPI.AccountView
alias Pleroma.User
+ alias Pleroma.Web.MastodonAPI.AccountView
test "Represent a user account" do
source_data = %{
@@ -63,7 +63,8 @@ test "Represent a user account" do
confirmation_pending: false,
tags: [],
is_admin: false,
- is_moderator: false
+ is_moderator: false,
+ relationship: %{}
}
}
@@ -106,7 +107,8 @@ test "Represent a Service(bot) account" do
confirmation_pending: false,
tags: [],
is_admin: false,
- is_moderator: false
+ is_moderator: false,
+ relationship: %{}
}
}
@@ -142,10 +144,70 @@ test "represent a relationship" do
muting_notifications: false,
requested: false,
domain_blocking: false,
- showing_reblogs: false,
+ showing_reblogs: true,
endorsed: false
}
assert expected == AccountView.render("relationship.json", %{user: user, target: other_user})
end
+
+ test "represent an embedded relationship" do
+ user =
+ insert(:user, %{
+ info: %{note_count: 5, follower_count: 3, source_data: %{"type" => "Service"}},
+ nickname: "shp@shitposter.club",
+ inserted_at: ~N[2017-08-15 15:47:06.597036]
+ })
+
+ other_user = insert(:user)
+
+ {:ok, other_user} = User.follow(other_user, user)
+ {:ok, other_user} = User.block(other_user, user)
+
+ expected = %{
+ id: to_string(user.id),
+ username: "shp",
+ acct: user.nickname,
+ display_name: user.name,
+ locked: false,
+ created_at: "2017-08-15T15:47:06.000Z",
+ followers_count: 3,
+ following_count: 0,
+ statuses_count: 5,
+ note: user.bio,
+ url: user.ap_id,
+ avatar: "http://localhost:4001/images/avi.png",
+ avatar_static: "http://localhost:4001/images/avi.png",
+ header: "http://localhost:4001/images/banner.png",
+ header_static: "http://localhost:4001/images/banner.png",
+ emojis: [],
+ fields: [],
+ bot: true,
+ source: %{
+ note: "",
+ privacy: "public",
+ sensitive: false
+ },
+ pleroma: %{
+ confirmation_pending: false,
+ tags: [],
+ is_admin: false,
+ is_moderator: false,
+ relationship: %{
+ id: to_string(user.id),
+ following: false,
+ followed_by: false,
+ blocking: true,
+ muting: false,
+ muting_notifications: false,
+ requested: false,
+ domain_blocking: false,
+ showing_reblogs: true,
+ endorsed: false
+ }
+ }
+ }
+
+ assert expected == AccountView.render("account.json", %{user: user, for: other_user})
+ end
end
diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs
index b52c2b805..74bf05708 100644
--- a/test/web/mastodon_api/mastodon_api_controller_test.exs
+++ b/test/web/mastodon_api/mastodon_api_controller_test.exs
@@ -5,17 +5,17 @@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
use Pleroma.Web.ConnCase
- alias Pleroma.Web.TwitterAPI.TwitterAPI
- alias Pleroma.Repo
- alias Pleroma.User
- alias Pleroma.Object
+ alias Ecto.Changeset
alias Pleroma.Activity
alias Pleroma.Notification
- alias Pleroma.Web.OStatus
- alias Pleroma.Web.CommonAPI
+ alias Pleroma.Object
+ alias Pleroma.Repo
+ alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
+ alias Pleroma.Web.CommonAPI
alias Pleroma.Web.MastodonAPI.FilterView
- alias Ecto.Changeset
+ alias Pleroma.Web.OStatus
+ alias Pleroma.Web.TwitterAPI.TwitterAPI
import Pleroma.Factory
import ExUnit.CaptureLog
import Tesla.Mock
@@ -248,6 +248,33 @@ test "direct timeline", %{conn: conn} do
assert status["url"] != direct.data["id"]
end
+ test "doesn't include DMs from blocked users", %{conn: conn} do
+ blocker = insert(:user)
+ blocked = insert(:user)
+ user = insert(:user)
+ {:ok, blocker} = User.block(blocker, blocked)
+
+ {:ok, _blocked_direct} =
+ CommonAPI.post(blocked, %{
+ "status" => "Hi @#{blocker.nickname}!",
+ "visibility" => "direct"
+ })
+
+ {:ok, direct} =
+ CommonAPI.post(user, %{
+ "status" => "Hi @#{blocker.nickname}!",
+ "visibility" => "direct"
+ })
+
+ res_conn =
+ conn
+ |> assign(:user, user)
+ |> get("api/v1/timelines/direct")
+
+ [status] = json_response(res_conn, 200)
+ assert status["id"] == direct.id
+ end
+
test "replying to a status", %{conn: conn} do
user = insert(:user)
@@ -344,6 +371,30 @@ test "when you didn't create it", %{conn: conn} do
assert Repo.get(Activity, activity.id) == activity
end
+
+ test "when you're an admin or moderator", %{conn: conn} do
+ activity1 = insert(:note_activity)
+ activity2 = insert(:note_activity)
+ admin = insert(:user, info: %{is_admin: true})
+ moderator = insert(:user, info: %{is_moderator: true})
+
+ res_conn =
+ conn
+ |> assign(:user, admin)
+ |> delete("/api/v1/statuses/#{activity1.id}")
+
+ assert %{} = json_response(res_conn, 200)
+
+ res_conn =
+ conn
+ |> assign(:user, moderator)
+ |> delete("/api/v1/statuses/#{activity2.id}")
+
+ assert %{} = json_response(res_conn, 200)
+
+ refute Repo.get(Activity, activity1.id)
+ refute Repo.get(Activity, activity2.id)
+ end
end
describe "filters" do
@@ -946,7 +997,6 @@ test "/api/v1/follow_requests/:id/authorize works" do
other_user = Repo.get(User, other_user.id)
assert User.following?(other_user, user) == false
- assert user.info.follow_request_count == 1
conn =
build_conn()
@@ -960,7 +1010,6 @@ test "/api/v1/follow_requests/:id/authorize works" do
other_user = Repo.get(User, other_user.id)
assert User.following?(other_user, user) == true
- assert user.info.follow_request_count == 0
end
test "verify_credentials", %{conn: conn} do
@@ -982,7 +1031,6 @@ test "/api/v1/follow_requests/:id/reject works" do
{:ok, _activity} = ActivityPub.follow(other_user, user)
user = Repo.get(User, user.id)
- assert user.info.follow_request_count == 1
conn =
build_conn()
@@ -996,7 +1044,6 @@ test "/api/v1/follow_requests/:id/reject works" do
other_user = Repo.get(User, other_user.id)
assert User.following?(other_user, user) == false
- assert user.info.follow_request_count == 0
end
end
@@ -1017,6 +1064,17 @@ test "account fetching", %{conn: conn} do
assert %{"error" => "Can't find user"} = json_response(conn, 404)
end
+ test "account fetching also works nickname", %{conn: conn} do
+ user = insert(:user)
+
+ conn =
+ conn
+ |> get("/api/v1/accounts/#{user.nickname}")
+
+ assert %{"id" => id} = json_response(conn, 200)
+ assert id == user.id
+ end
+
test "media upload", %{conn: conn} do
file = %Plug.Upload{
content_type: "image/jpg",
@@ -1137,6 +1195,47 @@ test "getting followers, hide_followers, same user requesting", %{conn: conn} do
refute [] == json_response(conn, 200)
end
+ test "getting followers, pagination", %{conn: conn} do
+ user = insert(:user)
+ follower1 = insert(:user)
+ follower2 = insert(:user)
+ follower3 = insert(:user)
+ {:ok, _} = User.follow(follower1, user)
+ {:ok, _} = User.follow(follower2, user)
+ {:ok, _} = User.follow(follower3, user)
+
+ conn =
+ conn
+ |> assign(:user, user)
+
+ res_conn =
+ conn
+ |> get("/api/v1/accounts/#{user.id}/followers?since_id=#{follower1.id}")
+
+ assert [%{"id" => id3}, %{"id" => id2}] = json_response(res_conn, 200)
+ assert id3 == follower3.id
+ assert id2 == follower2.id
+
+ res_conn =
+ conn
+ |> get("/api/v1/accounts/#{user.id}/followers?max_id=#{follower3.id}")
+
+ assert [%{"id" => id2}, %{"id" => id1}] = json_response(res_conn, 200)
+ assert id2 == follower2.id
+ assert id1 == follower1.id
+
+ res_conn =
+ conn
+ |> get("/api/v1/accounts/#{user.id}/followers?limit=1&max_id=#{follower3.id}")
+
+ assert [%{"id" => id2}] = json_response(res_conn, 200)
+ assert id2 == follower2.id
+
+ assert [link_header] = get_resp_header(res_conn, "link")
+ assert link_header =~ ~r/since_id=#{follower2.id}/
+ assert link_header =~ ~r/max_id=#{follower2.id}/
+ end
+
test "getting following", %{conn: conn} do
user = insert(:user)
other_user = insert(:user)
@@ -1175,6 +1274,47 @@ test "getting following, hide_follows, same user requesting", %{conn: conn} do
refute [] == json_response(conn, 200)
end
+ test "getting following, pagination", %{conn: conn} do
+ user = insert(:user)
+ following1 = insert(:user)
+ following2 = insert(:user)
+ following3 = insert(:user)
+ {:ok, _} = User.follow(user, following1)
+ {:ok, _} = User.follow(user, following2)
+ {:ok, _} = User.follow(user, following3)
+
+ conn =
+ conn
+ |> assign(:user, user)
+
+ res_conn =
+ conn
+ |> get("/api/v1/accounts/#{user.id}/following?since_id=#{following1.id}")
+
+ assert [%{"id" => id3}, %{"id" => id2}] = json_response(res_conn, 200)
+ assert id3 == following3.id
+ assert id2 == following2.id
+
+ res_conn =
+ conn
+ |> get("/api/v1/accounts/#{user.id}/following?max_id=#{following3.id}")
+
+ assert [%{"id" => id2}, %{"id" => id1}] = json_response(res_conn, 200)
+ assert id2 == following2.id
+ assert id1 == following1.id
+
+ res_conn =
+ conn
+ |> get("/api/v1/accounts/#{user.id}/following?limit=1&max_id=#{following3.id}")
+
+ assert [%{"id" => id2}] = json_response(res_conn, 200)
+ assert id2 == following2.id
+
+ assert [link_header] = get_resp_header(res_conn, "link")
+ assert link_header =~ ~r/since_id=#{following2.id}/
+ assert link_header =~ ~r/max_id=#{following2.id}/
+ end
+
test "following / unfollowing a user", %{conn: conn} do
user = insert(:user)
other_user = insert(:user)
@@ -1492,9 +1632,10 @@ test "updates the user's bio", %{conn: conn} do
assert user = json_response(conn, 200)
assert user["note"] ==
- "I drink #cofe with @#{user2.nickname} #cofe with @) <> user2.nickname <> ~s( "Create",
+ "object" => %{
+ "content" =>
+ "Lorem ipsum dolor sit amet , consectetur :bear: adipiscing elit. Fusce sagittis finibus turpis."
+ }
+ }
+ }
+ },
+ %{nickname: "Bob"}
+ ) ==
+ "@Bob: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce sagittis fini..."
+ end
+
+ test "renders body for follow activity" do
+ assert Impl.format_body(%{activity: %{data: %{"type" => "Follow"}}}, %{nickname: "Bob"}) ==
+ "@Bob has followed you"
+ end
+
+ test "renders body for announce activity" do
+ user = insert(:user)
+
+ note =
+ insert(:note, %{
+ data: %{
+ "content" =>
+ "Lorem ipsum dolor sit amet , consectetur :bear: adipiscing elit. Fusce sagittis finibus turpis."
+ }
+ })
+
+ note_activity = insert(:note_activity, %{note: note})
+ announce_activity = insert(:announce_activity, %{user: user, note_activity: note_activity})
+
+ assert Impl.format_body(%{activity: announce_activity}, user) ==
+ "@#{user.nickname} repeated: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce sagittis fini..."
+ end
+
+ test "renders body for like activity" do
+ assert Impl.format_body(%{activity: %{data: %{"type" => "Like"}}}, %{nickname: "Bob"}) ==
+ "@Bob has favorited your post"
+ end
+end
diff --git a/test/web/rel_me_test.exs b/test/web/rel_me_test.exs
new file mode 100644
index 000000000..5188f4de1
--- /dev/null
+++ b/test/web/rel_me_test.exs
@@ -0,0 +1,67 @@
+defmodule Pleroma.Web.RelMeTest do
+ use ExUnit.Case, async: true
+
+ setup do
+ Tesla.Mock.mock(fn
+ %{
+ method: :get,
+ url: "http://example.com/rel_me/anchor"
+ } ->
+ %Tesla.Env{status: 200, body: File.read!("test/fixtures/rel_me_anchor.html")}
+
+ %{
+ method: :get,
+ url: "http://example.com/rel_me/anchor_nofollow"
+ } ->
+ %Tesla.Env{status: 200, body: File.read!("test/fixtures/rel_me_anchor_nofollow.html")}
+
+ %{
+ method: :get,
+ url: "http://example.com/rel_me/link"
+ } ->
+ %Tesla.Env{status: 200, body: File.read!("test/fixtures/rel_me_link.html")}
+
+ %{
+ method: :get,
+ url: "http://example.com/rel_me/null"
+ } ->
+ %Tesla.Env{status: 200, body: File.read!("test/fixtures/rel_me_null.html")}
+ end)
+
+ :ok
+ end
+
+ test "parse/1" do
+ hrefs = ["https://social.example.org/users/lain"]
+
+ assert Pleroma.Web.RelMe.parse("http://example.com/rel_me/null") == {:ok, []}
+ assert {:error, _} = Pleroma.Web.RelMe.parse("http://example.com/rel_me/error")
+
+ assert Pleroma.Web.RelMe.parse("http://example.com/rel_me/link") == {:ok, hrefs}
+ assert Pleroma.Web.RelMe.parse("http://example.com/rel_me/anchor") == {:ok, hrefs}
+ assert Pleroma.Web.RelMe.parse("http://example.com/rel_me/anchor_nofollow") == {:ok, hrefs}
+ end
+
+ test "maybe_put_rel_me/2" do
+ profile_urls = ["https://social.example.org/users/lain"]
+ attr = "me"
+ fallback = nil
+
+ assert Pleroma.Web.RelMe.maybe_put_rel_me("http://example.com/rel_me/null", profile_urls) ==
+ fallback
+
+ assert Pleroma.Web.RelMe.maybe_put_rel_me("http://example.com/rel_me/error", profile_urls) ==
+ fallback
+
+ assert Pleroma.Web.RelMe.maybe_put_rel_me("http://example.com/rel_me/anchor", profile_urls) ==
+ attr
+
+ assert Pleroma.Web.RelMe.maybe_put_rel_me(
+ "http://example.com/rel_me/anchor_nofollow",
+ profile_urls
+ ) == attr
+
+ assert Pleroma.Web.RelMe.maybe_put_rel_me("http://example.com/rel_me/link", profile_urls) ==
+ attr
+ end
+end
diff --git a/test/web/rich_media/helpers_test.exs b/test/web/rich_media/helpers_test.exs
new file mode 100644
index 000000000..60d93768f
--- /dev/null
+++ b/test/web/rich_media/helpers_test.exs
@@ -0,0 +1,62 @@
+defmodule Pleroma.Web.RichMedia.HelpersTest do
+ use Pleroma.DataCase
+
+ alias Pleroma.Web.CommonAPI
+
+ import Pleroma.Factory
+ import Tesla.Mock
+
+ setup do
+ mock(fn env -> apply(HttpRequestMock, :request, [env]) end)
+ :ok
+ end
+
+ test "refuses to crawl incomplete URLs" do
+ user = insert(:user)
+
+ {:ok, activity} =
+ CommonAPI.post(user, %{
+ "status" => "[test](example.com/ogp)",
+ "content_type" => "text/markdown"
+ })
+
+ Pleroma.Config.put([:rich_media, :enabled], true)
+
+ assert %{} == Pleroma.Web.RichMedia.Helpers.fetch_data_for_activity(activity)
+
+ Pleroma.Config.put([:rich_media, :enabled], false)
+ end
+
+ test "refuses to crawl malformed URLs" do
+ user = insert(:user)
+
+ {:ok, activity} =
+ CommonAPI.post(user, %{
+ "status" => "[test](example.com[]/ogp)",
+ "content_type" => "text/markdown"
+ })
+
+ Pleroma.Config.put([:rich_media, :enabled], true)
+
+ assert %{} == Pleroma.Web.RichMedia.Helpers.fetch_data_for_activity(activity)
+
+ Pleroma.Config.put([:rich_media, :enabled], false)
+ end
+
+ test "crawls valid, complete URLs" do
+ user = insert(:user)
+
+ {:ok, activity} =
+ CommonAPI.post(user, %{
+ "status" => "[test](http://example.com/ogp)",
+ "content_type" => "text/markdown"
+ })
+
+ Pleroma.Config.put([:rich_media, :enabled], true)
+
+ assert %{page_url: "http://example.com/ogp", rich_media: _} =
+ Pleroma.Web.RichMedia.Helpers.fetch_data_for_activity(activity)
+
+ Pleroma.Config.put([:rich_media, :enabled], false)
+ end
+end
diff --git a/test/web/salmon/salmon_test.exs b/test/web/salmon/salmon_test.exs
index 9e583ba40..265e1abbd 100644
--- a/test/web/salmon/salmon_test.exs
+++ b/test/web/salmon/salmon_test.exs
@@ -4,10 +4,10 @@
defmodule Pleroma.Web.Salmon.SalmonTest do
use Pleroma.DataCase
- alias Pleroma.Web.Salmon
alias Pleroma.Activity
alias Pleroma.Repo
alias Pleroma.User
+ alias Pleroma.Web.Salmon
import Pleroma.Factory
@magickey "RSA.pu0s-halox4tu7wmES1FVSx6u-4wc0YrUFXcqWXZG4-27UmbCOpMQftRCldNRfyA-qLbz-eqiwQhh-1EwUvjsD4cYbAHNGHwTvDOyx5AKthQUP44ykPv7kjKGh3DWKySJvcs9tlUG87hlo7AvnMo9pwRS_Zz2CacQ-MKaXyDepk=.AQAB"
diff --git a/test/web/streamer_test.exs b/test/web/streamer_test.exs
index 16d7b9c24..bfe18cb7f 100644
--- a/test/web/streamer_test.exs
+++ b/test/web/streamer_test.exs
@@ -5,10 +5,10 @@
defmodule Pleroma.Web.StreamerTest do
use Pleroma.DataCase
- alias Pleroma.Web.Streamer
alias Pleroma.List
alias Pleroma.User
alias Pleroma.Web.CommonAPI
+ alias Pleroma.Web.Streamer
import Pleroma.Factory
test "it sends to public" do
@@ -39,7 +39,15 @@ test "it sends to public" do
task =
Task.async(fn ->
- assert_receive {:text, _}, 4_000
+ expected_event =
+ %{
+ "event" => "delete",
+ "payload" => activity.id
+ }
+ |> Jason.encode!()
+
+ assert_receive {:text, received_event}, 4_000
+ assert received_event == expected_event
end)
fake_socket = %{
@@ -194,4 +202,34 @@ test "it send wanted private posts to list" do
Task.await(task)
end
+
+ test "it doesn't send muted reblogs" do
+ user1 = insert(:user)
+ user2 = insert(:user)
+ user3 = insert(:user)
+ CommonAPI.hide_reblogs(user1, user2)
+
+ task =
+ Task.async(fn ->
+ refute_receive {:text, _}, 1_000
+ end)
+
+ fake_socket = %{
+ transport_pid: task.pid,
+ assigns: %{
+ user: user1
+ }
+ }
+
+ {:ok, create_activity} = CommonAPI.post(user3, %{"status" => "I'm kawen"})
+ {:ok, announce_activity, _} = CommonAPI.repeat(create_activity.id, user2)
+
+ topics = %{
+ "public" => [fake_socket]
+ }
+
+ Streamer.push_to_socket(topics, "public", announce_activity)
+
+ Task.await(task)
+ end
end
diff --git a/test/web/twitter_api/representers/activity_representer_test.exs b/test/web/twitter_api/representers/activity_representer_test.exs
index 365c7f659..d154385a0 100644
--- a/test/web/twitter_api/representers/activity_representer_test.exs
+++ b/test/web/twitter_api/representers/activity_representer_test.exs
@@ -4,45 +4,15 @@
defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
use Pleroma.DataCase
- alias Pleroma.User
alias Pleroma.Activity
alias Pleroma.Object
+ alias Pleroma.User
+ alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter
alias Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter
- alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.TwitterAPI.UserView
import Pleroma.Factory
- test "an announce activity" do
- user = insert(:user)
- note_activity = insert(:note_activity)
- activity_actor = Repo.get_by(User, ap_id: note_activity.data["actor"])
- object = Object.get_by_ap_id(note_activity.data["object"]["id"])
-
- {:ok, announce_activity, _object} = ActivityPub.announce(user, object)
- note_activity = Activity.get_by_ap_id(note_activity.data["id"])
-
- status =
- ActivityRepresenter.to_map(announce_activity, %{
- users: [user, activity_actor],
- announced_activity: note_activity,
- for: user
- })
-
- assert status["id"] == announce_activity.id
- assert status["user"] == UserView.render("show.json", %{user: user, for: user})
-
- retweeted_status =
- ActivityRepresenter.to_map(note_activity, %{user: activity_actor, for: user})
-
- assert retweeted_status["repeated"] == true
- assert retweeted_status["id"] == note_activity.id
- assert status["statusnet_conversation_id"] == retweeted_status["statusnet_conversation_id"]
-
- assert status["retweeted_status"] == retweeted_status
- assert status["activity_type"] == "repeat"
- end
-
test "a like activity" do
user = insert(:user)
note_activity = insert(:note_activity)
@@ -131,10 +101,14 @@ test "an activity" do
recipients: to
}
+ corndog_emojo = ~s(2hu
alert('YAY')Some @shp "
+ ~s(2hu ) <>
+ corndog_emojo <>
+ ~s(
alert\('YAY'\)Some ) <>
+ corndog_emojo <>
+ ~s( content mentioning @shp )
expected_status = %{
"id" => activity.id,
@@ -168,6 +142,7 @@ test "an activity" do
"uri" => activity.data["object"]["id"],
"visibility" => "direct",
"card" => nil,
+ "muted" => false,
"summary" => "2hu :2hu:",
"summary_html" =>
"2hu #Bike log - Commute Tuesdayhttps://pla.bike/posts/20181211/ #cycling #CHScycling #commute #Bike log - Commute Tuesdayhttps://pla.bike/posts/20181211/ #cycling #CHScycling #commute 
)
+
expected_html =
- "![\"2hu\"](\"corndog.png\" "\\"2hu\\"")