diff options
author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-03-13 19:30:42 +0400 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2020-03-15 17:00:18 +0300 |
commit | ffd636f109d437ff49f38d5fabeb1109566f117b (patch) | |
tree | 1bb47e4c4fe15a80aeedd46accd335f5bcbb8460 | |
parent | bd80ff9a6c9f825aba9fadfc1fea6f05c3226590 (diff) | |
download | pleroma-ffd636f109d437ff49f38d5fabeb1109566f117b.tar.gz |
Fix hashtags WebSocket streaming
-rw-r--r-- | lib/pleroma/activity/ir/topics.ex | 2 | ||||
-rw-r--r-- | 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 index 4acc1a3e0..9e65bedad 100644 --- 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 index e75f83586..44aec1e19 100644 --- 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} |