diff options
| -rw-r--r-- | modules/pseudoclients/memoserv.cpp | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/modules/pseudoclients/memoserv.cpp b/modules/pseudoclients/memoserv.cpp index 37e9545aa..2eda9f30c 100644 --- a/modules/pseudoclients/memoserv.cpp +++ b/modules/pseudoclients/memoserv.cpp @@ -49,18 +49,29 @@ class MemoServCore : public Module, public MemoServService if (mi == NULL) return MEMO_INVALID_TARGET; + Anope::string sender_display = source; + User *sender = User::Find(source, true); - if (sender != NULL && !sender->HasPriv("memoserv/no-limit") && !force) + if (sender != NULL) { - time_t send_delay = Config->GetModule("memoserv")->Get<time_t>("senddelay"); - if (send_delay > 0 && sender->lastmemosend + send_delay > Anope::CurTime) - return MEMO_TOO_FAST; - else if (!mi->memomax) - return MEMO_TARGET_FULL; - else if (mi->memomax > 0 && mi->memos->size() >= static_cast<unsigned>(mi->memomax)) - return MEMO_TARGET_FULL; - else if (mi->HasIgnore(sender)) - return MEMO_SUCCESS; + if (!sender->HasPriv("memoserv/no-limit") && !force) + { + time_t send_delay = Config->GetModule("memoserv")->Get<time_t>("senddelay"); + if (send_delay > 0 && sender->lastmemosend + send_delay > Anope::CurTime) + return MEMO_TOO_FAST; + else if (!mi->memomax) + return MEMO_TARGET_FULL; + else if (mi->memomax > 0 && mi->memos->size() >= static_cast<unsigned>(mi->memomax)) + return MEMO_TARGET_FULL; + else if (mi->HasIgnore(sender)) + return MEMO_SUCCESS; + } + + NickCore *acc = sender->Account(); + if (acc != NULL) + { + sender_display = acc->display; + } } if (sender != NULL) @@ -70,7 +81,7 @@ class MemoServCore : public Module, public MemoServService m->mi = mi; mi->memos->push_back(m); m->owner = target; - m->sender = source; + m->sender = sender_display; m->time = Anope::CurTime; m->text = message; m->unread = true; |