From ec217059c38f4de854338ccabf669d2a77e6c94d Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Tue, 17 May 2022 13:02:58 +0100
Subject: Store a set of list mode pointers in Membership instead of
 characters.

---
 src/modules/m_httpd_stats.cpp         | 2 +-
 src/modules/m_spanningtree/commands.h | 3 ++-
 src/modules/m_spanningtree/main.cpp   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp
index 91bfba6ca..923f82b0a 100644
--- a/src/modules/m_httpd_stats.cpp
+++ b/src/modules/m_httpd_stats.cpp
@@ -183,7 +183,7 @@ namespace Stats
 			{
 				data << "<channelmember><uid>" << memb->user->uuid << "</uid><privs>"
 					<< Sanitize(memb->GetAllPrefixChars()) << "</privs><modes>"
-					<< memb->modes << "</modes>";
+					<< memb->GetAllPrefixModes() << "</modes>";
 				DumpMeta(data, memb);
 				data << "</channelmember>";
 			}
diff --git a/src/modules/m_spanningtree/commands.h b/src/modules/m_spanningtree/commands.h
index 6f3260d35..cf3e1590d 100644
--- a/src/modules/m_spanningtree/commands.h
+++ b/src/modules/m_spanningtree/commands.h
@@ -185,7 +185,8 @@ public:
 
 		void add(Membership* memb)
 		{
-			add(memb, memb->modes.begin(), memb->modes.end());
+			const std::string modes = memb->GetAllPrefixModes();
+			add(memb, modes.begin(), modes.end());
 		}
 
 		void clear();
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 2dfd52695..fd130c787 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -538,7 +538,7 @@ void ModuleSpanningTree::OnUserJoin(Membership* memb, bool sync, bool created_by
 		if (!memb->modes.empty())
 		{
 			params.push(ConvToStr(memb->chan->age));
-			params.push(memb->modes);
+			params.push(memb->GetAllPrefixModes());
 		}
 		params.Broadcast();
 	}
-- 
cgit v1.3.1-10-gc9f91