X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fuser.ex;h=bc7f2601fb725b71e124b782caa46107a20ae20d;hb=279e1ce556f063fa9725375622896f8f091be3c4;hp=ab29fe6f452f352a3a83d6a325cb4cf724d9aaff;hpb=fb7b926be385da563f29f2a7134f965fcba36b3c;p=akkoma

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index ab29fe6f4..bc7f2601f 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -228,12 +228,21 @@ defmodule Pleroma.User do
     Cachex.get!(:user_cache, key, fallback: fn(_) -> user_info(user) end)
   end
 
+  def fetch_by_nickname(nickname) do
+    ap_try = ActivityPub.make_user_from_nickname(nickname)
+
+    case ap_try do
+      {:ok, user} -> {:ok, user}
+      _ -> OStatus.make_user(nickname)
+    end
+  end
+
   def get_or_fetch_by_nickname(nickname) do
     with %User{} = user <- get_by_nickname(nickname)  do
       user
     else _e ->
       with [_nick, _domain] <- String.split(nickname, "@"),
-           {:ok, user} <- OStatus.make_user(nickname) do
+           {:ok, user} <- fetch_by_nickname(nickname) do
         user
       else _e -> nil
       end
@@ -295,7 +304,7 @@ defmodule Pleroma.User do
     update_and_set_cache(cs)
   end
 
-  def get_notified_from_activity(%Activity{data: %{"to" => to}}) do
+  def get_notified_from_activity(%Activity{recipients: to}) do
     query = from u in User,
       where: u.ap_id in ^to,
       where: u.local == true
@@ -303,7 +312,7 @@ defmodule Pleroma.User do
     Repo.all(query)
   end
 
-  def get_recipients_from_activity(%Activity{data: %{"to" => to}}) do
+  def get_recipients_from_activity(%Activity{recipients: to}) do
     query = from u in User,
       where: u.ap_id in ^to,
       or_where: fragment("? \\\?| ?", u.following, ^to)
@@ -427,5 +436,5 @@ defmodule Pleroma.User do
     Repo.insert(cs, on_conflict: :replace_all, conflict_target: :nickname)
   end
 
-  def ap_enabled?(%User{info: %{"ap_enabled" => ap}}), do: ap
+  def ap_enabled?(%User{info: info}), do: info["ap_enabled"]
 end