From 479bd466b566b800124e1e868d2024a5c44047be Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 15 Oct 2020 17:19:15 +0200 Subject: [PATCH 1/2] Improve debug logger message in webfinger module Signed-off-by: Thomas Citharel --- lib/federation/web_finger/web_finger.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/federation/web_finger/web_finger.ex b/lib/federation/web_finger/web_finger.ex index 97f5b2b5..60163ec4 100644 --- a/lib/federation/web_finger/web_finger.ex +++ b/lib/federation/web_finger/web_finger.ex @@ -93,7 +93,7 @@ defmodule Mobilizon.Federation.WebFinger do _ -> Logger.debug(fn -> - "Unhandled type: #{inspect(link["type"])}" + "Unhandled type to finger: #{inspect(link["type"])}" end) data From 6f5d535b86d8e5a9462af1e634644162860f2748 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 15 Oct 2020 17:19:22 +0200 Subject: [PATCH 2/2] Fix finding local actor by username with domain Signed-off-by: Thomas Citharel --- lib/mobilizon/actors/actors.ex | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/mobilizon/actors/actors.ex b/lib/mobilizon/actors/actors.ex index d6ee2da7..11579fbd 100644 --- a/lib/mobilizon/actors/actors.ex +++ b/lib/mobilizon/actors/actors.ex @@ -1616,6 +1616,12 @@ defmodule Mobilizon.Actors do from(a in query, where: a.preferred_username == ^name and is_nil(a.domain)) 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 from(a in query, where: a.preferred_username == ^name and a.domain == ^domain) end