gMaps.lua -> location.lua

Also moved some stuff from where it shouldn't be.

config.lua

@@ -162,7 +162,7 @@ Send /help to get started.
         'dice',
         'echo',
         'eightball',
-        'gMaps',
+        'location',
         'hackernews',
         'imdb',
         'nick',

otouto/plugins/location.lua

@@ -23,15 +23,19 @@ function gMaps:action(msg, config)
         return
     end
 
-    local coords = utilities.get_coords(input, config)
+    local lat, lon = utilities.get_coords(input)
-    if type(coords) == 'string' then
+    if lat == nil then
-        utilities.send_reply(msg, coords)
+        utilities.send_reply(msg, config.errors.connection)
+        return
+    elseif lat == false then
+        utilities.send_reply(msg, config.errors.results)
+        return
     end
 
     bindings.sendLocation{
         chat_id = msg.chat.id,
-        latitude = coords.lat,
+        latitude = lat,
-        longitude = coords.lon,
+        longitude = lon,
         reply_to_message_id = msg.message_id
     }
 end

otouto/plugins/time.lua

@@ -20,15 +20,18 @@ function time:action(msg, config)
         return
     end
 
-    local coords = utilities.get_coords(input, config)
+    local lat, lon = utilities.get_coords(input)
-    if type(coords) == 'string' then
+    if lat == nil then
-        utilities.send_reply(msg, coords)
+        utilities.send_reply(msg, config.errors.connection)
+        return
+    elseif lat == false then
+        utilities.send_reply(msg, config.errors.results)
         return
     end
 
     local now = os.time()
     local utc = os.time(os.date('!*t', now))
-    local url = time.base_url:format(coords.lat, coords.lon, utc)
+    local url = time.base_url:format(lat, lon, utc)
     local jstr, code = HTTPS.request(url)
     if code ~= 200 then
         utilities.send_reply(msg, config.errors.connection)

otouto/plugins/weather.lua

@@ -25,13 +25,16 @@ function weather:action(msg, config)
         return
     end
 
-    local coords = utilities.get_coords(input, config)
+    local lat, lon = utilities.get_coords(input)
-    if type(coords) == 'string' then
+    if lat == nil then
-        utilities.send_reply(msg, coords)
+        utilities.send_reply(msg, config.errors.connection)
+        return
+    elseif lat == false then
+        utilities.send_reply(msg, config.errors.results)
         return
     end
 
-    local url = 'http://api.openweathermap.org/data/2.5/weather?APPID=' .. config.owm_api_key .. '&lat=' .. coords.lat .. '&lon=' .. coords.lon
+    local url = 'http://api.openweathermap.org/data/2.5/weather?APPID=' .. config.owm_api_key .. '&lat=' .. lat .. '&lon=' .. lon
 
     local jstr, res = HTTP.request(url)
     if res ~= 200 then

otouto/utilities.lua

@@ -123,25 +123,18 @@ function utilities.save_data(filename, data)
 end
 
  -- Gets coordinates for a location. Used by gMaps.lua, time.lua, weather.lua.
-function utilities.get_coords(input, config)
+ -- Returns nil for a connection error and false for zero results.
-
+function utilities.get_coords(input)
     local url = 'http://maps.googleapis.com/maps/api/geocode/json?address=' .. URL.escape(input)
-
     local jstr, res = HTTP.request(url)
     if res ~= 200 then
-        return config.errors.connection
+        return
     end
-
     local jdat = JSON.decode(jstr)
     if jdat.status == 'ZERO_RESULTS' then
-        return config.errors.results
+        return false
     end
-
+    return jdat.results[1].geometry.location.lat, jdat.results[1].geometry.location.lng
-    return {
-        lat = jdat.results[1].geometry.location.lat,
-        lon = jdat.results[1].geometry.location.lng
-    }
-
 end
 
  -- Get the number of values in a key/value table.
@@ -219,8 +212,10 @@ end
 
 function utilities.md_escape(text)
     return text:gsub('_', '\\_')
-            :gsub('%[', '\\['):gsub('%]', '\\]')
+        :gsub('%[', '\\[')
-            :gsub('%*', '\\*'):gsub('`', '\\`')
+        :gsub('%]', '\\]')
+        :gsub('%*', '\\*')
+        :gsub('`', '\\`')
 end
 
 function utilities.html_escape(text)