1 files changed, 9 insertions, 8 deletions

diff --git a/src/state.lisp b/src/state.lisp
index 98e2048..597f0a8 100644
--- a/src/state.lisp
+++ b/src/state.lisp
@@ -1,13 +1,15 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
 (defpackage :ukkoclot/state
-  (:use :c2cl :ukkoclot/config)
+  (:documentation "Holds the global state")
+  (:use :c2cl)
+  (:import-from :com.dieggsy.f-string :enable-f-strings)
+  (:import-from :conf :bot-token)
   (:export
    #:bot
    #:make-bot
    #:bot-p
    #:copy-bot
-   #:bot-config
    #:bot-db
    #:bot-base-uri
    #:bot-power-on
@@ -15,16 +17,15 @@
    #:bot-id%))
 (in-package :ukkoclot/state)
 
+(enable-f-strings)
+
 (defstruct (bot (:constructor make-bot%))
-  (config (error "No value given for config") :read-only t)
   (db (error "No value given for DB") :read-only t)
   (base-uri (error "No value given for base-uri") :read-only t)
   (power-on t :type boolean)
   (username% nil :type (or string null))
   (id% nil :type (or integer null)))
 
-(defun make-bot (config db)
-  (let ((base-uri (concatenate 'string
-                               "https://api.telegram.org/bot"
-                               (config-bot-token config) "/")))
-    (make-bot% :config config :db db :base-uri base-uri)))
+(defun make-bot (db)
+  (let ((base-uri #f"https://api.telegram.org/bot{(bot-token)}/"))
+    (make-bot% :db db :base-uri base-uri)))