X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fuser.ex;h=e92b85f52c2baea89ecc9c96f4bf8f4064e07d5a;hb=847cb15626debd15eb50c00bb50113457bed7d1c;hp=a503a5b3f1dd073354a0abb0505a451298212bad;hpb=611ca385dea3d611a97579000311cc42684305e6;p=akkoma

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index a503a5b3f..e92b85f52 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -417,7 +417,7 @@ defmodule Pleroma.User do
         _ ->
           case OStatus.make_user(ap_id) do
             {:ok, user} -> user
-            _ -> {:error, "Could not fetch by ap id"}
+            _ -> {:error, "Could not fetch by AP id"}
           end
       end
     end
@@ -458,4 +458,12 @@ defmodule Pleroma.User do
 
   def ap_enabled?(%User{info: info}), do: info["ap_enabled"]
   def ap_enabled?(_), do: false
+
+  def get_or_fetch(uri_or_nickname) do
+    if String.starts_with?(uri_or_nickname, "http") do
+      get_or_fetch_by_ap_id(uri_or_nickname)
+    else
+      get_or_fetch_by_nickname(uri_or_nickname)
+    end
+  end
 end