6 files changed, 44 insertions, 33 deletions

diff --git a/src/tg/delete-message.lisp b/src/tg/delete-message.lisp
index cc52371..2b332df 100644
--- a/src/tg/delete-message.lisp
+++ b/src/tg/delete-message.lisp
@@ -1,6 +1,7 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
 (defpackage :ukkoclot/src/tg/delete-message
+  (:documentation "deleteMessage Telegram method")
   (:use :c2cl :ukkoclot/src/tg/message :ukkoclot/src/tg/method-macros :ukkoclot/src/tg/send-animation)
   (:export :delete-message :try-delete-message))
 (in-package :ukkoclot/src/tg/delete-message)
@@ -9,13 +10,13 @@
   (chat-id (or integer string))
   (message-id integer))
 
-(defun try-delete-message (bot msg)
+(defun try-delete-message (msg)
+  "Attempt to delete the MSG, on failure reply with a GIF of the DO NOT cat."
   (handler-case
-      (delete-message bot
-                      :chat-id (message-chat-id msg)
+      (delete-message :chat-id (message-chat-id msg)
                       :message-id (message-id msg))
     (error ()
       (handler-case
-          (reply-animation bot msg #P"blob/do-not.mp4"
+          (reply-animation msg #P"blob/do-not.mp4"
                            :allow-sending-without-reply nil)
         (error () nil)))))
diff --git a/src/tg/get-me.lisp b/src/tg/get-me.lisp
index b7e8bc0..e7d41a1 100644
--- a/src/tg/get-me.lisp
+++ b/src/tg/get-me.lisp
@@ -1,27 +1,31 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
 (defpackage :ukkoclot/src/tg/get-me
+  (:documentation "getMe Telegram method")
   (:use :c2cl :ukkoclot/src/tg/method-macros :ukkoclot/src/tg/user)
-  (:import-from :ukkoclot/src/state :bot-id% :bot-username%)
+  (:import-from :state)
   (:export :bot-id :bot-username :get-me))
 (in-package :ukkoclot/src/tg/get-me)
 
 (define-tg-method (get-me% user :GET))
 
-(defun get-me (bot)
-  (let ((me (get-me% bot)))
-    (setf (bot-id% bot) (user-id me))
-    (setf (bot-username% bot) (user-username me))
+(defun get-me ()
+  "getMe Telegram method"
+  (let ((me (get-me%)))
+    (setf (state:id%) (user-id me))
+    (setf (state:username%) (user-username me))
     me))
 
-(defun bot-id (bot)
-  (or (bot-id% bot)
+(defun bot-id ()
+  "Get the bot's ID, this memoizes the result"
+  (or (state:id%)
       (progn
-        (get-me bot)
-        (bot-id% bot))))
+        (get-me)
+        (state:id%))))
 
-(defun bot-username (bot)
-  (or (bot-username% bot)
+(defun bot-username ()
+  "Get the bot's username, this memoizes the result"
+  (or (state:username%)
       (progn
-        (get-me bot)
-        (bot-username% bot))))
+        (get-me)
+        (state:username%))))
diff --git a/src/tg/method-macros.lisp b/src/tg/method-macros.lisp
index 00adf95..56445e3 100644
--- a/src/tg/method-macros.lisp
+++ b/src/tg/method-macros.lisp
@@ -6,8 +6,8 @@
   (:import-from :alexandria :with-gensyms)
   (:import-from :com.dieggsy.f-string :enable-f-strings)
   (:import-from :serapeum :take)
+  (:import-from :state)
   (:import-from :str)
-  (:import-from :ukkoclot/src/state :bot)
   (:import-from :ukkoclot/src/transport :do-call)
   (:export :define-tg-method))
 (in-package :ukkoclot/src/tg/method-macros)
@@ -53,9 +53,9 @@
     `(,(param-name param) ,(param-default param)))
 
   (defun emit-defun (name return-type params method)
-    (with-gensyms (args bot)
-      `(defun ,name (,bot &key ,@(iter (for param in params) ; lint:suppress lambda-list-invalid
-                                       (collect (emit-defun-arg param))))
+    (with-gensyms (args)
+      `(defun ,name (&key ,@(iter (for param in params) ; lint:suppress lambda-list-invalid
+                                  (collect (emit-defun-arg param))))
          (let (,args)
            ,@(iter (for param in (reverse params))
                    (collect (if (param-skip-if-default param)
@@ -63,11 +63,11 @@
                                                 ,(param-default param))
                                    ,(emit-append-to-args param args))
                                 (emit-append-to-args param args))))
-           (do-call ,bot ,method ,(path-from-name name) ',return-type ,args)))))
+           (do-call ,method ,(path-from-name name) ',return-type ,args)))))
 
   (defun emit-ftype (name return-type params)
-    `(declaim (ftype (function (bot &key ,@(iter (for param in params)
-                                                 (collect (emit-arg-type param))))
+    `(declaim (ftype (function (&key ,@(iter (for param in params)
+                                             (collect (emit-arg-type param))))
                                ,return-type)
                      ,name))))
 
diff --git a/src/tg/send-animation.lisp b/src/tg/send-animation.lisp
index a0b2d57..560b331 100644
--- a/src/tg/send-animation.lisp
+++ b/src/tg/send-animation.lisp
@@ -1,6 +1,7 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
 (defpackage :ukkoclot/src/tg/send-animation
+  (:documentation "sendAnimation Telegram method")
   (:use
    :c2cl
    :ukkoclot/src/tg/force-reply
@@ -40,9 +41,9 @@
   (reply-markup (or inline-keyboard-markup reply-keyboard-markup reply-keyboard-remove force-reply null) nil))
 
 ;; TODO: Some kind of caching for files?
-(defun reply-animation (bot msg animation &key allow-sending-without-reply text parse-mode caption-above)
-  (send-animation bot
-                  :chat-id (message-chat-id msg)
+(defun reply-animation (msg animation &key allow-sending-without-reply text parse-mode caption-above)
+  "Shortcut to reply to a given MSG with an animation."
+  (send-animation :chat-id (message-chat-id msg)
                   :animation animation
                   :caption text
                   :parse-mode parse-mode
diff --git a/src/tg/send-message.lisp b/src/tg/send-message.lisp
index 9edc50d..befecbe 100644
--- a/src/tg/send-message.lisp
+++ b/src/tg/send-message.lisp
@@ -1,6 +1,7 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
 (defpackage :ukkoclot/src/tg/send-message
+  (:documentation "sendMessage Telegram method")
   (:use
    :c2cl
    :ukkoclot/src/tg/force-reply
@@ -30,9 +31,9 @@
   (reply-parameters (or reply-parameters null) nil)
   (reply-markup (or inline-keyboard-markup reply-keyboard-markup reply-keyboard-remove force-reply null) nil))
 
-(defun reply-message (bot msg text &key parse-mode allow-sending-without-reply)
-  (send-message bot
-                :chat-id (message-chat-id msg)
+(defun reply-message (msg text &key parse-mode allow-sending-without-reply)
+  "Shortcut to reply to a given MSG."
+  (send-message :chat-id (message-chat-id msg)
                 :text text
                 :parse-mode parse-mode
                 :reply-parameters
diff --git a/src/tg/set-my-name.lisp b/src/tg/set-my-name.lisp
index 67c698d..2b3869a 100644
--- a/src/tg/set-my-name.lisp
+++ b/src/tg/set-my-name.lisp
@@ -1,6 +1,7 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
 (defpackage :ukkoclot/src/tg/set-my-name
+  (:documentation "setMyName Telegram method.")
   (:use :c2cl :ukkoclot/src/tg/bot-name :ukkoclot/src/tg/get-my-name :ukkoclot/src/tg/method-macros)
   (:export :set-my-name))
 (in-package :ukkoclot/src/tg/set-my-name)
@@ -9,11 +10,14 @@
   (name (or string null) nil)
   (language-code (or string null) nil))
 
-(defun set-my-name (bot &key (name nil) (language-code nil))
+(defun set-my-name (&key (name nil) (language-code nil))
+  "setMyName Telegram method.
+
+We also first check if the name is already set because setMyName has a very heavy rate limiting impact."
   (block nil
     (when name
-      (let ((curr-name (get-my-name bot :language-code language-code)))
+      (let ((curr-name (get-my-name :language-code language-code)))
         (when (string= name (bot-name-name curr-name))
           (return))))
-    (unless (set-my-name% bot :name name :language-code language-code)
+    (unless (set-my-name% :name name :language-code language-code)
       (error "Failed to set name"))))