1 files changed, 14 insertions, 12 deletions

diff --git a/src/main.lisp b/src/main.lisp
index 419bb67..6d83ff4 100644
--- a/src/main.lisp
+++ b/src/main.lisp
@@ -4,7 +4,7 @@
   (:nicknames :ukkoclot)
   (:use :c2cl :ukkoclot/bot :ukkoclot/config :ukkoclot/inline-bots :ukkoclot/log :ukkoclot/tg-types)
   (:import-from :anaphora :acond :awhen :it)
-  (:import-from :ukkoclot/bot :make-bot :bot-power-on)
+  (:import-from :ukkoclot/bot :make-bot :bot-power-on :fixup-value)
   (:import-from :ukkoclot/db :with-db)
   (:import-from :ukkoclot/strings :escape-xml :is-tg-whitespace-str :starts-with :starts-with-ignore-case)
   (:local-nicknames
@@ -32,7 +32,8 @@
     (log-info "We're done!")))
 
 (defun wrapped-main (bot config)
-  (send-message bot :chat-id (config-dev-group config) :text "Initializing...")
+  (when *in-prod*
+    (send-message bot :chat-id (config-dev-group config) :text "Initializing..."))
   (set-my-name bot :name (config-bot-name config))
   (let ((gup-offset 0))
     (loop while (bot-power-on bot) do
@@ -101,14 +102,17 @@
         (on-new-member bot msg new-chat-member)))))
 
 (defun on-new-member (bot msg new-member)
-  ;; TODO: Rule 11 no hating on cats on bot entry
   ;; TODO: Rule 10 have fun and enjoy your time on user entry
   (if (= (user-id new-member) (bot-id bot))
-      nil
-      (reply-message bot msg
-                     (concatenate 'string "Hello there, " (user-format-name new-member) "!  Be on your bestest behaviour now!!")
-                     :parse-mode "HTML"
-                     :allow-sending-without-reply t)))
+      (reply-animation bot msg #P"blob/rule-11.mp4"
+                       :allow-sending-without-reply t)
+      (reply-animation bot msg #P"blob/rule-10.mp4"
+                       :text (concatenate 'string "Hello there, "
+                                          (user-format-name new-member)
+                                          "!  Be on your bestest behaviour now!!")
+                       :parse-mode "HTML"
+                       :caption-above t
+                       :allow-sending-without-reply t)))
 
 (defun is-bad-text (text)
   ;; TODO:
@@ -130,7 +134,7 @@
 
     (awhen (message-entities msg)
       (loop for entity across it
-            when (and (eq (message-entity-type entity) :bot-command)
+            when (and (equal (message-entity-type entity) "bot_command")
                       (= (message-entity-offset entity) 0))
               do (on-text-command bot msg text (message-entity-extract entity text))))
 
@@ -218,9 +222,7 @@
 
       ((and (equal simple-cmd "msginfo")
             (message-reply-to-message msg))
-       (reply-message bot it
-                      ;; TODO: Text needs lot more massaging lol
-                      (jzon:stringify (arg-encode it))))
+       (reply-message bot it (fixup-value it)))
 
       ((equal simple-cmd "ping")
        (let* ((start-time (get-internal-real-time))