Small fixes, fix error report message, fix blank renderer defer text

libs/ctlogins.lua

@@ -13,23 +13,49 @@ local CtLib = require 'CtLib'
 
 local acs = {}
 do
+ ---@type string
  local s = process.env.CtLogins
  assert(s and #s > 0, "CtLogins env var not specified.")
  local i = 0
- for d, a, b in s:gmatch('(%S+)%s+(%S+)%s+(%S+)%s+') do
- acs[i] = {a = a, b = b, d = d}
+ for d, a, b, u in s:gmatch('(%S+)[^\n%S]+(%S+)[^\n%S]+(%S+)[^\n%S]+(%S+)[^\n%S]-\n') do
+ acs[i] = {a = a, b = b, d = d, u = u}
  i = i + 1
  end
 end
 
 ---@type CtLib[]
 local logins = {}
 
+local function setupAcc(n)
+ assert(acs[n], "n beyond number of available accounts.")
+ local acc = CtLib.login(acs[n].a, acs[n].b)
+ acc:updateDisplayName(acs[n].u)
+ acc:setPlayerAllData {
+ Setup = {
+ Custo = {},
+ ClassID = 'CL03',
+ IconID = 'PI011',
+ FanionID = 'FA004',
+ TitleId = 'PT064',
+ WallID = 'WP003',
+ }
+ }
+ return acc
+end
+
 ---@return CtLib
-function logins.getMain()
- logins[0] = logins[0] or CtLib.login(acs[0].a, acs[0].b)
- return logins[0]
+function logins.getAcc(n)
+ if not n then n = 1 end
+ assert(type(n) == 'number' and n >= 0 and n % 1 == 0, "n must be a valid positive integer")
+ if not logins[n] then
+ logins[n] = setupAcc(n)
+ end
+ return logins[n]
 end
 
+---@return CtLib
+function logins.getMain()
+ return logins.getAcc(0)
+end
 
 return logins

libs/renderer/defer.lua

@@ -78,6 +78,7 @@ function SvgTextGen:generate(outPath, maxWidth, maxHeight)
  svgCache[self.name] = {tag = tag, stroke = att.stroke and {color = {col2Rgb(att.stroke)}, width = tonumber(att['stroke-width']) or 1}}
  end
 
+ if self.text:match('^%s*$') then self.text = '-' end
  local text = vips.Image.text(svgCache[self.name].tag..self.text..'</span>', {rgba = true, dpi = 75})
 
  local fac = math.min(maxWidth and (maxWidth/text:width()) or 1, maxHeight and (maxHeight/text:height()) or 1, 1)

libs/util.lua

@@ -45,7 +45,7 @@ end
 
 ---@param client Client
 function util.sendErrorToOwner(client, err)
- client:getUser('368727799189733376'):send(("An error has occured! ```\n%s\n```"):format(err:sub(1900)))
+ client:getUser('368727799189733376'):send(("An error has occured! ```\n%s\n```"):format(err:sub(1, 1900)))
 end
 
 function util.patternEscape(str)

package.lua

@@ -1,6 +1,6 @@
 return {
  name = "Lyrth/StormraiserBot",
- version = "1.4.0",
+ version = "1.4.1",
  description = "Stormraiser bot for the official Century: Age of Ashes server.",
  license = "GNU General Public License v3.0",
  author = { name = "Lyrthras", email = "me[at]lyr.pw" },