lug/invidious
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add extra handling for year format

Browse Source
This commit is contained in:
Omar Roth 2018-08-05 18:35:52 -05:00
parent 9d6cdc3032
commit 5a6b36ecce
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/invidious.cr
View File

@ -336,19 +336,23 @@ end
# Search # Search
get "/results" do |env| get "/results" do |env|
search_query = env.params.query["search_query"]? query = env.params.query["search_query"]?
query ||= env.params.query["q"]?
query ||= ""
page = env.params.query["page"]?.try &.to_i? page = env.params.query["page"]?.try &.to_i?
page ||= 1 page ||= 1
if search_query if query
env.redirect "/search?q=#{URI.escape(search_query)}&page=#{page}" env.redirect "/search?q=#{URI.escape(query)}&page=#{page}"
else else
env.redirect "/" env.redirect "/"
end end
end end
get "/search" do |env| get "/search" do |env|
query = env.params.query["q"]? query = env.params.query["search_query"]?
query ||= env.params.query["q"]?
query ||= "" query ||= ""
page = env.params.query["page"]?.try &.to_i? page = env.params.query["page"]?.try &.to_i?

7
src/invidious/helpers/utils.cr
View File

@ -63,7 +63,12 @@ def decode_time(string)
end end
def decode_date(string : String) def decode_date(string : String)
# Time matches format "20 hours ago", "40 minutes ago"... # String matches 'YYYY'
if string.match(/\d{4}/)
return Time.new(string.to_i, 1, 1)
end
# String matches format "20 hours ago", "40 minutes ago"...
date = string.split(" ")[-3, 3] date = string.split(" ")[-3, 3]
delta = date[0].to_i delta = date[0].to_i