Compare commits

...

51 Commits

Author SHA1 Message Date
Максим Човнюк
07ac1502b4 Enchancement to override Label._renderNecessary
All checks were successful
build nuget workflow for TelegramBotBase project / Build-TelegramBotBase (x64, linux) (push) Successful in 37s
2024-12-07 23:04:00 +05:00
Максим Човнюк
07cbb8bfa4 AutoCleanForm detect only is active form
All checks were successful
build nuget workflow for TelegramBotBase project / Build-TelegramBotBase (x64, linux) (push) Successful in 37s
2024-12-07 22:09:18 +05:00
Максим Човнюк
139ccbb136 received handling
All checks were successful
build nuget workflow for TelegramBotBase project / Build-TelegramBotBase (x64, linux) (push) Successful in 36s
2024-12-07 21:39:27 +05:00
Максим Човнюк
f4bc2ca9b0 fix changing iterable collection
All checks were successful
build nuget workflow for TelegramBotBase project / Build-TelegramBotBase (x64, linux) (push) Successful in 36s
2024-12-07 20:53:10 +05:00
Максим Човнюк
880878190d force update
All checks were successful
build nuget workflow for TelegramBotBase project / Build-TelegramBotBase (x64, linux) (push) Successful in 40s
2024-12-07 20:02:00 +05:00
Максим Човнюк
3f0fc962a4 IFormState OR attributes
All checks were successful
build nuget workflow for TelegramBotBase project / Build-TelegramBotBase (x64, linux) (push) Successful in 38s
2024-12-07 10:50:36 +05:00
Максим Човнюк
6a80ec66ad di and serialization support
All checks were successful
build nuget workflow for TelegramBotBase project / Build-TelegramBotBase (x64, linux) (push) Successful in 37s
2024-12-06 16:13:46 +05:00
Максим Човнюк
0931147f5a pass version to dotnet on all steps
All checks were successful
build nuget workflow for TelegramBotBase project / Build-TelegramBotBase (x64, linux) (push) Successful in 37s
2024-12-05 17:44:24 +05:00
Максим Човнюк
a81d299010 version setup on build step
Some checks failed
build nuget workflow for TelegramBotBase project / Build-TelegramBotBase (x64, linux) (push) Failing after 36s
2024-12-05 17:38:45 +05:00
Максим Човнюк
956fbd47f0 1
All checks were successful
build nuget workflow for TelegramBotBase project / Build-TelegramBotBase (x64, linux) (push) Successful in 36s
2024-12-05 17:28:42 +05:00
Максим Човнюк
4210ecbb4f version in workflow
Some checks failed
build nuget workflow for TelegramBotBase project / Build-TelegramBotBase (x64, linux) (push) Failing after 35s
2024-12-05 17:26:47 +05:00
Максим Човнюк
9dc7490015 version update
Some checks failed
build nuget workflow for TelegramBotBase project / Build-TelegramBotBase (x64, linux) (push) Failing after 34s
2024-12-05 17:22:36 +05:00
Максим Човнюк
877d2daa30 name fix
All checks were successful
build nuget workflow for TelegramBotBase project / Build-TelegramBotBase (x64, linux) (push) Successful in 36s
2024-12-05 16:54:31 +05:00
Максим Човнюк
55027b92aa optional step "disconnect source"
Some checks failed
build nuget workflow for TelegramBotBase project / Build-TelegramBotBase (x64, linux) (push) Failing after 34s
2024-12-05 16:50:13 +05:00
Максим Човнюк
ec4bb85d40 revert external action to cli commands
Some checks failed
build nuget workflow for TelegramBotBase project / Build-TelegramBotBase (x64, linux) (push) Failing after 35s
2024-12-05 16:47:19 +05:00
Максим Човнюк
db0afd4668 change interpolation type in path
Some checks failed
build nuget workflow for TelegramBotBase project / Build-TelegramBotBase (x64, linux) (push) Failing after 43s
2024-12-05 16:32:21 +05:00
Максим Човнюк
3ab24dcd37 try to use new github action
Some checks failed
build nuget workflow for TelegramBotBase project / Build-TelegramBotBase (x64, linux) (push) Failing after 5s
2024-12-05 16:31:04 +05:00
Максим Човнюк
4b42644593 fix missing path to uploading nuget package
Some checks failed
build nuget workflow for TelegramBotBase project / Build-TelegramBotBase (x64, linux) (push) Failing after 35s
2024-12-05 16:23:25 +05:00
Максим Човнюк
3b792ee676 workflow move to "nuget push" api key
Some checks failed
build nuget workflow for TelegramBotBase project / Build-TelegramBotBase (x64, linux) (push) Failing after 35s
2024-12-05 16:20:48 +05:00
Максим Човнюк
367de14a1a 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
2024-12-05 16:16:49 +05:00
Florian Zevedei
82e6d79ec4 Updating examples 2024-07-12 13:40:47 +02:00
Florian Zevedei
5d2f3e7fe9
Merge pull request #67 from MajMcCloud/development
Updating master branch via development branch
2024-07-10 14:28:25 +02:00
Florian Zevedei
7aa40b3e2d Using Message instead RawData.Message on session creation 2024-07-10 14:25:51 +02:00
Florian Zevedei
eb8fad444b Fix for bots in groups adding/removing 2024-07-10 14:25:08 +02:00
Florian Zevedei
5cda9e1fdc
README.md aktualisieren 2024-07-06 17:56:33 +02:00
Florian Zevedei
41bdf52afe
README.md aktualisieren 2024-07-06 17:56:13 +02:00
Florian Zevedei
9023875922
README.md aktualisieren 2024-07-06 17:55:36 +02:00
Florian Zevedei
05bfeb8d09
Update README.md 2024-07-06 17:28:23 +02:00
Florian Zevedei
1f1aa1f0ee Adding throwPendingUpdates to QuickStart in BBB 2024-07-03 15:56:50 +02:00
Florian Zevedei
3d97da75f1 Update README.md 2024-07-01 03:28:37 +02:00
Florian Zevedei
261fdafd96
Merge pull request #65 from MajMcCloud/development
Migrating development branch into master
2024-06-29 18:30:34 +02:00
Florian Zevedei
39e68a2089
Merge branch 'master' into development 2024-06-29 18:28:37 +02:00
Florian Zevedei
312690c002 Fix builder in sample 2024-06-25 13:43:33 +02:00
Florian Zevedei
99b888a7a2 Replacing project reference with nuget package in samples 2024-06-25 13:43:21 +02:00
Florian Zevedei
6adcc52ea2 Adding null/empty checks to some controls to prevent invalid behaviour 2024-06-09 14:19:04 +02:00
Florian Zevedei
834038ff44 Adding additional bot command checks toa void invalid configurations 2024-06-09 14:13:43 +02:00
Florian Zevedei
e3d1652a02 Fixing on EditableMessage 2024-05-29 21:35:09 +02:00
Florian Zevedei
a7411176e6 Fixing the prototype solution of group commands detection 2024-05-29 21:29:14 +02:00
Florian Zevedei
801c0b77f8 Introducing BotGroupCommand property. 2024-05-27 21:39:36 +02:00
Florian Zevedei
7a86ecdf32 Breakable change! Remove of most try/catch's in DeviceSession 2024-05-25 17:24:24 +02:00
Florian Zevedei
175927fbab Updating nuget dependencies 2 2024-05-19 14:16:18 +02:00
Florian Zevedei
34e4429b38 Updating nuget dependencies 2024-05-19 14:15:56 +02:00
Florian Zevedei
dc28bde382 Fix Action method handling, if handled by control already 2024-05-19 14:06:01 +02:00
Florian Zevedei
87d57c471a Update CallbackDataTooLongException.cs 2024-05-12 19:07:33 +03:00
Florian Zevedei
5ce2360cc7 Adding callbackdata too long exception and checks 2024-05-12 19:01:50 +03:00
Florian Zevedei
e345fc2948 Fixing message loop handling of Action methods 2024-05-12 18:45:18 +03:00
Florian Zevedei
652526ec59 Consolidate nuget references 2024-05-12 18:40:55 +03:00
Florian Zevedei
b829f43c5d Adding a exception for invalid ServiceProviders #62
- adding an internal exception handler to catch InvalidOperationException and throw a new explicit one
2024-03-10 17:09:13 +01:00
Florian Zevedei
6e7acdbdba Bugfix in BBB 2024-03-10 16:49:18 +01:00
Florian Zevedei
396a524d94 BotBaseBuilder fix 2024-03-10 16:01:45 +01:00
Florian Zevedei
7d679649e4
Merge pull request #64 from MajMcCloud/master
Update development branch
2024-03-10 15:54:29 +01:00
48 changed files with 609 additions and 398 deletions

View File

@ -0,0 +1,48 @@
name: build nuget workflow for TelegramBotBase project
on:
push:
branches:
- master
jobs:
Build-TelegramBotBase:
env:
APP_PROJECT_NAME: TelegramBotBase
PACKAGE_VERSION: "123.1.6"
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 /p:Version=$PACKAGE_VERSION
- name: Build app
run: dotnet build -c Release --version-suffix $PACKAGE_VERSION --no-restore $APP_PROJECT_NAME /p:Version=$PACKAGE_VERSION
- name: Pack app
run: dotnet pack --no-build $APP_PROJECT_NAME /p:Version=$PACKAGE_VERSION
- name: disconnect old source
run: dotnet nuget remove source gitea
continue-on-error: true
- name: Connect source
run: dotnet nuget add source --name gitea https://git.kosyakmakc.ru/api/packages/kosyakmakc/nuget/index.json
- name: Upload nuget package
run: dotnet nuget push --source gitea --api-key ${{ secrets.kosyakmakc_nuget_publish }} ${{ gitea.workspace }}/${{ env.APP_PROJECT_NAME }}/bin/Release/$APP_PROJECT_NAME.$PACKAGE_VERSION.nupkg

View File

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\TelegramBotBase\TelegramBotBase.csproj"/>
<PackageReference Include="TelegramBotBase" Version="6.4.1" />
</ItemGroup>
</Project>

View File

@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="TelegramBotBase" Version="5.3.0" />
<PackageReference Include="TelegramBotBase" Version="6.4.1" />
</ItemGroup>
<ItemGroup>

View File

@ -16,6 +16,7 @@ namespace BotAndWebApplication.BotStuff.Tasks
.DefaultCommands()
.NoSerialization()
.UseEnglish()
.UseThreadPool()
.Build();
}

View File

@ -8,12 +8,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.9"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.9"/>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.11" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\TelegramBotBase\TelegramBotBase.csproj"/>
<ProjectReference Include="..\..\TelegramBotBase\TelegramBotBase.csproj" />
</ItemGroup>
</Project>

View File

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\TelegramBotBase\TelegramBotBase.csproj" />
<PackageReference Include="TelegramBotBase" Version="6.4.1" />
</ItemGroup>
</Project>

View File

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\TelegramBotBase\TelegramBotBase.csproj"/>
<PackageReference Include="TelegramBotBase" Version="6.4.1" />
</ItemGroup>
</Project>

View File

@ -14,6 +14,10 @@
**Releases: [GitHub](https://github.com/MajMcCloud/TelegramBotFramework/releases)**
**Need your own bot? Get in touch https://t.me/botbasebuilder**
**on X: @florian_zevedei**
## Donate
Paypal: [https://paypal.me/majmccloud](https://paypal.me/majmccloud)
@ -102,6 +106,7 @@ var bot = BotBaseBuilder
})
.NoSerialization()
.UseEnglish()
.UseSingleThread()
.Build();
// Upload bot commands to BotFather
@ -122,8 +127,32 @@ like ChatId and other stuff your carrying.
From there you build up your bots:
```csharp
public class StartForm : FormBase
public class Start : FormBase
{
public Start()
{
//Additional event handlers
Init += Start_Init;
Opened += Start_Opened;
Closed += Start_Closed;
}
// Gets invoked on initialization, before navigation
private async Task Start_Init(object sender, Args.InitEventArgs e)
{
}
// Gets invoked after opened
private async Task Start_Opened(object sender, EventArgs e)
{
}
// Gets invoked after form has been closed
private async Task Start_Closed(object sender, EventArgs e)
{
}
// Gets invoked during Navigation to this form
public override async Task PreLoad(MessageResult message)
{
@ -220,6 +249,7 @@ var bot = BotBaseBuilder
})
.NoSerialization()
.UseEnglish()
.UseSingleThread()
.Build();
bot.BotCommand += async (s, en) =>
@ -260,15 +290,15 @@ public class SimpleForm : AutoCleanForm
{
public SimpleForm()
{
this.DeleteSide = TelegramBotBase.Enums.eDeleteSide.Both;
this.DeleteMode = TelegramBotBase.Enums.eDeleteMode.OnLeavingForm;
DeleteSide = EDeleteSide.Both;
DeleteMode = EDeleteMode.OnLeavingForm;
this.Opened += SimpleForm_Opened;
Opened += SimpleForm_Opened;
}
private async Task SimpleForm_Opened(object sender, EventArgs e)
{
await this.Device.Send("Hello world! (send 'back' to get back to Start)\r\nOr\r\nhi, hello, maybe, bye and ciao");
await Device.Send("Hello world! (send 'back' to get back to Start)\r\nOr\r\nhi, hello, maybe, bye and ciao");
}
public override async Task Load(MessageResult message)
@ -306,7 +336,13 @@ public class SimpleForm : AutoCleanForm
```csharp
public class ButtonTestForm : AutoCleanForm
{
public override async Task Opened()
public ButtonTestForm()
{
this.DeleteMode = eDeleteMode.OnLeavingForm;
Opened += ButtonTestForm_Opened;
}
private async Task ButtonTestForm_Opened(object sender, EventArgs e)
{
await this.Device.Send("Hello world! (Click 'back' to get back to Start)");
}
@ -376,9 +412,10 @@ public class ProgressTest : AutoCleanForm
public ProgressTest()
{
this.DeleteMode = eDeleteMode.OnLeavingForm;
Opened += ProgressTest_Opened;
}
public override async Task Opened()
private async Task ProgressTest_Opened(object sender, EventArgs e)
{
await this.Device.Send("Welcome to ProgressTest");
}
@ -858,6 +895,7 @@ var bot = BotBaseBuilder
})
.UseSimpleJSON(AppContext.BaseDirectory + "config\\states.json")
.UseEnglish()
.UseSingleThread()
.Build();
await bot.Start();
@ -881,6 +919,7 @@ var bot = BotBaseBuilder
})
.UseJSON(AppContext.BaseDirectory + "config\\states.json")
.UseEnglish()
.UseSingleThread()
.Build();
await bot.Start();
@ -903,6 +942,7 @@ var bot = BotBaseBuilder
})
.UseXML(AppContext.BaseDirectory + "config\\states.xml")
.UseEnglish()
.UseSingleThread()
.Build();
await bot.Start();
@ -916,7 +956,7 @@ datatype and one for implementing into a form which should be invoked with event
#### IStateMachine
Is the basic StateMachine interface, it has two methods `SaveFormStates(SaveStatesEventArgs e)`
and `StateContainerLoadFormStates()`, nothing fancy, just simple calls. Implement both methods with your own
and `LoadFormStates()`, nothing fancy, just simple calls. Implement both methods with your own
serialization process.
```csharp

View File

@ -14,7 +14,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="IronSoftware.System.Drawing" Version="2024.1.1" />
<PackageReference Include="IronSoftware.System.Drawing" Version="2024.5.1" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

View File

@ -16,7 +16,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.3" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

View File

@ -22,7 +22,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="TelegramBotBase" Version="6.0.0" />
<PackageReference Include="Npgsql" Version="8.0.1" />
<PackageReference Include="Npgsql" Version="8.0.3" />
</ItemGroup>
</Project>

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();
}

View File

@ -446,8 +446,8 @@ public class FormBase : IDisposable
{
c.Cleanup().Wait();
Controls.Remove(c);
}
Controls.Clear();
}
/// <summary>

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);
}

View File

@ -1,7 +1,8 @@
using System.Collections.Generic;
using System;
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;
@ -9,16 +10,36 @@ namespace TelegramBotBase.Base;
public class MessageResult : ResultBase
{
internal MessageResult()
{
}
public MessageResult(Update update)
{
UpdateData = update;
init();
}
public Update UpdateData { get; set; }
void init()
{
IsAction = UpdateData.CallbackQuery != null;
if (Message == null)
return;
IsBotCommand = Message.Entities?.Any(a => a.Type == MessageEntityType.BotCommand) ?? false;
if (!IsBotCommand)
return;
BotCommand = MessageText.Split(' ')[0];
IsBotGroupCommand = BotCommand.Contains("@");
if (IsBotGroupCommand)
{
BotCommand = BotCommand.Substring(0, BotCommand.LastIndexOf('@'));
}
}
public Update UpdateData { get; private set; }
/// <summary>
/// Returns the Device/ChatId
@ -55,12 +76,17 @@ public class MessageResult : ResultBase
/// <summary>
/// Is this an action ? (i.e. button click)
/// </summary>
public bool IsAction => UpdateData.CallbackQuery != null;
public bool IsAction { get; private set; }
/// <summary>
/// Is this a command ? Starts with a slash '/' and a command
/// </summary>
public bool IsBotCommand => MessageText.StartsWith("/");
public bool IsBotCommand { get; private set; }
/// <summary>
/// Is this a bot command sent from a group via @BotId ?
/// </summary>
public bool IsBotGroupCommand { get; private set; }
/// <summary>
/// Returns a List of all parameters which has been sent with the command itself (i.e. /start 123 456 789 =>
@ -83,18 +109,7 @@ public class MessageResult : ResultBase
/// <summary>
/// Returns just the command (i.e. /start 1 2 3 => /start)
/// </summary>
public string BotCommand
{
get
{
if (!IsBotCommand)
{
return null;
}
return MessageText.Split(' ')[0];
}
}
public string BotCommand { get; private set; }
/// <summary>
/// Returns if this message will be used on the first form or not.
@ -111,7 +126,7 @@ public class MessageResult : ResultBase
T cd = null;
try
{
cd = JsonConvert.DeserializeObject<T>(RawData);
cd = JsonSerializer.Deserialize<T>(RawData);
return cd;
}

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);

View File

@ -8,6 +8,7 @@ using Telegram.Bot.Types;
using TelegramBotBase.Args;
using TelegramBotBase.Base;
using TelegramBotBase.Enums;
using TelegramBotBase.Exceptions;
using TelegramBotBase.Interfaces;
using TelegramBotBase.Sessions;
using Console = TelegramBotBase.Tools.Console;
@ -115,7 +116,7 @@ public sealed class BotBase
if (ds == null)
{
ds = await Sessions.StartSession(e.DeviceId);
ds.LastMessage = e.RawData.Message;
ds.LastMessage = e.Message;
OnSessionBegins(new SessionBeginEventArgs(e.DeviceId, ds));
}
@ -139,6 +140,13 @@ public sealed class BotBase
mr.IsFirstHandler = false;
} while (ds.FormSwitched && i < GetSetting(ESettings.NavigationMaximum, 10));
}
catch (InvalidServiceProviderConfiguration ex)
{
var ds = Sessions.GetSession(e.DeviceId);
OnException(new SystemExceptionEventArgs(e.Message.Text, e.DeviceId, ds, ex));
throw;
}
catch (Exception ex)
{
var ds = Sessions.GetSession(e.DeviceId);
@ -189,13 +197,10 @@ public sealed class BotBase
/// <param name="deviceId">Contains the device/chat id of the device to update.</param>
public async Task InvokeMessageLoop(long deviceId)
{
var mr = new MessageResult
var mr = new MessageResult(new Update
{
UpdateData = new Update
{
Message = new Message()
}
};
Message = new Message()
});
await InvokeMessageLoop(deviceId, mr);
}
@ -260,7 +265,7 @@ public sealed class BotBase
{
foreach (var scope in BotCommandScopes)
{
if (scope.Value.Any(a => "/" + a.Command == command))
if (scope.Value.Any(a => Constants.Telegram.BotCommandIndicator + a.Command == command))
{
return true;
}

View File

@ -73,14 +73,14 @@ public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage,
}
public IBuildingStage QuickStart(string apiKey, Type startForm)
public IBuildingStage QuickStart(string apiKey, Type startForm, bool throwPendingUpdates = false)
{
_apiKey = apiKey;
_factory = new DefaultStartFormFactory(startForm);
DefaultMessageLoop();
NoProxy();
NoProxy(throwPendingUpdates);
OnlyStart();
@ -94,7 +94,7 @@ public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage,
}
public IBuildingStage QuickStart<T>(string apiKey)
public IBuildingStage QuickStart<T>(string apiKey, bool throwPendingUpdates = false)
where T : FormBase
{
_apiKey = apiKey;
@ -102,7 +102,7 @@ public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage,
DefaultMessageLoop();
NoProxy();
NoProxy(throwPendingUpdates);
OnlyStart();
@ -115,14 +115,14 @@ public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage,
return this;
}
public IBuildingStage QuickStart(string apiKey, IStartFormFactory startFormFactory)
public IBuildingStage QuickStart(string apiKey, IStartFormFactory startFormFactory, bool throwPendingUpdates = false)
{
_apiKey = apiKey;
_factory = startFormFactory;
DefaultMessageLoop();
NoProxy();
NoProxy(throwPendingUpdates);
OnlyStart();
@ -399,41 +399,41 @@ public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage,
#region "Step 7 (Language)"
/// <inheritdoc cref="ILanguageSelectionStage.DefaultLanguage"/>
public IBuildingStage DefaultLanguage()
public IThreadingStage DefaultLanguage()
{
return this;
}
/// <inheritdoc cref="ILanguageSelectionStage.UseEnglish"/>
public IBuildingStage UseEnglish()
public IThreadingStage UseEnglish()
{
Default.Language = new English();
return this;
}
/// <inheritdoc cref="ILanguageSelectionStage.UseGerman"/>
public IBuildingStage UseGerman()
public IThreadingStage UseGerman()
{
Default.Language = new German();
return this;
}
/// <inheritdoc cref="ILanguageSelectionStage.UsePersian"/>
public IBuildingStage UsePersian()
public IThreadingStage UsePersian()
{
Default.Language = new Persian();
return this;
}
/// <inheritdoc cref="ILanguageSelectionStage.UseRussian"/>
public IBuildingStage UseRussian()
public IThreadingStage UseRussian()
{
Default.Language = new Russian();
return this;
}
/// <inheritdoc cref="ILanguageSelectionStage.Custom"/>
public IBuildingStage Custom(Localization language)
public IThreadingStage Custom(Localization language)
{
Default.Language = language;
return this;

View File

@ -20,16 +20,18 @@ public interface IAPIKeySelectionStage
/// </summary>
/// <param name="apiKey"></param>
/// <param name="StartForm"></param>
/// <param name="throwPendingUpdates">Indicates if all pending Telegram.Bot.Types.Updates should be thrown out before start polling.</param>
/// <returns></returns>
IBuildingStage QuickStart(string apiKey, Type StartForm);
IBuildingStage QuickStart(string apiKey, Type StartForm, bool throwPendingUpdates = false);
/// <summary>
/// Quick and easy way to create a BotBase instance.
/// Uses: DefaultMessageLoop, NoProxy, OnlyStart, NoSerialization, DefaultLanguage
/// </summary>
/// <param name="apiKey"></param>
/// <param name="throwPendingUpdates">Indicates if all pending Telegram.Bot.Types.Updates should be thrown out before start polling.</param>
/// <returns></returns>
IBuildingStage QuickStart<T>(string apiKey) where T : FormBase;
IBuildingStage QuickStart<T>(string apiKey , bool throwPendingUpdates = false) where T : FormBase;
/// <summary>
/// Quick and easy way to create a BotBase instance.
@ -37,6 +39,7 @@ public interface IAPIKeySelectionStage
/// </summary>
/// <param name="apiKey"></param>
/// <param name="StartFormFactory"></param>
/// <param name="throwPendingUpdates">Indicates if all pending Telegram.Bot.Types.Updates should be thrown out before start polling.</param>
/// <returns></returns>
IBuildingStage QuickStart(string apiKey, IStartFormFactory StartFormFactory);
IBuildingStage QuickStart(string apiKey, IStartFormFactory StartFormFactory, bool throwPendingUpdates = false);
}

View File

@ -11,35 +11,35 @@ public interface ILanguageSelectionStage
/// Selects the default language for control usage. (English)
/// </summary>
/// <returns>The next stage in the building process.</returns>
IBuildingStage DefaultLanguage();
IThreadingStage DefaultLanguage();
/// <summary>
/// Selects english as the default language for control labels.
/// </summary>
/// <returns>The next stage in the building process.</returns>
IBuildingStage UseEnglish();
IThreadingStage UseEnglish();
/// <summary>
/// Selects german as the default language for control labels.
/// </summary>
/// <returns>The next stage in the building process.</returns>
IBuildingStage UseGerman();
IThreadingStage UseGerman();
/// <summary>
/// Selects persian as the default language for control labels.
/// </summary>
/// <returns>The next stage in the building process.</returns>
IBuildingStage UsePersian();
IThreadingStage UsePersian();
/// <summary>
/// Selects russian as the default language for control labels.
/// </summary>
/// <returns>The next stage in the building process.</returns>
IBuildingStage UseRussian();
IThreadingStage UseRussian();
/// <summary>
/// Selects a custom language as the default language for control labels.
/// </summary>
/// <returns>The next stage in the building process.</returns>
IBuildingStage Custom(Localization language);
IThreadingStage Custom(Localization language);
}

View File

@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Linq;
using Telegram.Bot.Types;
@ -20,6 +21,16 @@ public static class Extensions
scope = BotCommandScope.Default();
}
if (string.IsNullOrEmpty(command))
{
throw new ArgumentNullException(nameof(command), $"{nameof(command)} parameter can not be null or empty");
}
if(command.StartsWith(Constants.Telegram.BotCommandIndicator))
{
throw new ArgumentException($"{nameof(command)} parameter does not have to start with a slash, please remove.", $"{nameof(command)}");
}
var item = cmds.FirstOrDefault(a => a.Key.Type == scope.Type);
if (item.Value != null)

View File

@ -16,4 +16,15 @@ public static class Telegram
public const int MaxReplyKeyboardCols = 12;
public const int MessageDeletionsPerSecond = 30;
/// <summary>
/// The maximum length of callback data. Will raise an exception of it exceeds it.
/// </summary>
public const int MaxCallBackDataBytes = 64;
/// <summary>
/// The slash constant which indicates a bot command.
/// </summary>
public const string BotCommandIndicator = "/";
}

View File

@ -51,7 +51,24 @@ public class ButtonGrid : ControlBase
DataSource = new ButtonFormDataSource(form);
}
public string Title { get; set; } = Default.Language["ButtonGrid_Title"];
string m_Title = Default.Language["ButtonGrid_Title"];
public string Title
{
get
{
return m_Title;
}
set
{
if (string.IsNullOrEmpty(value))
{
throw new ArgumentNullException($"{nameof(Title)}", $"{nameof(Title)} property must have been a value unequal to null/empty");
}
m_Title = value;
}
}
public string ConfirmationText { get; set; } = "";
@ -340,14 +357,14 @@ public class ButtonGrid : ControlBase
}
//var button = HeadLayoutButtonRow?. .FirstOrDefault(a => a.Text.Trim() == result.MessageText)
// ?? SubHeadLayoutButtonRow?.FirstOrDefault(a => a.Text.Trim() == result.MessageText);
//var button = HeadLayoutButtonRow?. .FirstOrDefault(a => a.Text.Trim() == result.MessageText)
// ?? SubHeadLayoutButtonRow?.FirstOrDefault(a => a.Text.Trim() == result.MessageText);
// bf.ToList().FirstOrDefault(a => a.Text.Trim() == result.MessageText)
// bf.ToList().FirstOrDefault(a => a.Text.Trim() == result.MessageText)
//var index = bf.FindRowByButton(button);
//var index = bf.FindRowByButton(button);
check:
check:
//Remove button click message
if (DeleteReplyMessage)
@ -449,15 +466,15 @@ public class ButtonGrid : ControlBase
}
//var bf = DataSource.ButtonForm;
//var bf = DataSource.ButtonForm;
//var button = HeadLayoutButtonRow?.FirstOrDefault(a => a.Value == result.RawData)
// ?? SubHeadLayoutButtonRow?.FirstOrDefault(a => a.Value == result.RawData)
// ?? bf.ToList().FirstOrDefault(a => a.Value == result.RawData);
//var button = HeadLayoutButtonRow?.FirstOrDefault(a => a.Value == result.RawData)
// ?? SubHeadLayoutButtonRow?.FirstOrDefault(a => a.Value == result.RawData)
// ?? bf.ToList().FirstOrDefault(a => a.Value == result.RawData);
//var index = bf.FindRowByButton(button);
//var index = bf.FindRowByButton(button);
check:
check:
if (match != null)
{
await result.ConfirmAction(ConfirmationText ?? "");
@ -506,13 +523,13 @@ public class ButtonGrid : ControlBase
if (DataSource.RowCount > Constants.Telegram.MaxInlineKeyBoardRows && !EnablePaging)
{
throw new MaximumRowsReachedException
{ Value = DataSource.RowCount, Maximum = Constants.Telegram.MaxInlineKeyBoardRows };
{ Value = DataSource.RowCount, Maximum = Constants.Telegram.MaxInlineKeyBoardRows };
}
if (DataSource.ColumnCount > Constants.Telegram.MaxInlineKeyBoardCols)
{
throw new MaximumColsException
{ Value = DataSource.ColumnCount, Maximum = Constants.Telegram.MaxInlineKeyBoardCols };
{ Value = DataSource.ColumnCount, Maximum = Constants.Telegram.MaxInlineKeyBoardCols };
}
break;
@ -522,13 +539,13 @@ public class ButtonGrid : ControlBase
if (DataSource.RowCount > Constants.Telegram.MaxReplyKeyboardRows && !EnablePaging)
{
throw new MaximumRowsReachedException
{ Value = DataSource.RowCount, Maximum = Constants.Telegram.MaxReplyKeyboardRows };
{ Value = DataSource.RowCount, Maximum = Constants.Telegram.MaxReplyKeyboardRows };
}
if (DataSource.ColumnCount > Constants.Telegram.MaxReplyKeyboardCols)
{
throw new MaximumColsException
{ Value = DataSource.ColumnCount, Maximum = Constants.Telegram.MaxReplyKeyboardCols };
{ Value = DataSource.ColumnCount, Maximum = Constants.Telegram.MaxReplyKeyboardCols };
}
break;
@ -693,7 +710,7 @@ public class ButtonGrid : ControlBase
Updated();
}
else
//Remove event handler
//Remove event handler
{
Device.MessageDeleted -= Device_MessageDeleted;
}

View File

@ -13,6 +13,7 @@ using TelegramBotBase.Enums;
using TelegramBotBase.Exceptions;
using TelegramBotBase.Form;
using TelegramBotBase.Localizations;
using static System.Net.Mime.MediaTypeNames;
using static TelegramBotBase.Base.Async;
namespace TelegramBotBase.Controls.Hybrid;
@ -51,7 +52,24 @@ public class CheckedButtonList : ControlBase
DataSource = new ButtonFormDataSource(form);
}
public string Title { get; set; } = Default.Language["ButtonGrid_Title"];
string m_Title = Default.Language["ButtonGrid_Title"];
public string Title
{
get
{
return m_Title;
}
set
{
if (string.IsNullOrEmpty(value))
{
throw new ArgumentNullException($"{nameof(Title)}", $"{nameof(Title)} property must have been a value unequal to null/empty");
}
m_Title = value;
}
}
public string ConfirmationText { get; set; } = "";

View File

@ -67,7 +67,24 @@ public class TaggedButtonGrid : MultiView
DataSource = new ButtonFormDataSource(form);
}
public string Title { get; set; } = Default.Language["ButtonGrid_Title"];
string m_Title = Default.Language["ButtonGrid_Title"];
public string Title
{
get
{
return m_Title;
}
set
{
if (string.IsNullOrEmpty(value))
{
throw new ArgumentNullException($"{nameof(Title)}", $"{nameof(Title)} property must have been a value unequal to null/empty");
}
m_Title = value;
}
}
public string ConfirmationText { get; set; }

View File

@ -14,9 +14,9 @@ namespace TelegramBotBase.Controls.Inline;
[DebuggerDisplay("{Text}")]
public class Label : ControlBase
{
private bool _renderNecessary = true;
protected bool _renderNecessary = true;
private string _text = string.Empty;
private string _text = Default.Language["Label_Text"];
public String Text
{
@ -29,6 +29,10 @@ public class Label : ControlBase
if (_text == value)
return;
if (string.IsNullOrEmpty(value))
{
throw new ArgumentNullException($"{nameof(Text)}", $"{nameof(Text)} property must have been a value unequal to null/empty");
}
_text = value;
_renderNecessary = true;
@ -36,6 +40,8 @@ public class Label : ControlBase
}
}
private ParseMode _parseMode = ParseMode.Markdown;
public ParseMode ParseMode

View File

@ -32,10 +32,32 @@ public class MultiToggleButton : ControlBase
/// </summary>
public string ChangedString { get; set; } = Default.Language["MultiToggleButton_Changed"];
private string _title = Default.Language["MultiToggleButton_Title"];
/// <summary>
/// This holds the title of the control.
/// </summary>
public string Title { get; set; } = Default.Language["MultiToggleButton_Title"];
public String Title
{
get
{
return _title;
}
set
{
if (_title == value)
return;
if (string.IsNullOrEmpty(value))
{
throw new ArgumentNullException($"{nameof(Title)}", $"{nameof(Title)} must have been a value unequal to null/empty");
}
_title = value;
_renderNecessary = true;
}
}
public int? MessageId { get; set; }

View File

@ -36,7 +36,31 @@ public class ToggleButton : ControlBase
public string ChangedString { get; set; } = Default.Language["ToggleButton_Changed"];
public string Title { get; set; } = Default.Language["ToggleButton_Title"];
private string _title = Default.Language["ToggleButton_Title"];
public String Title
{
get
{
return _title;
}
set
{
if (_title == value)
return;
if (string.IsNullOrEmpty(value))
{
throw new ArgumentNullException($"{nameof(Title)}", $"{nameof(Title)} property must have been a value unequal to null/empty");
}
_title = value;
_renderNecessary = true;
}
}
public int? MessageId { get; set; }

View File

@ -0,0 +1,35 @@
using System;
using Telegram.Bot.Exceptions;
namespace TelegramBotBase.Exceptions;
public sealed class CallbackDataTooLongException : Exception
{
static ApiRequestException _innerException = new Telegram.Bot.Exceptions.ApiRequestException("Bad Request: BUTTON_DATA_INVALID", 400);
static String _message = $"You have exceeded the maximum {Constants.Telegram.MaxCallBackDataBytes} bytes of callback data.\r\nThis is a pre-sending message from the TelegramBotBase framework.\r\nread more: https://core.telegram.org/bots/api#inlinekeyboardbutton";
static String _message_with_bytes = $"You have exceeded the maximum {Constants.Telegram.MaxCallBackDataBytes} bytes of callback data with @current_callback_bytes@ bytes.\r\nThis is a pre-sending message from the TelegramBotBase framework.\r\nread more: https://core.telegram.org/bots/api#inlinekeyboardbutton";
public CallbackDataTooLongException() : base(_message, _innerException)
{
}
/// <summary>
///
/// </summary>
/// <param name="current_callback_bytes">The amount of callback bytes generated.</param>
public CallbackDataTooLongException(int current_callback_bytes) : base(getMessage(current_callback_bytes), _innerException)
{
}
static String getMessage(int current_callback_bytes = -1)
{
if (current_callback_bytes == -1)
return _message;
return _message_with_bytes.Replace("@current_callback_bytes@", current_callback_bytes.ToString());
}
}

View File

@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace TelegramBotBase.Exceptions
{
public sealed class InvalidServiceProviderConfiguration : Exception
{
public InvalidServiceProviderConfiguration(string message, Exception innerException) : base(message, innerException) { }
}
}

View File

@ -1,6 +1,7 @@
using System;
using Microsoft.Extensions.DependencyInjection;
using TelegramBotBase.DependencyInjection;
using TelegramBotBase.Exceptions;
using TelegramBotBase.Form;
using TelegramBotBase.Interfaces;
@ -22,9 +23,20 @@ public class ServiceProviderStartFormFactory : IStartFormFactory
_serviceProvider = serviceProvider;
}
public FormBase CreateForm()
public FormBase CreateForm() => CreateForm(null);
public FormBase CreateForm(Type? specifiedStartFrom = null)
{
var fb = (FormBase)ActivatorUtilities.CreateInstance(_serviceProvider, _startFormClass);
FormBase fb = null;
try
{
fb = (FormBase)ActivatorUtilities.CreateInstance(_serviceProvider, specifiedStartFrom ?? _startFormClass);
}
catch(InvalidOperationException ex)
{
throw new InvalidServiceProviderConfiguration(ex.Message, ex);
}
//Sets an internal field for future ServiceProvider navigation
fb.SetServiceProvider(_serviceProvider);

View File

@ -24,7 +24,7 @@ public class AutoCleanForm : FormBase
DeleteMode = EDeleteMode.OnEveryCall;
DeleteSide = EDeleteSide.BotOnly;
Init += AutoCleanForm_Init;
Opened += AutoCleanForm_Init;
Closed += AutoCleanForm_Closed;
}
@ -35,7 +35,7 @@ public class AutoCleanForm : FormBase
[SaveState] public EDeleteSide DeleteSide { get; set; }
private Task AutoCleanForm_Init(object sender, InitEventArgs e)
private Task AutoCleanForm_Init(object sender, EventArgs e)
{
if (Device == null)
{
@ -70,7 +70,8 @@ public class AutoCleanForm : FormBase
private Task Device_MessageSent(object sender, MessageSentEventArgs e)
{
if (DeleteSide == EDeleteSide.UserOnly)
if (DeleteSide == EDeleteSide.UserOnly
|| Device.ActiveForm != this)
{
return Task.CompletedTask;
}
@ -137,6 +138,12 @@ public class AutoCleanForm : FormBase
return Task.CompletedTask;
}
Device.MessageSent -= Device_MessageSent;
Device.MessageReceived -= Device_MessageReceived;
Device.MessageDeleted -= Device_MessageDeleted;
MessageCleanup().Wait();
return Task.CompletedTask;
}

View File

@ -1,4 +1,7 @@
using Newtonsoft.Json;
using System.Text;
using System.Text.Json;
using System.Text.Json.Serialization;
using TelegramBotBase.Exceptions;
namespace TelegramBotBase.Form;
@ -17,28 +20,30 @@ 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)
{
return new CallbackData(method, value).Serialize();
return new CallbackData(method, value).Serialize(true);
}
/// <summary>
/// Serializes data to json string
/// </summary>
/// <returns></returns>
public string Serialize()
public string Serialize(bool throwExceptionOnOverflow = false)
{
var s = "";
try
{
s = JsonConvert.SerializeObject(this);
}
catch
var s = string.Empty;
s = JsonSerializer.Serialize(this);
//Is data over 64 bytes ?
int byte_count = Encoding.UTF8.GetByteCount(s);
if (throwExceptionOnOverflow && byte_count > Constants.Telegram.MaxCallBackDataBytes)
{
throw new CallbackDataTooLongException(byte_count);
}
return s;
@ -51,19 +56,8 @@ public class CallbackData
/// <returns></returns>
public static CallbackData Deserialize(string data)
{
CallbackData cd = null;
try
{
cd = JsonConvert.DeserializeObject<CallbackData>(data);
return cd;
}
catch
{
}
return null;
return JsonSerializer.Deserialize<CallbackData>(data);
}
public static implicit operator string(CallbackData callbackData) => callbackData.Serialize();
public static implicit operator string(CallbackData callbackData) => callbackData.Serialize(true);
}

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));

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;
}

View File

@ -34,5 +34,6 @@ public sealed class English : Localization
Values["ToggleButton_Changed"] = "Setting changed";
Values["ButtonGrid_SearchIcon"] = "🔍";
Values["TaggedButtonGrid_TagIcon"] = "📁";
Values["Label_Text"] = "Default label text";
}
}

View File

@ -34,5 +34,6 @@ public sealed class German : Localization
Values["ToggleButton_Changed"] = "Einstellung geändert";
Values["ButtonGrid_SearchIcon"] = "🔍";
Values["TaggedButtonGrid_TagIcon"] = "📁";
Values["Label_Text"] = "Standard Label Text";
}
}

View File

@ -34,6 +34,7 @@ public sealed class Persian : Localization
Values["ToggleButton_Changed"] = "تنظیمات تغییر کرد";
Values["ButtonGrid_SearchIcon"] = "🔍";
Values["TaggedButtonGrid_TagIcon"] = "📁";
Values["Label_Text"] = "متن برچسب پیش‌فرض";
}
}

View File

@ -34,5 +34,6 @@ public sealed class Russian : Localization
Values["ToggleButton_Changed"] = "Настройки изменены";
Values["ButtonGrid_SearchIcon"] = "🔍";
Values["TaggedButtonGrid_TagIcon"] = "📁";
Values["Label_Text"] = "Текст метки по умолчанию";
}
}

View File

@ -46,6 +46,8 @@ public class FormBaseMessageLoop : IMessageLoopFactory
mr.Device = session;
ur.Device = session;
session.OnMessageReceived(new(mr.Message));
var activeForm = session.ActiveForm;
//Pre Loading Event
@ -79,13 +81,16 @@ public class FormBaseMessageLoop : IMessageLoopFactory
}
//Action Event
if (!session.FormSwitched && mr.IsAction)
if (!session.FormSwitched && mr.IsAction && !mr.Handled)
{
//Send Action event to controls
await activeForm.ActionControls(mr);
//Send Action event to form itself
await activeForm.Action(mr);
if (!mr.Handled)
{
//Send Action event to form itself, if not already handled by a control
await activeForm.Action(mr);
}
if (!mr.Handled)
{

View File

@ -72,13 +72,16 @@ public class FullMessageLoop : IMessageLoopFactory
}
//Action Event
if (!session.FormSwitched && mr.IsAction)
if (!session.FormSwitched && mr.IsAction && !mr.Handled)
{
//Send Action event to controls
await activeForm.ActionControls(mr);
//Send Action event to form itself
await activeForm.Action(mr);
if (!mr.Handled)
{
//Send Action event to form itself, if not already handled by a control
await activeForm.Action(mr);
}
if (!mr.Handled)
{

View File

@ -6,6 +6,7 @@ using System.Threading.Tasks;
using TelegramBotBase.Args;
using TelegramBotBase.Attributes;
using TelegramBotBase.Base;
using TelegramBotBase.Factories;
using TelegramBotBase.Form;
using TelegramBotBase.Interfaces;
using TelegramBotBase.Sessions;
@ -145,9 +146,17 @@ public class SessionManager
{
continue;
}
FormBase form;
if (BotBase.StartFormFactory is ServiceProviderStartFormFactory diFactory)
{
form = diFactory.CreateForm(t);
}
//No default constructor, fallback
if (!(t.GetConstructor(new Type[] { })?.Invoke(new object[] { }) is FormBase form))
else if (t.GetConstructor(new Type[] { })?.Invoke(new object[] { }) is FormBase f)
{
form = f;
}
else
{
if (!statemachine.FallbackStateForm.IsSubclassOf(typeof(FormBase)))
{
@ -293,17 +302,19 @@ public class SessionManager
se.Values = ssea.Values;
}
//Search for public properties with SaveState attribute
var fields = form.GetType()
.GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
.Where(a => a.GetCustomAttributes(typeof(SaveState), true).Length != 0).ToList();
foreach (var f in fields)
else
{
var val = f.GetValue(form);
//Search for public properties with SaveState attribute
var fields = form.GetType()
.GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
.Where(a => a.GetCustomAttributes(typeof(SaveState), true).Length != 0).ToList();
se.Values.Add("$" + f.Name, val);
foreach (var f in fields)
{
var val = f.GetValue(form);
se.Values.Add("$" + f.Name, val);
}
}
states.Add(se);

View File

@ -131,13 +131,9 @@ public class DeviceSession : IDeviceSession
public async Task ConfirmAction(string callbackQueryId, string message = "", bool showAlert = false,
string urlToOpen = null)
{
try
{
await Client.TelegramClient.AnswerCallbackQueryAsync(callbackQueryId, message, showAlert, urlToOpen);
}
catch
{
}
await Client.TelegramClient.AnswerCallbackQueryAsync(callbackQueryId, message, showAlert, urlToOpen);
}
/// <summary>
@ -157,17 +153,8 @@ public class DeviceSession : IDeviceSession
throw new MessageTooLongException(text.Length);
}
try
{
return await Api(a =>
a.EditMessageTextAsync(DeviceId, messageId, text, parseMode, replyMarkup: markup));
}
catch
{
}
return null;
return await Api(a => a.EditMessageTextAsync(DeviceId, messageId, text, parseMode, replyMarkup: markup));
}
/// <summary>
@ -185,17 +172,9 @@ public class DeviceSession : IDeviceSession
throw new MessageTooLongException(text.Length);
}
try
{
return await Api(a =>
a.EditMessageTextAsync(DeviceId, messageId, text, parseMode, replyMarkup: markup));
}
catch
{
}
return await Api(a => a.EditMessageTextAsync(DeviceId, messageId, text, parseMode, replyMarkup: markup));
return null;
}
/// <summary>
@ -215,18 +194,8 @@ public class DeviceSession : IDeviceSession
throw new MessageTooLongException(message.Text.Length);
}
try
{
return await Api(a =>
a.EditMessageTextAsync(DeviceId, message.MessageId, message.Text, parseMode,
replyMarkup: markup));
}
catch
{
}
return null;
return await Api(a => a.EditMessageTextAsync(DeviceId, message.MessageId, message.Text, parseMode,
replyMarkup: markup));
}
/// <summary>
@ -237,15 +206,8 @@ public class DeviceSession : IDeviceSession
/// <returns></returns>
public async Task<Message> EditReplyMarkup(int messageId, ButtonForm bf)
{
try
{
return await Api(a => a.EditMessageReplyMarkupAsync(DeviceId, messageId, bf));
}
catch
{
}
return null;
return await Api(a => a.EditMessageReplyMarkupAsync(DeviceId, messageId, bf));
}
/// <summary>
@ -277,21 +239,15 @@ public class DeviceSession : IDeviceSession
text = text.MarkdownV2Escape();
}
try
{
var t = Api(a => a.SendTextMessageAsync(deviceId, text, null, parseMode, replyToMessageId: replyTo,
replyMarkup: markup, disableNotification: disableNotification));
var t = Api(a => a.SendMessage(deviceId, text, messageThreadId: null, parseMode: parseMode, replyParameters: replyTo,
replyMarkup: markup, disableNotification: disableNotification));
var o = GetOrigin(new StackTrace());
var o = GetOrigin(new StackTrace());
await OnMessageSent(new MessageSentEventArgs(await t, o));
await OnMessageSent(new MessageSentEventArgs(await t, o));
return await t;
return await t;
}
catch
{
return null;
}
}
/// <summary>
@ -336,20 +292,15 @@ public class DeviceSession : IDeviceSession
text = text.MarkdownV2Escape();
}
try
{
var t = Api(a => a.SendTextMessageAsync(DeviceId, text, null, parseMode, replyToMessageId: replyTo,
replyMarkup: markup, disableNotification: disableNotification));
var o = GetOrigin(new StackTrace());
await OnMessageSent(new MessageSentEventArgs(await t, o));
var t = Api(a => a.SendMessage(DeviceId, text, messageThreadId: null, parseMode: parseMode, replyParameters: replyTo,
replyMarkup: markup, disableNotification: disableNotification));
var o = GetOrigin(new StackTrace());
await OnMessageSent(new MessageSentEventArgs(await t, o));
return await t;
return await t;
}
catch
{
return null;
}
}
/// <summary>
@ -360,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)
{
@ -379,20 +330,15 @@ public class DeviceSession : IDeviceSession
text = text.MarkdownV2Escape();
}
try
{
var t = Api(a => a.SendTextMessageAsync(DeviceId, text, null, parseMode, replyToMessageId: replyTo,
replyMarkup: markup, disableNotification: disableNotification));
var o = GetOrigin(new StackTrace());
await OnMessageSent(new MessageSentEventArgs(await t, o));
var t = Api(a => a.SendMessage(DeviceId, text, messageThreadId: null, parseMode: parseMode, replyParameters: replyTo,
replyMarkup: markup, disableNotification: disableNotification));
var o = GetOrigin(new StackTrace());
await OnMessageSent(new MessageSentEventArgs(await t, o));
return await t;
return await t;
}
catch
{
return null;
}
}
/// <summary>
@ -414,20 +360,15 @@ public class DeviceSession : IDeviceSession
InlineKeyboardMarkup markup = buttons;
try
{
var t = Api(a => a.SendPhotoAsync(DeviceId, file, null, caption, parseMode, replyToMessageId: replyTo,
replyMarkup: markup, disableNotification: disableNotification));
var o = GetOrigin(new StackTrace());
await OnMessageSent(new MessageSentEventArgs(await t, o));
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());
await OnMessageSent(new MessageSentEventArgs(await t, o));
return await t;
return await t;
}
catch
{
return null;
}
}
/// <summary>
@ -449,21 +390,16 @@ public class DeviceSession : IDeviceSession
InlineKeyboardMarkup markup = buttons;
try
{
var t = Api(a => a.SendVideoAsync(DeviceId, file, caption: caption, parseMode: parseMode,
replyToMessageId: replyTo, replyMarkup: markup,
disableNotification: disableNotification));
var o = GetOrigin(new StackTrace());
await OnMessageSent(new MessageSentEventArgs(await t, o));
var t = Api(a => a.SendVideo(DeviceId, file, caption: caption, parseMode: parseMode,
replyParameters: replyTo, replyMarkup: markup,
disableNotification: disableNotification));
var o = GetOrigin(new StackTrace());
await OnMessageSent(new MessageSentEventArgs(await t, o));
return await t;
return await t;
}
catch
{
return null;
}
}
/// <summary>
@ -484,21 +420,16 @@ public class DeviceSession : IDeviceSession
InlineKeyboardMarkup markup = buttons;
try
{
var t = Api(a => a.SendVideoAsync(DeviceId, InputFile.FromUri(url), parseMode: parseMode,
replyToMessageId: replyTo, replyMarkup: markup,
disableNotification: disableNotification));
var o = GetOrigin(new StackTrace());
await OnMessageSent(new MessageSentEventArgs(await t, o));
var t = Api(a => a.SendVideo(DeviceId, InputFile.FromUri(url), parseMode: parseMode,
replyParameters: replyTo, replyMarkup: markup,
disableNotification: disableNotification));
var o = GetOrigin(new StackTrace());
await OnMessageSent(new MessageSentEventArgs(await t, o));
return await t;
return await t;
}
catch
{
return null;
}
}
/// <summary>
@ -520,24 +451,19 @@ public class DeviceSession : IDeviceSession
InlineKeyboardMarkup markup = buttons;
try
{
var ms = new MemoryStream(video);
var fts = InputFile.FromStream(ms, filename);
var ms = new MemoryStream(video);
var t = Api(a => a.SendVideoAsync(DeviceId, fts, parseMode: parseMode, replyToMessageId: replyTo,
replyMarkup: markup, disableNotification: disableNotification));
var fts = InputFile.FromStream(ms, filename);
var o = GetOrigin(new StackTrace());
await OnMessageSent(new MessageSentEventArgs(await t, o));
var t = Api(a => a.SendVideo(DeviceId, fts, parseMode: parseMode, replyParameters: replyTo,
replyMarkup: markup, disableNotification: disableNotification));
var o = GetOrigin(new StackTrace());
await OnMessageSent(new MessageSentEventArgs(await t, o));
return await t;
return await t;
}
catch
{
return null;
}
}
/// <summary>
@ -560,26 +486,21 @@ public class DeviceSession : IDeviceSession
InlineKeyboardMarkup markup = buttons;
try
{
var fs = new FileStream(filepath, FileMode.Open);
var filename = Path.GetFileName(filepath);
var fs = new FileStream(filepath, FileMode.Open);
var fts = InputFile.FromStream(fs, filename);
var filename = Path.GetFileName(filepath);
var t = Api(a => a.SendVideoAsync(DeviceId, fts, parseMode: parseMode, replyToMessageId: replyTo,
replyMarkup: markup, disableNotification: disableNotification));
var fts = InputFile.FromStream(fs, filename);
var o = GetOrigin(new StackTrace());
await OnMessageSent(new MessageSentEventArgs(await t, o));
var t = Api(a => a.SendVideo(DeviceId, fts, parseMode: parseMode, replyParameters: replyTo,
replyMarkup: markup, disableNotification: disableNotification));
var o = GetOrigin(new StackTrace());
await OnMessageSent(new MessageSentEventArgs(await t, o));
return await t;
return await t;
}
catch
{
return null;
}
}
/// <summary>
@ -650,20 +571,15 @@ public class DeviceSession : IDeviceSession
markup = buttons;
}
try
{
var t = Api(a => a.SendDocumentAsync(DeviceId, document, null, null, caption, replyMarkup: markup,
disableNotification: disableNotification, replyToMessageId: replyTo));
var o = GetOrigin(new StackTrace());
await OnMessageSent(new MessageSentEventArgs(await t, o));
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));
return await t;
return await t;
}
catch
{
return null;
}
}
/// <summary>
@ -714,22 +630,16 @@ public class DeviceSession : IDeviceSession
public async Task<Message> HideReplyKeyboard(string closedMsg = "Closed", bool autoDeleteResponse = true)
{
try
{
var m = await Send(closedMsg, new ReplyKeyboardRemove());
if (autoDeleteResponse && m != null)
{
await DeleteMessage(m);
}
var m = await Send(closedMsg, new ReplyKeyboardRemove());
return m;
}
catch
if (autoDeleteResponse && m != null)
{
await DeleteMessage(m);
}
return null;
return m;
}
/// <summary>
@ -759,13 +669,9 @@ public class DeviceSession : IDeviceSession
public virtual async Task ChangeChatPermissions(ChatPermissions permissions)
{
try
{
await Api(a => a.SetChatPermissionsAsync(DeviceId, permissions));
}
catch
{
}
await Api(a => a.SetChatPermissionsAsync(DeviceId, permissions));
}
private Type GetOrigin(StackTrace stackTrace)
@ -865,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
{
@ -878,49 +784,31 @@ public class DeviceSession : IDeviceSession
public virtual async Task<ChatMember> GetChatUser(long userId)
{
try
{
return await Api(a => a.GetChatMemberAsync(DeviceId, userId));
}
catch
{
}
return null;
return await Api(a => a.GetChatMemberAsync(DeviceId, userId));
}
[Obsolete("User BanUser instead.")]
public virtual async Task KickUser(long userId, DateTime until = default)
{
try
{
await Api(a => a.BanChatMemberAsync(DeviceId, userId, until));
}
catch
{
}
await Api(a => a.BanChatMemberAsync(DeviceId, userId, until));
}
public virtual async Task BanUser(long userId, DateTime until = default)
{
try
{
await Api(a => a.BanChatMemberAsync(DeviceId, userId, until));
}
catch
{
}
await Api(a => a.BanChatMemberAsync(DeviceId, userId, until));
}
public virtual async Task UnbanUser(long userId)
{
try
{
await Api(a => a.UnbanChatMemberAsync(DeviceId, userId));
}
catch
{
}
await Api(a => a.UnbanChatMemberAsync(DeviceId, userId));
}
#endregion

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);

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);
}

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>

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>

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