Typo + Linting.

stable
lain 5 years ago
parent 8b9a0dd4a7
commit 024dfdc39c

@ -371,7 +371,7 @@ defmodule Pleroma.User 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."}

@ -36,9 +36,10 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.FollowHandlingTest 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 =

Loading…
Cancel
Save