Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-18 00:25:32 +01:00
Code Issues Projects Releases Wiki Activity

Check recipient socialspy exempt during PMs. Resolves #166

Browse Source
This commit is contained in:
Ali Moghnieh 2016-07-25 13:10:06 +01:00
parent 352c92b880
commit 017082c07a
No known key found for this signature in database
GPG Key ID: F09D3A1BAF2E6D70
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Essentials/src/com/earth2me/essentials/messaging/SimpleMessageRecipient.java
View File

@ -36,6 +36,13 @@ public class SimpleMessageRecipient implements IMessageRecipient {
private long lastMessageMs;
private WeakReference<IMessageRecipient> replyRecipient;
protected static User getUser(IMessageRecipient recipient) {
if (recipient instanceof SimpleMessageRecipient) {
return ((SimpleMessageRecipient) recipient).parent instanceof User ? (User) ((SimpleMessageRecipient) recipient).parent : null;
}
return recipient instanceof User ? (User) recipient : null;
}
public SimpleMessageRecipient(IEssentials ess, IMessageRecipient parent) {
this.ess = ess;
this.parent = parent;
@ -78,9 +85,12 @@ public class SimpleMessageRecipient implements IMessageRecipient {
sendMessage(tl("msgFormat", tl("me"), recipient.getDisplayName(), message));
// Better Social Spy
User senderUser = getUser();
User senderUser = getUser(this);
User recipientUser = getUser(recipient);
if (senderUser != null // not null if player.
&& !senderUser.isAuthorized("essentials.chat.spy.exempt")) {
// Dont spy on chats involving socialspy exempt players
&& !senderUser.isAuthorized("essentials.chat.spy.exempt")
&& (recipientUser != null && !recipientUser.isAuthorized("essentials.chat.spy.exempt"))) {
for (User onlineUser : ess.getOnlineUsers()) {
if (onlineUser.isSocialSpyEnabled()
// Don't send socialspy messages to message sender/receiver to prevent spam
@ -104,7 +114,7 @@ public class SimpleMessageRecipient implements IMessageRecipient {
return MessageResponse.UNREACHABLE;
}
User user = getUser();
User user = getUser(this);
boolean afk = false;
if (user != null) {
if (user.isIgnoreMsg()
@ -135,10 +145,6 @@ public class SimpleMessageRecipient implements IMessageRecipient {
return afk ? MessageResponse.SUCCESS_BUT_AFK : MessageResponse.SUCCESS;
}
protected User getUser() {
return this.parent instanceof User ? (User) this.parent : null;
}
@Override public boolean isReachable() {
return this.parent.isReachable();
}