Sheldan/abstracto
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto.git synced 2026-03-20 12:41:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

added possibility to the ID of a user instead of a mention for a member parameter

Browse Source
This commit is contained in:
Sheldan
2020-05-27 15:39:12 +02:00
parent feb92698ef
commit 8413bc8314
4 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/CommandReceivedHandler.java
View File

@@ -12,6 +12,7 @@ import dev.sheldan.abstracto.core.command.execution.*;
import dev.sheldan.abstracto.core.command.execution.UnParsedCommandParameter;
import dev.sheldan.abstracto.core.Constants;
import dev.sheldan.abstracto.core.exception.ChannelNotFoundException;
import dev.sheldan.abstracto.core.exception.MemberNotFoundException;
import dev.sheldan.abstracto.core.exception.RoleNotFoundInDBException;
import dev.sheldan.abstracto.core.models.database.ARole;
import dev.sheldan.abstracto.core.service.management.ChannelManagementService;
@@ -165,7 +166,15 @@ public class CommandReceivedHandler extends ListenerAdapter {
} else if(param.getType().equals(TextChannel.class)){
parsedParameters.add(channelIterator.next());
} else if(param.getType().equals(Member.class)) {
parsedParameters.add(memberIterator.next());
if(StringUtils.isNumeric(value)) {
Member memberById = message.getGuild().getMemberById(Long.parseLong(value));
if(memberById == null) {
throw new MemberNotFoundException();
}
parsedParameters.add(memberById);
} else {
parsedParameters.add(memberIterator.next());
}
} else if(param.getType().equals(Emote.class)) {
// TODO maybe rework, this fails if two emotes are needed, and the second one is an emote, the first one a default one
// the second one shadows the first one, and there are too little parameters to go of

1
abstracto-application/core/core-impl/src/main/resources/seedData/templates/exceptions/member_not_found_exception_en_US.ftl Normal file
View File

@@ -0,0 +1 @@
<#include "member_not_foound_exception_text">

20
abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/exception/MemberNotFoundException.java Normal file
View File

@@ -0,0 +1,20 @@
package dev.sheldan.abstracto.core.exception;
import dev.sheldan.abstracto.templating.Templatable;
public class MemberNotFoundException extends AbstractoRunTimeException implements Templatable {
public MemberNotFoundException() {
super("");
}
@Override
public String getTemplateName() {
return "member_not_found_exception";
}
@Override
public Object getTemplateModel() {
return new Object();
}
}

1
abstracto-application/template-config/src/main/resources/templates/en_US/core/exception/member_not_foound_exception_text_en_US.ftl Normal file
View File

@@ -0,0 +1 @@
Member not found.