CrazyHackGUT/telegram-bot
1
0
Fork 0
mirror of https://github.com/Bubuni-Team/telegram-bot.git synced 2026-07-31 00:29:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update target framework to .NET 5 & telegram-bot-framework. Update bot codebase to use the new framework API.

Browse Source
This commit is contained in:
West14
2021-12-25 15:17:13 +02:00
parent 73ed1d88a9
commit de08c74a5d
9 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/Core.csproj
+2 -2
View File
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssemblyName>TelegramBot</AssemblyName> <AssemblyName>TelegramBot</AssemblyName>
<RootNamespace>Kruzya.TelegramBot.Core</RootNamespace> <RootNamespace>Kruzya.TelegramBot.Core</RootNamespace>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AleXr64.BotFramework" Version="0.3.11" /> <PackageReference Include="AleXr64.BotFramework" Version="0.5.21" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.2" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="3.1.2" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="3.1.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.2" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.2" />
modules/CombotAntiSpam/CombotAntiSpam.csproj
+1 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssemblyName>TelegramBot.CombotAntiSpam</AssemblyName> <AssemblyName>TelegramBot.CombotAntiSpam</AssemblyName>
<RootNamespace>Kruzya.TelegramBot.CombotAntiSpam</RootNamespace> <RootNamespace>Kruzya.TelegramBot.CombotAntiSpam</RootNamespace>
</PropertyGroup> </PropertyGroup>
modules/CombotAntiSpam/UserJoinHandler.cs
+2 -1
View File
@@ -2,6 +2,7 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using BotFramework; using BotFramework;
using BotFramework.Attributes; using BotFramework.Attributes;
using BotFramework.Enums;
using BotFramework.Setup; using BotFramework.Setup;
using Kruzya.TelegramBot.CombotAntiSpam.Combot; using Kruzya.TelegramBot.CombotAntiSpam.Combot;
using Kruzya.TelegramBot.Core.Extensions; using Kruzya.TelegramBot.Core.Extensions;
@@ -20,7 +21,7 @@ namespace Kruzya.TelegramBot.CombotAntiSpam
_combotClient = combotClient; _combotClient = combotClient;
} }
[Message(MessageType.ChatMembersAdded, InChat.Public)] [Message(InChat.Public, MessageFlag.HasNewChatMembers)]
public async Task OnUserJoined() public async Task OnUserJoined()
{ {
var canKickMembers = ((await Bot.GetChatMemberAsync(Chat, (await Bot.GetMeAsync()).Id)).CanRestrictMembers == true); var canKickMembers = ((await Bot.GetChatMemberAsync(Chat, (await Bot.GetMeAsync()).Id)).CanRestrictMembers == true);
modules/Destiny2.WhereIsXur/Destiny2.WhereIsXur.csproj
+1 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssemblyName>Kruzya.TelegramBot.D2_WhereIsXur</AssemblyName> <AssemblyName>Kruzya.TelegramBot.D2_WhereIsXur</AssemblyName>
<RootNamespace>Kruzya.TelegramBot.Destiny2.WhereIsXur</RootNamespace> <RootNamespace>Kruzya.TelegramBot.Destiny2.WhereIsXur</RootNamespace>
</PropertyGroup> </PropertyGroup>
modules/RichSiteSummary/Handler/FeedList.cs
+3 -1
View File
@@ -4,6 +4,8 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using BotFramework.Attributes; using BotFramework.Attributes;
using BotFramework.Enums;
using BotFramework.Setup;
using Kruzya.TelegramBot.Core.Extensions; using Kruzya.TelegramBot.Core.Extensions;
using Kruzya.TelegramBot.RichSiteSummary.Data; using Kruzya.TelegramBot.RichSiteSummary.Data;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
@@ -210,7 +212,7 @@ namespace Kruzya.TelegramBot.RichSiteSummary.Handler
#region Message handler #region Message handler
[CallbackQuery] [Update(InChat.All, UpdateFlag.CallbackQuery)]
public async Task HandleAction() public async Task HandleAction()
{ {
if (!RawUpdate.CallbackQuery.Data.StartsWith("feed|")) if (!RawUpdate.CallbackQuery.Data.StartsWith("feed|"))
modules/RichSiteSummary/RichSiteSummary.csproj
+1 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssemblyName>TelegramBot.RichSiteSummary</AssemblyName> <AssemblyName>TelegramBot.RichSiteSummary</AssemblyName>
<RootNamespace>Kruzya.TelegramBot.RichSiteSummary</RootNamespace> <RootNamespace>Kruzya.TelegramBot.RichSiteSummary</RootNamespace>
</PropertyGroup> </PropertyGroup>
modules/UrlLimitations/MessageHandler.cs
+2 -1
View File
@@ -3,6 +3,7 @@ using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using BotFramework; using BotFramework;
using BotFramework.Attributes; using BotFramework.Attributes;
using BotFramework.Enums;
using BotFramework.Setup; using BotFramework.Setup;
using Kruzya.TelegramBot.Core.Cache; using Kruzya.TelegramBot.Core.Cache;
using Kruzya.TelegramBot.Core.Data; using Kruzya.TelegramBot.Core.Data;
@@ -24,7 +25,7 @@ namespace Kruzya.TelegramBot.UrlLimitations
dbCtx = coreContext; dbCtx = coreContext;
} }
[TextMessage(InChat.Public)] [Message(InChat.Public, MessageFlag.HasText)]
public async Task OnMessageReceived() public async Task OnMessageReceived()
{ {
var option = await dbCtx.UserValues.FindOption(Chat.Id, From.Id, "urlLimitations.messagesAfterJoin"); var option = await dbCtx.UserValues.FindOption(Chat.Id, From.Id, "urlLimitations.messagesAfterJoin");
modules/UrlLimitations/UrlLimitations.csproj
+1 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssemblyName>TelegramBot.UrlLimitations</AssemblyName> <AssemblyName>TelegramBot.UrlLimitations</AssemblyName>
<RootNamespace>Kruzya.TelegramBot.UrlLimitations</RootNamespace> <RootNamespace>Kruzya.TelegramBot.UrlLimitations</RootNamespace>
</PropertyGroup> </PropertyGroup>
modules/UrlLimitations/UserJoinHandler.cs
+2 -1
View File
@@ -2,6 +2,7 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using BotFramework; using BotFramework;
using BotFramework.Attributes; using BotFramework.Attributes;
using BotFramework.Enums;
using BotFramework.Setup; using BotFramework.Setup;
using Kruzya.TelegramBot.Core.Cache; using Kruzya.TelegramBot.Core.Cache;
using Kruzya.TelegramBot.Core.Data; using Kruzya.TelegramBot.Core.Data;
@@ -19,7 +20,7 @@ namespace Kruzya.TelegramBot.UrlLimitations
dbCtx = coreContext; dbCtx = coreContext;
} }
[Message(MessageType.ChatMembersAdded, InChat.Public)] [Message(InChat.Public, MessageFlag.HasNewChatMembers)]
public async Task OnChatMembersAdded() public async Task OnChatMembersAdded()
{ {
foreach (var member in RawUpdate.Message.NewChatMembers) foreach (var member in RawUpdate.Message.NewChatMembers)