potsda.mn/mobilizon
10
4
Fork 1
Code Issues 22 Pull requests 1 Projects Releases Wiki Activity

Merge branch 'webfinger-fixes' into 'master'

Browse source 
Webfinger fixes

See merge request framasoft/mobilizon!614
This commit is contained in:
Thomas Citharel 2020-10-15 17:46:43 +02:00
parent 75576f5f81 6f5d535b86
commit 489b91a7dd
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/federation/web_finger/web_finger.ex
View file

@ -93,7 +93,7 @@ defmodule Mobilizon.Federation.WebFinger do
_ -> _ ->
Logger.debug(fn -> Logger.debug(fn ->
"Unhandled type: #{inspect(link["type"])}" "Unhandled type to finger: #{inspect(link["type"])}"
end) end)
data data

6
lib/mobilizon/actors/actors.ex
View file

@ -1616,6 +1616,12 @@ defmodule Mobilizon.Actors do
from(a in query, where: a.preferred_username == ^name and is_nil(a.domain)) from(a in query, where: a.preferred_username == ^name and is_nil(a.domain))
end end
@own_domain Mobilizon.Config.instance_hostname()
defp filter_by_name(query, [name, @own_domain]) do
filter_by_name(query, [name])
end
defp filter_by_name(query, [name, domain]) do defp filter_by_name(query, [name, domain]) do
from(a in query, where: a.preferred_username == ^name and a.domain == ^domain) from(a in query, where: a.preferred_username == ^name and a.domain == ^domain)
end end