From 166a47ac68ab571ca1aacaaf8c0edfff26f8d59e Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Tue, 28 Feb 2023 16:32:27 +0000
Subject: Remove GetSID, rename sid to ServerId.

---
 src/modules/m_spanningtree/capab.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'src/modules/m_spanningtree/capab.cpp')

diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp
index a59a73a3b..d0b974131 100644
--- a/src/modules/m_spanningtree/capab.cpp
+++ b/src/modules/m_spanningtree/capab.cpp
@@ -568,7 +568,12 @@ bool TreeSocket::Capab(const CommandBase::Params& params)
 			if (!this->GetTheirChallenge().empty() && (this->LinkState == CONNECTING))
 			{
 				this->SendCapabilities(2);
-				this->WriteLine("SERVER " + ServerInstance->Config->ServerName + " " + TreeSocket::MakePass(capab->link->SendPass, capab->theirchallenge) + " 0 " + ServerInstance->Config->GetSID() + " :" + ServerInstance->Config->ServerDesc);
+				this->WriteLine(INSP_FORMAT("SERVER {} {} 0 {} :{}",
+					ServerInstance->Config->ServerName,
+					TreeSocket::MakePass(capab->link->SendPass, capab->theirchallenge),
+					ServerInstance->Config->ServerId,
+					ServerInstance->Config->ServerDesc
+				));
 			}
 		}
 		else
@@ -577,7 +582,12 @@ bool TreeSocket::Capab(const CommandBase::Params& params)
 			if (this->LinkState == CONNECTING)
 			{
 				this->SendCapabilities(2);
-				this->WriteLine("SERVER "+ServerInstance->Config->ServerName+" "+capab->link->SendPass+" 0 "+ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc);
+				this->WriteLine(INSP_FORMAT("SERVER {} {} 0 {} :{}",
+					ServerInstance->Config->ServerName,
+					capab->link->SendPass,
+					ServerInstance->Config->ServerId,
+					ServerInstance->Config->ServerDesc
+				));
 			}
 		}
 	}
-- 
cgit v1.3.1-10-gc9f91