Merge Upstream

miku/plugins/luarun.lua

@@ -17,6 +17,12 @@ function luarun:init(config)
             return JSON.encode(t, {indent=true})
         end
     end
+    -- Lua 5.2 compatibility.
+    -- "loadstring" was renamed "load" in 5.3.
+    luarun.loadstring = load or loadstring
+    luarun.err_msg = function(x)
+        return 'Error:\n' .. tostring(x)
+    end
 end
 
 function luarun:action(msg, config)
@@ -35,24 +41,21 @@ function luarun:action(msg, config)
         input = 'return ' .. input
     end
 
-    local output, success =
-        load("local bot = require('miku.bot')\n\z
+    local output, success = luarun.loadstring(
+        "local bot = require('miku.bot')\n\z
         local bindings = require('miku.bindings')\n\z
         local utilities = require('miku.utilities')\n\z
         local json = require('dkjson')\n\z
         local URL = require('socket.url')\n\z
         local http = require('socket.http')\n\z
         local https = require('ssl.https')\n\z
-        return function (self, msg, config)\n" .. input .. "\nend")
-
-    local function err_msg(x)
-        return "Fehler:\n" .. tostring(x)
-    end
+        return function (self, msg, config)\n" .. input .. "\nend"
+    )
 
     if output == nil then
         output = success
     else
-        success, output = xpcall(output(), err_msg, self, msg, config)
+        success, output = xpcall(output(), luarun.err_msg, self, msg, config)
     end
 
     if output == nil then

miku/utilities.lua

@@ -20,7 +20,7 @@
 
 local utilities = {}
 
-utf8 = require 'lua-utf8'
+utf8 = require('lua-utf8')
 ltn12 = require('ltn12')
 http = require('socket.http')
 https = require('ssl.https')
@@ -1134,7 +1134,8 @@ end
  -- Converts a gross string back into proper UTF-8.
  -- Useful for fixing improper encoding caused by bad JSON escaping.
 function utilities.fix_utf8(str)
-	return string.char(utf8.codepoint(str, 1, -1))
+    return string.char(utf8.codepoint(str, 1, -1))
 end
 
-return utilities
+
+return utilities