From 93eddf603b246ce3ff4a7ef589da0ae5b8c919c4 Mon Sep 17 00:00:00 2001
From: Aeadoin <109764533+Aeadoin@users.noreply.github.com>
Date: Mon, 23 Jan 2023 18:39:55 -0500
Subject: [PATCH] [Bug Fix] Fix botgrouplist to display unique entries. (#2785)

---
 zone/bot_command.cpp  | 8 +++++++-
 zone/bot_database.cpp | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/zone/bot_command.cpp b/zone/bot_command.cpp
index 1b3c66348..f812c4d6c 100644
--- a/zone/bot_command.cpp
+++ b/zone/bot_command.cpp
@@ -7192,7 +7192,13 @@ void bot_subcommand_botgroup_add_member(Client *c, const Seperator *sep)
 	std::list<Bot*> sbl;
 	MyBots::PopulateSBL_ByNamedBot(c, sbl, sep->arg[1]);
 	if (sbl.empty()) {
-		c->Message(Chat::White, "You must name a new member as a bot that you own to use this command.");
+		c->Message(
+			Chat::White,
+			fmt::format(
+				"Usage: (<target_leader>) {} [member_name]",
+				sep->arg[0]
+			).c_str()
+		);
 		return;
 	}
 
diff --git a/zone/bot_database.cpp b/zone/bot_database.cpp
index 1bac31359..a959e8e59 100644
--- a/zone/bot_database.cpp
+++ b/zone/bot_database.cpp
@@ -2624,7 +2624,7 @@ bool BotDatabase::LoadBotGroupsListByOwnerID(const uint32 owner_id, std::list<st
 
 
 	query = fmt::format(
-		"SELECT group_name, group_leader_id FROM "
+		"SELECT DISTINCT(group_name), group_leader_id FROM "
 		"bot_groups bg INNER JOIN bot_group_members bgm "
 		"ON bg.groups_index = bgm.groups_index "
 		"WHERE bgm.bot_id IN "