moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Typo + Linting.

This commit is contained in:
lain 2019-06-05 12:45:28 +02:00
parent 8b9a0dd4a7
commit 024dfdc39c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/user.ex
View File

@ -371,7 +371,7 @@ def follow(%User{} = follower, %User{info: info} = followed) do
cond do cond do
info.deactivated -> info.deactivated ->
{:error, "Could not follow user: You are deactivatedt."} {:error, "Could not follow user: You are deactivated."}
deny_follow_blocked and blocks?(followed, follower) -> deny_follow_blocked and blocks?(followed, follower) ->
{:error, "Could not follow user: #{followed.nickname} blocked you."} {:error, "Could not follow user: #{followed.nickname} blocked you."}

7
test/web/activity_pub/transmogrifier/follow_handling_test.exs
View File

@ -36,9 +36,10 @@ test "it works for incoming follow requests" do
end end
test "it works for follow requests when you are already followed, creating a new accept activity" do test "it works for follow requests when you are already followed, creating a new accept activity" do
# This is important because the remote might have the wrong idea about the current follow status. # This is important because the remote might have the wrong idea about the
# This can lead to instance A thinking that x@A is followed by y@B, but B thinks they are not. In # current follow status. This can lead to instance A thinking that x@A is
# this case, the follow can never go through again because it will never get an Accept. # followed by y@B, but B thinks they are not. In this case, the follow can
# never go through again because it will never get an Accept.
user = insert(:user) user = insert(:user)
data = data =