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

Code improvements

Browse source
This commit is contained in:
GregTCLTK 2019-12-25 11:45:52 +01:00
parent cb719f01ae
commit 1223e98552
No known key found for this signature in database
GPG key ID: A91BADE5C070FF67
1 changed files with 35 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
src/main/java/com/bbn/hadder/Rethink.java
View file

@ -4,7 +4,6 @@ import com.bbn.hadder.core.Config;
import com.rethinkdb.RethinkDB; import com.rethinkdb.RethinkDB;
import com.rethinkdb.gen.exc.ReqlOpFailedError; import com.rethinkdb.gen.exc.ReqlOpFailedError;
import com.rethinkdb.net.Connection; import com.rethinkdb.net.Connection;
import com.rethinkdb.net.Cursor;
import org.json.JSONArray; import org.json.JSONArray;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
@ -56,33 +55,31 @@ public class Rethink {
public Object get(String table, String where, String value, String column) { public Object get(String table, String where, String value, String column) {
JSONArray array = this.getAsArray(table, where, value); JSONArray array = this.getAsArray(table, where, value);
if (array.length()>0) if (array.length() > 0)
if (array.getJSONObject(0).has(column)) if (array.getJSONObject(0).has(column))
return array.getJSONObject(0).get(column); return array.getJSONObject(0).get(column);
else return null; else return null;
else return null; else return null;
} }
public String update(String table, String wherevalue, String what, String whatvalue) { public void update(String table, String value, String what, String whatvalue) {
String out = "";
try { try {
Cursor cursor = r.table(table).get(wherevalue).update(r.hashMap(what, whatvalue)).run(conn); r.table(table).get(value).update(r.hashMap(what, whatvalue)).run(conn);
out=cursor.toString(); } catch (ClassCastException e) {
} catch (ClassCastException ignored) {} e.printStackTrace();
return out; }
} }
public String insert(String table, Object object) { public void insert(String table, Object object) {
String out = "";
try { try {
Cursor cursor = r.table(table).insert(object).run(conn); r.table(table).insert(object).run(conn);
out = cursor.next().toString(); } catch (ClassCastException e) {
} catch (ClassCastException ignored) {} e.printStackTrace();
return out; }
} }
public void remove(String table, String where, String wherevalue) { public void remove(String table, String where, String value) {
r.table(table).filter(row -> row.g(where.toLowerCase()).eq(wherevalue)).delete().run(conn); r.table(table).filter(row -> row.g(where.toLowerCase()).eq(value)).delete().run(conn);
} }
public void setup() { public void setup() {
@ -108,16 +105,16 @@ public class Rethink {
} }
} }
public void setUserPrefix(String prefix, String userid) { public void setUserPrefix(String prefix, String user_id) {
this.update("user", userid, "prefix", prefix); this.update("user", user_id, "prefix", prefix);
} }
public String getUserPrefix(String id) { public String getUserPrefix(String id) {
return (String) this.get("user", "id", id, "prefix"); return (String) this.get("user", "id", id, "prefix");
} }
public void setGuildPrefix(String prefix, String guildid) { public void setGuildPrefix(String prefix, String guild_id) {
this.update("server", guildid, "prefix", prefix); this.update("server", guild_id, "prefix", prefix);
} }
public String getGuildPrefix(String id) { public String getGuildPrefix(String id) {
@ -139,40 +136,40 @@ public class Rethink {
this.insert("user", r.hashMap("id", id).with("prefix", "h.").with("language", "en")); this.insert("user", r.hashMap("id", id).with("prefix", "h.").with("language", "en"));
} }
public void setNeededstars(String stars, String guildid) { public void setNeededstars(String stars, String guild_id) {
this.update("server", guildid, "neededstars", stars); this.update("server", guild_id, "neededstars", stars);
} }
public String getNeededstars(String guildid) { public String getNeededstars(String guild_id) {
return (String) this.get("server", "id", guildid, "neededstars"); return (String) this.get("server", "id", guild_id, "neededstars");
} }
public void setStarboardChannel(String guildid, String channelid) { public void setStarboardChannel(String guild_id, String channel_id) {
this.update("server", guildid, "starboard", channelid); this.update("server", guild_id, "starboard", channel_id);
} }
public String getStarboardChannel(String guildid) { public String getStarboardChannel(String guild_id) {
return (String) this.get("server", "id", guildid, "starboard"); return (String) this.get("server", "id", guild_id, "starboard");
} }
public boolean hasStarboardChannel(String guildid) { public boolean hasStarboardChannel(String guild_id) {
return !this.get("server", "id", guildid, "starboard").equals(""); return !this.get("server", "id", guild_id, "starboard").equals("");
} }
public void insertStarboardMessage(String messageid, String guildid, String starboardmessageid) { public void insertStarboardMessage(String message_id, String guild_id, String starboardmessageid) {
this.insert("stars", r.hashMap("id", messageid).with("guild", guildid).with("starboardmsg", starboardmessageid)); this.insert("stars", r.hashMap("id", message_id).with("guild", guild_id).with("starboardmsg", starboardmessageid));
} }
public String getStarboardMessage(String messageid) { public String getStarboardMessage(String message_id) {
return (String) this.get("stars", "id", messageid, "starboardmsg"); return (String) this.get("stars", "id", message_id, "starboardmsg");
} }
public void removeStarboardMessage(String messageid) { public void removeStarboardMessage(String message_id) {
this.remove("stars", "id", messageid); this.remove("stars", "id", message_id);
} }
public boolean hasStarboardMessage(String messageid) { public boolean hasStarboardMessage(String message_id) {
return this.get("stars", "id", messageid, "guild") != null; return this.get("stars", "id", message_id, "guild") != null;
} }
public void updateRules(String guild_id, String message_id, String role_id, String accept_emote, String decline_emote) { public void updateRules(String guild_id, String message_id, String role_id, String accept_emote, String decline_emote) {