From 1c82697ccbf85359e86ec815bd66a74803c7ac3f Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 30 Sep 2016 20:52:38 -0400 Subject: [PATCH] Revert "Always use display for memo source" This reverts commit d8a945b1a6f4e500bcb9162cf388f6984ad38328. --- modules/commands/ms_rsend.cpp | 2 +- modules/commands/ms_send.cpp | 2 +- modules/commands/ms_sendall.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/commands/ms_rsend.cpp b/modules/commands/ms_rsend.cpp index e703ba067..b7744131a 100644 --- a/modules/commands/ms_rsend.cpp +++ b/modules/commands/ms_rsend.cpp @@ -51,7 +51,7 @@ class CommandMSRSend : public Command source.Reply(ACCESS_DENIED); else { - MemoServService::MemoResult result = memoserv->Send(source.GetAccount()->display, nick, text); + MemoServService::MemoResult result = memoserv->Send(source.GetNick(), nick, text); if (result == MemoServService::MEMO_INVALID_TARGET) source.Reply(_("\002%s\002 is not a registered unforbidden nick or channel."), nick.c_str()); else if (result == MemoServService::MEMO_TOO_FAST) diff --git a/modules/commands/ms_send.cpp b/modules/commands/ms_send.cpp index 73ffd4c41..b028706d3 100644 --- a/modules/commands/ms_send.cpp +++ b/modules/commands/ms_send.cpp @@ -45,7 +45,7 @@ class CommandMSSend : public Command return; } - MemoServService::MemoResult result = memoserv->Send(source.GetAccount()->display, nick, text); + MemoServService::MemoResult result = memoserv->Send(source.GetNick(), nick, text); if (result == MemoServService::MEMO_SUCCESS) { source.Reply(_("Memo sent to \002%s\002."), nick.c_str()); diff --git a/modules/commands/ms_sendall.cpp b/modules/commands/ms_sendall.cpp index 8f0514d6f..4cc0f350c 100644 --- a/modules/commands/ms_sendall.cpp +++ b/modules/commands/ms_sendall.cpp @@ -39,7 +39,7 @@ class CommandMSSendAll : public Command const NickCore *nc = it->second; if (nc != source.nc) - memoserv->Send(source.GetAccount()->display, nc->display, text); + memoserv->Send(source.GetNick(), nc->display, text); } source.Reply(_("A massmemo has been sent to all registered users."));