X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_chanhistory.cpp;h=f689b292c1960adff28e31e974288cdad46a3b5a;hb=3151d60c1ecc9462e4c335282ee6c31672f45111;hp=540fa29087cbb548307826967d6429e5ae7c1ee7;hpb=87b1461e2a4710a38b32186c2582da9fe9bb3804;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp index 540fa2908..f689b292c 100644 --- a/src/modules/m_chanhistory.cpp +++ b/src/modules/m_chanhistory.cpp @@ -1,6 +1,12 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2018 linuxdaemon + * Copyright (C) 2013, 2017-2020 Sadie Powell + * Copyright (C) 2013 Daniel Vassdal + * Copyright (C) 2012-2015, 2018 Attila Molnar + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2010 Craig Edwards * Copyright (C) 2009-2010 Daniel De Graaf * * This file is part of InspIRCd. InspIRCd is free software: you can @@ -22,28 +28,39 @@ #include "modules/ircv3_batch.h" #include "modules/server.h" +typedef insp::flat_map HistoryTagMap; + struct HistoryItem { time_t ts; std::string text; + MessageType type; + HistoryTagMap tags; std::string sourcemask; - HistoryItem(User* source, const std::string& Text) + HistoryItem(User* source, const MessageDetails& details) : ts(ServerInstance->Time()) - , text(Text) + , text(details.text) + , type(details.type) , sourcemask(source->GetFullHost()) { + tags.reserve(details.tags_out.size()); + for (ClientProtocol::TagMap::const_iterator iter = details.tags_out.begin(); iter != details.tags_out.end(); ++iter) + tags[iter->first] = iter->second.value; } }; struct HistoryList { std::deque lines; - unsigned int maxlen, maxtime; - std::string param; + unsigned int maxlen; + unsigned int maxtime; - HistoryList(unsigned int len, unsigned int time, const std::string& oparam) - : maxlen(len), maxtime(time), param(oparam) { } + HistoryList(unsigned int len, unsigned int time) + : maxlen(len) + , maxtime(time) + { + } }; class HistoryMode : public ParamMode > @@ -53,6 +70,7 @@ class HistoryMode : public ParamMode > HistoryMode(Module* Creator) : ParamMode >(Creator, "history", 'H') { + syntax = ":"; } ModeAction OnSet(User* source, Channel* channel, std::string& parameter) CXX11_OVERRIDE @@ -90,43 +108,88 @@ class HistoryMode : public ParamMode > history->maxlen = len; history->maxtime = time; - history->param = parameter; } else { - ext.set(channel, new HistoryList(len, time, parameter)); + ext.set(channel, new HistoryList(len, time)); } return MODEACTION_ALLOW; } void SerializeParam(Channel* chan, const HistoryList* history, std::string& out) { - out.append(history->param); + out.append(ConvToStr(history->maxlen)); + out.append(":"); + out.append(InspIRCd::DurationString(history->maxtime)); } }; class ModuleChanHistory : public Module - , public ServerEventListener + , public ServerProtocol::BroadcastEventListener { + private: HistoryMode m; - bool sendnotice; + bool prefixmsg; UserModeReference botmode; bool dobots; IRCv3::Batch::CapReference batchcap; IRCv3::Batch::API batchmanager; IRCv3::Batch::Batch batch; IRCv3::ServerTime::API servertimemanager; + ClientProtocol::MessageTagEvent tagevent; + + void AddTag(ClientProtocol::Message& msg, const std::string& tagkey, std::string& tagval) + { + const Events::ModuleEventProvider::SubscriberList& list = tagevent.GetSubscribers(); + for (Events::ModuleEventProvider::SubscriberList::const_iterator i = list.begin(); i != list.end(); ++i) + { + ClientProtocol::MessageTagProvider* const tagprov = static_cast(*i); + const ModResult res = tagprov->OnProcessTag(ServerInstance->FakeClient, tagkey, tagval); + if (res == MOD_RES_ALLOW) + msg.AddTag(tagkey, tagprov, tagval); + else if (res == MOD_RES_DENY) + break; + } + } + + void SendHistory(LocalUser* user, Channel* channel, HistoryList* list, time_t mintime) + { + if (batchmanager) + { + batchmanager->Start(batch); + batch.GetBatchStartMessage().PushParamRef(channel->name); + } + + for(std::deque::iterator i = list->lines.begin(); i != list->lines.end(); ++i) + { + HistoryItem& item = *i; + if (item.ts >= mintime) + { + ClientProtocol::Messages::Privmsg msg(ClientProtocol::Messages::Privmsg::nocopy, item.sourcemask, channel, item.text, item.type); + for (HistoryTagMap::iterator iter = item.tags.begin(); iter != item.tags.end(); ++iter) + AddTag(msg, iter->first, iter->second); + if (servertimemanager) + servertimemanager->Set(msg, item.ts); + batch.AddToBatch(msg); + user->Send(ServerInstance->GetRFCEvents().privmsg, msg); + } + } + + if (batchmanager) + batchmanager->End(batch); + } public: ModuleChanHistory() - : ServerEventListener(this) + : ServerProtocol::BroadcastEventListener(this) , m(this) , botmode(this, "bot") , batchcap(this) , batchmanager(this) , batch("chathistory") , servertimemanager(this) + , tagevent(this) { } @@ -134,7 +197,7 @@ class ModuleChanHistory { ConfigTag* tag = ServerInstance->Config->ConfValue("chanhistory"); m.maxlines = tag->getUInt("maxlines", 50, 1); - sendnotice = tag->getBool("notice", true); + prefixmsg = tag->getBool("prefixmsg", tag->getBool("notice", true)); dobots = tag->getBool("bots", true); } @@ -145,13 +208,14 @@ class ModuleChanHistory void OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details) CXX11_OVERRIDE { - if ((target.type == MessageTarget::TYPE_CHANNEL) && (target.status == 0) && (details.type == MSG_PRIVMSG)) + std::string ctcpname; + if ((target.type == MessageTarget::TYPE_CHANNEL) && (target.status == 0) && (!details.IsCTCP(ctcpname) || irc::equals(ctcpname, "ACTION"))) { Channel* c = target.Get(); HistoryList* list = m.ext.get(c); if (list) { - list->lines.push_back(HistoryItem(user, details.text)); + list->lines.push_back(HistoryItem(user, details)); if (list->lines.size() > list->maxlen) list->lines.pop_front(); } @@ -170,44 +234,25 @@ class ModuleChanHistory HistoryList* list = m.ext.get(memb->chan); if (!list) return; - time_t mintime = 0; - if (list->maxtime) - mintime = ServerInstance->Time() - list->maxtime; - if ((sendnotice) && (!batchcap.get(localuser))) + if ((prefixmsg) && (!batchcap.get(localuser))) { std::string message("Replaying up to " + ConvToStr(list->maxlen) + " lines of pre-join history"); if (list->maxtime > 0) - message.append(" spanning up to " + ConvToStr(list->maxtime) + " seconds"); + message.append(" from the last " + InspIRCd::DurationString(list->maxtime)); memb->WriteNotice(message); } - if (batchmanager) - { - batchmanager->Start(batch); - batch.GetBatchStartMessage().PushParamRef(memb->chan->name); - } - - for(std::deque::iterator i = list->lines.begin(); i != list->lines.end(); ++i) - { - const HistoryItem& item = *i; - if (item.ts >= mintime) - { - ClientProtocol::Messages::Privmsg msg(ClientProtocol::Messages::Privmsg::nocopy, item.sourcemask, memb->chan, item.text); - if (servertimemanager) - servertimemanager->Set(msg, item.ts); - batch.AddToBatch(msg); - localuser->Send(ServerInstance->GetRFCEvents().privmsg, msg); - } - } + time_t mintime = 0; + if (list->maxtime) + mintime = ServerInstance->Time() - list->maxtime; - if (batchmanager) - batchmanager->End(batch); + SendHistory(localuser, memb->chan, list, mintime); } Version GetVersion() CXX11_OVERRIDE { - return Version("Provides channel mode +H, allows for the channel message history to be replayed on join", VF_VENDOR); + return Version("Adds channel mode H (history) which allows message history to be viewed on joining the channel.", VF_VENDOR); } };