Fixed imports.

40ants · Dec 7, 2024 · 73feeeb · 73feeeb
1 parent 2dc346e
commit 73feeeb
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 29 deletions.
diff --git a/cl-telegram-bot2-deps.asd b/cl-telegram-bot2-deps.asd
diff --git a/cl-telegram-bot2.asd b/cl-telegram-bot2.asd
@@ -29,4 +29,5 @@
 (asdf:register-system-packages "utilities.print-items" '("PRINT-ITEMS"))
 (asdf:register-system-packages "dexador" '("DEX"))
 (asdf:register-system-packages "sento" '("SENTO.ACTOR-SYSTEM"
+                                         "SENTO.ACTOR-CONTEXT"
                                          "SENTO.ACTOR"))
diff --git a/v2/bot.lisp b/v2/bot.lisp
@@ -5,12 +5,13 @@
                 #:required-argument
                 #:once-only)
   (:import-from #:sento.actor-system)
+  (:import-from #:sento.actor-context)
+  (:import-from #:cl-telegram-bot2/api)
   (:import-from #:cl-telegram-bot2/vars
                 #:*current-bot*)
   (:import-from #:cl-telegram-bot2/states/base
                 #:base-state)
-  (:export
-   #:defbot))
+  (:export #:defbot))
 (in-package #:cl-telegram-bot2/bot)
 
 

diff --git a/v2/high.lisp b/v2/high.lisp
@@ -1,16 +1,12 @@
 (uiop:define-package #:cl-telegram-bot2/high
   (:use #:cl)
-  (:import-from #:serapeum
-                #:defvar-unbound)
   (:import-from #:cl-telegram-bot2/api
                 #:send-photo
                 #:message-chat
                 #:update-message
                 #:update
                 #:chat-id
                 #:send-message)
-  (:import-from #:cl-telegram-bot2/generics
-                #:process)
   (:import-from #:cl-telegram-bot2/vars
                 #:*current-chat*)
   (:import-from #:lambda-fiddle
@@ -86,17 +82,3 @@
       (push message *collected-messages*))
     (values message)))
 
-
-;; (defun reply (text &rest rest &key #.*args*)
-;;   (let ((chat-id (chat-id *current-chat*)))
-;;     (apply #'send-message
-;;            chat-id
-;;            text
-;;            rest))
-;;   ;; (values)
-;;   )
-
-
-;; (defmethod process :around ((state chat-state) (update update))
-;;   (let* 
-;;     (call-next-method)))
diff --git a/v2/pipeline.lisp b/v2/pipeline.lisp
@@ -1,15 +1,13 @@
 (uiop:define-package #:cl-telegram-bot2/pipeline
   (:use #:cl)
-  (:import-from #:log4cl)
+  (:import-from #:log)
+  (:import-from #:cl-telegram-bot2/api)
   (:import-from #:cl-telegram-bot2/bot
                 #:initial-state-class
                 #:api-uri
                 #:token
                 #:get-last-update-id
                 #:bot)
-  (:import-from #:anaphora
-                #:it
-                #:acond)
   (:import-from #:cl-telegram-bot2/vars
                 #:*current-state*
                 #:*current-bot*
@@ -26,12 +24,11 @@
                 #:fmt)
   (:import-from #:sento.actor
                 #:*state*)
+  (:import-from #:sento.actor-context)
   (:import-from #:cl-telegram-bot2/vars
                 #:*current-chat*)
   (:import-from #:closer-mop
                 #:slot-definition-type)
-  (:import-from #:alexandria
-                #:required-argument)
   (:import-from #:cl-telegram-bot2/states/base
                 #:state-id
                 #:base-state)

diff --git a/v2/server.lisp b/v2/server.lisp
@@ -3,7 +3,7 @@
   (:import-from #:bordeaux-threads
                 #:make-thread
                 #:destroy-thread)
-  (:import-from #:log4cl)
+  (:import-from #:log)
   ;; (:import-from #:cl-telegram-bot/update
   ;;               #:process-updates)
   ;; (:import-from #:cl-telegram-bot/response

diff --git a/v2/spec.lisp b/v2/spec.lisp
@@ -19,7 +19,6 @@
                 #:curry
                 #:make-keyword
                 #:hash-table-alist)
-  (:import-from #:cl-telegram-bot2/deps)
   (:import-from #:njson
                 #:jget)
   (:import-from #:cl-json