aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api/controllers
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2018-05-13 10:56:11 +0200
committerlain <lain@soykaf.club>2018-05-13 10:56:11 +0200
commit76722ea9c8dfbb8fefe247883946aa5c872d9a49 (patch)
tree34020541df1d6684e935cfd09f36cb6eed7b13f6 /lib/pleroma/web/twitter_api/controllers
parenta3d1d4894fdd8dd0133e1d2c6fde9d95f49dfcc7 (diff)
parentbb864e96ad4e0be470da78baa000019f571e30db (diff)
downloadpleroma-76722ea9c8dfbb8fefe247883946aa5c872d9a49.tar.gz
Merge branch 'develop' into kaniini/pleroma-bugfix/unlisted-statuses
Diffstat (limited to 'lib/pleroma/web/twitter_api/controllers')
-rw-r--r--lib/pleroma/web/twitter_api/controllers/util_controller.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
index c7b1a5b95..ea540b34c 100644
--- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
+++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@ -92,7 +92,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
with %User{} = user <- User.get_cached_by_nickname(username),
true <- Pbkdf2.checkpw(password, user.password_hash),
- %User{} = followed <- Repo.get(User, id),
+ %User{} = _followed <- Repo.get(User, id),
{:ok, follower} <- User.follow(user, followee),
{:ok, _activity} <- ActivityPub.follow(follower, followee) do
conn