diff options
| author | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2007-11-09 21:51:48 +0000 |
|---|---|---|
| committer | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2007-11-09 21:51:48 +0000 |
| commit | b94c45340e153254f9dd06ecc3445222f31d0220 (patch) | |
| tree | 3f0dda82973d84bbbcf08c0e8e1115f89afc3be6 /include | |
| parent | c708d7a3c0defba07171a70c68636d0b14abf590 (diff) | |
Roadmap item "Fix jointhrottle to not try 'throttle' clients during a netmerge (requires changing join event to be aware of netmerge?)" -- 1.2 only
requires an extra parameter to OnUserJoin, bool sync. usually false, but FJOIN code during burst sets it to true.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8552 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'include')
| -rw-r--r-- | include/channels.h | 4 | ||||
| -rw-r--r-- | include/modules.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/channels.h b/include/channels.h index 0f947ac22..c49ac35d3 100644 --- a/include/channels.h +++ b/include/channels.h @@ -122,7 +122,7 @@ class CoreExport Channel : public Extensible /** Connect a Channel to a User */ - static Channel* ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const std::string &privs); + static Channel* ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const std::string &privs, bool bursting); /** Set default modes for the channel on creation */ @@ -375,7 +375,7 @@ class CoreExport Channel : public Extensible * been created if the channel did not exist before the user was joined to it. * If the user could not be joined to a channel, the return value may be NULL. */ - static Channel* JoinUser(InspIRCd* ServerInstance, User *user, const char* cn, bool override, const char* key, time_t TS = 0); + static Channel* JoinUser(InspIRCd* ServerInstance, User *user, const char* cn, bool override, const char* key, bool bursting, time_t TS = 0); /** Write to a channel, from a user, using va_args for text * @param user User whos details to prefix the line with diff --git a/include/modules.h b/include/modules.h index 598c0b4f6..112804524 100644 --- a/include/modules.h +++ b/include/modules.h @@ -458,8 +458,10 @@ class CoreExport Module : public Extensible * @param channel The channel being joined * @param silent Change this to true if you want to conceal the JOIN command from the other users * of the channel (useful for modules such as auditorium) + * @param sync This is set to true if the JOIN is the result of a network sync and the remote user is being introduced + * to a channel due to the network sync. */ - virtual void OnUserJoin(User* user, Channel* channel, bool &silent); + virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent); /** Called after a user joins a channel * Identical to OnUserJoin, but called immediately afterwards, when any linking module has |