Use serapeum's -> & defsubst

1 files changed, 12 insertions, 2 deletions

diff --git a/src/config.lisp b/src/config.lisp
index 85c9662..7117de3 100644
--- a/src/config.lisp
+++ b/src/config.lisp
@@ -5,6 +5,7 @@
   (:nicknames :conf)
   (:use :c2cl :iterate :ukkoclot/src/rw-lock)
   (:import-from :alexandria :make-keyword)
+  (:import-from :serapeum :->)
   (:export
    #:*config*
    #:config
@@ -31,36 +32,42 @@
 (defvar *config* (make-config)
   "Bot's configuration")
 
+(-> bot-name (&optional config) string)
 (defun bot-name (&optional (config *config*))
   "Get the desired name for the bot"
   (with-slots (lock bot-name) config
     (with-read-lock (lock)
       bot-name)))
 
+(-> bot-token (&optional config) string)
 (defun bot-token (&optional (config *config*))
   "Get the API token for the bot"
   (with-slots (lock bot-token) config
     (with-read-lock (lock)
       bot-token)))
 
+(-> db-path (&optional config) pathname)
 (defun db-path (&optional (config *config*))
   "Get the path to the bot's database"
   (with-slots (lock db-path) config
     (with-read-lock (lock)
-      db-path)))
+      (pathname db-path))))
 
+(-> dev-group (&optional config) integer)
 (defun dev-group (&optional (config *config*))
   "Get the ID of the dev/testing group"
   (with-slots (lock dev-group) config
     (with-read-lock (lock)
       dev-group)))
 
+(-> owner (&optional config) integer)
 (defun owner (&optional (config *config*))
   "Get the ID of the bot's owner"
   (with-slots (lock owner) config
     (with-read-lock (lock)
       owner)))
 
+(-> load-config (pathname &optional config) config)
 (defun load-config (filename &optional (config *config*))
   "Load config from the given `filename'."
   (prog1 config
@@ -71,6 +78,7 @@
           (let ((name (intern (symbol-name kw-name) :ukkoclot/src/config)))
             (setf (slot-value config name) value)))))))
 
+(-> serialize (config) list)
 (defun serialize (config)
   "Serializes the config to a plist."
   (with-read-lock ((config-lock config))
@@ -81,10 +89,12 @@
           (appending (list (make-keyword name)
                            (slot-value config name))))))))
 
+(-> print-default (pathname) (values &optional))
 (defun print-default (filename)
   "Prints the default config to the given `filename'."
   (with-open-file (f filename :direction :output :if-exists :supersede)
     (format f ";; lint:suppress in-package spdx-license-identifier~%")
     (format f ";; Copy this file to config.lisp and modify it there~%")
     (let ((data (serialize (make-config))))
-      (format f "~<(~;~@{~(~W~) ~W~^ ~_~}~;)~:>~%" data))))
+      (format f "~<(~;~@{~(~W~) ~W~^ ~_~}~;)~:>~%" data)))
+  (values))