commit
fd46edb473
@ -0,0 +1,56 @@
|
|||||||
|
defmodule Pleroma.Web.ActivityPub.Visibility do
|
||||||
|
alias Pleroma.Activity
|
||||||
|
alias Pleroma.Object
|
||||||
|
alias Pleroma.User
|
||||||
|
|
||||||
|
def is_public?(%Object{data: %{"type" => "Tombstone"}}), do: false
|
||||||
|
def is_public?(%Object{data: data}), do: is_public?(data)
|
||||||
|
def is_public?(%Activity{data: data}), do: is_public?(data)
|
||||||
|
def is_public?(%{"directMessage" => true}), do: false
|
||||||
|
|
||||||
|
def is_public?(data) do
|
||||||
|
"https://www.w3.org/ns/activitystreams#Public" in (data["to"] ++ (data["cc"] || []))
|
||||||
|
end
|
||||||
|
|
||||||
|
def is_private?(activity) do
|
||||||
|
unless is_public?(activity) do
|
||||||
|
follower_address = User.get_cached_by_ap_id(activity.data["actor"]).follower_address
|
||||||
|
Enum.any?(activity.data["to"], &(&1 == follower_address))
|
||||||
|
else
|
||||||
|
false
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def is_direct?(%Activity{data: %{"directMessage" => true}}), do: true
|
||||||
|
def is_direct?(%Object{data: %{"directMessage" => true}}), do: true
|
||||||
|
|
||||||
|
def is_direct?(activity) do
|
||||||
|
!is_public?(activity) && !is_private?(activity)
|
||||||
|
end
|
||||||
|
|
||||||
|
def visible_for_user?(activity, nil) do
|
||||||
|
is_public?(activity)
|
||||||
|
end
|
||||||
|
|
||||||
|
def visible_for_user?(activity, user) do
|
||||||
|
x = [user.ap_id | user.following]
|
||||||
|
y = [activity.actor] ++ activity.data["to"] ++ (activity.data["cc"] || [])
|
||||||
|
visible_for_user?(activity, nil) || Enum.any?(x, &(&1 in y))
|
||||||
|
end
|
||||||
|
|
||||||
|
# guard
|
||||||
|
def entire_thread_visible_for_user?(nil, _user), do: false
|
||||||
|
|
||||||
|
# child
|
||||||
|
def entire_thread_visible_for_user?(
|
||||||
|
%Activity{data: %{"object" => %{"inReplyTo" => parent_id}}} = tail,
|
||||||
|
user
|
||||||
|
)
|
||||||
|
when is_binary(parent_id) do
|
||||||
|
parent = Activity.get_in_reply_to_activity(tail)
|
||||||
|
visible_for_user?(tail, user) && entire_thread_visible_for_user?(parent, user)
|
||||||
|
end
|
||||||
|
|
||||||
|
# root
|
||||||
|
def entire_thread_visible_for_user?(tail, user), do: visible_for_user?(tail, user)
|
||||||
|
end
|
@ -0,0 +1,21 @@
|
|||||||
|
defmodule Pleroma.Web.Metadata.PlayerView do
|
||||||
|
use Pleroma.Web, :view
|
||||||
|
import Phoenix.HTML.Tag, only: [content_tag: 3, tag: 2]
|
||||||
|
|
||||||
|
def render("player.html", %{"mediaType" => type, "href" => href}) do
|
||||||
|
{tag_type, tag_attrs} =
|
||||||
|
case type do
|
||||||
|
"audio" <> _ -> {:audio, []}
|
||||||
|
"video" <> _ -> {:video, [loop: true]}
|
||||||
|
end
|
||||||
|
|
||||||
|
content_tag(
|
||||||
|
tag_type,
|
||||||
|
[
|
||||||
|
tag(:source, src: href, type: type),
|
||||||
|
"Your browser does not support #{type} playback."
|
||||||
|
],
|
||||||
|
[controls: true] ++ tag_attrs
|
||||||
|
)
|
||||||
|
end
|
||||||
|
end
|
@ -0,0 +1,42 @@
|
|||||||
|
# Pleroma: A lightweight social networking server
|
||||||
|
# Copyright \xc2\xa9 2017-2019 Pleroma Authors <https://pleroma.social/>
|
||||||
|
# SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
|
defmodule Pleroma.Web.Metadata.Utils do
|
||||||
|
alias Pleroma.HTML
|
||||||
|
alias Pleroma.Formatter
|
||||||
|
alias Pleroma.Web.MediaProxy
|
||||||
|
|
||||||
|
def scrub_html_and_truncate(%{data: %{"content" => content}} = object) do
|
||||||
|
content
|
||||||
|
# html content comes from DB already encoded, decode first and scrub after
|
||||||
|
|> HtmlEntities.decode()
|
||||||
|
|> String.replace(~r/<br\s?\/?>/, " ")
|
||||||
|
|> HTML.get_cached_stripped_html_for_object(object, __MODULE__)
|
||||||
|
|> Formatter.demojify()
|
||||||
|
|> Formatter.truncate()
|
||||||
|
end
|
||||||
|
|
||||||
|
def scrub_html_and_truncate(content) when is_binary(content) do
|
||||||
|
content
|
||||||
|
# html content comes from DB already encoded, decode first and scrub after
|
||||||
|
|> HtmlEntities.decode()
|
||||||
|
|> String.replace(~r/<br\s?\/?>/, " ")
|
||||||
|
|> HTML.strip_tags()
|
||||||
|
|> Formatter.demojify()
|
||||||
|
|> Formatter.truncate()
|
||||||
|
end
|
||||||
|
|
||||||
|
def attachment_url(url) do
|
||||||
|
MediaProxy.url(url)
|
||||||
|
end
|
||||||
|
|
||||||
|
def user_name_string(user) do
|
||||||
|
"#{user.name} " <>
|
||||||
|
if user.local do
|
||||||
|
"(@#{user.nickname}@#{Pleroma.Web.Endpoint.host()})"
|
||||||
|
else
|
||||||
|
"(@#{user.nickname})"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
@ -0,0 +1,16 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<body>
|
||||||
|
|
||||||
|
<style type="text/css">
|
||||||
|
video, audio {
|
||||||
|
width:100%;
|
||||||
|
max-width:600px;
|
||||||
|
height: auto;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
|
<%= render @view_module, @view_template, assigns %>
|
||||||
|
|
||||||
|
</body>
|
||||||
|
</html>
|
@ -0,0 +1,11 @@
|
|||||||
|
defmodule Pleroma.Repo.Migrations.DataMigrationNormalizeScopes do
|
||||||
|
use Ecto.Migration
|
||||||
|
|
||||||
|
def up do
|
||||||
|
for t <- [:apps, :oauth_authorizations, :oauth_tokens] do
|
||||||
|
execute "UPDATE #{t} SET scopes = string_to_array(array_to_string(scopes, ' '), ' ');"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def down, do: :noop
|
||||||
|
end
|
@ -0,0 +1,98 @@
|
|||||||
|
defmodule Pleroma.Web.ActivityPub.VisibilityTest do
|
||||||
|
use Pleroma.DataCase
|
||||||
|
|
||||||
|
alias Pleroma.Web.CommonAPI
|
||||||
|
alias Pleroma.Web.ActivityPub.Visibility
|
||||||
|
import Pleroma.Factory
|
||||||
|
|
||||||
|
setup do
|
||||||
|
user = insert(:user)
|
||||||
|
mentioned = insert(:user)
|
||||||
|
following = insert(:user)
|
||||||
|
unrelated = insert(:user)
|
||||||
|
{:ok, following} = Pleroma.User.follow(following, user)
|
||||||
|
|
||||||
|
{:ok, public} =
|
||||||
|
CommonAPI.post(user, %{"status" => "@#{mentioned.nickname}", "visibility" => "public"})
|
||||||
|
|
||||||
|
{:ok, private} =
|
||||||
|
CommonAPI.post(user, %{"status" => "@#{mentioned.nickname}", "visibility" => "private"})
|
||||||
|
|
||||||
|
{:ok, direct} =
|
||||||
|
CommonAPI.post(user, %{"status" => "@#{mentioned.nickname}", "visibility" => "direct"})
|
||||||
|
|
||||||
|
{:ok, unlisted} =
|
||||||
|
CommonAPI.post(user, %{"status" => "@#{mentioned.nickname}", "visibility" => "unlisted"})
|
||||||
|
|
||||||
|
%{
|
||||||
|
public: public,
|
||||||
|
private: private,
|
||||||
|
direct: direct,
|
||||||
|
unlisted: unlisted,
|
||||||
|
user: user,
|
||||||
|
mentioned: mentioned,
|
||||||
|
following: following,
|
||||||
|
unrelated: unrelated
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
test "is_direct?", %{public: public, private: private, direct: direct, unlisted: unlisted} do
|
||||||
|
assert Visibility.is_direct?(direct)
|
||||||
|
refute Visibility.is_direct?(public)
|
||||||
|
refute Visibility.is_direct?(private)
|
||||||
|
refute Visibility.is_direct?(unlisted)
|
||||||
|
end
|
||||||
|
|
||||||
|
test "is_public?", %{public: public, private: private, direct: direct, unlisted: unlisted} do
|
||||||
|
refute Visibility.is_public?(direct)
|
||||||
|
assert Visibility.is_public?(public)
|
||||||
|
refute Visibility.is_public?(private)
|
||||||
|
assert Visibility.is_public?(unlisted)
|
||||||
|
end
|
||||||
|
|
||||||
|
test "is_private?", %{public: public, private: private, direct: direct, unlisted: unlisted} do
|
||||||
|
refute Visibility.is_private?(direct)
|
||||||
|
refute Visibility.is_private?(public)
|
||||||
|
assert Visibility.is_private?(private)
|
||||||
|
refute Visibility.is_private?(unlisted)
|
||||||
|
end
|
||||||
|
|
||||||
|
test "visible_for_user?", %{
|
||||||
|
public: public,
|
||||||
|
private: private,
|
||||||
|
direct: direct,
|
||||||
|
unlisted: unlisted,
|
||||||
|
user: user,
|
||||||
|
mentioned: mentioned,
|
||||||
|
following: following,
|
||||||
|
unrelated: unrelated
|
||||||
|
} do
|
||||||
|
# All visible to author
|
||||||
|
|
||||||
|
assert Visibility.visible_for_user?(public, user)
|
||||||
|
assert Visibility.visible_for_user?(private, user)
|
||||||
|
assert Visibility.visible_for_user?(unlisted, user)
|
||||||
|
assert Visibility.visible_for_user?(direct, user)
|
||||||
|
|
||||||
|
# All visible to a mentioned user
|
||||||
|
|
||||||
|
assert Visibility.visible_for_user?(public, mentioned)
|
||||||
|
assert Visibility.visible_for_user?(private, mentioned)
|
||||||
|
assert Visibility.visible_for_user?(unlisted, mentioned)
|
||||||
|
assert Visibility.visible_for_user?(direct, mentioned)
|
||||||
|
|
||||||
|
# DM not visible for just follower
|
||||||
|
|
||||||
|
assert Visibility.visible_for_user?(public, following)
|
||||||
|
assert Visibility.visible_for_user?(private, following)
|
||||||
|
assert Visibility.visible_for_user?(unlisted, following)
|
||||||
|
refute Visibility.visible_for_user?(direct, following)
|
||||||
|
|
||||||
|
# Public and unlisted visible for unrelated user
|
||||||
|
|
||||||
|
assert Visibility.visible_for_user?(public, unrelated)
|
||||||
|
assert Visibility.visible_for_user?(unlisted, unrelated)
|
||||||
|
refute Visibility.visible_for_user?(private, unrelated)
|
||||||
|
refute Visibility.visible_for_user?(direct, unrelated)
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in new issue