From b5bc17fba34044097844263641c0f612db75d466 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Wed, 22 Aug 2018 13:43:46 +0100 Subject: Send the 001-004 numerics and MOTD/LUSERS from core_info. Co-authored-by: Attila Molnar --- include/mode.h | 31 ------------------------------- include/numerics.h | 7 ------- 2 files changed, 38 deletions(-) (limited to 'include') diff --git a/include/mode.h b/include/mode.h index ac23adc33..fe02838b2 100644 --- a/include/mode.h +++ b/include/mode.h @@ -594,30 +594,12 @@ class CoreExport ModeParser : public fakederef */ ModeAction TryMode(User* user, User* targu, Channel* targc, Modes::Change& mcitem, bool SkipACL); - /** Returns a list of user or channel mode characters. - * Used for constructing the parts of the mode list in the 004 numeric. - * @param mt Controls whether to list user modes or channel modes - * @param needparam Return modes only if they require a parameter to be set - * @return The available mode letters that satisfy the given conditions - */ - std::string CreateModeList(ModeType mt, bool needparam = false); - - /** Recreate the cached mode list that is displayed in the 004 numeric - * in Cached004ModeList. - * Called when a mode handler is added or removed. - */ - void RecreateModeListFor004Numeric(); - /** Allocates an unused id for the given mode type, throws a ModuleException if out of ids. * @param mt The type of the mode to allocate the id for * @return The id */ ModeHandler::Id AllocateModeId(ModeType mt); - /** Cached mode list for use in 004 numeric - */ - TR1NS::array Cached004ModeList; - public: typedef std::vector ListModeList; typedef std::vector PrefixModeList; @@ -778,14 +760,6 @@ class CoreExport ModeParser : public fakederef */ PrefixMode* FindPrefix(unsigned const char pfxletter); - /** Returns an array of modes: - * 1. User modes - * 2. Channel modes - * 3. Channel modes that require a parameter when set - * This is sent to users as the last part of the 004 numeric - */ - const TR1NS::array& GetModeListFor004Numeric(); - /** Generates a list of modes, comma seperated by type: * 1; Listmodes EXCEPT those with a prefix * 2; Modes that take a param when adding or removing @@ -823,11 +797,6 @@ class CoreExport ModeParser : public fakederef void ShowListModeList(User* user, Channel* chan, ModeHandler* mh); }; -inline const TR1NS::array& ModeParser::GetModeListFor004Numeric() -{ - return Cached004ModeList; -} - inline PrefixMode* ModeHandler::IsPrefixMode() { return (this->type_id == MC_PREFIX ? static_cast(this) : NULL); diff --git a/include/numerics.h b/include/numerics.h index d1899b757..343f88252 100644 --- a/include/numerics.h +++ b/include/numerics.h @@ -35,13 +35,6 @@ */ enum { - /* - * Reply range of numerics. - */ - RPL_WELCOME = 1, // 2812, not 1459 - RPL_YOURHOSTIS = 2, // 2812, not 1459 - RPL_SERVERCREATED = 3, // 2812, not 1459 - RPL_SERVERVERSION = 4, // 2812, not 1459 RPL_ISUPPORT = 5, // not RFC, extremely common though (defined as RPL_BOUNCE in 2812, widely ignored) RPL_SNOMASKIS = 8, // unrealircd -- cgit v1.2.3