1 files changed, 17 insertions, 5 deletions

diff --git a/src/tg/get-me.lisp b/src/tg/get-me.lisp
index ae00717..cfb1304 100644
--- a/src/tg/get-me.lisp
+++ b/src/tg/get-me.lisp
@@ -3,13 +3,25 @@
 (defpackage :ukkoclot/tg/get-me
   (:use :c2cl :ukkoclot/bot/method-macros :ukkoclot/tg/user)
   (:import-from :ukkoclot/state :bot-id% :bot-username%)
-  (:export :get-me))
+  (:export :bot-id :bot-username :get-me))
 (in-package :ukkoclot/tg/get-me)
 
 (define-tg-method (get-me% user :GET))
 
 (defun get-me (bot)
-  (let ((res (get-me% bot)))
-    (setf (bot-id% bot) (user-id res))
-    (setf (bot-username% bot) (user-username res))
-    res))
+  (let ((me (get-me bot)))
+    (setf (bot-id% bot) (user-id me))
+    (setf (bot-username% bot) (user-username me))
+    me))
+
+(defun bot-id (bot)
+  (or (bot-id% bot)
+      (progn
+        (get-me bot)
+        (bot-id% bot))))
+
+(defun bot-username (bot)
+  (or (bot-username% bot)
+      (progn
+        (get-me bot)
+        (bot-username% bot))))