Skip to content
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

Allow UserSnowflake subtypes in bulk ban methods #2689

Merged
merged 1 commit into from
Jun 29, 2024
+3 −3
Merged

Allow UserSnowflake subtypes in bulk ban methods #2689

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Allow UserSnowflake subtypes in bulk ban methods
@freya022
freya022 committed Jun 24, 2024
commit f16664059504a6e90aa25d4d7d0b6cce98410082
4 changes: 2 additions & 2 deletions src/main/java/net/dv8tion/jda/api/entities/Guild.java
View file
Original file line number Diff line number Diff line change
@@ -3722,7 +3722,7 @@ default AuditableRestAction<Void> kick(@Nonnull UserSnowflake user, @Nullable St
*/
@Nonnull
@CheckReturnValue
AuditableRestAction<BulkBanResponse> ban(@Nonnull Collection<UserSnowflake> users, @Nullable Duration deletionTime);
AuditableRestAction<BulkBanResponse> ban(@Nonnull Collection<? extends UserSnowflake> users, @Nullable Duration deletionTime);

/**
* Bans up to 200 of the provided users.
@@ -3763,7 +3763,7 @@ default AuditableRestAction<Void> kick(@Nonnull UserSnowflake user, @Nullable St
*/
@Nonnull
@CheckReturnValue
default AuditableRestAction<BulkBanResponse> ban(@Nonnull Collection<UserSnowflake> users, int deletionTimeframe, @Nonnull TimeUnit unit)
default AuditableRestAction<BulkBanResponse> ban(@Nonnull Collection<? extends UserSnowflake> users, int deletionTimeframe, @Nonnull TimeUnit unit)
{
Checks.notNull(unit, "TimeUnit");
return ban(users, Duration.ofSeconds(unit.toSeconds(deletionTimeframe)));
2 changes: 1 addition & 1 deletion src/main/java/net/dv8tion/jda/internal/entities/GuildImpl.java
View file
Original file line number Diff line number Diff line change
@@ -1548,7 +1548,7 @@ public AuditableRestAction<Void> ban(@Nonnull UserSnowflake user, int duration,

@Nonnull
@Override
public AuditableRestAction<BulkBanResponse> ban(@Nonnull Collection<UserSnowflake> users, @Nullable Duration deletionTime)
public AuditableRestAction<BulkBanResponse> ban(@Nonnull Collection<? extends UserSnowflake> users, @Nullable Duration deletionTime)
{
deletionTime = deletionTime == null ? Duration.ZERO : deletionTime;
Checks.noneNull(users, "Users");