diff --git a/YoutubeCrawler.iml b/YoutubeCrawler.iml
new file mode 100644
index 0000000..fe14238
--- /dev/null
+++ b/YoutubeCrawler.iml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 30d9cbe..368d3d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
YoutubeCrawler
YoutubeCrawler
- 0.0.1-SNAPSHOT
+ 0.0.2
src
@@ -18,6 +18,7 @@
org.apache.maven.plugins
maven-jar-plugin
+ 3.1.1
@@ -60,6 +61,8 @@
1.8
1.8
+ UTF-8
+ UTF-8
@@ -75,7 +78,7 @@
TelegramAPI
TelegramAPI
- 0.0.1-SNAPSHOT
+ 0.0.2
\ No newline at end of file
diff --git a/src/de/mrbesen/youtubecrawler/Main.java b/src/de/mrbesen/youtubecrawler/Main.java
index 27c760a..c2c6eff 100644
--- a/src/de/mrbesen/youtubecrawler/Main.java
+++ b/src/de/mrbesen/youtubecrawler/Main.java
@@ -11,19 +11,17 @@ import org.apache.log4j.Logger;
import de.mrbesen.telegram.MessageBuilder;
import de.mrbesen.telegram.TelegramAPI;
import de.mrbesen.telegram.commands.JSONCommandHandler;
-import de.mrbesen.telegram.event.EventHandler;
-import de.mrbesen.telegram.event.EventListener;
import de.mrbesen.telegram.event.events.UserSendMessageEvent;
import de.mrbesen.telegram.log.Log4JLog;
import de.mrbesen.telegram.objects.TMessage;
import de.mrbesen.telegram.objects.TUser;
-public class Main implements JSONCommandHandler, EventListener{
+public class Main implements JSONCommandHandler {
- private ArrayList admins = new ArrayList<>();//userids of admins
+ private ArrayList admins = new ArrayList<>();//userids of admins
private String adminstr = null;
private long setadminstr = -1;
- private static String abc = "abcdefghijklmnopqrstuvwxyz";//used for random string generation
+ private static final String abc = "abcdefghijklmnopqrstuvwxyz";//used for random string generation
private Logger log = Logger.getLogger(this.getClass().getName());
private TelegramAPI tapi;
private Thread mainthread;
@@ -71,12 +69,8 @@ public class Main implements JSONCommandHandler, EventListener{
//starting BOT API
tapi = new TelegramAPI(Config.prop.getProperty("telegramapi.key"));
- tapi.getCommandManager().registerCommand("random", this);
- tapi.getCommandManager().registerCommand("admin", this);
- tapi.getCommandManager().registerCommand("stats", this);
- tapi.getCommandManager().registerCommand("stop", this);
- tapi.getCommandManager().registerCommand("profiler", this);
- tapi.getEventManager().registerEvent(this);
+ tapi.getCommandManager().registerCommand( this);
+ tapi.getEventManager().registerEvent(UserSendMessageEvent.class, this::onAdmin);
tapi.setHelpText("Send the command /random to get a random video.");
tapi.setUpdateInterval(2000);
tapi.setLog(new Log4JLog());
@@ -90,7 +84,7 @@ public class Main implements JSONCommandHandler, EventListener{
String line = scan.nextLine().trim();
if(!line.isEmpty()) {
try {
- admins.add(Integer.parseInt(line));
+ admins.add(Long.parseLong(line));
} catch(NumberFormatException e) {
e.printStackTrace();
}
@@ -164,7 +158,7 @@ public class Main implements JSONCommandHandler, EventListener{
public boolean onCommand(TUser sender, String cmd, String[] args, TMessage json) {
if(cmd.startsWith("random")) {
String ytid = cra.getDB().getRandom();
- int chatid = json.getChatID();
+ long chatid = json.getChatID();
tapi.sendMessage(new MessageBuilder().setAsync().setText("https://youtube.com/watch?v=" + ytid).setReciver(chatid).build());
@@ -208,7 +202,7 @@ public class Main implements JSONCommandHandler, EventListener{
}
public void broadcastAdmin(String msg) {
- for(int admin : admins) {
+ for(long admin : admins) {
if(admin != 0) {
MessageBuilder mb = new MessageBuilder().setAsync().setText(msg).setReciver(admin);
tapi.sendMessage(mb.build());
@@ -216,7 +210,7 @@ public class Main implements JSONCommandHandler, EventListener{
}
}
- private String getRandomStr(int length) {
+ private static String getRandomStr(int length) {
Random rand = new Random();
String out = "";
for(int i = 0; i < length; i++) {
@@ -225,8 +219,8 @@ public class Main implements JSONCommandHandler, EventListener{
return out;
}
- @EventHandler
- public void onAdmin(UserSendMessageEvent e) {
+ public void onAdmin(Object event) {
+ UserSendMessageEvent e = (UserSendMessageEvent) event;
if(adminstr != null && setadminstr > 0) {
if(e.getMessage() != null && (System.currentTimeMillis() - setadminstr) / 1000 < 60) {
if(e.getMessage().getText() != null) {
@@ -241,6 +235,4 @@ public class Main implements JSONCommandHandler, EventListener{
}
}
}
-
-
}
\ No newline at end of file