Skip to content

Reworked /profile #38

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
jasonlessenich merged 4 commits into from
Aug 11, 2021
Merged

Reworked /profile #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
83a1aad
fixed Reaction in Accept.java, reworked Profile.java & added Spotify …
jasonlessenich Aug 6, 2021
614c6da
removed unnecessary ``continue;``
jasonlessenich Aug 6, 2021
5c42a7a
changed ``member.getEffectiveName()`` to ``member.getUser().getName()``
jasonlessenich Aug 6, 2021
5deeb44
made some small changes to the profile
jasonlessenich Aug 7, 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
9 changes: 8 additions & 1 deletion src/main/java/com/javadiscord/javabot/commands/moderation/Warns.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@

public class Warns implements SlashCommandHandler {

public long warnCount (Member member) {
MongoDatabase database = mongoClient.getDatabase("userdata");
MongoCollection<Document> warns = database.getCollection("warns");

return warns.countDocuments(eq("user_id", member.getId()));
}

@Override
public ReplyAction handle(SlashCommandEvent event) {
OptionMapping warnsOption = event.getOption("user");
Expand All @@ -42,7 +49,7 @@ public ReplyAction handle(SlashCommandEvent event) {

var e = new EmbedBuilder()
.setAuthor(member.getUser().getAsTag() + " | Warns", null, member.getUser().getEffectiveAvatarUrl())
.setDescription("```" + member.getUser().getAsTag() + " has been warned " + warns.count(eq("user_id", member.getId())) + " times so far."
.setDescription("```" + member.getUser().getAsTag() + " has been warned " + warnCount(member) + " times so far."
+ "\n\n" + sb + "```")
.setColor(Constants.YELLOW)
.setFooter("ID: " + member.getId())
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/javadiscord/javabot/commands/other/suggestions/Accept.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public ReplyAction handle(SlashCommandEvent event) {
.setTimestamp(timestamp)
.setFooter("Accepted by " + event.getUser().getAsTag());

msg.editMessage(eb.build()).queue(message1 -> message1.addReaction(Constants.REACTION_UPVOTE).queue());
msg.editMessageEmbeds(eb.build()).queue(message1 -> message1.addReaction(Constants.REACTION_SUCCESS).queue());
return event.reply("Done!").setEphemeral(true);

} else {
Expand Down
244 changes: 141 additions & 103 deletions src/main/java/com/javadiscord/javabot/commands/user_commands/Profile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,152 +1,190 @@
package com.javadiscord.javabot.commands.user_commands;

import com.javadiscord.javabot.commands.SlashCommandHandler;
import com.javadiscord.javabot.commands.moderation.Warns;
import com.javadiscord.javabot.commands.other.qotw.Leaderboard;
import com.javadiscord.javabot.other.Constants;
import com.javadiscord.javabot.other.Database;
import com.javadiscord.javabot.other.Embeds;
import com.javadiscord.javabot.other.TimeUtils;
import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoDatabase;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.entities.Activity;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.RichPresence;
import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
import net.dv8tion.jda.api.interactions.commands.OptionMapping;
import net.dv8tion.jda.api.requests.restaction.interactions.ReplyAction;
import org.bson.Document;

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

import static com.javadiscord.javabot.events.Startup.mongoClient;
import static com.mongodb.client.model.Filters.eq;

// TODO: Clean up this a lot.
@Deprecated(forRemoval = true)
public class Profile implements SlashCommandHandler {

@Override
public ReplyAction handle(SlashCommandEvent event) {
String getBadges (Member member) {

OptionMapping profileOption = event.getOption("user");
Member member = profileOption == null ? event.getMember() : profileOption.getAsMember();
String badges = "";

if (member.getUser().isBot()) badges += Constants.BOT;
if (!(member.getTimeBoosted() == null)) badges += Constants.SERVER_BOOST;

badges += member.getUser().getFlags().toString()
.substring(1, member.getUser().getFlags().toString().length() - 1)
.replace(",", "")
.replace("PARTNER", Constants.PARTNER)
.replace("HYPESQUAD_BRAVERY", Constants.BRAVERY)
.replace("HYPESQUAD_BRILLIANCE", Constants.BRILLIANCE)
.replace("HYPESQUAD_BALANCE", Constants.BALANCE)
.replace("VERIFIED_DEVELOPER", Constants.DEV)
.replace("EARLY_SUPPORTER", Constants.EARLY_SUPPORTER)
.replace("SYSTEM", Constants.STAFF)
.replace("BUG_HUNTER_LEVEL_1", Constants.BUG_HUNTER)
.replace("BUG_HUNTER_LEVEL_2", Constants.BUG_HUNTER)
.replace("VERIFIED_BOT", "");

return badges;
}

String getOnlineStatus (Member member) {

String statusEmote = member.getOnlineStatus().toString()
.replace("ONLINE", Constants.ONLINE)
.replace("IDLE", Constants.IDLE)
.replace("DO_NOT_DISTURB", Constants.DND)
.replace("OFFLINE", Constants.OFFLINE);

return statusEmote;
}

Color getColor (Member member) {

Color color;
if (member.getColor() == null) color = Constants.GRAY;
else color = member.getColor();

return color;
}

String getColorRoleAsMention (Member member) {

String highestRole;
try {
highestRole = member.getRoles().get(0).getName();
highestRole = member.getRoles().get(0).getAsMention();
} catch (IndexOutOfBoundsException e) {
highestRole = "everyone";
highestRole = "None";
}

String timeJoined = member.getTimeJoined().format(TimeUtils.STANDARD_FORMATTER);
String timeCreated = member.getTimeCreated().format(TimeUtils.STANDARD_FORMATTER);
return highestRole;
}

Color color;
String colorText;
if (member.getColor() == null) {
color = new Color(0x2F3136);
colorText = "None";

} else {
color = member.getColor();
colorText = "#" + Integer.toHexString(member.getColorRaw());
}
String getColorAsHex (Color color) {
return "#" + Integer.toHexString(color.getRGB()).toUpperCase();
}

String status = member.getOnlineStatus().toString().substring(0, 1).toUpperCase() + member.getOnlineStatus().toString().substring(1).toLowerCase().replace("_", " ");
List<Activity> activities = member.getActivities();
Activity getCustomActivity (Member member) {

String customStatus, gameActivity;
Activity activity = null;

try {
if (activities.get(0).getType().toString().equalsIgnoreCase("CUSTOM_STATUS")) {
customStatus = activities.get(0).getName();
} else {
customStatus = "None";
for (var act : member.getActivities()) {

if (act.getType().name().equals("CUSTOM_STATUS")) {
activity = act;
break;
}
} catch (IndexOutOfBoundsException e) {
customStatus = "None";
}

try {
if (customStatus.equals("None")) {
gameActivity = activities.get(0).getName();
return activity;
}

} else {
gameActivity = activities.get(1).getName();
}
} catch (IndexOutOfBoundsException e) {
gameActivity = "None";
Activity getGameActivity (Member member) {

Activity activity = null;

for (var act : member.getActivities()) {

if (act.getType().name().equals("CUSTOM_STATUS")) continue;
else activity = act; break;
}

try {
return activity;
}

String statusEmote = status
.replace("Online", Constants.ONLINE)
.replace("Idle", Constants.IDLE)
.replace("Do not disturb", Constants.DND)
.replace("Offline", Constants.OFFLINE);
String getGameActivityType (Activity activity) {

String badges = member.getUser().getFlags().toString()
.substring(1, member.getUser().getFlags().toString().length() - 1)
.replace(",", "")
.replace("PARTNER", Constants.PARTNER)
.replace("HYPESQUAD_BRAVERY", Constants.BRAVERY)
.replace("HYPESQUAD_BRILLIANCE", Constants.BRILLIANCE)
.replace("HYPESQUAD_BALANCE", Constants.BALANCE)
.replace("VERIFIED_DEVELOPER", Constants.DEV)
.replace("EARLY_SUPPORTER", Constants.EARLY_SUPPORTER)
.replace("SYSTEM", Constants.STAFF)
.replace("BUG_HUNTER_LEVEL_1", Constants.BUG_HUNTER)
.replace("BUG_HUNTER_LEVEL_2", Constants.BUG_HUNTER)
.replace("VERIFIED_BOT", "");
return activity.getType().name().toLowerCase()
.replace("listening", "Listening to")
.replace("default", "Playing");
}

String boostBadge, botBadge;
String getGameActivityDetails (Activity activity) {

if (!(member.getTimeBoosted() == null)) {
boostBadge = Constants.SERVER_BOOST;
} else {
boostBadge = "";
}
String details = "";

String name = member.getEffectiveName()
.replace("```", "");
if (activity.getName().equals("Spotify")) {

if (member.getUser().isBot()) {
botBadge = Constants.BOT;
} else {
botBadge = "";
}
RichPresence rp = activity.asRichPresence();
String spotifyURL = "https://open.spotify.com/track/" + rp.getSyncId();

details = "[`\"" + rp.getDetails() + "\"";
if (!(rp.getState() == null)) details += " by " + rp.getState();
details += "`](" + spotifyURL + ") " + Constants.SPOTIFY;

MongoDatabase database = mongoClient.getDatabase("userdata");
MongoCollection<Document> warns = database.getCollection("warns");
} else details = "`" + activity.getName() + "`";

int qotwCount = new Database().getMemberInt(member, "qotwpoints");
int warnCount = (int) warns.count(eq("user_id", member.getId()));
return details;
}

String getServerJoinedDate (Member member, TimeUtils tu) {

long timeJoined = member.getTimeJoined().toInstant().getEpochSecond();
String joinDiff = tu.formatDurationToNow(member.getTimeJoined());

return "<t:" + timeJoined + ":F>" + " (" + joinDiff + " ago)";
}

TimeUtils tu = new TimeUtils();
String joinDiff = " (" + tu.formatDurationToNow(member.getTimeJoined()) + ")";
String createDiff = " (" + tu.formatDurationToNow(member.getTimeCreated()) + ")";
String getAccountCreatedDate (Member member, TimeUtils tu) {

EmbedBuilder eb = new EmbedBuilder()
.setTitle(statusEmote + " " + member.getUser().getAsTag() + " " + botBadge + boostBadge + badges)
.setColor(color)
long timeCreated = member.getTimeCreated().toInstant().getEpochSecond();
String createDiff = tu.formatDurationToNow(member.getTimeCreated());

return "<t:" + timeCreated + ":F>" + " (" + createDiff + " ago)";
}

String getDescription (Member member) {

String desc = "";


if (!(getCustomActivity(member) == null)) desc += "\n\"" + getCustomActivity(member).getName() + "\"";
if (!(getGameActivity(member) == null)) desc += "\n• " + getGameActivityType(getGameActivity(member)) + " " + getGameActivityDetails(getGameActivity(member));

desc +=
"\n\n⌞ Warnings: `" + new Warns().warnCount(member) + "`" +
"\n⌞ QOTW-Points: `" + new Database().getMemberInt(member, "qotwpoints") + " (#" + Leaderboard.rank(member.getId()) + ")`";

return desc;
}

@Override
public ReplyAction handle(SlashCommandEvent event) {

OptionMapping profileOption = event.getOption("user");
Member member = profileOption == null ? event.getMember() : profileOption.getAsMember();

TimeUtils tu = new TimeUtils();

var e = new EmbedBuilder()
.setTitle(getOnlineStatus(member) + " " + member.getUser().getAsTag() + " " + getBadges(member))
.setThumbnail(member.getUser().getEffectiveAvatarUrl() + "?size=4096")
.addField("Name", "```" + name + " ```", true)
.addField("QOTW", "```" + qotwCount + " (#" + Leaderboard.rank(member.getId()) + ")```", true)
.addField("Warnings", "```" + warnCount + "```", true)
.addField("ID", "```" + member.getId() + "```", false)
.addField("Role Amount", "```" + member.getRoles().size() + " Roles```", true)
.addField("Role Color", "```" + colorText + "```", true)
.addField("Highest Role", "```@" + highestRole + "```", true)
.addField("Custom Status", "```" + customStatus + "```", true)
.addField("Game Activity", "```" + gameActivity + "```", true)
.addField("Server joined on", "```" + timeJoined + joinDiff + "```", false)
.addField("Account created on", "```" + timeCreated + createDiff + "```", false);
return event.replyEmbeds(eb.build());

} catch (IndexOutOfBoundsException e) {
return event.replyEmbeds(Embeds.emptyError("```" + e.getMessage() + "```", event.getUser())).setEphemeral(true);
}
.setColor(getColor(member))
.setDescription(getDescription(member))
.setFooter("ID: " + member.getId());

if (member.getRoles().size() > 1 ) e.addField("Roles", getColorRoleAsMention(member) + " (+" + (member.getRoles().size() -1) + " other)", true);
else if (member.getRoles().size() > 0) e.addField("Roles", getColorRoleAsMention(member), true);

if (member.getRoles().size() > 0) e.addField("Color", "`" + getColorAsHex(getColor(member)) + "`", true);
e.addField("Server joined on", getServerJoinedDate(member, tu), false)
.addField("Account created on", getAccountCreatedDate(member, tu), true);

return event.replyEmbeds(e.build());
}
}
1 change: 1 addition & 0 deletions src/main/java/com/javadiscord/javabot/other/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public class Constants {
public static final String REACTION_SUCCESS = "check:861259759151087627";
public static final String REACTION_UPVOTE = "up_vote:861259760547659786";
public static final String REACTION_DOWNVOTE = "down_vote:861259759562391572";
public static final String SPOTIFY = "<:spotify:873228785091231795>";

public static final String ONLINE = "<:sOnline:861259760467705877>";
public static final String OFFLINE = "<:sOffline:861259760488677376>";
Expand Down