diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ns_group.c | 14 | ||||
| -rw-r--r-- | src/core/ns_info.c | 11 |
2 files changed, 10 insertions, 15 deletions
diff --git a/src/core/ns_group.c b/src/core/ns_group.c index 2aa47ac1f..dab27af27 100644 --- a/src/core/ns_group.c +++ b/src/core/ns_group.c @@ -182,16 +182,14 @@ class CommandNSGList : public Command for (i = 0; i < nc->aliases.count; ++i) { NickAlias *na2 = static_cast<NickAlias *>(nc->aliases.list[i]); - if (na2->nc == nc) + + if (!(wont_expire = na2->HasFlag(NS_NO_EXPIRE))) { - if (!(wont_expire = na2->HasFlag(NS_NO_EXPIRE))) - { - expt = na2->last_seen + Config.NSExpire; - tm = localtime(&expt); - strftime_lang(buf, sizeof(buf), finduser(na2->nick), STRFTIME_DATE_TIME_FORMAT, tm); - } - notice_lang(Config.s_NickServ, u, u->Account()->IsServicesOper() && !wont_expire ? NICK_GLIST_REPLY_ADMIN : NICK_GLIST_REPLY, wont_expire ? '!' : ' ', na2->nick, buf); + expt = na2->last_seen + Config.NSExpire; + tm = localtime(&expt); + strftime_lang(buf, sizeof(buf), finduser(na2->nick), STRFTIME_DATE_TIME_FORMAT, tm); } + notice_lang(Config.s_NickServ, u, wont_expire ? NICK_GLIST_REPLY_NOEXPIRE : NICK_GLIST_REPLY, na2->nick, buf); } notice_lang(Config.s_NickServ, u, NICK_GLIST_FOOTER, nc->aliases.count); } diff --git a/src/core/ns_info.c b/src/core/ns_info.c index 0635e52df..421d33f97 100644 --- a/src/core/ns_info.c +++ b/src/core/ns_info.c @@ -171,13 +171,10 @@ class CommandNSInfo : public Command notice_lang(Config.s_NickServ, u, NICK_INFO_NO_EXPIRE); else { - if (u->Account()->IsServicesOper()) - { - expt = na->last_seen + Config.NSExpire; - tm = localtime(&expt); - strftime_lang(buf, sizeof(buf), finduser(na->nick), STRFTIME_DATE_TIME_FORMAT, tm); - notice_lang(Config.s_NickServ, u, NICK_INFO_EXPIRE, buf); - } + expt = na->last_seen + Config.NSExpire; + tm = localtime(&expt); + strftime_lang(buf, sizeof(buf), finduser(na->nick), STRFTIME_DATE_TIME_FORMAT, tm); + notice_lang(Config.s_NickServ, u, NICK_INFO_EXPIRE, buf); } } |