Sheldan/abstracto
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto.git synced 2026-03-27 14:23:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AB-328] fixing case sensitivity of allowed invite links

Browse Source
This commit is contained in:
Sheldan
2021-09-07 01:13:34 +02:00
parent 9659a3487a
commit 5e6999cd45
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
abstracto-application/abstracto-modules/invite-filter/invite-filter-impl/src/main/java/dev/sheldan/abstracto/invitefilter/repository/AllowedInviteLinkRepository.java
View File

@@ -13,5 +13,5 @@ public interface AllowedInviteLinkRepository extends JpaRepository<AllowedInvite
Optional<AllowedInviteLink> findByTargetServerIdAndServer(Long targetServerId, AServer server); Optional<AllowedInviteLink> findByTargetServerIdAndServer(Long targetServerId, AServer server);
Optional<AllowedInviteLink> findByTargetServerIdAndServer_Id(Long targetServerId, Long serverId); Optional<AllowedInviteLink> findByTargetServerIdAndServer_Id(Long targetServerId, Long serverId);
Optional<AllowedInviteLink> findByCodeAndServer_Id(String code, Long serverId); Optional<AllowedInviteLink> findByCodeIgnoreCaseAndServer_Id(String code, Long serverId);
} }

2
abstracto-application/abstracto-modules/invite-filter/invite-filter-impl/src/main/java/dev/sheldan/abstracto/invitefilter/service/InviteLinkFilterServiceBean.java
View File

@@ -302,7 +302,7 @@ public class InviteLinkFilterServiceBean implements InviteLinkFilterService {
} }
List<String> unResolvedInvites = new ArrayList<>(); List<String> unResolvedInvites = new ArrayList<>();
foundInvites.forEach(possibleUnresolvedInvite -> { foundInvites.forEach(possibleUnresolvedInvite -> {
if(invites.stream().noneMatch(invite -> invite.getCode().equals(possibleUnresolvedInvite))) { if(invites.stream().noneMatch(invite -> invite.getCode().equalsIgnoreCase(possibleUnresolvedInvite))) {
unResolvedInvites.add(possibleUnresolvedInvite); unResolvedInvites.add(possibleUnresolvedInvite);
} }
}); });

9
abstracto-application/abstracto-modules/invite-filter/invite-filter-impl/src/main/java/dev/sheldan/abstracto/invitefilter/service/management/AllowedInviteLinkManagementBean.java
View File

@@ -16,7 +16,12 @@ public class AllowedInviteLinkManagementBean implements AllowedInviteLinkManagem
@Override @Override
public AllowedInviteLink createAllowedInviteLink(AServer server, Long targetServerId, String code) { public AllowedInviteLink createAllowedInviteLink(AServer server, Long targetServerId, String code) {
AllowedInviteLink inviteLink = AllowedInviteLink.builder().targetServerId(targetServerId).code(code).server(server).build(); AllowedInviteLink inviteLink = AllowedInviteLink
.builder()
.targetServerId(targetServerId)
.code(code)
.server(server)
.build();
return repository.save(inviteLink); return repository.save(inviteLink);
} }
@@ -48,6 +53,6 @@ public class AllowedInviteLinkManagementBean implements AllowedInviteLinkManagem
@Override @Override
public boolean allowedInviteLinkExists(ServerUser serverUser, String code) { public boolean allowedInviteLinkExists(ServerUser serverUser, String code) {
return repository.findByCodeAndServer_Id(code, serverUser.getServerId()).isPresent(); return repository.findByCodeIgnoreCaseAndServer_Id(code, serverUser.getServerId()).isPresent();
} }
} }