Browse Source

Don't load on nalunch command

Innocenty Enikeew 9 năm trước cách đây
mục cha
commit
eafcc38387
1 tập tin đã thay đổi với 23 bổ sung20 xóa
  1. 23 20
      chatikbot.lisp

+ 23 - 20
chatikbot.lisp

@@ -164,16 +164,16 @@
   (log:info "handle-cmd-akb" chat-id message-id args)
   (handler-case
       (progn
-	(let ((total-aneks
-	       (aget "count" (vk-wall-get :domain +akb-vk-domain+ :count 1 :offset 10000000))))
-	  (dolist (post (aget "items" (vk-wall-get :domain +akb-vk-domain+
-						   :count (or (ignore-errors (parse-integer (car args))) 1)
-						   :offset (random total-aneks))))
-	    (handler-case
-		(telegram-send-message chat-id
-				       (format-akb post)
-				       :disable-web-preview 1)
-	      (error (e) (log:error e))))))
+    (let ((total-aneks
+           (aget "count" (vk-wall-get :domain +akb-vk-domain+ :count 1 :offset 10000000))))
+      (dolist (post (aget "items" (vk-wall-get :domain +akb-vk-domain+
+                           :count (or (ignore-errors (parse-integer (car args))) 1)
+                           :offset (random total-aneks))))
+        (handler-case
+        (telegram-send-message chat-id
+                       (format-akb post)
+                       :disable-web-preview 1)
+          (error (e) (log:error e))))))
     (error (e)
       (log:error "~A" e)
       (telegram-send-message chat-id "Ошибочка вышла"))))
@@ -237,15 +237,15 @@
     (telegram-send-message
      chat-id
      (if location
-	 (handler-case
-	     (forecast-format (forecast
-			       (aget "latitude" location)
-			       (aget "longitude" location)
-			       :hourly (find "hourly" args :key #'string-downcase :test #'equal)
-			       :daily (find "daily" args :key #'string-downcase :test #'equal)))
-	   (error (e)
-	     (log:error "~A" e)
-	     "Ошибочка вышла"))
+     (handler-case
+         (forecast-format (forecast
+                   (aget "latitude" location)
+                   (aget "longitude" location)
+                   :hourly (find "hourly" args :key #'string-downcase :test #'equal)
+                   :daily (find "daily" args :key #'string-downcase :test #'equal)))
+       (error (e)
+         (log:error "~A" e)
+         "Ошибочка вышла"))
      "Так а ты чьих будешь?"))))
 
 
@@ -568,7 +568,10 @@
   (log:info "handle-cmd-nalunch" chat-id message-id args)
   (handler-case
       (if (member chat-id *admins*)
-          (send-response chat-id (nalunch-format (nalunch-recent)))
+          (send-response chat-id (nalunch-format
+                                  (or *nalunch-last-result*
+                                      (setf *nalunch-last-result*
+                                            (nalunch-recent)))))
           (send-dont-understand chat-id))
     (error (e)
       (log:error "~A" e)