From 9e424b351da370630924e32d0a84eba6fdb8c05e Mon Sep 17 00:00:00 2001 From: Uko Kokņevičs Date: Mon, 13 Oct 2025 06:32:57 +0300 Subject: Move bot/methods to tg/* --- src/bot/advanced.lisp | 2 +- src/bot/methods.lisp | 97 --------------------------------------------------- 2 files changed, 1 insertion(+), 98 deletions(-) delete mode 100644 src/bot/methods.lisp (limited to 'src/bot') diff --git a/src/bot/advanced.lisp b/src/bot/advanced.lisp index c18b574..3763151 100644 --- a/src/bot/advanced.lisp +++ b/src/bot/advanced.lisp @@ -1,7 +1,7 @@ ;; SPDX-License-Identifier: EUPL-1.2 ;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs (defpackage :ukkoclot/bot/advanced - (:use :c2cl :ukkoclot/bot/methods :ukkoclot/tg) + (:use :c2cl :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/methods.lisp b/src/bot/methods.lisp deleted file mode 100644 index 6f01cae..0000000 --- a/src/bot/methods.lisp +++ /dev/null @@ -1,97 +0,0 @@ -;; SPDX-License-Identifier: EUPL-1.2 -;; SPDX-FileCopyrightText: 2025 Uko Kokņevičs -(defpackage :ukkoclot/bot/methods - (: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) - -(define-tg-method (answer-callback-query boolean) - (callback-query-id string) - (text (or string null) nil) - (show-alert boolean nil) - (url (or string null) nil) - (cache-time (or integer null) nil)) - -(define-tg-method (delete-message boolean) - (chat-id (or integer string)) - (message-id integer)) - -;; TODO: Add a way to simply specify :message msg :) -(define-tg-method (edit-message-text message) - (business-connection-id (or string null) nil) - (chat-id (or integer string null) nil) - (message-id (or integer null) nil) - (inline-message-id (or string null) nil) - (text string) - (parse-mode (or parse-mode null) nil) - (entities (or (array message-entity) null) nil) - (link-preview-options (or link-preview-options null) nil) - (reply-markup (or inline-keyboard-markup null) nil)) - -(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)) - -(define-tg-method (get-my-name bot-name :GET) - (language-code (or string null) nil)) - -(define-tg-method (get-updates (array update)) - (offset (or integer null) nil) - (limit (or integer null) nil) - (timeout (or integer null) nil) - (allowed-updates (or string null) nil)) - -(define-tg-method (send-animation message) - (business-connection-id (or string null) nil) - (chat-id (or integer string)) - (message-thread-id (or integer null) nil) - (direct-messages-topic-id (or integer null) nil) - (animation (or pathname string)) - (duration (or integer null) nil) - (width (or integer null) nil) - (height (or integer null) nil) - (thumbnail (or pathname string null) nil) - (caption (or string null) nil) - (parse-mode (or parse-mode null) nil) - (caption-entities (or (array message-entity) null) nil) - (show-caption-above-media boolean nil) - (has-spoiler boolean nil) - (disable-notification boolean nil) - (protect-content boolean nil) - (allow-paid-broadcast boolean nil) - (message-effect-id (or string null) nil) - (suggested-post-parameters (or suggested-post-parameters null) nil) - (reply-parameters (or reply-parameters null) nil) - (reply-markup (or inline-keyboard-markup reply-keyboard-markup reply-keyboard-remove force-reply null) nil)) - -(define-tg-method (send-message message) - (business-connection-id (or string null) nil) - (chat-id (or integer string)) - (message-thread-id (or integer null) nil) - (text string) - (parse-mode (or parse-mode null) nil) - (entities (or (array message-entity) null) nil) - (link-preview-options (or link-preview-options null) nil) - (disable-notification (or boolean null) nil) - (protect-content (or boolean null) nil) - (message-effect-id (or string null) nil) - (reply-parameters (or reply-parameters null) nil) - (reply-markup (or inline-keyboard-markup reply-keyboard-markup reply-keyboard-remove force-reply null) nil)) - -(define-tg-method (set-my-name% boolean) - (name (or string null) nil) - (language-code (or string null) nil)) - -(defun set-my-name (bot &key (name nil) (language-code nil)) - (block nil - (when name - (let ((curr-name (get-my-name bot :language-code language-code))) - (when (string= name (bot-name-name curr-name)) - (return)))) - (unless (set-my-name% bot :name name :language-code language-code) - (error "Failed to set name")))) -- cgit v1.2.3