moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Repair retweets.

This commit is contained in:
Roger Braun 2017-05-10 19:29:25 +02:00
parent f73cd6f3ce
commit 1b67a59795
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/web/ostatus/ostatus.ex
View File

@ -120,10 +120,10 @@ def get_attachments(entry) do
end end
def get_content(entry) do def get_content(entry) do
base_content = string_from_xpath("/entry/content", entry) base_content = string_from_xpath("//content", entry)
with scope when not is_nil(scope) <- string_from_xpath("//mastodon:scope", entry), with scope when not is_nil(scope) <- string_from_xpath("//mastodon:scope", entry),
cw when not is_nil(cw) <- string_from_xpath("/entry/summary", entry) do cw when not is_nil(cw) <- string_from_xpath("//summary", entry) do
"<span class='mastodon-cw'>#{cw}</span><br>#{base_content}" "<span class='mastodon-cw'>#{cw}</span><br>#{base_content}"
else _e -> base_content else _e -> base_content
end end

1
test/web/ostatus/ostatus_test.exs
View File

@ -98,6 +98,7 @@ test "handle incoming retweets - GS, subscription" do
assert retweeted_activity.data["actor"] == "https://pleroma.soykaf.com/users/lain" assert retweeted_activity.data["actor"] == "https://pleroma.soykaf.com/users/lain"
refute retweeted_activity.local refute retweeted_activity.local
assert retweeted_activity.data["object"]["announcement_count"] == 1 assert retweeted_activity.data["object"]["announcement_count"] == 1
assert String.contains?(retweeted_activity.data["object"]["content"], "mastodon")
end end
test "handle incoming retweets - GS, subscription - local message" do test "handle incoming retweets - GS, subscription - local message" do