valitydev/alert-tg-bot
14
0
Fork 0
mirror of https://github.com/valitydev/alert-tg-bot.git synced 2024-11-06 01:55:23 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Return max allowed and relevant results (#12)

Browse Source 
* Return max allowed and relevant results

* Dirty fix (use option length sort)

* Cleanup
This commit is contained in:
Egor Cherniak 2023-07-04 09:37:19 +03:00 committed by GitHub
parent 2705bf24d5
commit e068525360
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pom.xml
View File

@ -159,7 +159,6 @@
<artifactId>postgresql</artifactId>
</dependency>
<!--test-->
<dependency>
<groupId>org.springframework.boot</groupId>

14
src/main/java/dev/vality/alert/tg/bot/handler/InlineHandler.java
View File

@ -16,10 +16,10 @@ import org.springframework.stereotype.Component;
import org.telegram.telegrambots.meta.api.methods.AnswerInlineQuery;
import org.telegram.telegrambots.meta.api.objects.Update;
import org.telegram.telegrambots.meta.api.objects.inlinequery.inputmessagecontent.InputTextMessageContent;
import org.telegram.telegrambots.meta.api.objects.inlinequery.result.InlineQueryResult;
import org.telegram.telegrambots.meta.api.objects.inlinequery.result.InlineQueryResultArticle;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import static dev.vality.alert.tg.bot.utils.StringSearchUtils.*;
@ -28,6 +28,7 @@ import static dev.vality.alert.tg.bot.utils.StringSearchUtils.*;
@RequiredArgsConstructor
@Order(Ordered.HIGHEST_PRECEDENCE)
public class InlineHandler implements CommonHandler<AnswerInlineQuery> {
public static final int MAX_INLINE_LIMIT = 50;
private final MayDayService mayDayService;
private final JsonMapper jsonMapper;
@ -42,7 +43,7 @@ public class InlineHandler implements CommonHandler<AnswerInlineQuery> {
@Override
public AnswerInlineQuery handle(Update update, long userId) throws TException {
String inlineQuery = update.getInlineQuery().getQuery();
List<InlineQueryResult> queryResultArticleList = new ArrayList<>();
List<InlineQueryResultArticle> queryResultArticleList = new ArrayList<>();
switch (InlineCommands.valueOfStartInlineCommand(inlineQuery)) {
case SELECT_ALERT -> {
List<UserAlert> userAlerts = mayDayService.getUserAlerts(
@ -79,7 +80,14 @@ public class InlineHandler implements CommonHandler<AnswerInlineQuery> {
default -> throw new AlertTgBotException("Unknown InlineQuery value: " + inlineQuery);
}
return new AnswerInlineQuery(update.getInlineQuery().getId(), queryResultArticleList);
List<InlineQueryResultArticle> queryResultArticleListCopy = queryResultArticleList;
queryResultArticleListCopy.sort(Comparator.comparingInt(q -> q.getId().length()));
if (queryResultArticleListCopy.size() > MAX_INLINE_LIMIT) {
queryResultArticleListCopy = queryResultArticleListCopy.subList(0, MAX_INLINE_LIMIT);
}
return new AnswerInlineQuery(update.getInlineQuery().getId(), new ArrayList<>(queryResultArticleListCopy));
}
private InlineQueryResultArticle fillInlineQueryResultArticle(String id,