diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-11-16 18:13:47 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-11-16 18:13:47 +0000 |
| commit | 2f639ea1292b1dee01b10fc78bbbe253a4592f2d (patch) | |
| tree | 826a84d81ea2b1ece77eeae72f52615da59bf162 /lib/pleroma/user.ex | |
| parent | 38f76d964f62f03f01abc8beeeddaac97a91d751 (diff) | |
| parent | e8d8c84f795152a0522e6848e75b47dcbce5aa89 (diff) | |
| download | pleroma-2f639ea1292b1dee01b10fc78bbbe253a4592f2d.tar.gz | |
Merge branch 'feature/pleromafe-usersearch' into 'develop'
Add Twitter / Pleroma API user search
See merge request pleroma/pleroma!452
Diffstat (limited to 'lib/pleroma/user.ex')
| -rw-r--r-- | lib/pleroma/user.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index be634a8e1..6e1d5559d 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -498,7 +498,7 @@ defmodule Pleroma.User do Repo.all(query) end - def search(query, resolve) do + def search(query, resolve \\ false) do # strip the beginning @ off if there is a query query = String.trim_leading(query, "@") |