Merge remote-tracking branch 'origin/develop' into develop

src/commands/CommandCharacterCreate.java

@@ -13,7 +13,7 @@ import dataStructures.UserInput;
 
 public class CommandCharacterCreate extends Command
 {
-public CommandCharacterCreate(KittyRole level, KittyRating rating) { super(level, rating); }
+	public CommandCharacterCreate(KittyRole level, KittyRating rating) { super(level, rating); }
 	
 	@Override
 	public String HelpText() { return LocStrings.Stub("CharacterCreateInfo"); }
@@ -33,6 +33,5 @@ public CommandCharacterCreate(KittyRole level, KittyRating rating) { super(level
 			return;
 		}
 		res.Call(LocStrings.Stub("CharacterCreateDuplicate"));
-		
-	}
+		}
 }

src/commands/CommandCharacterEditBio.java

@@ -0,0 +1,38 @@
+package commands;
+
+import core.CharacterManager;
+import core.Command;
+import core.LocStrings;
+import dataStructures.*;
+
+public class CommandCharacterEditBio extends Command
+{
+	public CommandCharacterEditBio(KittyRole level, KittyRating rating) { super(level, rating); }
+	
+	@Override
+	public String HelpText() { return LocStrings.Stub("CharacterEditBioInfo"); }
+	
+	@Override
+	public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
+	{
+		try
+		{
+			Long.parseLong(input.args.split(" ")[0]);
+		}
+		catch(Exception e)
+		{
+			res.Call(LocStrings.Stub("CharacterEditBioNotValid"));
+			return;
+		}
+		KittyCharacter character = CharacterManager.instance.searchCharacter(input.args.split(" ")[0]).get(0);
+		if(character.getOwner().equals(user))
+		{
+			CharacterManager.instance.editBio(character, input.args.substring(input.args.indexOf(' ')));
+			res.Call(LocStrings.Stub("CharacterEditBioSuccess"));
+		}
+		else
+		{
+			res.Call(LocStrings.Stub("CharacterEditBioNotAuth"));
+		}
+	}
+}

src/commands/CommandCharacterEditName.java

@@ -0,0 +1,38 @@
+package commands;
+
+import core.CharacterManager;
+import core.Command;
+import core.LocStrings;
+import dataStructures.*;
+
+public class CommandCharacterEditName extends Command
+{
+	public CommandCharacterEditName(KittyRole level, KittyRating rating) { super(level, rating); }
+	
+	@Override
+	public String HelpText() { return LocStrings.Stub("CharacterEditNameInfo"); }
+	
+	@Override
+	public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
+	{
+		try
+		{
+			Long.parseLong(input.args.split(" ")[0]);
+		}
+		catch(Exception e)
+		{
+			res.Call(LocStrings.Stub("CharacterEditNameNotValid"));
+			return;
+		}
+		KittyCharacter character = CharacterManager.instance.searchCharacter(input.args.split(" ")[0]).get(0);
+		if(character.getOwner().equals(user))
+		{
+			CharacterManager.instance.editName(character, input.args.substring(input.args.indexOf(' ')));
+			res.Call(LocStrings.Stub("CharacterEditNameSuccess"));
+		}
+		else
+		{
+			res.Call(LocStrings.Stub("CharacterEditNameNotAuth"));
+		}
+	}
+}

src/commands/CommandCharacterEditURL.java

@@ -0,0 +1,38 @@
+package commands;
+
+import core.CharacterManager;
+import core.Command;
+import core.LocStrings;
+import dataStructures.*;
+
+public class CommandCharacterEditURL extends Command
+{
+	public CommandCharacterEditURL(KittyRole level, KittyRating rating) { super(level, rating); }
+	
+	@Override
+	public String HelpText() { return LocStrings.Stub("CharacterEditURLInfo"); }
+	
+	@Override
+	public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
+	{
+		try
+		{
+			Long.parseLong(input.args.split(" ")[0]);
+		}
+		catch(Exception e)
+		{
+			res.Call(LocStrings.Stub("CharacterEditURLNotValid"));
+			return;
+		}
+		KittyCharacter character = CharacterManager.instance.searchCharacter(input.args.split(" ")[0]).get(0);
+		if(character.getOwner().equals(user))
+		{
+			CharacterManager.instance.editRefImage(character, input.args.substring(input.args.indexOf(' ')));
+			res.Call(LocStrings.Stub("CharacterEditURLSuccess"));
+		}
+		else
+		{
+			res.Call(LocStrings.Stub("CharacterEditURLNotAuth"));
+		}
+	}
+}

src/commands/CommandCharacterSearch.java

@@ -0,0 +1,40 @@
+package commands;
+
+import java.util.ArrayList;
+
+import core.CharacterManager;
+import core.Command;
+import core.LocStrings;
+import dataStructures.*;
+
+public class CommandCharacterSearch extends Command
+{
+	public CommandCharacterSearch(KittyRole level, KittyRating rating) { super(level, rating); }
+	
+	@Override
+	public String HelpText() { return LocStrings.Stub("CharacterSearchInfo"); }
+	
+	@Override
+	public void OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
+	{
+		ArrayList <KittyCharacter> characters = CharacterManager.instance.searchCharacter(input.args);
+		if(characters.size() < 1)
+		{
+			res.Call(LocStrings.Stub("CharacterSearchNoCharacterFound"));
+			return;
+		}
+		if(characters.size() > 1)
+		{
+			res.Call(LocStrings.Stub("CharacterSearchMultipleCharacterHeader"));
+			for(KittyCharacter character:characters)
+			{
+				res.Call(String.format(LocStrings.Stub("CharacterSearchMultipleCharacter"), character.getName(), character.getOwner().name, character.getUID()));
+			}
+			return;
+		}
+		else
+		{
+			res.Call(String.format(LocStrings.Stub("CharacterSearchOneCharacter"), characters.get(0).getOwner().name, characters.get(0).getName(), characters.get(0).getBio(), characters.get(0).getRefImage(), characters.get(0).getUID()));
+		}
+	}
+}

src/core/CharacterManager.java

@@ -1,15 +1,19 @@
 package core;
 
+import java.util.ArrayList;
 import java.util.Vector;
 
 import dataStructures.KittyCharacter;
+import dataStructures.KittyTrackedLong;
 import dataStructures.KittyUser;
+import me.xdrop.fuzzywuzzy.FuzzySearch;
 import utils.GlobalLog;
 import utils.LogFilter;
 
 public class CharacterManager 
 {
-	public static CharacterManager instance; 
+	public static CharacterManager instance;
+	KittyTrackedLong uniqueID = new KittyTrackedLong("CharacterIDCounter", "");
 	
 	private Vector <KittyCharacter> characters = new Vector<KittyCharacter>();
 	public CharacterManager()
@@ -25,6 +29,33 @@ public class CharacterManager
 		}
 	}
 	
+	public ArrayList<KittyCharacter> searchCharacter(String query)
+	{	
+		ArrayList<KittyCharacter> chars = new ArrayList<KittyCharacter>();
+		try
+		{
+			long UID = Long.parseLong(query);
+			for(KittyCharacter character:characters)
+			{
+				if(character.getUID() == UID)
+				{
+					chars.add(character);
+					break;
+				}
+			}
+		}catch(Exception e)
+		{
+			for(KittyCharacter character:characters)
+			{
+				if(FuzzySearch.ratio(query.toLowerCase(), character.getName().toLowerCase()) > 60)
+				{
+					chars.add(character);
+				}
+			}
+		}
+		return chars;
+	}
+	
 	public boolean addCharacter(KittyUser user, String name, String bio, String refImage)
 	{
 		for(KittyCharacter character:characters)
@@ -35,45 +66,29 @@ public class CharacterManager
 			}
 		}
 		
-		characters.add(new KittyCharacter(user, name, bio, refImage)); 
+		characters.add(new KittyCharacter(user, name, bio, refImage, uniqueID.Get()));
+		uniqueID.Add(1);
 		return true; 
 	}
 	
-	public boolean removeCharacter(KittyUser user, String name)
+	public void removeCharacter(KittyCharacter character, String name)
 	{
-		for(KittyCharacter character:characters)
-		{
-			if(character.getName().equals(name) && character.getOwner().discordID.equals(user.discordID))
-			{
-				characters.remove(character);
-				return true;
-			}
-		}
-		return false; 
+		characters.remove(character);
 	}
 	
-	public boolean editRefImage(KittyUser user, String name, String refImage)
+	public void editRefImage(KittyCharacter character, String refImage)
 	{
-		for(KittyCharacter character:characters)
-		{
-			if(character.getName().equals(name) && character.getOwner().discordID.equals(user.discordID))
-			{
-				return character.editRefImage(user, refImage);
-			}
-		}
-		return false; 
+		character.editRefImage(refImage);
 	}
 	
-	public boolean editBio(KittyUser user, String name, String bio)
+	public void editBio(KittyCharacter character, String bio)
 	{
-		for(KittyCharacter character:characters)
-		{
-			if(character.getName().equals(name) && character.getOwner().discordID.equals(user.discordID))
-			{
-				return character.editBio(user, bio);
-			}
-		}
-		return false; 
+		character.editBio(bio);
+	}
+
+	public void editName(KittyCharacter character, String name) 
+	{
+		character.editName(name);
 	}
 	
 }

src/core/ObjectBuilderFactory.java

@@ -424,6 +424,10 @@ public class ObjectBuilderFactory
 		manager.Register(LocCommands.Stub("benchmark, bench"), new CommandBenchmark(KittyRole.General, KittyRating.Safe));
 		manager.Register(LocCommands.Stub("rafflejoin"), new CommandRaffleJoin(KittyRole.General, KittyRating.Safe));
 		manager.Register(LocCommands.Stub("charactercreate"), new CommandCharacterCreate(KittyRole.General, KittyRating.Safe));
+		manager.Register(LocCommands.Stub("searchcharacter"), new CommandCharacterSearch(KittyRole.General, KittyRating.Safe));
+		manager.Register(LocCommands.Stub("charactereditbio"), new CommandCharacterEditBio(KittyRole.General, KittyRating.Safe));
+		manager.Register(LocCommands.Stub("charactereditname"), new CommandCharacterEditName(KittyRole.General, KittyRating.Safe));
+		manager.Register(LocCommands.Stub("charactereditURL"), new CommandCharacterEditURL(KittyRole.General, KittyRating.Safe));
 		manager.Register(LocCommands.Stub("leaderboard"), new CommandLeaderboard(KittyRole.General, KittyRating.Safe));
 		manager.Register(LocCommands.Stub("color, colour"), new CommandColor(KittyRole.General, KittyRating.Safe));
 		
@@ -504,4 +508,4 @@ public class ObjectBuilderFactory
 			return userCache.size();
 		}
 	}
-}
+}

src/dataStructures/KittyCharacter.java

@@ -6,43 +6,30 @@ public class KittyCharacter
 	private String name;
 	private String bio; 
 	private String refImage; 
+	private long uniqueID;
 	
-	public KittyCharacter(KittyUser owner, String name, String bio, String refImage)
+	public KittyCharacter(KittyUser owner, String name, String bio, String refImage, long uniqueID)
 	{
 		this.owner = owner;
 		this.name = name;
 		this.bio = bio;
 		this.refImage = refImage; 
+		this.uniqueID = uniqueID;
 	}
 	
-	
-	private boolean allowedToEdit(KittyUser editor)
+	public void editBio(String bio)
 	{
-		if(editor.identifier.equals(owner.identifier))
-		{
-			return true;
-		}
-		return false; 
+		this.bio = bio;
 	}
 	
-	public boolean editBio(KittyUser editor, String bio)
+	public void editRefImage(String refImage)
 	{
-		if(allowedToEdit(editor))
-		{
-			this.bio = bio;
-			return true; 
-		}
-		return false;
+		this.refImage = refImage;
 	}
 	
-	public boolean editRefImage(KittyUser editor, String refImage)
+	public void editName(String name) 
 	{
-		if(allowedToEdit(editor))
-		{
-			this.refImage = refImage;
-			return true; 
-		}
-		return false;
+		this.name = name;	
 	}
 	
 	public KittyUser getOwner()
@@ -65,6 +52,11 @@ public class KittyCharacter
 		return refImage; 
 	}
 	
+	public long getUID()
+	{
+		return uniqueID;
+	}
+	
 	public String toString()
 	{
 		return name + " " + bio + " " + refImage;