fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-12-22 17:27:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop

Browse source
This commit is contained in:
FloatingGhost 2022-01-07 17:36:21 +00:00
parent 92d3742072 2cc6b1e1bd
commit 34780cf182
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,10 +6,10 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.ArticleNotePageValidator do
use Ecto.Schema use Ecto.Schema
alias Pleroma.EctoType.ActivityPub.ObjectValidators alias Pleroma.EctoType.ActivityPub.ObjectValidators
alias Pleroma.Object.Fetcher
alias Pleroma.Web.ActivityPub.ObjectValidators.CommonFixes alias Pleroma.Web.ActivityPub.ObjectValidators.CommonFixes
alias Pleroma.Web.ActivityPub.ObjectValidators.CommonValidations alias Pleroma.Web.ActivityPub.ObjectValidators.CommonValidations
alias Pleroma.Web.ActivityPub.Transmogrifier alias Pleroma.Web.ActivityPub.Transmogrifier
alias Pleroma.Object.Fetcher
import Ecto.Changeset import Ecto.Changeset

23
lib/pleroma/web/activity_pub/object_validators/tag_validator.ex
View file

@ -69,7 +69,12 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.TagValidator do
end end
def changeset(struct, %{"type" => "Book"} = data) do def changeset(struct, %{"type" => "Book"} = data) do
data = Map.put(data, "name", data["title"]) data =
if Map.has_key?(data, "title") do
Map.put(data, "name", data["title"])
else
data
end
struct struct
|> cast(data, [:type, :name]) |> cast(data, [:type, :name])
@ -77,7 +82,14 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.TagValidator do
end end
def changeset(struct, %{"type" => "Edition"} = data) do def changeset(struct, %{"type" => "Edition"} = data) do
data = Map.put(data, "name", data["title"]) # Sometimes it's title, sometimes name
# Don't ask me.
data =
if Map.has_key?(data, "title") do
Map.put(data, "name", data["title"])
else
data
end
struct struct
|> cast(data, [:type, :name]) |> cast(data, [:type, :name])
@ -85,7 +97,12 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.TagValidator do
end end
def changeset(struct, %{"type" => "Work"} = data) do def changeset(struct, %{"type" => "Work"} = data) do
data = Map.put(data, "name", data["title"]) data =
if Map.has_key?(data, "title") do
Map.put(data, "name", data["title"])
else
data
end
struct struct
|> cast(data, [:type, :name]) |> cast(data, [:type, :name])