Fix user representation after following.

[akkoma] / lib / pleroma / user.ex

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 29fd1de8b07125529efb55376fde433361cda398..c77704db0c9b0184f78d072548b719a079b58cb5 100644 (file)
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -16,12 +16,7 @@ defmodule Pleroma.User do
   end
 
   def ap_id(%User{nickname: nickname}) do
-    host =
-      Application.get_env(:pleroma, Pleroma.Web.Endpoint)
-      |> Keyword.fetch!(:url)
-      |> Keyword.fetch!(:host)
-
-    "https://#{host}/users/#{nickname}"
+    "#{Pleroma.Web.base_url}/users/#{nickname}"
   end
 
   def ap_followers(%User{} = user) do
@@ -43,4 +38,18 @@ defmodule Pleroma.User do
     |> follow_changeset(%{following: following})
     |> Repo.update
   end
+
+  def unfollow(%User{} = follower, %User{} = followed) do
+    ap_followers = User.ap_followers(followed)
+    following = follower.following
+    |> List.delete(ap_followers)
+
+    follower
+    |> follow_changeset(%{following: following})
+    |> Repo.update
+  end
+
+  def following?(%User{} = follower, %User{} = followed) do
+    Enum.member?(follower.following, User.ap_followers(followed))
+  end
 end