summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormark mark@31f1291d-b8d6-0310-a050-a5561fc1590b <mark mark@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2008-08-24 15:54:58 +0000
committermark mark@31f1291d-b8d6-0310-a050-a5561fc1590b <mark mark@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2008-08-24 15:54:58 +0000
commit10e0b81d3da0dcd86a39595abb6798ff7f0e3639 (patch)
tree9b92677e28983186de6b00bb07ce86c8b61ad77a /src
parent0030f51a2deb9ec8549f76c2a20311ac4d4e1b23 (diff)
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
git-svn-id: svn://svn.anope.org/anope/trunk@1418 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1133 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src')
-rw-r--r--src/channels.c12
-rw-r--r--src/protocol/inspircd11.c2
2 files changed, 12 insertions, 2 deletions
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;
}