diff options
-rw-r--r-- | Changes | 1 | ||||
-rw-r--r-- | src/channels.c | 12 | ||||
-rw-r--r-- | src/protocol/inspircd11.c | 2 | ||||
-rw-r--r-- | version.log | 6 |
4 files changed, 18 insertions, 3 deletions
@@ -53,6 +53,7 @@ Anope Version S V N Provided by Robin Burchell <w00t@inspircd.org> - 2008 08/08 F Strict warnings in send.c from comparing address of non-ptr [ #00] 08/08 F Removed sa-commands from inspircd protocol support. [ #00] +08/24 F InspIRCd FMODE timestamp issue. [#927] Provided by Christian Schroer <Christian.Schroer@coderschlampe.com> - 2008 07/20 F Updated Deutch language file. [#892] diff --git a/src/channels.c b/src/channels.c index aec70dfe8..87e6a8d05 100644 --- a/src/channels.c +++ b/src/channels.c @@ -583,8 +583,18 @@ void do_join(const char *source, int ac, char **av) if (check_kick(user, s, time(NULL))) continue; + time_t ts = time(NULL); + + if (ac == 2) { + if (debug) { + alog("debug: recieved a new TS for JOIN: %ld", + (long int) ts); + } + ts = strtoul(av[1], NULL, 10); + } + chan = findchan(s); - chan = join_user_update(user, chan, s, time(NULL)); + chan = join_user_update(user, chan, s, ts); chan_set_correct_modes(user, chan, 1); send_event(EVENT_JOIN_CHANNEL, 3, EVENT_STOP, source, s); diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c index a70044435..7f3cbb9e3 100644 --- a/src/protocol/inspircd11.c +++ b/src/protocol/inspircd11.c @@ -1297,7 +1297,7 @@ int anope_event_join(char *source, int ac, char **av) { if (ac != 2) return MOD_CONT; - do_join(source, 1, av); + do_join(source, ac, av); return MOD_CONT; } diff --git a/version.log b/version.log index ae2699fee..453b5db26 100644 --- a/version.log +++ b/version.log @@ -9,10 +9,14 @@ VERSION_MAJOR="1" VERSION_MINOR="7" VERSION_PATCH="21" VERSION_EXTRA="-svn" -VERSION_BUILD="1417" +VERSION_BUILD="1418" # $Log$ # +# BUILD : 1.7.21 (1418) +# BUGS : 927 +# NOTES : Applied a patch by w00t to store the timestamp supplied by insp in FJOIN on channel creation +# # BUILD : 1.7.21 (1417) # BUGS : # NOTES : Set SO_REUSEADDR on sock to prevent potential issues with bind() failing after a restart |