diff options
| author | lambda <pleromagit@rogerbraun.net> | 2019-01-23 12:14:41 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2019-01-23 12:14:41 +0000 |
| commit | 5067b791a124960e3561ff77065a36d45abd2552 (patch) | |
| tree | 38cf094a6405c147fe5d8cff3be173f2379166d9 /lib/pleroma/web/twitter_api/twitter_api_controller.ex | |
| parent | b624b7a150c813722c4ffe82112c03e246fb5760 (diff) | |
| parent | 2de208817c04d9a48aaf0fdaf887dd0e10d15907 (diff) | |
| download | pleroma-5067b791a124960e3561ff77065a36d45abd2552.tar.gz | |
Merge branch 'rename/pleroma_activity_consistency' into 'develop'
Consistent fonction names in Pleroma.Activity
See merge request pleroma/pleroma!690
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api_controller.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index ede079963..8c9060cf2 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -330,12 +330,12 @@ defmodule Pleroma.Web.TwitterAPI.Controller do end def get_by_id_or_ap_id(id) do - activity = Repo.get(Activity, id) || Activity.get_create_activity_by_object_ap_id(id) + activity = Repo.get(Activity, id) || Activity.get_create_by_object_ap_id(id) if activity.data["type"] == "Create" do activity else - Activity.get_create_activity_by_object_ap_id(activity.data["object"]) + Activity.get_create_by_object_ap_id(activity.data["object"]) end end |