summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-03-13 18:50:17 +0000
committerrinpatch <rinpatch@sdf.org>2020-03-13 18:50:17 +0000
commit994ac4357cb6c3f64a8889d3a98f9a3adbd37010 (patch)
tree13bd2a235d338a40c5e2a637b1b3fd476db8637a /lib
parent658f30c0b3cc5403d1172a07adba8bdcd79eb82c (diff)
parentfffc382f138442035337e55eb930324d13bbdca8 (diff)
downloadpleroma-994ac4357cb6c3f64a8889d3a98f9a3adbd37010.tar.gz
pleroma-994ac4357cb6c3f64a8889d3a98f9a3adbd37010.zip
Merge branch 'fix/hashtags-streaming' into 'develop'
Fix hashtags WebSocket streaming Closes #1593 See merge request pleroma/pleroma!2294
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/activity/ir/topics.ex2
1 files changed, 1 insertions, 1 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