summaryrefslogtreecommitdiff
path: root/modules/core
diff options
context:
space:
mode:
Diffstat (limited to 'modules/core')
-rw-r--r--modules/core/m_message.c10
-rw-r--r--modules/core/m_mode.c4
2 files changed, 7 insertions, 7 deletions
diff --git a/modules/core/m_message.c b/modules/core/m_message.c
index 0fa48db..193287c 100644
--- a/modules/core/m_message.c
+++ b/modules/core/m_message.c
@@ -412,8 +412,8 @@ msg_client(int p_or_n, const char *command, struct Client *source_p,
/* check for accept, flag recipient incoming message */
if (p_or_n != NOTICE)
sendto_one(source_p, form_str(RPL_TARGUMODEG),
- ID_or_name(&me, source_p->from),
- ID_or_name(source_p, source_p->from), target_p->name,
+ ID_or_name(&me, source_p),
+ ID_or_name(source_p, source_p), target_p->name,
callerid ? "+g" : "+G",
callerid ? "server side ignore" :
"server side ignore with the exception of common channels");
@@ -423,8 +423,8 @@ msg_client(int p_or_n, const char *command, struct Client *source_p,
{
if (p_or_n != NOTICE)
sendto_one(source_p, form_str(RPL_TARGNOTIFY),
- ID_or_name(&me, source_p->from),
- ID_or_name(source_p, source_p->from), target_p->name);
+ ID_or_name(&me, source_p),
+ ID_or_name(source_p, source_p), target_p->name);
sendto_one(target_p, form_str(RPL_UMODEGMSG),
me.name, target_p->name,
@@ -512,7 +512,7 @@ handle_special(int p_or_n, const char *command, struct Client *client_p,
* Not destined for a user on me :-(
*/
sendto_one(target_p, ":%s %s %s :%s",
- ID_or_name(source_p, target_p->from),
+ ID_or_name(source_p, target_p),
command, nick, text);
if ((p_or_n != NOTICE) && MyClient(source_p))
source_p->localClient->last_privmsg = CurrentTime;
diff --git a/modules/core/m_mode.c b/modules/core/m_mode.c
index dc4f001..4251aa0 100644
--- a/modules/core/m_mode.c
+++ b/modules/core/m_mode.c
@@ -74,8 +74,8 @@ m_mode(struct Client *client_p, struct Client *source_p,
if ((chptr = hash_find_channel(parv[1])) == NULL)
{
sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
- ID_or_name(&me, source_p->from),
- ID_or_name(source_p, source_p->from),
+ ID_or_name(&me, source_p),
+ ID_or_name(source_p, source_p),
parv[1]);
return 0;
}