Formatting.

This commit is contained in:
lain 2018-04-20 13:10:57 +02:00
parent 18c3ca7844
commit a61e8ac154
4 changed files with 48 additions and 22 deletions

View file

@ -217,8 +217,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
activities = []
else
activities =
ActivityPub.fetch_public_activities(params)
|> Enum.reverse()
ActivityPub.fetch_public_activities(params)
|> Enum.reverse()
end
conn

View file

@ -23,16 +23,34 @@ defmodule Pleroma.Web.TwitterAPI.NotificationView do
end
def render("notification.json", %{notifications: notifications, for: user}) do
render_many(notifications, Pleroma.Web.TwitterAPI.NotificationView, "notification.json", for: user)
render_many(
notifications,
Pleroma.Web.TwitterAPI.NotificationView,
"notification.json",
for: user
)
end
def render("notification.json", %{notification: %Notification{id: id, seen: seen, activity: activity, inserted_at: created_at}, for: user} = opts) do
ntype = case activity.data["type"] do
"Create" -> "mention"
"Like" -> "like"
"Announce" -> "repeat"
"Follow" -> "follow"
end
def render(
"notification.json",
%{
notification: %Notification{
id: id,
seen: seen,
activity: activity,
inserted_at: created_at
},
for: user
} = opts
) do
ntype =
case activity.data["type"] do
"Create" -> "mention"
"Like" -> "like"
"Announce" -> "repeat"
"Follow" -> "follow"
end
from = get_user(activity.data["actor"], opts)
%{
@ -40,7 +58,7 @@ defmodule Pleroma.Web.TwitterAPI.NotificationView do
"ntype" => ntype,
"notice" => ActivityView.render("activity.json", %{activity: activity, for: user}),
"from_profile" => UserView.render("show.json", %{user: from, for: user}),
"is_seen" => (if seen, do: 1, else: 0),
"is_seen" => if(seen, do: 1, else: 0),
"created_at" => created_at |> Utils.format_naive_asctime()
}
end

View file

@ -270,10 +270,10 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
assert length(response) == 1
assert response ==
NotificationView.render(
"notification.json",
%{notifications: Notification.for_user(current_user), for: current_user}
)
NotificationView.render("notification.json", %{
notifications: Notification.for_user(current_user),
for: current_user
})
end
end

View file

@ -36,14 +36,17 @@ defmodule Pleroma.Web.TwitterAPI.NotificationViewTest do
"ntype" => "follow"
}
assert represented == NotificationView.render("notification.json", %{notification: follow_notif, for: user})
assert represented ==
NotificationView.render("notification.json", %{notification: follow_notif, for: user})
end
test "A mention notification" do
user = insert(:user)
other_user = insert(:user)
{:ok, activity} = TwitterAPI.create_status(other_user, %{"status" => "Päivää, @#{user.nickname}"})
{:ok, activity} =
TwitterAPI.create_status(other_user, %{"status" => "Päivää, @#{user.nickname}"})
[notification] = Notification.for_user(user)
represented = %{
@ -55,7 +58,8 @@ defmodule Pleroma.Web.TwitterAPI.NotificationViewTest do
"ntype" => "mention"
}
assert represented == NotificationView.render("notification.json", %{notification: notification, for: user})
assert represented ==
NotificationView.render("notification.json", %{notification: notification, for: user})
end
test "A retweet notification" do
@ -71,11 +75,13 @@ defmodule Pleroma.Web.TwitterAPI.NotificationViewTest do
"from_profile" => UserView.render("show.json", %{user: repeater, for: user}),
"id" => notification.id,
"is_seen" => 0,
"notice" => ActivityView.render("activity.json", %{activity: notification.activity, for: user}),
"notice" =>
ActivityView.render("activity.json", %{activity: notification.activity, for: user}),
"ntype" => "repeat"
}
assert represented == NotificationView.render("notification.json", %{notification: notification, for: user})
assert represented ==
NotificationView.render("notification.json", %{notification: notification, for: user})
end
test "A like notification" do
@ -91,10 +97,12 @@ defmodule Pleroma.Web.TwitterAPI.NotificationViewTest do
"from_profile" => UserView.render("show.json", %{user: liker, for: user}),
"id" => notification.id,
"is_seen" => 0,
"notice" => ActivityView.render("activity.json", %{activity: notification.activity, for: user}),
"notice" =>
ActivityView.render("activity.json", %{activity: notification.activity, for: user}),
"ntype" => "like"
}
assert represented == NotificationView.render("notification.json", %{notification: notification, for: user})
assert represented ==
NotificationView.render("notification.json", %{notification: notification, for: user})
end
end