From dce58b1611e275118d418bfb3b4402bd14d279dd Mon Sep 17 00:00:00 2001 From: danieldg Date: Mon, 18 Jan 2010 23:49:23 +0000 Subject: Move lots of spanningtree items to commands git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12296 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_spanningtree/ftopic.cpp | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) (limited to 'src/modules/m_spanningtree/ftopic.cpp') diff --git a/src/modules/m_spanningtree/ftopic.cpp b/src/modules/m_spanningtree/ftopic.cpp index 0753fa17b..2413a67d3 100644 --- a/src/modules/m_spanningtree/ftopic.cpp +++ b/src/modules/m_spanningtree/ftopic.cpp @@ -12,20 +12,15 @@ */ #include "inspircd.h" -#include "xline.h" +#include "commands.h" #include "treesocket.h" #include "treeserver.h" #include "utils.h" -/* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */ - - /** FTOPIC command */ -bool TreeSocket::ForceTopic(const std::string &source, parameterlist ¶ms) +CmdResult CommandFTopic::Handle(const std::vector& params, User *user) { - if (params.size() != 4) - return true; time_t ts = atoi(params[1].c_str()); Channel* c = ServerInstance->FindChan(params[0]); if (c) @@ -34,30 +29,16 @@ bool TreeSocket::ForceTopic(const std::string &source, parameterlist ¶ms) { if (c->topic != params[3]) { - User* user = ServerInstance->FindNick(source); // Update topic only when it differs from current topic c->topic.assign(params[3], 0, ServerInstance->Config->Limits.MaxTopic); - if (!user) - { - std::string sourceserv = Utils->FindServer(source)->GetName(); - c->WriteChannelWithServ(sourceserv.c_str(), "TOPIC %s :%s", c->name.c_str(), c->topic.c_str()); - } - else - { - c->WriteChannel(user, "TOPIC %s :%s", c->name.c_str(), c->topic.c_str()); - } + c->WriteChannel(user, "TOPIC %s :%s", c->name.c_str(), c->topic.c_str()); } // Always update setter and settime. c->setby.assign(params[2], 0, 127); c->topicset = ts; - - /* all done, send it on its way */ - params[3] = ":" + params[3]; - Utils->DoOneToAllButSender(source,"FTOPIC",params,source); } - } - return true; + return CMD_SUCCESS; } -- cgit v1.3.1-10-gc9f91