pleroma

commit: a61e8ac15473aca6d0ec9ef20df981bcef9d5897
parent: 18c3ca784427ad5e5f015c76c157697671d00fd4
Author: lain <lain@soykaf.club>
Date:   Fri, 20 Apr 2018 13:10:57 +0200

Formatting.

Diffstat:
M
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
4
++--
M
lib/pleroma/web/twitter_api/views/notification_view.ex
36
+++++++++++++++++++++++++++---------
M
test/web/twitter_api/twitter_api_controller_test.exs
8
++++----
M
test/web/twitter_api/views/notification_view_test.exs
22
+++++++++++++++-------

4 files changed, 48 insertions(+), 22 deletions(-)
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -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
diff --git a/lib/pleroma/web/twitter_api/views/notification_view.ex b/lib/pleroma/web/twitter_api/views/notification_view.ex
@@ -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
diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs
@@ -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
 
diff --git a/test/web/twitter_api/views/notification_view_test.exs b/test/web/twitter_api/views/notification_view_test.exs
@@ -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