forked from mirrors/akkoma
Remove Activity, User and Notification views from TwitterAPI
This commit is contained in:
rinpatch
parent
90c2dae9a4
commit
985122cc03
4 changed files with 15 additions and 651 deletions
|
|
@ -1,366 +0,0 @@
|
||||||
# Pleroma: A lightweight social networking server
|
|
||||||
# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
|
|
||||||
# SPDX-License-Identifier: AGPL-3.0-only
|
|
||||||
|
|
||||||
defmodule Pleroma.Web.TwitterAPI.ActivityView do
|
|
||||||
use Pleroma.Web, :view
|
|
||||||
alias Pleroma.Activity
|
|
||||||
alias Pleroma.Formatter
|
|
||||||
alias Pleroma.HTML
|
|
||||||
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.UserView
|
|
||||||
|
|
||||||
import Ecto.Query
|
|
||||||
require Logger
|
|
||||||
require Pleroma.Constants
|
|
||||||
|
|
||||||
defp query_context_ids([]), do: []
|
|
||||||
|
|
||||||
defp query_context_ids(contexts) do
|
|
||||||
query = from(o in Object, where: fragment("(?)->>'id' = ANY(?)", o.data, ^contexts))
|
|
||||||
|
|
||||||
Repo.all(query)
|
|
||||||
end
|
|
||||||
|
|
||||||
defp query_users([]), do: []
|
|
||||||
|
|
||||||
defp query_users(user_ids) do
|
|
||||||
query = from(user in User, where: user.ap_id in ^user_ids)
|
|
||||||
|
|
||||||
Repo.all(query)
|
|
||||||
end
|
|
||||||
|
|
||||||
defp collect_context_ids(activities) do
|
|
||||||
_contexts =
|
|
||||||
activities
|
|
||||||
|> Enum.reject(& &1.data["context_id"])
|
|
||||||
|> Enum.map(fn %{data: data} ->
|
|
||||||
data["context"]
|
|
||||||
end)
|
|
||||||
|> Enum.filter(& &1)
|
|
||||||
|> query_context_ids()
|
|
||||||
|> Enum.reduce(%{}, fn %{data: %{"id" => ap_id}, id: id}, acc ->
|
|
||||||
Map.put(acc, ap_id, id)
|
|
||||||
end)
|
|
||||||
end
|
|
||||||
|
|
||||||
defp collect_users(activities) do
|
|
||||||
activities
|
|
||||||
|> Enum.map(fn activity ->
|
|
||||||
case activity.data do
|
|
||||||
data = %{"type" => "Follow"} ->
|
|
||||||
[data["actor"], data["object"]]
|
|
||||||
|
|
||||||
data ->
|
|
||||||
[data["actor"]]
|
|
||||||
end ++ activity.recipients
|
|
||||||
end)
|
|
||||||
|> List.flatten()
|
|
||||||
|> Enum.uniq()
|
|
||||||
|> query_users()
|
|
||||||
|> Enum.reduce(%{}, fn user, acc ->
|
|
||||||
Map.put(acc, user.ap_id, user)
|
|
||||||
end)
|
|
||||||
end
|
|
||||||
|
|
||||||
defp get_context_id(%{data: %{"context_id" => context_id}}, _) when not is_nil(context_id),
|
|
||||||
do: context_id
|
|
||||||
|
|
||||||
defp get_context_id(%{data: %{"context" => nil}}, _), do: nil
|
|
||||||
|
|
||||||
defp get_context_id(%{data: %{"context" => context}}, options) do
|
|
||||||
cond do
|
|
||||||
id = options[:context_ids][context] -> id
|
|
||||||
true -> Utils.context_to_conversation_id(context)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
defp get_context_id(_, _), do: nil
|
|
||||||
|
|
||||||
defp get_user(ap_id, opts) do
|
|
||||||
cond do
|
|
||||||
user = opts[:users][ap_id] ->
|
|
||||||
user
|
|
||||||
|
|
||||||
String.ends_with?(ap_id, "/followers") ->
|
|
||||||
nil
|
|
||||||
|
|
||||||
ap_id == Pleroma.Constants.as_public() ->
|
|
||||||
nil
|
|
||||||
|
|
||||||
user = User.get_cached_by_ap_id(ap_id) ->
|
|
||||||
user
|
|
||||||
|
|
||||||
user = User.get_by_guessed_nickname(ap_id) ->
|
|
||||||
user
|
|
||||||
|
|
||||||
true ->
|
|
||||||
User.error_user(ap_id)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def render("index.json", opts) do
|
|
||||||
context_ids = collect_context_ids(opts.activities)
|
|
||||||
users = collect_users(opts.activities)
|
|
||||||
|
|
||||||
opts =
|
|
||||||
opts
|
|
||||||
|> Map.put(:context_ids, context_ids)
|
|
||||||
|> Map.put(:users, users)
|
|
||||||
|
|
||||||
safe_render_many(
|
|
||||||
opts.activities,
|
|
||||||
ActivityView,
|
|
||||||
"activity.json",
|
|
||||||
opts
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
def render("activity.json", %{activity: %{data: %{"type" => "Delete"}} = activity} = opts) do
|
|
||||||
user = get_user(activity.data["actor"], opts)
|
|
||||||
created_at = activity.data["published"] |> 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 render("activity.json", %{activity: %{data: %{"type" => "Follow"}} = activity} = opts) do
|
|
||||||
user = get_user(activity.data["actor"], opts)
|
|
||||||
created_at = activity.data["published"] || DateTime.to_iso8601(activity.inserted_at)
|
|
||||||
created_at = created_at |> Utils.date_to_asctime()
|
|
||||||
|
|
||||||
followed = get_user(activity.data["object"], opts)
|
|
||||||
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
|
|
||||||
|
|
||||||
def render("activity.json", %{activity: %{data: %{"type" => "Announce"}} = activity} = opts) do
|
|
||||||
user = get_user(activity.data["actor"], opts)
|
|
||||||
created_at = activity.data["published"] |> Utils.date_to_asctime()
|
|
||||||
announced_activity = Activity.get_create_by_object_ap_id(activity.data["object"])
|
|
||||||
|
|
||||||
text = "#{user.nickname} repeated a status."
|
|
||||||
|
|
||||||
retweeted_status = render("activity.json", Map.merge(opts, %{activity: announced_activity}))
|
|
||||||
|
|
||||||
%{
|
|
||||||
"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" => get_context_id(announced_activity, opts),
|
|
||||||
"external_url" => activity.data["id"],
|
|
||||||
"activity_type" => "repeat"
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
def render("activity.json", %{activity: %{data: %{"type" => "Like"}} = activity} = opts) do
|
|
||||||
user = get_user(activity.data["actor"], opts)
|
|
||||||
liked_activity = Activity.get_create_by_object_ap_id(activity.data["object"])
|
|
||||||
liked_activity_id = if liked_activity, do: liked_activity.id, else: nil
|
|
||||||
|
|
||||||
created_at =
|
|
||||||
activity.data["published"]
|
|
||||||
|> Utils.date_to_asctime()
|
|
||||||
|
|
||||||
text = "#{user.nickname} favorited a status."
|
|
||||||
|
|
||||||
favorited_status =
|
|
||||||
if liked_activity,
|
|
||||||
do: render("activity.json", Map.merge(opts, %{activity: liked_activity})),
|
|
||||||
else: nil
|
|
||||||
|
|
||||||
%{
|
|
||||||
"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,
|
|
||||||
"favorited_status" => favorited_status,
|
|
||||||
"in_reply_to_status_id" => liked_activity_id,
|
|
||||||
"external_url" => activity.data["id"],
|
|
||||||
"activity_type" => "like"
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
def render(
|
|
||||||
"activity.json",
|
|
||||||
%{activity: %{data: %{"type" => "Create", "object" => object_id}} = activity} = opts
|
|
||||||
) do
|
|
||||||
user = get_user(activity.data["actor"], opts)
|
|
||||||
|
|
||||||
object = Object.normalize(object_id)
|
|
||||||
|
|
||||||
created_at = object.data["published"] |> Utils.date_to_asctime()
|
|
||||||
like_count = object.data["like_count"] || 0
|
|
||||||
announcement_count = object.data["announcement_count"] || 0
|
|
||||||
favorited = opts[:for] && opts[:for].ap_id in (object.data["likes"] || [])
|
|
||||||
repeated = opts[:for] && opts[:for].ap_id in (object.data["announcements"] || [])
|
|
||||||
pinned = activity.id in user.info.pinned_activities
|
|
||||||
|
|
||||||
attentions =
|
|
||||||
[]
|
|
||||||
|> Utils.maybe_notify_to_recipients(activity)
|
|
||||||
|> Utils.maybe_notify_mentioned_recipients(activity)
|
|
||||||
|> Enum.map(fn ap_id -> get_user(ap_id, opts) end)
|
|
||||||
|> Enum.filter(& &1)
|
|
||||||
|> Enum.map(fn user -> UserView.render("show.json", %{user: user, for: opts[:for]}) end)
|
|
||||||
|
|
||||||
conversation_id = get_context_id(activity, opts)
|
|
||||||
|
|
||||||
tags = object.data["tag"] || []
|
|
||||||
possibly_sensitive = object.data["sensitive"] || Enum.member?(tags, "nsfw")
|
|
||||||
|
|
||||||
tags = if possibly_sensitive, do: Enum.uniq(["nsfw" | tags]), else: tags
|
|
||||||
|
|
||||||
{summary, content} = render_content(object.data)
|
|
||||||
|
|
||||||
html =
|
|
||||||
content
|
|
||||||
|> HTML.get_cached_scrubbed_html_for_activity(
|
|
||||||
User.html_filter_policy(opts[:for]),
|
|
||||||
activity,
|
|
||||||
"twitterapi:content"
|
|
||||||
)
|
|
||||||
|> Formatter.emojify(object.data["emoji"])
|
|
||||||
|
|
||||||
text =
|
|
||||||
if content do
|
|
||||||
content
|
|
||||||
|> String.replace(~r/<br\s?\/?>/, "\n")
|
|
||||||
|> HTML.get_cached_stripped_html_for_activity(activity, "twitterapi:content")
|
|
||||||
else
|
|
||||||
""
|
|
||||||
end
|
|
||||||
|
|
||||||
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(summary)
|
|
||||||
|
|
||||||
card =
|
|
||||||
StatusView.render(
|
|
||||||
"card.json",
|
|
||||||
Pleroma.Web.RichMedia.Helpers.fetch_data_for_activity(activity)
|
|
||||||
)
|
|
||||||
|
|
||||||
thread_muted? =
|
|
||||||
case activity.thread_muted? do
|
|
||||||
thread_muted? when is_boolean(thread_muted?) -> thread_muted?
|
|
||||||
nil -> CommonAPI.thread_muted?(user, activity)
|
|
||||||
end
|
|
||||||
|
|
||||||
%{
|
|
||||||
"id" => activity.id,
|
|
||||||
"uri" => object.data["id"],
|
|
||||||
"user" => UserView.render("show.json", %{user: user, for: opts[:for]}),
|
|
||||||
"statusnet_html" => html,
|
|
||||||
"text" => text,
|
|
||||||
"is_local" => activity.local,
|
|
||||||
"is_post_verb" => true,
|
|
||||||
"created_at" => created_at,
|
|
||||||
"in_reply_to_status_id" => reply_parent && reply_parent.id,
|
|
||||||
"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" => (object.data["attachment"] || []) |> ObjectRepresenter.enum_to_list(opts),
|
|
||||||
"attentions" => attentions,
|
|
||||||
"fave_num" => like_count,
|
|
||||||
"repeat_num" => announcement_count,
|
|
||||||
"favorited" => !!favorited,
|
|
||||||
"repeated" => !!repeated,
|
|
||||||
"pinned" => pinned,
|
|
||||||
"external_url" => object.data["external_url"] || object.data["id"],
|
|
||||||
"tags" => tags,
|
|
||||||
"activity_type" => "post",
|
|
||||||
"possibly_sensitive" => possibly_sensitive,
|
|
||||||
"visibility" => Pleroma.Web.ActivityPub.Visibility.get_visibility(object),
|
|
||||||
"summary" => summary,
|
|
||||||
"summary_html" => summary |> Formatter.emojify(object.data["emoji"]),
|
|
||||||
"card" => card,
|
|
||||||
"muted" => thread_muted? || User.mutes?(opts[:for], user)
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
def render("activity.json", %{activity: unhandled_activity}) do
|
|
||||||
Logger.warn("#{__MODULE__} unhandled activity: #{inspect(unhandled_activity)}")
|
|
||||||
nil
|
|
||||||
end
|
|
||||||
|
|
||||||
def render_content(%{"type" => "Note"} = object) do
|
|
||||||
summary = object["summary"]
|
|
||||||
|
|
||||||
content =
|
|
||||||
if !!summary and summary != "" do
|
|
||||||
"<p>#{summary}</p>#{object["content"]}"
|
|
||||||
else
|
|
||||||
object["content"]
|
|
||||||
end
|
|
||||||
|
|
||||||
{summary, content}
|
|
||||||
end
|
|
||||||
|
|
||||||
def render_content(%{"type" => object_type} = object)
|
|
||||||
when object_type in ["Article", "Page", "Video"] do
|
|
||||||
summary = object["name"] || object["summary"]
|
|
||||||
|
|
||||||
content =
|
|
||||||
if !!summary and summary != "" and is_bitstring(object["url"]) do
|
|
||||||
"<p><a href=\"#{object["url"]}\">#{summary}</a></p>#{object["content"]}"
|
|
||||||
else
|
|
||||||
object["content"]
|
|
||||||
end
|
|
||||||
|
|
||||||
{summary, content}
|
|
||||||
end
|
|
||||||
|
|
||||||
def render_content(object) do
|
|
||||||
summary = object["summary"] || "Unhandled activity type: #{object["type"]}"
|
|
||||||
content = "<p>#{summary}</p>#{object["content"]}"
|
|
||||||
|
|
||||||
{summary, content}
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
@ -1,71 +0,0 @@
|
||||||
# Pleroma: A lightweight social networking server
|
|
||||||
# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
|
|
||||||
# SPDX-License-Identifier: AGPL-3.0-only
|
|
||||||
|
|
||||||
defmodule Pleroma.Web.TwitterAPI.NotificationView do
|
|
||||||
use Pleroma.Web, :view
|
|
||||||
alias Pleroma.Notification
|
|
||||||
alias Pleroma.User
|
|
||||||
alias Pleroma.Web.CommonAPI.Utils
|
|
||||||
alias Pleroma.Web.TwitterAPI.ActivityView
|
|
||||||
alias Pleroma.Web.TwitterAPI.UserView
|
|
||||||
|
|
||||||
require Pleroma.Constants
|
|
||||||
|
|
||||||
defp get_user(ap_id, opts) do
|
|
||||||
cond do
|
|
||||||
user = opts[:users][ap_id] ->
|
|
||||||
user
|
|
||||||
|
|
||||||
String.ends_with?(ap_id, "/followers") ->
|
|
||||||
nil
|
|
||||||
|
|
||||||
ap_id == Pleroma.Constants.as_public() ->
|
|
||||||
nil
|
|
||||||
|
|
||||||
true ->
|
|
||||||
User.get_cached_by_ap_id(ap_id)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def render("notification.json", %{notifications: notifications, for: user}) do
|
|
||||||
render_many(
|
|
||||||
notifications,
|
|
||||||
Pleroma.Web.TwitterAPI.NotificationView,
|
|
||||||
"notification.json",
|
|
||||||
for: user
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
def render(
|
|
||||||
"notification.json",
|
|
||||||
%{
|
|
||||||
notification: %Notification{
|
|
||||||
id: id,
|
|
||||||
seen: seen,
|
|
||||||
activity: activity,
|
|
||||||
inserted_at: created_at
|
|
||||||
},
|
|
||||||
for: user
|
|
||||||
} = opts
|
|
||||||
) do
|
|
||||||
ntype =
|
|
||||||
case activity.data["type"] do
|
|
||||||
"Create" -> "mention"
|
|
||||||
"Like" -> "like"
|
|
||||||
"Announce" -> "repeat"
|
|
||||||
"Follow" -> "follow"
|
|
||||||
end
|
|
||||||
|
|
||||||
from = get_user(activity.data["actor"], opts)
|
|
||||||
|
|
||||||
%{
|
|
||||||
"id" => id,
|
|
||||||
"ntype" => ntype,
|
|
||||||
"notice" => ActivityView.render("activity.json", %{activity: activity, for: user}),
|
|
||||||
"from_profile" => UserView.render("show.json", %{user: from, for: user}),
|
|
||||||
"is_seen" => if(seen, do: 1, else: 0),
|
|
||||||
"created_at" => created_at |> Utils.format_naive_asctime()
|
|
||||||
}
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
@ -1,191 +0,0 @@
|
||||||
# Pleroma: A lightweight social networking server
|
|
||||||
# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
|
|
||||||
# SPDX-License-Identifier: AGPL-3.0-only
|
|
||||||
|
|
||||||
defmodule Pleroma.Web.TwitterAPI.UserView do
|
|
||||||
use Pleroma.Web, :view
|
|
||||||
alias Pleroma.Formatter
|
|
||||||
alias Pleroma.HTML
|
|
||||||
alias Pleroma.User
|
|
||||||
alias Pleroma.Web.CommonAPI.Utils
|
|
||||||
alias Pleroma.Web.MediaProxy
|
|
||||||
|
|
||||||
def render("show.json", %{user: user = %User{}} = assigns) do
|
|
||||||
render_one(user, Pleroma.Web.TwitterAPI.UserView, "user.json", assigns)
|
|
||||||
end
|
|
||||||
|
|
||||||
def render("index.json", %{users: users, for: user}) do
|
|
||||||
users
|
|
||||||
|> render_many(Pleroma.Web.TwitterAPI.UserView, "user.json", for: user)
|
|
||||||
|> Enum.filter(&Enum.any?/1)
|
|
||||||
end
|
|
||||||
|
|
||||||
def render("user.json", %{user: user = %User{}} = assigns) do
|
|
||||||
if User.visible_for?(user, assigns[:for]),
|
|
||||||
do: do_render("user.json", assigns),
|
|
||||||
else: %{}
|
|
||||||
end
|
|
||||||
|
|
||||||
def render("short.json", %{
|
|
||||||
user: %User{
|
|
||||||
nickname: nickname,
|
|
||||||
id: id,
|
|
||||||
ap_id: ap_id,
|
|
||||||
name: name
|
|
||||||
}
|
|
||||||
}) do
|
|
||||||
%{
|
|
||||||
"fullname" => name,
|
|
||||||
"id" => id,
|
|
||||||
"ostatus_uri" => ap_id,
|
|
||||||
"profile_url" => ap_id,
|
|
||||||
"screen_name" => nickname
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
defp do_render("user.json", %{user: user = %User{}} = assigns) do
|
|
||||||
for_user = assigns[:for]
|
|
||||||
image = User.avatar_url(user) |> MediaProxy.url()
|
|
||||||
|
|
||||||
{following, follows_you, statusnet_blocking} =
|
|
||||||
if for_user do
|
|
||||||
{
|
|
||||||
User.following?(for_user, user),
|
|
||||||
User.following?(user, for_user),
|
|
||||||
User.blocks?(for_user, user)
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{false, false, false}
|
|
||||||
end
|
|
||||||
|
|
||||||
user_info = User.get_cached_user_info(user)
|
|
||||||
|
|
||||||
emoji =
|
|
||||||
(user.info.source_data["tag"] || [])
|
|
||||||
|> Enum.filter(fn %{"type" => t} -> t == "Emoji" end)
|
|
||||||
|> Enum.map(fn %{"icon" => %{"url" => url}, "name" => name} ->
|
|
||||||
{String.trim(name, ":"), url}
|
|
||||||
end)
|
|
||||||
|
|
||||||
emoji = Enum.dedup(emoji ++ user.info.emoji)
|
|
||||||
|
|
||||||
description_html =
|
|
||||||
(user.bio || "")
|
|
||||||
|> HTML.filter_tags(User.html_filter_policy(for_user))
|
|
||||||
|> Formatter.emojify(emoji)
|
|
||||||
|
|
||||||
fields =
|
|
||||||
user.info
|
|
||||||
|> User.Info.fields()
|
|
||||||
|> Enum.map(fn %{"name" => name, "value" => value} ->
|
|
||||||
%{
|
|
||||||
"name" => Pleroma.HTML.strip_tags(name),
|
|
||||||
"value" => Pleroma.HTML.filter_tags(value, Pleroma.HTML.Scrubber.LinksOnly)
|
|
||||||
}
|
|
||||||
end)
|
|
||||||
|
|
||||||
data =
|
|
||||||
%{
|
|
||||||
"created_at" => user.inserted_at |> Utils.format_naive_asctime(),
|
|
||||||
"description" => HTML.strip_tags((user.bio || "") |> String.replace("<br>", "\n")),
|
|
||||||
"description_html" => description_html,
|
|
||||||
"favourites_count" => 0,
|
|
||||||
"followers_count" => user_info[:follower_count],
|
|
||||||
"following" => following,
|
|
||||||
"follows_you" => follows_you,
|
|
||||||
"statusnet_blocking" => statusnet_blocking,
|
|
||||||
"friends_count" => user_info[:following_count],
|
|
||||||
"id" => user.id,
|
|
||||||
"name" => user.name || user.nickname,
|
|
||||||
"name_html" =>
|
|
||||||
if(user.name,
|
|
||||||
do: HTML.strip_tags(user.name) |> Formatter.emojify(emoji),
|
|
||||||
else: user.nickname
|
|
||||||
),
|
|
||||||
"profile_image_url" => image,
|
|
||||||
"profile_image_url_https" => image,
|
|
||||||
"profile_image_url_profile_size" => image,
|
|
||||||
"profile_image_url_original" => image,
|
|
||||||
"screen_name" => user.nickname,
|
|
||||||
"statuses_count" => user_info[:note_count],
|
|
||||||
"statusnet_profile_url" => user.ap_id,
|
|
||||||
"cover_photo" => User.banner_url(user) |> MediaProxy.url(),
|
|
||||||
"background_image" => image_url(user.info.background) |> MediaProxy.url(),
|
|
||||||
"is_local" => user.local,
|
|
||||||
"locked" => user.info.locked,
|
|
||||||
"hide_followers" => user.info.hide_followers,
|
|
||||||
"hide_follows" => user.info.hide_follows,
|
|
||||||
"fields" => fields,
|
|
||||||
|
|
||||||
# Pleroma extension
|
|
||||||
"pleroma" =>
|
|
||||||
%{
|
|
||||||
"confirmation_pending" => user_info.confirmation_pending,
|
|
||||||
"tags" => user.tags,
|
|
||||||
"skip_thread_containment" => user.info.skip_thread_containment
|
|
||||||
}
|
|
||||||
|> maybe_with_activation_status(user, for_user)
|
|
||||||
|> with_notification_settings(user, for_user)
|
|
||||||
}
|
|
||||||
|> maybe_with_user_settings(user, for_user)
|
|
||||||
|> maybe_with_role(user, for_user)
|
|
||||||
|
|
||||||
if assigns[:token] do
|
|
||||||
Map.put(data, "token", token_string(assigns[:token]))
|
|
||||||
else
|
|
||||||
data
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
defp with_notification_settings(data, %User{id: user_id} = user, %User{id: user_id}) do
|
|
||||||
Map.put(data, "notification_settings", user.info.notification_settings)
|
|
||||||
end
|
|
||||||
|
|
||||||
defp with_notification_settings(data, _, _), do: data
|
|
||||||
|
|
||||||
defp maybe_with_activation_status(data, user, %User{info: %{is_admin: true}}) do
|
|
||||||
Map.put(data, "deactivated", user.info.deactivated)
|
|
||||||
end
|
|
||||||
|
|
||||||
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,
|
|
||||||
"rights" => %{
|
|
||||||
"delete_others_notice" => !!user.info.is_moderator,
|
|
||||||
"admin" => !!user.info.is_admin
|
|
||||||
}
|
|
||||||
})
|
|
||||||
end
|
|
||||||
|
|
||||||
defp maybe_with_role(data, %User{info: %{show_role: true}} = user, _user) do
|
|
||||||
Map.merge(data, %{
|
|
||||||
"role" => role(user),
|
|
||||||
"rights" => %{
|
|
||||||
"delete_others_notice" => !!user.info.is_moderator,
|
|
||||||
"admin" => !!user.info.is_admin
|
|
||||||
}
|
|
||||||
})
|
|
||||||
end
|
|
||||||
|
|
||||||
defp maybe_with_role(data, _, _), do: data
|
|
||||||
|
|
||||||
defp maybe_with_user_settings(data, %User{info: info, id: id} = _user, %User{id: id}) do
|
|
||||||
data
|
|
||||||
|> Kernel.put_in(["default_scope"], info.default_scope)
|
|
||||||
|> Kernel.put_in(["no_rich_text"], info.no_rich_text)
|
|
||||||
end
|
|
||||||
|
|
||||||
defp maybe_with_user_settings(data, _, _), do: data
|
|
||||||
defp role(%User{info: %{:is_admin => true}}), do: "admin"
|
|
||||||
defp role(%User{info: %{:is_moderator => true}}), do: "moderator"
|
|
||||||
defp role(_), do: "member"
|
|
||||||
|
|
||||||
defp image_url(%{"url" => [%{"href" => href} | _]}), do: href
|
|
||||||
defp image_url(_), do: nil
|
|
||||||
|
|
||||||
defp token_string(%Pleroma.Web.OAuth.Token{token: token_str}), do: token_str
|
|
||||||
defp token_string(token), do: token
|
|
||||||
end
|
|
||||||
|
|
@ -7,9 +7,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
|
||||||
alias Pleroma.Repo
|
alias Pleroma.Repo
|
||||||
alias Pleroma.User
|
alias Pleroma.User
|
||||||
alias Pleroma.UserInviteToken
|
alias Pleroma.UserInviteToken
|
||||||
alias Pleroma.Web.TwitterAPI.ActivityView
|
|
||||||
alias Pleroma.Web.TwitterAPI.TwitterAPI
|
alias Pleroma.Web.TwitterAPI.TwitterAPI
|
||||||
alias Pleroma.Web.TwitterAPI.UserView
|
alias Pleroma.Web.MastodonAPI.AccountView
|
||||||
|
|
||||||
import Pleroma.Factory
|
import Pleroma.Factory
|
||||||
|
|
||||||
|
|
@ -31,8 +30,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
|
||||||
|
|
||||||
fetched_user = User.get_cached_by_nickname("lain")
|
fetched_user = User.get_cached_by_nickname("lain")
|
||||||
|
|
||||||
assert UserView.render("show.json", %{user: user}) ==
|
assert AccountView.render("account.json", %{user: user}) ==
|
||||||
UserView.render("show.json", %{user: fetched_user})
|
AccountView.render("account.json", %{user: fetched_user})
|
||||||
end
|
end
|
||||||
|
|
||||||
test "it registers a new user with empty string in bio and returns the user." do
|
test "it registers a new user with empty string in bio and returns the user." do
|
||||||
|
|
@ -49,8 +48,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
|
||||||
|
|
||||||
fetched_user = User.get_cached_by_nickname("lain")
|
fetched_user = User.get_cached_by_nickname("lain")
|
||||||
|
|
||||||
assert UserView.render("show.json", %{user: user}) ==
|
assert AccountView.render("account.json", %{user: user}) ==
|
||||||
UserView.render("show.json", %{user: fetched_user})
|
AccountView.render("account.json", %{user: fetched_user})
|
||||||
end
|
end
|
||||||
|
|
||||||
test "it sends confirmation email if :account_activation_required is specified in instance config" do
|
test "it sends confirmation email if :account_activation_required is specified in instance config" do
|
||||||
|
|
@ -147,8 +146,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
|
||||||
|
|
||||||
assert invite.used == true
|
assert invite.used == true
|
||||||
|
|
||||||
assert UserView.render("show.json", %{user: user}) ==
|
assert AccountView.render("account.json", %{user: user}) ==
|
||||||
UserView.render("show.json", %{user: fetched_user})
|
AccountView.render("account.json", %{user: fetched_user})
|
||||||
end
|
end
|
||||||
|
|
||||||
test "returns error on invalid token" do
|
test "returns error on invalid token" do
|
||||||
|
|
@ -212,8 +211,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
|
||||||
{:ok, user} = TwitterAPI.register_user(data)
|
{:ok, user} = TwitterAPI.register_user(data)
|
||||||
fetched_user = User.get_cached_by_nickname("vinny")
|
fetched_user = User.get_cached_by_nickname("vinny")
|
||||||
|
|
||||||
assert UserView.render("show.json", %{user: user}) ==
|
assert AccountView.render("account.json", %{user: user}) ==
|
||||||
UserView.render("show.json", %{user: fetched_user})
|
AccountView.render("account.json", %{user: fetched_user})
|
||||||
end
|
end
|
||||||
|
|
||||||
{:ok, data: data, check_fn: check_fn}
|
{:ok, data: data, check_fn: check_fn}
|
||||||
|
|
@ -287,8 +286,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
|
||||||
|
|
||||||
assert invite.used == true
|
assert invite.used == true
|
||||||
|
|
||||||
assert UserView.render("show.json", %{user: user}) ==
|
assert AccountView.render("account.json", %{user: user}) ==
|
||||||
UserView.render("show.json", %{user: fetched_user})
|
AccountView.render("account.json", %{user: fetched_user})
|
||||||
|
|
||||||
data = %{
|
data = %{
|
||||||
"nickname" => "GrimReaper",
|
"nickname" => "GrimReaper",
|
||||||
|
|
@ -338,8 +337,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
|
||||||
|
|
||||||
refute invite.used
|
refute invite.used
|
||||||
|
|
||||||
assert UserView.render("show.json", %{user: user}) ==
|
assert AccountView.render("account.json", %{user: user}) ==
|
||||||
UserView.render("show.json", %{user: fetched_user})
|
AccountView.render("account.json", %{user: fetched_user})
|
||||||
end
|
end
|
||||||
|
|
||||||
test "error after max uses" do
|
test "error after max uses" do
|
||||||
|
|
@ -362,8 +361,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
|
||||||
invite = Repo.get_by(UserInviteToken, token: invite.token)
|
invite = Repo.get_by(UserInviteToken, token: invite.token)
|
||||||
assert invite.used == true
|
assert invite.used == true
|
||||||
|
|
||||||
assert UserView.render("show.json", %{user: user}) ==
|
assert AccountView.render("account.json", %{user: user}) ==
|
||||||
UserView.render("show.json", %{user: fetched_user})
|
AccountView.render("account.json", %{user: fetched_user})
|
||||||
|
|
||||||
data = %{
|
data = %{
|
||||||
"nickname" => "GrimReaper",
|
"nickname" => "GrimReaper",
|
||||||
|
|
@ -439,13 +438,6 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
|
||||||
refute User.get_cached_by_nickname("lain")
|
refute User.get_cached_by_nickname("lain")
|
||||||
end
|
end
|
||||||
|
|
||||||
test "it assigns an integer conversation_id" do
|
|
||||||
note_activity = insert(:note_activity)
|
|
||||||
status = ActivityView.render("activity.json", activity: note_activity)
|
|
||||||
|
|
||||||
assert is_number(status["statusnet_conversation_id"])
|
|
||||||
end
|
|
||||||
|
|
||||||
setup do
|
setup do
|
||||||
Supervisor.terminate_child(Pleroma.Supervisor, Cachex)
|
Supervisor.terminate_child(Pleroma.Supervisor, Cachex)
|
||||||
Supervisor.restart_child(Pleroma.Supervisor, Cachex)
|
Supervisor.restart_child(Pleroma.Supervisor, Cachex)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue