ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-09 10:39:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'insp3' into master.

Browse Source
This commit is contained in:
Sadie Powell 2023-07-15 13:05:57 +01:00
commit 75c17e87b6
10 changed files with 53 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make/template/inspircd.1
View File

@ -1,7 +1,7 @@
.\"
.\" InspIRCd -- Internet Relay Chat Daemon
.\"
.\" Copyright (C) 2014, 2018, 2022 Sadie Powell <sadie@witchery.services>
.\" Copyright (C) 2014, 2018, 2023 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

2
make/template/main.mk
View File

@ -3,7 +3,7 @@
# InspIRCd -- Internet Relay Chat Daemon
#
# Copyright (C) 2018 Puck Meerburg <puck@puckipedia.com>
# Copyright (C) 2012-2022 Sadie Powell <sadie@witchery.services>
# Copyright (C) 2012-2023 Sadie Powell <sadie@witchery.services>
# Copyright (C) 2012, 2015-2016 Attila Molnar <attilamolnar@hush.com>
# Copyright (C) 2012 Robby <robby@chatbelgie.be>
# Copyright (C) 2012 Christoph Egger <christoph@debian.org>

2
src/configparser.cpp
View File

@ -2,7 +2,7 @@
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
* Copyright (C) 2013-2014, 2016-2022 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2013-2014, 2016-2023 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2013 ChrisTX <xpipe@hotmail.de>
* Copyright (C) 2012-2014 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2012 Robby <robby@chatbelgie.be>

2
src/modules/m_filter.cpp
View File

@ -8,7 +8,7 @@
* Copyright (C) 2018 Michael Hazell <michaelhazell@hotmail.com>
* Copyright (C) 2017 B00mX0r <b00mx0r@aureus.pw>
* Copyright (C) 2012-2014, 2016 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2012-2013, 2017-2022 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2012-2013, 2017-2023 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2012, 2018-2019 Robby <robby@chatbelgie.be>
* Copyright (C) 2011 Adam <Adam@anope.org>
* Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>

2
src/modules/m_geoclass.cpp
View File

@ -1,7 +1,7 @@
/*
* InspIRCd -- Internet Relay Chat Daemon
*
* Copyright (C) 2019-2020 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2019-2020, 2023 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

2
src/modules/m_noctcp.cpp
View File

@ -3,7 +3,7 @@
*
* Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
* Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
* Copyright (C) 2013, 2017-2021 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2013, 2017-2021, 2023 Sadie Powell <sadie@witchery.services>
* Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
* Copyright (C) 2012 Attila Molnar <attilamolnar@hush.com>
* Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>

2
src/modules/m_watch.cpp
View File

@ -199,6 +199,8 @@ private:
void Online(User* user)
{
SendAlert(user, user->nick, RPL_LOGON, "arrived online", user->nickchanged);
if (!user->awaymsg.empty())
OnUserAway(user);
}
void Offline(User* user, const std::string& nick)

4
tools/mkheaders
View File

@ -2,7 +2,7 @@
#
# InspIRCd -- Internet Relay Chat Daemon
#
# Copyright (C) 2020-2022 Sadie Powell <sadie@witchery.services>
# Copyright (C) 2020-2023 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
@ -87,7 +87,7 @@ for my $path (@paths) {
for my $line (<$fh>) {
$linenum += 1;
chomp $line;
if ($line =~ /^([^0-9A-Za-z]+\s)Copyright\s+\(C\)\s+[^<]+(\s+<[^>]+>)?$/) {
if ($line =~ /^([^0-9A-Za-z]+\s)Copyright\s+\(C\)\s+[^<]+(\s+<[^>]+>)?[\r\s]*$/) {
$copyright = scalar @lines;
$indent = $1;
} else {

22
win/CMakeLists.txt
View File

@ -1,3 +1,25 @@
#
# InspIRCd -- Internet Relay Chat Daemon
#
# Copyright (C) 2019 Robby <robby@chatbelgie.be>
# Copyright (C) 2015, 2018-2019, 2022 Sadie Powell <sadie@witchery.services>
# Copyright (C) 2013-2014, 2017 Adam <Adam@anope.org>
# Copyright (C) 2013-2014 Attila Molnar <attilamolnar@hush.com>
#
# 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
# License as published by the Free Software Foundation, version 2.
#
# This program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
# details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
cmake_minimum_required(VERSION 3.8 FATAL_ERROR)
project(InspIRCd CXX)

21
win/modules/CMakeLists.txt
View File

@ -1,3 +1,24 @@
#
# InspIRCd -- Internet Relay Chat Daemon
#
# Copyright (C) 2021-2022 Sadie Powell <sadie@witchery.services>
# Copyright (C) 2013-2014 Attila Molnar <attilamolnar@hush.com>
# Copyright (C) 2013 Adam <Adam@anope.org>
#
# 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
# License as published by the Free Software Foundation, version 2.
#
# This program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
# details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# These modules can always be built on all platforms.
file(GLOB INSPIRCD_MODULES
"${INSPIRCD_BASE}/src/coremods/core_*"