Introduce group basic federation, event new page and notifications
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
@@ -2,7 +2,9 @@ defmodule Mobilizon.Web.ActivityPub.ActorView do
|
||||
use Mobilizon.Web, :view
|
||||
|
||||
alias Mobilizon.Actors
|
||||
alias Mobilizon.Actors.Actor
|
||||
alias Mobilizon.Actors.{Actor, Member}
|
||||
alias Mobilizon.Resources
|
||||
alias Mobilizon.Resources.Resource
|
||||
|
||||
alias Mobilizon.Federation.ActivityPub
|
||||
alias Mobilizon.Federation.ActivityPub.{Activity, Utils}
|
||||
@@ -60,7 +62,7 @@ defmodule Mobilizon.Web.ActivityPub.ActorView do
|
||||
else: @private_visibility_empty_collection
|
||||
|
||||
%{
|
||||
"id" => Actor.build_url(actor.preferred_username, :followers),
|
||||
"id" => actor.followers_url,
|
||||
"type" => "OrderedCollection",
|
||||
"totalItems" => total,
|
||||
"first" => collection(followers, actor.preferred_username, :followers, 1, total)
|
||||
@@ -68,6 +70,64 @@ defmodule Mobilizon.Web.ActivityPub.ActorView do
|
||||
|> Map.merge(Utils.make_json_ld_header())
|
||||
end
|
||||
|
||||
def render("members.json", %{group: group, page: page, actor_applicant: actor_applicant}) do
|
||||
%{total: total, elements: members} =
|
||||
if Actor.is_public_visibility(group) ||
|
||||
actor_applicant_group_member?(group, actor_applicant),
|
||||
do: Actors.list_members_for_group(group, page),
|
||||
else: @private_visibility_empty_collection
|
||||
|
||||
members
|
||||
|> collection(group.preferred_username, :members, page, total)
|
||||
|> Map.merge(Utils.make_json_ld_header())
|
||||
end
|
||||
|
||||
def render("members.json", %{group: group, actor_applicant: actor_applicant}) do
|
||||
%{total: total, elements: members} =
|
||||
if Actor.is_public_visibility(group) ||
|
||||
actor_applicant_group_member?(group, actor_applicant),
|
||||
do: Actors.list_members_for_group(group),
|
||||
else: @private_visibility_empty_collection
|
||||
|
||||
%{
|
||||
"id" => group.url,
|
||||
"attributedTo" => group.url,
|
||||
"type" => "OrderedCollection",
|
||||
"totalItems" => total,
|
||||
"first" => collection(members, group.preferred_username, :members, 1, total)
|
||||
}
|
||||
|> Map.merge(Utils.make_json_ld_header())
|
||||
end
|
||||
|
||||
def render("resources.json", %{group: group, page: page, actor_applicant: actor_applicant}) do
|
||||
%{total: total, elements: resources} =
|
||||
if Actor.is_public_visibility(group) ||
|
||||
actor_applicant_group_member?(group, actor_applicant),
|
||||
do: Resources.get_top_level_resources_for_group(group),
|
||||
else: @private_visibility_empty_collection
|
||||
|
||||
resources
|
||||
|> collection(group.preferred_username, :resources, page, total)
|
||||
|> Map.merge(Utils.make_json_ld_header())
|
||||
end
|
||||
|
||||
def render("resources.json", %{group: group, actor_applicant: actor_applicant}) do
|
||||
%{total: total, elements: resources} =
|
||||
if Actor.is_public_visibility(group) ||
|
||||
actor_applicant_group_member?(group, actor_applicant),
|
||||
do: Resources.get_top_level_resources_for_group(group),
|
||||
else: @private_visibility_empty_collection
|
||||
|
||||
%{
|
||||
"id" => group.resources_url,
|
||||
"attributedTo" => group.url,
|
||||
"type" => "OrderedCollection",
|
||||
"totalItems" => total,
|
||||
"first" => collection(resources, group.preferred_username, :resources, 1, total)
|
||||
}
|
||||
|> Map.merge(Utils.make_json_ld_header())
|
||||
end
|
||||
|
||||
def render("outbox.json", %{actor: actor, page: page}) do
|
||||
%{total: total, elements: followers} =
|
||||
if Actor.is_public_visibility(actor),
|
||||
@@ -96,11 +156,12 @@ defmodule Mobilizon.Web.ActivityPub.ActorView do
|
||||
|
||||
@spec collection(list(), String.t(), atom(), integer(), integer()) :: map()
|
||||
defp collection(collection, preferred_username, endpoint, page, total)
|
||||
when endpoint in [:followers, :following, :outbox] do
|
||||
when endpoint in [:followers, :following, :outbox, :members, :resources, :todos] do
|
||||
offset = (page - 1) * 10
|
||||
|
||||
map = %{
|
||||
"id" => Actor.build_url(preferred_username, endpoint, page: page),
|
||||
"attributedTo" => Actor.build_url(preferred_username, :page),
|
||||
"type" => "OrderedCollectionPage",
|
||||
"partOf" => Actor.build_url(preferred_username, endpoint),
|
||||
"orderedItems" => Enum.map(collection, &item/1)
|
||||
@@ -115,4 +176,17 @@ defmodule Mobilizon.Web.ActivityPub.ActorView do
|
||||
|
||||
def item(%Activity{data: %{"id" => id}}), do: id
|
||||
def item(%Actor{url: url}), do: url
|
||||
def item(%Member{} = member), do: Convertible.model_to_as(member)
|
||||
def item(%Resource{} = resource), do: Convertible.model_to_as(resource)
|
||||
|
||||
defp actor_applicant_group_member?(%Actor{}, nil), do: false
|
||||
|
||||
defp actor_applicant_group_member?(%Actor{id: group_id}, %Actor{id: actor_applicant_id}),
|
||||
do:
|
||||
Actors.get_member(actor_applicant_id, group_id, [
|
||||
:member,
|
||||
:moderator,
|
||||
:administrator,
|
||||
:creator
|
||||
]) != {:error, :member_not_found}
|
||||
end
|
||||
|
||||
@@ -3,9 +3,16 @@ defmodule Mobilizon.Web.EmailView do
|
||||
|
||||
import Mobilizon.Web.Gettext
|
||||
|
||||
def datetime_to_string(%DateTime{} = datetime, locale \\ "en") do
|
||||
def datetime_to_string(%DateTime{} = datetime, locale \\ "en", format \\ :medium) do
|
||||
with {:ok, string} <-
|
||||
Cldr.DateTime.to_string(datetime, Mobilizon.Cldr, format: :medium, locale: locale) do
|
||||
Mobilizon.Cldr.DateTime.to_string(datetime, format: format, locale: locale) do
|
||||
string
|
||||
end
|
||||
end
|
||||
|
||||
def datetime_to_time_string(%DateTime{} = datetime, locale \\ "en", format \\ :hm) do
|
||||
with {:ok, string} <-
|
||||
Mobilizon.Cldr.DateTime.to_string(datetime, format: format, locale: locale) do
|
||||
string
|
||||
end
|
||||
end
|
||||
|
||||
@@ -6,7 +6,9 @@ defmodule Mobilizon.Web.PageView do
|
||||
use Mobilizon.Web, :view
|
||||
|
||||
alias Mobilizon.Actors.Actor
|
||||
alias Mobilizon.Events.{Comment, Event}
|
||||
alias Mobilizon.Conversations.Comment
|
||||
alias Mobilizon.Events.Event
|
||||
alias Mobilizon.Resources.Resource
|
||||
alias Mobilizon.Tombstone
|
||||
|
||||
alias Mobilizon.Service.Metadata
|
||||
@@ -40,35 +42,56 @@ defmodule Mobilizon.Web.PageView do
|
||||
|> Map.merge(Utils.make_json_ld_header())
|
||||
end
|
||||
|
||||
def render(page, %{object: object} = _assigns)
|
||||
def render("resource.activity-json", %{conn: %{assigns: %{object: %Resource{} = resource}}}) do
|
||||
resource
|
||||
|> Convertible.model_to_as()
|
||||
|> Map.merge(Utils.make_json_ld_header())
|
||||
end
|
||||
|
||||
def render(page, %{object: object, conn: conn} = _assigns)
|
||||
when page in ["actor.html", "event.html", "comment.html"] do
|
||||
tags = object |> Metadata.build_tags()
|
||||
inject_tags(conn, tags)
|
||||
end
|
||||
|
||||
def render("index.html", %{conn: conn}) do
|
||||
tags = Instance.build_tags()
|
||||
inject_tags(conn, tags)
|
||||
end
|
||||
|
||||
@spec inject_tags(Conn.t(), List.t()) :: {:safe, String.t()}
|
||||
defp inject_tags(conn, tags) do
|
||||
with {:ok, index_content} <- File.read(index_file_path()) do
|
||||
tags = object |> Metadata.build_tags() |> MetadataUtils.stringify_tags()
|
||||
locale = get_locale(conn)
|
||||
|
||||
index_content = replace_meta(index_content, tags)
|
||||
|
||||
{:safe, index_content}
|
||||
end
|
||||
end
|
||||
|
||||
def render("index.html", _assigns) do
|
||||
with {:ok, index_content} <- File.read(index_file_path()) do
|
||||
tags = Instance.build_tags() |> MetadataUtils.stringify_tags()
|
||||
|
||||
index_content = replace_meta(index_content, tags)
|
||||
|
||||
{:safe, index_content}
|
||||
do_replacements(index_content, MetadataUtils.stringify_tags(tags), locale)
|
||||
end
|
||||
end
|
||||
|
||||
@spec index_file_path :: String.t()
|
||||
defp index_file_path do
|
||||
Path.join(Application.app_dir(:mobilizon, "priv/static"), "index.html")
|
||||
end
|
||||
|
||||
@spec replace_meta(String.t(), String.t()) :: String.t()
|
||||
# TODO: Find why it's different in dev/prod and during tests
|
||||
defp replace_meta(index_content, tags) do
|
||||
index_content
|
||||
|> String.replace("<meta name=\"server-injected-data\" />", tags)
|
||||
|> String.replace("<meta name=server-injected-data>", tags)
|
||||
end
|
||||
|
||||
@spec do_replacements(String.t(), String.t(), String.t()) :: {:safe, String.t()}
|
||||
defp do_replacements(index_content, tags, locale) do
|
||||
index_content
|
||||
|> replace_meta(tags)
|
||||
|> String.replace("<html lang=\"en\">", "<html lang=\"#{locale}\">")
|
||||
|> String.replace("<html lang=en>", "<html lang=\"#{locale}\">")
|
||||
|> (&{:safe, &1}).()
|
||||
end
|
||||
|
||||
@spec get_locale(Conn.t()) :: String.t()
|
||||
defp get_locale(%{private: %{cldr_locale: nil}}), do: "en"
|
||||
defp get_locale(%{private: %{cldr_locale: %{requested_locale_name: locale}}}), do: locale
|
||||
defp get_locale(_), do: "en"
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user