Skip to content

Adding tag used in the footer #309

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

Merged
Zabuzard merged 12 commits into from
Dec 29, 2021
Merged

Adding tag used in the footer #309

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ef404c8
This is a pull request on resolving the issue#275, The issue was reso…
DevSerendipity Dec 8, 2021
8e15c4d
Sollution to improving the footer reply
DevSerendipity Dec 8, 2021
4baa29f
Removed the generate embed method from MessageUtils.java and added t…
DevSerendipity Dec 10, 2021
3ee5423
Another comment of previous generate embed class
DevSerendipity Dec 10, 2021
463d53d
Removed the redundant comments, the setAuthor method and added the ti…
DevSerendipity Dec 10, 2021
c09b4ca
Removed the additional comment, reverted back to an old call and chan…
DevSerendipity Dec 10, 2021
e512ffa
Removing, the usertoString and replacing it with user.getName
DevSerendipity Dec 10, 2021
2d2c980
Removing the empty line
DevSerendipity Dec 10, 2021
6381594
Applied spotless
DevSerendipity Dec 10, 2021
2bc4e8a
Merge branch 'develop' into feature/replicating-slash-command
DevSerendipity Dec 11, 2021
abde994
Removed the Todo comment
DevSerendipity Dec 20, 2021
c85473a
Pulled the changes from the origin branch and ran spotless
DevSerendipity Dec 20, 2021
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
22 changes: 19 additions & 3 deletions application/src/main/java/org/togetherjava/tjbot/commands/free/FreeCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.togetherjava.tjbot.commands.free;

import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Message;
Expand All @@ -16,11 +17,11 @@
import org.slf4j.LoggerFactory;
import org.togetherjava.tjbot.commands.SlashCommandAdapter;
import org.togetherjava.tjbot.commands.SlashCommandVisibility;
import org.togetherjava.tjbot.commands.utils.MessageUtils;
import org.togetherjava.tjbot.config.Config;
import org.togetherjava.tjbot.config.FreeCommandConfig;

import java.awt.*;
import java.time.Instant;
import java.util.*;

// TODO (can SlashCommandVisibility be narrower than GUILD?)
Expand Down Expand Up @@ -197,12 +198,27 @@ private boolean handleShouldBeProcessed(@NotNull final SlashCommandEvent event)
*
* @param channel the text channel the status message will be posted in.
*/

/*
* event.replyEmbeds(new EmbedBuilder() .setDescription(tagSystem.getTag(id).orElseThrow()
* .setFooter(event.getUser() + " - used /tag foo") .setColor(TagSystem.AMBIENT_COLOR)
* ).queue();
*/
public void displayStatus(@NotNull TextChannel channel) {
final Guild guild = channel.getGuild();

/*
* MessageUtils.generateEmbed(STATUS_TITLE, messageTxt, channel.getJDA().getSelfUser(),
* MESSAGE_HIGHLIGHT_COLOR, null)
*/

String messageTxt = buildStatusMessage(guild);
MessageEmbed embed = MessageUtils.generateEmbed(STATUS_TITLE, messageTxt,
channel.getJDA().getSelfUser(), MESSAGE_HIGHLIGHT_COLOR);
MessageEmbed embed = new EmbedBuilder().setTitle(STATUS_TITLE)
.setDescription(messageTxt)
.setAuthor(String.valueOf(channel.getJDA().getSelfUser()))
.setTimestamp(Instant.now())
.setColor(MESSAGE_HIGHLIGHT_COLOR)
.build();

getStatusMessageIn(channel).flatMap(this::deleteIfNotLatest)
.ifPresentOrElse(message -> message.editMessageEmbeds(embed).queue(),
Expand Down
19 changes: 16 additions & 3 deletions application/src/main/java/org/togetherjava/tjbot/commands/tags/TagCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package org.togetherjava.tjbot.commands.tags;

import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
import net.dv8tion.jda.api.interactions.commands.OptionType;
import org.jetbrains.annotations.NotNull;
import org.togetherjava.tjbot.commands.SlashCommandAdapter;
import org.togetherjava.tjbot.commands.SlashCommandVisibility;
import org.togetherjava.tjbot.commands.utils.MessageUtils;

import java.time.Instant;
import java.util.Objects;

/**
Expand Down Expand Up @@ -42,10 +43,22 @@ public void onSlashCommand(@NotNull SlashCommandEvent event) {
if (tagSystem.handleIsUnknownTag(id, event)) {
return;
}
/*
event.replyEmbeds(tagEmbed(id, event.getUser(), event.getCommandString())).queue();
}

private MessageEmbed tagEmbed(String id, User user, String commandString) {
return MessageUtils.generateEmbed(null, tagSystem.getTag(id).orElseThrow(), user,
TagSystem.AMBIENT_COLOR, user.getName() + " " + commandString);
}
*/

event
.replyEmbeds(MessageUtils.generateEmbed(null, tagSystem.getTag(id).orElseThrow(),
event.getUser(), TagSystem.AMBIENT_COLOR))
.replyEmbeds(new EmbedBuilder().setDescription(tagSystem.getTag(id).orElseThrow())
.setFooter(event.getUser().getName() + " - used /tag foo")
.setTimestamp(Instant.now())
.setColor(TagSystem.AMBIENT_COLOR)
.build())
.queue();
}
}
32 changes: 25 additions & 7 deletions application/src/main/java/org/togetherjava/tjbot/commands/tags/TagManageCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.togetherjava.tjbot.commands.tags;

import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Role;
import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
Expand All @@ -17,6 +18,7 @@
import org.togetherjava.tjbot.commands.utils.MessageUtils;
import org.togetherjava.tjbot.config.Config;

import java.time.Instant;
import java.util.Objects;
import java.util.OptionalLong;
import java.util.function.BiConsumer;
Expand Down Expand Up @@ -90,9 +92,18 @@ public TagManageCommand(TagSystem tagSystem) {
private static void sendSuccessMessage(@NotNull Interaction event, @NotNull String id,
@NotNull String actionVerb) {
logger.info("User '{}' {} the tag with id '{}'.", event.getUser().getId(), actionVerb, id);
event.replyEmbeds(MessageUtils.generateEmbed("Success",
"Successfully %s tag '%s'.".formatted(actionVerb, id), event.getUser(),
TagSystem.AMBIENT_COLOR))
/*
* MessageUtils.generateEmbed("Success", "Successfully %s tag '%s'.".formatted(actionVerb,
* id), event.getUser(), TagSystem.AMBIENT_COLOR, null)
*/

event
.replyEmbeds(new EmbedBuilder().setTitle("Success")
.setDescription("Successfully %s tag '%s'.".formatted(actionVerb, id))
.setAuthor(String.valueOf(event.getUser()))
.setTimestamp(Instant.now())
.setColor(TagSystem.AMBIENT_COLOR)
.build())
.queue();
}

Expand Down Expand Up @@ -146,10 +157,17 @@ private void rawTag(@NotNull SlashCommandEvent event) {
if (tagSystem.handleIsUnknownTag(id, event)) {
return;
}

event.replyEmbeds(MessageUtils.generateEmbed(null,
MessageUtils.escapeMarkdown(tagSystem.getTag(id).orElseThrow()), event.getUser(),
TagSystem.AMBIENT_COLOR))
/*
* MessageUtils.generateEmbed(null,
* MessageUtils.escapeMarkdown(tagSystem.getTag(id).orElseThrow()), event.getUser(),
* TagSystem.AMBIENT_COLOR, null)
*/
event
.replyEmbeds(new EmbedBuilder()
.setDescription(MessageUtils.escapeMarkdown(tagSystem.getTag(id).orElseThrow()))
.setAuthor(String.valueOf(event.getUser()))
.setColor(TagSystem.AMBIENT_COLOR)
.build())
.queue();
}

Expand Down
17 changes: 14 additions & 3 deletions application/src/main/java/org/togetherjava/tjbot/commands/tags/TagsCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package org.togetherjava.tjbot.commands.tags;

import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.events.interaction.ButtonClickEvent;
import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
import org.jetbrains.annotations.NotNull;
import org.togetherjava.tjbot.commands.SlashCommandAdapter;
import org.togetherjava.tjbot.commands.SlashCommandVisibility;
import org.togetherjava.tjbot.commands.utils.MessageUtils;

import java.time.Instant;
import java.util.List;
import java.util.Objects;

Expand Down Expand Up @@ -42,8 +43,18 @@ public TagsCommand(TagSystem tagSystem) {
@Override
public void onSlashCommand(@NotNull SlashCommandEvent event) {
// TODO A list might be better than comma separated, which is hard to read
event.replyEmbeds(MessageUtils.generateEmbed("All available tags",
String.join(", ", tagSystem.getAllIds()), event.getUser(), TagSystem.AMBIENT_COLOR))
/*
* MessageUtils.generateEmbed("All available tags", String.join(", ",
* tagSystem.getAllIds()), event.getUser(), TagSystem.AMBIENT_COLOR, null)
*/

event
.replyEmbeds(new EmbedBuilder().setTitle("All available tags")
.setDescription(String.join(", ", tagSystem.getAllIds()))
.setFooter(event.getUser().getName() + " - used /tag foo")
.setTimestamp(Instant.now())
.setColor(TagSystem.AMBIENT_COLOR)
.build())
.addActionRow(
TagSystem.createDeleteButton(generateComponentId(event.getUser().getId())))
.queue();
Expand Down
25 changes: 0 additions & 25 deletions application/src/main/java/org/togetherjava/tjbot/commands/utils/MessageUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
package org.togetherjava.tjbot.commands.utils;

import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.MessageEmbed;
import net.dv8tion.jda.api.entities.User;
import net.dv8tion.jda.api.interactions.components.ActionRow;
import net.dv8tion.jda.api.interactions.components.Button;
import net.dv8tion.jda.api.utils.MarkdownSanitizer;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.awt.*;
import java.time.Instant;
import java.util.List;

/**
Expand Down Expand Up @@ -43,25 +37,6 @@ public static void disableButtons(@NotNull Message message) {
.queue();
}

/**
* Generates an embed with the given content.
*
* @param title title of the embed or {@code null} if not desired
* @param content content to display in the embed
* @param user name of the user who requested the embed or {@code null} if no user requested
* this
* @param ambientColor the ambient color of the embed or {@code null} for a default color
* @return the generated embed
*/
public static @NotNull MessageEmbed generateEmbed(@Nullable String title,
@NotNull CharSequence content, @Nullable User user, @Nullable Color ambientColor) {
return new EmbedBuilder().setTitle(title)
.setDescription(content)
.setTimestamp(Instant.now())
.setFooter(user == null ? null : user.getName())
.setColor(ambientColor)
.build();
}

/**
* Escapes every markdown content in the given string.
Expand Down