Merge pull request #86 from SOBotics/develop

merged release to the wrong branch again
SOBotics · Mar 25, 2017 · 84b5d9a · 84b5d9a
2 parents b59b210 + 537125f
commit 84b5d9a
Show file tree

Hide file tree

Showing 25 changed files with 329 additions and 14 deletions.
diff --git a/data/.gitignore b/data/.gitignore
@@ -0,0 +1 @@
+/OptedInUsersList.txt
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>de.felixsfd.stackoverflow</groupId>
   <artifactId>guttenberg</artifactId>
-  <version>0.5.4</version>
+  <version>0.6.101</version>
   <build>
     <resources>
       <resource>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>de.felixsfd.stackoverflow</groupId>
     <artifactId>guttenberg</artifactId>
-    <version>0.6.0</version>
+    <version>0.7.0</version>
 
     <dependencies>
         <dependency>
@@ -45,6 +45,11 @@
             <artifactId>java-string-similarity</artifactId>
             <version>0.21</version>
         </dependency>
+        <dependency>
+        	<groupId>org.sobotics</groupId>
+        	<artifactId>redunda-lib</artifactId>
+        	<version>0.3.0</version>
+        </dependency>
     </dependencies>
     <repositories>
         <repository>

diff --git a/src/main/java/org/sobotics/guttenberg/clients/Client.java b/src/main/java/org/sobotics/guttenberg/clients/Client.java
@@ -2,13 +2,17 @@
 
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.sobotics.redunda.DataService;
+import org.sobotics.redunda.PingService;
+import org.sobotics.guttenberg.commands.Status;
 import org.sobotics.guttenberg.roomdata.BotRoom;
 import org.sobotics.guttenberg.roomdata.SOBoticsChatRoom;
 import org.sobotics.guttenberg.roomdata.SOGuttenbergTestingFacility;
@@ -49,6 +53,45 @@ public static void main(String[] args) {
         rooms.add(new SOBoticsChatRoom());
         rooms.add(new SOGuttenbergTestingFacility());
 
+        //get current version
+        Properties guttenbergProperties = new Properties();
+        String version = "0.0.0";
+        try{
+            InputStream is = Status.class.getResourceAsStream("/guttenberg.properties");
+            guttenbergProperties.load(is);
+            version = guttenbergProperties.getProperty("version", "0.0.0");
+        }
+        catch (IOException e){
+            LOGGER.error("Could not load properties", e);
+        }
+
+        LOGGER.info("Connecting to Redunda...");
+        PingService redunda = new PingService(prop.getProperty("redunda_apikey", ""), version);
+        String productionInstance = prop.getProperty("production_instance", "false");
+
+
+        //track files for synchronization
+        DataService redundaData = redunda.buildDataService();
+        redundaData.trackFile(FilePathUtils.optedUsersFile);
+        redundaData.trackFile(FilePathUtils.generalPropertiesFile);
+
+        if (productionInstance.equals("false")) {
+        	redunda.setDebugging(true);
+        	LOGGER.info("Set Redunda debugging to true");
+        } else {
+        	//not debugging
+        	LOGGER.info("Start synchronization...");
+            redundaData.syncAndStart();
+            LOGGER.info("Synchronization finished!");
+        }
+
+        //first check manually, so that RunnerService will know the status before posting the welcome message
+        boolean isOnStandby = redunda.checkStandbyStatus();
+        if (isOnStandby)
+        	LOGGER.info("Launching in standby...");
+
+        redunda.start();
+
 
         LOGGER.info("Launch Guttenberg...");
 

diff --git a/src/main/java/org/sobotics/guttenberg/clients/Guttenberg.java b/src/main/java/org/sobotics/guttenberg/clients/Guttenberg.java
@@ -10,6 +10,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.sobotics.guttenberg.finders.NewAnswersFinder;
+import org.sobotics.redunda.PingService;
 import org.sobotics.guttenberg.entities.OptedInUser;
 import org.sobotics.guttenberg.entities.Post;
 import org.sobotics.guttenberg.finders.PlagFinder;
@@ -48,6 +49,12 @@ public void secureExecute() {
 	}
 
 	public void execute() throws Throwable {
+		boolean standbyMode = PingService.standby.get();
+		if (standbyMode == true) {
+			LOGGER.info("STANDBY - " + Instant.now());
+			return;
+		}
+
 		Instant startTime = Instant.now();
 		Properties props = new Properties();
 		LOGGER.info("Executing at - "+startTime);

diff --git a/src/main/java/org/sobotics/guttenberg/commandlists/SoBoticsCommandsList.java b/src/main/java/org/sobotics/guttenberg/commandlists/SoBoticsCommandsList.java
@@ -1,16 +1,24 @@
 package org.sobotics.guttenberg.commandlists;
 
+import java.io.FileInputStream;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Optional;
+import java.util.Properties;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.sobotics.redunda.PingService;
 import org.sobotics.guttenberg.commands.*;
 import org.sobotics.guttenberg.services.RunnerService;
+import org.sobotics.guttenberg.utils.FilePathUtils;
 
 import fr.tunaki.stackoverflow.chat.Message;
 import fr.tunaki.stackoverflow.chat.Room;
+import fr.tunaki.stackoverflow.chat.User;
+import fr.tunaki.stackoverflow.chat.event.MessagePostedEvent;
 import fr.tunaki.stackoverflow.chat.event.PingMessageEvent;
 
 /**
@@ -43,7 +51,73 @@ public void mention(Room room, PingMessageEvent event, boolean isReply, RunnerSe
 
         for(SpecialCommand command: commands){
             if(command.validate()){
-                command.execute(room, instance);
+            	boolean standbyMode = PingService.standby.get();
+            	if (standbyMode == true) {
+            		if (command.availableInStandby() == true) {
+            			command.execute(room, instance);
+            		}
+            	} else {
+            		command.execute(room, instance);
+            	}
+            }
+        }
+    }
+
+    public void globalCommand(Room room, MessagePostedEvent event,  RunnerService instance) {
+    	//only ROs should execute global commands!
+    	try {
+    		User user = event.getUser().get();
+    		if (!user.isModerator() && !user.isRoomOwner())
+    			return;
+    	} catch (Throwable e) {
+    		LOGGER.warn("Could not verify privileges of that user. Don't execute the command.", e);
+    		return;
+    	}
+
+
+    	Message message = event.getMessage();
+        LOGGER.info("Message: "+message.getContent());
+
+        int cp = Character.codePointAt(message.getPlainContent(), 0);
+
+        if (PingService.standby.get() == false && (cp == 128642 || (cp>=128644 && cp<=128650))) {
+        	room.send("[🚃](http://bit.ly/2nRi9kX)");
+        	return;
+        }
+
+    	//return immediately, if @gut is part of the message!
+    	String username = "";
+
+        Properties prop = new Properties();
+
+        try{
+            prop.load(new FileInputStream(FilePathUtils.loginPropertiesFile));
+            username = prop.getProperty("username").substring(0,3).toLowerCase();
+        }
+        catch (IOException e){
+            LOGGER.error("Could not load login.properties", e);
+            username = "gut";
+        }
+
+        boolean containsUsername = message.getPlainContent().toLowerCase().contains("@"+username);
+        //LOGGER.info("containsUsername: "+containsUsername);
+        if (containsUsername == true)
+        	return;
+
+        List<SpecialCommand> commands = new ArrayList<>(Arrays.asList(
+            new Alive(message)
+        ));
+
+        for(SpecialCommand command: commands){
+            if(command.validate()){
+            	boolean standbyMode = PingService.standby.get();
+            	if (standbyMode == true) {
+            		if (command.availableInStandby() == true) {
+            			command.execute(room, instance);
+            		}
+            	} else {
+            		command.execute(room, instance);
+            	}
             }
         }
     }

diff --git a/src/main/java/org/sobotics/guttenberg/commands/Alive.java b/src/main/java/org/sobotics/guttenberg/commands/Alive.java
@@ -1,6 +1,15 @@
 package org.sobotics.guttenberg.commands;
 
 import org.sobotics.guttenberg.utils.CommandUtils;
+import org.sobotics.guttenberg.utils.FilePathUtils;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Properties;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.sobotics.redunda.PingService;
 import org.sobotics.guttenberg.services.RunnerService;
 
 import fr.tunaki.stackoverflow.chat.Message;
@@ -11,7 +20,7 @@
  */
 public class Alive implements SpecialCommand {
 
-
+	private static final Logger LOGGER = LoggerFactory.getLogger(Alive.class);
     private final Message message;
 
     public Alive(Message message) {
@@ -25,7 +34,17 @@ public boolean validate() {
 
     @Override
     public void execute(Room room, RunnerService instance) {
-        room.replyTo(message.getId(), "Not sure. Ask someone else.");
+    	Properties prop = new Properties();
+
+        try{
+            prop.load(new FileInputStream(FilePathUtils.loginPropertiesFile));
+        }
+        catch (IOException e){
+            LOGGER.error("Error: ", e);
+            room.replyTo(message.getId(), "Maybe. But something strange is going on!");
+            return;
+        }
+        room.send("The instance "+prop.getProperty("location", "undefined")+ " is running.\nStandby: "+PingService.standby.toString());
     }
 
     @Override
@@ -37,4 +56,9 @@ public String description() {
     public String name() {
         return "alive";
     }
+
+	@Override
+	public boolean availableInStandby() {
+		return true;
+	}
 }
diff --git a/src/main/java/org/sobotics/guttenberg/commands/Check.java b/src/main/java/org/sobotics/guttenberg/commands/Check.java
@@ -87,4 +87,9 @@ public String name() {
         return "check";
     }
 
+	@Override
+	public boolean availableInStandby() {
+		return false;
+	}
+
 }
diff --git a/src/main/java/org/sobotics/guttenberg/commands/ClearHelp.java b/src/main/java/org/sobotics/guttenberg/commands/ClearHelp.java
@@ -40,4 +40,9 @@ public String name() {
         return "clear";
     }
 
+	@Override
+	public boolean availableInStandby() {
+		return false;
+	}
+
 }
diff --git a/src/main/java/org/sobotics/guttenberg/commands/Commands.java b/src/main/java/org/sobotics/guttenberg/commands/Commands.java
@@ -52,5 +52,10 @@ public String description() {
         return "Returns the list of commands associated with this bot";
     }
 
+	@Override
+	public boolean availableInStandby() {
+		return false;
+	}
+
 
 }
diff --git a/src/main/java/org/sobotics/guttenberg/commands/Kill.java b/src/main/java/org/sobotics/guttenberg/commands/Kill.java
@@ -0,0 +1,51 @@
+package org.sobotics.guttenberg.commands;
+
+import org.sobotics.guttenberg.services.RunnerService;
+import org.sobotics.guttenberg.utils.CommandUtils;
+
+import fr.tunaki.stackoverflow.chat.Message;
+import fr.tunaki.stackoverflow.chat.Room;
+import fr.tunaki.stackoverflow.chat.User;
+
+public class Kill implements SpecialCommand {
+
+	private final Message message;
+
+    public Kill(Message message) {
+        this.message = message;
+    }
+
+	@Override
+	public boolean validate() {
+		return CommandUtils.checkForCommand(message.getPlainContent(), "kill");
+	}
+
+	@Override
+	public void execute(Room room, RunnerService instance) {
+		User user = message.getUser();
+
+    	if (!user.isModerator() && !user.isRoomOwner()) {
+    		room.replyTo(message.getId(), "Sorry, but only room-owners and moderators can use this command");
+    		return;
+    	}
+
+    	System.out.println("KILLED BY "+user.getName());
+    	System.exit(0);
+	}
+
+	@Override
+	public String description() {
+		return "Kills the currently active instance";
+	}
+
+	@Override
+	public String name() {
+		return "kill";
+	}
+
+	@Override
+	public boolean availableInStandby() {
+		return false;
+	}
+
+}
diff --git a/src/main/java/org/sobotics/guttenberg/commands/OptIn.java b/src/main/java/org/sobotics/guttenberg/commands/OptIn.java
@@ -82,4 +82,9 @@ public String name() {
 		return "opt-in";
 	}
 
+	@Override
+	public boolean availableInStandby() {
+		return false;
+	}
+
 }
diff --git a/src/main/java/org/sobotics/guttenberg/commands/OptOut.java b/src/main/java/org/sobotics/guttenberg/commands/OptOut.java
@@ -55,4 +55,9 @@ public String name() {
 		return "opt-out";
 	}
 
+	@Override
+	public boolean availableInStandby() {
+		return false;
+	}
+
 }