Akamaru/RikoBot-Sharp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace "var" with their types

Browse Source
This commit is contained in:
Andreas Bielawski 2020-03-31 11:20:12 +02:00
parent 24ee7f9052
commit 262d77d1e1
No known key found for this signature in database
GPG Key ID: D2073645DC2C3DE5
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Commands.cs
View File

@ -35,14 +35,14 @@ namespace RSSBot {
} }
public static async void Subscribe(Message message, GroupCollection args) { public static async void Subscribe(Message message, GroupCollection args) {
var url = args[1].Value; string url = args[1].Value;
var chatId = message.Chat.Id; long chatId = message.Chat.Id;
var feed = new RssBotFeed(url); RssBotFeed feed = new RssBotFeed(url);
await Bot.BotClient.SendChatActionAsync(message.Chat, ChatAction.Typing); await Bot.BotClient.SendChatActionAsync(message.Chat, ChatAction.Typing);
if (args.Count > 2) { if (args.Count > 2) {
var chatName = args[2].Value; string chatName = args[2].Value;
if (!chatName.StartsWith("@")) chatName = $"@{chatName}"; if (!chatName.StartsWith("@")) chatName = $"@{chatName}";
Chat chatInfo; Chat chatInfo;
@ -91,13 +91,13 @@ namespace RSSBot {
} }
public static async void Unsubscribe(Message message, GroupCollection args) { public static async void Unsubscribe(Message message, GroupCollection args) {
var url = args[1].Value; string url = args[1].Value;
var chatId = message.Chat.Id; long chatId = message.Chat.Id;
RssBotFeed feed = Bot.RssBotFeeds RssBotFeed feed = Bot.RssBotFeeds
.FirstOrDefault(x => x.Url.ToLower().Equals(url.ToLower())); .FirstOrDefault(x => x.Url.ToLower().Equals(url.ToLower()));
if (args.Count > 2) { if (args.Count > 2) {
var chatName = args[2].Value; string chatName = args[2].Value;
if (!chatName.StartsWith("@")) chatName = $"@{chatName}"; if (!chatName.StartsWith("@")) chatName = $"@{chatName}";
Chat chatInfo; Chat chatInfo;
@ -130,12 +130,12 @@ namespace RSSBot {
} }
public static async void Show(Message message, GroupCollection args) { public static async void Show(Message message, GroupCollection args) {
var chatId = message.Chat.Id; long chatId = message.Chat.Id;
var chatTitle = message.Chat.Type.Equals(ChatType.Private) ? message.Chat.FirstName : message.Chat.Title; string chatTitle = message.Chat.Type.Equals(ChatType.Private) ? message.Chat.FirstName : message.Chat.Title;
await Bot.BotClient.SendChatActionAsync(message.Chat, ChatAction.Typing); await Bot.BotClient.SendChatActionAsync(message.Chat, ChatAction.Typing);
if (args.Count > 1) { if (args.Count > 1) {
var chatName = args[1].Value; string chatName = args[1].Value;
if (!chatName.StartsWith("@")) chatName = $"@{chatName}"; if (!chatName.StartsWith("@")) chatName = $"@{chatName}";
Chat chatInfo; Chat chatInfo;
@ -157,14 +157,14 @@ namespace RSSBot {
} }
} }
var feeds = Bot.RssBotFeeds.Where(x => x.Subs.Contains(chatId)).ToList(); List<RssBotFeed> feeds = Bot.RssBotFeeds.Where(x => x.Subs.Contains(chatId)).ToList();
var text = new StringBuilder(); StringBuilder text = new StringBuilder();
if (feeds.Count < 1) { if (feeds.Count < 1) {
text.Append("❌ Keine Feeds abonniert."); text.Append("❌ Keine Feeds abonniert.");
} else { } else {
text.Append($"<strong>{HttpUtility.HtmlEncode(chatTitle)}</strong> hat abonniert:\n"); text.Append($"<strong>{HttpUtility.HtmlEncode(chatTitle)}</strong> hat abonniert:\n");
for (var i = 0; i < feeds.Count; i++) text.Append($"<strong>{i + 1}</strong>) {feeds[i].Url}\n"); for (int i = 0; i < feeds.Count; i++) text.Append($"<strong>{i + 1}</strong>) {feeds[i].Url}\n");
} }
await Bot.BotClient.SendTextMessageAsync(message.Chat, text.ToString(), ParseMode.Html, true); await Bot.BotClient.SendTextMessageAsync(message.Chat, text.ToString(), ParseMode.Html, true);
@ -172,7 +172,7 @@ namespace RSSBot {
public static async void Sync() { public static async void Sync() {
Logger.Info("================================"); Logger.Info("================================");
var hadEntries = false; bool hadEntries = false;
foreach (RssBotFeed feed in Bot.RssBotFeeds.ToList()) { foreach (RssBotFeed feed in Bot.RssBotFeeds.ToList()) {
Logger.Info(feed.Url); Logger.Info(feed.Url);
try { try {
@ -193,11 +193,11 @@ namespace RSSBot {
: $"{feed.NewEntries.Count} neue Beiträge"); : $"{feed.NewEntries.Count} neue Beiträge");
foreach (FeedItem entry in feed.NewEntries) { foreach (FeedItem entry in feed.NewEntries) {
var postTitle = "Kein Titel"; string postTitle = "Kein Titel";
if (!string.IsNullOrWhiteSpace(entry.Title)) postTitle = Utils.StripHtml(entry.Title); if (!string.IsNullOrWhiteSpace(entry.Title)) postTitle = Utils.StripHtml(entry.Title);
var postLink = feed.MainLink; string postLink = feed.MainLink;
var linkName = postLink; string linkName = postLink;
if (!string.IsNullOrWhiteSpace(entry.Link)) { if (!string.IsNullOrWhiteSpace(entry.Link)) {
postLink = entry.Link; postLink = entry.Link;
// FeedProxy URLs // FeedProxy URLs
@ -207,20 +207,20 @@ namespace RSSBot {
} }
// Remove "www." // Remove "www."
var index = linkName.IndexOf("www.", StringComparison.Ordinal); int index = linkName.IndexOf("www.", StringComparison.Ordinal);
if (index > -1) linkName = linkName.Remove(index, 4); if (index > -1) linkName = linkName.Remove(index, 4);
var content = ""; string content = "";
if (!string.IsNullOrWhiteSpace(entry.Content)) if (!string.IsNullOrWhiteSpace(entry.Content))
content = Utils.ProcessContent(entry.Content); content = Utils.ProcessContent(entry.Content);
else if (!string.IsNullOrWhiteSpace(entry.Description)) else if (!string.IsNullOrWhiteSpace(entry.Description))
content = Utils.ProcessContent(entry.Description); content = Utils.ProcessContent(entry.Description);
var text = $"<b>{postTitle}</b>\n<i>{feed.Title}</i>\n{content}"; string text = $"<b>{postTitle}</b>\n<i>{feed.Title}</i>\n{content}";
text += $"\n<a href=\"{postLink}\">Weiterlesen auf {linkName}</a>"; text += $"\n<a href=\"{postLink}\">Weiterlesen auf {linkName}</a>";
// Send // Send
foreach (var chatId in feed.Subs.ToList()) foreach (long chatId in feed.Subs.ToList())
try { try {
await Bot.BotClient.SendTextMessageAsync(chatId, text, ParseMode.Html, true, true); await Bot.BotClient.SendTextMessageAsync(chatId, text, ParseMode.Html, true, true);
} catch (ApiRequestException e) { } catch (ApiRequestException e) {
@ -244,7 +244,7 @@ namespace RSSBot {
} }
public static async void ShowAvailableFeeds(Message message, GroupCollection args) { public static async void ShowAvailableFeeds(Message message, GroupCollection args) {
var url = args[1].Value; string url = args[1].Value;
IEnumerable<HtmlFeedLink> feeds; IEnumerable<HtmlFeedLink> feeds;
try { try {
feeds = await FeedReader.GetFeedUrlsFromUrlAsync(url); feeds = await FeedReader.GetFeedUrlsFromUrlAsync(url);
@ -253,13 +253,13 @@ namespace RSSBot {
return; return;
} }
var htmlFeedLinks = feeds.ToList(); List<HtmlFeedLink> htmlFeedLinks = feeds.ToList();
if (htmlFeedLinks.Count == 0) { if (htmlFeedLinks.Count == 0) {
await Bot.BotClient.SendTextMessageAsync(message.Chat, "❌ Keine Feeds gefunden."); await Bot.BotClient.SendTextMessageAsync(message.Chat, "❌ Keine Feeds gefunden.");
return; return;
} }
var text = htmlFeedLinks.Aggregate("Feeds gefunden:\n", string text = htmlFeedLinks.Aggregate("Feeds gefunden:\n",
(current, feedLink) => (current, feedLink) =>
current + $"* <a href=\"{feedLink.Url}\">{Utils.StripHtml(feedLink.Title)}</a>\n"); current + $"* <a href=\"{feedLink.Url}\">{Utils.StripHtml(feedLink.Title)}</a>\n");