Skip to content
This repository has been archived by the owner on Sep 25, 2024. It is now read-only.

Commit

Permalink
Merge branch 'master' into 30-remove-unused-code
Browse files Browse the repository at this point in the history
  • Loading branch information
@Trip-kun
Trip-kun authored Jan 14, 2024
2 parents aa10138 + 8451704 commit 1a0458c
Show file tree
Hide file tree
Showing 11 changed files with 55 additions and 35 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ FROM openjdk:17-slim
WORKDIR /app
COPY --from=BUILD /build/build/libs/oatmeal-1.0-all.jar oatmeal.jar
WORKDIR /app/work
ENTRYPOINT java -jar /app/oatmeal.jar
ENTRYPOINT java -jar /app/oatmeal.jar -Xms1024m -Xmx4096m
3 changes: 1 addition & 2 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ tasks.run.dependsOn(getTOKEN) */
mainClassName = 'wtf.triplapeeck.oatmeal.Main'
group 'wtf.triplapeeck'
version '1.0'
def jdaVersion = '5.0.0-beta.12'

def jdaVersion = '5.0.0-beta.19'
repositories {
mavenCentral()
jcenter()
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/wtf/triplapeeck/oatmeal/commands/oatmeal/admin/SetAdmin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import net.dv8tion.jda.api.entities.User;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import org.jetbrains.annotations.NotNull;
import wtf.triplapeeck.oatmeal.Config;
import wtf.triplapeeck.oatmeal.DataCarriage;
import wtf.triplapeeck.oatmeal.Main;
import wtf.triplapeeck.oatmeal.entities.UserData;
Expand All @@ -25,6 +26,10 @@ public void handler(MessageReceivedEvent event, DataCarriage carriage, ThreadMan
List<User> userList = carriage.message.getMentions().getUsers();
User user = userList.get(0);
UserData usUsr = Main.dataManager.getUserData(user.getId());
if (Config.getConfig().owners.contains(Long.valueOf(usUsr.getID()))) {
carriage.channel.sendMessage(user.getName() + " is in the Owner Config, cannot change as owner config also allows for admin status").queue();
return;
}
usUsr.setAdmin(!usUsr.isAdmin());
carriage.channel.sendMessage(user.getName() + " now " + Utils.isNot(usUsr.isAdmin()) + " an Admin").queue();

Expand Down
8 changes: 6 additions & 2 deletions src/main/java/wtf/triplapeeck/oatmeal/commands/oatmeal/owner/SetOwner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import net.dv8tion.jda.api.entities.User;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import org.jetbrains.annotations.NotNull;
import wtf.triplapeeck.oatmeal.Config;
import wtf.triplapeeck.oatmeal.DataCarriage;
import wtf.triplapeeck.oatmeal.Main;
import wtf.triplapeeck.oatmeal.entities.UserData;
Expand All @@ -20,9 +21,12 @@ public void handler(MessageReceivedEvent event, DataCarriage carriage, ThreadMan
List<User> userList = carriage.message.getMentions().getUsers();
User user = userList.get(0);
UserData usUsr = Main.dataManager.getUserData(user.getId());

if (Config.getConfig().owners.contains(Long.valueOf(usUsr.getID()))) {
carriage.channel.sendMessage(user.getName() + " is in the Owner Config, cannot change").queue();
return;
}
usUsr.setOwner(!usUsr.isOwner());
carriage.channel.sendMessage(user.getName() + " now " + Utils.isNot(usUsr.isAdmin()) + " an Owner").queue();
carriage.channel.sendMessage(user.getName() + " now " + Utils.isNot(usUsr.isOwner()) + " an Owner").queue();
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/wtf/triplapeeck/oatmeal/entities/mariadb/MariaReminder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class MariaReminder extends ReminderData {
@DatabaseField(canBeNull = false, foreign = true, foreignAutoRefresh = true)
private @NotNull MariaUser user;

@DatabaseField(canBeNull = false)
@DatabaseField(canBeNull = false, width=5000)
private @NotNull String text;

@DatabaseField(canBeNull = false)
Expand Down
9 changes: 3 additions & 6 deletions src/main/java/wtf/triplapeeck/oatmeal/entities/mariadb/MariaUser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,10 @@ public synchronized Boolean isAdmin() {
}

@Override
public void setAdmin(Boolean admin) {

public void setAdmin(@NotNull Boolean admin) {
this.admin=admin;
}

public synchronized void setAdmin(@NotNull boolean admin) {
this.admin = (admin || isOwner());
}

@NotNull
public synchronized Boolean isOwner() {
Expand All @@ -74,7 +71,7 @@ public void setOwner(Boolean owner) {
}

public synchronized void setOwner(@NotNull boolean owner) {
this.owner = (owner || Config.getConfig().owners.contains(userId));
this.owner = owner;
}

public Boolean isCurrencyPreference() {
Expand Down
8 changes: 5 additions & 3 deletions src/main/java/wtf/triplapeeck/oatmeal/events/GuildEmojiAddEvent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,10 @@ public void run() {
try {
if (messageReaction.getEmoji().asUnicode().getAsCodepoints().equalsIgnoreCase("U+2b50")) {
for (Iterator<User> it = messageReaction.retrieveUsers().stream().iterator(); count >= guildEntity.getStarboardLimit() || it.hasNext(); ) {
it.next();
count++;
User user = it.next();
if (user.getIdLong()!= event.retrieveMessage().complete().getIdLong()) {
count++;
}

}
}
Expand All @@ -76,7 +78,7 @@ public void run() {
int height = 0;
int width = 0;
for (Message.Attachment a : message.getAttachments()) {
if (url == "") {
if (url.isBlank()) {
url = a.getUrl();
height = a.getHeight();
width = a.getWidth();
Expand Down
8 changes: 5 additions & 3 deletions src/main/java/wtf/triplapeeck/oatmeal/events/GuildEmojiRemoveEvent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,10 @@ public void run() {
try {
if (messageReaction.getEmoji().asUnicode().getAsCodepoints().equalsIgnoreCase("U+2b50")) {
for (Iterator<User> it = messageReaction.retrieveUsers().stream().iterator(); count >= guildEntity.getStarboardLimit() || it.hasNext(); ) {
it.next();
count++;
User user = it.next();
if (user.getIdLong()!= event.retrieveMessage().complete().getIdLong()) {
count++;
}

}
}
Expand All @@ -72,7 +74,7 @@ public void run() {
int height=0;
int width=0;
for (Message.Attachment a : message.getAttachments()) {
if (url=="") {
if (url.isBlank()) {
url=a.getUrl();
height=a.getHeight();
width=a.getWidth();
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/wtf/triplapeeck/oatmeal/managers/DataManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public synchronized void requestToEnd() {
public abstract ReminderData createReminder(String text, Long unix, MariaUser user);
public abstract List<? extends ReminderData> getAllReminderData();

public GuildData getGuildData(String id) {
public synchronized GuildData getGuildData(String id) {
GuildData guildData;
if (guildCache.get(id)==null) {
guildData=getRawGuildData(id);
Expand All @@ -52,7 +52,7 @@ public GuildData getGuildData(String id) {
guildData.request();
return guildData;
}
public UserData getUserData(String id) {
public synchronized UserData getUserData(String id) {
UserData userData;
if (userCache.get(id)==null) {
userData=getRawUserData(id);
Expand All @@ -63,7 +63,7 @@ public UserData getUserData(String id) {
userData.request();
return userData;
}
public ChannelData getChannelData(String id) {
public synchronized ChannelData getChannelData(String id) {
ChannelData channelData;
if (channelCache.get(id)==null) {
channelData = getRawChannelData(id);
Expand All @@ -74,7 +74,7 @@ public ChannelData getChannelData(String id) {
channelData.request();
return channelData;
}
public MemberData getMemberData(String id) {
public synchronized MemberData getMemberData(String id) {
MemberData memberData;
if (memberCache.get(id)==null) {
memberData = getRawMemberData(id);
Expand All @@ -85,7 +85,7 @@ public MemberData getMemberData(String id) {
memberData.request();
return memberData;
}
public void saveAll() {
public synchronized void saveAll() {
temp.addAll(guildCache.keySet());
for (String key: temp) {
saveGuildData(key, false);
Expand Down
25 changes: 14 additions & 11 deletions src/main/java/wtf/triplapeeck/oatmeal/managers/MariaManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public synchronized MariaUser getRawUserData(String id) {
return userEntity;
}

public void saveGuildData(String key, boolean remove) {
public synchronized void saveGuildData(String key, boolean remove) {
MariaGuild guildEntity =(MariaGuild) guildCache.get(key);
if (remove) {
guildCache.remove(key);
Expand All @@ -64,13 +64,13 @@ public void saveGuildData(String key, boolean remove) {
throw new RuntimeException(e);
}
}
public void saveUserData(String key, boolean remove) {
public synchronized void saveUserData(String key, boolean remove) {
MariaUser userEntity = (MariaUser) userCache.get(key);
if (remove) {
userCache.remove(key);
}
}
public MariaChannel getRawChannelData(String id) {
public synchronized MariaChannel getRawChannelData(String id) {
MariaChannel mariaChannel;
try {
mariaChannel = ORMLiteDatabaseUtil.getChannelEntity(id);
Expand All @@ -83,14 +83,17 @@ public MariaChannel getRawChannelData(String id) {
}
return mariaChannel;
}
public void saveChannelData(String key, boolean remove) {
public synchronized void saveChannelData(String key, boolean remove) {
MariaChannel mariaChannel = (MariaChannel) channelCache.get(key);
if (remove) {
channelCache.remove(key);
}
try {
String step;
while (true) {
if (mariaChannel==null) {
return;
}
try {
step = gson.toJson(mariaChannel.getTable());
break;
Expand All @@ -105,7 +108,7 @@ public void saveChannelData(String key, boolean remove) {
throw new RuntimeException(e);
}
}
public MariaMember getRawMemberData(String id) {
public synchronized MariaMember getRawMemberData(String id) {
MariaMember mariaMember;
try {
mariaMember = ORMLiteDatabaseUtil.getMemberEntity(id);
Expand All @@ -118,7 +121,7 @@ public MariaMember getRawMemberData(String id) {
}
return mariaMember;
}
public void saveMemberData(String key, boolean remove) {
public synchronized void saveMemberData(String key, boolean remove) {
MariaMember mariaMember = (MariaMember) memberCache.get(key);
if (remove) {
memberCache.remove(key);
Expand All @@ -131,7 +134,7 @@ public void saveMemberData(String key, boolean remove) {
}


public void removeReminderData(Long id) {
public synchronized void removeReminderData(Long id) {
try {
ORMLiteDatabaseUtil.deleteReminderEntity(id);
} catch (SQLException e) {
Expand All @@ -140,7 +143,7 @@ public void removeReminderData(Long id) {
}


public void removeReminderDatas(Collection<Long> ids) {
public synchronized void removeReminderDatas(Collection<Long> ids) {
try {
ORMLiteDatabaseUtil.deleteReminderEntities(ids);
} catch(SQLException e) {
Expand All @@ -149,7 +152,7 @@ public void removeReminderDatas(Collection<Long> ids) {
}

@Override
public void saveReminderData(ReminderData reminderData) {
public synchronized void saveReminderData(ReminderData reminderData) {
MariaReminder reminderEntity = (MariaReminder) reminderData;
try {
ORMLiteDatabaseUtil.updateReminderEntity(reminderEntity);
Expand All @@ -159,12 +162,12 @@ public void saveReminderData(ReminderData reminderData) {
}

@Override
public ReminderData createReminder(String text, Long unix, MariaUser user) {
public synchronized ReminderData createReminder(String text, Long unix, MariaUser user) {
return new MariaReminder(unix, text, user);
}

@Override
public List<? extends ReminderData> getAllReminderData() {
public synchronized List<? extends ReminderData> getAllReminderData() {
try {
return ORMLiteDatabaseUtil.getAllReminderEntity();
} catch (SQLException e) {
Expand Down
10 changes: 9 additions & 1 deletion src/main/java/wtf/triplapeeck/oatmeal/util/ORMLiteDatabaseUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.j256.ormlite.dao.DaoManager;
import com.j256.ormlite.jdbc.JdbcPooledConnectionSource;
import com.j256.ormlite.table.TableUtils;
import org.apache.commons.logging.Log;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import wtf.triplapeeck.oatmeal.Config;
Expand Down Expand Up @@ -52,7 +53,7 @@ public ORMLiteDatabaseUtil() throws SQLException {
upgrade();
}

private static final int VERSION=2;
private static final int VERSION=3;

public static int getVersion() {
return VERSION;
Expand Down Expand Up @@ -81,6 +82,13 @@ public static void upgrade() {
}
case 2:
Logger.basicLog(Logger.Level.INFO, "Database now ORM Version 2");
try {
userDao.executeRaw("ALTER TABLE oatmeal_reminders MODIFY COLUMN text VARCHAR (5000);");
} catch (SQLException e) {
throw new RuntimeException(e);
}
case 3:
Logger.basicLog(Logger.Level.INFO, "Database now ORM Version 3");
}
config.version=VERSION;
Config.saveConfig();
Expand Down

0 comments on commit 1a0458c

Please sign in to comment.