projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[#394] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
status_view.ex
diff --git
a/lib/pleroma/web/mastodon_api/views/status_view.ex
b/lib/pleroma/web/mastodon_api/views/status_view.ex
index 80e80c8f598ef6c38c316cc56a0576eb1df5b6b4..2d9a915f07e9cbe969a611a5a2c1d7057f957cdd 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/status_view.ex
@@
-61,7
+61,7
@@
defmodule Pleroma.Web.MastodonAPI.StatusView do
in_reply_to_id: nil,
in_reply_to_account_id: nil,
reblog: reblogged,
in_reply_to_id: nil,
in_reply_to_account_id: nil,
reblog: reblogged,
- content: reblogged[:content],
+ content: reblogged[:content]
|| ""
,
created_at: created_at,
reblogs_count: 0,
replies_count: 0,
created_at: created_at,
reblogs_count: 0,
replies_count: 0,
@@
-230,24
+230,24
@@
defmodule Pleroma.Web.MastodonAPI.StatusView do
if !!name and name != "" do
"<p><a href=\"#{object["id"]}\">#{name}</a></p>#{object["content"]}"
else
if !!name and name != "" do
"<p><a href=\"#{object["id"]}\">#{name}</a></p>#{object["content"]}"
else
- object["content"]
+ object["content"]
|| ""
end
content
end
end
content
end
- def render_content(%{"type" =>
"Article"} = object)
do
+ def render_content(%{"type" =>
object_type} = object) when object_type in ["Article", "Page"]
do
summary = object["name"]
content =
summary = object["name"]
content =
- if !!summary and summary != "" do
+ if !!summary and summary != ""
and is_bitstring(object["url"])
do
"<p><a href=\"#{object["url"]}\">#{summary}</a></p>#{object["content"]}"
else
"<p><a href=\"#{object["url"]}\">#{summary}</a></p>#{object["content"]}"
else
- object["content"]
+ object["content"]
|| ""
end
content
end
end
content
end
- def render_content(object), do: object["content"]
+ def render_content(object), do: object["content"]
|| ""
end
end