Skip to content

Commit b5dbdd7

Browse files
committed
updated datetime format
1 parent b563665 commit b5dbdd7

File tree

9 files changed

+19
-12
lines changed

9 files changed

+19
-12
lines changed

src/main/java/tech/goodquestion/lembot/BotMain.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ private static void initializeObjects() {
119119
jda.addEventListener(new InviteLinkDeletion());
120120
jda.addEventListener(new InviteTracking());
121121
jda.addEventListener(new LinkDeletion());
122-
jda.addEventListener(new MediaOnly());
122+
jda.addEventListener(new MemesOnlyChannel());
123123
jda.addEventListener(new MemberAuthorization());
124124
jda.addEventListener(new MemberJoinStorage());
125125
jda.addEventListener(new MemberLeftStorage());

src/main/java/tech/goodquestion/lembot/command/impl/ParserCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public void dispatch(final Message message, final TextChannel channel, final Mem
2828
final LocalDateTime parsedInput = LocalDateTimeParser.parse(message.getContentRaw());
2929

3030
assert parsedInput != null;
31-
final String description = "```js\n" + LocalDateTimeFormatter.toGermanFormat(parsedInput) + "```\n";
31+
final String description = "```js\n" + LocalDateTimeFormatter.toGermanFormat(parsedInput).replace("um","") + "```\n";
3232

3333
Helper.createEmbed(embedBuilder, title, description, EmbedColorHelper.SUCCESS);
3434

src/main/java/tech/goodquestion/lembot/command/impl/database/MemberInfoCommand.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,26 +55,29 @@ public void dispatch(final Message message, final TextChannel channel, final Mem
5555
final String lastActivityDateTime = QueryHelper.getLastActivityDateTimeBy(userId) == null
5656
? "N/A"
5757
: LocalDateTimeFormatter.toGermanFormat(Objects.requireNonNull(QueryHelper.getLastActivityDateTimeBy(userId)));
58+
5859
final long amountMessages = QueryHelper.getAmountMessagesBy(userId);
5960
final long amountBumps = QueryHelper.getAmountBumpsBy(userId);
61+
6062
final String lastActivity = !member.getOnlineStatus().equals(OnlineStatus.OFFLINE)
6163
? ":green_circle: Online"
62-
: "```js\nZuletzt aktiv am " + lastActivityDateTime + "```";
64+
: String.format("```js\nZuletzt online am %s```" ,lastActivityDateTime);
6365

6466
final EmbedBuilder embedBuilder = new EmbedBuilder();
6567
embedBuilder.setTitle("Member Informationen");
6668
embedBuilder.setColor(Color.decode(EmbedColorHelper.MEMBER_INFO));
6769
embedBuilder.setAuthor(user.getAsTag(), null, Helper.getUserFromCommandInput(message, args).getEffectiveAvatarUrl());
6870
embedBuilder.setThumbnail(user.getAvatarUrl());
6971
embedBuilder.addField("Member", userAsMention, true);
70-
embedBuilder.addField("Erstellungsdatum", accountCreationDate, true);
71-
embedBuilder.addField("Letztes Beitrittsdatum", getLastJoinDate(member), true);
72+
embedBuilder.addField("Erstellungsdatum", accountCreationDate.replace("um", ""), true);
73+
embedBuilder.addField("Letztes Beitrittsdatum", getLastJoinDate(member).replace("um", ""), true);
7274
embedBuilder.addField("Nachrichten", String.valueOf(amountMessages), true);
7375
embedBuilder.addField("Bumps", String.valueOf(amountBumps), true);
7476
embedBuilder.addField("Rollen", String.valueOf(getAmountRoles(member)), true);
7577
embedBuilder.addField("Aktivität", lastActivity, false);
7678

7779
Helper.sendEmbed(embedBuilder, message, true);
80+
7881
}
7982

8083
private String getLastJoinDate(Member member){

src/main/java/tech/goodquestion/lembot/command/impl/database/MemberLogsCommand.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ public void dispatch(final Message message, final TextChannel channel, final Mem
7070
final long amountMessages = QueryHelper.getAmountMessagesBy(userId);
7171
final long amountBumps = QueryHelper.getAmountBumpsBy(userId);
7272

73-
final String lastActivity = !member.getOnlineStatus().equals(OnlineStatus.OFFLINE) ? ":green_circle: Online" : String.format("```js\nZuletzt aktiv am %s```" ,lastActivityDateTime);
73+
final String lastActivity = !member.getOnlineStatus().equals(OnlineStatus.OFFLINE)
74+
? ":green_circle: Online"
75+
: String.format("```js\nZuletzt online am %s```" ,lastActivityDateTime);
7476

7577
final String activeSanction = QueryHelper.hasActiveSanction(userId) ? "*Mute*" : "*Keine*";
7678

@@ -80,8 +82,8 @@ public void dispatch(final Message message, final TextChannel channel, final Mem
8082
embedBuilder.setAuthor(user.getAsTag(), null, Helper.getUserFromCommandInput(message, args).getEffectiveAvatarUrl());
8183
embedBuilder.setThumbnail(user.getAvatarUrl());
8284
embedBuilder.addField("Member", userAsMention, true);
83-
embedBuilder.addField("Erstellungsdatum", accountCreationDate, true);
84-
embedBuilder.addField("Letztes Beitrittsdatum", getLastJoinDate(member), true);
85+
embedBuilder.addField("Erstellungsdatum", accountCreationDate.replace("um",""), true);
86+
embedBuilder.addField("Letztes Beitrittsdatum", getLastJoinDate(member).replace("um",""), true);
8587
embedBuilder.addField("Nachrichten", String.valueOf(amountMessages), true);
8688
embedBuilder.addField("Bumps", String.valueOf(amountBumps), true);
8789
embedBuilder.addField("Rollen", String.valueOf(getAmountRoles(member)), true);
@@ -103,6 +105,7 @@ private int getAmountRoles(Member member){
103105
return member.getRoles().size();
104106
}
105107

108+
106109
@Override
107110
public String getName() {
108111
return "ml";

src/main/java/tech/goodquestion/lembot/database/MemberLeftStorage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public void onGuildMemberRemove(@NotNull GuildMemberRemoveEvent event) {
1616
CommandHelper.logMemberAmount(event.getGuild());
1717

1818
Objects.requireNonNull(event.getGuild().getTextChannelById(Config.getInstance().getChannelConfig().getJoinLeftChannel().getIdLong()))
19-
.sendMessage(":door: User **" + event.getUser().getAsTag() + "** hat den Server am " + Helper.getGermanDateTime() + " **verlassen**")
19+
.sendMessage(":door: User **" + event.getUser().getAsTag() + "** hat den Server am " + Helper.getCurrentCETDateTime() + " **verlassen**")
2020
.queue();
2121
}
2222
}

src/main/java/tech/goodquestion/lembot/event/WelcomingMemberJoin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public void onGuildMemberJoin(@NotNull final GuildMemberJoinEvent event) {
2828
Config.getInstance().getChannelConfig().getNewArrivalsChannel().sendMessage(personalizedWelcomeMessage).queue();
2929

3030
Config.getInstance().getChannelConfig().getJoinLeftChannel()
31-
.sendMessage(":arrow_right: User " + newMemberAsMention + " ist am " + Helper.getGermanDateTime() + " **gejoint**")
31+
.sendMessage(":arrow_right: User " + newMemberAsMention + " ist am " + Helper.getCurrentCETDateTime() + " **gejoint**")
3232
.queue();
3333
}
3434
}

src/main/java/tech/goodquestion/lembot/library/Helper.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ public static String getAmountContributors(final String repositoryUrl) {
181181
return "-1";
182182
}
183183

184-
public static String getGermanDateTime() {
184+
public static String getCurrentCETDateTime() {
185185

186186
DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("dd MMMM yyyy").withLocale(Locale.GERMAN);
187187
DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("HH:mm").withLocale(Locale.GERMAN);
@@ -204,4 +204,5 @@ public static User getUserFromCommandInput(final Message message, final String[]
204204

205205
return user;
206206
}
207+
207208
}

src/main/java/tech/goodquestion/lembot/library/parser/LocalDateTimeFormatter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class LocalDateTimeFormatter private constructor() {
99

1010
companion object Formatter {
1111

12-
private val dateFormatter: DateTimeFormatter = DateTimeFormatter.ofPattern("dd.MM.yyyy HH:mm")
12+
private val dateFormatter: DateTimeFormatter = DateTimeFormatter.ofPattern("dd.MM.yyyy 'um' HH:mm")
1313

1414
@JvmStatic
1515
fun toGermanFormat(localDateTime: LocalDateTime): String {

target/lembotv1.jar

-18.3 MB
Binary file not shown.

0 commit comments

Comments
 (0)