diff options
| author | Robin Burchell w00t@inspircd.org <Robin Burchell w00t@inspircd.org@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-10-02 16:03:16 +0000 |
|---|---|---|
| committer | Robin Burchell w00t@inspircd.org <Robin Burchell w00t@inspircd.org@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-10-02 16:03:16 +0000 |
| commit | e5051e4aa5cfc9e80ac965a6a82e4cab8d17387c (patch) | |
| tree | 0ccaead6e96584ebc2376604e5ca5c34c11b12b1 /src/chanserv.c | |
| parent | b7ed70140d6e755b49cdd3c4b9d85ec6abf30cd7 (diff) | |
Merge commit 'cbx/anopeng-uid' into anopeng-uid
Conflicts:
include/extern.h
include/services.h
src/protocol/bahamut.c
src/protocol/inspircd11.c
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1320 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src/chanserv.c')
| -rw-r--r-- | src/chanserv.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/chanserv.c b/src/chanserv.c index e6360e20e..b325bf6a6 100644 --- a/src/chanserv.c +++ b/src/chanserv.c @@ -1377,7 +1377,7 @@ int check_kick(User * user, const char *chan, time_t chants) ac = 3; } - do_cmode(whosends(ci), ac, av); + do_cmode(whosends(ci)->nick, ac, av); } anope_SendMode(whosends(ci), chan, "+b %s", mask); @@ -1432,7 +1432,7 @@ void restore_topic(const char *chan) * should be updated with a TOPIC from the IRCd soon. -GD */ ci->last_topic = NULL; - strscpy(ci->last_topic_setter, whosends(ci), NICKMAX); + strscpy(ci->last_topic_setter, whosends(ci)->nick, NICKMAX); ci->last_topic_time = time(NULL); return; } @@ -1444,7 +1444,7 @@ void restore_topic(const char *chan) c->topic_time = ci->last_topic_time; } else { c->topic = NULL; - strscpy(c->topic_setter, whosends(ci), NICKMAX); + strscpy(c->topic_setter, whosends(ci)->nick, NICKMAX); } if (ircd->join2set) { if (whosends(ci) == s_ChanServ) { @@ -1452,7 +1452,7 @@ void restore_topic(const char *chan) anope_SendMode(NULL, chan, "+o %s", s_ChanServ); } } - anope_cmd_topic(whosends(ci), c->name, c->topic_setter, + anope_cmd_topic(whosends(ci)->nick, c->name, c->topic_setter, c->topic ? c->topic : "", c->topic_time); if (ircd->join2set) { if (whosends(ci) == s_ChanServ) { @@ -1489,7 +1489,7 @@ int check_topiclock(Channel * c, time_t topic_time) c->topic = NULL; /* Bot assigned & Symbiosis ON?, the bot will set the topic - doc */ /* Altough whosends() also checks for BSMinUsers -GD */ - strscpy(c->topic_setter, whosends(ci), NICKMAX); + strscpy(c->topic_setter, whosends(ci)->nick, NICKMAX); } if (ircd->topictsforward) { @@ -1515,7 +1515,7 @@ int check_topiclock(Channel * c, time_t topic_time) } } - anope_cmd_topic(whosends(ci), c->name, c->topic_setter, + anope_cmd_topic(whosends(ci)->nick, c->name, c->topic_setter, c->topic ? c->topic : "", c->topic_time); if (ircd->join2set) { |