alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'feature/mastodon-search-tags' into 'develop' 

mastodon search api: implement a reasonable hashtags stub

See merge request pleroma/pleroma!89
This commit is contained in:
lambda 2018-04-01 08:37:45 +00:00
parent 1dcc700cca 2dcc6037d0
commit 978df55a86
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View File

@ -513,12 +513,16 @@ def search(%{assigns: %{user: user}} = conn, %{"q" => query} = params) do
) )
statuses = Repo.all(q) ++ fetched statuses = Repo.all(q) ++ fetched
tags = String.split(query)
|> Enum.uniq()
|> Enum.filter(fn tag -> String.starts_with?(tag, "#") end)
|> Enum.map(fn tag -> String.slice(tag, 1..-1) end)
res = %{ res = %{
"accounts" => AccountView.render("accounts.json", users: accounts, for: user, as: :user), "accounts" => AccountView.render("accounts.json", users: accounts, for: user, as: :user),
"statuses" => "statuses" =>
StatusView.render("index.json", activities: statuses, for: user, as: :activity), StatusView.render("index.json", activities: statuses, for: user, as: :activity),
"hashtags" => [] "hashtags" => tags
} }
json(conn, res) json(conn, res)