diff options
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/m_banredirect.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_conn_join.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_operjoin.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_redirect.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_sajoin.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/treesocket1.cpp | 18 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/treesocket2.cpp | 2 |
7 files changed, 10 insertions, 20 deletions
diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp index 88d4872ce..1564cef57 100644 --- a/src/modules/m_banredirect.cpp +++ b/src/modules/m_banredirect.cpp @@ -285,7 +285,7 @@ class ModuleBanRedirect : public Module else { user->WriteServ("470 %s :You are banned from %s. You are being automatically redirected to %s", user->nick, chan->name, redir->targetchan.c_str()); - chanrec::JoinUser(Srv, user, redir->targetchan.c_str(), false); + chanrec::JoinUser(Srv, user, redir->targetchan.c_str(), false, ""); return 1; } } diff --git a/src/modules/m_conn_join.cpp b/src/modules/m_conn_join.cpp index 9a7fdca7a..75415d6a5 100644 --- a/src/modules/m_conn_join.cpp +++ b/src/modules/m_conn_join.cpp @@ -88,7 +88,7 @@ class ModuleConnJoin : public Module for(std::vector<std::string>::iterator it = Joinchans.begin(); it != Joinchans.end(); it++) if (ServerInstance->IsChannel(it->c_str())) - chanrec::JoinUser(ServerInstance, user, it->c_str(), false); + chanrec::JoinUser(ServerInstance, user, it->c_str(), false, ""); } }; diff --git a/src/modules/m_operjoin.cpp b/src/modules/m_operjoin.cpp index 09ddb47b9..4308068e3 100644 --- a/src/modules/m_operjoin.cpp +++ b/src/modules/m_operjoin.cpp @@ -89,7 +89,7 @@ class ModuleOperjoin : public Module for(std::vector<std::string>::iterator it = operChans.begin(); it != operChans.end(); it++) if (ServerInstance->IsChannel(it->c_str())) - chanrec::JoinUser(ServerInstance, user, it->c_str(), false); + chanrec::JoinUser(ServerInstance, user, it->c_str(), false, ""); } }; diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp index cf0174cc6..9cba183fe 100644 --- a/src/modules/m_redirect.cpp +++ b/src/modules/m_redirect.cpp @@ -137,7 +137,7 @@ class ModuleRedirect : public Module } user->WriteServ("470 %s :%s has become full, so you are automatically being transferred to the linked channel %s", user->nick, cname, channel.c_str()); - chanrec::JoinUser(ServerInstance, user, channel.c_str(), false); + chanrec::JoinUser(ServerInstance, user, channel.c_str(), false, ""); return 1; } } diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp index caf3dc6d2..a2c710ec3 100644 --- a/src/modules/m_sajoin.cpp +++ b/src/modules/m_sajoin.cpp @@ -49,7 +49,7 @@ class cmd_sajoin : public command_t return CMD_FAILURE; } - chanrec::JoinUser(ServerInstance, dest, parameters[1], true); + chanrec::JoinUser(ServerInstance, dest, parameters[1], true, ""); /* Fix for dotslasher and w00t - if the join didnt succeed, return CMD_FAILURE so that it doesnt propogate */ chanrec* n = ServerInstance->FindChan(parameters[1]); diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp index f0fd0e1ef..008f0c98a 100644 --- a/src/modules/m_spanningtree/treesocket1.cpp +++ b/src/modules/m_spanningtree/treesocket1.cpp @@ -756,7 +756,10 @@ bool TreeSocket::ForceJoin(const std::string &source, std::deque<std::string> &p /* Finally, we can actually place the user into the channel. * We're sure its right. Final answer, phone a friend. */ - chanrec::JoinUser(this->Instance, who, channel.c_str(), true, ""); + if (created) + chanrec::JoinUser(this->Instance, who, channel.c_str(), true, "", TS); + else + chanrec::JoinUser(this->Instance, who, channel.c_str(), true, ""); /* Have we already queued up MAXMODES modes with parameters * (+qaohv) ready to be sent to the server? */ @@ -838,19 +841,6 @@ bool TreeSocket::ForceJoin(const std::string &source, std::deque<std::string> &p for (unsigned int f = 2; f < modectr; f++) free(mode_users[f]); } - /* if we newly created the channel, set it's TS properly. */ - if (created) - { - /* find created channel .. */ - chan = this->Instance->FindChan(channel); - if (chan) - /* w00t said this shouldnt be needed but it is. - * This isnt strictly true, as chan can be NULL - * if a nick collision has occured and therefore - * the channel was never created. - */ - chan->age = TS; - } /* All done. That wasnt so bad was it, you can wipe * the sweat from your forehead now. :-) */ diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp index e4d53c8ef..72c439ebe 100644 --- a/src/modules/m_spanningtree/treesocket2.cpp +++ b/src/modules/m_spanningtree/treesocket2.cpp @@ -335,7 +335,7 @@ bool TreeSocket::ServiceJoin(const std::string &prefix, std::deque<std::string> { /* only join if it's local, otherwise just pass it on! */ if (IS_LOCAL(u)) - chanrec::JoinUser(this->Instance, u, params[1].c_str(), false); + chanrec::JoinUser(this->Instance, u, params[1].c_str(), false, "", Instance->Time()); Utils->DoOneToAllButSender(prefix,"SVSJOIN",params,prefix); } return true; |