From c60f88bb5ce23d1291dddfd3e15ba71c801b7d3c Mon Sep 17 00:00:00 2001
From: Peter Powell <petpow@saberuk.com>
Date: Mon, 13 Aug 2018 21:35:28 +0100
Subject: [PATCH] Add support for the IRCv3 account-tag specification.

Co-authored-by: Attila Molnar <attilamolnar@hush.com>
---
 docs/conf/modules.conf.example     |  5 +++
 src/modules/m_ircv3_accounttag.cpp | 62 ++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 src/modules/m_ircv3_accounttag.cpp

diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
index 6c3357d29..50a43021a 100644
--- a/docs/conf/modules.conf.example
+++ b/docs/conf/modules.conf.example
@@ -1036,6 +1036,11 @@
 # and host cycling.
 #<ircv3 accountnotify="on" awaynotify="on" extendedjoin="on">
 
+#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+# IRCv3 account-tag module. Adds the 'account' tag which contains the
+# services account name of the message sender.
+#<module name="ircv3_accounttag">
+
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # IRCv3 cap-notify module: Provides the cap-notify IRCv3.2 extension.
 # Required for IRCv3.2 conformance.
diff --git a/src/modules/m_ircv3_accounttag.cpp b/src/modules/m_ircv3_accounttag.cpp
new file mode 100644
index 000000000..45fcf8022
--- /dev/null
+++ b/src/modules/m_ircv3_accounttag.cpp
@@ -0,0 +1,62 @@
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2016 Attila Molnar <attilamolnar@hush.com>
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "inspircd.h"
+#include "modules/ircv3.h"
+#include "modules/account.h"
+
+class AccountTag : public IRCv3::CapTag<AccountTag>
+{
+ public:
+	const std::string* GetValue(const ClientProtocol::Message& msg) const
+	{
+		User* const user = msg.GetSourceUser();
+		if (!user)
+			return NULL;
+
+		AccountExtItem* const accextitem = GetAccountExtItem();
+		if (!accextitem)
+			return NULL;
+
+		return accextitem->get(user);
+	}
+
+	AccountTag(Module* mod)
+		: IRCv3::CapTag<AccountTag>(mod, "account-tag", "account")
+	{
+	}
+};
+
+class ModuleIRCv3AccountTag : public Module
+{
+	AccountTag tag;
+
+ public:
+	ModuleIRCv3AccountTag()
+		: tag(this)
+	{
+	}
+
+	Version GetVersion() CXX11_OVERRIDE
+	{
+		return Version("Provides the account-tag IRCv3 extension", VF_VENDOR);
+	}
+};
+
+MODULE_INIT(ModuleIRCv3AccountTag)
-- 
2.39.2