Skip to content

Commit 31c6a3a

Browse files
greenhat616greenhat616
committed
refactor: upgrade project to dotnet 8
1 parent a982a79 commit 31c6a3a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+491
-376
lines changed

‎pmcenter/BotCommands/AutoSaveCommand.cs

+16-16
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ public async Task<bool> ExecuteAsync(TelegramBotClient botClient, Update update)
2828
Vars.CurrentConf.ConfSyncInterval = 0;
2929
_ = await botClient.SendTextMessageAsync(update.Message.From.Id,
3030
Vars.CurrentLang.Message_AutoSaveDisabled,
31-
ParseMode.Markdown,
32-
false,
33-
Vars.CurrentConf.DisableNotifications,
34-
update.Message.MessageId).ConfigureAwait(false);
31+
parseMode: ParseMode.Markdown,
32+
protectContent: false,
33+
disableNotification: Vars.CurrentConf.DisableNotifications,
34+
messageThreadId: update.Message.MessageId).ConfigureAwait(false);
3535
if (Vars.SyncConf != null) Vars.SyncConf.Interrupt();
3636
return true;
3737
}
@@ -40,17 +40,17 @@ public async Task<bool> ExecuteAsync(TelegramBotClient botClient, Update update)
4040
Vars.CurrentConf.ConfSyncInterval = interval;
4141
_ = await botClient.SendTextMessageAsync(update.Message.From.Id,
4242
Vars.CurrentLang.Message_AutoSaveEnabled.Replace("$1", (interval / 1000).ToString()),
43-
ParseMode.Markdown,
44-
false,
45-
Vars.CurrentConf.DisableNotifications,
46-
update.Message.MessageId).ConfigureAwait(false);
43+
parseMode: ParseMode.MarkdownV2,
44+
protectContent: false,
45+
disableNotification: Vars.CurrentConf.DisableNotifications,
46+
messageThreadId: update.Message.MessageId).ConfigureAwait(false);
4747
if (interval < 5000)
4848
_ = await botClient.SendTextMessageAsync(update.Message.From.Id,
4949
Vars.CurrentLang.Message_AutoSaveIntervalTooShort.Replace("$1", interval.ToString()),
50-
ParseMode.Markdown,
51-
false,
52-
Vars.CurrentConf.DisableNotifications,
53-
update.Message.MessageId).ConfigureAwait(false);
50+
parseMode: ParseMode.MarkdownV2,
51+
protectContent: false,
52+
disableNotification: Vars.CurrentConf.DisableNotifications,
53+
messageThreadId: update.Message.MessageId).ConfigureAwait(false);
5454
if ((Vars.SyncConf == null) || !Vars.SyncConf.IsAlive)
5555
{
5656
Vars.SyncConf = new Thread(() => Methods.ThrSyncConf());
@@ -63,10 +63,10 @@ public async Task<bool> ExecuteAsync(TelegramBotClient botClient, Update update)
6363
Log($"Failed to process autosave command: {ex}", "BOT", LogLevel.Error);
6464
_ = await botClient.SendTextMessageAsync(update.Message.From.Id,
6565
Vars.CurrentLang.Message_GeneralFailure.Replace("$1", ex.ToString()),
66-
ParseMode.Default,
67-
false,
68-
Vars.CurrentConf.DisableNotifications,
69-
update.Message.MessageId).ConfigureAwait(false);
66+
parseMode: ParseMode.MarkdownV2,
67+
protectContent: false,
68+
disableNotification: Vars.CurrentConf.DisableNotifications,
69+
messageThreadId: update.Message.MessageId).ConfigureAwait(false);
7070
return true;
7171
}
7272
}

‎pmcenter/BotCommands/BackupConfCommand.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ public async Task<bool> ExecuteAsync(TelegramBotClient botClient, Update update)
2323
_ = await botClient.SendTextMessageAsync(
2424
update.Message.From.Id,
2525
Vars.CurrentLang.Message_BackupComplete.Replace("$1", randomFilename),
26-
ParseMode.Markdown,
27-
false,
28-
Vars.CurrentConf.DisableNotifications,
29-
update.Message.MessageId).ConfigureAwait(false);
26+
parseMode: ParseMode.MarkdownV2,
27+
protectContent: false,
28+
disableNotification: Vars.CurrentConf.DisableNotifications,
29+
messageThreadId: update.Message.MessageId).ConfigureAwait(false);
3030
return true;
3131
}
3232
}

‎pmcenter/BotCommands/BanCommand.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ public async Task<bool> ExecuteAsync(TelegramBotClient botClient, Update update)
2121
_ = await botClient.SendTextMessageAsync(
2222
update.Message.From.Id,
2323
Vars.CurrentLang.Message_UserBanned,
24-
ParseMode.Markdown,
25-
false,
26-
Vars.CurrentConf.DisableNotifications,
27-
update.Message.MessageId).ConfigureAwait(false);
24+
parseMode: ParseMode.MarkdownV2,
25+
protectContent: false,
26+
disableNotification: Vars.CurrentConf.DisableNotifications,
27+
messageThreadId: update.Message.MessageId).ConfigureAwait(false);
2828
return true;
2929
}
3030
}

‎pmcenter/BotCommands/BanIdCommand.cs

+8-8
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@ public async Task<bool> ExecuteAsync(TelegramBotClient botClient, Update update)
2222
_ = await botClient.SendTextMessageAsync(
2323
update.Message.From.Id,
2424
Vars.CurrentLang.Message_UserBanned,
25-
ParseMode.Markdown,
26-
false,
27-
Vars.CurrentConf.DisableNotifications,
28-
update.Message.MessageId).ConfigureAwait(false);
25+
parseMode: ParseMode.MarkdownV2,
26+
protectContent: false,
27+
disableNotification: Vars.CurrentConf.DisableNotifications,
28+
messageThreadId: update.Message.MessageId).ConfigureAwait(false);
2929
}
3030
catch (Exception ex)
3131
{
3232
_ = await botClient.SendTextMessageAsync(
3333
update.Message.From.Id,
3434
Vars.CurrentLang.Message_GeneralFailure.Replace("$1", ex.Message),
35-
ParseMode.Markdown,
36-
false,
37-
Vars.CurrentConf.DisableNotifications,
38-
update.Message.MessageId).ConfigureAwait(false);
35+
parseMode: ParseMode.MarkdownV2,
36+
protectContent: false,
37+
disableNotification: Vars.CurrentConf.DisableNotifications,
38+
messageThreadId: update.Message.MessageId).ConfigureAwait(false);
3939
}
4040
return true;
4141
}

‎pmcenter/BotCommands/CatConfigCommand.cs

+13-13
Original file line numberDiff line numberDiff line change
@@ -21,30 +21,30 @@ public async Task<bool> ExecuteAsync(TelegramBotClient botClient, Update update)
2121
_ = await botClient.SendTextMessageAsync(
2222
update.Message.From.Id,
2323
Vars.CurrentLang.Message_CurrentConf.Replace("$1", text),
24-
ParseMode.Markdown,
25-
false,
26-
Vars.CurrentConf.DisableNotifications,
27-
update.Message.MessageId).ConfigureAwait(false);
28-
return true;
24+
parseMode: ParseMode.MarkdownV2,
25+
protectContent: false,
26+
disableNotification: Vars.CurrentConf.DisableNotifications,
27+
messageThreadId: update.Message.MessageId).ConfigureAwait(false);
28+
return true;
2929
}
3030
else
3131
{
3232
_ = await botClient.SendTextMessageAsync(
3333
update.Message.From.Id,
3434
Vars.CurrentLang.Message_CurrentConf.Replace("$1", texts[0]),
35-
ParseMode.Markdown,
36-
false,
37-
Vars.CurrentConf.DisableNotifications,
38-
update.Message.MessageId).ConfigureAwait(false);
35+
parseMode: ParseMode.MarkdownV2,
36+
protectContent: false,
37+
disableNotification: Vars.CurrentConf.DisableNotifications,
38+
messageThreadId: update.Message.MessageId).ConfigureAwait(false);
3939
for (int i = 1; i < texts.Count; i++)
4040
{
4141
_ = await botClient.SendTextMessageAsync(
4242
update.Message.From.Id,
4343
($"`{texts[i]}`"),
44-
ParseMode.Markdown,
45-
false,
46-
Vars.CurrentConf.DisableNotifications,
47-
update.Message.MessageId).ConfigureAwait(false);
44+
parseMode: ParseMode.MarkdownV2,
45+
protectContent: false,
46+
disableNotification: Vars.CurrentConf.DisableNotifications,
47+
messageThreadId: update.Message.MessageId).ConfigureAwait(false);
4848
}
4949
return true;
5050
}

‎pmcenter/BotCommands/ChatCommand.cs

+8-8
Original file line numberDiff line numberDiff line change
@@ -55,21 +55,21 @@ public async Task<bool> ExecuteAsync(TelegramBotClient botClient, Update update)
5555

5656
_ = await botClient.SendTextMessageAsync(update.Message.From.Id,
5757
Vars.CurrentLang.Message_ContinuedChatEnabled.Replace("$1", replacementText),
58-
ParseMode.Markdown,
59-
false,
60-
Vars.CurrentConf.DisableNotifications,
61-
update.Message.MessageId).ConfigureAwait(false);
58+
parseMode: ParseMode.MarkdownV2,
59+
protectContent: false,
60+
disableNotification: Vars.CurrentConf.DisableNotifications,
61+
messageThreadId: update.Message.MessageId).ConfigureAwait(false);
6262
return true;
6363
}
6464
catch (Exception ex)
6565
{
6666
Log($"Failed to enable Continued Conversation: {ex}", "BOT", LogLevel.Error);
6767
_ = await botClient.SendTextMessageAsync(update.Message.From.Id,
6868
Vars.CurrentLang.Message_GeneralFailure.Replace("$1", ex.ToString()),
69-
ParseMode.Default,
70-
false,
71-
Vars.CurrentConf.DisableNotifications,
72-
update.Message.MessageId).ConfigureAwait(false);
69+
parseMode: ParseMode.MarkdownV2,
70+
protectContent: false,
71+
disableNotification: Vars.CurrentConf.DisableNotifications,
72+
messageThreadId: update.Message.MessageId).ConfigureAwait(false);
7373
return true;
7474
}
7575
}

‎pmcenter/BotCommands/CheckUpdateCommand.cs

+12-12
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ public async Task<bool> ExecuteAsync(TelegramBotClient botClient, Telegram.Bot.T
3030
_ = await botClient.SendTextMessageAsync(
3131
update.Message.From.Id,
3232
updateString,
33-
ParseMode.Markdown,
34-
false,
35-
Vars.CurrentConf.DisableNotifications,
36-
update.Message.MessageId).ConfigureAwait(false);
33+
parseMode: ParseMode.MarkdownV2,
34+
protectContent: false,
35+
disableNotification: Vars.CurrentConf.DisableNotifications,
36+
messageThreadId: update.Message.MessageId).ConfigureAwait(false);
3737
}
3838
else
3939
{
@@ -44,10 +44,10 @@ public async Task<bool> ExecuteAsync(TelegramBotClient botClient, Telegram.Bot.T
4444
.Replace("$1", latest.Latest)
4545
.Replace("$2", Vars.AppVer.ToString())
4646
.Replace("$3", latest.UpdateCollection[currentLocalizedIndex].Details),
47-
ParseMode.Markdown,
48-
false,
49-
Vars.CurrentConf.DisableNotifications,
50-
update.Message.MessageId).ConfigureAwait(false);
47+
parseMode: ParseMode.MarkdownV2,
48+
protectContent: false,
49+
disableNotification: Vars.CurrentConf.DisableNotifications,
50+
messageThreadId: update.Message.MessageId).ConfigureAwait(false);
5151
}
5252
return true;
5353
}
@@ -57,10 +57,10 @@ public async Task<bool> ExecuteAsync(TelegramBotClient botClient, Telegram.Bot.T
5757
_ = await botClient.SendTextMessageAsync(
5858
update.Message.From.Id,
5959
errorString,
60-
ParseMode.Markdown,
61-
false,
62-
Vars.CurrentConf.DisableNotifications,
63-
update.Message.MessageId).ConfigureAwait(false);
60+
parseMode: ParseMode.MarkdownV2,
61+
protectContent: false,
62+
disableNotification: Vars.CurrentConf.DisableNotifications,
63+
messageThreadId: update.Message.MessageId).ConfigureAwait(false);
6464
return true;
6565
}
6666
}

‎pmcenter/BotCommands/ClearMessageLinksCommand.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ public async Task<bool> ExecuteAsync(TelegramBotClient botClient, Update update)
2020
_ = await botClient.SendTextMessageAsync(
2121
update.Message.From.Id,
2222
Vars.CurrentLang.Message_MsgLinksCleared,
23-
ParseMode.Markdown,
24-
false,
25-
Vars.CurrentConf.DisableNotifications,
26-
update.Message.MessageId).ConfigureAwait(false);
23+
parseMode: ParseMode.MarkdownV2,
24+
protectContent: false,
25+
disableNotification: Vars.CurrentConf.DisableNotifications,
26+
messageThreadId: update.Message.MessageId).ConfigureAwait(false);
2727
return true;
2828
}
2929
}

‎pmcenter/BotCommands/DetectPermissionCommand.cs

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
using System;
2-
using System.IO;
1+
using System.IO;
32
using System.Threading.Tasks;
43
using Telegram.Bot;
54
using Telegram.Bot.Types;
65
using Telegram.Bot.Types.Enums;
7-
using static pmcenter.Methods;
86

97
namespace pmcenter.Commands
108
{
@@ -24,10 +22,10 @@ public async Task<bool> ExecuteAsync(TelegramBotClient botClient, Update update)
2422
.Replace("$1", confWritable.ToString())
2523
.Replace("$2", langWritable.ToString())
2624
,
27-
ParseMode.Markdown,
28-
false,
29-
Vars.CurrentConf.DisableNotifications,
30-
update.Message.MessageId).ConfigureAwait(false);
25+
parseMode: ParseMode.MarkdownV2,
26+
protectContent: false,
27+
disableNotification: Vars.CurrentConf.DisableNotifications,
28+
messageThreadId: update.Message.MessageId).ConfigureAwait(false);
3129
return true;
3230
}
3331
}

‎pmcenter/BotCommands/DonateCommand.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ public async Task<bool> ExecuteAsync(TelegramBotClient botClient, Update update)
2020
_ = await botClient.SendTextMessageAsync(
2121
update.Message.From.Id,
2222
Vars.CurrentConf.DonateString,
23-
ParseMode.Markdown,
24-
false,
25-
Vars.CurrentConf.DisableNotifications,
26-
update.Message.MessageId).ConfigureAwait(false);
23+
parseMode: ParseMode.MarkdownV2,
24+
protectContent: false,
25+
disableNotification: Vars.CurrentConf.DisableNotifications,
26+
messageThreadId: update.Message.MessageId).ConfigureAwait(false);
2727
return true;
2828
}
2929
}

‎pmcenter/BotCommands/EditConfCommand.cs

+12-12
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ public async Task<bool> ExecuteAsync(TelegramBotClient botClient, Update update)
2929
_ = await botClient.SendTextMessageAsync(
3030
update.Message.From.Id,
3131
Vars.CurrentLang.Message_APIKeyChanged,
32-
ParseMode.Markdown,
33-
false,
34-
Vars.CurrentConf.DisableNotifications,
35-
update.Message.MessageId).ConfigureAwait(false);
32+
parseMode: ParseMode.MarkdownV2,
33+
protectContent: false,
34+
disableNotification: Vars.CurrentConf.DisableNotifications,
35+
messageThreadId: update.Message.MessageId).ConfigureAwait(false);
3636
Vars.RestartRequired = true;
3737
}
3838
if (temp.ConfSyncInterval == 0)
@@ -52,20 +52,20 @@ public async Task<bool> ExecuteAsync(TelegramBotClient botClient, Update update)
5252
_ = await botClient.SendTextMessageAsync(
5353
update.Message.From.Id,
5454
Vars.CurrentLang.Message_ConfigUpdated,
55-
ParseMode.Markdown,
56-
false,
57-
Vars.CurrentConf.DisableNotifications,
58-
update.Message.MessageId).ConfigureAwait(false);
55+
parseMode: ParseMode.MarkdownV2,
56+
protectContent: false,
57+
disableNotification: Vars.CurrentConf.DisableNotifications,
58+
messageThreadId: update.Message.MessageId).ConfigureAwait(false);
5959
}
6060
catch (Exception ex)
6161
{
6262
_ = await botClient.SendTextMessageAsync(
6363
update.Message.From.Id,
6464
Vars.CurrentLang.Message_GeneralFailure.Replace("$1", ex.Message),
65-
ParseMode.Markdown,
66-
false,
67-
Vars.CurrentConf.DisableNotifications,
68-
update.Message.MessageId).ConfigureAwait(false);
65+
parseMode: ParseMode.MarkdownV2,
66+
protectContent: false,
67+
disableNotification: Vars.CurrentConf.DisableNotifications,
68+
messageThreadId: update.Message.MessageId).ConfigureAwait(false);
6969
}
7070
return true;
7171
}

‎pmcenter/BotCommands/GetStatsCommand.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ public async Task<bool> ExecuteAsync(TelegramBotClient botClient, Update update)
1919
.Replace("$2", Vars.CurrentConf.Statistics.TotalForwardedToOwner.ToString())
2020
.Replace("$3", Vars.CurrentConf.Statistics.TotalForwardedFromOwner.ToString())
2121
.Replace("$4", Vars.CurrentConf.Statistics.TotalCommandsReceived.ToString()),
22-
ParseMode.Markdown,
23-
false,
24-
Vars.CurrentConf.DisableNotifications,
25-
update.Message.MessageId).ConfigureAwait(false);
22+
parseMode: ParseMode.MarkdownV2,
23+
protectContent: false,
24+
disableNotification: Vars.CurrentConf.DisableNotifications,
25+
messageThreadId: update.Message.MessageId).ConfigureAwait(false);
2626
return true;
2727
}
2828
}

‎pmcenter/BotCommands/HelpCommand.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ public async Task<bool> ExecuteAsync(TelegramBotClient botClient, Update update)
1616
_ = await botClient.SendTextMessageAsync(
1717
Vars.CurrentConf.OwnerUID,
1818
Vars.CurrentLang.Message_Help,
19-
ParseMode.Markdown,
20-
false,
21-
Vars.CurrentConf.DisableNotifications,
22-
update.Message.MessageId).ConfigureAwait(false);
19+
parseMode: ParseMode.MarkdownV2,
20+
protectContent: false,
21+
disableNotification: Vars.CurrentConf.DisableNotifications,
22+
messageThreadId: update.Message.MessageId).ConfigureAwait(false);
2323
return true;
2424
}
2525
}

0 commit comments

Comments
 (0)