Merge branch 'no-self-notification' into 'develop'

Do not create notification for yourself

Closes #121

See merge request pleroma/pleroma!148

lib/pleroma/notification.ex

@@ -91,7 +91,8 @@ def create_notifications(_), do: {:ok, []}
 
   # TODO move to sql, too.
   def create_notification(%Activity{} = activity, %User{} = user) do
-    unless User.blocks?(user, %{ap_id: activity.data["actor"]}) do
+    unless User.blocks?(user, %{ap_id: activity.data["actor"]}) or
+             user.ap_id == activity.data["actor"] do
       notification = %Notification{user_id: user.id, activity: activity}
       {:ok, notification} = Repo.insert(notification)
       Pleroma.Web.Streamer.stream("user", notification)

test/notification_test.exs

@@ -33,6 +33,13 @@ test "it doesn't create a notification for user if the user blocks the activity
 
       assert nil == Notification.create_notification(activity, user)
     end
+
+    test "it doesn't create a notification for user if he is the activity author" do
+      activity = insert(:note_activity)
+      author = User.get_by_ap_id(activity.data["actor"])
+
+      assert nil == Notification.create_notification(activity, author)
+    end
   end
 
   describe "get notification" do

test/web/twitter_api/twitter_api_controller_test.exs

@@ -257,8 +257,10 @@ test "without valid credentials", %{conn: conn} do
     end
 
     test "with credentials", %{conn: conn, user: current_user} do
+      other_user = insert(:user)
+
       {:ok, activity} =
-        ActivityBuilder.insert(%{"to" => [current_user.ap_id]}, %{user: current_user})
+        ActivityBuilder.insert(%{"to" => [current_user.ap_id]}, %{user: other_user})
 
       conn =
         conn