1 files changed, 17 insertions, 13 deletions

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%))))