Move bot/impl to state

5 files changed, 18 insertions, 15 deletions

diff --git a/src/bot.lisp b/src/bot.lisp
deleted file mode 100644
index 78a6ad0..0000000
--- a/src/bot.lisp
+++ /dev/null
@@ -1,6 +0,0 @@
-;; SPDX-License-Identifier: EUPL-1.2
-;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(uiop:define-package :ukkoclot/bot
-  (:use)
-  ;; Maybe should somehow hide BOT-USERNAME% and BOT-ID% but whatever
-  (:use-reexport :ukkoclot/bot/advanced :ukkoclot/bot/impl :ukkoclot/bot/methods))
diff --git a/src/bot/advanced.lisp b/src/bot/advanced.lisp
index 635bdb0..c18b574 100644
--- a/src/bot/advanced.lisp
+++ b/src/bot/advanced.lisp
@@ -1,7 +1,8 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
 (defpackage :ukkoclot/bot/advanced
-  (:use :c2cl :ukkoclot/bot/impl :ukkoclot/bot/methods :ukkoclot/tg)
+  (:use :c2cl :ukkoclot/bot/methods :ukkoclot/tg)
+  (:import-from :ukkoclot/state :bot-id% :bot-username%)
   (:export :bot-id :bot-username :reply-animation :reply-message :try-delete-message))
 (in-package :ukkoclot/bot/advanced)
 
diff --git a/src/bot/method-macros.lisp b/src/bot/method-macros.lisp
index b6f237f..0500de9 100644
--- a/src/bot/method-macros.lisp
+++ b/src/bot/method-macros.lisp
@@ -2,7 +2,7 @@
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
 (defpackage :ukkoclot/bot/method-macros
   (:use :c2cl :iterate)
-  (:import-from :ukkoclot/bot/impl :bot)
+  (:import-from :ukkoclot/state :bot)
   (:import-from :ukkoclot/transport :do-call)
   (:export :define-tg-method))
 (in-package :ukkoclot/bot/method-macros)
diff --git a/src/bot/methods.lisp b/src/bot/methods.lisp
index bddb9ff..2daea6f 100644
--- a/src/bot/methods.lisp
+++ b/src/bot/methods.lisp
@@ -1,7 +1,8 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
 (defpackage :ukkoclot/bot/methods
-  (:use :c2cl :ukkoclot/bot/method-macros :ukkoclot/bot/impl :ukkoclot/tg)
+  (:use :c2cl :ukkoclot/bot/method-macros :ukkoclot/tg)
+  (:import-from :ukkoclot/state :bot-id% :bot-username%)
   (:export :answer-callback-query :delete-message :send-animation :edit-message-text :get-me :get-updates :send-message :set-my-name))
 (in-package :ukkoclot/bot/methods)
 
diff --git a/src/bot/impl.lisp b/src/state.lisp
index ea1aa03..98e2048 100644
--- a/src/bot/impl.lisp
+++ b/src/state.lisp
@@ -1,12 +1,19 @@
 ;; SPDX-License-Identifier: EUPL-1.2
 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs <perkontevs@gmail.com>
-(defpackage :ukkoclot/bot/impl
-  (:use :c2cl :iterate :ukkoclot/config)
+(defpackage :ukkoclot/state
+  (:use :c2cl :ukkoclot/config)
   (:export
-   :bot :bot-p :make-bot
-
-   :bot-config :bot-db :bot-base-uri :bot-power-on :bot-username% :bot-id%))
-(in-package :ukkoclot/bot/impl)
+   #:bot
+   #:make-bot
+   #:bot-p
+   #:copy-bot
+   #:bot-config
+   #:bot-db
+   #:bot-base-uri
+   #:bot-power-on
+   #:bot-username%
+   #:bot-id%))
+(in-package :ukkoclot/state)
 
 (defstruct (bot (:constructor make-bot%))
   (config (error "No value given for config") :read-only t)