diff --git a/src/cmds/rub.moon b/src/cmds/rub.moon index 83af9b6..08b08c5 100644 --- a/src/cmds/rub.moon +++ b/src/cmds/rub.moon @@ -16,8 +16,9 @@ rub = res, suc = @tools._req @url, 'GET' return 'err' if not suc res = @tools.json.decode res or '{}' - res = res.ValCurs + return 'err' if not res + table.insert res.Valute, { ID: 'R01000' NumCode: '001' @@ -58,7 +59,7 @@ rub = wants[i] = wants[i]\upper! v, d, f = rub\course wants - if v == 'error' + if v == 'err' return @api\reply msg, @locale\get 'error', 'req_err', msg.l nf = {} diff --git a/src/events/message.moon b/src/events/message.moon index e1df67e..4f62c45 100644 --- a/src/events/message.moon +++ b/src/events/message.moon @@ -19,10 +19,12 @@ reg = { (api, msg) => if msg.text msg.text = utf8.lower ' '.. msg.text ..' ' - t = '' + t = msg.text for _, v in pairs reg - if utf8.match msg.text, '%s+'.. v[1] ..'%s+' - t ..= "#{v[2]} " + t = utf8.gsub t, '%s+'.. v[1] ..'%s+', ' '.. v[2] ..' ' - api\reply msg, t if t ~= '' + api\reply msg, t if t ~= msg.text + elseif msg.sticker + if msg.sticker.file_unique_id == 'AgADwAADcpO1DQ' + api\reply msg, 'редебало' return diff --git a/src/events/ready.moon b/src/events/ready.moon index e0e1551..e83d27f 100644 --- a/src/events/ready.moon +++ b/src/events/ready.moon @@ -32,7 +32,7 @@ export dump = (t, d) -> elseif type(v) == 'userdata' v = '' - c ..= ('%s%s = %s\n')\format (' ')\rep d, k, v + c ..= ('%s%s = %s\n')\format (' ')\rep(d), k, v c (api) =>