projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/emoji-in-local-users' 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..6aa794a59d5d219f13f8e94d5fa68453a727e258 100644
(file)
--- a/
lib/pleroma/web/twitter_api/representers/object_representer.ex
+++ b/
lib/pleroma/web/twitter_api/representers/object_representer.ex
@@
-9,7
+9,8
@@
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
}
end
@@
-18,7
+19,8
@@
defmodule Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter do
url: url |> Pleroma.Web.MediaProxy.url(),
mimetype: data["mediaType"] || url["mimeType"],
id: data["uuid"],
url: url |> Pleroma.Web.MediaProxy.url(),
mimetype: data["mediaType"] || url["mimeType"],
id: data["uuid"],
- oembed: false
+ oembed: false,
+ description: data["name"]
}
end
}
end