Skip to content

Commit dc0c5eb

Browse files
Removed duplicate method
1 parent 10ac817 commit dc0c5eb

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

src/main/java/net/javadiscord/javabot/systems/user_commands/ProfileCommand.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -95,21 +95,17 @@ public void execute(@NotNull SlashCommandInteractionEvent event) {
9595

9696
private @NotNull String getDescription(Member member) {
9797
StringBuilder sb = new StringBuilder();
98-
getCustomActivity(member).ifPresent(activity -> sb.append("\n`").append(activity.getName()).append("`"));
99-
getGameActivity(member).ifPresent(activity -> sb.append(String.format("\n%s %s",
98+
getActivity(member, true).ifPresent(activity -> sb.append("\n`").append(activity.getName()).append("`"));
99+
getActivity(member, false).ifPresent(activity -> sb.append(String.format("\n%s %s",
100100
getGameActivityType(activity),
101101
getGameActivityDetails(activity))));
102102
return sb.toString();
103103
}
104104

105-
private @NotNull Optional<Activity> getCustomActivity(@NotNull Member member) {
105+
private @NotNull Optional<Activity> getActivity(@NotNull Member member, boolean customActivity) {
106106
return member.getActivities().stream()
107-
.filter(a -> a.getType() == Activity.ActivityType.CUSTOM_STATUS).findFirst();
108-
}
109-
110-
private @NotNull Optional<Activity> getGameActivity(@NotNull Member member) {
111-
return member.getActivities().stream()
112-
.filter(a -> a.getType() != Activity.ActivityType.CUSTOM_STATUS).findFirst();
107+
.filter(a -> customActivity == (a.getType() == Activity.ActivityType.CUSTOM_STATUS))
108+
.findFirst();
113109
}
114110

115111
private @NotNull String getGameActivityType(@NotNull Activity activity) {

0 commit comments

Comments
 (0)