Merge branch 'insp4' into master.

12 files changed, 42 insertions, 44 deletions

diff --git a/modules/core/core_channel/cmd_names.cpp b/modules/core/core_channel/cmd_names.cpp
index b50f7fac3..5fae155a6 100644
--- a/modules/core/core_channel/cmd_names.cpp
+++ b/modules/core/core_channel/cmd_names.cpp
@@ -2,12 +2,11 @@
  * InspIRCd -- Internet Relay Chat Daemon
  *
  *   Copyright (C) 2021 Val Lorentz <progval+git@progval.net>
- *   Copyright (C) 2018-2022 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2018-2022, 2026 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2018 Dylan Frank <b00mx0r@aureus.pw>
  *   Copyright (C) 2013-2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
  *   Copyright (C) 2006, 2008 Craig Edwards <brain@inspircd.org>
  *
diff --git a/modules/core/core_channel/cmode_k.cpp b/modules/core/core_channel/cmode_k.cpp
index 35bc9cb59..28714333d 100644
--- a/modules/core/core_channel/cmode_k.cpp
+++ b/modules/core/core_channel/cmode_k.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2017, 2019-2023 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2017, 2019-2023, 2026 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2014 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Uli Schlachter <psychon@znc.in>
diff --git a/modules/core/core_channel/core_channel.cpp b/modules/core/core_channel/core_channel.cpp
index 2316011f8..c55d514d7 100644
--- a/modules/core/core_channel/core_channel.cpp
+++ b/modules/core/core_channel/core_channel.cpp
@@ -4,7 +4,7 @@
  *   Copyright (C) 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
  *   Copyright (C) 2018 Dylan Frank <b00mx0r@aureus.pw>
- *   Copyright (C) 2017-2024 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2017-2024, 2026 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2014-2015, 2018 Attila Molnar <attilamolnar@hush.com>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/core/core_channel/core_channel.h b/modules/core/core_channel/core_channel.h
index 25c71105d..c2516b6d5 100644
--- a/modules/core/core_channel/core_channel.h
+++ b/modules/core/core_channel/core_channel.h
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2017, 2019-2024 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2017, 2019-2024, 2026 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2014-2015 Attila Molnar <attilamolnar@hush.com>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
diff --git a/modules/core/core_channel/extban.cpp b/modules/core/core_channel/extban.cpp
index a37a58473..4af394067 100644
--- a/modules/core/core_channel/extban.cpp
+++ b/modules/core/core_channel/extban.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2020, 2022-2025 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2020, 2022-2026 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
diff --git a/modules/core/core_channel/modes.cpp b/modules/core/core_channel/modes.cpp
index f6a944873..d2e165a88 100644
--- a/modules/core/core_channel/modes.cpp
+++ b/modules/core/core_channel/modes.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2017, 2019, 2021-2023 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2017, 2019, 2021-2023, 2026 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2014 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
diff --git a/modules/core/core_info/cmd_commands.cpp b/modules/core/core_info/cmd_commands.cpp
index 36f747105..c08ce5036 100644
--- a/modules/core/core_info/cmd_commands.cpp
+++ b/modules/core/core_info/cmd_commands.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2017, 2020-2022, 2024-2025 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2017, 2020-2022, 2024-2026 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2014, 2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Uli Schlachter <psychon@znc.in>
diff --git a/modules/core/core_info/info.h b/modules/core/core_info/info.h
index be1259a22..a654596d2 100644
--- a/modules/core/core_info/info.h
+++ b/modules/core/core_info/info.h
@@ -26,38 +26,37 @@ static constexpr const char* const lines[] = {
 	"  Uli Schlachter (psychon)",
 	" ",
 	"\002Contributors\002:",
-	"  0x277F                      A_D                       Adrien Bustany  ",
-	"  Akinwale Ariwodola          Alyx                      Anatole Denis   ",
-	"  Andrio Celos                Ariadne Conill            Ben Harris      ",
-	"  blitmap                     Boleslaw Tokarski         burlex          ",
-	"  Chew                        Chin Lee                  Chris Novakovic ",
-	"  Christian Höltje            Christoph Egger           Christopher Holm",
-	"  Christos Triantafyllidis    ChrisTX                   Dan Parsons     ",
-	"  Daniel Vassdal              David Lamont              David Schultz   ",
-	"  delthas                     DjSlash                   Dominic Hamon   ",
-	"  Dylan Frank                 edef                      eggy            ",
-	"  ElementalAlchemist          Elizabeth Myers           emerson         ",
-	"  fez                         Filippo Cortigiani        Florian Praden  ",
-	"  Garrett Holmstrom           Geoff Bricker             Glen Miner      ",
-	"  Googolplexed                Guillaume Delacour        Hendrik Jäger   ",
-	"  Herman                      iwalkalone                jackmcbarn      ",
-	"  James Lu                    James Wheare              jamie           ",
-	"  JD Horelick                 Jens Voss                 Joel Sing       ",
-	"  Johanna A                   Jordyn                    Josh Soref      ",
-	"  Julien Vehent               JustArchi                 Justin Crawford ",
-	"  katsklaw                    Kyle Fuller               Larry Williamson",
-	"  linuxdaemon                 Mantas Mikulėnas          Marcus Rueckert ",
-	"  Matthew Martin              md_5                      Michael         ",
-	"  Michael Hazell              Molly Miller              newuser1        ",
-	"  nia                         Nicole Kleinhoff          PhilSliderS     ",
-	"  Pierre Carrier              Pippijn van Steenhoven    Puck Meerburg   ",
-	"  R-V6                        randomdan                 Renegade334     ",
-	"  Richard Bradfield           Robby                     satmd           ",
-	"  Shawn Smith                 Sheogorath                Steven Van Acker",
-	"  systocrat                   ThatOneRoadie             The Aviator     ",
-	"  Thiago Crepaldi             Thomas Fargeix            Tim Heckman     ",
-	"  typobox43                   Vitor Luis                Wade Cline      ",
-	"  WindowsUser",
+	"  0x277F                      A_D                   Adrien Bustany   ",
+	"  Akinwale Ariwodola          Alyx                  Anatole Denis    ",
+	"  Andrio Celos                Ariadne Conill        Ben Harris       ",
+	"  blitmap                     Boleslaw Tokarski     burlex           ",
+	"  Chew                        Chin Lee              Chris Novakovic  ",
+	"  Christian Höltje            Christoph Egger       Christopher Holm ",
+	"  Christos Triantafyllidis    ChrisTX               Dan Parsons      ",
+	"  Daniel Vassdal              David Lamont          David Schultz    ",
+	"  delthas                     DjSlash               Dominic Hamon    ",
+	"  Dylan Frank                 edef                  eggy             ",
+	"  ElementalAlchemist          Elizabeth Myers       emerson          ",
+	"  fez                         Filippo Cortigiani    Florian Praden   ",
+	"  Garrett Holmstrom           Geoff Bricker         Glen Miner       ",
+	"  Googolplexed                Guillaume Delacour    Hendrik Jäger    ",
+	"  Herman                      iwalkalone            jackmcbarn       ",
+	"  James Lu                    James Wheare          jamie            ",
+	"  JD Horelick                 Jens Voss             Joel Sing        ",
+	"  Johanna A                   Jordyn                Josh Soref       ",
+	"  Julien Vehent               JustArchi             Justin Crawford  ",
+	"  katsklaw                    Kyle Fuller           Larry Williamson ",
+	"  linuxdaemon                 Mantas Mikulėnas      Marcus Rueckert  ",
+	"  Matthew Martin              md_5                  Michael Hazell   ",
+	"  Molly Miller                newuser1              nia              ",
+	"  Nicole Kleinhoff            PhilSliderS           Pierre Carrier   ",
+	"  Pippijn van Steenhoven      Puck Meerburg         R-V6             ",
+	"  randomdan                   Renegade334           Richard Bradfield",
+	"  Robby                       satmd                 Shawn Smith      ",
+	"  Sheogorath                  Steven Van Acker      systocrat        ",
+	"  ThatOneRoadie               The Aviator           Thiago Crepaldi  ",
+	"  Thomas Fargeix              Tim Heckman           typobox43        ",
+	"  Vitor Luis                  Wade Cline            WindowsUser",
 	" ",
 	"\002Special Thanks\002:",
 	"  Asmo    Brik    Daniel Oaks (dan-)    Darren Whitlen (prawnsalad)    Duck",
diff --git a/modules/core/core_info/isupport.cpp b/modules/core/core_info/isupport.cpp
index 79ada5121..ac1d68593 100644
--- a/modules/core/core_info/isupport.cpp
+++ b/modules/core/core_info/isupport.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2020-2025 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2020-2026 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
diff --git a/modules/core/core_list.cpp b/modules/core/core_list.cpp
index bd727159f..6e703c72a 100644
--- a/modules/core/core_list.cpp
+++ b/modules/core/core_list.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2017-2024 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2017-2024, 2026 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2015 Daniel Vassdal <shutter@canternet.org>
  *   Copyright (C) 2013-2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
diff --git a/modules/core/core_oper/cmd_restart.cpp b/modules/core/core_oper/cmd_restart.cpp
index 48fa42590..7dc9481a0 100644
--- a/modules/core/core_oper/cmd_restart.cpp
+++ b/modules/core/core_oper/cmd_restart.cpp
@@ -2,7 +2,7 @@
  * InspIRCd -- Internet Relay Chat Daemon
  *
  *   Copyright (C) 2018-2020, 2022-2023 Sadie Powell <sadie@witchery.services>
- *   Copyright (C) 2017 Jordyn/The Linux Geek <onlinecloud1@gmail.com>
+ *   Copyright (C) 2017 Jordyn <onlinecloud1@gmail.com>
  *   Copyright (C) 2012, 2014-2015 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Uli Schlachter <psychon@znc.in>
diff --git a/modules/core/core_user/cmd_user.cpp b/modules/core/core_user/cmd_user.cpp
index a7f057324..20fdb94a0 100644
--- a/modules/core/core_user/cmd_user.cpp
+++ b/modules/core/core_user/cmd_user.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2017-2018, 2020, 2022-2024 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2017-2018, 2020, 2022, 2024, 2026 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2014-2015 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>