diff options
author | Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> | 2019-01-04 16:27:46 +0000 |
---|---|---|
committer | Wim Vanderbauwhede <Wim.Vanderbauwhede@mail.be> | 2019-01-04 16:27:46 +0000 |
commit | ba93396649f65a1f32eeedfd9ccd32cf308e7210 (patch) | |
tree | 8412ad6a830521187f8f96deb038371d4d40535d /lib/pleroma/web/common_api/utils.ex | |
parent | 4c95545d194e8a807e9e3514ed75347d78ec0856 (diff) | |
download | pleroma-ba93396649f65a1f32eeedfd9ccd32cf308e7210.tar.gz |
Patch to support image descriptions in Pleroma FE
Diffstat (limited to 'lib/pleroma/web/common_api/utils.ex')
-rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 5fe21fb99..59df48ed6 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -32,7 +32,21 @@ defmodule Pleroma.Web.CommonAPI.Utils do def get_replied_to_activity(_), do: nil - def attachments_from_ids(ids, descs_str) do + def attachments_from_ids(data) do + if Map.has_key?(data, "descriptions") do + attachments_from_ids_descs(data["media_ids"], data["descriptions"]) + else + attachments_from_ids_no_descs(data["media_ids"]) + end + end + + def attachments_from_ids_no_descs(ids) do + Enum.map(ids || [], fn media_id -> + Repo.get(Object, media_id).data + end) + end + + def attachments_from_ids_descs(ids, descs_str) do {_, descs} = Jason.decode(descs_str) Enum.map(ids || [], fn media_id -> |