aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api/twitter_api.ex
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-08-24 15:48:33 +0200
committerlain <lain@soykaf.club>2019-08-24 15:48:33 +0200
commitcc6c0b4ba6762e6a9b0a90c3dcda3f95283eb22a (patch)
treee80078875de15734e045f39e0bd9f82310961201 /lib/pleroma/web/twitter_api/twitter_api.ex
parent0e2b5a3e6aed7947909c2a1ff1618403546f1572 (diff)
parentbc78a875c86db42d67122cfb767f239a55dacbea (diff)
downloadpleroma-cc6c0b4ba6762e6a9b0a90c3dcda3f95283eb22a.tar.gz
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
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', ?)",