-
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
18 changed files
with
357 additions
and
231 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
82 changes: 82 additions & 0 deletions
82
src/main/java/com/eternalcode/discordapp/meeting/MeetingController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| package com.eternalcode.discordapp.meeting; | ||
|
|
||
| import com.eternalcode.discordapp.config.AppConfig; | ||
| import com.eternalcode.discordapp.meeting.event.MeetingCreateEvent; | ||
| import com.eternalcode.discordapp.observer.Observer; | ||
| import com.eternalcode.discordapp.util.DiscordTagFormat; | ||
| import com.eternalcode.discordapp.util.InstantFormatUtil; | ||
| import net.dv8tion.jda.api.EmbedBuilder; | ||
| import net.dv8tion.jda.api.JDA; | ||
| import net.dv8tion.jda.api.entities.Member; | ||
| import net.dv8tion.jda.api.entities.MessageEmbed; | ||
| import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; | ||
| import net.dv8tion.jda.api.interactions.components.buttons.Button; | ||
|
|
||
| import java.awt.*; | ||
| import java.time.Instant; | ||
| import java.time.ZoneId; | ||
| import java.time.ZoneOffset; | ||
|
|
||
| public class MeetingController implements Observer<MeetingCreateEvent> { | ||
|
|
||
| private final JDA jda; | ||
| private final AppConfig appConfig; | ||
|
|
||
| public MeetingController(JDA jda, AppConfig appConfig) { | ||
| this.jda = jda; | ||
| this.appConfig = appConfig; | ||
| } | ||
|
|
||
| @Override | ||
| public void update(MeetingCreateEvent event) { | ||
| Meeting meeting = event.meeting(); | ||
| Long channelId = event.channelId(); | ||
|
|
||
| TextChannel textChannelById = this.jda.getTextChannelById(channelId); | ||
|
|
||
| if (textChannelById == null) { | ||
| return; | ||
| } | ||
|
|
||
| Long requesterId = meeting.getRequesterId(); | ||
|
|
||
| Member memberById = this.jda.getGuildById(this.appConfig.guildId) | ||
| .getMemberById(requesterId); | ||
|
|
||
| if (memberById == null) { | ||
| return; | ||
| } | ||
|
|
||
| String requesterName = memberById.getEffectiveName(); | ||
|
|
||
| // TODO: add everyone ping at created meeting | ||
|
|
||
| Instant startTime = meeting.getStartTime(); | ||
| ZoneOffset offset = ZoneId.systemDefault().getRules().getOffset(startTime); | ||
|
|
||
| String timeFieldValue = String.format("%s (%s)", | ||
| InstantFormatUtil.format(startTime), | ||
| DiscordTagFormat.toDiscordWhen(startTime.atOffset(offset))); | ||
|
|
||
| MessageEmbed embed = new EmbedBuilder() | ||
| .setTitle("📅 | Meeting requested") | ||
| .setColor(Color.decode(this.appConfig.embedSettings.meetingEmbed.color)) | ||
| .setThumbnail(this.appConfig.embedSettings.meetingEmbed.thumbnail) | ||
| .setDescription("TODO: Some description, dodałbym wzmiankę o przewodniczącym spotkania") | ||
| .addField("Meeting Leader:", requesterName, false) | ||
| .addField("Time:", timeFieldValue, false) | ||
| .addField("Present", "", true) | ||
| .addField("Absent", "", true) | ||
| .setTimestamp(meeting.getIssuedAt()) | ||
| .build(); | ||
|
|
||
| Button presentButton = Button.primary("meeting:present:" + meeting.getIssuedAt().toEpochMilli(), "Present"); | ||
| Button absentButton = Button.danger("meeting:absent:" + meeting.getIssuedAt().toEpochMilli(), "Absent"); | ||
|
|
||
| textChannelById | ||
| .sendMessageEmbeds(embed) | ||
| .addActionRow(presentButton, absentButton) | ||
| .queue(); | ||
| } | ||
|
|
||
| } |
16 changes: 0 additions & 16 deletions
16
src/main/java/com/eternalcode/discordapp/meeting/MeetingNotificationType.java
This file was deleted.
Oops, something went wrong.
62 changes: 31 additions & 31 deletions
62
src/main/java/com/eternalcode/discordapp/meeting/MeetingService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,42 @@ | ||
| package com.eternalcode.discordapp.meeting; | ||
|
|
||
| import com.eternalcode.discordapp.config.AppConfig; | ||
| import com.eternalcode.discordapp.config.ConfigManager; | ||
| import com.eternalcode.discordapp.meeting.command.child.CreateChild; | ||
| import net.dv8tion.jda.api.EmbedBuilder; | ||
| import net.dv8tion.jda.api.entities.Member; | ||
| import net.dv8tion.jda.api.entities.MessageEmbed; | ||
| import net.dv8tion.jda.api.entities.channel.Channel; | ||
|
|
||
| import java.awt.*; | ||
| import com.eternalcode.discordapp.database.DatabaseManager; | ||
| import com.eternalcode.discordapp.meeting.database.MeetingRepository; | ||
| import com.eternalcode.discordapp.meeting.database.MeetingRepositoryImpl; | ||
| import com.eternalcode.discordapp.meeting.event.MeetingCreateEvent; | ||
| import com.eternalcode.discordapp.observer.ObserverRegistry; | ||
|
|
||
| import java.time.Instant; | ||
| import java.util.ArrayList; | ||
|
|
||
| public class MeetingService { | ||
|
|
||
| private final AppConfig appConfig; | ||
| private final ConfigManager configManager; | ||
| private final CreateChild createChild; | ||
| private final MeetingRepository meetingRepository; | ||
| private final ObserverRegistry observerRegistry; | ||
|
|
||
| public MeetingService(DatabaseManager databaseManager, ObserverRegistry observerRegistry) { | ||
| this.meetingRepository = MeetingRepositoryImpl.create(databaseManager); | ||
| this.observerRegistry = observerRegistry; | ||
| } | ||
|
|
||
| public void createMeeting(Instant issuedAt, Instant startTime, Long requester, Long channelId) { | ||
| Meeting meeting = new Meeting(requester, issuedAt, startTime); | ||
|
|
||
| this.meetingRepository.saveMeeting(meeting); | ||
| this.observerRegistry.publish(new MeetingCreateEvent(meeting, requester, channelId)); | ||
| } | ||
|
|
||
| public void deleteMeeting(Instant issuedAt, Instant startTime, Long requester) { | ||
| Meeting meeting = new Meeting(requester, issuedAt, startTime); | ||
|
|
||
| public MeetingService(AppConfig appConfig, ConfigManager configManager, CreateChild createChild) { | ||
| this.appConfig = appConfig; | ||
| this.configManager = configManager; | ||
| this.createChild = createChild; | ||
| this.meetingRepository.deleteMeeting(meeting); | ||
| } | ||
|
|
||
| public void createMeeting(String title, String description, String dateTime, Member requester, Member chairperson, Channel announcementChannel) { | ||
| ArrayList<Member> presentMembers = new ArrayList<>(); | ||
| ArrayList<Member> absentMembers = new ArrayList<>(); | ||
|
|
||
| MessageEmbed embed = new EmbedBuilder() | ||
| .setTitle("📅 | Meeting requested") | ||
| .setColor(Color.decode(this.appConfig.embedSettings.meetingEmbed.color)) | ||
| .setThumbnail(this.appConfig.embedSettings.meetingEmbed.thumbnail) | ||
| .setDescription("") | ||
| .addField("Present", "", true) | ||
| .addField("Absent", "", true) | ||
| .setFooter("Requested by " + requester.getUser().getName(), requester.getAvatarUrl()) | ||
| .setTimestamp(Instant.now()) | ||
| .build(); | ||
| public void findMeeting(Instant issuedAt, Instant startTime, Long requester) { | ||
| Meeting meeting = new Meeting(requester, issuedAt, startTime); | ||
|
|
||
| this.meetingRepository.findMeeting(meeting); | ||
| } | ||
|
|
||
| //zw | ||
|
|
||
| } |
37 changes: 0 additions & 37 deletions
37
src/main/java/com/eternalcode/discordapp/meeting/MeetingUser.java
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.