projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into dtluna/pleroma-feature/unfollow-activity
[akkoma]
/
lib
/
pleroma
/
user.ex
diff --git
a/lib/pleroma/user.ex
b/lib/pleroma/user.ex
index 551c23445067b6e73f2dd2ef3e406ca14df5a7aa..4510be77052129bdf32950d2903fe6847f9171e2 100644
(file)
--- a/
lib/pleroma/user.ex
+++ b/
lib/pleroma/user.ex
@@
-5,6
+5,7
@@
defmodule Pleroma.User do
alias Pleroma.{Repo, User, Object, Web}
alias Comeonin.Pbkdf2
alias Pleroma.Web.{OStatus, Websub}
alias Pleroma.{Repo, User, Object, Web}
alias Comeonin.Pbkdf2
alias Pleroma.Web.{OStatus, Websub}
+ alias Pleroma.Web.ActivityPub.ActivityPub
schema "users" do
field :bio, :string
schema "users" do
field :bio, :string
@@
-107,9
+108,10
@@
defmodule Pleroma.User do
following = follower.following
|> List.delete(ap_followers)
following = follower.following
|> List.delete(ap_followers)
- follower
+
{ :ok, follower } =
follower
|> follow_changeset(%{following: following})
|> Repo.update
|> follow_changeset(%{following: following})
|> Repo.update
+ { :ok, follower, ActivityPub.fetch_latest_follow(follower, followed)}
else
{:error, "Not subscribed!"}
end
else
{:error, "Not subscribed!"}
end