diff options
| author | geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2007-12-28 19:12:02 +0000 |
|---|---|---|
| committer | geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b <geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864> | 2007-12-28 19:12:02 +0000 |
| commit | 4a5cf6e1e3a3e8031cc4980477c456ec684cb971 (patch) | |
| tree | 7ca35b3ff7a3897d10f7f56a78ea0c71eca4747f /src/protocol/charybdis.c | |
| parent | f8f64944c27f09a728f2c75d3b66ca7ce1e700ae (diff) | |
BUILD : 1.7.19 (1322) BUGS : 685 NOTES : Applied a patch by Jilles which should fix SJOIN not always sending the correct TS
git-svn-id: svn://svn.anope.org/anope/trunk@1322 31f1291d-b8d6-0310-a050-a5561fc1590b
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1040 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src/protocol/charybdis.c')
| -rw-r--r-- | src/protocol/charybdis.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c index d559e0941..317753945 100644 --- a/src/protocol/charybdis.c +++ b/src/protocol/charybdis.c @@ -907,16 +907,9 @@ void charybdis_cmd_unsqline(char *user) void charybdis_cmd_join(char *user, char *channel, time_t chantime) { Uid *ud; - time_t tstosend; - - /* Working around anope's TS brokenness, also making sure - * to *never* send an SJOIN with TS zero -- jilles */ - if (chantime == 0 || chantime == time(NULL)) - tstosend = 0x7FFFFFFF; - else - tstosend = chantime; + ud = find_uid(user); - send_cmd(NULL, "SJOIN %ld %s + :%s", (long int) tstosend, + send_cmd(NULL, "SJOIN %ld %s + :%s", (long int) chantime, channel, (UseTS6 ? (ud ? ud->uid : user) : user)); } |