aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api/twitter_api.ex
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-07-31 14:12:29 +0300
committerrinpatch <rinpatch@sdf.org>2019-07-31 14:12:29 +0300
commitc88a5d32514f4ed78e4b9216198db62e8799ffe4 (patch)
treebc979f2522156be74138491114892e7acbeaafcb /lib/pleroma/web/twitter_api/twitter_api.ex
parent41e0304757c5a0d9778f7e685c9ddf481f0e15cb (diff)
parent66575061851f13355958fd292ee545462bf191c0 (diff)
downloadpleroma-c88a5d32514f4ed78e4b9216198db62e8799ffe4.tar.gz
Merge branch 'develop' into feature/hide-follows-remote
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api.ex')
-rw-r--r--lib/pleroma/web/twitter_api/twitter_api.ex4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index bb5dda204..80082ea84 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -15,6 +15,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
import Ecto.Query
+ require Pleroma.Constants
+
def create_status(%User{} = user, %{"status" => _} = data) do
CommonAPI.post(user, data)
end
@@ -286,7 +288,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
from(
[a, o] in Activity.with_preloaded_object(Activity),
where: fragment("?->>'type' = 'Create'", a.data),
- where: "https://www.w3.org/ns/activitystreams#Public" in a.recipients,
+ where: ^Pleroma.Constants.as_public() in a.recipients,
where:
fragment(
"to_tsvector('english', ?->>'content') @@ plainto_tsquery('english', ?)",