bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Generate * from *Map

Browse source 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
tusooa 2022-12-29 12:13:58 -05:00 committed by marcin mikołajczak
parent 4bcae3597f
commit 5c62c50e9b
6 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/multi_language.ex
View file

@ -26,7 +26,7 @@ defp map_to_str_impl(data, mode) do
|> Enum.join(sep(mode))
else
[lang] -> data[lang]
_ -> ""
_ -> nil
end
end

4
lib/pleroma/web/activity_pub/object_validators/article_note_page_validator.ex
View file

@ -86,7 +86,9 @@ defp fix(data) do
|> fix_attachments()
|> CommonFixes.fix_quote_url()
|> Transmogrifier.fix_emoji()
|> Transmogrifier.fix_content_map()
|> CommonFixes.fix_multilang_field("content", "contentMap", multiline: true)
|> CommonFixes.fix_multilang_field("summary", "summaryMap", multiline: false)
|> CommonFixes.fix_multilang_field("name", "nameMap", multiline: false)
|> CommonFixes.maybe_add_language()
|> CommonFixes.maybe_add_content_map()
end

3
lib/pleroma/web/activity_pub/object_validators/audio_image_video_validator.ex
View file

@ -102,6 +102,9 @@ defp fix(data) do
|> CommonFixes.fix_quote_url()
|> Transmogrifier.fix_emoji()
|> fix_url()
|> CommonFixes.fix_multilang_field("content", "contentMap", multiline: true)
|> CommonFixes.fix_multilang_field("summary", "summaryMap", multiline: false)
|> CommonFixes.fix_multilang_field("name", "nameMap", multiline: false)
|> fix_content()
end

9
lib/pleroma/web/activity_pub/object_validators/common_fixes.ex
View file

@ -194,4 +194,13 @@ def maybe_add_content_map(%{"language" => language, "content" => content} = obje
end
def maybe_add_content_map(object), do: object
def fix_multilang_field(data, str_field, map_field, opts \\ []) do
with %{} = map <- data[map_field],
str when is_binary(str) <- Pleroma.MultiLanguage.map_to_str(map, opts) do
Map.put(data, str_field, str)
else
_ -> data
end
end
end

3
lib/pleroma/web/activity_pub/object_validators/question_validator.ex
View file

@ -67,6 +67,9 @@ defp fix(data) do
|> CommonFixes.fix_quote_url()
|> Transmogrifier.fix_emoji()
|> fix_closed()
|> CommonFixes.fix_multilang_field("content", "contentMap", multiline: true)
|> CommonFixes.fix_multilang_field("summary", "summaryMap", multiline: false)
|> CommonFixes.fix_multilang_field("name", "nameMap", multiline: false)
end
def changeset(struct, data) do

6
test/pleroma/web/activity_pub/object_validators/article_note_page_validator_test.exs
View file

@ -54,9 +54,14 @@ test "Note with contentMap and summaryMap", %{note: note} do
|> Map.put("summaryMap", summary_map)
|> Map.put("contentMap", content_map)
expected_summary = Pleroma.MultiLanguage.map_to_str(summary_map, multiline: false)
expected_content = Pleroma.MultiLanguage.map_to_str(content_map, multiline: true)
assert %{
valid?: true,
changes: %{
summary: ^expected_summary,
content: ^expected_content,
summaryMap: ^summary_map,
contentMap: ^content_map
}
@ -74,6 +79,7 @@ test "Note with empty *Map", %{note: note} do
changes: changes
} = ArticleNotePageValidator.cast_and_validate(note)
assert changes.content == note["content"]
assert Map.has_key?(changes, :summaryMap)
refute Map.has_key?(changes, :contentMap)
end