diff options
| author | lain <lain@soykaf.club> | 2018-06-03 19:11:22 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-06-03 19:11:22 +0200 |
| commit | 0f70e83e8c745645703be8084001b1ef92c03823 (patch) | |
| tree | ee6ff615eae7e45f1906ccbf77657bf0a93d23d3 /lib/pleroma/web/common_api | |
| parent | 9d054d30bce383437b6bb07c869047f1cb8e164f (diff) | |
| download | pleroma-0f70e83e8c745645703be8084001b1ef92c03823.tar.gz | |
Better error handling in TwitterApiController.
Diffstat (limited to 'lib/pleroma/web/common_api')
| -rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 9c9951371..30089f553 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -9,11 +9,12 @@ defmodule Pleroma.Web.CommonAPI.Utils do def get_by_id_or_ap_id(id) do activity = Repo.get(Activity, id) || Activity.get_create_activity_by_object_ap_id(id) - if activity.data["type"] == "Create" do - activity - else - Activity.get_create_activity_by_object_ap_id(activity.data["object"]) - end + activity && + if activity.data["type"] == "Create" do + activity + else + Activity.get_create_activity_by_object_ap_id(activity.data["object"]) + end end def get_replied_to_activity(id) when not is_nil(id) do |