diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-04-09 08:42:01 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-04-09 08:42:01 +0000 |
| commit | d7c2909ce2e488e049a04ba6ba2a79d392d60bde (patch) | |
| tree | 6c7afb1039e684c459bc96cac6e1c0202cedf1d5 | |
| parent | 210755ac46d7f1b909b74c75e9c7cce4dd9df7ba (diff) | |
| parent | 2edde060420f6e36a17b26839c9a95949d8b8d69 (diff) | |
| download | pleroma-d7c2909ce2e488e049a04ba6ba2a79d392d60bde.tar.gz | |
Merge branch 'bugfix/user-search-with-at-sign' into 'develop'
user: strip leading @ from user query when searching for users if present
Closes #117
See merge request pleroma/pleroma!99
| -rw-r--r-- | lib/pleroma/user.ex | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index abeb169d9..e959fe677 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -375,6 +375,9 @@ defmodule Pleroma.User do end def search(query, resolve) do + # strip the beginning @ off if there is a query + query = String.trim_leading(query, "@") + if resolve do User.get_or_fetch_by_nickname(query) end |