From daa848cecd20ff5c9b5cc654e3ac362ebe30c473 Mon Sep 17 00:00:00 2001
From: Er2 <er2@dismail.de>
Date: Sun, 27 Feb 2022 23:29:37 +0300
Subject: [PATCH 1/2] bugfixes, redebalo

---
 src/cmds/rub.moon       |  5 +++--
 src/events/message.moon | 10 ++++++----
 src/events/ready.moon   |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

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 = '<USERDATA>'
 
-    c ..= ('%s%s = %s\n')\format (' ')\rep d, k, v
+    c ..= ('%s%s = %s\n')\format (' ')\rep(d), k, v
   c
 
 (api) =>

From 0b2a7ac8e515e232a0076b854de33892dae92eb8 Mon Sep 17 00:00:00 2001
From: Er2 <er2@dismail.de>
Date: Mon, 28 Feb 2022 10:17:49 +0300
Subject: [PATCH 2/2] update lib, add some random

---
 etc/api                 |  2 +-
 src/events/message.moon | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/etc/api b/etc/api
index fefafd4..da0a266 160000
--- a/etc/api
+++ b/etc/api
@@ -1 +1 @@
-Subproject commit fefafd4923e824cb5a7f762c7e65d24cdc1f8d87
+Subproject commit da0a266b72f0919c5ed1bfa3fbc75e7d2f398229
diff --git a/src/events/message.moon b/src/events/message.moon
index 4f62c45..fc48613 100644
--- a/src/events/message.moon
+++ b/src/events/message.moon
@@ -16,6 +16,14 @@ reg = {
   {'чё%?*',           'ничё'}
 }
 
+stick = {
+  {
+    'AgADwAADcpO1DQ'
+    'редебало'
+    'CAACAgIAAx0CUY2umQACFItiHHUg6w_MPu6Vs8k76cwn4OIHNQACwAADcpO1DVbNTDlmHOWMIwQ'
+  }
+}
+
 (api, msg) =>
   if msg.text
     msg.text = utf8.lower ' '.. msg.text ..' '
@@ -25,6 +33,10 @@ reg = {
 
     api\reply msg, t if t ~= msg.text
   elseif msg.sticker
-    if msg.sticker.file_unique_id == 'AgADwAADcpO1DQ'
-      api\reply msg, 'редебало'
+    for k, v in pairs stick
+      if msg.sticker.file_unique_id == v[1]
+        if math.random! <= 0.5
+          api\reply msg, v[2]
+        else api\sendSticker msg, v[3] --, _, _, _, msg.message_id
+
   return