|
|
@@ -320,13 +320,13 @@
|
|
|
(handler-case
|
|
|
(let* ((symbol (get-label-symbol (nth 1 *args*)))
|
|
|
(amount (or (nth 2 *args*) (error "no amount")))
|
|
|
- (order (find amount (db/orders-get chat-id (agets from "id") symbol)
|
|
|
+ (order (find amount (db/orders-get *chat-id* (agets *from* "id") symbol)
|
|
|
:key #'(lambda (r) (nth 4 r)) :test #'equal)))
|
|
|
(if order
|
|
|
(progn
|
|
|
(db/order-del (car order))
|
|
|
(handle-hodl-show))
|
|
|
- (bot-send-message (format nil "Не нашёл ~A ~A :(" amount (nth 1 args)))))
|
|
|
+ (bot-send-message (format nil "Не нашёл ~A ~A :(" amount (nth 1 *args*)))))
|
|
|
(error (e)
|
|
|
(log:error "~A" e)
|
|
|
(bot-send-message "/hodl del <SYM> <AMT>"))))
|
|
|
@@ -343,9 +343,9 @@
|
|
|
(telegram-send-chat-action *chat-id* "upload_photo")
|
|
|
(let* ((args (mapcar 'string-downcase *args*))
|
|
|
(all-symbols (db/get-chat-symbols))
|
|
|
- (symbols (or (intersection (mapcar #'get-label-symbol *args*) all-symbols :test 'equal) all-symbols))
|
|
|
- (day-range (some #'(lambda (a) (aget a +chart-ranges+)) *args*))
|
|
|
- (number (some #'(lambda (a) (parse-integer a :junk-allowed t)) *args*))
|
|
|
+ (symbols (or (intersection (mapcar #'get-label-symbol args) all-symbols :test 'equal) all-symbols))
|
|
|
+ (day-range (some #'(lambda (a) (aget a +chart-ranges+)) args))
|
|
|
+ (number (some #'(lambda (a) (parse-integer a :junk-allowed t)) args))
|
|
|
(avg (* 60 (cond
|
|
|
(day-range (round day-range *chart-points*))
|
|
|
(number)
|