diff options
author | lain <lain@soykaf.club> | 2019-06-05 12:45:28 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2019-06-05 12:45:28 +0200 |
commit | 024dfdc39c80e3a0c9f625f31101fc6aa896e93d (patch) | |
tree | c513468e925259ad4cdbba48c8671460b31bc91f | |
parent | 8b9a0dd4a7e60f610e3aa1db92e62bc0fbe54521 (diff) | |
download | pleroma-024dfdc39c80e3a0c9f625f31101fc6aa896e93d.tar.gz |
Typo + Linting.
-rw-r--r-- | lib/pleroma/user.ex | 2 | ||||
-rw-r--r-- | test/web/activity_pub/transmogrifier/follow_handling_test.exs | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 48b9f1d7d..d873d7623 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -371,7 +371,7 @@ defmodule Pleroma.User do cond do 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) -> {:error, "Could not follow user: #{followed.nickname} blocked you."} diff --git a/test/web/activity_pub/transmogrifier/follow_handling_test.exs b/test/web/activity_pub/transmogrifier/follow_handling_test.exs index 9f89e876b..5ddf6cd52 100644 --- a/test/web/activity_pub/transmogrifier/follow_handling_test.exs +++ b/test/web/activity_pub/transmogrifier/follow_handling_test.exs @@ -36,9 +36,10 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.FollowHandlingTest do end 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 can lead to instance A thinking that x@A is 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. + # This is important because the remote might have the wrong idea about the + # current follow status. This can lead to instance A thinking that x@A is + # 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) data = |