projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/user-search-null-name' into 'develop'
[akkoma]
/
lib
/
pleroma
/
user.ex
diff --git
a/lib/pleroma/user.ex
b/lib/pleroma/user.ex
index 5705098eaea236392f6546b4e35d147b54b7daf7..0e5e2d943e79d5dffd256d9f560df1245b2b7044 100644
(file)
--- a/
lib/pleroma/user.ex
+++ b/
lib/pleroma/user.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-201
8
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-201
9
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.User do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.User do
@@
-495,6
+495,7
@@
defmodule Pleroma.User do
Enum.map(reqs, fn req -> req.actor end)
|> Enum.uniq()
|> Enum.map(fn ap_id -> get_by_ap_id(ap_id) end)
Enum.map(reqs, fn req -> req.actor end)
|> Enum.uniq()
|> Enum.map(fn ap_id -> get_by_ap_id(ap_id) end)
+ |> Enum.filter(fn u -> !is_nil(u) end)
|> Enum.filter(fn u -> !following?(u, user) end)
{:ok, users}
|> Enum.filter(fn u -> !following?(u, user) end)
{:ok, users}
@@
-609,7
+610,7
@@
defmodule Pleroma.User do
select_merge: %{
search_distance:
fragment(
select_merge: %{
search_distance:
fragment(
- "? <-> (? ||
?
)",
+ "? <-> (? ||
coalesce(?, '')
)",
^query,
u.nickname,
u.name
^query,
u.nickname,
u.name
@@
-786,7
+787,9
@@
defmodule Pleroma.User do
Pleroma.HTML.Scrubber.TwitterText
end
Pleroma.HTML.Scrubber.TwitterText
end
- def html_filter_policy(_), do: nil
+ @default_scrubbers Pleroma.Config.get([:markup, :scrub_policy])
+
+ def html_filter_policy(_), do: @default_scrubbers
def get_or_fetch_by_ap_id(ap_id) do
user = get_by_ap_id(ap_id)
def get_or_fetch_by_ap_id(ap_id) do
user = get_by_ap_id(ap_id)