From 501207fa41000291a877e2670f0fe858f8564cb3 Mon Sep 17 00:00:00 2001 From: mrbesen Date: Tue, 26 Mar 2019 15:55:44 +0100 Subject: [PATCH] fixed litle bug, admin ids only --- .../mrbesen/youtubecrawler/CrawlerThread.java | 3 +-- src/de/mrbesen/youtubecrawler/Main.java | 21 +++++++++++-------- src/de/mrbesen/youtubecrawler/Server.java | 1 - 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/de/mrbesen/youtubecrawler/CrawlerThread.java b/src/de/mrbesen/youtubecrawler/CrawlerThread.java index 48c704b..50f4233 100644 --- a/src/de/mrbesen/youtubecrawler/CrawlerThread.java +++ b/src/de/mrbesen/youtubecrawler/CrawlerThread.java @@ -1,7 +1,6 @@ package de.mrbesen.youtubecrawler; import java.io.IOException; -import java.util.ArrayList; import java.util.LinkedList; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -78,7 +77,7 @@ public class CrawlerThread implements Runnable { */ LinkedList[] report() { lockforreport = true; - LinkedList[] out = new LinkedList[] {(LinkedList) crawled, (LinkedList) found}; + LinkedList[] out = new LinkedList[] {(LinkedList) crawled, (LinkedList) found}; crawled = new LinkedList<>(); found = new LinkedList<>(); lockforreport = false; diff --git a/src/de/mrbesen/youtubecrawler/Main.java b/src/de/mrbesen/youtubecrawler/Main.java index e2c1b8d..1f58eec 100644 --- a/src/de/mrbesen/youtubecrawler/Main.java +++ b/src/de/mrbesen/youtubecrawler/Main.java @@ -7,7 +7,6 @@ import java.util.Random; import java.util.Scanner; import org.apache.log4j.Logger; -import org.json.JSONObject; import de.mrbesen.telegram.MessageBuilder; import de.mrbesen.telegram.TelegramAPI; @@ -21,7 +20,7 @@ import de.mrbesen.telegram.objects.TUser; public class Main implements JSONCommandHandler, EventListener{ - private ArrayList admins = new ArrayList<>();//usernames 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 @@ -53,7 +52,6 @@ public class Main implements JSONCommandHandler, EventListener{ startcrawler = startcra; } - private void run() { mainthread = Thread.currentThread(); @@ -91,7 +89,11 @@ public class Main implements JSONCommandHandler, EventListener{ while(scan.hasNext()) { String line = scan.nextLine().trim(); if(!line.isEmpty()) { - admins.add(line); + try { + admins.add(Integer.parseInt(line)); + } catch(NumberFormatException e) { + e.printStackTrace(); + } } } scan.close(); @@ -206,10 +208,11 @@ public class Main implements JSONCommandHandler, EventListener{ } public void broadcastAdmin(String msg) { - for(String admin : admins) { - TUser adm = tapi.getUser(admin); - if(adm != null) - adm.sendMessage(msg); + for(int admin : admins) { + if(admin != 0) { + MessageBuilder mb = new MessageBuilder().setAsync().setText(msg).setReciver(admin); + tapi.sendMessage(mb.build()); + } } } @@ -228,7 +231,7 @@ public class Main implements JSONCommandHandler, EventListener{ if(e.getMessage() != null && (System.currentTimeMillis() - setadminstr) / 1000 < 60) { if(e.getMessage().getText() != null) { if(e.getMessage().getText().equals(adminstr)) { - admins.add(e.getUser().getName()); + admins.add(e.getUser().getID()); e.getMessage().reply("You are now Admin!"); adminstr = null; setadminstr = -1; diff --git a/src/de/mrbesen/youtubecrawler/Server.java b/src/de/mrbesen/youtubecrawler/Server.java index 71eb060..ad77574 100644 --- a/src/de/mrbesen/youtubecrawler/Server.java +++ b/src/de/mrbesen/youtubecrawler/Server.java @@ -2,7 +2,6 @@ package de.mrbesen.youtubecrawler; import java.io.IOException; import java.io.PrintWriter; -import java.net.InetAddress; import java.net.ServerSocket; import java.net.Socket; import java.net.SocketTimeoutException;