Skip to content

Commit

Permalink
Merge pull request #182 from SOBotics/release/1.2.3
Browse files Browse the repository at this point in the history
Release/1.2.3
  • Loading branch information
FelixSFD authored Jul 16, 2018
2 parents dc1461b + f268e0b commit 654dabe
Show file tree
Hide file tree
Showing 31 changed files with 85 additions and 92 deletions.
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>de.felixsfd.stackoverflow</groupId>
<artifactId>guttenberg</artifactId>
<version>1.2.2</version>
<version>1.2.3</version>

<dependencies>
<dependency>
Expand All @@ -14,9 +14,9 @@
<version>1.0</version>
</dependency>
<dependency>
<groupId>fr.tunaki.stackoverflow</groupId>
<groupId>org.sobotics</groupId>
<artifactId>chatexchange</artifactId>
<version>1.1.2-SNAPSHOT</version>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>com.optimaize.languagedetector</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/sobotics/guttenberg/clients/Client.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import org.sobotics.guttenberg.utils.FileUtils;
import org.sobotics.guttenberg.utils.StatusUtils;

import fr.tunaki.stackoverflow.chat.StackExchangeClient;
import org.sobotics.chatexchange.chat.StackExchangeClient;


/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.sobotics.guttenberg.clients;

import java.io.FileInputStream;
import java.io.IOException;
import java.time.Instant;
import java.util.ArrayList;
Expand All @@ -20,7 +19,7 @@
import org.sobotics.guttenberg.utils.FileUtils;
import org.sobotics.guttenberg.utils.StatusUtils;

import fr.tunaki.stackoverflow.chat.Room;
import org.sobotics.chatexchange.chat.Room;

/**
* Fetches and analyzes the data from the API
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
import org.sobotics.guttenberg.utils.FilePathUtils;
import org.sobotics.guttenberg.utils.FileUtils;

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;
import org.sobotics.chatexchange.chat.Message;
import org.sobotics.chatexchange.chat.Room;
import org.sobotics.chatexchange.chat.User;
import org.sobotics.chatexchange.chat.event.MessagePostedEvent;
import org.sobotics.chatexchange.chat.event.PingMessageEvent;

/**
* Created by bhargav.h on 28-Oct-16.
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/sobotics/guttenberg/commands/Alive.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import org.sobotics.redunda.PingService;
import org.sobotics.guttenberg.services.RunnerService;

import fr.tunaki.stackoverflow.chat.Message;
import fr.tunaki.stackoverflow.chat.Room;
import org.sobotics.chatexchange.chat.Message;
import org.sobotics.chatexchange.chat.Room;

/**
* Created by bhargav.h on 30-Sep-16.
Expand All @@ -31,7 +31,7 @@ public boolean validate() {
@Override
public void execute(Room room, RunnerService instance) {
LOGGER.warn("Someone wants to know, if I'm alive");
room.send("The instance "+PingService.location+ " is running.\nStandby: "+PingService.standby.toString());
room.send("The instance "+PingService.location+ " is running; Standby: "+PingService.standby.toString());
}

@Override
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/org/sobotics/guttenberg/commands/Check.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.sobotics.guttenberg.commands;

import java.io.FileInputStream;
import java.io.IOException;
import java.util.Collections;
import java.util.Comparator;
Expand All @@ -19,8 +18,8 @@

import com.google.gson.JsonObject;

import fr.tunaki.stackoverflow.chat.Message;
import fr.tunaki.stackoverflow.chat.Room;
import org.sobotics.chatexchange.chat.Message;
import org.sobotics.chatexchange.chat.Room;

public class Check implements SpecialCommand {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.sobotics.guttenberg.commands;

import java.io.FileInputStream;
import java.io.IOException;
import java.text.NumberFormat;
import java.util.ArrayList;
Expand Down Expand Up @@ -31,11 +30,11 @@
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;

import fr.tunaki.stackoverflow.chat.Message;
import fr.tunaki.stackoverflow.chat.Room;
import org.sobotics.chatexchange.chat.Message;
import org.sobotics.chatexchange.chat.Room;

/**
* Command to search for plagarisim using internet
* Command to search for plagiarism using internet
*
* @author Petter Friberg
*
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/org/sobotics/guttenberg/commands/CheckUser.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.sobotics.guttenberg.commands;

import java.io.FileInputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Formatter;
Expand All @@ -27,8 +26,8 @@
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;

import fr.tunaki.stackoverflow.chat.Message;
import fr.tunaki.stackoverflow.chat.Room;
import org.sobotics.chatexchange.chat.Message;
import org.sobotics.chatexchange.chat.Room;

/**
* Command to check all post of a user.
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/sobotics/guttenberg/commands/ClearHelp.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import org.sobotics.guttenberg.utils.StatusUtils;
import org.sobotics.guttenberg.services.RunnerService;

import fr.tunaki.stackoverflow.chat.Message;
import fr.tunaki.stackoverflow.chat.Room;
import org.sobotics.chatexchange.chat.Message;
import org.sobotics.chatexchange.chat.Room;

public class ClearHelp implements SpecialCommand {

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/sobotics/guttenberg/commands/Commands.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import org.sobotics.guttenberg.utils.PrintUtils;
import org.sobotics.guttenberg.services.RunnerService;

import fr.tunaki.stackoverflow.chat.Message;
import fr.tunaki.stackoverflow.chat.Room;
import org.sobotics.chatexchange.chat.Message;
import org.sobotics.chatexchange.chat.Room;

/**
* Created by bhargav.h on 30-Sep-16.
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/sobotics/guttenberg/commands/Feedback.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
import org.sobotics.guttenberg.utils.CommandUtils;
import org.sobotics.guttenberg.utils.PostUtils;

import fr.tunaki.stackoverflow.chat.Message;
import fr.tunaki.stackoverflow.chat.Room;
import fr.tunaki.stackoverflow.chat.event.PingMessageEvent;
import org.sobotics.chatexchange.chat.Message;
import org.sobotics.chatexchange.chat.Room;
import org.sobotics.chatexchange.chat.event.PingMessageEvent;

/**
* Created by bhargav.h on 29-Nov-16.
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/sobotics/guttenberg/commands/Kill.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
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;
import org.sobotics.chatexchange.chat.Message;
import org.sobotics.chatexchange.chat.Room;
import org.sobotics.chatexchange.chat.User;

public class Kill implements SpecialCommand {

Expand Down
7 changes: 3 additions & 4 deletions src/main/java/org/sobotics/guttenberg/commands/LogLevel.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.sobotics.guttenberg.commands;

import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Properties;
Expand All @@ -15,9 +14,9 @@
import org.sobotics.guttenberg.utils.FileUtils;
import org.sobotics.redunda.PingService;

import fr.tunaki.stackoverflow.chat.Message;
import fr.tunaki.stackoverflow.chat.Room;
import fr.tunaki.stackoverflow.chat.User;
import org.sobotics.chatexchange.chat.Message;
import org.sobotics.chatexchange.chat.Room;
import org.sobotics.chatexchange.chat.User;

public class LogLevel implements SpecialCommand {
private static final Logger LOGGER = LoggerFactory.getLogger(LogLevel.class);
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/sobotics/guttenberg/commands/OptIn.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
import org.sobotics.guttenberg.utils.FilePathUtils;
import org.sobotics.guttenberg.utils.FileUtils;

import fr.tunaki.stackoverflow.chat.Message;
import fr.tunaki.stackoverflow.chat.Room;
import fr.tunaki.stackoverflow.chat.User;
import org.sobotics.chatexchange.chat.Message;
import org.sobotics.chatexchange.chat.Room;
import org.sobotics.chatexchange.chat.User;

public class OptIn implements SpecialCommand {

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/sobotics/guttenberg/commands/OptOut.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
import org.sobotics.guttenberg.utils.FilePathUtils;
import org.sobotics.guttenberg.utils.FileUtils;

import fr.tunaki.stackoverflow.chat.Message;
import fr.tunaki.stackoverflow.chat.Room;
import fr.tunaki.stackoverflow.chat.User;
import org.sobotics.chatexchange.chat.Message;
import org.sobotics.chatexchange.chat.Room;
import org.sobotics.chatexchange.chat.User;

public class OptOut implements SpecialCommand {

Expand Down
5 changes: 2 additions & 3 deletions src/main/java/org/sobotics/guttenberg/commands/Quota.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,15 @@
import org.sobotics.guttenberg.utils.StatusUtils;
import org.sobotics.redunda.PingService;

import java.io.FileInputStream;
import java.io.IOException;
import java.util.Properties;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.sobotics.guttenberg.services.RunnerService;

import fr.tunaki.stackoverflow.chat.Message;
import fr.tunaki.stackoverflow.chat.Room;
import org.sobotics.chatexchange.chat.Message;
import org.sobotics.chatexchange.chat.Room;

public class Quota implements SpecialCommand {

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/sobotics/guttenberg/commands/Reboot.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
import org.slf4j.LoggerFactory;
import org.sobotics.guttenberg.services.RunnerService;

import fr.tunaki.stackoverflow.chat.Message;
import fr.tunaki.stackoverflow.chat.Room;
import fr.tunaki.stackoverflow.chat.User;
import org.sobotics.chatexchange.chat.Message;
import org.sobotics.chatexchange.chat.Room;
import org.sobotics.chatexchange.chat.User;

/**
*
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/sobotics/guttenberg/commands/Say.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import org.sobotics.guttenberg.utils.CommandUtils;
import org.sobotics.guttenberg.services.RunnerService;

import fr.tunaki.stackoverflow.chat.Message;
import fr.tunaki.stackoverflow.chat.Room;
import org.sobotics.chatexchange.chat.Message;
import org.sobotics.chatexchange.chat.Room;

/**
* Created by bhargav.h on 30-Sep-16.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.sobotics.guttenberg.commands;

import fr.tunaki.stackoverflow.chat.Room;
import org.sobotics.chatexchange.chat.Room;

import org.sobotics.guttenberg.services.RunnerService;

Expand Down
5 changes: 2 additions & 3 deletions src/main/java/org/sobotics/guttenberg/commands/Status.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.sobotics.guttenberg.commands;

import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
Expand All @@ -14,8 +13,8 @@
import org.sobotics.redunda.PingService;
import org.sobotics.guttenberg.services.RunnerService;

import fr.tunaki.stackoverflow.chat.Message;
import fr.tunaki.stackoverflow.chat.Room;
import org.sobotics.chatexchange.chat.Message;
import org.sobotics.chatexchange.chat.Room;

public class Status implements SpecialCommand {

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/sobotics/guttenberg/commands/Update.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
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 org.sobotics.chatexchange.chat.Message;
import org.sobotics.chatexchange.chat.Room;

public class Update implements SpecialCommand {
private static final Logger LOGGER = LoggerFactory.getLogger(Update.class);
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/org/sobotics/guttenberg/roomdata/BotRoom.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package org.sobotics.guttenberg.roomdata;

import fr.tunaki.stackoverflow.chat.ChatHost;
import fr.tunaki.stackoverflow.chat.Room;
import fr.tunaki.stackoverflow.chat.event.MessagePostedEvent;
import fr.tunaki.stackoverflow.chat.event.MessageReplyEvent;
import fr.tunaki.stackoverflow.chat.event.UserMentionedEvent;
import org.sobotics.chatexchange.chat.ChatHost;
import org.sobotics.chatexchange.chat.Room;
import org.sobotics.chatexchange.chat.event.MessagePostedEvent;
import org.sobotics.chatexchange.chat.event.MessageReplyEvent;
import org.sobotics.chatexchange.chat.event.UserMentionedEvent;

import java.util.function.Consumer;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
import org.sobotics.guttenberg.services.RunnerService;
import org.sobotics.guttenberg.utils.PostUtils;

import fr.tunaki.stackoverflow.chat.ChatHost;
import fr.tunaki.stackoverflow.chat.Room;
import fr.tunaki.stackoverflow.chat.event.MessagePostedEvent;
import fr.tunaki.stackoverflow.chat.event.MessageReplyEvent;
import fr.tunaki.stackoverflow.chat.event.UserMentionedEvent;
import org.sobotics.chatexchange.chat.ChatHost;
import org.sobotics.chatexchange.chat.Room;
import org.sobotics.chatexchange.chat.event.MessagePostedEvent;
import org.sobotics.chatexchange.chat.event.MessageReplyEvent;
import org.sobotics.chatexchange.chat.event.UserMentionedEvent;

public class SEBoticsChatRoom implements BotRoom {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package org.sobotics.guttenberg.roomdata;

import fr.tunaki.stackoverflow.chat.ChatHost;
import fr.tunaki.stackoverflow.chat.Room;
import fr.tunaki.stackoverflow.chat.event.MessagePostedEvent;
import fr.tunaki.stackoverflow.chat.event.MessageReplyEvent;
import fr.tunaki.stackoverflow.chat.event.UserMentionedEvent;
import org.sobotics.chatexchange.chat.ChatHost;
import org.sobotics.chatexchange.chat.Room;
import org.sobotics.chatexchange.chat.event.MessagePostedEvent;
import org.sobotics.chatexchange.chat.event.MessageReplyEvent;
import org.sobotics.chatexchange.chat.event.UserMentionedEvent;

import java.util.function.Consumer;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
import org.sobotics.guttenberg.services.RunnerService;
import org.sobotics.guttenberg.utils.PostUtils;

import fr.tunaki.stackoverflow.chat.ChatHost;
import fr.tunaki.stackoverflow.chat.Room;
import fr.tunaki.stackoverflow.chat.event.MessagePostedEvent;
import fr.tunaki.stackoverflow.chat.event.MessageReplyEvent;
import fr.tunaki.stackoverflow.chat.event.UserMentionedEvent;
import org.sobotics.chatexchange.chat.ChatHost;
import org.sobotics.chatexchange.chat.Room;
import org.sobotics.chatexchange.chat.event.MessagePostedEvent;
import org.sobotics.chatexchange.chat.event.MessageReplyEvent;
import org.sobotics.chatexchange.chat.event.UserMentionedEvent;

public class SOBoticsWorkshopChatRoom implements BotRoom {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;

import fr.tunaki.stackoverflow.chat.Room;
import org.sobotics.chatexchange.chat.Room;

public class CleanerService {
private Room room;
Expand Down
Loading

0 comments on commit 654dabe

Please sign in to comment.