Compare commits

...

5 Commits

Author SHA1 Message Date
Shwoomple 92f66779c1 started work on Member class 2022-02-20 23:11:38 +05:30
BodgeMaster 22e0139466 fixed a minor bug where the bot would exit immediately when deploying instead of waiting for the build to finish 2022-02-20 08:53:04 +01:00
BodgeMaster 4b075d63ed poll slower 2022-02-20 08:45:55 +01:00
BodgeMaster ce026ac1d3 hard-code file path for deployment check 2022-02-20 08:41:52 +01:00
BodgeMaster 7ed5d26a75 fix a potential hang before it occurs 2022-02-20 08:40:57 +01:00
3 changed files with 96 additions and 67 deletions

View File

@ -6,7 +6,7 @@ $(date "+%Y-%m-%d %I:%M:%S%p UTC%:z")
# build the thing into a big jar with all the dependencies # build the thing into a big jar with all the dependencies
mvn clean compile assembly:single mvn clean compile assembly:single
cat /dev/urandom | head -c 10 | base64 > id.txt dd if=/dev/urandom bs=1 count=20 | base64 > id.txt
# TODO: Somehow tell a service that manages the bot to shut it down and replace it with the updated version? # TODO: Somehow tell a service that manages the bot to shut it down and replace it with the updated version?
echo "================================================================================ echo "================================================================================

View File

@ -12,12 +12,14 @@ public class Main{
// Insert your bot's token here // Insert your bot's token here
String token = args[0]; String token = args[0];
CheckDeploy check = new CheckDeploy(3000, "Enter Filename Here"); CheckDeploy check = new CheckDeploy(7500, "/var/www/deployment/Hacky-Quizbot/id.txt");
check.start(); check.start();
DiscordApi api = new DiscordApiBuilder().setToken(token).login().join(); DiscordApi api = new DiscordApiBuilder().setToken(token).login().join();
//Trivia management
Member member = new Member(api);
// Add a listener which answers with "Pong!" if someone writes "!ping" // Add a listener which answers with "Pong!" if someone writes "!ping"
api.addMessageCreateListener(event -> { api.addMessageCreateListener(event -> {
if (event.getMessageContent().equalsIgnoreCase("!ping")) { if (event.getMessageContent().equalsIgnoreCase("!ping")) {
@ -40,29 +42,33 @@ public class Main{
this.filename = filename; this.filename = filename;
} }
public String grabId() { public String grabId() throws FileNotFoundException {
File file = new File(this.filename); File file = new File(this.filename);
Scanner reader; Scanner reader;
String id = new String(); String id = new String();
try {
reader = new Scanner(file); reader = new Scanner(file);
while (reader.hasNextLine()) { while (reader.hasNextLine()) {
id = reader.nextLine(); id = reader.nextLine();
} }
reader.close(); reader.close();
}catch (FileNotFoundException e) {
System.err.println("File not found");
}
return id; return id;
} }
public void run() { public void run() {
this.id = this.grabId(); //replace with correct filename try {
this.id = this.grabId();
} catch (FileNotFoundException e) {
System.err.println("Failed to grab ID on startup.");
System.exit(1);
}
while (true) { while (true) {
String new_id = this.grabId(); String new_id = this.id;
try {
new_id = this.grabId();
} catch (FileNotFoundException e) {
System.err.println("Failed to check ID.");
}
if (!new_id.equals(this.id)) { if (!new_id.equals(this.id)) {
System.exit(0); System.exit(0);
} }

View File

@ -0,0 +1,23 @@
package linux.general.hackyquizbot;
import org.javacord.api.DiscordApi;
import org.javacord.api.entity.user.User;
public class Member {
private DiscordApi api;
private User user;
public Member(DiscordApi api) {
this.api = api;
this.api.addMessageCreateListener(event ->{
if(event.getMessageContent().equalsIgnoreCase("!trivia")) {
if(event.getMessageAuthor().asUser().isPresent()) {
this.user = event.getMessageAuthor().asUser().get();
this.user.sendMessage("Welcome to hell");
}
}
});
}
}