mirror of
https://github.com/DiscordSRV/Ascension.git
synced 2024-11-01 08:39:31 +01:00
Fix group sync not finding members that are not cached, enable chunking by default. Add GroupSyncResult for being able to interact with role
This commit is contained in:
parent
67c609aa4f
commit
37476fd8f9
@ -54,6 +54,13 @@ public interface DiscordGuild extends JDAEntity<Guild>, Snowflake {
|
|||||||
@Placeholder("server_member_count")
|
@Placeholder("server_member_count")
|
||||||
int getMemberCount();
|
int getMemberCount();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the bot's membership in the server.
|
||||||
|
* @return the connected bot's member
|
||||||
|
*/
|
||||||
|
@NotNull
|
||||||
|
DiscordGuildMember getSelfMember();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Retrieves a Discord guild member from Discord by id.
|
* Retrieves a Discord guild member from Discord by id.
|
||||||
* @param id the id for the Discord guild member
|
* @param id the id for the Discord guild member
|
||||||
|
@ -76,6 +76,13 @@ public interface DiscordGuildMember extends JDAEntity<Member>, Mentionable {
|
|||||||
*/
|
*/
|
||||||
boolean hasRole(@NotNull DiscordRole role);
|
boolean hasRole(@NotNull DiscordRole role);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* If this member can interact (edit, add/take from members) with the specified role.
|
||||||
|
* @param role the role
|
||||||
|
* @return {@code true} if the member has a role above the specified role or is the server owner
|
||||||
|
*/
|
||||||
|
boolean canInteract(@NotNull DiscordRole role);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gives the given role to this member.
|
* Gives the given role to this member.
|
||||||
* @param role the role to give
|
* @param role the role to give
|
||||||
|
@ -34,7 +34,7 @@ public class MemberCachingConfig {
|
|||||||
public boolean all = false;
|
public boolean all = false;
|
||||||
|
|
||||||
@Comment("If members should be cached at startup, this requires the \"Server Members Intent\"")
|
@Comment("If members should be cached at startup, this requires the \"Server Members Intent\"")
|
||||||
public boolean chunk = false;
|
public boolean chunk = true;
|
||||||
|
|
||||||
@Comment("Filter for which servers should be cached at startup")
|
@Comment("Filter for which servers should be cached at startup")
|
||||||
public GuildFilter chunkingServerFilter = new GuildFilter();
|
public GuildFilter chunkingServerFilter = new GuildFilter();
|
||||||
|
@ -56,6 +56,11 @@ public class DiscordGuildImpl implements DiscordGuild {
|
|||||||
return guild.getMemberCount();
|
return guild.getMemberCount();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public @NotNull DiscordGuildMember getSelfMember() {
|
||||||
|
return discordSRV.discordAPI().getGuildMember(guild.getSelfMember());
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public @NotNull CompletableFuture<DiscordGuildMember> retrieveMemberById(long id) {
|
public @NotNull CompletableFuture<DiscordGuildMember> retrieveMemberById(long id) {
|
||||||
return discordSRV.discordAPI().mapExceptions(() -> guild.retrieveMemberById(id)
|
return discordSRV.discordAPI().mapExceptions(() -> guild.retrieveMemberById(id)
|
||||||
|
@ -87,6 +87,11 @@ public class DiscordGuildMemberImpl implements DiscordGuildMember {
|
|||||||
return roles.stream().anyMatch(role::equals);
|
return roles.stream().anyMatch(role::equals);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean canInteract(@NotNull DiscordRole role) {
|
||||||
|
return member.canInteract(role.asJDA());
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public CompletableFuture<Void> addRole(@NotNull DiscordRole role) {
|
public CompletableFuture<Void> addRole(@NotNull DiscordRole role) {
|
||||||
return discordSRV.discordAPI().mapExceptions(() ->
|
return discordSRV.discordAPI().mapExceptions(() ->
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
|
|
||||||
package com.discordsrv.common.groupsync;
|
package com.discordsrv.common.groupsync;
|
||||||
|
|
||||||
import com.discordsrv.api.discord.entity.guild.DiscordGuildMember;
|
|
||||||
import com.discordsrv.api.discord.entity.guild.DiscordRole;
|
import com.discordsrv.api.discord.entity.guild.DiscordRole;
|
||||||
import com.discordsrv.api.discord.events.member.role.DiscordMemberRoleAddEvent;
|
import com.discordsrv.api.discord.events.member.role.DiscordMemberRoleAddEvent;
|
||||||
import com.discordsrv.api.discord.events.member.role.DiscordMemberRoleRemoveEvent;
|
import com.discordsrv.api.discord.events.member.role.DiscordMemberRoleRemoveEvent;
|
||||||
@ -316,7 +315,11 @@ public class GroupSyncModule extends AbstractModule<DiscordSRV> {
|
|||||||
return CompletableFuture.completedFuture(GroupSyncResult.ROLE_DOESNT_EXIST);
|
return CompletableFuture.completedFuture(GroupSyncResult.ROLE_DOESNT_EXIST);
|
||||||
}
|
}
|
||||||
|
|
||||||
DiscordGuildMember member = role.getGuild().getMemberById(userId);
|
if (!role.getGuild().getSelfMember().canInteract(role)) {
|
||||||
|
return CompletableFuture.completedFuture(GroupSyncResult.ROLE_CANNOT_INTERACT);
|
||||||
|
}
|
||||||
|
|
||||||
|
return role.getGuild().retrieveMemberById(userId).thenCompose(member -> {
|
||||||
if (member == null) {
|
if (member == null) {
|
||||||
return CompletableFuture.completedFuture(GroupSyncResult.NOT_A_GUILD_MEMBER);
|
return CompletableFuture.completedFuture(GroupSyncResult.NOT_A_GUILD_MEMBER);
|
||||||
}
|
}
|
||||||
@ -395,6 +398,7 @@ public class GroupSyncModule extends AbstractModule<DiscordSRV> {
|
|||||||
});
|
});
|
||||||
|
|
||||||
return resultFuture;
|
return resultFuture;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Listeners & methods to indicate something changed
|
// Listeners & methods to indicate something changed
|
||||||
@ -636,7 +640,11 @@ public class GroupSyncModule extends AbstractModule<DiscordSRV> {
|
|||||||
return CompletableFuture.completedFuture(GroupSyncResult.ROLE_DOESNT_EXIST);
|
return CompletableFuture.completedFuture(GroupSyncResult.ROLE_DOESNT_EXIST);
|
||||||
}
|
}
|
||||||
|
|
||||||
DiscordGuildMember member = role.getGuild().getMemberById(userId);
|
if (!role.getGuild().getSelfMember().canInteract(role)) {
|
||||||
|
return CompletableFuture.completedFuture(GroupSyncResult.ROLE_CANNOT_INTERACT);
|
||||||
|
}
|
||||||
|
|
||||||
|
return role.getGuild().retrieveMemberById(userId).thenCompose(member -> {
|
||||||
if (member == null) {
|
if (member == null) {
|
||||||
return CompletableFuture.completedFuture(GroupSyncResult.NOT_A_GUILD_MEMBER);
|
return CompletableFuture.completedFuture(GroupSyncResult.NOT_A_GUILD_MEMBER);
|
||||||
}
|
}
|
||||||
@ -675,5 +683,6 @@ public class GroupSyncModule extends AbstractModule<DiscordSRV> {
|
|||||||
resultFuture.complete(result);
|
resultFuture.complete(result);
|
||||||
});
|
});
|
||||||
return resultFuture;
|
return resultFuture;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -34,6 +34,7 @@ public enum GroupSyncResult {
|
|||||||
|
|
||||||
// Errors
|
// Errors
|
||||||
ROLE_DOESNT_EXIST("Role doesn't exist"),
|
ROLE_DOESNT_EXIST("Role doesn't exist"),
|
||||||
|
ROLE_CANNOT_INTERACT("Bot doesn't have a role above the synced role (cannot interact)"),
|
||||||
NOT_A_GUILD_MEMBER("User is not part of the server the role is in"),
|
NOT_A_GUILD_MEMBER("User is not part of the server the role is in"),
|
||||||
PERMISSION_BACKEND_FAIL_CHECK("Failed to check group status, error printed"),
|
PERMISSION_BACKEND_FAIL_CHECK("Failed to check group status, error printed"),
|
||||||
UPDATE_FAILED("Failed to modify role/group, error printed"),
|
UPDATE_FAILED("Failed to modify role/group, error printed"),
|
||||||
|
Loading…
Reference in New Issue
Block a user