Make getUser a safer method by returning an EMPTY_USER on null
This commit is contained in:
parent
023772142a
commit
5281caad39
@ -37,6 +37,7 @@ import static com.google.common.collect.Sets.difference;
|
|||||||
import static java.lang.String.format;
|
import static java.lang.String.format;
|
||||||
import static java.time.ZonedDateTime.now;
|
import static java.time.ZonedDateTime.now;
|
||||||
import static java.util.Arrays.stream;
|
import static java.util.Arrays.stream;
|
||||||
|
import static java.util.Objects.isNull;
|
||||||
import static java.util.Optional.ofNullable;
|
import static java.util.Optional.ofNullable;
|
||||||
import static java.util.regex.Pattern.CASE_INSENSITIVE;
|
import static java.util.regex.Pattern.CASE_INSENSITIVE;
|
||||||
import static java.util.regex.Pattern.compile;
|
import static java.util.regex.Pattern.compile;
|
||||||
@ -402,8 +403,12 @@ public abstract class BaseAbilityBot extends DefaultAbsSender implements Ability
|
|||||||
}
|
}
|
||||||
|
|
||||||
boolean checkBlacklist(Update update) {
|
boolean checkBlacklist(Update update) {
|
||||||
Integer id = AbilityUtils.getUser(update).getId();
|
User user = getUser(update);
|
||||||
|
if (isNull(user)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
int id = user.getId();
|
||||||
return id == creatorId() || !blacklist().contains(id);
|
return id == creatorId() || !blacklist().contains(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -17,6 +17,7 @@ import java.util.function.Predicate;
|
|||||||
import static java.util.ResourceBundle.Control.FORMAT_PROPERTIES;
|
import static java.util.ResourceBundle.Control.FORMAT_PROPERTIES;
|
||||||
import static java.util.ResourceBundle.Control.getNoFallbackControl;
|
import static java.util.ResourceBundle.Control.getNoFallbackControl;
|
||||||
import static java.util.ResourceBundle.getBundle;
|
import static java.util.ResourceBundle.getBundle;
|
||||||
|
import static org.apache.commons.lang3.ObjectUtils.defaultIfNull;
|
||||||
import static org.apache.commons.lang3.StringUtils.isEmpty;
|
import static org.apache.commons.lang3.StringUtils.isEmpty;
|
||||||
import static org.telegram.abilitybots.api.objects.Flag.*;
|
import static org.telegram.abilitybots.api.objects.Flag.*;
|
||||||
|
|
||||||
@ -57,6 +58,10 @@ public final class AbilityUtils {
|
|||||||
* @throws IllegalStateException if the user could not be found
|
* @throws IllegalStateException if the user could not be found
|
||||||
*/
|
*/
|
||||||
public static User getUser(Update update) {
|
public static User getUser(Update update) {
|
||||||
|
return defaultIfNull(getUserElseThrow(update), EMPTY_USER);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static User getUserElseThrow(Update update) {
|
||||||
if (MESSAGE.test(update)) {
|
if (MESSAGE.test(update)) {
|
||||||
return update.getMessage().getFrom();
|
return update.getMessage().getFrom();
|
||||||
} else if (CALLBACK_QUERY.test(update)) {
|
} else if (CALLBACK_QUERY.test(update)) {
|
||||||
@ -199,7 +204,7 @@ public final class AbilityUtils {
|
|||||||
return update -> update.getMessage().getReplyToMessage().getText().equals(msg);
|
return update -> update.getMessage().getReplyToMessage().getText().equals(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getLocalizedMessage(String messageCode, Locale locale, Object...arguments) {
|
public static String getLocalizedMessage(String messageCode, Locale locale, Object... arguments) {
|
||||||
ResourceBundle bundle;
|
ResourceBundle bundle;
|
||||||
if (locale == null) {
|
if (locale == null) {
|
||||||
bundle = getBundle("messages", Locale.ROOT);
|
bundle = getBundle("messages", Locale.ROOT);
|
||||||
@ -217,7 +222,7 @@ public final class AbilityUtils {
|
|||||||
return MessageFormat.format(message, arguments);
|
return MessageFormat.format(message, arguments);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getLocalizedMessage(String messageCode, String languageCode, Object...arguments){
|
public static String getLocalizedMessage(String messageCode, String languageCode, Object... arguments) {
|
||||||
Locale locale = Strings.isNullOrEmpty(languageCode) ? null : Locale.forLanguageTag(languageCode);
|
Locale locale = Strings.isNullOrEmpty(languageCode) ? null : Locale.forLanguageTag(languageCode);
|
||||||
return getLocalizedMessage(messageCode, locale, arguments);
|
return getLocalizedMessage(messageCode, locale, arguments);
|
||||||
}
|
}
|
||||||
@ -247,8 +252,8 @@ public final class AbilityUtils {
|
|||||||
* The full name is identified as the concatenation of the first and last name, separated by a space.
|
* The full name is identified as the concatenation of the first and last name, separated by a space.
|
||||||
* This method can return an empty name if both first and last name are empty.
|
* This method can return an empty name if both first and last name are empty.
|
||||||
*
|
*
|
||||||
* @return the full name of the user
|
|
||||||
* @param user
|
* @param user
|
||||||
|
* @return the full name of the user
|
||||||
*/
|
*/
|
||||||
public static String fullName(User user) {
|
public static String fullName(User user) {
|
||||||
StringJoiner name = new StringJoiner(" ");
|
StringJoiner name = new StringJoiner(" ");
|
||||||
|
Loading…
Reference in New Issue
Block a user