From a151c37f94cc117c18f2b916487fd11dee61f93b Mon Sep 17 00:00:00 2001 From: Kruzya Date: Mon, 2 Mar 2020 17:07:42 +0400 Subject: [PATCH] Changed prefix for commands in RSS module --- modules/RichSiteSummary/Handler/FeedList.cs | 10 +++++----- modules/RichSiteSummary/Handler/StatsHandler.cs | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/RichSiteSummary/Handler/FeedList.cs b/modules/RichSiteSummary/Handler/FeedList.cs index 8ea8ffb..a5c0d0f 100644 --- a/modules/RichSiteSummary/Handler/FeedList.cs +++ b/modules/RichSiteSummary/Handler/FeedList.cs @@ -19,7 +19,7 @@ namespace Kruzya.TelegramBot.RichSiteSummary.Handler { } - [ParametrizedCommand("feed_show")] + [ParametrizedCommand("rss_show")] public async Task ShowFeed(Feed feed) => await ShowFeed(feed, Chat, From); public async Task ShowFeed(Guid feedId, Chat chat, User from) @@ -80,10 +80,10 @@ namespace Kruzya.TelegramBot.RichSiteSummary.Handler } } - [ParametrizedCommand("feed_list")] + [ParametrizedCommand("rss_list")] public async Task List() => await GenerateMenu(); - [ParametrizedCommand("feed_search")] + [ParametrizedCommand("rss_search")] public async Task Search(string query) { if (!(await GenerateMenu(query))) @@ -118,7 +118,7 @@ namespace Kruzya.TelegramBot.RichSiteSummary.Handler var dbQuery = _dbContext.Feeds.AsQueryable(); if (!string.IsNullOrWhiteSpace(query)) { - var searchQuery = query; + var searchQuery = query.ToLower(); if (query.EndsWith(":sub")) { var chatList = await _dbContext.Subscriptions.AllSubscriptions(chat).Select(chat => chat.Feed.FeedId).ToArrayAsync(); @@ -127,7 +127,7 @@ namespace Kruzya.TelegramBot.RichSiteSummary.Handler searchQuery = searchQuery.Remove(searchQuery.Length - 4, 4); } - dbQuery = dbQuery.Where(feed => feed.Title.Contains(searchQuery) || feed.Url.Contains(searchQuery) || feed.HomePage.Contains(searchQuery)); + dbQuery = dbQuery.Where(feed => feed.Title.ToLower().Contains(searchQuery) || feed.Url.ToLower().Contains(searchQuery) || feed.HomePage.ToLower().Contains(searchQuery)); } var totalCount = await dbQuery.CountAsync(); diff --git a/modules/RichSiteSummary/Handler/StatsHandler.cs b/modules/RichSiteSummary/Handler/StatsHandler.cs index 6c0e5cf..e84bad0 100644 --- a/modules/RichSiteSummary/Handler/StatsHandler.cs +++ b/modules/RichSiteSummary/Handler/StatsHandler.cs @@ -14,7 +14,7 @@ namespace Kruzya.TelegramBot.RichSiteSummary.Handler { } - [Command("feed_stats")] + [Command("rss_stats")] public async Task Execute() { var feedCount = await _dbContext.Feeds.CountAsync();