/*
* InspIRCd -- Internet Relay Chat Daemon
*
- * Copyright (C) 2019 Peter Powell <petpow@saberuk.com>
- * Copyright (C) 2016 Attila Molnar <attilamolnar@hush.com>
+ * Copyright (C) 2019-2020 Sadie Powell <sadie@witchery.services>
*
* 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
#include "inspircd.h"
-#include "modules/cap.h"
#include "modules/ctctags.h"
-class MsgIdGenerator
-{
- uint64_t counter;
- std::string strid;
- const std::string::size_type baselen;
-
- public:
- MsgIdGenerator()
- : counter(0)
- , strid(InspIRCd::Format("%s~%lu~", ServerInstance->Config->GetSID().c_str(), ServerInstance->startup_time))
- , baselen(strid.length())
- {
- }
-
- const std::string& GetNext()
- {
- strid.erase(baselen);
- strid.append(ConvToStr(counter++));
- return strid;
- }
-};
-
class MsgIdTag : public ClientProtocol::MessageTagProvider
{
private:
- Cap::Reference ctctagcap;
+ CTCTags::CapReference ctctagcap;
public:
- MsgIdGenerator generator;
-
MsgIdTag(Module* mod)
: ClientProtocol::MessageTagProvider(mod)
- , ctctagcap(mod, "message-tags")
- {
- }
-
- void OnPopulateTags(ClientProtocol::Message& msg) CXX11_OVERRIDE
+ , ctctagcap(mod)
{
- const ClientProtocol::TagMap& tags = msg.GetTags();
- if (tags.find("msgid") == tags.end())
- msg.AddTag("msgid", this, generator.GetNext());
}
ModResult OnProcessTag(User* user, const std::string& tagname, std::string& tagvalue) CXX11_OVERRIDE
}
};
+class MsgIdGenerator
+{
+ uint64_t counter;
+ std::string strid;
+ const std::string::size_type baselen;
+
+ public:
+ MsgIdGenerator()
+ : counter(0)
+ , strid(InspIRCd::Format("%s~%lu~", ServerInstance->Config->GetSID().c_str(), ServerInstance->startup_time))
+ , baselen(strid.length())
+ {
+ }
+
+ const std::string& GetNext()
+ {
+ strid.erase(baselen);
+ strid.append(ConvToStr(counter++));
+ return strid;
+ }
+};
+
class ModuleMsgId
: public Module
, public CTCTags::EventListener
{
private:
MsgIdTag tag;
+ MsgIdGenerator generator;
ModResult CopyMessageId(const ClientProtocol::TagMap& tags_in, ClientProtocol::TagMap& tags_out)
{
// If the remote server has sent a message identifier we should use that as
// identifiers need to be the same on all sides of the network.
tags_out.insert(*iter);
+ return MOD_RES_PASSTHRU;
}
+
+ // Otherwise, we can just create a new message identifier.
+ tags_out.insert(std::make_pair("msgid", ClientProtocol::MessageTagData(&tag, generator.GetNext())));
return MOD_RES_PASSTHRU;
}
Version GetVersion() CXX11_OVERRIDE
{
- return Version("Provides the msgid IRCv3 tag", VF_VENDOR);
+ return Version("Provides support for the IRCv3 Message IDs specification.", VF_VENDOR);
}
};