Add a CapReference class for the message-tags capability.

diff --git a/include/modules/ctctags.h b/include/modules/ctctags.h
index ad45d12b1a4f31b5b61e344d3badc94525df796a..7946c124349248206a072a8308f32cfbce004d51 100644 (file)
--- a/include/modules/ctctags.h
+++ b/include/modules/ctctags.h
@@ -20,14 +20,25 @@
 #pragma once
 
 #include "event.h"
+#include "modules/cap.h"
 
 namespace CTCTags
 {
+       class CapReference;
        class EventListener;
        class TagMessage;
        class TagMessageDetails;
 }
 
+class CTCTags::CapReference : public Cap::Reference
+{
+ public:
+       CapReference(Module* mod)
+               : Cap::Reference(mod, "message-tags")
+       {
+       }
+};
+
 class CTCTags::TagMessage : public ClientProtocol::Message
 {
 private:

diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index 91623a1fbe8b132e2deef24880d61b5bf238cc01..355ea44d4156096d30d339f2ea4b49c7fae2b5fa 100644 (file)
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -24,7 +24,7 @@
 
 
 #include "inspircd.h"
-#include "modules/cap.h"
+#include "modules/ctctags.h"
 #include "modules/whois.h"
 
 enum
@@ -37,13 +37,13 @@ class BotTag : public ClientProtocol::MessageTagProvider
 {
  private:
        SimpleUserModeHandler& botmode;
-       Cap::Reference ctctagcap;
+       CTCTags::CapReference ctctagcap;
 
  public:
        BotTag(Module* mod, SimpleUserModeHandler& bm)
                : ClientProtocol::MessageTagProvider(mod)
                , botmode(bm)
-               , ctctagcap(mod, "message-tags")
+               , ctctagcap(mod)
        {
        }
 

diff --git a/src/modules/m_ircv3_msgid.cpp b/src/modules/m_ircv3_msgid.cpp
index 8b56ba6c7a8cd5f32f0b832fdc423fe8b9c8c91b..c2bf3bd334e7304c5c05dd0fefc409074b2408e7 100644 (file)
--- a/src/modules/m_ircv3_msgid.cpp
+++ b/src/modules/m_ircv3_msgid.cpp
@@ -18,18 +18,17 @@
 
 
 #include "inspircd.h"
-#include "modules/cap.h"
 #include "modules/ctctags.h"
 
 class MsgIdTag : public ClientProtocol::MessageTagProvider
 {
  private:
-       Cap::Reference ctctagcap;
+       CTCTags::CapReference ctctagcap;
 
  public:
        MsgIdTag(Module* mod)
                : ClientProtocol::MessageTagProvider(mod)
-               , ctctagcap(mod, "message-tags")
+               , ctctagcap(mod)
        {
        }
 

diff --git a/src/modules/m_spanningtree/tags.cpp b/src/modules/m_spanningtree/tags.cpp
index feaa34bca2de337e72b66850a3ed41772028f094..7ae26d45be38c1aff61adc6f8e8a895e9f6e08d6 100644 (file)
--- a/src/modules/m_spanningtree/tags.cpp
+++ b/src/modules/m_spanningtree/tags.cpp
@@ -21,7 +21,7 @@
 
 ServiceTag::ServiceTag(Module* mod)
        : ClientProtocol::MessageTagProvider(mod)
-       , ctctagcap(mod, "message-tags")
+       , ctctagcap(mod)
 {
 }
 

diff --git a/src/modules/m_spanningtree/tags.h b/src/modules/m_spanningtree/tags.h
index d8d863a45999cfc06624ba8c34cf14fc3348f389..a52ee6ef8bb0b86b936e595d2bf632761d8ac74d 100644 (file)
--- a/src/modules/m_spanningtree/tags.h
+++ b/src/modules/m_spanningtree/tags.h
@@ -19,12 +19,12 @@
 
 #pragma once
 
-#include "modules/cap.h"
+#include "modules/ctctags.h"
 
 class ServiceTag : public ClientProtocol::MessageTagProvider
 {
  private:
-       Cap::Reference ctctagcap;
+       CTCTags::CapReference ctctagcap;
 
  public:
        ServiceTag(Module* mod);