Commit fe2dceb6 authored by Wim Vanderbauwhede's avatar Wim Vanderbauwhede

Patch to support image descriptions in Pleroma FE

parent d9d62a11
# Pleroma: A lightweight social networking server
# Copyright © 2017-2019 Pleroma Authors <>
# Copyright © 2017-2018 Pleroma Authors <>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.CommonAPI.Utils do
require Logger
alias Calendar.Strftime
alias Comeonin.Pbkdf2
alias Pleroma.{Activity, Formatter, Object, Repo}
......@@ -32,9 +33,11 @@ defmodule Pleroma.Web.CommonAPI.Utils do
def get_replied_to_activity(_), do: nil
def attachments_from_ids(ids) do || [], fn media_id ->
def attachments_from_ids(ids, descs) do || [], fn media_id -> do
Repo.get(Object, media_id).data
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment