No OneTemporary
Actions

Size

16 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/lib/pleroma/web/activity_pub/object_validators/common_fixes.ex b/lib/pleroma/web/activity_pub/object_validators/common_fixes.ex
	index e5f3b0589..f0f3fef90 100644
	--- a/lib/pleroma/web/activity_pub/object_validators/common_fixes.ex
	+++ b/lib/pleroma/web/activity_pub/object_validators/common_fixes.ex
	@@ -1,204 +1,212 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Web.ActivityPub.ObjectValidators.CommonFixes do
	alias Pleroma.EctoType.ActivityPub.ObjectValidators
	alias Pleroma.Language.LanguageDetector
	alias Pleroma.Maps
	alias Pleroma.Object
	alias Pleroma.Object.Containment
	alias Pleroma.User
	alias Pleroma.Web.ActivityPub.Transmogrifier
	alias Pleroma.Web.ActivityPub.Utils

	import Pleroma.EctoType.ActivityPub.ObjectValidators.LanguageCode,
	only: [good_locale_code?: 1]

	import Pleroma.Web.Utils.Guards, only: [not_empty_string: 1]

	require Pleroma.Constants

	def cast_and_filter_recipients(message, field, follower_collection, field_fallback \\ []) do
	{:ok, data} = ObjectValidators.Recipients.cast(message[field] \|\| field_fallback)

	data =
	Enum.reject(data, fn x ->
	String.ends_with?(x, "/followers") and x != follower_collection
	end)

	Map.put(message, field, data)
	end

	def fix_object_defaults(data) do
	data = Maps.filter_empty_values(data)

	context =
	Utils.maybe_create_context(
	data["context"] \|\| data["conversation"] \|\| data["inReplyTo"] \|\| data["id"]
	)

	%User{follower_address: follower_collection} = User.get_cached_by_ap_id(data["attributedTo"])

	data
	\|> Map.put("context", context)
	\|> cast_and_filter_recipients("to", follower_collection)
	\|> cast_and_filter_recipients("cc", follower_collection)
	\|> cast_and_filter_recipients("bto", follower_collection)
	\|> cast_and_filter_recipients("bcc", follower_collection)
	\|> Transmogrifier.fix_implicit_addressing(follower_collection)
	end

	def fix_activity_addressing(activity) do
	%User{follower_address: follower_collection} = User.get_cached_by_ap_id(activity["actor"])

	activity
	\|> cast_and_filter_recipients("to", follower_collection)
	\|> cast_and_filter_recipients("cc", follower_collection)
	\|> cast_and_filter_recipients("bto", follower_collection)
	\|> cast_and_filter_recipients("bcc", follower_collection)
	\|> Transmogrifier.fix_implicit_addressing(follower_collection)
	end

	def fix_actor(data) do
	actor =
	data
	\|> Map.put_new("actor", data["attributedTo"])
	\|> Containment.get_actor()

	data
	\|> Map.put("actor", actor)
	\|> Map.put("attributedTo", actor)
	end

	def fix_activity_context(data, %Object{data: %{"context" => object_context}}) do
	data
	\|> Map.put("context", object_context)
	end

	def fix_object_action_recipients(%{"actor" => actor} = data, %Object{data: %{"actor" => actor}}) do
	to = ((data["to"] \|\| []) -- [actor]) \|> Enum.uniq()

	Map.put(data, "to", to)
	end

	def fix_object_action_recipients(data, %Object{data: %{"actor" => actor}}) do
	to = ((data["to"] \|\| []) ++ [actor]) \|> Enum.uniq()

	Map.put(data, "to", to)
	end

	def fix_quote_url(%{"quoteUrl" => _quote_url} = data), do: data

	# Fedibird
	# https://github.com/fedibird/mastodon/commit/dbd7ae6cf58a92ec67c512296b4daaea0d01e6ac
	def fix_quote_url(%{"quoteUri" => quote_url} = data) do
	Map.put(data, "quoteUrl", quote_url)
	end

	# Old Fedibird (bug)
	# https://github.com/fedibird/mastodon/issues/9
	def fix_quote_url(%{"quoteURL" => quote_url} = data) do
	Map.put(data, "quoteUrl", quote_url)
	end

	# Misskey fallback
	def fix_quote_url(%{"_misskey_quote" => quote_url} = data) do
	Map.put(data, "quoteUrl", quote_url)
	end

	def fix_quote_url(%{"tag" => [_ \| _] = tags} = data) do
	tag = Enum.find(tags, &object_link_tag?/1)

	if not is_nil(tag) do
	data
	\|> Map.put("quoteUrl", tag["href"])
	else
	data
	end
	end

	def fix_quote_url(data), do: data

	# On Mastodon, `"likes"` attribute includes an inlined `Collection` with `totalItems`,
	# not a list of users.
	# https://github.com/mastodon/mastodon/pull/32007
	def fix_likes(%{"likes" => %{}} = data), do: Map.drop(data, ["likes"])

	def fix_likes(data), do: data

	# https://codeberg.org/fediverse/fep/src/branch/main/fep/e232/fep-e232.md
	def object_link_tag?(%{
	"type" => "Link",
	"mediaType" => media_type,
	"href" => href
	})
	when media_type in Pleroma.Constants.activity_json_mime_types() and is_binary(href) do
	true
	end

	def object_link_tag?(_), do: false

	def maybe_add_language_from_activity(object, activity) do
	language = get_language_from_context(activity)

	if language do
	Map.put(object, "language", language)
	else
	object
	end
	end

	def maybe_add_language(object) do
	language =
	[
	- get_language_from_context(object),
	- get_language_from_content_map(object),
	- get_language_from_content(object)
	+ &get_language_from_context/1,
	+ &get_language_from_content_map/1,
	+ &get_language_from_content/1
	]
	- \|> Enum.find(&good_locale_code?(&1))
	+ \|> Enum.find_value(fn get_language ->
	+ language = get_language.(object)
	+
	+ if good_locale_code?(language) do
	+ language
	+ else
	+ nil
	+ end
	+ end)

	if language do
	Map.put(object, "language", language)
	else
	object
	end
	end

	defp get_language_from_context(%{"@context" => context}) when is_list(context) do
	case context
	\|> Enum.find(fn
	%{"@language" => language} -> language != "und"
	_ -> nil
	end) do
	%{"@language" => language} -> language
	_ -> nil
	end
	end

	defp get_language_from_context(_), do: nil

	defp get_language_from_content_map(%{"contentMap" => content_map, "content" => source_content}) do
	content_groups = Map.to_list(content_map)

	case Enum.find(content_groups, fn {_, content} -> content == source_content end) do
	{language, _} -> language
	_ -> nil
	end
	end

	defp get_language_from_content_map(_), do: nil

	- defp get_language_from_content(%{"summary" => summary, "content" => content}) do
	- LanguageDetector.detect("#{summary} #{content}")
	+ defp get_language_from_content(%{"content" => content} = object) do
	+ LanguageDetector.detect("#{object["summary"] \|\| ""} #{content}")
	end

	defp get_language_from_content(_), do: nil

	def maybe_add_content_map(%{"language" => language, "content" => content} = object)
	when not_empty_string(language) do
	Map.put(object, "contentMap", Map.put(%{}, language, content))
	end

	def maybe_add_content_map(object), do: object
	end
	diff --git a/test/pleroma/web/activity_pub/object_validators/article_note_page_validator_test.exs b/test/pleroma/web/activity_pub/object_validators/article_note_page_validator_test.exs
	index 829598246..b64c554d8 100644
	--- a/test/pleroma/web/activity_pub/object_validators/article_note_page_validator_test.exs
	+++ b/test/pleroma/web/activity_pub/object_validators/article_note_page_validator_test.exs
	@@ -1,257 +1,280 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Web.ActivityPub.ObjectValidators.ArticleNotePageValidatorTest do
	use Pleroma.DataCase, async: true

	alias Pleroma.Web.ActivityPub.ObjectValidator
	alias Pleroma.Web.ActivityPub.ObjectValidators.ArticleNotePageValidator
	alias Pleroma.Web.ActivityPub.Utils

	+ import Mock
	import Pleroma.Factory

	describe "Notes" do
	setup do
	user = insert(:user)

	note = %{
	"id" => Utils.generate_activity_id(),
	"type" => "Note",
	"actor" => user.ap_id,
	"to" => [user.follower_address],
	"cc" => [],
	"content" => "Hellow this is content.",
	"context" => "xxx",
	"summary" => "a post"
	}

	%{user: user, note: note}
	end

	test "a basic note validates", %{note: note} do
	%{valid?: true} = ArticleNotePageValidator.cast_and_validate(note)
	end

	test "a note from factory validates" do
	note = insert(:note)
	%{valid?: true} = ArticleNotePageValidator.cast_and_validate(note.data)
	end
	end

	describe "Note with history" do
	setup do
	user = insert(:user)
	{:ok, activity} = Pleroma.Web.CommonAPI.post(user, %{status: "mew mew :dinosaur:"})
	{:ok, edit} = Pleroma.Web.CommonAPI.update(activity, user, %{status: "edited :blank:"})

	{:ok, %{"object" => external_rep}} =
	Pleroma.Web.ActivityPub.Transmogrifier.prepare_outgoing(edit.data)

	%{external_rep: external_rep}
	end

	test "edited note", %{external_rep: external_rep} do
	assert %{"formerRepresentations" => %{"orderedItems" => [%{"tag" => [_]}]}} = external_rep

	{:ok, validate_res, []} = ObjectValidator.validate(external_rep, [])

	assert %{"formerRepresentations" => %{"orderedItems" => [%{"emoji" => %{"dinosaur" => _}}]}} =
	validate_res
	end

	test "edited note, badly-formed formerRepresentations", %{external_rep: external_rep} do
	external_rep = Map.put(external_rep, "formerRepresentations", %{})

	assert {:error, _} = ObjectValidator.validate(external_rep, [])
	end

	test "edited note, badly-formed history item", %{external_rep: external_rep} do
	history_item =
	Enum.at(external_rep["formerRepresentations"]["orderedItems"], 0)
	\|> Map.put("type", "Foo")

	external_rep =
	put_in(
	external_rep,
	["formerRepresentations", "orderedItems"],
	[history_item]
	)

	assert {:error, _} = ObjectValidator.validate(external_rep, [])
	end
	end

	test "a Note from Roadhouse validates" do
	insert(:user, ap_id: "https://macgirvin.com/channel/mike")

	%{"object" => note} =
	"test/fixtures/roadhouse-create-activity.json"
	\|> File.read!()
	\|> Jason.decode!()

	%{valid?: true} = ArticleNotePageValidator.cast_and_validate(note)
	end

	test "a Note from Convergence AP Bridge validates" do
	insert(:user, ap_id: "https://cc.mkdir.uk/ap/acct/hiira")

	note =
	"test/fixtures/ccworld-ap-bridge_note.json"
	\|> File.read!()
	\|> Jason.decode!()

	%{valid?: true} = ArticleNotePageValidator.cast_and_validate(note)
	end

	test "a note with an attachment should work", _ do
	insert(:user, %{ap_id: "https://owncast.localhost.localdomain/federation/user/streamer"})

	note =
	"test/fixtures/owncast-note-with-attachment.json"
	\|> File.read!()
	\|> Jason.decode!()

	%{valid?: true} = ArticleNotePageValidator.cast_and_validate(note)
	end

	test "a Note without replies/first/items validates" do
	insert(:user, ap_id: "https://mastodon.social/users/emelie")

	note =
	"test/fixtures/tesla_mock/status.emelie.json"
	\|> File.read!()
	\|> Jason.decode!()
	\|> pop_in(["replies", "first", "items"])
	\|> elem(1)

	%{valid?: true} = ArticleNotePageValidator.cast_and_validate(note)
	end

	test "a Note with validated likes collection validates" do
	insert(:user, ap_id: "https://pol.social/users/mkljczk")

	%{"object" => note} =
	"test/fixtures/mastodon-update-with-likes.json"
	\|> File.read!()
	\|> Jason.decode!()

	%{valid?: true} = ArticleNotePageValidator.cast_and_validate(note)
	end

	test "Fedibird quote post" do
	insert(:user, ap_id: "https://fedibird.com/users/noellabo")

	data = File.read!("test/fixtures/quote_post/fedibird_quote_post.json") \|> Jason.decode!()
	cng = ArticleNotePageValidator.cast_and_validate(data)

	assert cng.valid?
	assert cng.changes.quoteUrl == "https://misskey.io/notes/8vsn2izjwh"
	end

	test "Fedibird quote post with quoteUri field" do
	insert(:user, ap_id: "https://fedibird.com/users/noellabo")

	data = File.read!("test/fixtures/quote_post/fedibird_quote_uri.json") \|> Jason.decode!()
	cng = ArticleNotePageValidator.cast_and_validate(data)

	assert cng.valid?
	assert cng.changes.quoteUrl == "https://fedibird.com/users/yamako/statuses/107699333438289729"
	end

	test "Misskey quote post" do
	insert(:user, ap_id: "https://misskey.io/users/7rkrarq81i")

	data = File.read!("test/fixtures/quote_post/misskey_quote_post.json") \|> Jason.decode!()
	cng = ArticleNotePageValidator.cast_and_validate(data)

	assert cng.valid?
	assert cng.changes.quoteUrl == "https://misskey.io/notes/8vs6wxufd0"
	end

	test "Parse tag as quote" do
	# https://codeberg.org/fediverse/fep/src/branch/main/fep/e232/fep-e232.md

	insert(:user, ap_id: "https://server.example/users/1")

	data = File.read!("test/fixtures/quote_post/fep-e232-tag-example.json") \|> Jason.decode!()
	cng = ArticleNotePageValidator.cast_and_validate(data)

	assert cng.valid?
	assert cng.changes.quoteUrl == "https://server.example/objects/123"

	assert Enum.at(cng.changes.tag, 0).changes == %{
	type: "Link",
	mediaType: "application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\"",
	href: "https://server.example/objects/123",
	name: "RE: https://server.example/objects/123"
	}
	end

	describe "Note language" do
	test "it detects language from JSON-LD context" do
	user = insert(:user)

	note_activity = %{
	"@context" => ["https://www.w3.org/ns/activitystreams", %{"@language" => "pl"}],
	"to" => ["https://www.w3.org/ns/activitystreams#Public"],
	"cc" => [],
	"type" => "Create",
	"object" => %{
	"to" => ["https://www.w3.org/ns/activitystreams#Public"],
	"cc" => [],
	"id" => Utils.generate_object_id(),
	"type" => "Note",
	"content" => "Szczęść Boże",
	"attributedTo" => user.ap_id
	},
	"actor" => user.ap_id
	}

	{:ok, _create_activity, meta} = ObjectValidator.validate(note_activity, [])

	assert meta[:object_data]["language"] == "pl"
	end

	test "it detects language from contentMap" do
	user = insert(:user)

	note = %{
	"to" => ["https://www.w3.org/ns/activitystreams#Public"],
	"cc" => [],
	"id" => Utils.generate_object_id(),
	"type" => "Note",
	"content" => "Szczęść Boże",
	"contentMap" => %{
	"de" => "Gott segne",
	"pl" => "Szczęść Boże"
	},
	"attributedTo" => user.ap_id
	}

	{:ok, object} = ArticleNotePageValidator.cast_and_apply(note)

	assert object.language == "pl"
	end

	+ test_with_mock "it doesn't call LanguageDetector when language is specified",
	+ Pleroma.Language.LanguageDetector,
	+ detect: fn _ -> nil end do
	+ user = insert(:user)
	+
	+ note = %{
	+ "to" => ["https://www.w3.org/ns/activitystreams#Public"],
	+ "cc" => [],
	+ "id" => Utils.generate_object_id(),
	+ "type" => "Note",
	+ "content" => "a post in English",
	+ "contentMap" => %{
	+ "en" => "a post in English"
	+ },
	+ "attributedTo" => user.ap_id
	+ }
	+
	+ ArticleNotePageValidator.cast_and_apply(note)
	+
	+ refute called(Pleroma.Language.LanguageDetector.detect(:_))
	+ end
	+
	test "it adds contentMap if language is specified" do
	user = insert(:user)

	note = %{
	"to" => ["https://www.w3.org/ns/activitystreams#Public"],
	"cc" => [],
	"id" => Utils.generate_object_id(),
	"type" => "Note",
	"content" => "тест",
	"language" => "uk",
	"attributedTo" => user.ap_id
	}

	{:ok, object} = ArticleNotePageValidator.cast_and_apply(note)

	assert object.contentMap == %{
	"uk" => "тест"
	}
	end
	end
	end

File Metadata

Mime Type: text/x-diff
Expires: Fri, Oct 9, 8:24 AM (1 d, 12 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1784569
Default Alt Text: (16 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions