X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_chanhistory.cpp;h=f689b292c1960adff28e31e974288cdad46a3b5a;hb=3151d60c1ecc9462e4c335282ee6c31672f45111;hp=8c73d4cd68dccabd2d85a63c763c3b7d56443a8b;hpb=038074d7c0f25ece31a6223214887ee56a1859de;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_chanhistory.cpp b/src/modules/m_chanhistory.cpp
index 8c73d4cd6..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 <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2013, 2017-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013 Daniel Vassdal <shutter@canternet.org>
+ *   Copyright (C) 2012-2015, 2018 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2010 Craig Edwards <brain@inspircd.org>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -28,16 +34,18 @@ struct HistoryItem
 {
 	time_t ts;
 	std::string text;
+	MessageType type;
 	HistoryTagMap tags;
 	std::string sourcemask;
 
-	HistoryItem(User* source, const std::string& Text, const ClientProtocol::TagMap& Tags)
+	HistoryItem(User* source, const MessageDetails& details)
 		: ts(ServerInstance->Time())
-		, text(Text)
+		, text(details.text)
+		, type(details.type)
 		, sourcemask(source->GetFullHost())
 	{
-		tags.reserve(Tags.size());
-		for (ClientProtocol::TagMap::const_iterator iter = Tags.begin(); iter != Tags.end(); ++iter)
+		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;
 	}
 };
@@ -122,7 +130,7 @@ class ModuleChanHistory
 {
  private:
 	HistoryMode m;
-	bool sendnotice;
+	bool prefixmsg;
 	UserModeReference botmode;
 	bool dobots;
 	IRCv3::Batch::CapReference batchcap;
@@ -158,7 +166,7 @@ class ModuleChanHistory
 			HistoryItem& item = *i;
 			if (item.ts >= mintime)
 			{
-				ClientProtocol::Messages::Privmsg msg(ClientProtocol::Messages::Privmsg::nocopy, item.sourcemask, channel, item.text);
+				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)
@@ -189,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);
 	}
 
@@ -200,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<Channel>();
 			HistoryList* list = m.ext.get(c);
 			if (list)
 			{
-				list->lines.push_back(HistoryItem(user, details.text, details.tags_out));
+				list->lines.push_back(HistoryItem(user, details));
 				if (list->lines.size() > list->maxlen)
 					list->lines.pop_front();
 			}
@@ -226,11 +235,11 @@ class ModuleChanHistory
 		if (!list)
 			return;
 
-		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 " + InspIRCd::DurationString(list->maxtime));
+				message.append(" from the last " + InspIRCd::DurationString(list->maxtime));
 			memb->WriteNotice(message);
 		}
 
@@ -243,7 +252,7 @@ class ModuleChanHistory
 
 	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);
 	}
 };