From ea1ef9da7f5382d1859753236205cf9496fd64f1 Mon Sep 17 00:00:00 2001
From: Aine <aine@etke.cc>
Date: Tue, 30 Aug 2022 15:00:34 +0300
Subject: [PATCH] !pm users changes

---
 bot/command_admin.go | 4 ++--
 bot/settings_bot.go  | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/bot/command_admin.go b/bot/command_admin.go
index 4b5bc0c..114b043 100644
--- a/bot/command_admin.go
+++ b/bot/command_admin.go
@@ -102,8 +102,8 @@ func (b *Bot) runUsers(ctx context.Context, commandSlice []string) {
 		msg.WriteString("Usage: `")
 		msg.WriteString(b.prefix)
 		msg.WriteString(" users PATTERN1 PATTERN2 PATTERN3...`")
-		msg.WriteString("where patterns like `@someone:example.com ")
-		msg.WriteString(" @bot.*:example.com @*:another.com @*:*`\n")
+		msg.WriteString("where each pattern is like `@someone:example.com`, ")
+		msg.WriteString("`@bot.*:example.com`, `@*:another.com`, or `@*:*`\n")
 
 		b.SendNotice(ctx, evt.RoomID, msg.String())
 		return
diff --git a/bot/settings_bot.go b/bot/settings_bot.go
index eb208d3..53af08f 100644
--- a/bot/settings_bot.go
+++ b/bot/settings_bot.go
@@ -28,7 +28,11 @@ func (s botSettings) Set(key, value string) {
 
 // Users option
 func (s botSettings) Users() []string {
-	return strings.Split(s.Get(botOptionUsers), " ")
+	value := s.Get(botOptionUsers)
+	if strings.Contains(value, " ") {
+		return strings.Split(value, " ")
+	}
+	return []string{}
 }
 
 // TODO: remove after migration