MrBesen
/
YoutubeCrawler
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

compatible with new version of telegramAPI

This commit is contained in:
mrbesen 2019-03-26 15:26:10 +01:00
parent 5519ab072d
commit 1874c2bec4
Signed by: MrBesen
GPG Key ID: 596B2350DCD67504
2 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/de/mrbesen/youtubecrawler/Main.java
View File

@ -16,6 +16,7 @@ import de.mrbesen.telegram.event.EventHandler;
import de.mrbesen.telegram.event.EventListener; import de.mrbesen.telegram.event.EventListener;
import de.mrbesen.telegram.event.events.UserSendMessageEvent; import de.mrbesen.telegram.event.events.UserSendMessageEvent;
import de.mrbesen.telegram.log.Log4JLog; import de.mrbesen.telegram.log.Log4JLog;
import de.mrbesen.telegram.objects.TMessage;
import de.mrbesen.telegram.objects.TUser; import de.mrbesen.telegram.objects.TUser;
public class Main implements JSONCommandHandler, EventListener{ public class Main implements JSONCommandHandler, EventListener{
@ -158,26 +159,13 @@ public class Main implements JSONCommandHandler, EventListener{
} }
@Override @Override
public boolean onCommand(TUser sender, String cmd, String[] args) { public boolean onCommand(TUser sender, String cmd, String[] args, TMessage json) {
//unused
return false;
}
@Override
public boolean onCommand(TUser sender, String cmd, String[] args, JSONObject j) {
if(cmd.startsWith("random")) { if(cmd.startsWith("random")) {
String ytid = cra.getDB().getRandom(); String ytid = cra.getDB().getRandom();
int chatid = 0; int chatid = json.getChatID();
try {
//log.debug(j.toString()); tapi.sendMessage(new MessageBuilder().setAsync().setText("https://youtube.com/watch?v=" + ytid).setReciver(chatid).build());
chatid = j.getJSONObject("chat").getInt("id");
} catch(Throwable t) { t.printStackTrace(); }
//log.info("chatid: " + chatid);
if(chatid != 0) {
tapi.sendMessage(new MessageBuilder().setText("https://youtube.com/watch?v=" + ytid).setReciver(chatid).build());
} else {
sender.sendMessage("https://youtube.com/watch?v=" + ytid);
}
return true; return true;
} else if(cmd.equals("admin")) { } else if(cmd.equals("admin")) {
if(admins.contains(sender.getName())) { if(admins.contains(sender.getName())) {
@ -250,4 +238,6 @@ public class Main implements JSONCommandHandler, EventListener{
} }
} }
} }
} }

18
src/de/mrbesen/youtubecrawler/Server.java
View File

@ -20,7 +20,7 @@ public class Server implements Runnable {
public Server(DB d) { public Server(DB d) {
db = d; db = d;
} }
void start() { void start() {
run = true; run = true;
t = new Thread(this, "Server"); t = new Thread(this, "Server");
@ -35,21 +35,21 @@ public class Server implements Runnable {
public void run() { public void run() {
try { try {
final int port = 2419; final int port = 2419;
ssoc = new ServerSocket(port, -1, InetAddress.getByName("::1")); ssoc = new ServerSocket(port, -1);
//ssoc.bind(new InetSocketAddress(, port)); //ssoc.bind(new InetSocketAddress(, port));
ssoc.setSoTimeout(5); ssoc.setSoTimeout(5);
log.info("opened Server at port " + port); log.info("opened Server at port " + port);
while(run) { while(run) {
try { try {
Socket client = ssoc.accept(); Socket client = ssoc.accept();
if(client.getInetAddress().isLoopbackAddress()) { //if(client.getInetAddress().isLoopbackAddress()) {
PrintWriter out = new PrintWriter(client.getOutputStream()); PrintWriter out = new PrintWriter(client.getOutputStream());
out.println(db.getRandom()); out.println(db.getRandom());
out.flush(); out.flush();
out.close(); out.close();
} else { /*} else {
log.info("client connected: " + client.getInetAddress().toString()); log.info("client connected: " + client.getInetAddress().toString());
} }*/
client.close(); client.close();
} catch(SocketTimeoutException ignored) {} } catch(SocketTimeoutException ignored) {}
} }