Skip to content

address code changes addressed by ankitsmt211 #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
suryatejess wants to merge 1 commit into
base: feature/cake-day
Choose a base branch
from
Open

address code changes addressed by ankitsmt211 #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion application/config.json.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
"rolePattern": "Top Helper.*",
"assignmentChannelPattern": "community-commands",
"announcementChannelPattern": "hall-of-fame"
}
},
"cakeDayConfig": {
"rolePattern": "Cake Day"
}
Expand Down
42 changes: 4 additions & 38 deletions application/src/main/java/org/togetherjava/tjbot/features/cakeday/CakeDayListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,12 @@
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.User;
import net.dv8tion.jda.api.events.guild.member.GuildMemberJoinEvent;
import net.dv8tion.jda.api.events.guild.member.GuildMemberRemoveEvent;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.jetbrains.annotations.NotNull;

import org.togetherjava.tjbot.db.generated.tables.records.CakeDaysRecord;
import org.togetherjava.tjbot.features.EventReceiver;

import java.util.Optional;

/**
* A listener class responsible for handling cake day related events.
Expand All @@ -24,43 +21,12 @@ public CakeDayListener(CakeDayService cakeDayService) {
this.cakeDayService = cakeDayService;
}

/**
* Handles the event of a message being received in a guild.
* <p>
* It caches the user's cake day and inserts the member's cake day into the database if not
* already present.
*
* @param event the {@link MessageReceivedEvent} representing the message received
*/
@Override
public void onMessageReceived(@NotNull MessageReceivedEvent event) {
User author = event.getAuthor();
public void onGuildMemberJoin(GuildMemberJoinEvent event) {
Guild guild = event.getGuild();
Member member = event.getMember();
long authorId = author.getIdLong();
long guildId = event.getGuild().getIdLong();

if (member == null || author.isBot() || author.isSystem()) {
return;
}


if (cakeDayService.hasMemberCakeDayToday(member)) {
cakeDayService.addCakeDayRole(member);
return;
}

if (cakeDayService.isUserCached(author)) {
return;
}

cakeDayService.addToCache(author);
Optional<CakeDaysRecord> cakeDaysRecord =
cakeDayService.findUserCakeDayFromDatabase(authorId);
if (cakeDaysRecord.isPresent()) {
return;
}

cakeDayService.insertMemberCakeDayToDatabase(member, guildId);
cakeDayService.insertUserCakeDay(member, guild);
}

/**
Expand Down
7 changes: 6 additions & 1 deletion application/src/main/java/org/togetherjava/tjbot/features/cakeday/CakeDayService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,12 @@ private Optional<Role> getCakeDayRoleFromGuild(Guild guild) {
*/
protected void removeUserCakeDay(User user, Guild guild) {
removeMemberCakeDayFromDatabase(user.getIdLong(), guild.getIdLong());
cakeDaysCache.remove(guild.getId());
cakeDaysCache.remove(user.getId());
}

protected void insertUserCakeDay(Member member, Guild guild) {
insertMemberCakeDayToDatabase(member, guild.getIdLong());
cakeDaysCache.add(member.getId()); // get this checked with chris
}

/**
Expand Down
Loading