Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'fix/retweet-language' into 'develop'

Browse Source 
Use "repeated" instead of "retweeted" for repeated statuses in Twitter API

Closes pleroma-fe#533

See merge request pleroma/pleroma!1130
This commit is contained in:
lambda 2019-05-10 09:49:46 +00:00
commit 17d01869ea
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/twitter_api/views/activity_view.ex
View File

@ -170,7 +170,7 @@ defmodule Pleroma.Web.TwitterAPI.ActivityView do
created_at = activity.data["published"] |> Utils.date_to_asctime() created_at = activity.data["published"] |> Utils.date_to_asctime()
announced_activity = Activity.get_create_by_object_ap_id(activity.data["object"]) announced_activity = Activity.get_create_by_object_ap_id(activity.data["object"])
text = "#{user.nickname} retweeted a status." text = "#{user.nickname} repeated a status."
retweeted_status = render("activity.json", Map.merge(opts, %{activity: announced_activity})) retweeted_status = render("activity.json", Map.merge(opts, %{activity: announced_activity}))

4
test/web/twitter_api/views/activity_view_test.exs
View File

@ -295,8 +295,8 @@ defmodule Pleroma.Web.TwitterAPI.ActivityViewTest do
"id" => announce.id, "id" => announce.id,
"is_local" => true, "is_local" => true,
"is_post_verb" => false, "is_post_verb" => false,
"statusnet_html" => "shp retweeted a status.", "statusnet_html" => "shp repeated a status.",
"text" => "shp retweeted a status.", "text" => "shp repeated a status.",
"uri" => "tag:#{announce.data["id"]}:objectType=note", "uri" => "tag:#{announce.data["id"]}:objectType=note",
"user" => UserView.render("show.json", user: other_user), "user" => UserView.render("show.json", user: other_user),
"retweeted_status" => ActivityView.render("activity.json", activity: activity), "retweeted_status" => ActivityView.render("activity.json", activity: activity),