Skip to content

Commit 3c765f2

Browse files
committed
style: fix code formatting
Running spotlessApply to fix CI
1 parent ab66203 commit 3c765f2

9 files changed

Lines changed: 45 additions & 37 deletions

File tree

src/main/java/yt/graven/gravensupport/EventReceiver.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
8888
*/
8989
if (event.getChannelType() == ChannelType.PRIVATE) {
9090
if (!ticketManager.exists(event.getAuthor())) return;
91-
Ticket ticket = ticketManager.get(event.getAuthor())
91+
Ticket ticket = ticketManager
92+
.get(event.getAuthor())
9293
.orElseThrow(() -> new RuntimeException("Ticket could not be found but exists"));
9394

9495
if (!ticket.isOpened()) return;

src/main/java/yt/graven/gravensupport/commands/ticket/Ticket.java

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import java.util.concurrent.CompletableFuture;
1717
import java.util.concurrent.Executors;
1818
import java.util.stream.Collectors;
19-
2019
import lombok.Getter;
2120
import net.dv8tion.jda.api.EmbedBuilder;
2221
import net.dv8tion.jda.api.entities.*;
@@ -44,11 +43,18 @@ public class Ticket {
4443
private final TicketManager ticketManager;
4544
private final Embeds embeds;
4645
private final YamlConfiguration config;
47-
@Getter private final User from;
46+
47+
@Getter
48+
private final User from;
49+
4850
private final Guild moderationGuild;
4951
private final Emoji sentEmote;
50-
@Getter private TextChannel to;
51-
@Getter private boolean opened;
52+
53+
@Getter
54+
private TextChannel to;
55+
56+
@Getter
57+
private boolean opened;
5258

5359
private static final Gson GSON = new GsonBuilder()
5460
.setPrettyPrinting()
@@ -261,12 +267,12 @@ public void openOnServer(boolean forced, User by, TicketOpeningReason reason) th
261267

262268
private WebhookClient retrieveWebhook() throws IOException {
263269
List<Webhook> webhooks = to.retrieveWebhooks().complete();
264-
return JDAWebhookClient.from(webhooks.isEmpty()
265-
? to.createWebhook(from.getName())
266-
.setAvatar(Icon.from(new URL(from.getEffectiveAvatarUrl()).openStream()))
267-
.complete()
268-
: webhooks.get(0)
269-
);
270+
return JDAWebhookClient.from(
271+
webhooks.isEmpty()
272+
? to.createWebhook(from.getName())
273+
.setAvatar(Icon.from(new URL(from.getEffectiveAvatarUrl()).openStream()))
274+
.complete()
275+
: webhooks.get(0));
270276
}
271277

272278
public void sendToTicket(Message message) {
@@ -275,7 +281,8 @@ public void sendToTicket(Message message) {
275281
webhook.send(builder.build())
276282
.thenAccept(msg -> {
277283
message.addReaction(sentEmote).queue();
278-
ticketManager.get(message.getAuthor())
284+
ticketManager
285+
.get(message.getAuthor())
279286
.map(Ticket::getTo)
280287
.ifPresent(textChannel -> updatePinnedMessages(textChannel, msg));
281288
})
@@ -361,7 +368,8 @@ public CompletableFuture<Message> confirmSendToUser(Message message) {
361368

362369
public void close() {
363370
Executors.newSingleThreadExecutor().execute(() -> {
364-
List<Message> messages = to.getIterableHistory().takeWhileAsync(Objects::nonNull).join();
371+
List<Message> messages =
372+
to.getIterableHistory().takeWhileAsync(Objects::nonNull).join();
365373
Collections.reverse(messages);
366374

367375
SerializableMessageArray sma = new SerializableMessageArray(
@@ -439,10 +447,12 @@ private void handleUnableToDmUser(InteractionHook reply) {
439447

440448
private void updatePinnedMessages(TextChannel textChannel, ReadonlyMessage msg) {
441449
ErrorHandler handleMaxPinError = new ErrorHandler().handle(ErrorResponse.MAX_MESSAGE_PINS, (exception) -> {
442-
textChannel.retrievePinnedMessages()
450+
textChannel
451+
.retrievePinnedMessages()
443452
.map(pinnedMessages -> pinnedMessages.get(pinnedMessages.size() - 1))
444453
.queue(oldestPinnedMessage -> {
445-
textChannel.unpinMessageById(oldestPinnedMessage.getId())
454+
textChannel
455+
.unpinMessageById(oldestPinnedMessage.getId())
446456
.queue(nothing -> pinMessage(textChannel, msg).queue());
447457
});
448458
});
@@ -453,5 +463,4 @@ private void updatePinnedMessages(TextChannel textChannel, ReadonlyMessage msg)
453463
private RestAction<Void> pinMessage(TextChannel channel, ReadonlyMessage message) {
454464
return channel.pinMessageById(message.getId());
455465
}
456-
457466
}

src/main/java/yt/graven/gravensupport/commands/ticket/close/CloseCommand.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,7 @@ public void run(SlashCommandInteractionEvent event) throws CommandCancelledExcep
6666
return;
6767
}
6868

69-
embeds.successMessage("Closing ticket")
70-
.reply(event)
71-
.queue();
69+
embeds.successMessage("Closing ticket").reply(event).queue();
7270

7371
ticket.get().close();
7472
}

src/main/java/yt/graven/gravensupport/commands/ticket/create/ModTicketCommand.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import yt.graven.gravensupport.utils.commands.Command;
2222
import yt.graven.gravensupport.utils.commands.ICommand;
2323
import yt.graven.gravensupport.utils.exceptions.CommandCancelledException;
24-
import yt.graven.gravensupport.utils.exceptions.TicketAlreadyExistsException;
2524
import yt.graven.gravensupport.utils.exceptions.TicketException;
2625
import yt.graven.gravensupport.utils.messages.Embeds;
2726

@@ -105,9 +104,12 @@ private void runWithSelectedUser(SlashCommandInteractionEvent event) throws IOEx
105104
String reason = reasonOption.getAsString();
106105

107106
if (ticketManager.exists(user)) {
108-
embeds.ticketAlreadyExistsMessage(ticketManager.get(user)
109-
.orElseThrow(() -> new TicketException("Ticket not found for user " + user.getId()))
110-
.getTo(), false)
107+
embeds.ticketAlreadyExistsMessage(
108+
ticketManager
109+
.get(user)
110+
.orElseThrow(() -> new TicketException("Ticket not found for user " + user.getId()))
111+
.getTo(),
112+
false)
111113
.editReply(reply)
112114
.queue();
113115
return;

src/main/java/yt/graven/gravensupport/commands/ticket/interactions/ConfirmMessageHandler.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import java.awt.*;
44
import java.time.Instant;
55
import java.util.Optional;
6-
7-
import club.minnced.discord.webhook.receive.ReadonlyMessage;
86
import lombok.RequiredArgsConstructor;
97
import net.dv8tion.jda.api.EmbedBuilder;
108
import net.dv8tion.jda.api.entities.Message;
@@ -143,12 +141,10 @@ private void updatePinnedMessages(Message message) {
143141
MessageChannelUnion channel = message.getChannel();
144142
channel.retrievePinnedMessages()
145143
.map(pinnedMessages -> pinnedMessages.get(pinnedMessages.size() - 1))
146-
.queue(oldestPinnedMessage ->
147-
channel.unpinMessageById(oldestPinnedMessage.getId())
148-
.queue(nothing -> message.pin().queue()));
144+
.queue(oldestPinnedMessage -> channel.unpinMessageById(oldestPinnedMessage.getId())
145+
.queue(nothing -> message.pin().queue()));
149146
});
150147

151148
message.pin().queue(null, handleMaxPinError);
152149
}
153-
154150
}

src/main/java/yt/graven/gravensupport/commands/ticket/interactions/OpeningReasonHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ public void run(StringSelectInteractionEvent event) throws TicketException, IOEx
5454
if (selectedOption.getValue().equalsIgnoreCase("op-other")) {
5555
Modal modal = Modal.create("op-other-reason", "Pourquoi ouvrez-vous un ticket ?")
5656
.addComponents(
57-
ActionRow.of(
58-
TextInput.create("reason", "Raison (en quelques mots)", TextInputStyle.SHORT).build()))
57+
ActionRow.of(TextInput.create("reason", "Raison (en quelques mots)", TextInputStyle.SHORT)
58+
.build()))
5959
.build();
6060

6161
event.replyModal(modal).queue();

src/main/java/yt/graven/gravensupport/utils/WebhookMessageAdapter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ public class WebhookMessageAdapter {
3131
EnumSet<Message.MentionType> parse = data.getAllowedMentions();
3232
allowedMentions.withParseUsers(parse.contains(Message.MentionType.USER));
3333
allowedMentions.withParseRoles(parse.contains(Message.MentionType.ROLE));
34-
allowedMentions.withParseEveryone(parse.contains(Message.MentionType.EVERYONE) || parse.contains(Message.MentionType.HERE));
34+
allowedMentions.withParseEveryone(
35+
parse.contains(Message.MentionType.EVERYONE) || parse.contains(Message.MentionType.HERE));
3536
builder.setAllowedMentions(allowedMentions);
3637
} else if (message instanceof ReceivedMessage) {
3738
AllowedMentions allowedMentions = AllowedMentions.none();

src/main/java/yt/graven/gravensupport/utils/messages/serializable/MessageType.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ public enum MessageType {
1010
public static MessageType fromMessage(Message message) {
1111
if (!message.getAuthor().isBot()) {
1212
return MODERATION;
13-
} else if (message.getAuthor().getIdLong() == message.getJDA().getSelfUser().getIdLong()) {
13+
} else if (message.getAuthor().getIdLong()
14+
== message.getJDA().getSelfUser().getIdLong()) {
1415
return BOT;
1516
}
1617
return TARGET;

src/main/java/yt/graven/gravensupport/utils/messages/serializable/SerializableMessageArray.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@
22

33
import com.google.gson.annotations.Expose;
44
import com.google.gson.annotations.SerializedName;
5-
65
import java.io.InputStream;
76
import java.util.ArrayList;
87
import java.util.Collections;
98
import java.util.List;
109
import java.util.Optional;
1110
import java.util.concurrent.CompletableFuture;
12-
1311
import net.dv8tion.jda.api.entities.Message;
1412
import net.dv8tion.jda.api.entities.User;
1513
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
@@ -62,8 +60,10 @@ private List<Message.Attachment> sendAttachments(Message message) {
6260
.orElseThrow();
6361

6462
for (Message.Attachment attachment : message.getAttachments()) {
65-
CompletableFuture<InputStream> attachmentStream = attachment.getProxy().download();
66-
Message attachmentMessage = attachmentsChannel.sendMessage("Attachment of @" + message.getAuthor().getAsTag())
63+
CompletableFuture<InputStream> attachmentStream =
64+
attachment.getProxy().download();
65+
Message attachmentMessage = attachmentsChannel
66+
.sendMessage("Attachment of @" + message.getAuthor().getAsTag())
6767
.addFiles(FileUpload.fromData(attachmentStream.join(), attachment.getFileName()))
6868
.complete();
6969

0 commit comments

Comments
 (0)