From a51d044c82d2e39a2d9a79dd2ce181ef7bd32b02 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Fri, 21 Jan 2022 15:53:04 +0000
Subject: Fix various edge cases in extensible synchronisation.

- Fix not forwarding the accountid extensible if it is set.
- Rename the variadic Set() overload to SetFwd().
- Re-add the `const T&` overload of Set().
- Move `bool synced` to SimpleExtItem from StringExtItem.
- Only sync extensibles if their instance is marked as syncable.
---
 src/modules/m_services_account.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/modules/m_services_account.cpp')

diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 8a97a83eb..b5d5f22a6 100644
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -103,11 +103,6 @@ class AccountExtItemImpl final
 	{
 	}
 
-	void FromInternal(Extensible* container, const std::string& value) noexcept override
-	{
-		StringExtItem::FromInternal(container, value);
-	}
-
 	void FromNetwork(Extensible* container, const std::string& value) noexcept override
 	{
 		StringExtItem::FromNetwork(container, value);
@@ -201,7 +196,7 @@ class ModuleServicesAccount final
 		, regdeafmode(this, "regdeaf", 'R')
 		, chanregmode(this)
 		, userregmode(this)
-		, accountid(this, "accountid", ExtensionType::USER)
+		, accountid(this, "accountid", ExtensionType::USER, true)
 		, accountname(this)
 		, accountextban(this, accountname)
 		, unauthedextban(this, accountname)
-- 
cgit v1.3.1-10-gc9f91