greg6775/Hadder
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 54 Packages Wiki Activity Actions

Sync with master #685

Merged
greg6775 merged 13 commits from master into greg-dev 2021-07-21 23:20:14 +02:00
Conversation 0 Commits 13 Files changed 1 +7 -4
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 6c8b697455 - Show all commits

2
pom.xml
View file

@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>Hadder</groupId> <groupId>Hadder</groupId>
<artifactId>Hadder</artifactId> <artifactId>Hadder</artifactId>
<version>2.0.0</version> <version>2.0.1</version>
<name>Hadder</name> <name>Hadder</name>
<inceptionYear>2019</inceptionYear> <inceptionYear>2019</inceptionYear>
<description>Hadder is a multi-purpose Discord bot.</description> <description>Hadder is a multi-purpose Discord bot.</description>

9
src/main/java/one/bbn/hadder/db/Mongo.java
View file

@ -43,7 +43,11 @@ public class Mongo {
BasicDBObject whereQuery = new BasicDBObject(); BasicDBObject whereQuery = new BasicDBObject();
whereQuery.put(where, what); whereQuery.put(where, what);
FindIterable<Document> it = collection.find(whereQuery); FindIterable<Document> it = collection.find(whereQuery);
return it.cursor().next().get(column); try {
return it.cursor().next().get(column);
} catch (NoSuchElementException ignore) {
return null;
}
} }
public JSONObject getObjectByID(String collection, String id) { public JSONObject getObjectByID(String collection, String id) {
@ -133,8 +137,7 @@ public class Mongo {
} }
public boolean hasStarboardMessage(String message_id) { public boolean hasStarboardMessage(String message_id) {
this.getByID("stars", "id", message_id, "guild"); return this.getByID("stars", "id", message_id, "guild") != null;
return true;
} }
public void insertStarboardMessage(String message_id, String guild_id, String starboard_message_id) { public void insertStarboardMessage(String message_id, String guild_id, String starboard_message_id) {