Compare commits

..
31 Commits
Author SHA1 Message Date
Florian Zevedei 82e6d79ec4 Updating examples 2024-07-12 13:40:47 +02:00
Florian Zevedei 5d2f3e7fe9 Merge pull request #67 from MajMcCloud/development
Updating master branch via development branch
2024-07-10 14:28:25 +02:00
Florian Zevedei 7aa40b3e2d Using Message instead RawData.Message on session creation 2024-07-10 14:25:51 +02:00
Florian Zevedei eb8fad444b Fix for bots in groups adding/removing 2024-07-10 14:25:08 +02:00
Florian Zevedei 5cda9e1fdc README.md aktualisieren 2024-07-06 17:56:33 +02:00
Florian Zevedei 41bdf52afe README.md aktualisieren 2024-07-06 17:56:13 +02:00
Florian Zevedei 9023875922 README.md aktualisieren 2024-07-06 17:55:36 +02:00
Florian Zevedei 05bfeb8d09 Update README.md 2024-07-06 17:28:23 +02:00
Florian Zevedei 1f1aa1f0ee Adding throwPendingUpdates to QuickStart in BBB 2024-07-03 15:56:50 +02:00
Florian Zevedei 3d97da75f1 Update README.md 2024-07-01 03:28:37 +02:00
Florian Zevedei 261fdafd96 Merge pull request #65 from MajMcCloud/development
Migrating development branch into master
2024-06-29 18:30:34 +02:00
Florian Zevedei 39e68a2089 Merge branch 'master' into development 2024-06-29 18:28:37 +02:00
Florian Zevedei 312690c002 Fix builder in sample 2024-06-25 13:43:33 +02:00
Florian Zevedei 99b888a7a2 Replacing project reference with nuget package in samples 2024-06-25 13:43:21 +02:00
Florian Zevedei 6adcc52ea2 Adding null/empty checks to some controls to prevent invalid behaviour 2024-06-09 14:19:04 +02:00
Florian Zevedei 834038ff44 Adding additional bot command checks toa void invalid configurations 2024-06-09 14:13:43 +02:00
Florian Zevedei e3d1652a02 Fixing on EditableMessage 2024-05-29 21:35:09 +02:00
Florian Zevedei a7411176e6 Fixing the prototype solution of group commands detection 2024-05-29 21:29:14 +02:00
Florian Zevedei 801c0b77f8 Introducing BotGroupCommand property. 2024-05-27 21:39:36 +02:00
Florian Zevedei 7a86ecdf32 Breakable change! Remove of most try/catch's in DeviceSession 2024-05-25 17:24:24 +02:00
Florian Zevedei 175927fbab Updating nuget dependencies 2 2024-05-19 14:16:18 +02:00
Florian Zevedei 34e4429b38 Updating nuget dependencies 2024-05-19 14:15:56 +02:00
Florian Zevedei dc28bde382 Fix Action method handling, if handled by control already 2024-05-19 14:06:01 +02:00
Florian Zevedei 87d57c471a Update CallbackDataTooLongException.cs 2024-05-12 19:07:33 +03:00
Florian Zevedei 5ce2360cc7 Adding callbackdata too long exception and checks 2024-05-12 19:01:50 +03:00
Florian Zevedei e345fc2948 Fixing message loop handling of Action methods 2024-05-12 18:45:18 +03:00
Florian Zevedei 652526ec59 Consolidate nuget references 2024-05-12 18:40:55 +03:00
Florian Zevedei b829f43c5d Adding a exception for invalid ServiceProviders #62
- adding an internal exception handler to catch InvalidOperationException and throw a new explicit one
2024-03-10 17:09:13 +01:00
Florian Zevedei 6e7acdbdba Bugfix in BBB 2024-03-10 16:49:18 +01:00
Florian Zevedei 396a524d94 BotBaseBuilder fix 2024-03-10 16:01:45 +01:00
Florian Zevedei 7d679649e4 Merge pull request #64 from MajMcCloud/master
Update development branch
2024-03-10 15:54:29 +01:00
34 changed files with 465 additions and 326 deletions
@@ -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();
} }
+3 -3
View File
@@ -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>
@@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\TelegramBotBase\TelegramBotBase.csproj" /> <PackageReference Include="TelegramBotBase" Version="6.4.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>
+1 -1
View File
@@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\TelegramBotBase\TelegramBotBase.csproj"/> <PackageReference Include="TelegramBotBase" Version="6.4.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>
+48 -8
View File
@@ -14,6 +14,10 @@
**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) Paypal: [https://paypal.me/majmccloud](https://paypal.me/majmccloud)
@@ -102,6 +106,7 @@ var bot = BotBaseBuilder
}) })
.NoSerialization() .NoSerialization()
.UseEnglish() .UseEnglish()
.UseSingleThread()
.Build(); .Build();
// Upload bot commands to BotFather // Upload bot commands to BotFather
@@ -122,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)
{ {
@@ -220,6 +249,7 @@ var bot = BotBaseBuilder
}) })
.NoSerialization() .NoSerialization()
.UseEnglish() .UseEnglish()
.UseSingleThread()
.Build(); .Build();
bot.BotCommand += async (s, en) => bot.BotCommand += async (s, en) =>
@@ -260,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)
@@ -306,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)");
} }
@@ -376,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");
} }
@@ -858,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();
@@ -881,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();
@@ -903,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();
@@ -916,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
@@ -14,7 +14,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="IronSoftware.System.Drawing" Version="2024.1.1" /> <PackageReference Include="IronSoftware.System.Drawing" Version="2024.5.1" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1"> <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>
@@ -16,7 +16,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.3" /> <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1"> <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>
@@ -22,7 +22,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="TelegramBotBase" Version="6.0.0" /> <PackageReference Include="TelegramBotBase" Version="6.0.0" />
<PackageReference Include="Npgsql" Version="8.0.1" /> <PackageReference Include="Npgsql" Version="8.0.3" />
</ItemGroup> </ItemGroup>
</Project> </Project>
+35 -20
View File
@@ -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.
+13 -8
View File
@@ -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,7 +116,7 @@ public sealed class BotBase
if (ds == null) if (ds == null)
{ {
ds = await Sessions.StartSession(e.DeviceId); ds = await Sessions.StartSession(e.DeviceId);
ds.LastMessage = e.RawData.Message; ds.LastMessage = e.Message;
OnSessionBegins(new SessionBeginEventArgs(e.DeviceId, ds)); OnSessionBegins(new SessionBeginEventArgs(e.DeviceId, ds));
} }
@@ -139,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);
@@ -189,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);
} }
@@ -260,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;
} }
+12 -12
View File
@@ -73,14 +73,14 @@ public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage,
} }
public IBuildingStage QuickStart(string apiKey, Type startForm) public IBuildingStage QuickStart(string apiKey, Type startForm, bool throwPendingUpdates = false)
{ {
_apiKey = apiKey; _apiKey = apiKey;
_factory = new DefaultStartFormFactory(startForm); _factory = new DefaultStartFormFactory(startForm);
DefaultMessageLoop(); DefaultMessageLoop();
NoProxy(); NoProxy(throwPendingUpdates);
OnlyStart(); OnlyStart();
@@ -94,7 +94,7 @@ public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage,
} }
public IBuildingStage QuickStart<T>(string apiKey) public IBuildingStage QuickStart<T>(string apiKey, bool throwPendingUpdates = false)
where T : FormBase where T : FormBase
{ {
_apiKey = apiKey; _apiKey = apiKey;
@@ -102,7 +102,7 @@ public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage,
DefaultMessageLoop(); DefaultMessageLoop();
NoProxy(); NoProxy(throwPendingUpdates);
OnlyStart(); OnlyStart();
@@ -115,14 +115,14 @@ public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage,
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();
@@ -399,41 +399,41 @@ public class BotBaseBuilder : IAPIKeySelectionStage, IMessageLoopSelectionStage,
#region "Step 7 (Language)" #region "Step 7 (Language)"
/// <inheritdoc cref="ILanguageSelectionStage.DefaultLanguage"/> /// <inheritdoc cref="ILanguageSelectionStage.DefaultLanguage"/>
public IBuildingStage DefaultLanguage() public IThreadingStage DefaultLanguage()
{ {
return this; return this;
} }
/// <inheritdoc cref="ILanguageSelectionStage.UseEnglish"/> /// <inheritdoc cref="ILanguageSelectionStage.UseEnglish"/>
public IBuildingStage UseEnglish() public IThreadingStage UseEnglish()
{ {
Default.Language = new English(); Default.Language = new English();
return this; return this;
} }
/// <inheritdoc cref="ILanguageSelectionStage.UseGerman"/> /// <inheritdoc cref="ILanguageSelectionStage.UseGerman"/>
public IBuildingStage UseGerman() public IThreadingStage UseGerman()
{ {
Default.Language = new German(); Default.Language = new German();
return this; return this;
} }
/// <inheritdoc cref="ILanguageSelectionStage.UsePersian"/> /// <inheritdoc cref="ILanguageSelectionStage.UsePersian"/>
public IBuildingStage UsePersian() public IThreadingStage UsePersian()
{ {
Default.Language = new Persian(); Default.Language = new Persian();
return this; return this;
} }
/// <inheritdoc cref="ILanguageSelectionStage.UseRussian"/> /// <inheritdoc cref="ILanguageSelectionStage.UseRussian"/>
public IBuildingStage UseRussian() public IThreadingStage UseRussian()
{ {
Default.Language = new Russian(); Default.Language = new Russian();
return this; return this;
} }
/// <inheritdoc cref="ILanguageSelectionStage.Custom"/> /// <inheritdoc cref="ILanguageSelectionStage.Custom"/>
public IBuildingStage Custom(Localization language) public IThreadingStage Custom(Localization language)
{ {
Default.Language = language; Default.Language = language;
return this; return this;
@@ -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);
} }
@@ -11,35 +11,35 @@ public interface ILanguageSelectionStage
/// Selects the default language for control usage. (English) /// Selects the default language for control usage. (English)
/// </summary> /// </summary>
/// <returns>The next stage in the building process.</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>The next stage in the building process.</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>The next stage in the building process.</returns> /// <returns>The next stage in the building process.</returns>
IBuildingStage UseGerman(); IThreadingStage UseGerman();
/// <summary> /// <summary>
/// Selects persian as the default language for control labels. /// Selects persian as the default language for control labels.
/// </summary> /// </summary>
/// <returns>The next stage in the building process.</returns> /// <returns>The next stage in the building process.</returns>
IBuildingStage UsePersian(); IThreadingStage UsePersian();
/// <summary> /// <summary>
/// Selects russian as the default language for control labels. /// Selects russian as the default language for control labels.
/// </summary> /// </summary>
/// <returns>The next stage in the building process.</returns> /// <returns>The next stage in the building process.</returns>
IBuildingStage UseRussian(); 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>The next stage in the building process.</returns> /// <returns>The next stage in the building process.</returns>
IBuildingStage Custom(Localization language); IThreadingStage Custom(Localization language);
} }
+12 -1
View File
@@ -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)
+11
View File
@@ -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 = "/";
} }
+34 -17
View File
@@ -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)
@@ -449,15 +466,15 @@ public class ButtonGrid : ControlBase
} }
//var bf = DataSource.ButtonForm; //var bf = DataSource.ButtonForm;
//var button = HeadLayoutButtonRow?.FirstOrDefault(a => a.Value == result.RawData) //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 result.ConfirmAction(ConfirmationText ?? "");
@@ -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; } = "";
@@ -67,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; }
+7 -1
View File
@@ -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,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) { }
}
}
@@ -1,6 +1,7 @@
using System; using System;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using TelegramBotBase.DependencyInjection; using TelegramBotBase.DependencyInjection;
using TelegramBotBase.Exceptions;
using TelegramBotBase.Form; using TelegramBotBase.Form;
using TelegramBotBase.Interfaces; using TelegramBotBase.Interfaces;
@@ -24,7 +25,16 @@ public class ServiceProviderStartFormFactory : IStartFormFactory
public FormBase CreateForm() public FormBase CreateForm()
{ {
var fb = (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 //Sets an internal field for future ServiceProvider navigation
fb.SetServiceProvider(_serviceProvider); fb.SetServiceProvider(_serviceProvider);
+14 -21
View File
@@ -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
View File
@@ -34,5 +34,6 @@ public sealed class English : Localization
Values["ToggleButton_Changed"] = "Setting changed"; Values["ToggleButton_Changed"] = "Setting changed";
Values["ButtonGrid_SearchIcon"] = "🔍"; Values["ButtonGrid_SearchIcon"] = "🔍";
Values["TaggedButtonGrid_TagIcon"] = "📁"; Values["TaggedButtonGrid_TagIcon"] = "📁";
Values["Label_Text"] = "Default label text";
} }
} }
+1
View File
@@ -34,5 +34,6 @@ public sealed class German : Localization
Values["ToggleButton_Changed"] = "Einstellung geändert"; Values["ToggleButton_Changed"] = "Einstellung geändert";
Values["ButtonGrid_SearchIcon"] = "🔍"; Values["ButtonGrid_SearchIcon"] = "🔍";
Values["TaggedButtonGrid_TagIcon"] = "📁"; Values["TaggedButtonGrid_TagIcon"] = "📁";
Values["Label_Text"] = "Standard Label Text";
} }
} }
+1
View File
@@ -34,6 +34,7 @@ public sealed class Persian : Localization
Values["ToggleButton_Changed"] = "تنظیمات تغییر کرد"; Values["ToggleButton_Changed"] = "تنظیمات تغییر کرد";
Values["ButtonGrid_SearchIcon"] = "🔍"; Values["ButtonGrid_SearchIcon"] = "🔍";
Values["TaggedButtonGrid_TagIcon"] = "📁"; Values["TaggedButtonGrid_TagIcon"] = "📁";
Values["Label_Text"] = "متن برچسب پیش‌فرض";
} }
} }
+1
View File
@@ -34,5 +34,6 @@ public sealed class Russian : Localization
Values["ToggleButton_Changed"] = "Настройки изменены"; Values["ToggleButton_Changed"] = "Настройки изменены";
Values["ButtonGrid_SearchIcon"] = "🔍"; Values["ButtonGrid_SearchIcon"] = "🔍";
Values["TaggedButtonGrid_TagIcon"] = "📁"; Values["TaggedButtonGrid_TagIcon"] = "📁";
Values["Label_Text"] = "Текст метки по умолчанию";
} }
} }
@@ -79,13 +79,16 @@ public class FormBaseMessageLoop : IMessageLoopFactory
} }
//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)
{ {
@@ -72,13 +72,16 @@ public class FullMessageLoop : IMessageLoopFactory
} }
//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)
{ {
+97 -208
View File
@@ -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