|
|
@@ -48,9 +48,8 @@
|
|
|
(feed-next-fetch feed) (local-time:timestamp+ (local-time:now) new-period :sec))
|
|
|
items))
|
|
|
|
|
|
-(defun %send-feeds (chat-id feeds)
|
|
|
- (bot-send-message chat-id
|
|
|
- (if (null feeds)
|
|
|
+(defun %send-feeds (feeds)
|
|
|
+ (bot-send-message (if (null feeds)
|
|
|
"Пока ничего не постим"
|
|
|
(format nil "Постим~%~{~A) ~A: ~A~^~%~}"
|
|
|
(loop for feed in feeds
|
|
|
@@ -219,7 +218,7 @@
|
|
|
(def-message-cmd-handler handler-cmd-rss (:rss)
|
|
|
(let ((feeds (db/rss-get-chat-feeds *chat-id*)))
|
|
|
(if (null *args*)
|
|
|
- (%send-feeds *chat-id* feeds)
|
|
|
+ (%send-feeds feeds)
|
|
|
(progn
|
|
|
(dolist (url *args*)
|
|
|
(handler-case
|
|
|
@@ -236,12 +235,12 @@
|
|
|
(push feed feeds)))))
|
|
|
(error (e) (log:error "~A: ~A" url e))))
|
|
|
(db/rss-set-chat-feeds *chat-id* feeds)
|
|
|
- (%send-feeds *chat-id* (db/rss-get-chat-feeds *chat-id*))))))
|
|
|
+ (%send-feeds (db/rss-get-chat-feeds *chat-id*))))))
|
|
|
|
|
|
(def-message-cmd-handler handler-cmd-last-rss (:lastrss)
|
|
|
(let ((feeds (db/rss-get-chat-feeds *chat-id*)))
|
|
|
(if (null *args*)
|
|
|
- (%send-feeds *chat-id* feeds)
|
|
|
+ (%send-feeds feeds)
|
|
|
(let* ((idx (1- (parse-integer (car *args*))))
|
|
|
(limit (min 20 (if (> (length *args*) 1) (parse-integer (second *args*)) 5)))
|
|
|
(items (db/rss-last-feed-items (nth idx feeds) limit)))
|
