Sheldan/abstracto
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto.git synced 2026-04-10 02:22:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AB-272] improving leaderboard performance

Browse Source 
fixing leaderboard returning wrong pages
making template cache update duration longer
This commit is contained in:
Sheldan
2021-05-26 21:41:04 +02:00
parent 919b52a607
commit 95a639a733
16 changed files with 98 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/MemberServiceBean.java
View File

@@ -15,6 +15,7 @@ import net.dv8tion.jda.api.entities.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
@@ -79,6 +80,19 @@ public class MemberServiceBean implements MemberService {
}
}
@Override
public CompletableFuture<List<Member>> getMembersInServerAsync(Long serverId, List<Long> memberIds) {
log.debug("Retrieving member {} in server {} from cache.", memberIds, serverId);
Guild guildById = guildService.getGuildById(serverId);
CompletableFuture<List<Member>> future = new CompletableFuture<>();
if(guildById != null) {
guildById.retrieveMembersByIds(memberIds).onSuccess(future::complete).onError(future::completeExceptionally);
} else {
throw new GuildNotFoundException(serverId);
}
return future;
}
@Override
public CompletableFuture<Member> retrieveMemberInServer(ServerUser serverUser) {
return getMemberInServerAsync(serverUser.getServerId(), serverUser.getUserId());

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/templating/config/FreemarkerConfiguration.java
View File

@@ -49,6 +49,8 @@ public class FreemarkerConfiguration {
Configuration configuration = factory.createConfiguration();
configuration.setSharedVariable("fmtDuration", durationMethod);
configuration.setSharedVariable("formatDate", instantMethod);
// 10 minutes template cache
configuration.setTemplateUpdateDelayMilliseconds(600000);
List<String> macrosToLoad = macroManagementService.loadAllMacros().stream()
.map(AutoLoadMacro::getKey).collect(Collectors.toList());
configuration.setAutoIncludes(macrosToLoad);

2
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/database/AServer.java
View File

@@ -36,7 +36,7 @@ public class AServer implements SnowFlake, Serializable {
@Transient
private boolean fake;
@OneToOne(mappedBy = "server", cascade = CascadeType.ALL)
@OneToOne(mappedBy = "server", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
@PrimaryKeyJoinColumn
private AllowedMention allowedMention;

4
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/database/AUserInAServer.java
View File

@@ -21,11 +21,11 @@ public class AUserInAServer implements Serializable {
@Column(name = "user_in_server_id", nullable = false)
private Long userInServerId;
@ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE})
@ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE}, fetch = FetchType.LAZY)
@JoinColumn(name = "user_id", nullable = false)
private AUser userReference;
@ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE})
@ManyToOne(cascade = {CascadeType.PERSIST, CascadeType.MERGE}, fetch = FetchType.LAZY)
@JoinColumn(name = "server_id", nullable = false)
private AServer serverReference;

2
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/service/MemberService.java
View File

@@ -9,6 +9,7 @@ import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.User;
import java.util.List;
import java.util.concurrent.CompletableFuture;
public interface MemberService {
@@ -16,6 +17,7 @@ public interface MemberService {
CompletableFuture<GuildChannelMember> getServerChannelUserAsync(Long serverId, Long channelId, Long userId);
Member getMemberInServer(Long serverId, Long memberId);
CompletableFuture<Member> getMemberInServerAsync(Long serverId, Long memberId);
CompletableFuture<List<Member>> getMembersInServerAsync(Long serverId, List<Long> memberIds);
CompletableFuture<Member> retrieveMemberInServer(ServerUser serverUser);
CompletableFuture<User> retrieveUserById(Long userId);
boolean isUserInGuild(AUserInAServer aUserInAServer);