Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
36fa5e88
Commit
36fa5e88
authored
Jan 07, 2019
by
scarlett
Browse files
Check visible_for_user when performing a search using a direct link.
parent
b0e8e521
Changes
1
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View file @
36fa5e88
...
...
@@ -725,11 +725,14 @@ def unblock_domain(%{assigns: %{user: blocker}} = conn, %{"domain" => domain}) d
json
(
conn
,
%{})
end
def
status_search
(
query
)
do
def
status_search
(
user
,
query
)
do
fetched
=
if
Regex
.
match?
(
~r/https?:/
,
query
)
do
with
{
:ok
,
object
}
<-
ActivityPub
.
fetch_object_from_id
(
query
)
do
[
Activity
.
get_create_activity_by_object_ap_id
(
object
.
data
[
"id"
])]
with
{
:ok
,
object
}
<-
ActivityPub
.
fetch_object_from_id
(
query
),
%
Activity
{}
=
activity
<-
Activity
.
get_create_activity_by_object_ap_id
(
object
.
data
[
"id"
]),
true
<-
ActivityPub
.
visible_for_user?
(
activity
,
user
)
do
[
activity
]
else
_e
->
[]
end
...
...
@@ -756,7 +759,7 @@ def status_search(query) do
def
search2
(%{
assigns:
%{
user:
user
}}
=
conn
,
%{
"q"
=>
query
}
=
params
)
do
accounts
=
User
.
search
(
query
,
params
[
"resolve"
]
==
"true"
)
statuses
=
status_search
(
query
)
statuses
=
status_search
(
user
,
query
)
tags_path
=
Web
.
base_url
()
<>
"/tag/"
...
...
@@ -780,7 +783,7 @@ def search2(%{assigns: %{user: user}} = conn, %{"q" => query} = params) do
def
search
(%{
assigns:
%{
user:
user
}}
=
conn
,
%{
"q"
=>
query
}
=
params
)
do
accounts
=
User
.
search
(
query
,
params
[
"resolve"
]
==
"true"
)
statuses
=
status_search
(
query
)
statuses
=
status_search
(
user
,
query
)
tags
=
String
.
split
(
query
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment