From: Luca CPZ <luca.cpz@gmail.com>
Date: Fri, 31 Aug 2018 10:11:38 +0000 (+0200)
Subject: widget.imap: ensure mailcount is not nil before notifying; closes #400
X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/558622c1ec8aa12355ef4fdf9963d86ad58c645f?hp=53ebca2867c5d9c9ab7c5d3f37ccc91784322cd7

widget.imap: ensure mailcount is not nil before notifying; closes #400
---

diff --git a/widget/imap.lua b/widget/imap.lua
index 93aced9..7e83d36 100644
--- a/widget/imap.lua
+++ b/widget/imap.lua
@@ -54,20 +54,17 @@ local function factory(args)
             mail_notification_preset.screen = awful.screen.focused()
         end
 
-        curl = string.format("%s --url imaps://%s:%s/INBOX -u %s:%q %s -k",
-               head_command, server, port, mail, password, request)
+        local curl = string.format("%s --url imaps://%s:%s/INBOX -u %s:%q %s -k",
+                     head_command, server, port, mail, password, request)
 
         helpers.async(curl, function(f)
             mailcount = tonumber(f:match("UNSEEN (%d+)"))
             widget = imap.widget
             settings()
 
-            if notify == "on" and mailcount >= 1 and mailcount > helpers.get_map(mail) then
-                if mailcount == 1 then
-                    nt = mail .. " has one new message"
-                else
-                    nt = mail .. " has <b>" .. mailcount .. "</b> new messages"
-                end
+            if notify == "on" and mailcount and mailcount >= 1 and mailcount > helpers.get_map(mail) then
+                local nt = mail .. " has <b>" .. mailcount .. "</b> new message"
+                if mailcount >= 1 then nt = nt .. "s" end
                 naughty.notify { preset = mail_notification_preset, text = nt }
             end