login

<     >

2023-08-09 15:02:44 (UTC-03:00)

Marcel Rodrigues <marcelgmr@gmail.com>

improve readability

diff --git a/skopos.lua b/skopos.lua
index 35c22e5..904fdf0 100644
--- a/skopos.lua
+++ b/skopos.lua
@@ -47,7 +47,6 @@ function App:routes()
     function (req)
         local user = self:get_user(req)
         if user == nil then return "/login", 303 end
-        -- TODO: set proj_id
         local states = self.model.states
         local columns = self.model:get_board(user.id)
         local env = {title=self.title, user=user, states=states, columns=columns}
@@ -111,6 +110,7 @@ function App:routes()
         end
         return "/login", 303
     end},
+    -- invites
     {"GET", "/i",
     function (req)
         local user = self:get_user(req)
@@ -135,6 +135,7 @@ function App:routes()
         self:log(LOG_INFO, "user "..user.nick.." canceled invite "..uuid)
         return "/i", 303
     end},
+    -- projects
     {"GET", "/p",
     function (req)
         local user = self:get_user(req)
@@ -210,6 +211,7 @@ function App:routes()
         end
         return "/p", 303
     end},
+    -- tickets
     {"GET", "/p/([-_%w]+)/t/new",
     function (req, name)
         local user = self:get_user(req)
@@ -220,12 +222,12 @@ function App:routes()
         return lud.template.render_file("view/ticket_form.html", env)
     end},
     {"GET", "/p/([-_%w]+)/t/(%d+)",
-    function (req, name, code)
+    function (req, name, tcode)
         local user = self:get_user(req)
         if user == nil then return "/login?after="..req.path, 303 end
         local proj = self.model:get_user_project(user.id, name)
         if proj == nil then return "not found", 404 end
-        local tick = self.model:get_ticket(proj.id, code, true)
+        local tick = self.model:get_ticket(proj.id, tcode, true)
         if tick == nil then return "not found", 404 end
         local comments = self.model:get_comments(tick.id)
         local env = {
@@ -243,43 +245,43 @@ function App:routes()
         local title = req.form.title
         local desc = req.form.desc
         local priority = tonumber(req.form.priority or 0)
-        local code = self.model:create_ticket(user.id, proj.id, title, desc, priority)
-        self:log(LOG_INFO, "user "..user.nick.." created ticket "..name.."#"..code)
-        return "/p/"..name.."/t/"..code, 303
+        local tcode = self.model:create_ticket(user.id, proj.id, title, desc, priority)
+        self:log(LOG_INFO, "user "..user.nick.." created ticket "..name.."#"..tcode)
+        return "/p/"..name.."/t/"..tcode, 303
     end},
     {"GET", "/p/([-_%w]+)/t/(%d+)/edit",
-    function (req, name, code)
+    function (req, name, tcode)
         local user = self:get_user(req)
         if user == nil then return "/login?after="..req.path, 303 end
         local proj = self.model:get_user_project(user.id, name)
         if proj == nil then return "not found", 404 end
-        local tick = self.model:get_ticket(proj.id, code)
+        local tick = self.model:get_ticket(proj.id, tcode)
         if tick == nil then return "not found", 404 end
         local env = {title=self.title, user=user, proj=proj, tick=tick}
         return lud.template.render_file("view/ticket_form.html", env)
     end},
     {"POST", "/p/([-_%w]+)/t/(%d+)/put",
-    function (req, name, code)
+    function (req, name, tcode)
         local user = self:get_user(req)
         if user == nil then return "/login", 303 end
         local proj = self.model:get_user_project(user.id, name)
         if proj == nil then return "not found", 404 end
-        local tick = self.model:get_ticket(proj.id, code)
+        local tick = self.model:get_ticket(proj.id, tcode)
         if tick == nil then return "not found", 404 end
         local title = req.form.title
         local desc = req.form.desc
         local priority = tonumber(req.form.priority or 0)
         self.model:update_ticket(tick.id, title, desc, priority)
-        self:log(LOG_INFO, "user "..user.nick.." edited ticket "..name.."#"..code)
-        return "/p/"..name.."/t/"..code, 303
+        self:log(LOG_INFO, "user "..user.nick.." edited ticket "..name.."#"..tcode)
+        return "/p/"..name.."/t/"..tcode, 303
     end},
     {"POST", "/p/([-_%w]+)/t/(%d+)/shift/(%d+)",
-    function (req, name, code, state_id)
+    function (req, name, tcode, state_id)
         local user = self:get_user(req)
         if user == nil then return "/login", 303 end
         local proj = self.model:get_user_project(user.id, name)
         if proj == nil then return "not found", 404 end
-        local tick = self.model:get_ticket(proj.id, code)
+        local tick = self.model:get_ticket(proj.id, tcode)
         if tick == nil then return "not found", 404 end
         self.model:shift_ticket(user.id, tick, tonumber(state_id))
         local path
@@ -291,19 +293,19 @@ function App:routes()
         return path, 303
     end},
     {"POST", "/p/([-_%w]+)/t/(%d+)/del",
-    function (req, name, code)
+    function (req, name, tcode)
         local user = self:get_user(req)
         if user == nil then return "/login", 303 end
         local proj = self.model:get_user_project(user.id, name)
         if proj == nil then return "not found", 404 end
-        local tick = self.model:get_ticket(proj.id, code)
+        local tick = self.model:get_ticket(proj.id, tcode)
         if tick ~= nil then
             self.model:del_ticket(tick.id)
-            self:log(LOG_INFO, "user "..user.nick.." deleted ticket "..name.."#"..code)
+            self:log(LOG_INFO, "user "..user.nick.." deleted ticket "..name.."#"..tcode)
         end
         return "/p/"..name, 303
     end},
-    -- Comments
+    -- comments
     {"GET", "/p/([-_%w]+)/t/(%d+)/c/new",
     function (req, name, tcode)
         local user = self:get_user(req)