Formatting

chatikbot.lisp

@@ -334,7 +334,8 @@
        "Пока ничего не постим"
        (format nil "Постим:~%~{~A (~A)~^~%~}"
                (loop for feed in feeds
-                  append (list (feed-title feed) (feed-url feed)))))))
+                  append (list (feed-title feed) (feed-url feed)))))
+   :disable-web-preview 1))
 
 (defun %get-feed (url)
   (when url
@@ -384,7 +385,9 @@
         (log:info "Fetching new items" (feed-url feed))
         (dolist (item (fetch-new-items feed))
           (dolist (chat-id (%feed-send-to feed))
-            (telegram-send-message chat-id (format-feed-item item) :disable-web-preview 1))))
+            (telegram-send-message chat-id
+                                   (format-feed-item feed item)
+                                   :disable-web-preview 1))))
     (error (e) (log:error e))))
 
 (defun %load-rss-feeds (alist)

rss.lisp

@@ -102,12 +102,13 @@
                                :published (local-time:universal-to-timestamp
                                            (date-time-parser:parse-date-time (child-text item "pubDate")))))))
 
-(defun format-feed-item (item)
-  (format nil "~A~@[ @ ~A~]~@[~%~%~A~]~%~%~A"
-          (feed-item-title item)
+(defun format-feed-item (feed item)
+  (format nil "~A~@[ @ ~A~]~%~A~%~A"
+          (feed-title feed)
           (alexandria:when-let (ts (feed-item-published item))
             (local-time:format-timestring
              nil ts
-             :format '((:year 2) "-" (:month 2) "-" (:day 2) " " (:hour 2) ":" (:min 2))))
-          (feed-item-description item)
+             :format '((:year 2) "-" (:month 2) "-" (:day 2)
+                       " " (:hour 2) ":" (:min 2))))
+          (feed-item-title item)
           (feed-item-link item)))