diff options
| -rw-r--r-- | config/prod.exs | 6 | ||||
| -rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 4 | ||||
| -rw-r--r-- | lib/pleroma/web/twitter_api/views/activity_view.ex | 50 | ||||
| -rw-r--r-- | test/web/twitter_api/views/activity_view_test.exs | 122 |
4 files changed, 175 insertions, 7 deletions
diff --git a/config/prod.exs b/config/prod.exs index 8522c67da..d0cfd1ac2 100644 --- a/config/prod.exs +++ b/config/prod.exs @@ -15,11 +15,7 @@ use Mix.Config # which you typically run after static files are built. config :pleroma, Pleroma.Web.Endpoint, http: [port: 4000], - protocol: "http", - debug_errors: true, - code_reloader: true, - check_origin: false, - watchers: [] + protocol: "http" # Do not print debug messages in production config :logger, level: :info diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index 0f84542f0..5fc940261 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -46,8 +46,8 @@ defmodule Pleroma.Web.CommonAPI do end end - def get_visibility(%{"visibility" => visibility}), do: visibility - def get_visibility(%{"in_reply_to_status_id" => status_id}) when status_id do + def get_visibility(%{"visibility" => visibility}) when visibility in ~w{public unlisted private direct}, do: visibility + def get_visibility(%{"in_reply_to_status_id" => status_id}) when not is_nil(status_id) do inReplyTo = get_replied_to_activity(status_id) Pleroma.Web.MastodonAPI.StatusView.get_visibility(inReplyTo.data["object"]) end diff --git a/lib/pleroma/web/twitter_api/views/activity_view.ex b/lib/pleroma/web/twitter_api/views/activity_view.ex index ae5be60ce..50d536d0e 100644 --- a/lib/pleroma/web/twitter_api/views/activity_view.ex +++ b/lib/pleroma/web/twitter_api/views/activity_view.ex @@ -5,8 +5,58 @@ defmodule Pleroma.Web.TwitterAPI.ActivityView do alias Pleroma.Web.TwitterAPI.UserView alias Pleroma.Web.TwitterAPI.TwitterAPI alias Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter + alias Pleroma.Activity alias Pleroma.Formatter + def render("activity.json", %{activity: %{data: %{"type" => "Announce"}} = activity} = opts) do + user = User.get_by_ap_id(activity.data["actor"]) + created_at = activity.data["published"] |> Utils.date_to_asctime + announced_activity = Activity.get_create_activity_by_object_ap_id(activity.data["object"]) + + text = "#{user.nickname} retweeted a status." + + # retweeted_status = to_map(announced_activity, Map.merge(%{user: announced_user}, opts)) + retweeted_status = render("activity.json", Map.merge(opts, %{activity: announced_activity})) + + %{ + "id" => activity.id, + "user" => UserView.render("show.json", %{user: user, for: opts[:for]}), + "statusnet_html" => text, + "text" => text, + "is_local" => activity.local, + "is_post_verb" => false, + "uri" => "tag:#{activity.data["id"]}:objectType=note", + "created_at" => created_at, + "retweeted_status" => retweeted_status, + "statusnet_conversation_id" => conversation_id(announced_activity), + "external_url" => activity.data["id"], + "activity_type" => "repeat" + } + end + + def render("activity.json", %{activity: %{data: %{"type" => "Like"}} = activity} = opts) do + user = User.get_cached_by_ap_id(activity.data["actor"]) + liked_activity = Activity.get_create_activity_by_object_ap_id(activity.data["object"]) + created_at = activity.data["published"] + |> Utils.date_to_asctime + + text = "#{user.nickname} favorited a status." + + %{ + "id" => activity.id, + "user" => UserView.render("show.json", %{user: user, for: opts[:for]}), + "statusnet_html" => text, + "text" => text, + "is_local" => activity.local, + "is_post_verb" => false, + "uri" => "tag:#{activity.data["id"]}:objectType=Favourite", + "created_at" => created_at, + "in_reply_to_status_id" => liked_activity.id, + "external_url" => activity.data["id"], + "activity_type" => "like" + } + end + def render("activity.json", %{activity: %{data: %{"type" => "Create", "object" => object}} = activity} = opts) do actor = get_in(activity.data, ["actor"]) user = User.get_cached_by_ap_id(actor) diff --git a/test/web/twitter_api/views/activity_view_test.exs b/test/web/twitter_api/views/activity_view_test.exs new file mode 100644 index 000000000..7615454da --- /dev/null +++ b/test/web/twitter_api/views/activity_view_test.exs @@ -0,0 +1,122 @@ +defmodule Pleroma.Web.TwitterAPI.ActivityViewTest do + use Pleroma.DataCase + + alias Pleroma.Web.CommonAPI + alias Pleroma.Web.CommonAPI.Utils + alias Pleroma.Web.TwitterAPI.ActivityView + alias Pleroma.Web.TwitterAPI.UserView + alias Pleroma.Web.TwitterAPI.TwitterAPI + alias Pleroma.Repo + alias Pleroma.Activity + import Pleroma.Factory + + test "a create activity with a note" do + user = insert(:user) + other_user = insert(:user, %{nickname: "shp"}) + + {:ok, activity} = CommonAPI.post(user, %{"status" => "Hey @shp!"}) + + result = ActivityView.render("activity.json", activity: activity) + + convo_id = TwitterAPI.context_to_conversation_id(activity.data["object"]["context"]) + + expected = %{ + "activity_type" => "post", + "attachments" => [], + "attentions" => [ + UserView.render("show.json", %{user: other_user}) + ], + "created_at" => activity.data["object"]["published"] |> Utils.date_to_asctime(), + "external_url" => activity.data["object"]["id"], + "fave_num" => 0, + "favorited" => false, + "id" => activity.id, + "in_reply_to_status_id" => nil, + "is_local" => true, + "is_post_verb" => true, + "possibly_sensitive" => false, + "repeat_num" => 0, + "repeated" => false, + "statusnet_conversation_id" => convo_id, + "statusnet_html" => + "Hey <span><a href=\"#{other_user.ap_id}\">@<span>shp</span></a></span>!", + "tags" => [], + "text" => "Hey @shp!", + "uri" => activity.data["object"]["id"], + "user" => UserView.render("show.json", %{user: user}) + } + + assert result == expected + end + + test "an activity that is a reply" do + user = insert(:user) + other_user = insert(:user, %{nickname: "shp"}) + + {:ok, activity} = CommonAPI.post(user, %{"status" => "Hey @shp!"}) + + {:ok, answer} = + CommonAPI.post(other_user, %{"status" => "Hi!", "in_reply_to_status_id" => activity.id}) + + result = ActivityView.render("activity.json", %{activity: answer}) + + assert result["in_reply_to_status_id"] == activity.id + end + + test "a like activity" do + user = insert(:user) + other_user = insert(:user, %{nickname: "shp"}) + + {:ok, activity} = CommonAPI.post(user, %{"status" => "Hey @shp!"}) + {:ok, like, _object} = CommonAPI.favorite(activity.id, other_user) + + result = ActivityView.render("activity.json", activity: like) + + expected = %{ + "activity_type" => "like", + "created_at" => like.data["published"] |> Utils.date_to_asctime(), + "external_url" => like.data["id"], + "id" => like.id, + "in_reply_to_status_id" => activity.id, + "is_local" => true, + "is_post_verb" => false, + "statusnet_html" => "shp favorited a status.", + "text" => "shp favorited a status.", + "uri" => "tag:#{like.data["id"]}:objectType=Favourite", + "user" => UserView.render("show.json", user: other_user) + } + + assert result == expected + end + + test "an announce activity" do + user = insert(:user) + other_user = insert(:user, %{nickname: "shp"}) + + {:ok, activity} = CommonAPI.post(user, %{"status" => "Hey @shp!"}) + {:ok, announce, _object} = CommonAPI.repeat(activity.id, other_user) + + convo_id = TwitterAPI.context_to_conversation_id(activity.data["object"]["context"]) + + activity = Repo.get(Activity, activity.id) + + result = ActivityView.render("activity.json", activity: announce) + + expected = %{ + "activity_type" => "repeat", + "created_at" => announce.data["published"] |> Utils.date_to_asctime(), + "external_url" => announce.data["id"], + "id" => announce.id, + "is_local" => true, + "is_post_verb" => false, + "statusnet_html" => "shp retweeted a status.", + "text" => "shp retweeted a status.", + "uri" => "tag:#{announce.data["id"]}:objectType=note", + "user" => UserView.render("show.json", user: other_user), + "retweeted_status" => ActivityView.render("activity.json", activity: activity), + "statusnet_conversation_id" => convo_id + } + + assert result == expected + end +end |