Merge pull request #60 from eXeC64/spy

Added chat spy feature for admins

plugin.yml

@@ -26,10 +26,11 @@ permissions:
       factions.kit.halfmod: true
       factions.flag.set: true
   factions.kit.halfmod:
-    description: Can use adminmode
+    description: Can use adminmode and chat spy
     children:
       factions.kit.fullplayer: true
       factions.adminmode: true
+      factions.chatspy: true
   factions.kit.fullplayer:
     default: true
     description: Can also create new factions.
@@ -71,6 +72,8 @@ permissions:
       factions.version: true
   factions.adminmode:
     description: enable admin bypass mode
+  factions.chatspy:
+    description: enable admin chat spy mode
   factions.autoclaim:
     description: auto-claim land as you walk around
   factions.chat:

src/com/massivecraft/factions/FPlayer.java

@@ -102,6 +102,11 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator
 		return chatMode;
 	}
 	
+	// FIELD: chatSpy
+	private transient boolean spyingChat = false;
+	public void setSpyingChat(boolean chatSpying) { this.spyingChat = chatSpying; }
+	public boolean isSpyingChat() { return spyingChat; }
+	
 	// FIELD: account
 	public MethodAccount getAccount()
 	{

src/com/massivecraft/factions/cmd/CmdChatSpy.java

@@ -0,0 +1,40 @@
+package com.massivecraft.factions.cmd;
+
+import com.massivecraft.factions.P;
+import com.massivecraft.factions.struct.Permission;
+
+public class CmdChatSpy extends FCommand
+{
+	public CmdChatSpy()
+	{
+		super();
+		this.aliases.add("chatspy");
+		
+		this.optionalArgs.put("on/off", "flip");
+		
+		this.permission = Permission.CHATSPY.node;
+		this.disableOnLock = false;
+		
+		senderMustBePlayer = true;
+		senderMustBeMember = false;
+		senderMustBeOfficer = false;
+		senderMustBeLeader = false;
+	}
+	
+	@Override
+	public void perform()
+	{
+		fme.setSpyingChat(this.argAsBool(0, ! fme.isSpyingChat()));
+		
+		if ( fme.isSpyingChat())
+		{
+			fme.msg("<i>You have enabled chat spying mode.");
+			P.p.log(fme.getName() + " has ENABLED chat spying mode.");
+		}
+		else
+		{
+			fme.msg("<i>You have disabled chat spying mode.");
+			P.p.log(fme.getName() + " DISABLED chat spying mode.");
+		}
+	}
+}

src/com/massivecraft/factions/cmd/FCmdRoot.java

@@ -10,6 +10,7 @@ public class FCmdRoot extends FCommand
 	public CmdAutoClaim cmdAutoClaim = new CmdAutoClaim();
 	public CmdAdmin cmdBypass = new CmdAdmin();
 	public CmdChat cmdChat = new CmdChat();
+	public CmdChatSpy cmdChatSpy = new CmdChatSpy();
 	public CmdClaim cmdClaim = new CmdClaim();
 	public CmdConfig cmdConfig = new CmdConfig();
 	public CmdCreate cmdCreate = new CmdCreate();
@@ -72,6 +73,7 @@ public class FCmdRoot extends FCommand
 		this.addSubCommand(this.cmdAutoClaim);
 		this.addSubCommand(this.cmdBypass);
 		this.addSubCommand(this.cmdChat);
+		this.addSubCommand(this.cmdChatSpy);
 		this.addSubCommand(this.cmdClaim);
 		this.addSubCommand(this.cmdConfig);
 		this.addSubCommand(this.cmdCreate);

src/com/massivecraft/factions/listeners/FactionsChatEarlyListener.java

@@ -52,6 +52,13 @@ public class FactionsChatEarlyListener extends PlayerListener
 			
 			P.p.log(Level.INFO, ChatColor.stripColor("FactionChat "+me.getFaction().getTag()+": "+message));
 			
+			//Send to any players who are spying chat
+			for (FPlayer fplayer : FPlayers.i.getOnline())
+			{
+				if( fplayer.isSpyingChat() )
+					fplayer.sendMessage("FactionChat "+me.getFaction().getTag()+": "+message);	
+			}
+			
 			event.setCancelled(true);
 			return;
 			
@@ -69,10 +76,14 @@ public class FactionsChatEarlyListener extends PlayerListener
 			for (FPlayer fplayer : FPlayers.i.getOnline())
 			{
 				if(myFaction.getRelationTo(fplayer) == Rel.ALLY)
-					fplayer.sendMessage(message);	
+					fplayer.sendMessage(message);
+				
+				//Send to any players who are spying chat
+				if( fplayer.isSpyingChat() )
+					fplayer.sendMessage("AllianceChat " + message);
 			}
 			
-			P.p.log(Level.INFO, ChatColor.stripColor("AllianceChat: "+message));
+			P.p.log(Level.INFO, ChatColor.stripColor("AllianceChat "+message));
 			
 			event.setCancelled(true);
 			return;

src/com/massivecraft/factions/struct/Permission.java

@@ -8,6 +8,7 @@ public enum Permission
 	ADMIN("adminmode"),
 	AUTOCLAIM("autoclaim"),
 	CHAT("chat"),
+	CHATSPY("chatspy"),
 	CLAIM("claim"),
 	CONFIG("config"),
 	CREATE("create"),