1 files changed, 12 insertions, 7 deletions

diff --git a/src/main.lisp b/src/main.lisp
index f9720c9..cd9e755 100644
--- a/src/main.lisp
+++ b/src/main.lisp
@@ -4,6 +4,7 @@
   (:nicknames :ukkoclot)
   (:use :c2cl :ukkoclot/config :ukkoclot/inline-bots :ukkoclot/tg)
   (:import-from :anaphora :acond :awhen :it)
+  (:import-from :com.dieggsy.f-string :enable-f-strings)
   (:import-from :log)
   (:import-from :ukkoclot/db :with-db)
   (:import-from :ukkoclot/serializing :fixup-value)
@@ -15,6 +16,8 @@
   (:export :main))
 (in-package :ukkoclot/main)
 
+(enable-f-strings)
+
 (defvar *in-prod* t)
 
 (defmacro reporty ((evt) &body body)
@@ -240,7 +243,9 @@
     ;; TODO: Replace this cond with a nicer dispatch.  Something like string-case?
     (acond
       ((equal simple-cmd "chatid")
-       (reply-message bot msg (format nil "<code>~A</code>" (message-chat-id msg)) :parse-mode html))
+       (reply-message bot msg
+                      #f"<code>{(message-chat-id msg)}</code>"
+                      :parse-mode html))
 
       ((and (equal simple-cmd "msginfo")
             (message-reply-to-message msg))
@@ -248,15 +253,14 @@
 
       ((equal simple-cmd "ping")
        (let* ((start-time (get-internal-real-time))
-              (reply (reply-message bot msg "Pong!
-Send time: ..."))
+              (reply (reply-message bot msg #f"Pong!{;~2%}Send time: ..."))
               (end-time (get-internal-real-time))
               (time-elapsed (* (/ (- end-time start-time) internal-time-units-per-second)
                                1000)))
          (edit-message-text bot
                             :chat-id (message-chat-id reply)
                             :message-id (message-id reply)
-                            :text (format nil "Pong!~2%Send time: ~Gms" time-elapsed))))
+                            :text #f"Pong!{;~2%}Send time: {time-elapsed;~G}ms")))
 
       ((and (equal simple-cmd "shutdown")
             (message-from msg)
@@ -264,11 +268,12 @@ Send time: ..."))
        (setf (bot-power-on bot) nil)
        (reply-message bot msg "Initialising shutdown..." :allow-sending-without-reply t)))))
 
+(defun escape-xml-obj (obj)
+  (escape-xml #f"{obj}"))
+
 (defun report-error (bot evt err)
   (log:error "While handling ~A: ~A" evt err)
-  (let ((msg (format nil "<code>~A</code> while handling ~&<pre>~A</pre>"
-                     (escape-xml (format nil "~A" err))
-                     (escape-xml (format nil "~A" evt)))))
+  (let ((msg #f"<code>{(escape-xml-obj err)}</code> while handling{;~%}<pre>{(escape-xml-obj evt)}</pre>"))
     (send-message bot
                       :chat-id (config-dev-group (bot-config bot))
                       :text msg