kosyakmakc/TelegramBotFramework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update dependencies and add workflow for publish nuget
Some checks failed
build nuget workflow for TelegramBotBase project / Build-TelegramBotBase (x64, linux) (push) Failing after 41s
Details

Browse Source
This commit is contained in:
Максим Човнюк 2024-12-05 16:16:49 +05:00
parent 82e6d79ec4
commit 367de14a1a
14 changed files with 116 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
.gitea/workflows/TelegramBotFramework.nuget.yaml Normal file
View File

@ -0,0 +1,43 @@
name: build nuget workflow for TelegramBotBase project
on:
push:
branches:
- master
jobs:
Build-TelegramBotBase:
env:
APP_PROJECT_NAME: TelegramBotBase
strategy:
matrix:
os:
- linux
# - win
arch:
- x64
#- x32
#- arch64
runs-on: [ "${{ matrix.os }}" ]
steps:
- name: Check out repository code
uses: actions/checkout@v4
- name: Setup dotnet
uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.0.x'
- name: Restore dependencies
run: dotnet restore $APP_PROJECT_NAME
- name: Build app
run: dotnet build -c Release --no-restore $APP_PROJECT_NAME
- name: Pack app
run: dotnet pack --no-build $APP_PROJECT_NAME
- name: asd
run: dotnet nuget add source --name gitea --api-key ${{ secrets.kosyakmakc_nuget_publish }} https://git.kosyakmakc.ru/api/packages/kosyakmakc/nuget/index.json
- name: Upload nuget package
run: dotnet nuget push --source {source_name} {package_file}

28
TelegramBotBase/Base/DataResult.cs
View File

@ -55,7 +55,7 @@ public class DataResult : ResultBase
{
var encryptedContent = new MemoryStream();
encryptedContent.SetLength(Document.FileSize.Value);
var file = await Device.Client.TelegramClient.GetInfoAndDownloadFileAsync(Document.FileId,
var file = await Device.Client.TelegramClient.GetInfoAndDownloadFile(Document.FileId,
encryptedContent);
return InputFile.FromStream(encryptedContent, Document.FileName);
@ -69,9 +69,9 @@ public class DataResult : ResultBase
/// <returns></returns>
public async Task DownloadDocument(string path)
{
var file = await Device.Client.TelegramClient.GetFileAsync(Document.FileId);
var file = await Device.Client.TelegramClient.GetFile(Document.FileId);
var fs = new FileStream(path, FileMode.Create);
await Device.Client.TelegramClient.DownloadFileAsync(file.FilePath, fs);
await Device.Client.TelegramClient.DownloadFile(file.FilePath, fs);
fs.Close();
fs.Dispose();
}
@ -83,7 +83,7 @@ public class DataResult : ResultBase
public async Task<byte[]> DownloadRawDocument()
{
var ms = new MemoryStream();
await Device.Client.TelegramClient.GetInfoAndDownloadFileAsync(Document.FileId, ms);
await Device.Client.TelegramClient.GetInfoAndDownloadFile(Document.FileId, ms);
return ms.ToArray();
}
@ -103,7 +103,7 @@ public class DataResult : ResultBase
public async Task<string> DownloadRawTextDocument(Encoding encoding)
{
var ms = new MemoryStream();
await Device.Client.TelegramClient.GetInfoAndDownloadFileAsync(Document.FileId, ms);
await Device.Client.TelegramClient.GetInfoAndDownloadFile(Document.FileId, ms);
ms.Position = 0;
@ -116,16 +116,16 @@ public class DataResult : ResultBase
{
var encryptedContent = new MemoryStream();
encryptedContent.SetLength(Video.FileSize.Value);
var file = await Device.Client.TelegramClient.GetInfoAndDownloadFileAsync(Video.FileId, encryptedContent);
var file = await Device.Client.TelegramClient.GetInfoAndDownloadFile(Video.FileId, encryptedContent);
return InputFile.FromStream(encryptedContent, "");
}
public async Task DownloadVideo(string path)
{
var file = await Device.Client.TelegramClient.GetFileAsync(Video.FileId);
var file = await Device.Client.TelegramClient.GetFile(Video.FileId);
var fs = new FileStream(path, FileMode.Create);
await Device.Client.TelegramClient.DownloadFileAsync(file.FilePath, fs);
await Device.Client.TelegramClient.DownloadFile(file.FilePath, fs);
fs.Close();
fs.Dispose();
}
@ -134,16 +134,16 @@ public class DataResult : ResultBase
{
var encryptedContent = new MemoryStream();
encryptedContent.SetLength(Audio.FileSize.Value);
var file = await Device.Client.TelegramClient.GetInfoAndDownloadFileAsync(Audio.FileId, encryptedContent);
var file = await Device.Client.TelegramClient.GetInfoAndDownloadFile(Audio.FileId, encryptedContent);
return InputFile.FromStream(encryptedContent, "");
}
public async Task DownloadAudio(string path)
{
var file = await Device.Client.TelegramClient.GetFileAsync(Audio.FileId);
var file = await Device.Client.TelegramClient.GetFile(Audio.FileId);
var fs = new FileStream(path, FileMode.Create);
await Device.Client.TelegramClient.DownloadFileAsync(file.FilePath, fs);
await Device.Client.TelegramClient.DownloadFile(file.FilePath, fs);
fs.Close();
fs.Dispose();
}
@ -153,7 +153,7 @@ public class DataResult : ResultBase
var photo = Photos[index];
var encryptedContent = new MemoryStream();
encryptedContent.SetLength(photo.FileSize.Value);
var file = await Device.Client.TelegramClient.GetInfoAndDownloadFileAsync(photo.FileId, encryptedContent);
var file = await Device.Client.TelegramClient.GetInfoAndDownloadFile(photo.FileId, encryptedContent);
return InputFile.FromStream(encryptedContent, "");
}
@ -161,9 +161,9 @@ public class DataResult : ResultBase
public async Task DownloadPhoto(int index, string path)
{
var photo = Photos[index];
var file = await Device.Client.TelegramClient.GetFileAsync(photo.FileId);
var file = await Device.Client.TelegramClient.GetFile(photo.FileId);
var fs = new FileStream(path, FileMode.Create);
await Device.Client.TelegramClient.DownloadFileAsync(file.FilePath, fs);
await Device.Client.TelegramClient.DownloadFile(file.FilePath, fs);
fs.Close();
fs.Dispose();
}

2
TelegramBotBase/Base/MessageClient.cs
View File

@ -103,7 +103,7 @@ public class MessageClient
var receiverOptions = new ReceiverOptions();
receiverOptions.ThrowPendingUpdates = ThrowPendingUpdates;
receiverOptions.DropPendingUpdates = ThrowPendingUpdates;
TelegramClient.StartReceiving(HandleUpdateAsync, HandleErrorAsync, receiverOptions, _cancellationTokenSource.Token);
}

4
TelegramBotBase/Base/MessageResult.cs
View File

@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Newtonsoft.Json;
using System.Text.Json;
using Telegram.Bot.Types;
using Telegram.Bot.Types.Enums;
@ -126,7 +126,7 @@ public class MessageResult : ResultBase
T cd = null;
try
{
cd = JsonConvert.DeserializeObject<T>(RawData);
cd = JsonSerializer.Deserialize<T>(RawData);
return cd;
}

2
TelegramBotBase/Base/ThreadPoolMessageClient.cs
View File

@ -72,7 +72,7 @@ public class ThreadPoolMessageClient : MessageClient
var receiverOptions = new ReceiverOptions();
receiverOptions.ThrowPendingUpdates = ThrowPendingUpdates;
receiverOptions.DropPendingUpdates = ThrowPendingUpdates;
ThreadPool.SetMaxThreads(ThreadPool_WorkerThreads, ThreadPool_IOThreads);

13
TelegramBotBase/Form/CallbackData.cs
View File

@ -1,5 +1,6 @@
using Newtonsoft.Json;
using System.Text;
using System.Text;
using System.Text.Json;
using System.Text.Json.Serialization;
using TelegramBotBase.Exceptions;
namespace TelegramBotBase.Form;
@ -19,9 +20,9 @@ public class CallbackData
Value = value;
}
[JsonProperty("m")] public string Method { get; set; }
[JsonPropertyName("m")] public string Method { get; set; }
[JsonProperty("v")] public string Value { get; set; }
[JsonPropertyName("v")] public string Value { get; set; }
public static string Create(string method, string value)
{
@ -36,7 +37,7 @@ public class CallbackData
{
var s = string.Empty;
s = JsonConvert.SerializeObject(this);
s = JsonSerializer.Serialize(this);
//Is data over 64 bytes ?
int byte_count = Encoding.UTF8.GetByteCount(s);
@ -55,7 +56,7 @@ public class CallbackData
/// <returns></returns>
public static CallbackData Deserialize(string data)
{
return JsonConvert.DeserializeObject<CallbackData>(data);
return JsonSerializer.Deserialize<CallbackData>(data);
}
public static implicit operator string(CallbackData callbackData) => callbackData.Serialize(true);

26
TelegramBotBase/Form/GroupForm.cs
View File

@ -11,28 +11,28 @@ public class GroupForm : FormBase
{
switch (message.MessageType)
{
case MessageType.ChatMembersAdded:
case MessageType.NewChatMembers:
await OnMemberChanges(new MemberChangeEventArgs(MessageType.ChatMembersAdded, message,
await OnMemberChanges(new MemberChangeEventArgs(MessageType.NewChatMembers, message,
message.Message.NewChatMembers));
break;
case MessageType.ChatMemberLeft:
case MessageType.LeftChatMember:
await OnMemberChanges(new MemberChangeEventArgs(MessageType.ChatMemberLeft, message,
await OnMemberChanges(new MemberChangeEventArgs(MessageType.LeftChatMember, message,
message.Message.LeftChatMember));
break;
case MessageType.ChatPhotoChanged:
case MessageType.ChatPhotoDeleted:
case MessageType.ChatTitleChanged:
case MessageType.MigratedFromGroup:
case MessageType.MigratedToSupergroup:
case MessageType.MessagePinned:
case MessageType.GroupCreated:
case MessageType.SupergroupCreated:
case MessageType.ChannelCreated:
case MessageType.NewChatPhoto:
case MessageType.DeleteChatPhoto:
case MessageType.NewChatTitle:
case MessageType.MigrateFromChatId:
case MessageType.MigrateToChatId:
case MessageType.PinnedMessage:
case MessageType.GroupChatCreated:
case MessageType.SupergroupChatCreated:
case MessageType.ChannelChatCreated:
await OnGroupChanged(new GroupChangedEventArgs(message.MessageType, message));

2
TelegramBotBase/Form/PromptDialog.cs
View File

@ -82,7 +82,7 @@ public class PromptDialog : ModalDialog
{
var bf = new ButtonForm();
bf.AddButtonRow(new ButtonBase(BackLabel, "back"));
await Device.Send(Message, (ReplyMarkupBase)bf);
await Device.Send(Message, (IReplyMarkup)bf);
return;
}

31
TelegramBotBase/Sessions/DeviceSession.cs
View File

@ -239,8 +239,7 @@ public class DeviceSession : IDeviceSession
text = text.MarkdownV2Escape();
}
var t = Api(a => a.SendTextMessageAsync(deviceId, text, null, parseMode, replyToMessageId: replyTo,
var t = Api(a => a.SendMessage(deviceId, text, messageThreadId: null, parseMode: parseMode, replyParameters: replyTo,
replyMarkup: markup, disableNotification: disableNotification));
var o = GetOrigin(new StackTrace());
@ -294,7 +293,7 @@ public class DeviceSession : IDeviceSession
}
var t = Api(a => a.SendTextMessageAsync(DeviceId, text, null, parseMode, replyToMessageId: replyTo,
var t = Api(a => a.SendMessage(DeviceId, text, messageThreadId: null, parseMode: parseMode, replyParameters: replyTo,
replyMarkup: markup, disableNotification: disableNotification));
var o = GetOrigin(new StackTrace());
@ -312,7 +311,7 @@ public class DeviceSession : IDeviceSession
/// <param name="replyTo"></param>
/// <param name="disableNotification"></param>
/// <returns></returns>
public async Task<Message> Send(string text, ReplyMarkupBase markup, int replyTo = 0,
public async Task<Message> Send(string text, IReplyMarkup markup, int replyTo = 0,
bool disableNotification = false, ParseMode parseMode = ParseMode.Markdown,
bool markdownV2AutoEscape = true)
{
@ -332,7 +331,7 @@ public class DeviceSession : IDeviceSession
}
var t = Api(a => a.SendTextMessageAsync(DeviceId, text, null, parseMode, replyToMessageId: replyTo,
var t = Api(a => a.SendMessage(DeviceId, text, messageThreadId: null, parseMode: parseMode, replyParameters: replyTo,
replyMarkup: markup, disableNotification: disableNotification));
var o = GetOrigin(new StackTrace());
@ -362,7 +361,7 @@ public class DeviceSession : IDeviceSession
InlineKeyboardMarkup markup = buttons;
var t = Api(a => a.SendPhotoAsync(DeviceId, file, null, caption, parseMode, replyToMessageId: replyTo,
var t = Api(a => a.SendPhoto(DeviceId, file, messageThreadId: null, caption: caption, parseMode: parseMode, replyParameters: replyTo,
replyMarkup: markup, disableNotification: disableNotification));
var o = GetOrigin(new StackTrace());
@ -392,8 +391,8 @@ public class DeviceSession : IDeviceSession
InlineKeyboardMarkup markup = buttons;
var t = Api(a => a.SendVideoAsync(DeviceId, file, caption: caption, parseMode: parseMode,
replyToMessageId: replyTo, replyMarkup: markup,
var t = Api(a => a.SendVideo(DeviceId, file, caption: caption, parseMode: parseMode,
replyParameters: replyTo, replyMarkup: markup,
disableNotification: disableNotification));
var o = GetOrigin(new StackTrace());
@ -422,8 +421,8 @@ public class DeviceSession : IDeviceSession
InlineKeyboardMarkup markup = buttons;
var t = Api(a => a.SendVideoAsync(DeviceId, InputFile.FromUri(url), parseMode: parseMode,
replyToMessageId: replyTo, replyMarkup: markup,
var t = Api(a => a.SendVideo(DeviceId, InputFile.FromUri(url), parseMode: parseMode,
replyParameters: replyTo, replyMarkup: markup,
disableNotification: disableNotification));
var o = GetOrigin(new StackTrace());
@ -457,7 +456,7 @@ public class DeviceSession : IDeviceSession
var fts = InputFile.FromStream(ms, filename);
var t = Api(a => a.SendVideoAsync(DeviceId, fts, parseMode: parseMode, replyToMessageId: replyTo,
var t = Api(a => a.SendVideo(DeviceId, fts, parseMode: parseMode, replyParameters: replyTo,
replyMarkup: markup, disableNotification: disableNotification));
var o = GetOrigin(new StackTrace());
@ -494,7 +493,7 @@ public class DeviceSession : IDeviceSession
var fts = InputFile.FromStream(fs, filename);
var t = Api(a => a.SendVideoAsync(DeviceId, fts, parseMode: parseMode, replyToMessageId: replyTo,
var t = Api(a => a.SendVideo(DeviceId, fts, parseMode: parseMode, replyParameters: replyTo,
replyMarkup: markup, disableNotification: disableNotification));
var o = GetOrigin(new StackTrace());
@ -573,8 +572,8 @@ public class DeviceSession : IDeviceSession
}
var t = Api(a => a.SendDocumentAsync(DeviceId, document, null, null, caption, replyMarkup: markup,
disableNotification: disableNotification, replyToMessageId: replyTo));
var t = Api(a => a.SendDocument(DeviceId, document, messageThreadId: null, thumbnail: null, caption: caption, replyMarkup: markup,
disableNotification: disableNotification, replyParameters: replyTo));
var o = GetOrigin(new StackTrace());
await OnMessageSent(new MessageSentEventArgs(await t, o));
@ -772,11 +771,11 @@ public class DeviceSession : IDeviceSession
#region "Users"
public virtual async Task RestrictUser(long userId, ChatPermissions permissions, bool? useIndependentGroupPermission = null, DateTime until = default)
public virtual async Task RestrictUser(long userId, ChatPermissions permissions, bool useIndependentGroupPermission = false, DateTime until = default)
{
try
{
await Api(a => a.RestrictChatMemberAsync(DeviceId, userId, permissions, useIndependentGroupPermission, until));
await Api(a => a.RestrictChatMember(DeviceId, userId, permissions, useIndependentChatPermissions: useIndependentGroupPermission, untilDate: until));
}
catch
{

13
TelegramBotBase/States/JSONStateMachine.cs
View File

@ -1,6 +1,6 @@
using System;
using System.IO;
using Newtonsoft.Json;
using System.Text.Json;
using TelegramBotBase.Args;
using TelegramBotBase.Base;
using TelegramBotBase.Form;
@ -48,11 +48,7 @@ public class JsonStateMachine : IStateMachine
{
var content = File.ReadAllText(FilePath);
var sc = JsonConvert.DeserializeObject<StateContainer>(content, new JsonSerializerSettings
{
TypeNameHandling = TypeNameHandling.All,
TypeNameAssemblyFormatHandling = TypeNameAssemblyFormatHandling.Simple
});
var sc = JsonSerializer.Deserialize<StateContainer>(content);
return sc;
}
@ -77,10 +73,9 @@ public class JsonStateMachine : IStateMachine
try
{
var content = JsonConvert.SerializeObject(e.States, Formatting.Indented, new JsonSerializerSettings
var content = JsonSerializer.Serialize(e.States, new JsonSerializerOptions
{
TypeNameHandling = TypeNameHandling.All,
TypeNameAssemblyFormatHandling = TypeNameAssemblyFormatHandling.Simple
WriteIndented = true,
});
File.WriteAllText(FilePath, content);

8
TelegramBotBase/States/SimpleJSONStateMachine.cs
View File

@ -1,6 +1,6 @@
using System;
using System.IO;
using Newtonsoft.Json;
using System.Text.Json;
using TelegramBotBase.Args;
using TelegramBotBase.Base;
using TelegramBotBase.Form;
@ -49,7 +49,7 @@ public class SimpleJsonStateMachine : IStateMachine
{
var content = File.ReadAllText(FilePath);
var sc = JsonConvert.DeserializeObject<StateContainer>(content);
var sc = JsonSerializer.Deserialize<StateContainer>(content);
return sc;
}
@ -74,7 +74,9 @@ public class SimpleJsonStateMachine : IStateMachine
try
{
var content = JsonConvert.SerializeObject(e.States, Formatting.Indented);
var content = JsonSerializer.Serialize(e.States, new JsonSerializerOptions() {
WriteIndented = true
});
File.WriteAllText(FilePath, content);
}

4
TelegramBotBase/TelegramBotBase.csproj
View File

@ -22,7 +22,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
</ItemGroup>
@ -57,7 +57,7 @@
<ItemGroup>
<PackageReference Include="Telegram.Bot" Version="19.0.0" />
<PackageReference Include="Telegram.Bot" Version="22.2.0" />
</ItemGroup>
</Project>

6
TelegramBotBase/TelegramBotBase.nuspec
View File

@ -14,12 +14,12 @@
<dependencies>
<group targetFramework=".NETFramework4.6.1">
<dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
<dependency id="Telegram.Bot" version="19.0.0" exclude="Build,Analyzers" />
<dependency id="Telegram.Bot" version="22.2.0" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETStandard2.0">
<dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
<dependency id="Telegram.Bot" version="19.0.0" exclude="Build,Analyzers" />
<dependency id="Telegram.Bot" version="22.2.0" exclude="Build,Analyzers" />
</group>
</dependencies>
</metadata>
</package>
</package>

5
TelegramBotFramework.sln
View File

@ -38,6 +38,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TelegramBotBase.Extensions.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TelegramBotBase.Extensions.Images.IronSoftware", "TelegramBotBase.Extensions.Images.IronSoftware\TelegramBotBase.Extensions.Images.IronSoftware.csproj", "{DC521A4C-7446-46F7-845B-AAF10EDCF8C6}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Элементы решения", "Элементы решения", "{040F54FA-B51F-475F-89F8-2DD23CDC2989}"
ProjectSection(SolutionItems) = preProject
.gitea\workflows\TelegramBotFramework.nuget.yaml = .gitea\workflows\TelegramBotFramework.nuget.yaml
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU