diff options
| author | rburchell <rburchell@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-02-09 21:01:05 +0000 |
|---|---|---|
| committer | rburchell <rburchell@5417fbe8-f217-4b02-8779-1006273d7864> | 2009-02-09 21:01:05 +0000 |
| commit | d7d01bdc5c667a1fafd95241282b58e03b4caa5b (patch) | |
| tree | f1482d8734da609923c6d8af6bc8fcb0fc187534 /src/protocol/ratbox.c | |
| parent | d49b3a25fda5f597491e73640dd1e76babc240eb (diff) | |
Squashed commit: merge next (1.9.1) back to trunk.
SVN users, NOTE: THIS WILL NOT BUILD, NOR SHOULD YOU RUN IT YET.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1953 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src/protocol/ratbox.c')
| -rw-r--r-- | src/protocol/ratbox.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c index fc5211e30..f99a0bd0e 100644 --- a/src/protocol/ratbox.c +++ b/src/protocol/ratbox.c @@ -150,7 +150,6 @@ IRCDCAPAB myIrcdcap[] = { 0, /* VHOST */ 0, /* SSJ3 */ 0, /* NICK2 */ - 0, /* UMODE2 */ 0, /* VL */ 0, /* TLKEXT */ 0, /* DODKEY */ @@ -577,7 +576,7 @@ class RatboxProto : public IRCDTS6Proto { BotInfo *bi = findbot(source); User *u = find_byuid(user); - send_cmd(bi ? bi->uid : source, "KILL %s :%s", u ? u->uid : user, buf); + send_cmd(bi ? bi->uid : source, "KILL %s :%s", u ? u->GetUID().c_str(): user, buf); } void SendSVSMode(User *u, int ac, const char **av) @@ -635,8 +634,10 @@ class RatboxProto : public IRCDTS6Proto void SendKickInternal(BotInfo *bi, const char *chan, const char *user, const char *buf) { User *u = finduser(user); - if (buf) send_cmd(bi->uid, "KICK %s %s :%s", chan, u ? u->uid : user, buf); - else send_cmd(bi->uid, "KICK %s %s", chan, u ? u->uid : user); + if (buf) send_cmd(bi->uid, "KICK %s %s :%s", chan, u ? u->GetUID().c_str() +: user, buf); + else send_cmd(bi->uid, "KICK %s %s", chan, u ? u->GetUID().c_str() +: user); } void SendNoticeChanopsInternal(BotInfo *source, const char *dest, const char *buf) @@ -667,7 +668,7 @@ class RatboxProto : public IRCDTS6Proto void SendInvite(BotInfo *source, const char *chan, const char *nick) { User *u = finduser(nick); - send_cmd(source->uid, "INVITE %s %s", u ? u->uid : nick, chan); + send_cmd(source->uid, "INVITE %s %s", u ? u->GetUID().c_str(): nick, chan); } int IsNickValid(const char *nick) |