Merge pull request #3656 from thelounge/xpaw/self-ctcp

Ignore echoed ctcp requests that aren't targeted at us
This commit is contained in:
Pavel Djundik 2020-01-02 10:46:03 +02:00 committed by GitHub
commit c6f77f0668
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -49,6 +49,16 @@ module.exports = function(irc, network) {
"ctcp request", "ctcp request",
_.throttle( _.throttle(
(data) => { (data) => {
// Ignore echoed ctcp requests that aren't targeted at us
// See https://github.com/kiwiirc/irc-framework/issues/225
if (
data.nick === irc.user.nick &&
data.nick !== data.target &&
network.irc.network.cap.isEnabled("echo-message")
) {
return;
}
const shouldIgnore = network.ignoreList.some(function(entry) { const shouldIgnore = network.ignoreList.some(function(entry) {
return Helper.compareHostmask(entry, data); return Helper.compareHostmask(entry, data);
}); });