diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-07-25 18:43:30 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-07-25 18:43:30 +0300 |
| commit | 41e0304757c5a0d9778f7e685c9ddf481f0e15cb (patch) | |
| tree | dc60d86d41153d9764cb32a9adae5fa24894c1fa /lib/pleroma/web/twitter_api/controllers | |
| parent | 196cad46f35a63c18d58cd5d982bc4e1f9b0d7c3 (diff) | |
| parent | d1e891062e3c6c34ca7940a476917beea2822ca2 (diff) | |
| download | pleroma-41e0304757c5a0d9778f7e685c9ddf481f0e15cb.tar.gz | |
Merge branch 'develop' into feature/hide-follows-remote
Diffstat (limited to 'lib/pleroma/web/twitter_api/controllers')
| -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 |