From e864f2a9f58463b4119606f196257a40b480ac17 Mon Sep 17 00:00:00 2001 From: bel Date: Sat, 1 Apr 2023 11:38:13 -0600 Subject: [PATCH] default /get includes broadcast message if no personal message and MySecretWord --- src/device/input/parse/v01/server.go | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/device/input/parse/v01/server.go b/src/device/input/parse/v01/server.go index 5723de2..760cd6f 100644 --- a/src/device/input/parse/v01/server.go +++ b/src/device/input/parse/v01/server.go @@ -77,12 +77,18 @@ func (v01 *V01) serveHTTP(w http.ResponseWriter, r *http.Request) { } func (v01 *V01) getUserFeedback(w http.ResponseWriter, r *http.Request) { - user, ok := v01.cfg.Users[r.URL.Query().Get("user")] - if !ok { - w.Write([]byte(v01.cfg.Broadcast.Message)) - return + user := v01.cfg.Users[r.URL.Query().Get("user")] + + msg := user.State.Message + if msg == "" { + msg = v01.cfg.Broadcast.Message } - w.Write([]byte(user.State.Message)) + + if user.State.GM.Alias != "" { + msg = fmt.Sprintf("%s (Your secret word is '%s'. Make **someone else** say it!)", msg, user.State.GM.Alias) + } + + w.Write([]byte(msg)) } func (v01 *V01) servePutBroadcast(w http.ResponseWriter, r *http.Request) {