diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-07-24 19:29:01 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-07-24 19:29:01 +0000 |
| commit | 19835be0677a9fa941b831ebf576c8cea9df080a (patch) | |
| tree | 246ec82d9a004b8b81edfa4867f32ca12e982ccb /lib/pleroma/web/twitter_api/controllers/util_controller.ex | |
| parent | 931c4974ee4a5e5e806433ce7b367928e4210e0c (diff) | |
| parent | 8d9f43e1d1a55f445e4e6e4659b9493cd35d99d9 (diff) | |
| download | pleroma-19835be0677a9fa941b831ebf576c8cea9df080a.tar.gz | |
Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'
Fix remote follow from /ostatus_subscribe
Closes #1103
See merge request pleroma/pleroma!1472
Diffstat (limited to 'lib/pleroma/web/twitter_api/controllers/util_controller.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/controllers/util_controller.ex | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex index 9e4da7dca..39bc6147c 100644 --- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex +++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex @@ -17,7 +17,6 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do alias Pleroma.Web alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.Web.CommonAPI - alias Pleroma.Web.OStatus alias Pleroma.Web.WebFinger def help_test(conn, _params) do @@ -60,7 +59,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do %Activity{id: activity_id} = Activity.get_create_by_object_ap_id(object.data["id"]) redirect(conn, to: "/notice/#{activity_id}") else - {err, followee} = OStatus.find_or_make_user(acct) + {err, followee} = User.get_or_fetch(acct) avatar = User.avatar_url(followee) name = followee.nickname id = followee.id |