services: Rewrite 'zulip-irc-bridge-configuration' with 'define-configuration/no-serialization'.

* gnu/services/messaging.scm (zulip-irc-bridge-configuration): Rewrite using
'define-configuration/no-serialization'.
(zulip-irc-bridge-services): Adjust for handling 'maybe-string' types.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Merges: #10180

2 files changed, 46 insertions, 24 deletions

diff --git a/doc/guix.texi b/doc/guix.texi
index 3f0c0c51f4d..e1701a0d17d 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -33141,8 +33141,8 @@ strings, see
 @cindex IRC, bridge to Zulip
 @cindex Zulip, bridge to IRC
 @url{https://zulip.com/integrations/irc, Zulip IRC integration} is a
-Zulip extension to bridge @acronym{IRC, Internet Relay Chat} room to a
-stream in the Zulip messaging system.
+Zulip extension to bridge an @acronym{IRC, Internet Relay Chat} room to
+a stream in the Zulip messaging system.
 
 @defvar zulip-irc-bridge-service-type
 This is the service type for the Zulip IRC bridge.  Its value is a
@@ -33172,26 +33172,30 @@ room to a Zulip stream.
 
 @end defvar
 
-@c %end of fragment
+@c %start of fragment
 
 @deftp {Data Type} zulip-irc-bridge-configuration
 Available @code{zulip-irc-bridge-configuration} fields are:
 
 @table @asis
-@item @code{irc-mirror} (default: @code{(file-append python-zulip "/share/zulip/integrations/bridge_with_irc/irc-mirror.py")}) (type: file-like)
-Path to IRC mirror integration to use for the service.
+@item @code{irc-mirror} (type: file-like)
+Path to the IRC mirror integration software to use.
 
 @item @code{irc-server} (type: string)
-The IRC server where to search the room to mirror.
+The IRC server where the channel to mirror is hosted.
 
 @item @code{channel} (type: string)
-The Zulip where to store the topic where IRC will be mirrored.
+The IRC room to mirror.
 
 @item @code{nick-prefix} (type: string)
 Bot nickname.
 
 @item @code{stream} (type: string)
-The Zulip stream/topic where the mirroring takes place.
+The Zulip stream where the mirroring takes place.
+
+@item @code{topic} (type: maybe-string)
+The Zulip topic to mirror the IRC room under.  Defaults to IRC if not
+specified.
 
 @item @code{site} (type: string)
 The Zulip server that the IRC bridge integration should operate on.
@@ -33200,12 +33204,14 @@ The Zulip server that the IRC bridge integration should operate on.
 The Zulip bot email that the IRC integration service should use.
 
 @item @code{api-key} (type: string)
-The API key of the Zulip bot that will send the mirrored messages.
+The API key that the Zulip bot will use for authenticating with the
+Zulip site.
 
 @end table
 
 @end deftp
 
+
 @c %end of fragment
 
 @node Telephony Services
diff --git a/gnu/services/messaging.scm b/gnu/services/messaging.scm
index 017c4048250..0be175d8af2 100644
--- a/gnu/services/messaging.scm
+++ b/gnu/services/messaging.scm
@@ -2735,20 +2735,36 @@ point to different things after a reload, such as renewed TLS certificates.")
 ;;; Zulip.
 ;;;
 
-(define-record-type* <zulip-irc-bridge-configuration>
-  zulip-irc-bridge-configuration make-zulip-irc-bridge-configuration
-  zulip-irc-bridge-configuration?
-  (irc-mirror  zulip-irc-bridge-mirror
-               (default (file-append python-zulip "/bin/zulip-irc-bridge")))
-  (irc-server  zulip-irc-bridge-server)
-  (channel     zulip-irc-bridge-channel)
-  (nick-prefix zulip-irc-bridge-nick-prefix)
-  (stream      zulip-irc-bridge-stream)
-  (topic       zulip-irc-bridge-topic
-               (default #f))
-  (site        zulip-irc-bridge-site)
-  (user        zulip-irc-bridge-user)
-  (api-key     zulip-irc-bridge-api-key))
+(define-configuration/no-serialization zulip-irc-bridge-configuration
+  (irc-mirror
+   (file-like
+    (file-append python-zulip "/bin/zulip-irc-bridge"))
+   "Path to IRC mirror integration to use for the service.")
+  (irc-server
+   string
+   "The IRC server where the channel to mirror is hosted.")
+  (channel
+    string
+    "The IRC room to mirror.")
+  (nick-prefix
+   string
+   "Bot nickname.")
+  (stream
+   string
+   "The Zulip stream where the mirroring takes place.")
+  (topic
+   maybe-string
+   "The Zulip topic to mirror the IRC room under.  Defaults to IRC if not
+specified.")
+  (site
+   string
+   "The Zulip server that the IRC bridge integration should operate on.")
+  (user
+   string
+   "The Zulip bot email that the IRC integration service should use.")
+  (api-key
+   string
+   "The API key of the Zulip bot that will send the mirrored messages."))
 
 (define %zulip-accounts
   (list (user-group
@@ -2775,7 +2791,7 @@ point to different things after a reload, such as renewed TLS certificates.")
                            (string-append "--site=" site)
                            (string-append "--user=" user)
                            (string-append "--api-key=" api-key)
-                           (if topic
+                           (if (maybe-value-set? topic)
                                (list (string-append "--topic=" topic))
                                '())))
            (log-file "/var/log/zulip-irc-bridge.log"))