summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAttila Molnar <attilamolnar@hush.com>2015-01-09 14:50:21 +0100
committerAttila Molnar <attilamolnar@hush.com>2015-01-09 14:50:21 +0100
commit853bfabbc777a3943f4de0436d87ea09a9863568 (patch)
tree172f53eeb82e6c695110b7638053e3804a4135cc
parent0e5fb98a6b82af738f6d5c3093d9597d470be3a6 (diff)
m_spanningtree Add source server parameter to CommandFJOIN::Builder constructor
Default it to this server
-rw-r--r--src/modules/m_spanningtree/commands.h2
-rw-r--r--src/modules/m_spanningtree/fjoin.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/m_spanningtree/commands.h b/src/modules/m_spanningtree/commands.h
index 89bd2bfee..c0043f0a4 100644
--- a/src/modules/m_spanningtree/commands.h
+++ b/src/modules/m_spanningtree/commands.h
@@ -144,7 +144,7 @@ class CommandFJoin : public ServerCommand
std::string::size_type pos;
public:
- Builder(Channel* chan);
+ Builder(Channel* chan, TreeServer* source = Utils->TreeRoot);
void add(Membership* memb);
bool has_room(Membership* memb) const;
void clear();
diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp
index bfe3592d2..f0d804880 100644
--- a/src/modules/m_spanningtree/fjoin.cpp
+++ b/src/modules/m_spanningtree/fjoin.cpp
@@ -237,8 +237,8 @@ void CommandFJoin::LowerTS(Channel* chan, time_t TS, const std::string& newname)
chan->topicset = 0;
}
-CommandFJoin::Builder::Builder(Channel* chan)
- : CmdBuilder("FJOIN")
+CommandFJoin::Builder::Builder(Channel* chan, TreeServer* source)
+ : CmdBuilder(source->GetID(), "FJOIN")
{
push(chan->name).push_int(chan->age).push_raw(" +");
pos = str().size();