From b308a8bc252938f942c8b038f2d305af9b6c8fac Mon Sep 17 00:00:00 2001 From: Greg Date: Sat, 27 Mar 2021 12:26:52 +0100 Subject: [PATCH 1/2] Prevent error in getByID function --- src/main/java/one/bbn/hadder/db/Mongo.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/one/bbn/hadder/db/Mongo.java b/src/main/java/one/bbn/hadder/db/Mongo.java index f89916bd..3706013a 100644 --- a/src/main/java/one/bbn/hadder/db/Mongo.java +++ b/src/main/java/one/bbn/hadder/db/Mongo.java @@ -43,7 +43,11 @@ public Object getByID(String collection_name, String where, String what, String BasicDBObject whereQuery = new BasicDBObject(); whereQuery.put(where, what); FindIterable 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) { @@ -133,8 +137,7 @@ public void push(MongoUser user) { } public boolean hasStarboardMessage(String message_id) { - this.getByID("stars", "id", message_id, "guild"); - return true; + return this.getByID("stars", "id", message_id, "guild") != null; } public void insertStarboardMessage(String message_id, String guild_id, String starboard_message_id) { From ca1dd18dfa498ceff3c359dc07ed6fd86a521e0d Mon Sep 17 00:00:00 2001 From: Greg Date: Sat, 27 Mar 2021 12:27:56 +0100 Subject: [PATCH 2/2] Bump version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f7fd1e24..26b7ba37 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 Hadder Hadder - 2.0.0 + 2.0.1 Hadder 2019 Hadder is a multi-purpose Discord bot.