From 3ef1e42e3c82c5799864a20f88954e828f28def3 Mon Sep 17 00:00:00 2001 From: Michael Poole Date: Wed, 17 Aug 2005 01:57:03 +0000 Subject: [PATCH] Switch more uses of &me to &his for channel localcasts. git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1457 c9e4aea6-c8fd-4c43-8297-357d70d61c8c --- ChangeLog | 15 +++++++++++++++ ircd/channel.c | 2 +- ircd/m_burst.c | 2 +- ircd/m_invite.c | 4 ++-- ircd/s_user.c | 4 ++-- 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7e07712..67ca31e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2005-08-16 Michael Poole + + * ircd/channel.c (joinbuf_join): Switch to &his instead of &me for + announcements to local users in a channel. + + * ircd/m_burst.c (ms_burst): Likewise. + + * ircd/m_invite.c (m_invite): Likewise. + (ms_invite): Likewise. + +2005-08-16 Jukka Ollila + + * ircd/s_user.c (hide_hostmask): Use HIS_SERVERNAME instead of the + real thing for the post-mode-x rejoin. + 2005-08-15 Michael Poole * include/supported.h (FEATURESVALUES2): Add +d channel mode. diff --git a/ircd/channel.c b/ircd/channel.c index f29c124..fcf1d3a 100644 --- a/ircd/channel.c +++ b/ircd/channel.c @@ -3424,7 +3424,7 @@ joinbuf_join(struct JoinBuf *jbuf, struct Channel *chan, unsigned int flags) /* send an op, too, if needed */ if (flags & CHFL_CHANOP && (oplevel < MAXOPLEVEL || !MyUser(jbuf->jb_source))) - sendcmdto_channel_butserv_butone((chan->mode.apass[0] ? &me : jbuf->jb_source), + sendcmdto_channel_butserv_butone((chan->mode.apass[0] ? &his : jbuf->jb_source), CMD_MODE, chan, NULL, 0, "%H +o %C", chan, jbuf->jb_source); } else if (MyUser(jbuf->jb_source)) diff --git a/ircd/m_burst.c b/ircd/m_burst.c index 79cce5a..6cddc47 100644 --- a/ircd/m_burst.c +++ b/ircd/m_burst.c @@ -306,7 +306,7 @@ int ms_burst(struct Client *cptr, struct Client *sptr, int parc, char *parv[]) *chptr->topic = '\0'; *chptr->topic_nick = '\0'; chptr->topic_time = 0; - sendcmdto_channel_butserv_butone(&me, CMD_TOPIC, chptr, NULL, 0, + sendcmdto_channel_butserv_butone(&his, CMD_TOPIC, chptr, NULL, 0, "%H :%s", chptr, chptr->topic); } } else if (chptr->creationtime == timestamp) { diff --git a/ircd/m_invite.c b/ircd/m_invite.c index a83b41e..e5270f2 100644 --- a/ircd/m_invite.c +++ b/ircd/m_invite.c @@ -188,7 +188,7 @@ int m_invite(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) if (!IsLocalChannel(chptr->chname) || MyConnect(acptr)) { if (feature_bool(FEAT_ANNOUNCE_INVITES)) { /* Announce to channel operators. */ - sendcmdto_channel_butserv_butone(&me, get_error_numeric(RPL_ISSUEDINVITE)->str, + sendcmdto_channel_butserv_butone(&his, get_error_numeric(RPL_ISSUEDINVITE)->str, NULL, chptr, sptr, SKIP_NONOPS, "%H %C %C :%C has been invited by %C", chptr, acptr, sptr, acptr, sptr); @@ -292,7 +292,7 @@ int ms_invite(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) if (feature_bool(FEAT_ANNOUNCE_INVITES)) { /* Announce to channel operators. */ - sendcmdto_channel_butserv_butone(&me, get_error_numeric(RPL_ISSUEDINVITE)->str, + sendcmdto_channel_butserv_butone(&his, get_error_numeric(RPL_ISSUEDINVITE)->str, NULL, chptr, sptr, SKIP_NONOPS, "%H %C %C :%C has been invited by %C", chptr, acptr, sptr, acptr, sptr); diff --git a/ircd/s_user.c b/ircd/s_user.c index aac289f..7d9faaf 100644 --- a/ircd/s_user.c +++ b/ircd/s_user.c @@ -1184,11 +1184,11 @@ hide_hostmask(struct Client *cptr, unsigned int flag) sendcmdto_channel_butserv_butone(cptr, CMD_JOIN, chan->channel, cptr, 0, "%H", chan->channel); if (IsChanOp(chan) && HasVoice(chan)) - sendcmdto_channel_butserv_butone(&me, CMD_MODE, chan->channel, cptr, 0, + sendcmdto_channel_butserv_butone(&his, CMD_MODE, chan->channel, cptr, 0, "%H +ov %C %C", chan->channel, cptr, cptr); else if (IsChanOp(chan) || HasVoice(chan)) - sendcmdto_channel_butserv_butone(&me, CMD_MODE, chan->channel, cptr, 0, + sendcmdto_channel_butserv_butone(&his, CMD_MODE, chan->channel, cptr, 0, "%H +%c %C", chan->channel, IsChanOp(chan) ? 'o' : 'v', cptr); } return 0; -- 2.20.1