aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-12-17 15:31:10 +0000
committerrinpatch <rinpatch@sdf.org>2019-12-17 15:31:10 +0000
commitd23a80e6911a85e2377ad2336a050e0206c74db9 (patch)
treeb8e5a62f79d6e78f7ccc0e63ddacafb21868a83b /lib/pleroma/web/twitter_api
parent086250ac5be17af26be4ad47d55a447ee0dd5101 (diff)
parentd2f1c4f658a8c995716aee3876cb46a0f48f99cb (diff)
downloadpleroma-d23a80e6911a85e2377ad2336a050e0206c74db9.tar.gz
Merge branch 'feature/add-event-support' into 'develop'
Add ActivityPub Object Event type support See merge request pleroma/pleroma!2075
Diffstat (limited to 'lib/pleroma/web/twitter_api')
-rw-r--r--lib/pleroma/web/twitter_api/controllers/util_controller.ex3
1 files changed, 2 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 2305bb413..799dd17ae 100644
--- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
+++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@ -104,7 +104,8 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
defp is_status?(acct) do
case Pleroma.Object.Fetcher.fetch_and_contain_remote_object_from_id(acct) do
- {:ok, %{"type" => type}} when type in ["Article", "Note", "Video", "Page", "Question"] ->
+ {:ok, %{"type" => type}}
+ when type in ["Article", "Event", "Note", "Video", "Page", "Question"] ->
true
_ ->