fix extra space

tyap-lyap · Jan 28, 2025 · f8f6f0c · f8f6f0c
1 parent 188ad7b
commit f8f6f0c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/src/main/java/ru/pinkgoosik/kitsun/event/DiscordEventsListener.java b/src/main/java/ru/pinkgoosik/kitsun/event/DiscordEventsListener.java
@@ -206,7 +206,7 @@ public void onChannelDelete(@NotNull ChannelDeleteEvent event) {
 
 					manager.getSession(channelId).ifPresent(session -> {
 						var owner = event.getGuild().getMemberById(session.owner);
-						serverData.logger.get().ifEnabled(log -> log.onVoiceChannelDelete(session, owner, channel));
+						serverData.logger.get().ifEnabled(log -> log.onVoiceChannelDelete(session, channel));
 						session.shouldBeRemoved = true;
 					});
 

diff --git a/src/main/java/ru/pinkgoosik/kitsun/feature/AutoChannelsManager.java b/src/main/java/ru/pinkgoosik/kitsun/feature/AutoChannelsManager.java
@@ -131,7 +131,7 @@ public Session(String owner, String channel) {
 		}
 
 		public void updateHistory(String line) {
-			this.history = history + "\n" + DurationUtils.format(Duration.between(Instant.parse(this.created), Instant.now())) + " - " + line;
+			this.history = history + (history.isEmpty() ? "" : "\n") + DurationUtils.format(Duration.between(Instant.parse(this.created), Instant.now())) + " - " + line;
 		}
 	}
 }
diff --git a/src/main/java/ru/pinkgoosik/kitsun/feature/ServerLogger.java b/src/main/java/ru/pinkgoosik/kitsun/feature/ServerLogger.java
@@ -8,7 +8,6 @@
 import net.dv8tion.jda.api.entities.channel.Channel;
 import net.dv8tion.jda.api.entities.channel.ChannelType;
 import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
-import org.jetbrains.annotations.Nullable;
 import ru.pinkgoosik.kitsun.DiscordApp;
 import ru.pinkgoosik.kitsun.event.DiscordEventsListener;
 import ru.pinkgoosik.kitsun.util.DurationUtils;
@@ -90,18 +89,14 @@ public void onVoiceChannelNameUpdate(String old, String current) {
 //		log(embed.build());
 	}
 
-	public void onVoiceChannelDelete(AutoChannelsManager.Session session, @Nullable Member owner, Channel voiceChannel) {
+	public void onVoiceChannelDelete(AutoChannelsManager.Session session, Channel voiceChannel) {
 		var embed = new EmbedBuilder();
 		embed.setTitle("Voice Channel Deleted");
 
 		Instant created = Instant.parse(session.created);
 		Instant now = Instant.now();
-		String ownerLine = "";
-		if(owner != null) {
-			ownerLine = " **Owner** " + "<@" + owner.getId() + ">";
-		}
 
-		embed.setDescription("**Channel** " + voiceChannel.getName() + ownerLine + " **Lasted** " + DurationUtils.format(Duration.between(created, now)) + "\n \n" + session.history);
+		embed.setDescription("**Channel** " + voiceChannel.getName() + " **Owner** " + "<@" + session.owner + ">" + " **Lasted** " + DurationUtils.format(Duration.between(created, now)) + "\n \n" + session.history);
 
 		embed.setColor(KitsunColors.getRed());
 		embed.setTimestamp(Instant.now());