projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'cleanup/admin-api-useless-if' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
twitter_api
/
representers
/
object_representer.ex
diff --git
a/lib/pleroma/web/twitter_api/representers/object_representer.ex
b/lib/pleroma/web/twitter_api/representers/object_representer.ex
index 60e30191f4041e3047f3d2af294846e5cffff060..47130ba0686993fae90f86343e643c25224f08d8 100644
(file)
--- a/
lib/pleroma/web/twitter_api/representers/object_representer.ex
+++ b/
lib/pleroma/web/twitter_api/representers/object_representer.ex
@@
-1,3
+1,7
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter do
use Pleroma.Web.TwitterAPI.Representers.BaseRepresenter
alias Pleroma.Object
defmodule Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter do
use Pleroma.Web.TwitterAPI.Representers.BaseRepresenter
alias Pleroma.Object
@@
-9,16
+13,18
@@
defmodule Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter do
url: url["href"] |> Pleroma.Web.MediaProxy.url(),
mimetype: url["mediaType"] || url["mimeType"],
id: data["uuid"],
url: url["href"] |> Pleroma.Web.MediaProxy.url(),
mimetype: url["mediaType"] || url["mimeType"],
id: data["uuid"],
- oembed: false
+ oembed: false,
+ description: data["name"]
}
end
def to_map(%Object{data: %{"url" => url} = data}, _opts) when is_binary(url) do
%{
url: url |> Pleroma.Web.MediaProxy.url(),
}
end
def to_map(%Object{data: %{"url" => url} = data}, _opts) when is_binary(url) do
%{
url: url |> Pleroma.Web.MediaProxy.url(),
- mimetype: data["mediaType"] ||
url
["mimeType"],
+ mimetype: data["mediaType"] ||
data
["mimeType"],
id: data["uuid"],
id: data["uuid"],
- oembed: false
+ oembed: false,
+ description: data["name"]
}
end
}
end