Skip to content
GitLab
Menu
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
21880970
Commit
21880970
authored
Jun 12, 2020
by
Ivan Tashkinov
Browse files
[
#1794
] Fixes URI query handling for hashtags extraction in search.
parent
5474b5c9
Pipeline
#27136
passed with stages
in 15 minutes and 58 seconds
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
lib/pleroma/web/mastodon_api/controllers/search_controller.ex
View file @
21880970
...
...
@@ -152,6 +152,7 @@ defp prepare_tags(query, add_joined_tag \\ true) do
defp
preprocess_uri_query
(
query
)
do
if
query
=~
~r/https?:\/
\
//
do
query
|>
String
.
trim_trailing
(
"/"
)
|>
URI
.
parse
()
|>
Map
.
get
(
:path
)
|>
String
.
split
(
"/"
)
...
...
test/web/mastodon_api/controllers/search_controller_test.exs
View file @
21880970
...
...
@@ -120,6 +120,35 @@ test "constructs hashtags from search query", %{conn: conn} do
assert
results
[
"hashtags"
]
==
[
%{
"name"
=>
"shpuld"
,
"url"
=>
"
#{
Web
.
base_url
()
}
/tag/shpuld"
}
]
results
=
conn
|>
get
(
"/api/v2/search?
#{
URI
.
encode_query
(%{
q:
"https://www.washingtonpost.com/sports/2020/06/10/"
<>
"nascar-ban-display-confederate-flag-all-events-properties/"
}
)
}"
)
|>
json_response_and_validate_schema
(
200
)
assert
results
[
"hashtags"
]
==
[
%{
"name"
=>
"nascar"
,
"url"
=>
"
#{
Web
.
base_url
()
}
/tag/nascar"
},
%{
"name"
=>
"ban"
,
"url"
=>
"
#{
Web
.
base_url
()
}
/tag/ban"
},
%{
"name"
=>
"display"
,
"url"
=>
"
#{
Web
.
base_url
()
}
/tag/display"
},
%{
"name"
=>
"confederate"
,
"url"
=>
"
#{
Web
.
base_url
()
}
/tag/confederate"
},
%{
"name"
=>
"flag"
,
"url"
=>
"
#{
Web
.
base_url
()
}
/tag/flag"
},
%{
"name"
=>
"all"
,
"url"
=>
"
#{
Web
.
base_url
()
}
/tag/all"
},
%{
"name"
=>
"events"
,
"url"
=>
"
#{
Web
.
base_url
()
}
/tag/events"
},
%{
"name"
=>
"properties"
,
"url"
=>
"
#{
Web
.
base_url
()
}
/tag/properties"
},
%{
"name"
=>
"NascarBanDisplayConfederateFlagAllEventsProperties"
,
"url"
=>
"
#{
Web
.
base_url
()
}
/tag/NascarBanDisplayConfederateFlagAllEventsProperties"
}
]
end
test
"excludes a blocked users from search results"
,
%{
conn:
conn
}
do
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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