Use serapeum's -> & defsubst

1 files changed, 16 insertions, 21 deletions

diff --git a/src/tg/user.lisp b/src/tg/user.lisp
index 0768d12..aefdeeb 100644
--- a/src/tg/user.lisp
+++ b/src/tg/user.lisp
@@ -3,6 +3,8 @@
 (defpackage :ukkoclot/src/tg/user
   (:documentation "User Telegram type")
   (:use :c2cl :ukkoclot/src/tg/type-macros)
+  (:import-from :serapeum :->)
+  (:import-from :ukkoclot/src/streams :with-format-like-stream)
   (:import-from :ukkoclot/src/strings :escape-xml)
   (:export
    #:user
@@ -39,26 +41,19 @@
   (supports-inline-queries boolean nil)
   (can-connect-to-business boolean nil))
 
-(defun user-format-name% (user out)
-  "Format the USER's name in a nice way to stream OUT."
-  (format out "<a href=\"tg://user?id=~A\"><i>" (user-id user))
-  (escape-xml (user-first-name user) out)
-  (when (user-last-name user)
-    (write-char #\Space out)
-    (escape-xml (user-last-name user) out))
-  (write-string "</i>" out)
+(-> user-format-name (user &optional (or stream boolean)) (or string null))
+(defun user-format-name (user &optional out-spec)
+  "Format the `user''s name in a nice way."
+  (with-format-like-stream (out out-spec)
+    (format out "<a href=\"tg://user?id=~A\"><i>" (user-id user))
+    (escape-xml (user-first-name user) out)
+    (when (user-last-name user)
+      (write-char #\Space out)
+      (escape-xml (user-last-name user) out))
+    (write-string "</i>" out)
 
-  (when (user-username user)
-    (write-string " @" out)
-    (escape-xml (user-username user) out))
+    (when (user-username user)
+      (write-string " @" out)
+      (escape-xml (user-username user) out))
 
-  (format out "</a> [<code>~A</code>]" (user-id user)))
-
-(defun user-format-name (user &optional out)
-  "Format the USER's name in a nice way to stream OUT.
-
-If OUT is `nil', return the formatted name as a string instead."
-  (if out
-      (user-format-name% user out)
-      (with-output-to-string (stream)
-        (user-format-name% user stream))))
+    (format out "</a> [<code>~A</code>]" (user-id user))))