projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remerge of hashtag following (#341)
[akkoma]
/
lib
/
mix
/
tasks
/
pleroma
/
user.ex
diff --git
a/lib/mix/tasks/pleroma/user.ex
b/lib/mix/tasks/pleroma/user.ex
index 278a01acc27cec721476894c6cce4e4e7423c577..dd1cdca5b72d6804604cab3919f1fcd027bf1a3d 100644
(file)
--- a/
lib/mix/tasks/pleroma/user.ex
+++ b/
lib/mix/tasks/pleroma/user.ex
@@
-471,9
+471,15
@@
defmodule Mix.Tasks.Pleroma.User do
def run(["timeline_query", nickname]) do
start_pleroma()
def run(["timeline_query", nickname]) do
start_pleroma()
+
params = %{local: true}
with %User{local: true} = user <- User.get_cached_by_nickname(nickname) do
params = %{local: true}
with %User{local: true} = user <- User.get_cached_by_nickname(nickname) do
+ followed_hashtags =
+ user
+ |> User.followed_hashtags()
+ |> Enum.map(& &1.id)
+
params =
params
|> Map.put(:type, ["Create", "Announce"])
params =
params
|> Map.put(:type, ["Create", "Announce"])
@@
-484,6
+490,7
@@
defmodule Mix.Tasks.Pleroma.User do
|> Map.put(:announce_filtering_user, user)
|> Map.put(:user, user)
|> Map.put(:local_only, params[:local])
|> Map.put(:announce_filtering_user, user)
|> Map.put(:user, user)
|> Map.put(:local_only, params[:local])
+ |> Map.put(:hashtags, followed_hashtags)
|> Map.delete(:local)
_activities =
|> Map.delete(:local)
_activities =