X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_info%2Fcmd_info.cpp;h=66f5558e1daa2ab399623c717fd27ad2a021d598;hb=HEAD;hp=e014fa4f2b9e2303bc5a1db6f89bbd585aadfb2f;hpb=761e6d75ba37b984998952940ed681e79e456142;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/coremods/core_info/cmd_info.cpp b/src/coremods/core_info/cmd_info.cpp
index e014fa4f2..66f5558e1 100644
--- a/src/coremods/core_info/cmd_info.cpp
+++ b/src/coremods/core_info/cmd_info.cpp
@@ -1,10 +1,13 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2011 Jackmcbarn <jackmcbarn@jackmcbarn.no-ip.org>
+ *   Copyright (C) 2018-2021 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2015 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2013-2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2007-2015 Robin Burchell <robin+git@viroteck.net>
- *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2007, 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.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
@@ -24,74 +27,69 @@
 #include "core_info.h"
 
 CommandInfo::CommandInfo(Module* parent)
-	: Command(parent, "INFO")
+	: ServerTargetCommand(parent, "INFO")
 {
 	Penalty = 4;
 	syntax = "[<servername>]";
 }
 
 static const char* const lines[] = {
-	"                   -/\\- \2InspIRCd\2 -\\/-",
+	"                   -/\\- \002InspIRCd\002 -\\/-",
 	"                 November 2002 - Present",
 	" ",
-	"\2Core Developers\2:",
-	"    Attila Molnar,          Attila,     <attilamolnar@hush.com>",
-	"    Peter Powell,           SaberUK,    <petpow@saberuk.com>",
+	"\002Core Developers\002:",
+	"    Matt Schatz,            genius3000, <genius3000@g3k.solutions>",
+	"    Sadie Powell,           SadieCat,   <sadie@witchery.services>",
 	" ",
-	"\2Former Developers\2:",
-	"    Oliver Lupton,          Om,         <om@inspircd.org>",
-	"    John Brooks,            Special,    <special@inspircd.org>",
+	"\002Former Developers\002:",
+	"    Attila Molnar,          Attila,     <attilamolnar@hush.com>",
+	"    Daniel De Graaf,        danieldg,   <danieldg@inspircd.org>",
 	"    Dennis Friis,           peavey,     <peavey@inspircd.org>",
+	"    John Brooks,            Special,    <special@inspircd.org>",
+	"    Matt Smith,             dz,         <dz@inspircd.org>",
+	"    Oliver Lupton,          Om,         <om@inspircd.org>",
 	"    Thomas Stagner,         aquanight,  <aquanight@inspircd.org>",
 	"    Uli Schlachter,         psychon,    <psychon@inspircd.org>",
-	"    Matt Smith,             dz,         <dz@inspircd.org>",
-	"    Daniel De Graaf,        danieldg,   <danieldg@inspircd.org>",
 	" ",
-	"\2Founding Developers\2:",
+	"\002Founding Developers\002:",
 	"    Craig Edwards,          Brain,      <brain@inspircd.org>",
 	"    Craig McLure,           Craig,      <craig@inspircd.org>",
 	"    Robin Burchell,         w00t,       <w00t@inspircd.org>",
 	" ",
-	"\2Active Contributors\2:",
-	"    Adam           Shutter",
+	"\002Active Contributors\002:",
+	"   Adam            Robby",
 	" ",
-	"\2Former Contributors\2:",
-	"   dmb             Zaba            skenmy         GreenReaper",
-	"   Dan             Jason           satmd          owine",
-	"   Adremelech      John2           jilles         HiroP",
-	"   eggy            Bricker         AnMaster       djGrrr",
-	"   nenolod         Quension        praetorian     pippijn",
-	"   CC              jamie           typobox43      Burlex (win32)",
-	"   Stskeeps        ThaPrince       BuildSmart     Thunderhacker",
-	"   Skip            LeaChim         Majic          MacGyver",
-	"   Namegduf        Ankit           Phoenix        Taros",
-	"   jackmcbarn      ChrisTX         Shawn",
+	"\002Former Contributors\002:",
+	"   Adremelech      Ankit           AnMaster        Bricker",
+	"   BuildSmart      Burlex          CC              ChrisTX",
+	"   Dan             djGrrr          dmb             eggy",
+	"   GreenReaper     HiroP           jackmcbarn      jamie",
+	"   Jason           jilles          John2           kaniini",
+	"   LeaChim         linuxdaemon     MacGyver        majic",
+	"   Namegduf        owine           Phoenix         pippijn",
+	"   praetorian      Quension        satmd           Shawn",
+	"   Sheogorath      Shutter         skenmy          Skip",
+	"   Stskeeps        Taros           ThaPrince       Thunderhacker",
+	"   typobox43       Zaba",
 	" ",
-	"\2Thanks To\2:",
-	"   Asmo            Brik            fraggeln",
+	"\002Thanks To\002:",
+	"   Asmo            Brik            fraggeln        prawnsalad",
 	" ",
-	" Best experienced with: \2An IRC client\2",
+	" Best experienced with \002an IRC client\002",
 	NULL
 };
 
 /** Handle /INFO
  */
-CmdResult CommandInfo::Handle (const std::vector<std::string>& parameters, User *user)
+CmdResult CommandInfo::Handle(User* user, const Params& parameters)
 {
-	if (parameters.size() > 0 && parameters[0] != ServerInstance->Config->ServerName)
+	if (parameters.size() > 0 && !irc::equals(parameters[0], ServerInstance->Config->ServerName))
 		return CMD_SUCCESS;
 
 	int i=0;
 	while (lines[i])
 		user->WriteRemoteNumeric(RPL_INFO, lines[i++]);
-	FOREACH_MOD(OnInfo, (user));
+
 	user->WriteRemoteNumeric(RPL_ENDOFINFO, "End of /INFO list");
 	return CMD_SUCCESS;
 }
-
-RouteDescriptor CommandInfo::GetRouting(User* user, const std::vector<std::string>& parameters)
-{
-	if (parameters.size() > 0)
-		return ROUTE_UNICAST(parameters[0]);
-	return ROUTE_LOCALONLY;
-}