X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_delayjoin.cpp;h=d58f07c2be5fd1f80ef43d19fe99688bdcce3a02;hb=HEAD;hp=d157b97bcc90461ebf39d3895aa031919a1d6b7c;hpb=4567a325b8cfc87ddf1aea1c0db7623d3b068931;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp index d157b97bc..d58f07c2b 100644 --- a/src/modules/m_delayjoin.cpp +++ b/src/modules/m_delayjoin.cpp @@ -1,10 +1,14 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2013, 2017-2019 Sadie Powell + * Copyright (C) 2012-2015, 2018 Attila Molnar + * Copyright (C) 2012, 2019 Robby * Copyright (C) 2010 Jens Voss + * Copyright (C) 2009 Matt Smith * Copyright (C) 2009 Daniel De Graaf * Copyright (C) 2008 Robin Burchell - * Copyright (C) 2007-2008 Craig Edwards + * Copyright (C) 2007-2008, 2010 Craig Edwards * * 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 @@ -21,16 +25,28 @@ #include "inspircd.h" +#include "modules/ctctags.h" +#include "modules/ircv3_servertime.h" +#include "modules/names.h" +#include "modules/who.h" class DelayJoinMode : public ModeHandler { + private: + LocalIntExt& unjoined; + IRCv3::ServerTime::API servertime; + public: - DelayJoinMode(Module* Parent) : ModeHandler(Parent, "delayjoin", 'D', PARAM_NONE, MODETYPE_CHANNEL) + DelayJoinMode(Module* Parent, LocalIntExt& ext) + : ModeHandler(Parent, "delayjoin", 'D', PARAM_NONE, MODETYPE_CHANNEL) + , unjoined(ext) + , servertime(Parent) { ranktoset = ranktounset = OP_VALUE; } ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE; + void RevealUser(User* user, Channel* chan); }; @@ -44,6 +60,7 @@ namespace */ class JoinHook : public ClientProtocol::EventHook { + private: const LocalIntExt& unjoined; public: @@ -56,8 +73,9 @@ class JoinHook : public ClientProtocol::EventHook ModResult OnPreEventSend(LocalUser* user, const ClientProtocol::Event& ev, ClientProtocol::MessageList& messagelist) CXX11_OVERRIDE { const ClientProtocol::Events::Join& join = static_cast(ev); - const User* const u = join.GetMember()->user; - if ((unjoined.get(u)) && (u != user)) + const Membership* const memb = join.GetMember(); + const User* const u = memb->user; + if ((unjoined.get(memb)) && (u != user)) return MOD_RES_DENY; return MOD_RES_PASSTHRU; } @@ -65,42 +83,40 @@ class JoinHook : public ClientProtocol::EventHook } -class ModuleDelayJoin : public Module +class ModuleDelayJoin + : public Module + , public CTCTags::EventListener + , public Names::EventListener + , public Who::EventListener { - DelayJoinMode djm; - void RevealUser(User* user, Channel* chan); public: LocalIntExt unjoined; JoinHook joinhook; + DelayJoinMode djm; ModuleDelayJoin() - : djm(this) + : CTCTags::EventListener(this) + , Names::EventListener(this) + , Who::EventListener(this) , unjoined("delayjoin", ExtensionItem::EXT_MEMBERSHIP, this) , joinhook(this, unjoined) + , djm(this, unjoined) { } Version GetVersion() CXX11_OVERRIDE; - ModResult OnNamesListItem(User* issuer, Membership*, std::string& prefixes, std::string& nick) CXX11_OVERRIDE; + ModResult OnNamesListItem(LocalUser* issuer, Membership*, std::string& prefixes, std::string& nick) CXX11_OVERRIDE; + ModResult OnWhoLine(const Who::Request& request, LocalUser* source, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE; void OnUserJoin(Membership*, bool, bool, CUList&) CXX11_OVERRIDE; void CleanUser(User* user); void OnUserPart(Membership*, std::string &partmessage, CUList&) CXX11_OVERRIDE; void OnUserKick(User* source, Membership*, const std::string &reason, CUList&) CXX11_OVERRIDE; void OnBuildNeighborList(User* source, IncludeChanList& include, std::map& exception) CXX11_OVERRIDE; void OnUserMessage(User* user, const MessageTarget& target, const MessageDetails& details) CXX11_OVERRIDE; + void OnUserTagMessage(User* user, const MessageTarget& target, const CTCTags::TagMessageDetails& details) CXX11_OVERRIDE; ModResult OnRawMode(User* user, Channel* channel, ModeHandler* mh, const std::string& param, bool adding) CXX11_OVERRIDE; }; -// TODO: make RevealUser accessible from DelayJoinMode and get rid of this. -class DummyMessageDetails : public MessageDetails -{ -public: - DummyMessageDetails() : MessageDetails(MSG_PRIVMSG, "", ClientProtocol::TagMap()) { } - bool IsCTCP(std::string& name, std::string& body) const CXX11_OVERRIDE { return false; } - bool IsCTCP(std::string&) const CXX11_OVERRIDE { return false; } - bool IsCTCP() const CXX11_OVERRIDE { return false; } -}; - ModeAction DelayJoinMode::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { /* no change */ @@ -113,13 +129,9 @@ ModeAction DelayJoinMode::OnModeChange(User* source, User* dest, Channel* channe * Make all users visible, as +D is being removed. If we don't do this, * they remain permanently invisible on this channel! */ - MessageTarget msgtarget(channel, 0); - DummyMessageDetails msgdetails; const Channel::MemberMap& users = channel->GetUsers(); for (Channel::MemberMap::const_iterator n = users.begin(); n != users.end(); ++n) - { - creator->OnUserMessage(n->first, msgtarget, msgdetails); - } + RevealUser(n->first, channel); } channel->SetMode(this, adding); return MODEACTION_ALLOW; @@ -127,10 +139,10 @@ ModeAction DelayJoinMode::OnModeChange(User* source, User* dest, Channel* channe Version ModuleDelayJoin::GetVersion() { - return Version("Allows for delay-join channels (+D) where users don't appear to join until they speak", VF_VENDOR); + return Version("Adds channel mode D (delayjoin) which hides JOIN messages from users until they speak.", VF_VENDOR); } -ModResult ModuleDelayJoin::OnNamesListItem(User* issuer, Membership* memb, std::string& prefixes, std::string& nick) +ModResult ModuleDelayJoin::OnNamesListItem(LocalUser* issuer, Membership* memb, std::string& prefixes, std::string& nick) { /* don't prevent the user from seeing themself */ if (issuer == memb->user) @@ -143,6 +155,23 @@ ModResult ModuleDelayJoin::OnNamesListItem(User* issuer, Membership* memb, std:: return MOD_RES_PASSTHRU; } +ModResult ModuleDelayJoin::OnWhoLine(const Who::Request& request, LocalUser* source, User* user, Membership* memb, Numeric::Numeric& numeric) +{ + // We don't need to do anything if they're not delayjoined. + if (!memb || !unjoined.get(memb)) + return MOD_RES_PASSTHRU; + + // Only show delayjoined users if the d flag has been specified. + if (!request.flags['d']) + return MOD_RES_DENY; + + // Add the < flag to mark the user as delayjoined. + size_t flag_index; + if (request.GetFieldIndex('f', flag_index)) + numeric.GetParams()[flag_index].push_back('<'); + return MOD_RES_PASSTHRU; +} + static void populate(CUList& except, Membership* memb) { const Channel::MemberMap& users = memb->chan->GetUsers(); @@ -157,7 +186,7 @@ static void populate(CUList& except, Membership* memb) void ModuleDelayJoin::OnUserJoin(Membership* memb, bool sync, bool created, CUList& except) { if (memb->chan->IsModeSet(djm)) - unjoined.set(memb, 1); + unjoined.set(memb, ServerInstance->Time()); } void ModuleDelayJoin::OnUserPart(Membership* memb, std::string &partmessage, CUList& except) @@ -184,29 +213,44 @@ void ModuleDelayJoin::OnBuildNeighborList(User* source, IncludeChanList& include } } +void ModuleDelayJoin::OnUserTagMessage(User* user, const MessageTarget& target, const CTCTags::TagMessageDetails& details) +{ + if (target.type != MessageTarget::TYPE_CHANNEL) + return; + + Channel* channel = target.Get(); + djm.RevealUser(user, channel); +} + void ModuleDelayJoin::OnUserMessage(User* user, const MessageTarget& target, const MessageDetails& details) { if (target.type != MessageTarget::TYPE_CHANNEL) return; Channel* channel = target.Get(); - RevealUser(user, channel); + djm.RevealUser(user, channel); } -void ModuleDelayJoin::RevealUser(User* user, Channel* chan) +void DelayJoinMode::RevealUser(User* user, Channel* chan) { Membership* memb = chan->GetUser(user); - if (!memb || !unjoined.set(memb, 0)) + if (!memb) + return; + + time_t jointime = unjoined.set(memb, 0); + if (!jointime) return; /* Display the join to everyone else (the user who joined got it earlier) */ CUList except_list; except_list.insert(user); ClientProtocol::Events::Join joinevent(memb); + if (servertime) + servertime->Set(joinevent, jointime); chan->Write(joinevent, 0, except_list); } -/* make the user visible if he receives any mode change */ +/* make the user visible if they receive any mode change */ ModResult ModuleDelayJoin::OnRawMode(User* user, Channel* channel, ModeHandler* mh, const std::string& param, bool adding) { if (!channel || param.empty()) @@ -225,7 +269,7 @@ ModResult ModuleDelayJoin::OnRawMode(User* user, Channel* channel, ModeHandler* if (!dest) return MOD_RES_PASSTHRU; - RevealUser(dest, channel); + djm.RevealUser(dest, channel); return MOD_RES_PASSTHRU; }