X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fftopic.cpp;h=3c76c928aa6a7d773390547f5ee9b46e02516a32;hb=393cc8f9d65aefd92628115edae341562ea440e7;hp=bd15489a23ace769e44f5d4f5cd4c74e0ff8fbc1;hpb=7432fea968127b606fc029ae462e91d3f30df8a4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/ftopic.cpp b/src/modules/m_spanningtree/ftopic.cpp index bd15489a2..3c76c928a 100644 --- a/src/modules/m_spanningtree/ftopic.cpp +++ b/src/modules/m_spanningtree/ftopic.cpp @@ -28,19 +28,12 @@ CmdResult CommandFTopic::Handle(User* user, std::vector& params) if (!c) return CMD_FAILURE; - time_t ChanTS = ConvToInt(params[1]); - if (!ChanTS) - return CMD_INVALID; - - if (c->age < ChanTS) + if (c->age < ServerCommand::ExtractTS(params[1])) // Our channel TS is older, nothing to do return CMD_FAILURE; - time_t ts = ConvToInt(params[2]); - if (!ts) - return CMD_INVALID; - // Channel::topicset is initialized to 0 on channel creation, so their ts will always win if we never had a topic + time_t ts = ServerCommand::ExtractTS(params[2]); if (ts < c->topicset) return CMD_FAILURE;