fixed litle bug, admin ids only

This commit is contained in:
mrbesen 2019-03-26 15:55:44 +01:00
parent d56f1271c4
commit 501207fa41
Signed by untrusted user: MrBesen
GPG Key ID: 596B2350DCD67504
3 changed files with 13 additions and 12 deletions

View File

@ -1,7 +1,6 @@
package de.mrbesen.youtubecrawler; package de.mrbesen.youtubecrawler;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@ -78,7 +77,7 @@ public class CrawlerThread implements Runnable {
*/ */
LinkedList<String>[] report() { LinkedList<String>[] report() {
lockforreport = true; lockforreport = true;
LinkedList[] out = new LinkedList[] {(LinkedList) crawled, (LinkedList) found}; LinkedList<String>[] out = new LinkedList[] {(LinkedList) crawled, (LinkedList) found};
crawled = new LinkedList<>(); crawled = new LinkedList<>();
found = new LinkedList<>(); found = new LinkedList<>();
lockforreport = false; lockforreport = false;

View File

@ -7,7 +7,6 @@ import java.util.Random;
import java.util.Scanner; import java.util.Scanner;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.json.JSONObject;
import de.mrbesen.telegram.MessageBuilder; import de.mrbesen.telegram.MessageBuilder;
import de.mrbesen.telegram.TelegramAPI; import de.mrbesen.telegram.TelegramAPI;
@ -21,7 +20,7 @@ import de.mrbesen.telegram.objects.TUser;
public class Main implements JSONCommandHandler, EventListener{ public class Main implements JSONCommandHandler, EventListener{
private ArrayList<String> admins = new ArrayList<>();//usernames of admins private ArrayList<Integer> admins = new ArrayList<>();//userids of admins
private String adminstr = null; private String adminstr = null;
private long setadminstr = -1; private long setadminstr = -1;
private static String abc = "abcdefghijklmnopqrstuvwxyz";//used for random string generation private static String abc = "abcdefghijklmnopqrstuvwxyz";//used for random string generation
@ -53,7 +52,6 @@ public class Main implements JSONCommandHandler, EventListener{
startcrawler = startcra; startcrawler = startcra;
} }
private void run() { private void run() {
mainthread = Thread.currentThread(); mainthread = Thread.currentThread();
@ -91,7 +89,11 @@ public class Main implements JSONCommandHandler, EventListener{
while(scan.hasNext()) { while(scan.hasNext()) {
String line = scan.nextLine().trim(); String line = scan.nextLine().trim();
if(!line.isEmpty()) { if(!line.isEmpty()) {
admins.add(line); try {
admins.add(Integer.parseInt(line));
} catch(NumberFormatException e) {
e.printStackTrace();
}
} }
} }
scan.close(); scan.close();
@ -206,10 +208,11 @@ public class Main implements JSONCommandHandler, EventListener{
} }
public void broadcastAdmin(String msg) { public void broadcastAdmin(String msg) {
for(String admin : admins) { for(int admin : admins) {
TUser adm = tapi.getUser(admin); if(admin != 0) {
if(adm != null) MessageBuilder mb = new MessageBuilder().setAsync().setText(msg).setReciver(admin);
adm.sendMessage(msg); 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() != null && (System.currentTimeMillis() - setadminstr) / 1000 < 60) {
if(e.getMessage().getText() != null) { if(e.getMessage().getText() != null) {
if(e.getMessage().getText().equals(adminstr)) { if(e.getMessage().getText().equals(adminstr)) {
admins.add(e.getUser().getName()); admins.add(e.getUser().getID());
e.getMessage().reply("You are now Admin!"); e.getMessage().reply("You are now Admin!");
adminstr = null; adminstr = null;
setadminstr = -1; setadminstr = -1;

View File

@ -2,7 +2,6 @@ package de.mrbesen.youtubecrawler;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.net.InetAddress;
import java.net.ServerSocket; import java.net.ServerSocket;
import java.net.Socket; import java.net.Socket;
import java.net.SocketTimeoutException; import java.net.SocketTimeoutException;