projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/peertube_2' 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 9af8a1691daf0cd5f5724929755b518a852f389f..60e30191f4041e3047f3d2af294846e5cffff060 100644
(file)
--- a/
lib/pleroma/web/twitter_api/representers/object_representer.ex
+++ b/
lib/pleroma/web/twitter_api/representers/object_representer.ex
@@
-7,7
+7,7
@@
defmodule Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter do
%{
url: url["href"] |> Pleroma.Web.MediaProxy.url(),
%{
url: url["href"] |> Pleroma.Web.MediaProxy.url(),
- mimetype: url["mediaType"],
+ mimetype: url["mediaType"]
|| url["mimeType"]
,
id: data["uuid"],
oembed: false
}
id: data["uuid"],
oembed: false
}
@@
-16,7
+16,7
@@
defmodule Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter do
def to_map(%Object{data: %{"url" => url} = data}, _opts) when is_binary(url) do
%{
url: url |> Pleroma.Web.MediaProxy.url(),
def to_map(%Object{data: %{"url" => url} = data}, _opts) when is_binary(url) do
%{
url: url |> Pleroma.Web.MediaProxy.url(),
- mimetype: data["mediaType"],
+ mimetype: data["mediaType"]
|| url["mimeType"]
,
id: data["uuid"],
oembed: false
}
id: data["uuid"],
oembed: false
}