Backups/Mango
1
0
Fork 0
mirror of https://github.com/hkalexling/Mango.git synced 2025-08-03 03:15:31 -04:00
Code Issues Projects Releases Wiki Activity

- remove unnecessary nil handling in the get_username macro

Browse Source
This commit is contained in:
Alex Ling 2020-02-14 17:04:50 +00:00
parent c7bde94495
commit a0710e274b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mango.cr
View File

@ -19,9 +19,10 @@ macro send_img(env, img)
end end
macro get_username(env) macro get_username(env)
cookie = {{env}}.request.cookies.find { |c| c.name == "token" } # if the request gets here, its has gone through the auth handler, and
next if cookie.nil? # we can be sure that a valid token exists, so we can use not_nil! here
storage.verify_token cookie.value cookie = {{env}}.request.cookies.find { |c| c.name == "token" }.not_nil!
(storage.verify_token cookie.value).not_nil!
end end
macro send_json(env, json) macro send_json(env, json)
@ -36,7 +37,7 @@ end
get "/" do |env| get "/" do |env|
begin begin
titles = library.titles titles = library.titles
username = (get_username env).not_nil! username = get_username env
percentage = titles.map &.load_percetage username percentage = titles.map &.load_percetage username
layout "index" layout "index"
rescue rescue
@ -47,7 +48,7 @@ end
get "/book/:title" do |env| get "/book/:title" do |env|
begin begin
title = (library.get_title env.params.url["title"]).not_nil! title = (library.get_title env.params.url["title"]).not_nil!
username = (get_username env).not_nil! username = get_username env
percentage = title.entries.map { |e| title.load_percetage username,\ percentage = title.entries.map { |e| title.load_percetage username,\
e.title } e.title }
layout "title" layout "title"
@ -182,7 +183,7 @@ get "/reader/:title/:entry/:page" do |env|
raise "" if page >= entry.pages raise "" if page >= entry.pages
# save progress # save progress
username = (get_username env).not_nil! username = get_username env
title.save_progress username, entry.title, page title.save_progress username, entry.title, page
urls = (page...[entry.pages, page + imgs_each_page].min) urls = (page...[entry.pages, page + imgs_each_page].min)