/*
* 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
{
private:
HistoryMode m;
- bool sendnotice;
+ bool prefixmsg;
UserModeReference botmode;
bool dobots;
IRCv3::Batch::CapReference batchcap;
{
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);
}
void OnUserPostMessage(User* user, const MessageTarget& target, const MessageDetails& details) CXX11_OVERRIDE
{
- if ((target.type == MessageTarget::TYPE_CHANNEL) && (target.status == 0))
+ 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)
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);
}
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);
}
};