pleroma

commit: 994ac4357cb6c3f64a8889d3a98f9a3adbd37010
parent: 658f30c0b3cc5403d1172a07adba8bdcd79eb82c
Author: rinpatch <rinpatch@sdf.org>
Date:   Fri, 13 Mar 2020 18:50:17 +0000

Merge branch 'fix/hashtags-streaming' into 'develop'

Fix hashtags WebSocket streaming

Closes #1593

See merge request pleroma/pleroma!2294
Diffstat:
M
lib/pleroma/activity/ir/topics.ex
2
+-
M
test/activity/ir/topics_test.exs
8
++++----

2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/pleroma/activity/ir/topics.ex b/lib/pleroma/activity/ir/topics.ex
@@ -39,7 +39,7 @@ defmodule Pleroma.Activity.Ir.Topics do
     end
   end
 
-  defp item_creation_tags(tags, %{data: %{"type" => "Create"}} = object, activity) do
+  defp item_creation_tags(tags, object, %{data: %{"type" => "Create"}} = activity) do
     tags ++ hashtags_to_topics(object) ++ attachment_topics(object, activity)
   end
 
diff --git a/test/activity/ir/topics_test.exs b/test/activity/ir/topics_test.exs
@@ -59,8 +59,8 @@ defmodule Pleroma.Activity.Ir.TopicsTest do
   describe "public visibility create events" do
     setup do
       activity = %Activity{
-        object: %Object{data: %{"type" => "Create", "attachment" => []}},
-        data: %{"to" => [Pleroma.Constants.as_public()]}
+        object: %Object{data: %{"attachment" => []}},
+        data: %{"type" => "Create", "to" => [Pleroma.Constants.as_public()]}
       }
 
       {:ok, activity: activity}
@@ -98,8 +98,8 @@ defmodule Pleroma.Activity.Ir.TopicsTest do
   describe "public visibility create events with attachments" do
     setup do
       activity = %Activity{
-        object: %Object{data: %{"type" => "Create", "attachment" => ["foo"]}},
-        data: %{"to" => [Pleroma.Constants.as_public()]}
+        object: %Object{data: %{"attachment" => ["foo"]}},
+        data: %{"type" => "Create", "to" => [Pleroma.Constants.as_public()]}
       }
 
       {:ok, activity: activity}