|
|
@@ -219,14 +219,15 @@
|
|
|
(when (>= hour *saver-notify-hour*)
|
|
|
(dolist (cp (saver/find-today-payments moment))
|
|
|
(db-transaction
|
|
|
- (send-response (car cp) (%saver/format-payment-notification (cdr cp) moment))
|
|
|
+ (bot-send-message (car cp) (%saver/format-payment-notification (cdr cp) moment) :parse-mode "markdown")
|
|
|
(db/saver/set-payment-notified (car cp) (saver/payment-name (cdr cp)) moment)))
|
|
|
(dolist (cs (saver/find-today-salaries moment))
|
|
|
(db-transaction
|
|
|
- (send-response (car cs)
|
|
|
- (%saver/format-salary-notification (cdr cs)
|
|
|
- (db/saver/get-payments (car cs))
|
|
|
- moment))
|
|
|
+ (bot-send-message (car cs)
|
|
|
+ (%saver/format-salary-notification (cdr cs)
|
|
|
+ (db/saver/get-payments (car cs))
|
|
|
+ moment)
|
|
|
+ :parse-mode "markdown")
|
|
|
(db/saver/set-salary-notified (car cs) moment))))))
|
|
|
|
|
|
|
|
|
@@ -307,12 +308,13 @@
|
|
|
(let ((payment (elt (db/saver/get-payments chat-id) (1- (parse-integer (car args)))))
|
|
|
(salary (db/saver/get-salary chat-id)))
|
|
|
(db/saver/del-payment chat-id (saver/payment-name payment))
|
|
|
- (send-response chat-id
|
|
|
- (format nil "'~A' удалил.~@[ Забрать _~$_ из накопленого.~]"
|
|
|
- (saver/payment-name payment)
|
|
|
- (and salary
|
|
|
- (/ (getf (saver/get-payment-info payment salary) :saved-amount)
|
|
|
- 100)))))
|
|
|
+ (bot-send-message chat-id
|
|
|
+ (format nil "'~A' удалил.~@[ Забрать _~$_ из накопленого.~]"
|
|
|
+ (saver/payment-name payment)
|
|
|
+ (and salary
|
|
|
+ (/ (getf (saver/get-payment-info payment salary) :saved-amount)
|
|
|
+ 100)))
|
|
|
+ :parse-mode "markdown"))
|
|
|
(error (e) (send-response chat-id (format nil "/saver del <idx> [~A]" e)))))
|
|
|
|
|
|
;; Hooks
|
