anthorob/netneutrality
1
0 Fork 0
Code Issues 1 Pull Requests 10 Actions Packages Projects Releases Wiki Activity

Add check to prevent null exceptions to isAdmin function

Browse Source
This commit is contained in:
anthorob committed 2022-01-04 18:38:13 -05:00
1 parent 4ca4fa7dba
commit 3bccd6ce5a
2 files changed
+3 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/netneutrality/db/MysqlDatabase.java
-1
View File
@@ -138,7 +138,6 @@ public class MysqlDatabase {
* @return a ResultSet object, which can be converted to a model using {@link MysqlDatabase#convertToTableModel(ResultSet, String)} * @return a ResultSet object, which can be converted to a model using {@link MysqlDatabase#convertToTableModel(ResultSet, String)}
*/ */
protected synchronized ResultSet prepareAndExecute(String sql, Object... params) { protected synchronized ResultSet prepareAndExecute(String sql, Object... params) {
logger.debug(sql);
try { try {
PreparedStatement query = connection.prepareStatement(sql); PreparedStatement query = connection.prepareStatement(sql);
src/main/java/netneutrality/utils/UserFunction.java
+3 -1
View File
@@ -3,13 +3,15 @@ package netneutrality.utils;
import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Role; import net.dv8tion.jda.api.entities.Role;
import net.dv8tion.jda.api.entities.User;
public class UserFunction { public class UserFunction {
public static boolean isAdmin(Member user) { public static boolean isAdmin(Member user) {
// This check will only be present during the development of the bot // This check will only be present during the development of the bot
if (user.getUser().getId().equals(Settings.getInstance().getCreator().getId())) { User creator = Settings.getInstance().getCreator();
if (creator != null && user.getId().equals(creator.getId())) {
return true; return true;
} }