Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
82e6d79ec4 | ||
|
|
5d2f3e7fe9 | ||
|
|
7aa40b3e2d | ||
|
|
eb8fad444b | ||
|
|
5cda9e1fdc | ||
|
|
41bdf52afe | ||
|
|
9023875922 | ||
|
|
05bfeb8d09 | ||
|
|
1f1aa1f0ee | ||
|
|
3d97da75f1 | ||
|
|
261fdafd96 | ||
|
|
39e68a2089 | ||
|
|
312690c002 | ||
|
|
99b888a7a2 | ||
|
|
6adcc52ea2 | ||
|
|
834038ff44 | ||
|
|
e3d1652a02 | ||
|
|
a7411176e6 | ||
|
|
801c0b77f8 | ||
|
|
7a86ecdf32 | ||
|
|
175927fbab | ||
|
|
34e4429b38 | ||
|
|
dc28bde382 | ||
|
|
87d57c471a | ||
|
|
5ce2360cc7 | ||
|
|
e345fc2948 | ||
|
|
652526ec59 | ||
|
|
b829f43c5d | ||
|
|
6e7acdbdba | ||
|
|
396a524d94 | ||
|
|
7d679649e4 | ||
|
|
2db8e2cf63 | ||
|
|
6b7f2ca273 | ||
|
|
31d0d9890d | ||
|
|
b252829296 | ||
|
|
a483bc7c0b | ||
|
|
4635a96fc7 | ||
|
|
727375f7aa | ||
|
|
86792af214 | ||
|
|
b3edb95b55 | ||
|
|
946420f9c6 | ||
|
|
c8c56a42c0 | ||
|
|
6f930eee8c | ||
|
|
c4a589d476 | ||
|
|
1b14b7b3cf | ||
|
|
cb5fa35269 | ||
|
|
f60e1000c3 | ||
|
|
00dafd59a3 | ||
|
|
848b5d29cf | ||
|
|
9cac57b8e7 | ||
|
|
52517534f8 | ||
|
|
5e166db243 | ||
|
|
71aa0c3d91 | ||
|
|
e34c71b42b | ||
|
|
9927a034b0 | ||
|
|
2e454d7f5c | ||
|
|
339319ef2a | ||
|
|
c8b12e9168 | ||
|
|
cbc31b8ff5 | ||
|
|
c514ede03f | ||
|
|
c91fbaa16c | ||
|
|
b8125e9aed | ||
|
|
d4af8797fb | ||
|
|
93fda551e1 | ||
|
|
b14913362e | ||
|
|
8b22fd7b74 | ||
|
|
254c002d4a | ||
|
|
a632440efd | ||
|
|
194d8ba317 | ||
|
|
d833b1e088 | ||
|
|
084395e962 | ||
|
|
b20b3b2826 | ||
|
|
c1d1d5f543 | ||
|
|
078bdfb163 | ||
|
|
94c680e036 | ||
|
|
dbdc40582a | ||
|
|
2d3393aa05 | ||
|
|
fdd814c88e | ||
|
|
2b06fba8ff | ||
|
|
8e4bc7a222 | ||
|
|
cc4c743721 | ||
|
|
4e55fd42d6 | ||
|
|
deef8dd086 | ||
|
|
3aff0aa94b | ||
|
|
75064fd64c | ||
|
|
0cafca9aee | ||
|
|
ad40675b87 | ||
|
|
83e09aec2a | ||
|
|
26152ee348 | ||
|
|
d5ffa914f0 | ||
|
|
a63f71268c | ||
|
|
7fcaa407ad | ||
|
|
d56b26a788 | ||
|
|
c1018ac5a0 | ||
|
|
064399ed77 | ||
|
|
121a788c17 | ||
|
|
40199a1d81 | ||
|
|
794dee7f58 | ||
|
|
88309e607b | ||
|
|
a71eed5054 | ||
|
|
2a873cc29b | ||
|
|
f401216eff | ||
|
|
0cb4f02a8d | ||
|
|
62b6bafbd3 | ||
|
|
89332244e3 | ||
|
|
43f4ab1061 | ||
|
|
1f438186f4 | ||
|
|
f447b058d0 | ||
|
|
40ba9bd8ab | ||
|
|
ca473f78ed | ||
|
|
ab702dbc9f | ||
|
|
23dc1ff1d6 | ||
|
|
e044d725c9 | ||
|
|
4825beea7e | ||
|
|
78d65868ff | ||
|
|
d7aca80d59 | ||
|
|
73863c4154 | ||
|
|
e3b1a32535 | ||
|
|
571049eeb4 | ||
|
|
30222d640d | ||
|
|
e6a48115a6 | ||
|
|
b278015dd4 | ||
|
|
91e0c54728 | ||
|
|
788f935c02 | ||
|
|
d1089fe716 | ||
|
|
1d3db0116e | ||
|
|
e95301f727 | ||
|
|
4ba91803fe |
@@ -8,7 +8,7 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\..\TelegramBotBase\TelegramBotBase.csproj"/>
|
<PackageReference Include="TelegramBotBase" Version="6.4.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="TelegramBotBase" Version="5.3.0" />
|
<PackageReference Include="TelegramBotBase" Version="6.4.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ namespace BotAndWebApplication.BotStuff.Tasks
|
|||||||
.DefaultCommands()
|
.DefaultCommands()
|
||||||
.NoSerialization()
|
.NoSerialization()
|
||||||
.UseEnglish()
|
.UseEnglish()
|
||||||
|
.UseThreadPool()
|
||||||
.Build();
|
.Build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
|
||||||
|
namespace DependencyInjection.Database;
|
||||||
|
|
||||||
|
public class BotDbContext : DbContext
|
||||||
|
{
|
||||||
|
public BotDbContext(DbContextOptions options) : base(options)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public DbSet<User> Users { get; set; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
namespace DependencyInjection.Database;
|
||||||
|
|
||||||
|
public class User
|
||||||
|
{
|
||||||
|
public long Id { get; set; }
|
||||||
|
public string LastMessage { get; set; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<OutputType>Exe</OutputType>
|
||||||
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.11" />
|
||||||
|
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.11" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\..\TelegramBotBase\TelegramBotBase.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
using DependencyInjection.Database;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using TelegramBotBase.Base;
|
||||||
|
using TelegramBotBase.Form;
|
||||||
|
using TelegramBotBase.DependencyInjection;
|
||||||
|
|
||||||
|
namespace DependencyInjection.Forms
|
||||||
|
{
|
||||||
|
public class ConfirmationForm : FormBase
|
||||||
|
{
|
||||||
|
private readonly BotDbContext _dbContext;
|
||||||
|
|
||||||
|
public ConfirmationForm(BotDbContext dbContext)
|
||||||
|
{
|
||||||
|
_dbContext = dbContext;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override async Task Load(MessageResult message)
|
||||||
|
{
|
||||||
|
var user = await _dbContext.Users.FindAsync(Device.DeviceId);
|
||||||
|
|
||||||
|
if (user == null)
|
||||||
|
{
|
||||||
|
await this.NavigateTo<StartForm>();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public override async Task Action(MessageResult message)
|
||||||
|
{
|
||||||
|
await message.ConfirmAction("Go back");
|
||||||
|
|
||||||
|
switch (message.RawData)
|
||||||
|
{
|
||||||
|
|
||||||
|
case "back":
|
||||||
|
|
||||||
|
await this.NavigateTo<StartForm>();
|
||||||
|
|
||||||
|
break;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public override async Task Render(MessageResult message)
|
||||||
|
{
|
||||||
|
var user = await _dbContext.Users.FindAsync(Device.DeviceId);
|
||||||
|
if (user == null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var bf = new ButtonForm();
|
||||||
|
bf.AddButtonRow("Back", "back");
|
||||||
|
|
||||||
|
await Device.Send($"ConfirmationForm: Your last message was: {user.LastMessage}. Click \"Back\" to get back.", bf);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
using DependencyInjection.Database;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
using TelegramBotBase.Builder;
|
||||||
|
|
||||||
|
namespace DependencyInjection
|
||||||
|
{
|
||||||
|
internal class Program
|
||||||
|
{
|
||||||
|
static async Task Main(string[] args)
|
||||||
|
{
|
||||||
|
|
||||||
|
|
||||||
|
var serviceCollection = new ServiceCollection()
|
||||||
|
.AddDbContext<BotDbContext>(x => x.UseInMemoryDatabase("TelegramBotBase"));
|
||||||
|
|
||||||
|
var serviceProvider = serviceCollection.BuildServiceProvider();
|
||||||
|
|
||||||
|
var bot = BotBaseBuilder.Create()
|
||||||
|
.WithAPIKey(Environment.GetEnvironmentVariable("API_KEY") ??
|
||||||
|
throw new Exception("API_KEY is not set"))
|
||||||
|
.DefaultMessageLoop()
|
||||||
|
.WithServiceProvider<StartForm>(serviceProvider)
|
||||||
|
.NoProxy()
|
||||||
|
.NoCommands()
|
||||||
|
.NoSerialization()
|
||||||
|
.DefaultLanguage()
|
||||||
|
.UseSingleThread()
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
await bot.Start();
|
||||||
|
await Task.Delay(-1);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,79 @@
|
|||||||
|
using DependencyInjection.Database;
|
||||||
|
using DependencyInjection.Forms;
|
||||||
|
using TelegramBotBase.Base;
|
||||||
|
using TelegramBotBase.Form;
|
||||||
|
using TelegramBotBase.DependencyInjection;
|
||||||
|
|
||||||
|
namespace DependencyInjection;
|
||||||
|
|
||||||
|
public class StartForm : FormBase
|
||||||
|
{
|
||||||
|
private readonly BotDbContext _dbContext;
|
||||||
|
|
||||||
|
public StartForm(BotDbContext dbContext)
|
||||||
|
{
|
||||||
|
_dbContext = dbContext;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override async Task Load(MessageResult message)
|
||||||
|
{
|
||||||
|
var user = await _dbContext.Users.FindAsync(Device.DeviceId);
|
||||||
|
if (user is null)
|
||||||
|
{
|
||||||
|
user = new User
|
||||||
|
{
|
||||||
|
Id = Device.DeviceId,
|
||||||
|
LastMessage = "<unknown>"
|
||||||
|
};
|
||||||
|
|
||||||
|
_dbContext.Users.Add(user);
|
||||||
|
await _dbContext.SaveChangesAsync();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (message.IsAction)
|
||||||
|
return;
|
||||||
|
|
||||||
|
|
||||||
|
user.LastMessage = string.IsNullOrWhiteSpace(message.MessageText) ? "<unknown>" : message.MessageText;
|
||||||
|
await _dbContext.SaveChangesAsync();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override async Task Action(MessageResult message)
|
||||||
|
{
|
||||||
|
await message.ConfirmAction("Ok");
|
||||||
|
|
||||||
|
switch(message.RawData)
|
||||||
|
{
|
||||||
|
|
||||||
|
case "open":
|
||||||
|
|
||||||
|
await this.NavigateTo(typeof(ConfirmationForm));
|
||||||
|
|
||||||
|
var new_form = await this.NavigateTo<ConfirmationForm>();
|
||||||
|
|
||||||
|
if (new_form == null)
|
||||||
|
{
|
||||||
|
await Device.Send("Cant open ConfirmationForm");
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public override async Task Render(MessageResult message)
|
||||||
|
{
|
||||||
|
var user = await _dbContext.Users.FindAsync(Device.DeviceId);
|
||||||
|
if (user == null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var bf = new ButtonForm();
|
||||||
|
|
||||||
|
bf.AddButtonRow("Open confirmation", "open");
|
||||||
|
|
||||||
|
await Device.Send($"Your last message's text was: `{user.LastMessage}`", bf);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -8,12 +8,12 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.9"/>
|
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.11" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.9"/>
|
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.11" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\..\TelegramBotBase\TelegramBotBase.csproj"/>
|
<ProjectReference Include="..\..\TelegramBotBase\TelegramBotBase.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ var bot = BotBaseBuilder.Create()
|
|||||||
.NoCommands()
|
.NoCommands()
|
||||||
.NoSerialization()
|
.NoSerialization()
|
||||||
.DefaultLanguage()
|
.DefaultLanguage()
|
||||||
|
.UseSingleThread()
|
||||||
.Build();
|
.Build();
|
||||||
|
|
||||||
await bot.Start();
|
await bot.Start();
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\..\TelegramBotBase\TelegramBotBase.csproj" />
|
<PackageReference Include="TelegramBotBase" Version="6.4.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -21,12 +21,15 @@ namespace InlineAndReplyCombination
|
|||||||
.DefaultCommands()
|
.DefaultCommands()
|
||||||
.UseJSON(Path.Combine(Directory.GetCurrentDirectory(), "states.json"))
|
.UseJSON(Path.Combine(Directory.GetCurrentDirectory(), "states.json"))
|
||||||
.UseEnglish()
|
.UseEnglish()
|
||||||
|
.UseSingleThread()
|
||||||
.Build();
|
.Build();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
await BotBaseInstance.UploadBotCommands();
|
await BotBaseInstance.UploadBotCommands();
|
||||||
|
|
||||||
|
BotBaseInstance.BotCommand += BotBaseInstance_BotCommand;
|
||||||
|
|
||||||
|
|
||||||
await BotBaseInstance.Start();
|
await BotBaseInstance.Start();
|
||||||
|
|
||||||
@@ -37,5 +40,28 @@ namespace InlineAndReplyCombination
|
|||||||
|
|
||||||
await BotBaseInstance.Stop();
|
await BotBaseInstance.Stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static async Task BotBaseInstance_BotCommand(object sender, TelegramBotBase.Args.BotCommandEventArgs e)
|
||||||
|
{
|
||||||
|
|
||||||
|
switch(e.Command)
|
||||||
|
{
|
||||||
|
case "/start":
|
||||||
|
|
||||||
|
|
||||||
|
var start = new StartForm();
|
||||||
|
|
||||||
|
await e.Device.ActiveForm.NavigateTo(start);
|
||||||
|
|
||||||
|
|
||||||
|
break;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\..\TelegramBotBase\TelegramBotBase.csproj"/>
|
<PackageReference Include="TelegramBotBase" Version="6.4.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -10,12 +10,18 @@
|
|||||||
|
|
||||||
**Support group: [@tgbotbase](https://t.me/tgbotbase)**
|
**Support group: [@tgbotbase](https://t.me/tgbotbase)**
|
||||||
|
|
||||||
**Discord Server: [https://discord.gg/p3PPhYbTf](https://discord.gg/p3PPhYbTf)**
|
**Discord Server: [https://discord.gg/V3PxreDYfE](https://discord.gg/V3PxreDYfE)**
|
||||||
|
|
||||||
**Releases: [GitHub](https://github.com/MajMcCloud/TelegramBotFramework/releases)**
|
**Releases: [GitHub](https://github.com/MajMcCloud/TelegramBotFramework/releases)**
|
||||||
|
|
||||||
|
**Need your own bot? Get in touch https://t.me/botbasebuilder**
|
||||||
|
|
||||||
|
**on X: @florian_zevedei**
|
||||||
|
|
||||||
## Donate
|
## Donate
|
||||||
|
|
||||||
|
Paypal: [https://paypal.me/majmccloud](https://paypal.me/majmccloud)
|
||||||
|
|
||||||
Bitcoin: `1GoUJYMwAvBipQTfw2FKydAz12J8RDyeJs` / `bc1qqwlp0p5ley29lsu6jhe0qv7s7963kfc7d0m53d`
|
Bitcoin: `1GoUJYMwAvBipQTfw2FKydAz12J8RDyeJs` / `bc1qqwlp0p5ley29lsu6jhe0qv7s7963kfc7d0m53d`
|
||||||
|
|
||||||
Etherium: `0xAf3835104c2C3E5b3e721FA2c7365955e87DB931`
|
Etherium: `0xAf3835104c2C3E5b3e721FA2c7365955e87DB931`
|
||||||
@@ -57,6 +63,7 @@ BitTorrent: `TYVZSykaVT1nKZnz9hjDgBRNB9VavU1bpW`
|
|||||||
* [TaggedButtonGrid](#tagged-button-grid)
|
* [TaggedButtonGrid](#tagged-button-grid)
|
||||||
* [CheckedButtonList](#checked-button-list)
|
* [CheckedButtonList](#checked-button-list)
|
||||||
* [MultiToggleButton](#multi-toggle-button)
|
* [MultiToggleButton](#multi-toggle-button)
|
||||||
|
- [Localizations](#localizations)
|
||||||
- [Groups](#groups)
|
- [Groups](#groups)
|
||||||
* [SplitterForm](#splitter-form)
|
* [SplitterForm](#splitter-form)
|
||||||
* [GroupForm](#group-form)
|
* [GroupForm](#group-form)
|
||||||
@@ -99,6 +106,7 @@ var bot = BotBaseBuilder
|
|||||||
})
|
})
|
||||||
.NoSerialization()
|
.NoSerialization()
|
||||||
.UseEnglish()
|
.UseEnglish()
|
||||||
|
.UseSingleThread()
|
||||||
.Build();
|
.Build();
|
||||||
|
|
||||||
// Upload bot commands to BotFather
|
// Upload bot commands to BotFather
|
||||||
@@ -119,8 +127,32 @@ like ChatId and other stuff your carrying.
|
|||||||
From there you build up your bots:
|
From there you build up your bots:
|
||||||
|
|
||||||
```csharp
|
```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
|
// Gets invoked during Navigation to this form
|
||||||
public override async Task PreLoad(MessageResult message)
|
public override async Task PreLoad(MessageResult message)
|
||||||
{
|
{
|
||||||
@@ -217,6 +249,7 @@ var bot = BotBaseBuilder
|
|||||||
})
|
})
|
||||||
.NoSerialization()
|
.NoSerialization()
|
||||||
.UseEnglish()
|
.UseEnglish()
|
||||||
|
.UseSingleThread()
|
||||||
.Build();
|
.Build();
|
||||||
|
|
||||||
bot.BotCommand += async (s, en) =>
|
bot.BotCommand += async (s, en) =>
|
||||||
@@ -257,15 +290,15 @@ public class SimpleForm : AutoCleanForm
|
|||||||
{
|
{
|
||||||
public SimpleForm()
|
public SimpleForm()
|
||||||
{
|
{
|
||||||
this.DeleteSide = TelegramBotBase.Enums.eDeleteSide.Both;
|
DeleteSide = EDeleteSide.Both;
|
||||||
this.DeleteMode = TelegramBotBase.Enums.eDeleteMode.OnLeavingForm;
|
DeleteMode = EDeleteMode.OnLeavingForm;
|
||||||
|
|
||||||
this.Opened += SimpleForm_Opened;
|
Opened += SimpleForm_Opened;
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task SimpleForm_Opened(object sender, EventArgs e)
|
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)
|
public override async Task Load(MessageResult message)
|
||||||
@@ -303,7 +336,13 @@ public class SimpleForm : AutoCleanForm
|
|||||||
```csharp
|
```csharp
|
||||||
public class ButtonTestForm : AutoCleanForm
|
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)");
|
await this.Device.Send("Hello world! (Click 'back' to get back to Start)");
|
||||||
}
|
}
|
||||||
@@ -373,9 +412,10 @@ public class ProgressTest : AutoCleanForm
|
|||||||
public ProgressTest()
|
public ProgressTest()
|
||||||
{
|
{
|
||||||
this.DeleteMode = eDeleteMode.OnLeavingForm;
|
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");
|
await this.Device.Send("Welcome to ProgressTest");
|
||||||
}
|
}
|
||||||
@@ -641,7 +681,7 @@ await this.NavigateTo(cd);
|
|||||||
|
|
||||||
A minimal control which allows to manage a classic "text" message and update its later without having to keep track of the message id.
|
A minimal control which allows to manage a classic "text" message and update its later without having to keep track of the message id.
|
||||||
|
|
||||||
<img src=".github/images/label.gif?raw=true" />
|
<img src=".github/images/label.gif?raw=true" style="width:500px" />
|
||||||
|
|
||||||
Check the example project [TelegramBotBase.Test/Tests/Controls/LabelForm.cs](TelegramBotBase.Test/Tests/Controls/LabelForm.cs)
|
Check the example project [TelegramBotBase.Test/Tests/Controls/LabelForm.cs](TelegramBotBase.Test/Tests/Controls/LabelForm.cs)
|
||||||
|
|
||||||
@@ -712,6 +752,20 @@ Check the example project [TelegramBotBase.Test/Tests/Controls/CheckedButtonList
|
|||||||
|
|
||||||
Check the example project [TelegramBotBase.Test/Tests/Controls/MultiToggleButtonForm.cs](TelegramBotBase.Test/Tests/Controls/MultiToggleButtonForm.cs)
|
Check the example project [TelegramBotBase.Test/Tests/Controls/MultiToggleButtonForm.cs](TelegramBotBase.Test/Tests/Controls/MultiToggleButtonForm.cs)
|
||||||
|
|
||||||
|
|
||||||
|
## Localizations
|
||||||
|
|
||||||
|
The current available languages for controls are:
|
||||||
|
|
||||||
|
- English
|
||||||
|
- German
|
||||||
|
- Persian
|
||||||
|
- Russian
|
||||||
|
|
||||||
|
You can add other languages easily by creating a subclass of the [TelegramBotBase/Localizations/Localization.cs](TelegramBotBase/Localizations/Localization.cs) class.
|
||||||
|
|
||||||
|
To set the default language set the *Language* property on the static [TelegramBotBase/Localizations/Default.cs](TelegramBotBase/Localizations/Default.cs) instance.
|
||||||
|
|
||||||
## Groups
|
## Groups
|
||||||
|
|
||||||
For groups, there are multiple different tools which help to work with and allows bot also to manage
|
For groups, there are multiple different tools which help to work with and allows bot also to manage
|
||||||
@@ -841,6 +895,7 @@ var bot = BotBaseBuilder
|
|||||||
})
|
})
|
||||||
.UseSimpleJSON(AppContext.BaseDirectory + "config\\states.json")
|
.UseSimpleJSON(AppContext.BaseDirectory + "config\\states.json")
|
||||||
.UseEnglish()
|
.UseEnglish()
|
||||||
|
.UseSingleThread()
|
||||||
.Build();
|
.Build();
|
||||||
|
|
||||||
await bot.Start();
|
await bot.Start();
|
||||||
@@ -864,6 +919,7 @@ var bot = BotBaseBuilder
|
|||||||
})
|
})
|
||||||
.UseJSON(AppContext.BaseDirectory + "config\\states.json")
|
.UseJSON(AppContext.BaseDirectory + "config\\states.json")
|
||||||
.UseEnglish()
|
.UseEnglish()
|
||||||
|
.UseSingleThread()
|
||||||
.Build();
|
.Build();
|
||||||
|
|
||||||
await bot.Start();
|
await bot.Start();
|
||||||
@@ -886,6 +942,7 @@ var bot = BotBaseBuilder
|
|||||||
})
|
})
|
||||||
.UseXML(AppContext.BaseDirectory + "config\\states.xml")
|
.UseXML(AppContext.BaseDirectory + "config\\states.xml")
|
||||||
.UseEnglish()
|
.UseEnglish()
|
||||||
|
.UseSingleThread()
|
||||||
.Build();
|
.Build();
|
||||||
|
|
||||||
await bot.Start();
|
await bot.Start();
|
||||||
@@ -899,7 +956,7 @@ datatype and one for implementing into a form which should be invoked with event
|
|||||||
#### IStateMachine
|
#### IStateMachine
|
||||||
|
|
||||||
Is the basic StateMachine interface, it has two methods `SaveFormStates(SaveStatesEventArgs e)`
|
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.
|
serialization process.
|
||||||
|
|
||||||
```csharp
|
```csharp
|
||||||
@@ -1023,6 +1080,8 @@ again at 1 (due to `PopAsync` or `PopToRootAsync` calls) it will replace the con
|
|||||||
you
|
you
|
||||||
have given to the constructor at the beginning.*
|
have given to the constructor at the beginning.*
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## Extensions
|
## Extensions
|
||||||
|
|
||||||
### TelegramBotBase.Extensions.Images
|
### TelegramBotBase.Extensions.Images
|
||||||
@@ -1032,7 +1091,43 @@ Extends the base package with some additional image methods like SendPhoto (usin
|
|||||||
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images/)
|
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images/)
|
||||||
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images)
|
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images)
|
||||||
|
|
||||||
[https://www.nuget.org/packages/TelegramBotBase.Extensions.Images/](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images/)
|
Source code: [TelegramBotBase.Extensions.Images/](/TelegramBotBase.Extensions.Images/)
|
||||||
|
|
||||||
|
Nuget package: [https://www.nuget.org/packages/TelegramBotBase.Extensions.Images/](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images/)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### TelegramBotBase.Extensions.Images.IronSoftware
|
||||||
|
|
||||||
|
Extends the base package with some additional image methods like SendPhoto (using Bitmap)
|
||||||
|
|
||||||
|
Important: This extension uses the IronSoftware drawing library.
|
||||||
|
|
||||||
|
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images.IronSoftware/)
|
||||||
|
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images.IronSoftware)
|
||||||
|
|
||||||
|
[https://www.nuget.org/packages/TelegramBotBase.Extensions.Images.IronSoftware/](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images.IronSoftware/)
|
||||||
|
|
||||||
|
Source code: [TelegramBotBase.Extensions.Images.IronSoftware/](TelegramBotBase.Extensions.Images.IronSoftware/)
|
||||||
|
|
||||||
|
Nuget package: [https://www.nuget.org/packages/TelegramBotBase.Extensions.IronSoftware/](https://www.nuget.org/packages/TelegramBotBase.Extensions.IronSoftware/)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
Project: [open source](TelegramBotBase.Extensions.Images/)
|
||||||
|
|
||||||
|
### TelegramBotBase.Extensions.Images.IronSoftware
|
||||||
|
|
||||||
|
Extends the base package with some additional image methods like SendPhoto (using Bitmap)
|
||||||
|
|
||||||
|
Important: This extension uses the IronSoftware drawing library.
|
||||||
|
|
||||||
|
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images.IronSoftware/)
|
||||||
|
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images.IronSoftware)
|
||||||
|
|
||||||
|
[https://www.nuget.org/packages/TelegramBotBase.Extensions.Images.IronSoftware/](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images.IronSoftware/)
|
||||||
|
|
||||||
|
Project: [open source](TelegramBotBase.Extensions.Images.IronSoftware/)
|
||||||
|
|
||||||
### TelegramBotBase.Extensions.Serializer.Database.MSSQL
|
### TelegramBotBase.Extensions.Serializer.Database.MSSQL
|
||||||
|
|
||||||
@@ -1041,7 +1136,28 @@ A session serializer for Microsoft SQL Server.
|
|||||||
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.MSSQL/)
|
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.MSSQL/)
|
||||||
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.MSSQL)
|
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.MSSQL)
|
||||||
|
|
||||||
[https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.MSSQL/](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.MSSQL/)
|
Source code: [TelegramBotBase.Extensions.Serializer.Database.MSSQL/](/TelegramBotBase.Extensions.Serializer.Database.MSSQL/)
|
||||||
|
|
||||||
|
Nuget package: [https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.MSSQL/](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.MSSQL/)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### TelegramBotBase.Extensions.Serializer.Database.PostgreSql
|
||||||
|
|
||||||
|
A session serializer for PostgreSql Server.
|
||||||
|
|
||||||
|
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.PostgreSql/)
|
||||||
|
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.PostgreSql)
|
||||||
|
|
||||||
|
Source code: [TelegramBotBase.Extensions.Serializer.Database.PostgreSql/](/TelegramBotBase.Extensions.Serializer.Database.PostgreSql/)
|
||||||
|
|
||||||
|
Nuget package: [https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.PostgreSql/](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.PostgreSql/)
|
||||||
|
|
||||||
|
Credits: [@Kataane](https://github.com/Kataane)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
Project: [open source](TelegramBotBase.Extensions.Serializer.Database.MSSQL/)
|
||||||
|
|
||||||
## Test Project
|
## Test Project
|
||||||
|
|
||||||
@@ -1081,3 +1197,8 @@ Having already a web application and want to add a TelegramBot side-by-side with
|
|||||||
Want to use Inline- and ReplyMarkup at the same time ? Here is an example how you can do that:
|
Want to use Inline- and ReplyMarkup at the same time ? Here is an example how you can do that:
|
||||||
|
|
||||||
- [Examples/InlineAndReplyCombination](Examples/InlineAndReplyCombination)
|
- [Examples/InlineAndReplyCombination](Examples/InlineAndReplyCombination)
|
||||||
|
|
||||||
|
|
||||||
|
Alpha: Full Dependency Injection example within this framework.
|
||||||
|
|
||||||
|
- [Examples/DependencyInjection](Examples/DependencyInjection)
|
||||||
|
|||||||
@@ -0,0 +1,73 @@
|
|||||||
|
using IronSoftware.Drawing;
|
||||||
|
using SixLabors.ImageSharp;
|
||||||
|
using System.IO;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using Telegram.Bot.Types;
|
||||||
|
using TelegramBotBase.Form;
|
||||||
|
using TelegramBotBase.Sessions;
|
||||||
|
using static IronSoftware.Drawing.AnyBitmap;
|
||||||
|
using SKImage = SixLabors.ImageSharp.Image;
|
||||||
|
|
||||||
|
namespace TelegramBotBase.Extensions.Images.IronSoftware
|
||||||
|
{
|
||||||
|
public static class ImageExtensions
|
||||||
|
{
|
||||||
|
public static Stream ToStream(this AnyBitmap image, ImageFormat format)
|
||||||
|
{
|
||||||
|
var stream = new MemoryStream();
|
||||||
|
image.ExportStream(stream, format);
|
||||||
|
stream.Position = 0;
|
||||||
|
return stream;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static async Task<Stream> ToStream(this SKImage image)
|
||||||
|
{
|
||||||
|
var stream = new MemoryStream();
|
||||||
|
await image.SaveAsPngAsync(stream);
|
||||||
|
stream.Position = 0;
|
||||||
|
return stream;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sends an image
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="image"></param>
|
||||||
|
/// <param name="name"></param>
|
||||||
|
/// <param name="buttons"></param>
|
||||||
|
/// <param name="replyTo"></param>
|
||||||
|
/// <param name="disableNotification"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static async Task<Message> SendPhoto(this DeviceSession session, AnyBitmap image, string name,
|
||||||
|
string caption, ButtonForm buttons = null, int replyTo = 0,
|
||||||
|
bool disableNotification = false)
|
||||||
|
{
|
||||||
|
using (var fileStream = ToStream(image, ImageFormat.Png))
|
||||||
|
{
|
||||||
|
var fts = InputFile.FromStream(fileStream, name);
|
||||||
|
|
||||||
|
return await session.SendPhoto(fts, caption, buttons, replyTo, disableNotification);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sends an image
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="image"></param>
|
||||||
|
/// <param name="name"></param>
|
||||||
|
/// <param name="buttons"></param>
|
||||||
|
/// <param name="replyTo"></param>
|
||||||
|
/// <param name="disableNotification"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static async Task<Message> SendPhoto(this DeviceSession session, SKImage image, string name,
|
||||||
|
string caption, ButtonForm buttons = null, int replyTo = 0,
|
||||||
|
bool disableNotification = false)
|
||||||
|
{
|
||||||
|
using (var fileStream = await ToStream(image))
|
||||||
|
{
|
||||||
|
var fts = InputFile.FromStream(fileStream, name);
|
||||||
|
|
||||||
|
return await session.SendPhoto(fts, caption, buttons, replyTo, disableNotification);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
# TelegramBotBase.Extensions.Images.IronSoftware
|
||||||
|
|
||||||
|
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images.IronSoftware/)
|
||||||
|
[](https://www.t.me/tgbotbase)
|
||||||
|
|
||||||
|
[](https://raw.githubusercontent.com/MajMcCloud/TelegramBotFramework/master/LICENCE.md)
|
||||||
|
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Images.IronSoftware)
|
||||||
|
|
||||||
|
|
||||||
|
This extension uses the [IronSoftware](https://ironsoftware.com/open-source/csharp/drawing/docs/) drawing library.
|
||||||
|
|
||||||
|
Check [https://ironsoftware.com/open-source/csharp/drawing/docs/](https://ironsoftware.com/open-source/csharp/drawing/docs/) for more details on this library.
|
||||||
+29
@@ -0,0 +1,29 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net6</TargetFrameworks>
|
||||||
|
<RepositoryUrl>https://github.com/MajMcCloud/TelegramBotFramework/tree/development/TelegramBotBase.Extensions.Images.IronSoftware</RepositoryUrl>
|
||||||
|
<PackageProjectUrl>https://github.com/MajMcCloud/TelegramBotFramework/tree/development/TelegramBotBase.Extensions.Images.IronSoftware</PackageProjectUrl>
|
||||||
|
<Copyright>MIT</Copyright>
|
||||||
|
<IncludeSymbols>true</IncludeSymbols>
|
||||||
|
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||||
|
<AssemblyVersion>1.0.1</AssemblyVersion>
|
||||||
|
<FileVersion>1.0.1</FileVersion>
|
||||||
|
<Description>This is an extension for sending Bitmap/Images platform independent by using IronSoftware's drawing library via TelegramBotBase.</Description>
|
||||||
|
<Version>1.0.1</Version>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<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>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="TelegramBotBase" Version="6.0.0" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<Folder Include="Properties\" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
@@ -2,11 +2,17 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net6</TargetFrameworks>
|
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net6</TargetFrameworks>
|
||||||
<RepositoryUrl>https://github.com/MajMcCloud/TelegramBotFramework</RepositoryUrl>
|
<RepositoryUrl>https://github.com/MajMcCloud/TelegramBotFramework/tree/development/TelegramBotBase.Extensions.Images</RepositoryUrl>
|
||||||
<PackageProjectUrl>https://github.com/MajMcCloud/TelegramBotFramework</PackageProjectUrl>
|
<PackageProjectUrl>https://github.com/MajMcCloud/TelegramBotFramework/tree/development/TelegramBotBase.Extensions.Images</PackageProjectUrl>
|
||||||
<Copyright>MIT</Copyright>
|
<Copyright>MIT</Copyright>
|
||||||
<IncludeSymbols>true</IncludeSymbols>
|
<IncludeSymbols>true</IncludeSymbols>
|
||||||
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||||
|
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
|
||||||
|
<Authors>$(AssemblyName)</Authors>
|
||||||
|
<Description>This is an extension for sending Bitmap/Images via TelegramBotBase.</Description>
|
||||||
|
<FileVersion>1.1.1</FileVersion>
|
||||||
|
<AssemblyVersion>1.1.1</AssemblyVersion>
|
||||||
|
<Version>1.1.1</Version>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@@ -15,10 +21,7 @@
|
|||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
|
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
|
||||||
</ItemGroup>
|
<PackageReference Include="TelegramBotBase" Version="6.0.0" />
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="..\TelegramBotBase\TelegramBotBase.csproj" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ namespace TelegramBotBase.Extensions.Serializer.Database.MSSQL
|
|||||||
|
|
||||||
if (FallbackStateForm != null && !FallbackStateForm.IsSubclassOf(typeof(FormBase)))
|
if (FallbackStateForm != null && !FallbackStateForm.IsSubclassOf(typeof(FormBase)))
|
||||||
{
|
{
|
||||||
throw new ArgumentException("FallbackStateForm is not a subclass of FormBase");
|
throw new ArgumentException($"{nameof(FallbackStateForm)} is not a subclass of {nameof(FormBase)}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
-5
@@ -16,15 +16,12 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.0.0"/>
|
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
|
||||||
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
|
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
</ItemGroup>
|
<PackageReference Include="TelegramBotBase" Version="6.0.0" />
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="..\TelegramBotBase\TelegramBotBase.csproj"/>
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -0,0 +1,92 @@
|
|||||||
|
using System;
|
||||||
|
using TelegramBotBase.Builder;
|
||||||
|
using TelegramBotBase.Builder.Interfaces;
|
||||||
|
|
||||||
|
namespace TelegramBotBase.Extensions.Serializer.Database.PostgreSql
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Provides extension methods for configuring the use of PostgreSQL Server Database for session serialization.
|
||||||
|
/// </summary>
|
||||||
|
public static class BotBaseBuilderExtensions
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Uses an PostgreSQL Server Database to save and restore sessions.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="builder">The session serialization stage builder.</param>
|
||||||
|
/// <param name="connectionString">The connection string to the PostgreSQL database.</param>
|
||||||
|
/// <param name="fallbackForm">The fallback form type.</param>
|
||||||
|
/// <param name="tablePrefix">The prefix for database table names (default is "tgb_").</param>
|
||||||
|
/// <returns>The language selection stage builder.</returns>
|
||||||
|
public static ILanguageSelectionStage UsePostgreSqlDatabase(
|
||||||
|
this ISessionSerializationStage builder,
|
||||||
|
string connectionString, Type fallbackForm = null,
|
||||||
|
string tablePrefix = "tgb_")
|
||||||
|
{
|
||||||
|
var serializer = new PostgreSqlSerializer(connectionString, tablePrefix, fallbackForm);
|
||||||
|
|
||||||
|
builder.UseSerialization(serializer);
|
||||||
|
|
||||||
|
return builder as BotBaseBuilder;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Uses an PostgreSQL Server Database to save and restore sessions.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="builder">The session serialization stage builder.</param>
|
||||||
|
/// <param name="hostOrIp">The host or IP address of the PostgreSQL server.</param>
|
||||||
|
/// <param name="port">The port number for the PostgreSQL server.</param>
|
||||||
|
/// <param name="databaseName">The name of the PostgreSQL database.</param>
|
||||||
|
/// <param name="userId">The user ID for connecting to the PostgreSQL server.</param>
|
||||||
|
/// <param name="password">The password for connecting to the PostgreSQL server.</param>
|
||||||
|
/// <param name="fallbackForm">The fallback form type.</param>
|
||||||
|
/// <param name="tablePrefix">The prefix for database table names (default is "tgb_").</param>
|
||||||
|
/// <returns>The language selection stage builder.</returns>
|
||||||
|
public static ILanguageSelectionStage UsePostgreSqlDatabase(
|
||||||
|
this ISessionSerializationStage builder,
|
||||||
|
string hostOrIp, int port,
|
||||||
|
string databaseName, string userId,
|
||||||
|
string password, Type fallbackForm = null,
|
||||||
|
string tablePrefix = "tgb_")
|
||||||
|
{
|
||||||
|
var connectionString = $"Host={hostOrIp};Port={port};Database={databaseName};Username={userId};Password={password}";
|
||||||
|
|
||||||
|
var serializer = new PostgreSqlSerializer(connectionString, tablePrefix, fallbackForm);
|
||||||
|
|
||||||
|
builder.UseSerialization(serializer);
|
||||||
|
|
||||||
|
return builder as BotBaseBuilder;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Uses an PostgreSQL Server Database with Windows Authentication to save and restore sessions.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="builder">The session serialization stage builder.</param>
|
||||||
|
/// <param name="hostOrIp">The host or IP address of the PostgreSQL server.</param>
|
||||||
|
/// <param name="port">The port number for the PostgreSQL server.</param>
|
||||||
|
/// <param name="databaseName">The name of the PostgreSQL database.</param>
|
||||||
|
/// <param name="integratedSecurity">A flag indicating whether to use Windows Authentication (true) or not (false).</param>
|
||||||
|
/// <param name="fallbackForm">The fallback form type.</param>
|
||||||
|
/// <param name="tablePrefix">The prefix for database table names (default is "tgb_").</param>
|
||||||
|
/// <returns>The language selection stage builder.</returns>
|
||||||
|
public static ILanguageSelectionStage UsePostgreSqlDatabase(
|
||||||
|
this ISessionSerializationStage builder,
|
||||||
|
string hostOrIp, int port,
|
||||||
|
string databaseName, bool integratedSecurity = true,
|
||||||
|
Type fallbackForm = null, string tablePrefix = "tgb_")
|
||||||
|
{
|
||||||
|
if (!integratedSecurity)
|
||||||
|
{
|
||||||
|
throw new ArgumentOutOfRangeException();
|
||||||
|
}
|
||||||
|
|
||||||
|
var connectionString = $"Host={hostOrIp};Port={port};Database={databaseName};Integrated Security=true;";
|
||||||
|
|
||||||
|
var serializer = new PostgreSqlSerializer(connectionString, tablePrefix, fallbackForm);
|
||||||
|
|
||||||
|
builder.UseSerialization(serializer);
|
||||||
|
|
||||||
|
return builder as BotBaseBuilder;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,252 @@
|
|||||||
|
using Npgsql;
|
||||||
|
using System;
|
||||||
|
using System.Data;
|
||||||
|
using NpgsqlTypes;
|
||||||
|
using TelegramBotBase.Args;
|
||||||
|
using TelegramBotBase.Base;
|
||||||
|
using TelegramBotBase.Form;
|
||||||
|
using TelegramBotBase.Interfaces;
|
||||||
|
|
||||||
|
namespace TelegramBotBase.Extensions.Serializer.Database.PostgreSql
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Represents a PostgreSQL implementation of the <see cref="IStateMachine"/> for saving and loading form states.
|
||||||
|
/// </summary>
|
||||||
|
public class PostgreSqlSerializer : IStateMachine
|
||||||
|
{
|
||||||
|
private readonly string insertIntoSessionSql;
|
||||||
|
private readonly string insertIntoSessionsDataSql;
|
||||||
|
private readonly string selectAllDevicesSessionsSql;
|
||||||
|
private readonly string selectAllDevicesSessionsDataSql;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="PostgreSqlSerializer"/> class.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="connectionString">The connection string to the PostgreSQL database.</param>
|
||||||
|
/// <param name="tablePrefix">The prefix for database table names (default is "tgb_").</param>
|
||||||
|
/// <param name="fallbackStateForm">The fallback state form type.</param>
|
||||||
|
/// <exception cref="ArgumentNullException">Thrown when <paramref name="connectionString"/> is null.</exception>
|
||||||
|
/// <exception cref="ArgumentException">Thrown when <paramref name="fallbackStateForm"/> is not a subclass of <see cref="FormBase"/>.</exception>
|
||||||
|
public PostgreSqlSerializer(string connectionString, string tablePrefix = "tgb_", Type fallbackStateForm = null)
|
||||||
|
{
|
||||||
|
ConnectionString = connectionString ?? throw new ArgumentNullException(nameof(connectionString));
|
||||||
|
|
||||||
|
TablePrefix = tablePrefix;
|
||||||
|
|
||||||
|
FallbackStateForm = fallbackStateForm;
|
||||||
|
|
||||||
|
if (FallbackStateForm != null && !FallbackStateForm.IsSubclassOf(typeof(FormBase)))
|
||||||
|
{
|
||||||
|
throw new ArgumentException($"{nameof(FallbackStateForm)} is not a subclass of {nameof(FormBase)}");
|
||||||
|
}
|
||||||
|
|
||||||
|
insertIntoSessionSql = "INSERT INTO " + TablePrefix +
|
||||||
|
"devices_sessions (deviceId, deviceTitle, \"FormUri\", \"QualifiedName\") VALUES (@deviceId, @deviceTitle, @FormUri, @QualifiedName)";
|
||||||
|
insertIntoSessionsDataSql = "INSERT INTO " + TablePrefix + "devices_sessions_data (deviceId, key, value, type) VALUES (@deviceId, @key, @value, @type)";
|
||||||
|
|
||||||
|
selectAllDevicesSessionsSql = "SELECT * FROM " + TablePrefix + "devices_sessions";
|
||||||
|
selectAllDevicesSessionsDataSql = "SELECT * FROM " + TablePrefix + "devices_sessions_data WHERE deviceId = @deviceId";
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the connection string to the PostgreSQL database.
|
||||||
|
/// </summary>
|
||||||
|
public string ConnectionString { get; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the table name prefix for database tables.
|
||||||
|
/// </summary>
|
||||||
|
public string TablePrefix { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the fallback state form type.
|
||||||
|
/// </summary>
|
||||||
|
public Type FallbackStateForm { get; set; }
|
||||||
|
|
||||||
|
/// <inheritdoc/>
|
||||||
|
/// <summary>
|
||||||
|
/// Saves form states to the PostgreSQL database.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="e">The <see cref="SaveStatesEventArgs"/> containing the states to be saved.</param>
|
||||||
|
public void SaveFormStates(SaveStatesEventArgs e)
|
||||||
|
{
|
||||||
|
var container = e.States;
|
||||||
|
|
||||||
|
//Cleanup old Session data
|
||||||
|
Cleanup();
|
||||||
|
|
||||||
|
using (var connection = new NpgsqlConnection(ConnectionString))
|
||||||
|
{
|
||||||
|
connection.Open();
|
||||||
|
|
||||||
|
//Store session data in database
|
||||||
|
foreach (var state in container.States)
|
||||||
|
{
|
||||||
|
using (var sessionCommand = connection.CreateCommand())
|
||||||
|
{
|
||||||
|
sessionCommand.CommandText = insertIntoSessionSql;
|
||||||
|
|
||||||
|
sessionCommand.Parameters.Add(new NpgsqlParameter("@deviceId", NpgsqlDbType.Bigint){Value = state.DeviceId });
|
||||||
|
sessionCommand.Parameters.Add(new NpgsqlParameter("@deviceTitle", DbType.StringFixedLength){Value = state.ChatTitle ?? string.Empty});
|
||||||
|
sessionCommand.Parameters.Add(new NpgsqlParameter("@FormUri", DbType.StringFixedLength) {Value = state.FormUri});
|
||||||
|
sessionCommand.Parameters.Add(new NpgsqlParameter("@QualifiedName", DbType.StringFixedLength){Value = state.QualifiedName });
|
||||||
|
|
||||||
|
sessionCommand.ExecuteNonQuery();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
using (var connection = new NpgsqlConnection(ConnectionString))
|
||||||
|
{
|
||||||
|
connection.Open();
|
||||||
|
|
||||||
|
foreach (var state in container.States)
|
||||||
|
{
|
||||||
|
SaveSessionsData(state, connection);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc/>
|
||||||
|
/// <summary>
|
||||||
|
/// Loads form states from the PostgreSQL database.
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>A <see cref="StateContainer"/> containing the loaded form states.</returns>
|
||||||
|
public StateContainer LoadFormStates()
|
||||||
|
{
|
||||||
|
var stateContainer = new StateContainer();
|
||||||
|
|
||||||
|
using (var connection = new NpgsqlConnection(ConnectionString))
|
||||||
|
{
|
||||||
|
connection.Open();
|
||||||
|
|
||||||
|
using (var sessionCommand = connection.CreateCommand())
|
||||||
|
{
|
||||||
|
sessionCommand.CommandText = selectAllDevicesSessionsSql;
|
||||||
|
|
||||||
|
var sessionTable = new DataTable();
|
||||||
|
using (var dataAdapter = new NpgsqlDataAdapter(sessionCommand))
|
||||||
|
{
|
||||||
|
dataAdapter.Fill(sessionTable);
|
||||||
|
|
||||||
|
foreach (DataRow row in sessionTable.Rows)
|
||||||
|
{
|
||||||
|
var stateEntry = new StateEntry
|
||||||
|
{
|
||||||
|
DeviceId = (long)row["deviceId"],
|
||||||
|
ChatTitle = row["deviceTitle"].ToString(),
|
||||||
|
FormUri = row["FormUri"].ToString(),
|
||||||
|
QualifiedName = row["QualifiedName"].ToString()
|
||||||
|
};
|
||||||
|
|
||||||
|
stateContainer.States.Add(stateEntry);
|
||||||
|
|
||||||
|
if (stateEntry.DeviceId > 0)
|
||||||
|
{
|
||||||
|
stateContainer.ChatIds.Add(stateEntry.DeviceId);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
stateContainer.GroupIds.Add(stateEntry.DeviceId);
|
||||||
|
}
|
||||||
|
|
||||||
|
LoadDataTable(connection, row, stateEntry);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return stateContainer;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Cleans up old session data in the PostgreSQL database.
|
||||||
|
/// </summary>
|
||||||
|
private void Cleanup()
|
||||||
|
{
|
||||||
|
using (var connection = new NpgsqlConnection(ConnectionString))
|
||||||
|
{
|
||||||
|
connection.Open();
|
||||||
|
|
||||||
|
using (var clearCommand = connection.CreateCommand())
|
||||||
|
{
|
||||||
|
clearCommand.CommandText = $"DELETE FROM {TablePrefix}devices_sessions_data";
|
||||||
|
clearCommand.ExecuteNonQuery();
|
||||||
|
}
|
||||||
|
|
||||||
|
using (var clearCommand = connection.CreateCommand())
|
||||||
|
{
|
||||||
|
clearCommand.CommandText = $"DELETE FROM {TablePrefix}devices_sessions";
|
||||||
|
clearCommand.ExecuteNonQuery();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Saves session data to the PostgreSQL database.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="state">The state entry containing session data to be saved.</param>
|
||||||
|
/// <param name="connection">The NpgsqlConnection used for the database interaction.</param>
|
||||||
|
private void SaveSessionsData(StateEntry state, NpgsqlConnection connection)
|
||||||
|
{
|
||||||
|
foreach (var data in state.Values)
|
||||||
|
{
|
||||||
|
using (var dataCommand = connection.CreateCommand())
|
||||||
|
{
|
||||||
|
dataCommand.CommandText = insertIntoSessionsDataSql;
|
||||||
|
|
||||||
|
dataCommand.Parameters.Add(new NpgsqlParameter("@deviceId", NpgsqlDbType.Bigint) { Value = state.DeviceId });
|
||||||
|
dataCommand.Parameters.Add(new NpgsqlParameter("@key", DbType.StringFixedLength) { Value = data.Key });
|
||||||
|
|
||||||
|
var type = data.Value.GetType();
|
||||||
|
|
||||||
|
if (type.IsPrimitive || type == typeof(string))
|
||||||
|
{
|
||||||
|
dataCommand.Parameters.Add(new NpgsqlParameter("@value", NpgsqlDbType.Text) { Value = data.Value });
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var json = System.Text.Json.JsonSerializer.Serialize(data.Value);
|
||||||
|
dataCommand.Parameters.Add(new NpgsqlParameter("@value", NpgsqlDbType.Text) { Value = json });
|
||||||
|
}
|
||||||
|
|
||||||
|
dataCommand.Parameters.Add(new NpgsqlParameter("@type", DbType.StringFixedLength) { Value = type.AssemblyQualifiedName });
|
||||||
|
|
||||||
|
dataCommand.ExecuteNonQuery();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Loads session data from the PostgreSQL database.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="connection">The NpgsqlConnection used for the database interaction.</param>
|
||||||
|
/// <param name="row">The DataRow representing a session entry in the main sessions table.</param>
|
||||||
|
/// <param name="stateEntry">The StateEntry object to which session data will be loaded.</param>
|
||||||
|
private void LoadDataTable(NpgsqlConnection connection, DataRow row, StateEntry stateEntry)
|
||||||
|
{
|
||||||
|
using (var sessionCommand = connection.CreateCommand())
|
||||||
|
{
|
||||||
|
sessionCommand.CommandText = selectAllDevicesSessionsDataSql;
|
||||||
|
sessionCommand.Parameters.Add(new NpgsqlParameter("@deviceId", row["deviceId"]));
|
||||||
|
|
||||||
|
var dataCommandTable = new DataTable();
|
||||||
|
using (var npgSqlDataAdapter = new NpgsqlDataAdapter(sessionCommand))
|
||||||
|
{
|
||||||
|
npgSqlDataAdapter.Fill(dataCommandTable);
|
||||||
|
|
||||||
|
foreach (DataRow dataRow in dataCommandTable.Rows)
|
||||||
|
{
|
||||||
|
var key = dataRow["key"].ToString();
|
||||||
|
var type = Type.GetType(dataRow["type"].ToString());
|
||||||
|
|
||||||
|
var value = System.Text.Json.JsonSerializer.Deserialize(dataRow["value"].ToString(), type);
|
||||||
|
|
||||||
|
stateEntry.Values.Add(key, value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
# TelegramBotBase.Extensions.Serializer.Database.PostgreSQL
|
||||||
|
|
||||||
|
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.PostgreSQL/)
|
||||||
|
[](https://www.t.me/tgbotbase)
|
||||||
|
|
||||||
|
[](https://raw.githubusercontent.com/MajMcCloud/TelegramBotFramework/master/LICENCE.md)
|
||||||
|
[](https://www.nuget.org/packages/TelegramBotBase.Extensions.Serializer.Database.PostgreSQL)
|
||||||
|
|
||||||
|
## How to use
|
||||||
|
|
||||||
|
```csharp
|
||||||
|
using TelegramBotBase.Extensions.Serializer.Database.PostgreSQL;
|
||||||
|
|
||||||
|
|
||||||
|
var bot = BotBaseBuilder
|
||||||
|
.Create()
|
||||||
|
.WithAPIKey(APIKey)
|
||||||
|
.DefaultMessageLoop()
|
||||||
|
.WithStartForm<Start>()
|
||||||
|
.NoProxy()
|
||||||
|
.OnlyStart()
|
||||||
|
.UsePostgreSqlDatabase("localhost", "8181", "telegram_bot")
|
||||||
|
.UseEnglish()
|
||||||
|
.Build();
|
||||||
|
|
||||||
|
bot.Start();
|
||||||
|
```
|
||||||
+28
@@ -0,0 +1,28 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net6</TargetFrameworks>
|
||||||
|
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
|
||||||
|
<RepositoryUrl>https://github.com/MajMcCloud/TelegramBotFramework</RepositoryUrl>
|
||||||
|
<PackageProjectUrl>https://github.com/MajMcCloud/TelegramBotFramework</PackageProjectUrl>
|
||||||
|
<Copyright>MIT</Copyright>
|
||||||
|
<IncludeSymbols>true</IncludeSymbols>
|
||||||
|
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||||
|
<AssemblyVersion>1.0.1</AssemblyVersion>
|
||||||
|
<FileVersion>1.0.1</FileVersion>
|
||||||
|
<Version>1.0.1</Version>
|
||||||
|
<Description>
|
||||||
|
A session serializer for PostgreSQL Server.
|
||||||
|
</Description>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
|
||||||
|
<PrivateAssets>all</PrivateAssets>
|
||||||
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="TelegramBotBase" Version="6.0.0" />
|
||||||
|
<PackageReference Include="Npgsql" Version="8.0.3" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
-- Enable uuid-ossp extension
|
||||||
|
CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
|
||||||
|
|
||||||
|
-- Create table tgb_devices_sessions
|
||||||
|
CREATE TABLE tgb_devices_sessions (
|
||||||
|
deviceId bigint NOT NULL,
|
||||||
|
deviceTitle character varying(512) NOT NULL,
|
||||||
|
"FormUri" character varying(512) NOT NULL,
|
||||||
|
"QualifiedName" character varying(512) NOT NULL,
|
||||||
|
CONSTRAINT PK_tgb_devices_sessions_1 PRIMARY KEY (deviceId)
|
||||||
|
);
|
||||||
|
|
||||||
|
-- Create table tgb_devices_sessions_data
|
||||||
|
CREATE TABLE tgb_devices_sessions_data (
|
||||||
|
Id uuid DEFAULT uuid_generate_v4() NOT NULL,
|
||||||
|
deviceId bigint NOT NULL,
|
||||||
|
key character varying(512) NOT NULL,
|
||||||
|
"value" text NOT NULL,
|
||||||
|
"type" character varying(512) NOT NULL,
|
||||||
|
CONSTRAINT PK_tgb_devices_session_data PRIMARY KEY (Id)
|
||||||
|
);
|
||||||
|
|
||||||
|
-- Add default constraint for Id column in tgb_devices_sessions_data
|
||||||
|
ALTER TABLE tgb_devices_sessions_data
|
||||||
|
ALTER COLUMN Id SET DEFAULT uuid_generate_v4();
|
||||||
@@ -32,6 +32,7 @@ internal class Program
|
|||||||
})
|
})
|
||||||
.NoSerialization()
|
.NoSerialization()
|
||||||
.UseEnglish()
|
.UseEnglish()
|
||||||
|
.UseThreadPool()
|
||||||
.Build();
|
.Build();
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,10 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\TelegramBotBase.Extensions.Images\TelegramBotBase.Extensions.Images.csproj" />
|
<PackageReference Include="TelegramBotBase.Extensions.Images" Version="1.1.2" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\TelegramBotBase\TelegramBotBase.csproj" />
|
<ProjectReference Include="..\TelegramBotBase\TelegramBotBase.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ namespace TelegramBotBase.Example.Tests.Controls;
|
|||||||
public class LabelForm : AutoCleanForm
|
public class LabelForm : AutoCleanForm
|
||||||
{
|
{
|
||||||
|
|
||||||
TelegramBotBase.Controls.Inline.LabelControl _label;
|
TelegramBotBase.Controls.Inline.Label _label;
|
||||||
|
|
||||||
ButtonGrid _buttonGrid;
|
ButtonGrid _buttonGrid;
|
||||||
|
|
||||||
@@ -27,7 +27,7 @@ public class LabelForm : AutoCleanForm
|
|||||||
private Task LabelForm_Init(object sender, InitEventArgs e)
|
private Task LabelForm_Init(object sender, InitEventArgs e)
|
||||||
{
|
{
|
||||||
//The "label" control
|
//The "label" control
|
||||||
_label = new LabelControl("My test label");
|
_label = new Label("My test label");
|
||||||
|
|
||||||
AddControl(_label);
|
AddControl(_label);
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
using System;
|
||||||
|
|
||||||
|
namespace TelegramBotBase.Base
|
||||||
|
{
|
||||||
|
public class ErrorResult : EventArgs
|
||||||
|
{
|
||||||
|
public ErrorResult(Exception exception)
|
||||||
|
{
|
||||||
|
Exception = exception;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Exception Exception { get; }
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -32,6 +32,8 @@ public class FormBase : IDisposable
|
|||||||
|
|
||||||
public MessageClient Client { get; set; }
|
public MessageClient Client { get; set; }
|
||||||
|
|
||||||
|
IServiceProvider _serviceProvider = null;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// has this formular already been disposed ?
|
/// has this formular already been disposed ?
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ using System.Collections.Generic;
|
|||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
using System.Net.Http;
|
using System.Net.Http;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Telegram.Bot;
|
using Telegram.Bot;
|
||||||
@@ -10,6 +11,7 @@ using Telegram.Bot.Exceptions;
|
|||||||
using Telegram.Bot.Polling;
|
using Telegram.Bot.Polling;
|
||||||
using Telegram.Bot.Types;
|
using Telegram.Bot.Types;
|
||||||
|
|
||||||
|
|
||||||
namespace TelegramBotBase.Base;
|
namespace TelegramBotBase.Base;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -17,31 +19,38 @@ namespace TelegramBotBase.Base;
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public class MessageClient
|
public class MessageClient
|
||||||
{
|
{
|
||||||
|
private EventHandlerList Events { get; } = new();
|
||||||
|
|
||||||
private static readonly object EvOnMessageLoop = new();
|
private static readonly object EvOnMessageLoop = new();
|
||||||
|
private static readonly object EvOnReceiveError = new();
|
||||||
|
|
||||||
private static object __evOnMessage = new();
|
protected CancellationTokenSource _cancellationTokenSource;
|
||||||
|
|
||||||
private static object __evOnMessageEdit = new();
|
public string ApiKey { get; }
|
||||||
|
|
||||||
private static object __evCallbackQuery = new();
|
public ITelegramBotClient TelegramClient { get; set; }
|
||||||
|
|
||||||
private CancellationTokenSource _cancellationTokenSource;
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Indicates if all pending Telegram.Bot.Types.Updates should be thrown out before
|
||||||
|
// start polling. If set to true Telegram.Bot.Polling.ReceiverOptions.AllowedUpdates
|
||||||
|
// should be set to not null, otherwise Telegram.Bot.Polling.ReceiverOptions.AllowedUpdates
|
||||||
|
// will effectively be set to receive all Telegram.Bot.Types.Updates.
|
||||||
|
/// </summary>
|
||||||
|
public bool ThrowPendingUpdates { get; set; }
|
||||||
|
|
||||||
|
|
||||||
public MessageClient(string apiKey)
|
public MessageClient(string apiKey)
|
||||||
{
|
{
|
||||||
ApiKey = apiKey;
|
ApiKey = apiKey;
|
||||||
TelegramClient = new TelegramBotClient(apiKey);
|
TelegramClient = new TelegramBotClient(apiKey);
|
||||||
|
|
||||||
Prepare();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public MessageClient(string apiKey, HttpClient proxy)
|
public MessageClient(string apiKey, HttpClient proxy)
|
||||||
{
|
{
|
||||||
ApiKey = apiKey;
|
ApiKey = apiKey;
|
||||||
TelegramClient = new TelegramBotClient(apiKey, proxy);
|
TelegramClient = new TelegramBotClient(apiKey, proxy);
|
||||||
|
|
||||||
Prepare();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -59,8 +68,6 @@ public class MessageClient
|
|||||||
);
|
);
|
||||||
|
|
||||||
TelegramClient = new TelegramBotClient(apiKey, httpClient);
|
TelegramClient = new TelegramBotClient(apiKey, httpClient);
|
||||||
|
|
||||||
Prepare();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -80,8 +87,6 @@ public class MessageClient
|
|||||||
);
|
);
|
||||||
|
|
||||||
TelegramClient = new TelegramBotClient(apiKey, httpClient);
|
TelegramClient = new TelegramBotClient(apiKey, httpClient);
|
||||||
|
|
||||||
Prepare();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -89,61 +94,41 @@ public class MessageClient
|
|||||||
{
|
{
|
||||||
ApiKey = apiKey;
|
ApiKey = apiKey;
|
||||||
TelegramClient = client;
|
TelegramClient = client;
|
||||||
|
|
||||||
Prepare();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public string ApiKey { get; }
|
public virtual void StartReceiving()
|
||||||
|
|
||||||
public ITelegramBotClient TelegramClient { get; set; }
|
|
||||||
|
|
||||||
private EventHandlerList Events { get; } = new();
|
|
||||||
|
|
||||||
|
|
||||||
public void Prepare()
|
|
||||||
{
|
|
||||||
TelegramClient.Timeout = new TimeSpan(0, 0, 30);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public void StartReceiving()
|
|
||||||
{
|
{
|
||||||
_cancellationTokenSource = new CancellationTokenSource();
|
_cancellationTokenSource = new CancellationTokenSource();
|
||||||
|
|
||||||
var receiverOptions = new ReceiverOptions();
|
var receiverOptions = new ReceiverOptions();
|
||||||
|
|
||||||
TelegramClient.StartReceiving(HandleUpdateAsync, HandleErrorAsync, receiverOptions,
|
receiverOptions.ThrowPendingUpdates = ThrowPendingUpdates;
|
||||||
_cancellationTokenSource.Token);
|
|
||||||
|
TelegramClient.StartReceiving(HandleUpdateAsync, HandleErrorAsync, receiverOptions, _cancellationTokenSource.Token);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void StopReceiving()
|
|
||||||
|
public virtual void StopReceiving()
|
||||||
{
|
{
|
||||||
_cancellationTokenSource.Cancel();
|
_cancellationTokenSource.Cancel();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public async Task HandleUpdateAsync(ITelegramBotClient botClient, Update update, CancellationToken cancellationToken)
|
private async Task HandleUpdateAsync(ITelegramBotClient botClient, Update update, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
await OnMessageLoop(new UpdateResult(update, null));
|
await OnMessageLoop(new UpdateResult(update, null));
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task HandleErrorAsync(ITelegramBotClient botClient, Exception exception,
|
|
||||||
|
private async Task HandleErrorAsync(ITelegramBotClient botClient, Exception exception,
|
||||||
CancellationToken cancellationToken)
|
CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
if (exception is ApiRequestException exApi)
|
await OnReceiveError(new ErrorResult(exception));
|
||||||
{
|
|
||||||
Console.WriteLine($"Telegram API Error:\n[{exApi.ErrorCode}]\n{exApi.Message}");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Console.WriteLine(exception.ToString());
|
|
||||||
}
|
|
||||||
|
|
||||||
return Task.CompletedTask;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#region "BotCommands"
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// This will return the current list of bot commands.
|
/// This will return the current list of bot commands.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -175,6 +160,8 @@ public class MessageClient
|
|||||||
await TelegramClient.DeleteMyCommandsAsync(scope, languageCode);
|
await TelegramClient.DeleteMyCommandsAsync(scope, languageCode);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
|
||||||
#region "Events"
|
#region "Events"
|
||||||
|
|
||||||
@@ -184,10 +171,47 @@ public class MessageClient
|
|||||||
remove => Events.RemoveHandler(EvOnMessageLoop, value);
|
remove => Events.RemoveHandler(EvOnMessageLoop, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public async Task OnMessageLoop(UpdateResult update)
|
public async Task OnMessageLoop(UpdateResult update)
|
||||||
{
|
{
|
||||||
await (Events[EvOnMessageLoop] as Async.AsyncEventHandler<UpdateResult>)?.Invoke(this, update);
|
var eventHandlers = (Events[EvOnMessageLoop] as Async.AsyncEventHandler<UpdateResult>)?.Invoke(this, update);
|
||||||
|
|
||||||
|
if (eventHandlers != null)
|
||||||
|
{
|
||||||
|
await eventHandlers;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public event Async.AsyncEventHandler<ErrorResult> ReceiveError
|
||||||
|
{
|
||||||
|
add => Events.AddHandler(EvOnReceiveError, value);
|
||||||
|
remove => Events.RemoveHandler(EvOnReceiveError, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public async Task OnReceiveError(ErrorResult update)
|
||||||
|
{
|
||||||
|
var eventHandlers = (Events[EvOnReceiveError] as Async.AsyncEventHandler<ErrorResult>)?.Invoke(this, update);
|
||||||
|
|
||||||
|
if (eventHandlers != null)
|
||||||
|
{
|
||||||
|
await eventHandlers;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
//Fallback when no event handler is used.
|
||||||
|
if (update.Exception is ApiRequestException exApi)
|
||||||
|
{
|
||||||
|
Console.WriteLine($"Telegram API Error:\n[{exApi.ErrorCode}]\n{exApi.Message}");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Console.WriteLine(update.Exception.ToString());
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using System.Collections.Generic;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
@@ -9,16 +10,36 @@ namespace TelegramBotBase.Base;
|
|||||||
|
|
||||||
public class MessageResult : ResultBase
|
public class MessageResult : ResultBase
|
||||||
{
|
{
|
||||||
internal MessageResult()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public MessageResult(Update update)
|
public MessageResult(Update update)
|
||||||
{
|
{
|
||||||
UpdateData = 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>
|
/// <summary>
|
||||||
/// Returns the Device/ChatId
|
/// Returns the Device/ChatId
|
||||||
@@ -55,12 +76,17 @@ public class MessageResult : ResultBase
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Is this an action ? (i.e. button click)
|
/// Is this an action ? (i.e. button click)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool IsAction => UpdateData.CallbackQuery != null;
|
public bool IsAction { get; private set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Is this a command ? Starts with a slash '/' and a command
|
/// Is this a command ? Starts with a slash '/' and a command
|
||||||
/// </summary>
|
/// </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>
|
/// <summary>
|
||||||
/// Returns a List of all parameters which has been sent with the command itself (i.e. /start 123 456 789 =>
|
/// 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>
|
/// <summary>
|
||||||
/// Returns just the command (i.e. /start 1 2 3 => /start)
|
/// Returns just the command (i.e. /start 1 2 3 => /start)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string BotCommand
|
public string BotCommand { get; private set; }
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
if (!IsBotCommand)
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return MessageText.Split(' ')[0];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Returns if this message will be used on the first form or not.
|
/// Returns if this message will be used on the first form or not.
|
||||||
|
|||||||
@@ -0,0 +1,109 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.ComponentModel;
|
||||||
|
using System.Net;
|
||||||
|
using System.Net.Http;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using Telegram.Bot;
|
||||||
|
using Telegram.Bot.Exceptions;
|
||||||
|
using Telegram.Bot.Polling;
|
||||||
|
using Telegram.Bot.Types;
|
||||||
|
using TelegramBotBase.Interfaces;
|
||||||
|
|
||||||
|
namespace TelegramBotBase.Base;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Base class for message handling
|
||||||
|
/// </summary>
|
||||||
|
public class ThreadPoolMessageClient : MessageClient
|
||||||
|
{
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Indicates if all pending Telegram.Bot.Types.Updates should be thrown out before
|
||||||
|
// start polling. If set to true Telegram.Bot.Polling.ReceiverOptions.AllowedUpdates
|
||||||
|
// should be set to not null, otherwise Telegram.Bot.Polling.ReceiverOptions.AllowedUpdates
|
||||||
|
// will effectively be set to receive all Telegram.Bot.Types.Updates.
|
||||||
|
/// </summary>
|
||||||
|
|
||||||
|
public int ThreadPool_WorkerThreads { get; set; } = 1;
|
||||||
|
|
||||||
|
public int ThreadPool_IOThreads { get; set; } = 1;
|
||||||
|
|
||||||
|
|
||||||
|
public ThreadPoolMessageClient(string apiKey) : base(apiKey)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public ThreadPoolMessageClient(string apiKey, HttpClient proxy) : base(apiKey, proxy)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public ThreadPoolMessageClient(string apiKey, Uri proxyUrl, NetworkCredential credential = null) : base(apiKey, proxyUrl, credential)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes the client with a proxy
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="apiKey"></param>
|
||||||
|
/// <param name="proxyHost">i.e. 127.0.0.1</param>
|
||||||
|
/// <param name="proxyPort">i.e. 10000</param>
|
||||||
|
public ThreadPoolMessageClient(string apiKey, string proxyHost, int proxyPort) : base(apiKey, proxyHost, proxyPort)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public ThreadPoolMessageClient(string apiKey, TelegramBotClient client) : base(apiKey, client)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
public override void StartReceiving()
|
||||||
|
{
|
||||||
|
_cancellationTokenSource = new CancellationTokenSource();
|
||||||
|
|
||||||
|
var receiverOptions = new ReceiverOptions();
|
||||||
|
|
||||||
|
receiverOptions.ThrowPendingUpdates = ThrowPendingUpdates;
|
||||||
|
|
||||||
|
ThreadPool.SetMaxThreads(ThreadPool_WorkerThreads, ThreadPool_IOThreads);
|
||||||
|
|
||||||
|
TelegramClient.StartReceiving(HandleUpdateAsyncThreadPool, HandleErrorAsyncThreadPool, receiverOptions, _cancellationTokenSource.Token);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void StopReceiving()
|
||||||
|
{
|
||||||
|
_cancellationTokenSource.Cancel();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public Task HandleUpdateAsyncThreadPool(ITelegramBotClient botClient, Update update, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
ThreadPool.QueueUserWorkItem(async a =>
|
||||||
|
{
|
||||||
|
await OnMessageLoop(new UpdateResult(update, null));
|
||||||
|
});
|
||||||
|
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task HandleErrorAsyncThreadPool(ITelegramBotClient botClient, Exception exception,
|
||||||
|
CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
ThreadPool.QueueUserWorkItem(async a =>
|
||||||
|
{
|
||||||
|
await OnReceiveError(new ErrorResult(exception));
|
||||||
|
});
|
||||||
|
|
||||||
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -16,6 +16,7 @@ public class UpdateResult : ResultBase
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public override long DeviceId =>
|
public override long DeviceId =>
|
||||||
RawData?.Message?.Chat?.Id
|
RawData?.Message?.Chat?.Id
|
||||||
|
?? RawData?.EditedMessage?.Chat?.Id
|
||||||
?? RawData?.CallbackQuery?.Message?.Chat?.Id
|
?? RawData?.CallbackQuery?.Message?.Chat?.Id
|
||||||
?? Device?.DeviceId
|
?? Device?.DeviceId
|
||||||
?? 0;
|
?? 0;
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ using Telegram.Bot.Types;
|
|||||||
using TelegramBotBase.Args;
|
using TelegramBotBase.Args;
|
||||||
using TelegramBotBase.Base;
|
using TelegramBotBase.Base;
|
||||||
using TelegramBotBase.Enums;
|
using TelegramBotBase.Enums;
|
||||||
|
using TelegramBotBase.Exceptions;
|
||||||
using TelegramBotBase.Interfaces;
|
using TelegramBotBase.Interfaces;
|
||||||
using TelegramBotBase.Sessions;
|
using TelegramBotBase.Sessions;
|
||||||
using Console = TelegramBotBase.Tools.Console;
|
using Console = TelegramBotBase.Tools.Console;
|
||||||
@@ -115,12 +116,13 @@ public sealed class BotBase
|
|||||||
if (ds == null)
|
if (ds == null)
|
||||||
{
|
{
|
||||||
ds = await Sessions.StartSession(e.DeviceId);
|
ds = await Sessions.StartSession(e.DeviceId);
|
||||||
e.Device = ds;
|
ds.LastMessage = e.Message;
|
||||||
ds.LastMessage = e.RawData.Message;
|
|
||||||
|
|
||||||
OnSessionBegins(new SessionBeginEventArgs(e.DeviceId, ds));
|
OnSessionBegins(new SessionBeginEventArgs(e.DeviceId, ds));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
e.Device = ds;
|
||||||
|
|
||||||
var mr = new MessageResult(e.RawData);
|
var mr = new MessageResult(e.RawData);
|
||||||
|
|
||||||
var i = 0;
|
var i = 0;
|
||||||
@@ -138,6 +140,13 @@ public sealed class BotBase
|
|||||||
mr.IsFirstHandler = false;
|
mr.IsFirstHandler = false;
|
||||||
} while (ds.FormSwitched && i < GetSetting(ESettings.NavigationMaximum, 10));
|
} 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)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
var ds = Sessions.GetSession(e.DeviceId);
|
var ds = Sessions.GetSession(e.DeviceId);
|
||||||
@@ -188,13 +197,10 @@ public sealed class BotBase
|
|||||||
/// <param name="deviceId">Contains the device/chat id of the device to update.</param>
|
/// <param name="deviceId">Contains the device/chat id of the device to update.</param>
|
||||||
public async Task InvokeMessageLoop(long deviceId)
|
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);
|
await InvokeMessageLoop(deviceId, mr);
|
||||||
}
|
}
|
||||||
@@ -259,7 +265,7 @@ public sealed class BotBase
|
|||||||
{
|
{
|
||||||
foreach (var scope in BotCommandScopes)
|
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;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ namespace TelegramBotBase.Builder;
|
|||||||
|
|
||||||
public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage, IStartFormSelectionStage,
|
public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage, IStartFormSelectionStage,
|
||||||
IBuildingStage, INetworkingSelectionStage, IBotCommandsStage, ISessionSerializationStage,
|
IBuildingStage, INetworkingSelectionStage, IBotCommandsStage, ISessionSerializationStage,
|
||||||
ILanguageSelectionStage
|
ILanguageSelectionStage, IThreadingStage
|
||||||
{
|
{
|
||||||
private string _apiKey;
|
private string _apiKey;
|
||||||
|
|
||||||
@@ -32,6 +32,7 @@ public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage,
|
|||||||
|
|
||||||
private BotBaseBuilder()
|
private BotBaseBuilder()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -39,7 +40,10 @@ public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage,
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
private Dictionary<BotCommandScope, List<BotCommand>> BotCommandScopes { get; } = new();
|
private Dictionary<BotCommandScope, List<BotCommand>> BotCommandScopes { get; } = new();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Creates a full BotBase instance with all parameters previously set.
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
public BotBase Build()
|
public BotBase Build()
|
||||||
{
|
{
|
||||||
var bot = new BotBase(_apiKey, _client)
|
var bot = new BotBase(_apiKey, _client)
|
||||||
@@ -69,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;
|
_apiKey = apiKey;
|
||||||
_factory = new DefaultStartFormFactory(startForm);
|
_factory = new DefaultStartFormFactory(startForm);
|
||||||
|
|
||||||
DefaultMessageLoop();
|
DefaultMessageLoop();
|
||||||
|
|
||||||
NoProxy();
|
NoProxy(throwPendingUpdates);
|
||||||
|
|
||||||
OnlyStart();
|
OnlyStart();
|
||||||
|
|
||||||
@@ -84,11 +88,13 @@ public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage,
|
|||||||
|
|
||||||
DefaultLanguage();
|
DefaultLanguage();
|
||||||
|
|
||||||
|
UseSingleThread();
|
||||||
|
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public IBuildingStage QuickStart<T>(string apiKey)
|
public IBuildingStage QuickStart<T>(string apiKey, bool throwPendingUpdates = false)
|
||||||
where T : FormBase
|
where T : FormBase
|
||||||
{
|
{
|
||||||
_apiKey = apiKey;
|
_apiKey = apiKey;
|
||||||
@@ -96,7 +102,7 @@ public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage,
|
|||||||
|
|
||||||
DefaultMessageLoop();
|
DefaultMessageLoop();
|
||||||
|
|
||||||
NoProxy();
|
NoProxy(throwPendingUpdates);
|
||||||
|
|
||||||
OnlyStart();
|
OnlyStart();
|
||||||
|
|
||||||
@@ -104,17 +110,19 @@ public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage,
|
|||||||
|
|
||||||
DefaultLanguage();
|
DefaultLanguage();
|
||||||
|
|
||||||
|
UseSingleThread();
|
||||||
|
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public IBuildingStage QuickStart(string apiKey, IStartFormFactory startFormFactory)
|
public IBuildingStage QuickStart(string apiKey, IStartFormFactory startFormFactory, bool throwPendingUpdates = false)
|
||||||
{
|
{
|
||||||
_apiKey = apiKey;
|
_apiKey = apiKey;
|
||||||
_factory = startFormFactory;
|
_factory = startFormFactory;
|
||||||
|
|
||||||
DefaultMessageLoop();
|
DefaultMessageLoop();
|
||||||
|
|
||||||
NoProxy();
|
NoProxy(throwPendingUpdates);
|
||||||
|
|
||||||
OnlyStart();
|
OnlyStart();
|
||||||
|
|
||||||
@@ -122,6 +130,8 @@ public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage,
|
|||||||
|
|
||||||
DefaultLanguage();
|
DefaultLanguage();
|
||||||
|
|
||||||
|
UseSingleThread();
|
||||||
|
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -204,67 +214,72 @@ public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage,
|
|||||||
|
|
||||||
#region "Step 4 (Network Settings)"
|
#region "Step 4 (Network Settings)"
|
||||||
|
|
||||||
public IBotCommandsStage WithProxy(string proxyAddress)
|
public IBotCommandsStage WithProxy(string proxyAddress, bool throwPendingUpdates = false, int timeoutInSeconds = 60)
|
||||||
{
|
{
|
||||||
var url = new Uri(proxyAddress);
|
var url = new Uri(proxyAddress);
|
||||||
_client = new MessageClient(_apiKey, url)
|
_client = new MessageClient(_apiKey, url)
|
||||||
{
|
{
|
||||||
TelegramClient =
|
TelegramClient =
|
||||||
{
|
{
|
||||||
Timeout = new TimeSpan(0, 1, 0)
|
Timeout = TimeSpan.FromSeconds(timeoutInSeconds)
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
_client.ThrowPendingUpdates = throwPendingUpdates;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public IBotCommandsStage NoProxy()
|
public IBotCommandsStage NoProxy(bool throwPendingUpdates = false, int timeoutInSeconds = 60)
|
||||||
{
|
{
|
||||||
_client = new MessageClient(_apiKey)
|
_client = new MessageClient(_apiKey)
|
||||||
{
|
{
|
||||||
TelegramClient =
|
TelegramClient =
|
||||||
{
|
{
|
||||||
Timeout = new TimeSpan(0, 1, 0)
|
Timeout = TimeSpan.FromSeconds(timeoutInSeconds)// new TimeSpan(0, 1, 0)
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
_client.ThrowPendingUpdates = throwPendingUpdates;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public IBotCommandsStage WithBotClient(TelegramBotClient tgclient)
|
public IBotCommandsStage WithBotClient(TelegramBotClient tgclient, bool throwPendingUpdates = false, int timeoutInSeconds = 60)
|
||||||
{
|
{
|
||||||
_client = new MessageClient(_apiKey, tgclient)
|
_client = new MessageClient(_apiKey, tgclient)
|
||||||
{
|
{
|
||||||
TelegramClient =
|
TelegramClient =
|
||||||
{
|
{
|
||||||
Timeout = new TimeSpan(0, 1, 0)
|
Timeout = TimeSpan.FromSeconds(timeoutInSeconds)// new TimeSpan(0, 1, 0)
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
_client.ThrowPendingUpdates = throwPendingUpdates;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public IBotCommandsStage WithHostAndPort(string proxyHost, int proxyPort)
|
public IBotCommandsStage WithHostAndPort(string proxyHost, int proxyPort, bool throwPendingUpdates = false, int timeoutInSeconds = 60)
|
||||||
{
|
{
|
||||||
_client = new MessageClient(_apiKey, proxyHost, proxyPort)
|
_client = new MessageClient(_apiKey, proxyHost, proxyPort)
|
||||||
{
|
{
|
||||||
TelegramClient =
|
TelegramClient =
|
||||||
{
|
{
|
||||||
Timeout = new TimeSpan(0, 1, 0)
|
Timeout = TimeSpan.FromSeconds(timeoutInSeconds)// new TimeSpan(0, 1, 0)
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
_client.ThrowPendingUpdates = throwPendingUpdates;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public IBotCommandsStage WithHttpClient(HttpClient tgclient)
|
public IBotCommandsStage WithHttpClient(HttpClient tgclient, bool throwPendingUpdates = false, int timeoutInSeconds = 60)
|
||||||
{
|
{
|
||||||
_client = new MessageClient(_apiKey, tgclient)
|
_client = new MessageClient(_apiKey, tgclient)
|
||||||
{
|
{
|
||||||
TelegramClient =
|
TelegramClient =
|
||||||
{
|
{
|
||||||
Timeout = new TimeSpan(0, 1, 0)
|
Timeout = TimeSpan.FromSeconds(timeoutInSeconds)// new TimeSpan(0, 1, 0)
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
_client.ThrowPendingUpdates = throwPendingUpdates;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -383,28 +398,71 @@ public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage,
|
|||||||
|
|
||||||
#region "Step 7 (Language)"
|
#region "Step 7 (Language)"
|
||||||
|
|
||||||
public IBuildingStage DefaultLanguage()
|
/// <inheritdoc cref="ILanguageSelectionStage.DefaultLanguage"/>
|
||||||
|
public IThreadingStage DefaultLanguage()
|
||||||
{
|
{
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public IBuildingStage UseEnglish()
|
/// <inheritdoc cref="ILanguageSelectionStage.UseEnglish"/>
|
||||||
|
public IThreadingStage UseEnglish()
|
||||||
{
|
{
|
||||||
Default.Language = new English();
|
Default.Language = new English();
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public IBuildingStage UseGerman()
|
/// <inheritdoc cref="ILanguageSelectionStage.UseGerman"/>
|
||||||
|
public IThreadingStage UseGerman()
|
||||||
{
|
{
|
||||||
Default.Language = new German();
|
Default.Language = new German();
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public IBuildingStage Custom(Localization language)
|
/// <inheritdoc cref="ILanguageSelectionStage.UsePersian"/>
|
||||||
|
public IThreadingStage UsePersian()
|
||||||
|
{
|
||||||
|
Default.Language = new Persian();
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc cref="ILanguageSelectionStage.UseRussian"/>
|
||||||
|
public IThreadingStage UseRussian()
|
||||||
|
{
|
||||||
|
Default.Language = new Russian();
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc cref="ILanguageSelectionStage.Custom"/>
|
||||||
|
public IThreadingStage Custom(Localization language)
|
||||||
{
|
{
|
||||||
Default.Language = language;
|
Default.Language = language;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|
||||||
|
#region "Step 8 (Threading)"
|
||||||
|
|
||||||
|
public IBuildingStage UseSingleThread()
|
||||||
|
{
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public IBuildingStage UseThreadPool(int workerThreads = 2, int ioThreads = 1)
|
||||||
|
{
|
||||||
|
var c = new ThreadPoolMessageClient(_apiKey, (TelegramBotClient)_client.TelegramClient);
|
||||||
|
|
||||||
|
c.ThreadPool_WorkerThreads = workerThreads;
|
||||||
|
c.ThreadPool_IOThreads = ioThreads;
|
||||||
|
c.ThrowPendingUpdates = _client.ThrowPendingUpdates;
|
||||||
|
|
||||||
|
_client = c;
|
||||||
|
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,16 +20,18 @@ public interface IAPIKeySelectionStage
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="apiKey"></param>
|
/// <param name="apiKey"></param>
|
||||||
/// <param name="StartForm"></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>
|
/// <returns></returns>
|
||||||
IBuildingStage QuickStart(string apiKey, Type StartForm);
|
IBuildingStage QuickStart(string apiKey, Type StartForm, bool throwPendingUpdates = false);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Quick and easy way to create a BotBase instance.
|
/// Quick and easy way to create a BotBase instance.
|
||||||
/// Uses: DefaultMessageLoop, NoProxy, OnlyStart, NoSerialization, DefaultLanguage
|
/// Uses: DefaultMessageLoop, NoProxy, OnlyStart, NoSerialization, DefaultLanguage
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="apiKey"></param>
|
/// <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>
|
/// <returns></returns>
|
||||||
IBuildingStage QuickStart<T>(string apiKey) where T : FormBase;
|
IBuildingStage QuickStart<T>(string apiKey , bool throwPendingUpdates = false) where T : FormBase;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Quick and easy way to create a BotBase instance.
|
/// Quick and easy way to create a BotBase instance.
|
||||||
@@ -37,6 +39,7 @@ public interface IAPIKeySelectionStage
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="apiKey"></param>
|
/// <param name="apiKey"></param>
|
||||||
/// <param name="StartFormFactory"></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>
|
/// <returns></returns>
|
||||||
IBuildingStage QuickStart(string apiKey, IStartFormFactory StartFormFactory);
|
IBuildingStage QuickStart(string apiKey, IStartFormFactory StartFormFactory, bool throwPendingUpdates = false);
|
||||||
}
|
}
|
||||||
@@ -2,5 +2,9 @@
|
|||||||
|
|
||||||
public interface IBuildingStage
|
public interface IBuildingStage
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Creates a full BotBase instance with all parameters previously set.
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
BotBase Build();
|
BotBase Build();
|
||||||
}
|
}
|
||||||
@@ -2,29 +2,44 @@
|
|||||||
|
|
||||||
namespace TelegramBotBase.Builder.Interfaces;
|
namespace TelegramBotBase.Builder.Interfaces;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Represents the language selection stage in the localization process.
|
||||||
|
/// </summary>
|
||||||
public interface ILanguageSelectionStage
|
public interface ILanguageSelectionStage
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Selects the default language for control usage. (English)
|
/// Selects the default language for control usage. (English)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns>The next stage in the building process.</returns>
|
||||||
IBuildingStage DefaultLanguage();
|
IThreadingStage DefaultLanguage();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Selects english as the default language for control labels.
|
/// Selects english as the default language for control labels.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns>The next stage in the building process.</returns>
|
||||||
IBuildingStage UseEnglish();
|
IThreadingStage UseEnglish();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Selects german as the default language for control labels.
|
/// Selects german as the default language for control labels.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <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>
|
||||||
|
IThreadingStage UsePersian();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Selects russian as the default language for control labels.
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>The next stage in the building process.</returns>
|
||||||
|
IThreadingStage UseRussian();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Selects a custom language as the default language for control labels.
|
/// Selects a custom language as the default language for control labels.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns>The next stage in the building process.</returns>
|
||||||
IBuildingStage Custom(Localization language);
|
IThreadingStage Custom(Localization language);
|
||||||
}
|
}
|
||||||
@@ -9,22 +9,25 @@ public interface INetworkingSelectionStage
|
|||||||
/// Chooses a proxy as network configuration.
|
/// Chooses a proxy as network configuration.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="proxyAddress"></param>
|
/// <param name="proxyAddress"></param>
|
||||||
|
/// <param name="throwPendingUpdates">Indicates if all pending Telegram.Bot.Types.Updates should be thrown out before start polling.</param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
IBotCommandsStage WithProxy(string proxyAddress);
|
IBotCommandsStage WithProxy(string proxyAddress, bool throwPendingUpdates = false, int timeoutInSeconds = 60);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Do not choose a proxy as network configuration.
|
/// Do not choose a proxy as network configuration.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
/// <param name="throwPendingUpdates">Indicates if all pending Telegram.Bot.Types.Updates should be thrown out before start polling.</param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
IBotCommandsStage NoProxy();
|
IBotCommandsStage NoProxy(bool throwPendingUpdates = false, int timeoutInSeconds = 60);
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Chooses a custom instance of TelegramBotClient.
|
/// Chooses a custom instance of TelegramBotClient.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="client"></param>
|
/// <param name="client"></param>
|
||||||
|
/// <param name="throwPendingUpdates">Indicates if all pending Telegram.Bot.Types.Updates should be thrown out before start polling.</param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
IBotCommandsStage WithBotClient(TelegramBotClient client);
|
IBotCommandsStage WithBotClient(TelegramBotClient client, bool throwPendingUpdates = false, int timeoutInSeconds = 60);
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -32,13 +35,15 @@ public interface INetworkingSelectionStage
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="proxyHost"></param>
|
/// <param name="proxyHost"></param>
|
||||||
/// <param name="Port"></param>
|
/// <param name="Port"></param>
|
||||||
|
/// <param name="throwPendingUpdates">Indicates if all pending Telegram.Bot.Types.Updates should be thrown out before start polling.</param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
IBotCommandsStage WithHostAndPort(string proxyHost, int Port);
|
IBotCommandsStage WithHostAndPort(string proxyHost, int Port, bool throwPendingUpdates = false, int timeoutInSeconds = 60);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Uses a custom http client.
|
/// Uses a custom http client.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="client"></param>
|
/// <param name="client"></param>
|
||||||
|
/// <param name="throwPendingUpdates">Indicates if all pending Telegram.Bot.Types.Updates should be thrown out before start polling.</param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
IBotCommandsStage WithHttpClient(HttpClient client);
|
IBotCommandsStage WithHttpClient(HttpClient client, bool throwPendingUpdates = false, int timeoutInSeconds = 60);
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
|
namespace TelegramBotBase.Builder.Interfaces
|
||||||
|
{
|
||||||
|
public interface IThreadingStage
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Uses one single thread for message loop. (Default)
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
public IBuildingStage UseSingleThread();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Using the threadpool for managing requests.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="workerThreads">Number of concurrent working threads.</param>
|
||||||
|
/// <param name="ioThreads">Number of concurrent I/O threads.</param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public IBuildingStage UseThreadPool(int workerThreads = 2, int ioThreads = 1);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
using System.Collections.Generic;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using Telegram.Bot.Types;
|
using Telegram.Bot.Types;
|
||||||
|
|
||||||
@@ -20,6 +21,16 @@ public static class Extensions
|
|||||||
scope = BotCommandScope.Default();
|
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);
|
var item = cmds.FirstOrDefault(a => a.Key.Type == scope.Type);
|
||||||
|
|
||||||
if (item.Value != null)
|
if (item.Value != null)
|
||||||
|
|||||||
@@ -16,4 +16,15 @@ public static class Telegram
|
|||||||
public const int MaxReplyKeyboardCols = 12;
|
public const int MaxReplyKeyboardCols = 12;
|
||||||
|
|
||||||
public const int MessageDeletionsPerSecond = 30;
|
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 = "/";
|
||||||
}
|
}
|
||||||
@@ -51,7 +51,24 @@ public class ButtonGrid : ControlBase
|
|||||||
DataSource = new ButtonFormDataSource(form);
|
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; } = "";
|
public string ConfirmationText { get; set; } = "";
|
||||||
|
|
||||||
@@ -340,14 +357,14 @@ public class ButtonGrid : ControlBase
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//var button = HeadLayoutButtonRow?. .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);
|
// ?? 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
|
//Remove button click message
|
||||||
if (DeleteReplyMessage)
|
if (DeleteReplyMessage)
|
||||||
@@ -426,8 +443,6 @@ public class ButtonGrid : ControlBase
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
await result.ConfirmAction(ConfirmationText ?? "");
|
|
||||||
|
|
||||||
ButtonRow match = null;
|
ButtonRow match = null;
|
||||||
var index = -1;
|
var index = -1;
|
||||||
|
|
||||||
@@ -451,17 +466,19 @@ public class ButtonGrid : ControlBase
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//var bf = DataSource.ButtonForm;
|
//var bf = DataSource.ButtonForm;
|
||||||
|
|
||||||
//var button = HeadLayoutButtonRow?.FirstOrDefault(a => a.Value == result.RawData)
|
//var button = HeadLayoutButtonRow?.FirstOrDefault(a => a.Value == result.RawData)
|
||||||
// ?? SubHeadLayoutButtonRow?.FirstOrDefault(a => a.Value == result.RawData)
|
// ?? SubHeadLayoutButtonRow?.FirstOrDefault(a => a.Value == result.RawData)
|
||||||
// ?? bf.ToList().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)
|
if (match != null)
|
||||||
{
|
{
|
||||||
|
await result.ConfirmAction(ConfirmationText ?? "");
|
||||||
|
|
||||||
await OnButtonClicked(new ButtonClickedEventArgs(match.GetButtonMatch(result.RawData, false), index,
|
await OnButtonClicked(new ButtonClickedEventArgs(match.GetButtonMatch(result.RawData, false), index,
|
||||||
match));
|
match));
|
||||||
|
|
||||||
@@ -506,13 +523,13 @@ public class ButtonGrid : ControlBase
|
|||||||
if (DataSource.RowCount > Constants.Telegram.MaxInlineKeyBoardRows && !EnablePaging)
|
if (DataSource.RowCount > Constants.Telegram.MaxInlineKeyBoardRows && !EnablePaging)
|
||||||
{
|
{
|
||||||
throw new MaximumRowsReachedException
|
throw new MaximumRowsReachedException
|
||||||
{ Value = DataSource.RowCount, Maximum = Constants.Telegram.MaxInlineKeyBoardRows };
|
{ Value = DataSource.RowCount, Maximum = Constants.Telegram.MaxInlineKeyBoardRows };
|
||||||
}
|
}
|
||||||
|
|
||||||
if (DataSource.ColumnCount > Constants.Telegram.MaxInlineKeyBoardCols)
|
if (DataSource.ColumnCount > Constants.Telegram.MaxInlineKeyBoardCols)
|
||||||
{
|
{
|
||||||
throw new MaximumColsException
|
throw new MaximumColsException
|
||||||
{ Value = DataSource.ColumnCount, Maximum = Constants.Telegram.MaxInlineKeyBoardCols };
|
{ Value = DataSource.ColumnCount, Maximum = Constants.Telegram.MaxInlineKeyBoardCols };
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
@@ -522,13 +539,13 @@ public class ButtonGrid : ControlBase
|
|||||||
if (DataSource.RowCount > Constants.Telegram.MaxReplyKeyboardRows && !EnablePaging)
|
if (DataSource.RowCount > Constants.Telegram.MaxReplyKeyboardRows && !EnablePaging)
|
||||||
{
|
{
|
||||||
throw new MaximumRowsReachedException
|
throw new MaximumRowsReachedException
|
||||||
{ Value = DataSource.RowCount, Maximum = Constants.Telegram.MaxReplyKeyboardRows };
|
{ Value = DataSource.RowCount, Maximum = Constants.Telegram.MaxReplyKeyboardRows };
|
||||||
}
|
}
|
||||||
|
|
||||||
if (DataSource.ColumnCount > Constants.Telegram.MaxReplyKeyboardCols)
|
if (DataSource.ColumnCount > Constants.Telegram.MaxReplyKeyboardCols)
|
||||||
{
|
{
|
||||||
throw new MaximumColsException
|
throw new MaximumColsException
|
||||||
{ Value = DataSource.ColumnCount, Maximum = Constants.Telegram.MaxReplyKeyboardCols };
|
{ Value = DataSource.ColumnCount, Maximum = Constants.Telegram.MaxReplyKeyboardCols };
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
@@ -693,7 +710,7 @@ public class ButtonGrid : ControlBase
|
|||||||
Updated();
|
Updated();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
//Remove event handler
|
//Remove event handler
|
||||||
{
|
{
|
||||||
Device.MessageDeleted -= Device_MessageDeleted;
|
Device.MessageDeleted -= Device_MessageDeleted;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ using TelegramBotBase.Enums;
|
|||||||
using TelegramBotBase.Exceptions;
|
using TelegramBotBase.Exceptions;
|
||||||
using TelegramBotBase.Form;
|
using TelegramBotBase.Form;
|
||||||
using TelegramBotBase.Localizations;
|
using TelegramBotBase.Localizations;
|
||||||
|
using static System.Net.Mime.MediaTypeNames;
|
||||||
using static TelegramBotBase.Base.Async;
|
using static TelegramBotBase.Base.Async;
|
||||||
|
|
||||||
namespace TelegramBotBase.Controls.Hybrid;
|
namespace TelegramBotBase.Controls.Hybrid;
|
||||||
@@ -51,7 +52,24 @@ public class CheckedButtonList : ControlBase
|
|||||||
DataSource = new ButtonFormDataSource(form);
|
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; } = "";
|
public string ConfirmationText { get; set; } = "";
|
||||||
|
|
||||||
|
|||||||
@@ -29,8 +29,6 @@ public class TaggedButtonGrid : MultiView
|
|||||||
|
|
||||||
public string BackLabel = Default.Language["ButtonGrid_Back"];
|
public string BackLabel = Default.Language["ButtonGrid_Back"];
|
||||||
|
|
||||||
public string CheckAllLabel = Default.Language["ButtonGrid_CheckAll"];
|
|
||||||
|
|
||||||
public string NextPageLabel = Default.Language["ButtonGrid_NextPage"];
|
public string NextPageLabel = Default.Language["ButtonGrid_NextPage"];
|
||||||
|
|
||||||
public string NoItemsLabel = Default.Language["ButtonGrid_NoItems"];
|
public string NoItemsLabel = Default.Language["ButtonGrid_NoItems"];
|
||||||
@@ -39,11 +37,17 @@ public class TaggedButtonGrid : MultiView
|
|||||||
|
|
||||||
public string SearchLabel = Default.Language["ButtonGrid_SearchFeature"];
|
public string SearchLabel = Default.Language["ButtonGrid_SearchFeature"];
|
||||||
|
|
||||||
public string UncheckAllLabel = Default.Language["ButtonGrid_UncheckAll"];
|
public string TotalTagsLabel = Default.Language["TaggedButtonGrid_TotalTags"];
|
||||||
|
|
||||||
|
public string CheckedTagsLabel = Default.Language["TaggedButtonGrid_CheckedTags"];
|
||||||
|
|
||||||
|
public string CheckAllLabel = Default.Language["TaggedButtonGrid_CheckAll"];
|
||||||
|
|
||||||
|
public string UncheckAllLabel = Default.Language["TaggedButtonGrid_UncheckAll"];
|
||||||
|
|
||||||
public string SearchIcon = Default.Language["ButtonGrid_SearchIcon"];
|
public string SearchIcon = Default.Language["ButtonGrid_SearchIcon"];
|
||||||
|
|
||||||
public string TagIcon = Default.Language["ButtonGrid_TagIcon"];
|
public string TagIcon = Default.Language["TaggedButtonGrid_TagIcon"];
|
||||||
|
|
||||||
public TaggedButtonGrid()
|
public TaggedButtonGrid()
|
||||||
{
|
{
|
||||||
@@ -63,7 +67,24 @@ public class TaggedButtonGrid : MultiView
|
|||||||
DataSource = new ButtonFormDataSource(form);
|
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; }
|
public string ConfirmationText { get; set; }
|
||||||
|
|
||||||
@@ -379,14 +400,6 @@ public class TaggedButtonGrid : MultiView
|
|||||||
index = br.Item2;
|
index = br.Item2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//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)
|
|
||||||
|
|
||||||
//var index = bf.FindRowByButton(button);
|
|
||||||
|
|
||||||
check:
|
check:
|
||||||
|
|
||||||
|
|
||||||
@@ -490,10 +503,16 @@ public class TaggedButtonGrid : MultiView
|
|||||||
if (result.MessageText == CheckAllLabel)
|
if (result.MessageText == CheckAllLabel)
|
||||||
{
|
{
|
||||||
CheckAllTags();
|
CheckAllTags();
|
||||||
|
Updated();
|
||||||
|
result.Handled = true;
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
else if (result.MessageText == UncheckAllLabel)
|
else if (result.MessageText == UncheckAllLabel)
|
||||||
{
|
{
|
||||||
UncheckAllTags();
|
UncheckAllTags();
|
||||||
|
Updated();
|
||||||
|
result.Handled = true;
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var i = result.MessageText.LastIndexOf(" ");
|
var i = result.MessageText.LastIndexOf(" ");
|
||||||
@@ -569,15 +588,6 @@ public class TaggedButtonGrid : MultiView
|
|||||||
index = br.Item2;
|
index = br.Item2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//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 index = bf.FindRowByButton(button);
|
|
||||||
|
|
||||||
check:
|
check:
|
||||||
if (match != null)
|
if (match != null)
|
||||||
{
|
{
|
||||||
@@ -619,22 +629,47 @@ public class TaggedButtonGrid : MultiView
|
|||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case "$back$":
|
|
||||||
|
|
||||||
SelectedViewIndex = 0;
|
default:
|
||||||
|
|
||||||
|
if (SelectedViewIndex != 1)
|
||||||
|
return;
|
||||||
|
|
||||||
|
|
||||||
|
switch (result.RawData)
|
||||||
|
{
|
||||||
|
case "$back$":
|
||||||
|
|
||||||
|
SelectedViewIndex = 0;
|
||||||
|
Updated();
|
||||||
|
|
||||||
|
return;
|
||||||
|
|
||||||
|
case "$checkall$":
|
||||||
|
|
||||||
|
CheckAllTags();
|
||||||
|
|
||||||
|
return;
|
||||||
|
|
||||||
|
case "$uncheckall$":
|
||||||
|
|
||||||
|
UncheckAllTags();
|
||||||
|
|
||||||
|
return;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
if (SelectedTags.Contains(result.RawData))
|
||||||
|
{
|
||||||
|
SelectedTags.Remove(result.RawData);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SelectedTags.Add(result.RawData);
|
||||||
|
}
|
||||||
|
|
||||||
Updated();
|
Updated();
|
||||||
|
|
||||||
break;
|
|
||||||
|
|
||||||
case "$checkall$":
|
|
||||||
|
|
||||||
CheckAllTags();
|
|
||||||
|
|
||||||
break;
|
|
||||||
|
|
||||||
case "$uncheckall$":
|
|
||||||
|
|
||||||
UncheckAllTags();
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -723,8 +758,10 @@ public class TaggedButtonGrid : MultiView
|
|||||||
|
|
||||||
if (EnableCheckAllTools)
|
if (EnableCheckAllTools)
|
||||||
{
|
{
|
||||||
TagsSubHeadLayoutButtonRow = new ButtonRow(new ButtonBase(CheckAllLabel, "$checkall$"),
|
TagsSubHeadLayoutButtonRow = new ButtonRow(new ButtonBase(string.Format(TotalTagsLabel, Tags.Count), "$total$"),
|
||||||
new ButtonBase(UncheckAllLabel, "$uncheckall$"));
|
new ButtonBase(CheckAllLabel, "$checkall$"),
|
||||||
|
new ButtonBase(UncheckAllLabel, "$uncheckall$"),
|
||||||
|
new ButtonBase(string.Format(CheckedTagsLabel, SelectedTags.Count), "checked$"));
|
||||||
bf.AddButtonRow(TagsSubHeadLayoutButtonRow);
|
bf.AddButtonRow(TagsSubHeadLayoutButtonRow);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -756,10 +793,6 @@ public class TaggedButtonGrid : MultiView
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
//if (bf.Count == 0)
|
|
||||||
// return;
|
|
||||||
|
|
||||||
|
|
||||||
var rkm = (ReplyKeyboardMarkup)bf;
|
var rkm = (ReplyKeyboardMarkup)bf;
|
||||||
rkm.ResizeKeyboard = ResizeKeyboard;
|
rkm.ResizeKeyboard = ResizeKeyboard;
|
||||||
rkm.OneTimeKeyboard = OneTimeKeyboard;
|
rkm.OneTimeKeyboard = OneTimeKeyboard;
|
||||||
@@ -881,21 +914,20 @@ public class TaggedButtonGrid : MultiView
|
|||||||
{
|
{
|
||||||
Message m = null;
|
Message m = null;
|
||||||
|
|
||||||
var form = DataSource.PickItems(CurrentPageIndex * ItemRowsPerPage, ItemRowsPerPage,
|
ButtonForm form = null;
|
||||||
EnableSearch ? SearchQuery : null);
|
|
||||||
|
|
||||||
//if (this.EnableSearch && this.SearchQuery != null && this.SearchQuery != "")
|
|
||||||
//{
|
|
||||||
// form = form.FilterDuplicate(this.SearchQuery, true);
|
|
||||||
//}
|
|
||||||
//else
|
|
||||||
//{
|
|
||||||
// form = form.Duplicate();
|
|
||||||
//}
|
|
||||||
|
|
||||||
if (Tags != null && SelectedTags != null)
|
if (Tags != null && SelectedTags != null)
|
||||||
{
|
{
|
||||||
|
form = DataSource.PickAllItems(EnableSearch ? SearchQuery : null); //CurrentPageIndex * ItemRowsPerPage, ItemRowsPerPage,
|
||||||
|
|
||||||
form = form.TagDuplicate(SelectedTags);
|
form = form.TagDuplicate(SelectedTags);
|
||||||
|
|
||||||
|
form = new ButtonForm(form.ToRowList().Skip(CurrentPageIndex * ItemRowsPerPage).Take(ItemRowsPerPage));
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
form = DataSource.PickItems(CurrentPageIndex * ItemRowsPerPage, ItemRowsPerPage,
|
||||||
|
EnableSearch ? SearchQuery : null);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (EnablePaging)
|
if (EnablePaging)
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ public class Label : ControlBase
|
|||||||
{
|
{
|
||||||
private bool _renderNecessary = true;
|
private bool _renderNecessary = true;
|
||||||
|
|
||||||
private string _text = string.Empty;
|
private string _text = Default.Language["Label_Text"];
|
||||||
|
|
||||||
public String Text
|
public String Text
|
||||||
{
|
{
|
||||||
@@ -29,6 +29,10 @@ public class Label : ControlBase
|
|||||||
if (_text == value)
|
if (_text == value)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if (string.IsNullOrEmpty(value))
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException($"{nameof(Text)}", $"{nameof(Text)} property must have been a value unequal to null/empty");
|
||||||
|
}
|
||||||
|
|
||||||
_text = value;
|
_text = value;
|
||||||
_renderNecessary = true;
|
_renderNecessary = true;
|
||||||
@@ -36,6 +40,8 @@ public class Label : ControlBase
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private ParseMode _parseMode = ParseMode.Markdown;
|
private ParseMode _parseMode = ParseMode.Markdown;
|
||||||
|
|
||||||
public ParseMode ParseMode
|
public ParseMode ParseMode
|
||||||
|
|||||||
@@ -32,10 +32,32 @@ public class MultiToggleButton : ControlBase
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public string ChangedString { get; set; } = Default.Language["MultiToggleButton_Changed"];
|
public string ChangedString { get; set; } = Default.Language["MultiToggleButton_Changed"];
|
||||||
|
|
||||||
|
private string _title = Default.Language["MultiToggleButton_Title"];
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// This holds the title of the control.
|
/// This holds the title of the control.
|
||||||
/// </summary>
|
/// </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; }
|
public int? MessageId { get; set; }
|
||||||
|
|
||||||
|
|||||||
@@ -36,7 +36,31 @@ public class ToggleButton : ControlBase
|
|||||||
|
|
||||||
public string ChangedString { get; set; } = Default.Language["ToggleButton_Changed"];
|
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; }
|
public int? MessageId { get; set; }
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,86 @@
|
|||||||
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using TelegramBotBase.Form;
|
||||||
|
|
||||||
|
namespace TelegramBotBase.DependencyInjection
|
||||||
|
{
|
||||||
|
public static class Extensions
|
||||||
|
{
|
||||||
|
internal static FieldInfo _ServiceProviderField = typeof(FormBase).GetField("_serviceProvider", System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.NonPublic);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Use Dependency Injection to create new form and inject parameters. (Main variant)
|
||||||
|
/// </summary>
|
||||||
|
/// <typeparam name="NewForm"></typeparam>
|
||||||
|
/// <param name="args"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static async Task<NewForm> NavigateTo<NewForm>(this FormBase current_form, params object[] args)
|
||||||
|
where NewForm : FormBase
|
||||||
|
{
|
||||||
|
var _serviceProvider = current_form.GetServiceProvider();
|
||||||
|
|
||||||
|
var instance = ActivatorUtilities.CreateInstance(_serviceProvider, typeof(NewForm)) as NewForm;
|
||||||
|
|
||||||
|
if (instance == null)
|
||||||
|
return null; //throw new Exception("Could not instantiate new form via DI.");
|
||||||
|
|
||||||
|
instance.SetServiceProvider(_serviceProvider);
|
||||||
|
|
||||||
|
await current_form.NavigateTo(instance, args);
|
||||||
|
|
||||||
|
return instance;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Use Dependency Injection to create new form and inject parameters. (Alternative variant)
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="current_form"></param>
|
||||||
|
/// <param name="formBaseType"></param>
|
||||||
|
/// <param name="args"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
/// <exception cref="ArgumentException"></exception>
|
||||||
|
public static async Task<FormBase> NavigateTo(this FormBase current_form, Type formBaseType, params object[] args)
|
||||||
|
{
|
||||||
|
if (!typeof(FormBase).IsAssignableFrom(formBaseType))
|
||||||
|
throw new ArgumentException($"{nameof(formBaseType)} argument must be a {nameof(FormBase)} type");
|
||||||
|
|
||||||
|
var _serviceProvider = current_form.GetServiceProvider();
|
||||||
|
|
||||||
|
var instance = ActivatorUtilities.CreateInstance(_serviceProvider, formBaseType) as FormBase;
|
||||||
|
|
||||||
|
if (instance == null)
|
||||||
|
return null; //throw new Exception("Could not instantiate new form via DI.");
|
||||||
|
|
||||||
|
instance.SetServiceProvider(_serviceProvider);
|
||||||
|
|
||||||
|
await current_form.NavigateTo(instance, args);
|
||||||
|
|
||||||
|
return instance;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sets the internal service provider field.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="form"></param>
|
||||||
|
/// <param name="serviceProvider"></param>
|
||||||
|
public static void SetServiceProvider(this FormBase form, IServiceProvider serviceProvider)
|
||||||
|
{
|
||||||
|
_ServiceProviderField?.SetValue(form, serviceProvider);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the internal service provider field value.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="form"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static IServiceProvider GetServiceProvider(this FormBase form)
|
||||||
|
{
|
||||||
|
var sp = _ServiceProviderField?.GetValue(form) as IServiceProvider;
|
||||||
|
return sp;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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) { }
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -12,7 +12,7 @@ public class DefaultStartFormFactory : IStartFormFactory
|
|||||||
{
|
{
|
||||||
if (!typeof(FormBase).IsAssignableFrom(startFormClass))
|
if (!typeof(FormBase).IsAssignableFrom(startFormClass))
|
||||||
{
|
{
|
||||||
throw new ArgumentException("startFormClass argument must be a FormBase type");
|
throw new ArgumentException($"{nameof(startFormClass)} argument must be a {nameof(FormBase)} type");
|
||||||
}
|
}
|
||||||
|
|
||||||
_startFormClass = startFormClass;
|
_startFormClass = startFormClass;
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
using System;
|
using System;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
using TelegramBotBase.DependencyInjection;
|
||||||
|
using TelegramBotBase.Exceptions;
|
||||||
using TelegramBotBase.Form;
|
using TelegramBotBase.Form;
|
||||||
using TelegramBotBase.Interfaces;
|
using TelegramBotBase.Interfaces;
|
||||||
|
|
||||||
@@ -14,7 +16,7 @@ public class ServiceProviderStartFormFactory : IStartFormFactory
|
|||||||
{
|
{
|
||||||
if (!typeof(FormBase).IsAssignableFrom(startFormClass))
|
if (!typeof(FormBase).IsAssignableFrom(startFormClass))
|
||||||
{
|
{
|
||||||
throw new ArgumentException("startFormClass argument must be a FormBase type");
|
throw new ArgumentException($"{nameof(startFormClass)} argument must be a {nameof(FormBase)} type");
|
||||||
}
|
}
|
||||||
|
|
||||||
_startFormClass = startFormClass;
|
_startFormClass = startFormClass;
|
||||||
@@ -23,7 +25,21 @@ public class ServiceProviderStartFormFactory : IStartFormFactory
|
|||||||
|
|
||||||
public FormBase CreateForm()
|
public FormBase CreateForm()
|
||||||
{
|
{
|
||||||
return (FormBase)ActivatorUtilities.CreateInstance(_serviceProvider, _startFormClass);
|
FormBase fb = null;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
fb = (FormBase)ActivatorUtilities.CreateInstance(_serviceProvider, _startFormClass);
|
||||||
|
}
|
||||||
|
catch(InvalidOperationException ex)
|
||||||
|
{
|
||||||
|
throw new InvalidServiceProviderConfiguration(ex.Message, ex);
|
||||||
|
}
|
||||||
|
|
||||||
|
//Sets an internal field for future ServiceProvider navigation
|
||||||
|
fb.SetServiceProvider(_serviceProvider);
|
||||||
|
|
||||||
|
return fb;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -23,6 +23,11 @@ public class ButtonForm
|
|||||||
DependencyControl = control;
|
DependencyControl = control;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public ButtonForm(IEnumerable<ButtonRow> rows)
|
||||||
|
{
|
||||||
|
_buttons = rows.ToList();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public IReplyMarkup Markup { get; set; }
|
public IReplyMarkup Markup { get; set; }
|
||||||
|
|
||||||
@@ -149,6 +154,11 @@ public class ButtonForm
|
|||||||
.Aggregate((a, b) => a.Union(b).ToList());
|
.Aggregate((a, b) => a.Union(b).ToList());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<ButtonRow> ToRowList()
|
||||||
|
{
|
||||||
|
return _buttons;
|
||||||
|
}
|
||||||
|
|
||||||
public InlineKeyboardButton[][] ToInlineButtonArray()
|
public InlineKeyboardButton[][] ToInlineButtonArray()
|
||||||
{
|
{
|
||||||
var ikb = _buttons.Select(a => a.ToArray().Select(b => b.ToInlineButton(this)).ToArray()).ToArray();
|
var ikb = _buttons.Select(a => a.ToArray().Select(b => b.ToInlineButton(this)).ToArray()).ToArray();
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
|
using System.Text;
|
||||||
|
using TelegramBotBase.Exceptions;
|
||||||
|
|
||||||
namespace TelegramBotBase.Form;
|
namespace TelegramBotBase.Form;
|
||||||
|
|
||||||
@@ -23,22 +25,24 @@ public class CallbackData
|
|||||||
|
|
||||||
public static string Create(string method, string value)
|
public static string Create(string method, string value)
|
||||||
{
|
{
|
||||||
return new CallbackData(method, value).Serialize();
|
return new CallbackData(method, value).Serialize(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Serializes data to json string
|
/// Serializes data to json string
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public string Serialize()
|
public string Serialize(bool throwExceptionOnOverflow = false)
|
||||||
{
|
{
|
||||||
var s = "";
|
var s = string.Empty;
|
||||||
try
|
|
||||||
{
|
s = JsonConvert.SerializeObject(this);
|
||||||
s = JsonConvert.SerializeObject(this);
|
|
||||||
}
|
//Is data over 64 bytes ?
|
||||||
catch
|
int byte_count = Encoding.UTF8.GetByteCount(s);
|
||||||
|
if (throwExceptionOnOverflow && byte_count > Constants.Telegram.MaxCallBackDataBytes)
|
||||||
{
|
{
|
||||||
|
throw new CallbackDataTooLongException(byte_count);
|
||||||
}
|
}
|
||||||
|
|
||||||
return s;
|
return s;
|
||||||
@@ -51,19 +55,8 @@ public class CallbackData
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static CallbackData Deserialize(string data)
|
public static CallbackData Deserialize(string data)
|
||||||
{
|
{
|
||||||
CallbackData cd = null;
|
return JsonConvert.DeserializeObject<CallbackData>(data);
|
||||||
try
|
|
||||||
{
|
|
||||||
cd = JsonConvert.DeserializeObject<CallbackData>(data);
|
|
||||||
|
|
||||||
return cd;
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static implicit operator string(CallbackData callbackData) => callbackData.Serialize();
|
public static implicit operator string(CallbackData callbackData) => callbackData.Serialize(true);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
namespace TelegramBotBase.Localizations;
|
namespace TelegramBotBase.Localizations;
|
||||||
|
|
||||||
public class English : Localization
|
public sealed class English : Localization
|
||||||
{
|
{
|
||||||
public English()
|
public English()
|
||||||
{
|
{
|
||||||
@@ -12,8 +12,10 @@ public class English : Localization
|
|||||||
Values["ButtonGrid_CurrentPage"] = "Page {0} of {1}";
|
Values["ButtonGrid_CurrentPage"] = "Page {0} of {1}";
|
||||||
Values["ButtonGrid_SearchFeature"] = "💡 Send a message to filter the list. Click the 🔍 to reset the filter.";
|
Values["ButtonGrid_SearchFeature"] = "💡 Send a message to filter the list. Click the 🔍 to reset the filter.";
|
||||||
Values["ButtonGrid_Back"] = "Back";
|
Values["ButtonGrid_Back"] = "Back";
|
||||||
Values["ButtonGrid_CheckAll"] = "Check all";
|
Values["TaggedButtonGrid_TotalTags"] = "Total: {0}";
|
||||||
Values["ButtonGrid_UncheckAll"] = "Uncheck all";
|
Values["TaggedButtonGrid_CheckedTags"] = "Checked: {0}";
|
||||||
|
Values["TaggedButtonGrid_CheckAll"] = "Check all";
|
||||||
|
Values["TaggedButtonGrid_UncheckAll"] = "Uncheck all";
|
||||||
Values["CalendarPicker_Title"] = "Pick date";
|
Values["CalendarPicker_Title"] = "Pick date";
|
||||||
Values["CalendarPicker_PreviousPage"] = "◀️";
|
Values["CalendarPicker_PreviousPage"] = "◀️";
|
||||||
Values["CalendarPicker_NextPage"] = "▶️";
|
Values["CalendarPicker_NextPage"] = "▶️";
|
||||||
@@ -31,6 +33,7 @@ public class English : Localization
|
|||||||
Values["PromptDialog_Back"] = "Back";
|
Values["PromptDialog_Back"] = "Back";
|
||||||
Values["ToggleButton_Changed"] = "Setting changed";
|
Values["ToggleButton_Changed"] = "Setting changed";
|
||||||
Values["ButtonGrid_SearchIcon"] = "🔍";
|
Values["ButtonGrid_SearchIcon"] = "🔍";
|
||||||
Values["ButtonGrid_TagIcon"] = "📁";
|
Values["TaggedButtonGrid_TagIcon"] = "📁";
|
||||||
|
Values["Label_Text"] = "Default label text";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
namespace TelegramBotBase.Localizations;
|
namespace TelegramBotBase.Localizations;
|
||||||
|
|
||||||
public class German : Localization
|
public sealed class German : Localization
|
||||||
{
|
{
|
||||||
public German()
|
public German()
|
||||||
{
|
{
|
||||||
@@ -10,11 +10,12 @@ public class German : Localization
|
|||||||
Values["ButtonGrid_PreviousPage"] = "◀️";
|
Values["ButtonGrid_PreviousPage"] = "◀️";
|
||||||
Values["ButtonGrid_NextPage"] = "▶️";
|
Values["ButtonGrid_NextPage"] = "▶️";
|
||||||
Values["ButtonGrid_CurrentPage"] = "Seite {0} von {1}";
|
Values["ButtonGrid_CurrentPage"] = "Seite {0} von {1}";
|
||||||
Values["ButtonGrid_SearchFeature"] =
|
Values["ButtonGrid_SearchFeature"] = "💡 Sende eine Nachricht um die Liste zu filtern. Klicke die 🔍 um den Filter zurückzusetzen.";
|
||||||
"💡 Sende eine Nachricht um die Liste zu filtern. Klicke die 🔍 um den Filter zurückzusetzen.";
|
|
||||||
Values["ButtonGrid_Back"] = "Zurück";
|
Values["ButtonGrid_Back"] = "Zurück";
|
||||||
Values["ButtonGrid_CheckAll"] = "Alle auswählen";
|
Values["TaggedButtonGrid_TotalTags"] = "Gesamt: {0}";
|
||||||
Values["ButtonGrid_UncheckAll"] = "Keine auswählen";
|
Values["TaggedButtonGrid_CheckedTags"] = "Ausgewählt: {0}";
|
||||||
|
Values["TaggedButtonGrid_CheckAll"] = "Alle auswählen";
|
||||||
|
Values["TaggedButtonGrid_UncheckAll"] = "Keine auswählen";
|
||||||
Values["CalendarPicker_Title"] = "Datum auswählen";
|
Values["CalendarPicker_Title"] = "Datum auswählen";
|
||||||
Values["CalendarPicker_PreviousPage"] = "◀️";
|
Values["CalendarPicker_PreviousPage"] = "◀️";
|
||||||
Values["CalendarPicker_NextPage"] = "▶️";
|
Values["CalendarPicker_NextPage"] = "▶️";
|
||||||
@@ -31,5 +32,8 @@ public class German : Localization
|
|||||||
Values["MultiToggleButton_Changed"] = "Ausgewählt";
|
Values["MultiToggleButton_Changed"] = "Ausgewählt";
|
||||||
Values["PromptDialog_Back"] = "Zurück";
|
Values["PromptDialog_Back"] = "Zurück";
|
||||||
Values["ToggleButton_Changed"] = "Einstellung geändert";
|
Values["ToggleButton_Changed"] = "Einstellung geändert";
|
||||||
|
Values["ButtonGrid_SearchIcon"] = "🔍";
|
||||||
|
Values["TaggedButtonGrid_TagIcon"] = "📁";
|
||||||
|
Values["Label_Text"] = "Standard Label Text";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
namespace TelegramBotBase.Localizations;
|
||||||
|
|
||||||
|
public sealed class Persian : Localization
|
||||||
|
{
|
||||||
|
public Persian()
|
||||||
|
{
|
||||||
|
Values["Language"] = "فارسی";
|
||||||
|
Values["ButtonGrid_Title"] = "منو";
|
||||||
|
Values["ButtonGrid_NoItems"] = "هیچ آیتمی وجود ندارد.";
|
||||||
|
Values["ButtonGrid_PreviousPage"] = "◀️";
|
||||||
|
Values["ButtonGrid_NextPage"] = "▶️";
|
||||||
|
Values["ButtonGrid_CurrentPage"] = "صفحه ی {0} از {1}";
|
||||||
|
Values["ButtonGrid_SearchFeature"] = "💡 برای فیلتر کردن لیست پیام ارسال کنید. برای بازنشانی فیلتر روی 🔍 کلیک کنید.";
|
||||||
|
Values["ButtonGrid_Back"] = "بازگشت";
|
||||||
|
Values["TaggedButtonGrid_TotalTags"] = "Total: {0}";
|
||||||
|
Values["TaggedButtonGrid_CheckedTags"] = "Checked: {0}";
|
||||||
|
Values["TaggedButtonGrid_CheckAll"] = "بررسی کردن همه";
|
||||||
|
Values["TaggedButtonGrid_UncheckAll"] = "بررسی نکردن همه";
|
||||||
|
Values["CalendarPicker_Title"] = "تاریخ را انتخاب کنید";
|
||||||
|
Values["CalendarPicker_PreviousPage"] = "◀️";
|
||||||
|
Values["CalendarPicker_NextPage"] = "▶️";
|
||||||
|
Values["TreeView_Title"] = "گره را انتخاب کنید";
|
||||||
|
Values["TreeView_LevelUp"] = "🔼 سطح بالا";
|
||||||
|
Values["ToggleButton_On"] = "روشن";
|
||||||
|
Values["ToggleButton_Off"] = "خاموش";
|
||||||
|
Values["ToggleButton_OnIcon"] = "⚫";
|
||||||
|
Values["ToggleButton_OffIcon"] = "⚪";
|
||||||
|
Values["ToggleButton_Title"] = "تغییر وضعیت";
|
||||||
|
Values["ToggleButton_Changed"] = "انتخاب شده";
|
||||||
|
Values["MultiToggleButton_SelectedIcon"] = "✅";
|
||||||
|
Values["MultiToggleButton_Title"] = "چند تعویض";
|
||||||
|
Values["MultiToggleButton_Changed"] = "انتخاب شده";
|
||||||
|
Values["PromptDialog_Back"] = "بازگشت";
|
||||||
|
Values["ToggleButton_Changed"] = "تنظیمات تغییر کرد";
|
||||||
|
Values["ButtonGrid_SearchIcon"] = "🔍";
|
||||||
|
Values["TaggedButtonGrid_TagIcon"] = "📁";
|
||||||
|
Values["Label_Text"] = "متن برچسب پیشفرض";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
namespace TelegramBotBase.Localizations;
|
||||||
|
|
||||||
|
public sealed class Russian : Localization
|
||||||
|
{
|
||||||
|
public Russian()
|
||||||
|
{
|
||||||
|
Values["Language"] = "Русский (Russian)";
|
||||||
|
Values["ButtonGrid_Title"] = "Меню";
|
||||||
|
Values["ButtonGrid_NoItems"] = "Нет доступных элементов.";
|
||||||
|
Values["ButtonGrid_PreviousPage"] = "◀️";
|
||||||
|
Values["ButtonGrid_NextPage"] = "▶️";
|
||||||
|
Values["ButtonGrid_CurrentPage"] = "Страница {0} из {1}";
|
||||||
|
Values["ButtonGrid_SearchFeature"] = "💡 Отправьте сообщение, чтобы отфильтровать список. Нажмите на 🔍, чтобы сбросить фильтр.";
|
||||||
|
Values["ButtonGrid_Back"] = "Назад";
|
||||||
|
Values["TaggedButtonGrid_TotalTags"] = "Всего: {0}";
|
||||||
|
Values["TaggedButtonGrid_CheckedTags"] = "Отмечено: {0}";
|
||||||
|
Values["TaggedButtonGrid_CheckAll"] = "Выделить все";
|
||||||
|
Values["TaggedButtonGrid_UncheckAll"] = "Отменить выбор";
|
||||||
|
Values["CalendarPicker_Title"] = "Календарь / Выберите дату";
|
||||||
|
Values["CalendarPicker_PreviousPage"] = "◀️";
|
||||||
|
Values["CalendarPicker_NextPage"] = "▶️";
|
||||||
|
Values["TreeView_Title"] = "Выберите пункт";
|
||||||
|
Values["TreeView_LevelUp"] = "🔼 Обратно";
|
||||||
|
Values["ToggleButton_On"] = "Вкл";
|
||||||
|
Values["ToggleButton_Off"] = "Выкл";
|
||||||
|
Values["ToggleButton_OnIcon"] = "⚫";
|
||||||
|
Values["ToggleButton_OffIcon"] = "⚪";
|
||||||
|
Values["ToggleButton_Title"] = "Переключить";
|
||||||
|
Values["ToggleButton_Changed"] = "Выбрано";
|
||||||
|
Values["MultiToggleButton_SelectedIcon"] = "✅";
|
||||||
|
Values["MultiToggleButton_Title"] = "Множественный выбор";
|
||||||
|
Values["MultiToggleButton_Changed"] = "Выбрано";
|
||||||
|
Values["PromptDialog_Back"] = "Назад";
|
||||||
|
Values["ToggleButton_Changed"] = "Настройки изменены";
|
||||||
|
Values["ButtonGrid_SearchIcon"] = "🔍";
|
||||||
|
Values["TaggedButtonGrid_TagIcon"] = "📁";
|
||||||
|
Values["Label_Text"] = "Текст метки по умолчанию";
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -72,14 +72,23 @@ public class FormBaseMessageLoop : IMessageLoopFactory
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Message edited ?
|
||||||
|
if(update.Type == UpdateType.EditedMessage)
|
||||||
|
{
|
||||||
|
await activeForm.Edited(mr);
|
||||||
|
}
|
||||||
|
|
||||||
//Action Event
|
//Action Event
|
||||||
if (!session.FormSwitched && mr.IsAction)
|
if (!session.FormSwitched && mr.IsAction && !mr.Handled)
|
||||||
{
|
{
|
||||||
//Send Action event to controls
|
//Send Action event to controls
|
||||||
await activeForm.ActionControls(mr);
|
await activeForm.ActionControls(mr);
|
||||||
|
|
||||||
//Send Action event to form itself
|
if (!mr.Handled)
|
||||||
await activeForm.Action(mr);
|
{
|
||||||
|
//Send Action event to form itself, if not already handled by a control
|
||||||
|
await activeForm.Action(mr);
|
||||||
|
}
|
||||||
|
|
||||||
if (!mr.Handled)
|
if (!mr.Handled)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -65,14 +65,23 @@ public class FullMessageLoop : IMessageLoopFactory
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Message edited ?
|
||||||
|
if (update.Type == UpdateType.EditedMessage)
|
||||||
|
{
|
||||||
|
await activeForm.Edited(mr);
|
||||||
|
}
|
||||||
|
|
||||||
//Action Event
|
//Action Event
|
||||||
if (!session.FormSwitched && mr.IsAction)
|
if (!session.FormSwitched && mr.IsAction && !mr.Handled)
|
||||||
{
|
{
|
||||||
//Send Action event to controls
|
//Send Action event to controls
|
||||||
await activeForm.ActionControls(mr);
|
await activeForm.ActionControls(mr);
|
||||||
|
|
||||||
//Send Action event to form itself
|
if (!mr.Handled)
|
||||||
await activeForm.Action(mr);
|
{
|
||||||
|
//Send Action event to form itself, if not already handled by a control
|
||||||
|
await activeForm.Action(mr);
|
||||||
|
}
|
||||||
|
|
||||||
if (!mr.Handled)
|
if (!mr.Handled)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -131,13 +131,9 @@ public class DeviceSession : IDeviceSession
|
|||||||
public async Task ConfirmAction(string callbackQueryId, string message = "", bool showAlert = false,
|
public async Task ConfirmAction(string callbackQueryId, string message = "", bool showAlert = false,
|
||||||
string urlToOpen = null)
|
string urlToOpen = null)
|
||||||
{
|
{
|
||||||
try
|
|
||||||
{
|
await Client.TelegramClient.AnswerCallbackQueryAsync(callbackQueryId, message, showAlert, urlToOpen);
|
||||||
await Client.TelegramClient.AnswerCallbackQueryAsync(callbackQueryId, message, showAlert, urlToOpen);
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -157,17 +153,8 @@ public class DeviceSession : IDeviceSession
|
|||||||
throw new MessageTooLongException(text.Length);
|
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>
|
/// <summary>
|
||||||
@@ -185,17 +172,9 @@ public class DeviceSession : IDeviceSession
|
|||||||
throw new MessageTooLongException(text.Length);
|
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>
|
/// <summary>
|
||||||
@@ -215,18 +194,8 @@ public class DeviceSession : IDeviceSession
|
|||||||
throw new MessageTooLongException(message.Text.Length);
|
throw new MessageTooLongException(message.Text.Length);
|
||||||
}
|
}
|
||||||
|
|
||||||
try
|
return await Api(a => a.EditMessageTextAsync(DeviceId, message.MessageId, message.Text, parseMode,
|
||||||
{
|
replyMarkup: markup));
|
||||||
return await Api(a =>
|
|
||||||
a.EditMessageTextAsync(DeviceId, message.MessageId, message.Text, parseMode,
|
|
||||||
replyMarkup: markup));
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -237,15 +206,8 @@ public class DeviceSession : IDeviceSession
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public async Task<Message> EditReplyMarkup(int messageId, ButtonForm bf)
|
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>
|
/// <summary>
|
||||||
@@ -277,21 +239,16 @@ public class DeviceSession : IDeviceSession
|
|||||||
text = text.MarkdownV2Escape();
|
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());
|
var t = Api(a => a.SendTextMessageAsync(deviceId, text, null, parseMode, replyToMessageId: replyTo,
|
||||||
|
replyMarkup: markup, disableNotification: disableNotification));
|
||||||
|
|
||||||
await OnMessageSent(new MessageSentEventArgs(await t, o));
|
var o = GetOrigin(new StackTrace());
|
||||||
|
|
||||||
|
await OnMessageSent(new MessageSentEventArgs(await t, o));
|
||||||
|
|
||||||
|
return await t;
|
||||||
|
|
||||||
return await t;
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -336,20 +293,15 @@ public class DeviceSession : IDeviceSession
|
|||||||
text = text.MarkdownV2Escape();
|
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());
|
var t = Api(a => a.SendTextMessageAsync(DeviceId, text, null, parseMode, replyToMessageId: replyTo,
|
||||||
await OnMessageSent(new MessageSentEventArgs(await t, o));
|
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>
|
/// <summary>
|
||||||
@@ -379,20 +331,15 @@ public class DeviceSession : IDeviceSession
|
|||||||
text = text.MarkdownV2Escape();
|
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());
|
var t = Api(a => a.SendTextMessageAsync(DeviceId, text, null, parseMode, replyToMessageId: replyTo,
|
||||||
await OnMessageSent(new MessageSentEventArgs(await t, o));
|
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>
|
/// <summary>
|
||||||
@@ -414,20 +361,15 @@ public class DeviceSession : IDeviceSession
|
|||||||
|
|
||||||
InlineKeyboardMarkup markup = buttons;
|
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());
|
var t = Api(a => a.SendPhotoAsync(DeviceId, file, null, caption, parseMode, replyToMessageId: replyTo,
|
||||||
await OnMessageSent(new MessageSentEventArgs(await t, o));
|
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>
|
/// <summary>
|
||||||
@@ -449,21 +391,16 @@ public class DeviceSession : IDeviceSession
|
|||||||
|
|
||||||
InlineKeyboardMarkup markup = buttons;
|
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());
|
var t = Api(a => a.SendVideoAsync(DeviceId, file, caption: caption, parseMode: parseMode,
|
||||||
await OnMessageSent(new MessageSentEventArgs(await t, o));
|
replyToMessageId: 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>
|
/// <summary>
|
||||||
@@ -484,21 +421,16 @@ public class DeviceSession : IDeviceSession
|
|||||||
|
|
||||||
InlineKeyboardMarkup markup = buttons;
|
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());
|
var t = Api(a => a.SendVideoAsync(DeviceId, InputFile.FromUri(url), parseMode: parseMode,
|
||||||
await OnMessageSent(new MessageSentEventArgs(await t, o));
|
replyToMessageId: 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>
|
/// <summary>
|
||||||
@@ -520,24 +452,19 @@ public class DeviceSession : IDeviceSession
|
|||||||
|
|
||||||
InlineKeyboardMarkup markup = buttons;
|
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,
|
var fts = InputFile.FromStream(ms, filename);
|
||||||
replyMarkup: markup, disableNotification: disableNotification));
|
|
||||||
|
|
||||||
var o = GetOrigin(new StackTrace());
|
var t = Api(a => a.SendVideoAsync(DeviceId, fts, parseMode: parseMode, replyToMessageId: replyTo,
|
||||||
await OnMessageSent(new MessageSentEventArgs(await t, o));
|
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>
|
/// <summary>
|
||||||
@@ -560,26 +487,21 @@ public class DeviceSession : IDeviceSession
|
|||||||
|
|
||||||
InlineKeyboardMarkup markup = buttons;
|
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,
|
var fts = InputFile.FromStream(fs, filename);
|
||||||
replyMarkup: markup, disableNotification: disableNotification));
|
|
||||||
|
|
||||||
var o = GetOrigin(new StackTrace());
|
var t = Api(a => a.SendVideoAsync(DeviceId, fts, parseMode: parseMode, replyToMessageId: replyTo,
|
||||||
await OnMessageSent(new MessageSentEventArgs(await t, o));
|
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>
|
/// <summary>
|
||||||
@@ -650,20 +572,15 @@ public class DeviceSession : IDeviceSession
|
|||||||
markup = buttons;
|
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());
|
var t = Api(a => a.SendDocumentAsync(DeviceId, document, null, null, caption, replyMarkup: markup,
|
||||||
await OnMessageSent(new MessageSentEventArgs(await t, o));
|
disableNotification: disableNotification, replyToMessageId: replyTo));
|
||||||
|
|
||||||
|
var o = GetOrigin(new StackTrace());
|
||||||
|
await OnMessageSent(new MessageSentEventArgs(await t, o));
|
||||||
|
|
||||||
|
return await t;
|
||||||
|
|
||||||
return await t;
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -714,22 +631,16 @@ public class DeviceSession : IDeviceSession
|
|||||||
|
|
||||||
public async Task<Message> HideReplyKeyboard(string closedMsg = "Closed", bool autoDeleteResponse = true)
|
public async Task<Message> HideReplyKeyboard(string closedMsg = "Closed", bool autoDeleteResponse = true)
|
||||||
{
|
{
|
||||||
try
|
|
||||||
{
|
|
||||||
var m = await Send(closedMsg, new ReplyKeyboardRemove());
|
|
||||||
|
|
||||||
if (autoDeleteResponse && m != null)
|
var m = await Send(closedMsg, new ReplyKeyboardRemove());
|
||||||
{
|
|
||||||
await DeleteMessage(m);
|
|
||||||
}
|
|
||||||
|
|
||||||
return m;
|
if (autoDeleteResponse && m != null)
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
{
|
||||||
|
await DeleteMessage(m);
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return m;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -759,13 +670,9 @@ public class DeviceSession : IDeviceSession
|
|||||||
|
|
||||||
public virtual async Task ChangeChatPermissions(ChatPermissions permissions)
|
public virtual async Task ChangeChatPermissions(ChatPermissions permissions)
|
||||||
{
|
{
|
||||||
try
|
|
||||||
{
|
await Api(a => a.SetChatPermissionsAsync(DeviceId, permissions));
|
||||||
await Api(a => a.SetChatPermissionsAsync(DeviceId, permissions));
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private Type GetOrigin(StackTrace stackTrace)
|
private Type GetOrigin(StackTrace stackTrace)
|
||||||
@@ -878,49 +785,31 @@ public class DeviceSession : IDeviceSession
|
|||||||
|
|
||||||
public virtual async Task<ChatMember> GetChatUser(long userId)
|
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.")]
|
[Obsolete("User BanUser instead.")]
|
||||||
public virtual async Task KickUser(long userId, DateTime until = default)
|
public virtual async Task KickUser(long userId, DateTime until = default)
|
||||||
{
|
{
|
||||||
try
|
|
||||||
{
|
await Api(a => a.BanChatMemberAsync(DeviceId, userId, until));
|
||||||
await Api(a => a.BanChatMemberAsync(DeviceId, userId, until));
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual async Task BanUser(long userId, DateTime until = default)
|
public virtual async Task BanUser(long userId, DateTime until = default)
|
||||||
{
|
{
|
||||||
try
|
|
||||||
{
|
await Api(a => a.BanChatMemberAsync(DeviceId, userId, until));
|
||||||
await Api(a => a.BanChatMemberAsync(DeviceId, userId, until));
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual async Task UnbanUser(long userId)
|
public virtual async Task UnbanUser(long userId)
|
||||||
{
|
{
|
||||||
try
|
|
||||||
{
|
await Api(a => a.UnbanChatMemberAsync(DeviceId, userId));
|
||||||
await Api(a => a.UnbanChatMemberAsync(DeviceId, userId));
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ public class JsonStateMachine : IStateMachine
|
|||||||
|
|
||||||
if (FallbackStateForm != null && !FallbackStateForm.IsSubclassOf(typeof(FormBase)))
|
if (FallbackStateForm != null && !FallbackStateForm.IsSubclassOf(typeof(FormBase)))
|
||||||
{
|
{
|
||||||
throw new ArgumentException("FallbackStateForm is not a subclass of FormBase");
|
throw new ArgumentException($"{nameof(FallbackStateForm)} is not a subclass of {nameof(FormBase)}");
|
||||||
}
|
}
|
||||||
|
|
||||||
FilePath = file ?? throw new ArgumentNullException(nameof(file));
|
FilePath = file ?? throw new ArgumentNullException(nameof(file));
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ public class SimpleJsonStateMachine : IStateMachine
|
|||||||
|
|
||||||
if (FallbackStateForm != null && !FallbackStateForm.IsSubclassOf(typeof(FormBase)))
|
if (FallbackStateForm != null && !FallbackStateForm.IsSubclassOf(typeof(FormBase)))
|
||||||
{
|
{
|
||||||
throw new ArgumentException("FallbackStateForm is not a subclass of FormBase");
|
throw new ArgumentException($"{nameof(FallbackStateForm)} is not a subclass of {nameof(FormBase)}");
|
||||||
}
|
}
|
||||||
|
|
||||||
FilePath = file ?? throw new ArgumentNullException(nameof(file));
|
FilePath = file ?? throw new ArgumentNullException(nameof(file));
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ public class XmlStateMachine : IStateMachine
|
|||||||
|
|
||||||
if (FallbackStateForm != null && !FallbackStateForm.IsSubclassOf(typeof(FormBase)))
|
if (FallbackStateForm != null && !FallbackStateForm.IsSubclassOf(typeof(FormBase)))
|
||||||
{
|
{
|
||||||
throw new ArgumentException("FallbackStateForm is not a subclass of FormBase");
|
throw new ArgumentException($"{nameof(FallbackStateForm)} is not a subclass of {nameof(FormBase)}");
|
||||||
}
|
}
|
||||||
|
|
||||||
FilePath = file ?? throw new ArgumentNullException(nameof(file));
|
FilePath = file ?? throw new ArgumentNullException(nameof(file));
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net6</TargetFrameworks>
|
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net6;net7</TargetFrameworks>
|
||||||
<LangVersion>10</LangVersion>
|
<LangVersion>10</LangVersion>
|
||||||
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
||||||
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
|
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
|
||||||
|
|||||||
@@ -14,12 +14,10 @@
|
|||||||
<dependencies>
|
<dependencies>
|
||||||
<group targetFramework=".NETFramework4.6.1">
|
<group targetFramework=".NETFramework4.6.1">
|
||||||
<dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
|
<dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
|
||||||
<dependency id="System.Drawing.Common" version="4.6.0" exclude="Build,Analyzers" />
|
|
||||||
<dependency id="Telegram.Bot" version="19.0.0" exclude="Build,Analyzers" />
|
<dependency id="Telegram.Bot" version="19.0.0" exclude="Build,Analyzers" />
|
||||||
</group>
|
</group>
|
||||||
<group targetFramework=".NETStandard2.0">
|
<group targetFramework=".NETStandard2.0">
|
||||||
<dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
|
<dependency id="Newtonsoft.Json" version="13.0.1" exclude="Build,Analyzers" />
|
||||||
<dependency id="System.Drawing.Common" version="4.6.0" exclude="Build,Analyzers" />
|
|
||||||
<dependency id="Telegram.Bot" version="19.0.0" exclude="Build,Analyzers" />
|
<dependency id="Telegram.Bot" version="19.0.0" exclude="Build,Analyzers" />
|
||||||
</group>
|
</group>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|||||||
@@ -30,7 +30,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCoreBot", "Examples\EFCor
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BotAndWebApplication", "Examples\BotAndWebApplication\BotAndWebApplication.csproj", "{52EA3201-02E8-46F5-87C4-B4752C8A815C}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BotAndWebApplication", "Examples\BotAndWebApplication\BotAndWebApplication.csproj", "{52EA3201-02E8-46F5-87C4-B4752C8A815C}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InlineAndReplyCombination", "Examples\InlineAndReplyCombination\InlineAndReplyCombination.csproj", "{067E8EBE-F90A-4AFF-A0FF-20578216486E}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InlineAndReplyCombination", "Examples\InlineAndReplyCombination\InlineAndReplyCombination.csproj", "{067E8EBE-F90A-4AFF-A0FF-20578216486E}"
|
||||||
|
EndProject
|
||||||
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DependencyInjection", "Examples\DependencyInjection\DependencyInjection.csproj", "{689B16BC-200E-4C68-BB2E-8B209070849B}"
|
||||||
|
EndProject
|
||||||
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TelegramBotBase.Extensions.Serializer.Database.PostgreSql", "TelegramBotBase.Extensions.Serializer.Database.PostgreSql\TelegramBotBase.Extensions.Serializer.Database.PostgreSql.csproj", "{7C55D9FF-7DC1-41D0-809C-469EBFA20992}"
|
||||||
|
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
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
@@ -78,6 +84,18 @@ Global
|
|||||||
{067E8EBE-F90A-4AFF-A0FF-20578216486E}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{067E8EBE-F90A-4AFF-A0FF-20578216486E}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{067E8EBE-F90A-4AFF-A0FF-20578216486E}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{067E8EBE-F90A-4AFF-A0FF-20578216486E}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{067E8EBE-F90A-4AFF-A0FF-20578216486E}.Release|Any CPU.Build.0 = Release|Any CPU
|
{067E8EBE-F90A-4AFF-A0FF-20578216486E}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{689B16BC-200E-4C68-BB2E-8B209070849B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{689B16BC-200E-4C68-BB2E-8B209070849B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{689B16BC-200E-4C68-BB2E-8B209070849B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{689B16BC-200E-4C68-BB2E-8B209070849B}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{7C55D9FF-7DC1-41D0-809C-469EBFA20992}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{7C55D9FF-7DC1-41D0-809C-469EBFA20992}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{7C55D9FF-7DC1-41D0-809C-469EBFA20992}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{7C55D9FF-7DC1-41D0-809C-469EBFA20992}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{DC521A4C-7446-46F7-845B-AAF10EDCF8C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{DC521A4C-7446-46F7-845B-AAF10EDCF8C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{DC521A4C-7446-46F7-845B-AAF10EDCF8C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{DC521A4C-7446-46F7-845B-AAF10EDCF8C6}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
@@ -91,6 +109,9 @@ Global
|
|||||||
{261BED47-0404-4A9A-86FC-047DE42A7D25} = {BFA71E3F-31C0-4FC1-A320-4DCF704768C5}
|
{261BED47-0404-4A9A-86FC-047DE42A7D25} = {BFA71E3F-31C0-4FC1-A320-4DCF704768C5}
|
||||||
{52EA3201-02E8-46F5-87C4-B4752C8A815C} = {BFA71E3F-31C0-4FC1-A320-4DCF704768C5}
|
{52EA3201-02E8-46F5-87C4-B4752C8A815C} = {BFA71E3F-31C0-4FC1-A320-4DCF704768C5}
|
||||||
{067E8EBE-F90A-4AFF-A0FF-20578216486E} = {BFA71E3F-31C0-4FC1-A320-4DCF704768C5}
|
{067E8EBE-F90A-4AFF-A0FF-20578216486E} = {BFA71E3F-31C0-4FC1-A320-4DCF704768C5}
|
||||||
|
{689B16BC-200E-4C68-BB2E-8B209070849B} = {BFA71E3F-31C0-4FC1-A320-4DCF704768C5}
|
||||||
|
{7C55D9FF-7DC1-41D0-809C-469EBFA20992} = {E3193182-6FDA-4FA3-AD26-A487291E7681}
|
||||||
|
{DC521A4C-7446-46F7-845B-AAF10EDCF8C6} = {E3193182-6FDA-4FA3-AD26-A487291E7681}
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||||
SolutionGuid = {59CB40E1-9FA7-4867-A56F-4F418286F057}
|
SolutionGuid = {59CB40E1-9FA7-4867-A56F-4F418286F057}
|
||||||
|
|||||||
Reference in New Issue
Block a user