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

Update DeviceSession.cs

Browse Source 
- adding ParseMode to Edit functions
- adding a Send method which the parameter of the DeviceId
This commit is contained in:
FlorianDahn 2020-10-22 22:14:40 +02:00
parent ba9fd8062c
commit f24c309f63
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
TelegramBotBase/Sessions/DeviceSession.cs
View File

@ -143,7 +143,7 @@ namespace TelegramBotBase.Sessions
/// <param name="text"></param> /// <param name="text"></param>
/// <param name="buttons"></param> /// <param name="buttons"></param>
/// <returns></returns> /// <returns></returns>
public async Task<Message> Edit(int messageId, String text, ButtonForm buttons = null) public async Task<Message> Edit(int messageId, String text, ButtonForm buttons = null, ParseMode parseMode = ParseMode.Default)
{ {
InlineKeyboardMarkup markup = buttons; InlineKeyboardMarkup markup = buttons;
@ -154,7 +154,7 @@ namespace TelegramBotBase.Sessions
try try
{ {
return await this.Client.TelegramClient.EditMessageTextAsync(this.DeviceId, messageId, text, replyMarkup: markup); return await this.Client.TelegramClient.EditMessageTextAsync(this.DeviceId, messageId, text, parseMode, replyMarkup: markup);
} }
catch catch
{ {
@ -172,7 +172,7 @@ namespace TelegramBotBase.Sessions
/// <param name="text"></param> /// <param name="text"></param>
/// <param name="buttons"></param> /// <param name="buttons"></param>
/// <returns></returns> /// <returns></returns>
public async Task<Message> Edit(int messageId, String text, InlineKeyboardMarkup markup) public async Task<Message> Edit(int messageId, String text, InlineKeyboardMarkup markup, ParseMode parseMode = ParseMode.Default)
{ {
if (text.Length > Constants.Telegram.MaxMessageLength) if (text.Length > Constants.Telegram.MaxMessageLength)
{ {
@ -181,7 +181,7 @@ namespace TelegramBotBase.Sessions
try try
{ {
return await this.Client.TelegramClient.EditMessageTextAsync(this.DeviceId, messageId, text, replyMarkup: markup); return await this.Client.TelegramClient.EditMessageTextAsync(this.DeviceId, messageId, text, parseMode, replyMarkup: markup);
} }
catch catch
{ {
@ -199,7 +199,7 @@ namespace TelegramBotBase.Sessions
/// <param name="text"></param> /// <param name="text"></param>
/// <param name="buttons"></param> /// <param name="buttons"></param>
/// <returns></returns> /// <returns></returns>
public async Task<Message> Edit(Message message, ButtonForm buttons = null) public async Task<Message> Edit(Message message, ButtonForm buttons = null, ParseMode parseMode = ParseMode.Default)
{ {
InlineKeyboardMarkup markup = buttons; InlineKeyboardMarkup markup = buttons;
@ -210,7 +210,7 @@ namespace TelegramBotBase.Sessions
try try
{ {
return await this.Client.TelegramClient.EditMessageTextAsync(this.DeviceId, message.MessageId, message.Text, replyMarkup: markup); return await this.Client.TelegramClient.EditMessageTextAsync(this.DeviceId, message.MessageId, message.Text, parseMode, replyMarkup: markup);
} }
catch catch
{ {
@ -250,7 +250,7 @@ namespace TelegramBotBase.Sessions
/// <param name="replyTo"></param> /// <param name="replyTo"></param>
/// <param name="disableNotification"></param> /// <param name="disableNotification"></param>
/// <returns></returns> /// <returns></returns>
public async Task<Message> Send(String text, ButtonForm buttons = null, int replyTo = 0, bool disableNotification = false, ParseMode parseMode = ParseMode.Default, bool MarkdownV2AutoEscape = true) public async Task<Message> Send(long deviceId, String text, ButtonForm buttons = null, int replyTo = 0, bool disableNotification = false, ParseMode parseMode = ParseMode.Default, bool MarkdownV2AutoEscape = true)
{ {
if (this.ActiveForm == null) if (this.ActiveForm == null)
return null; return null;
@ -271,7 +271,7 @@ namespace TelegramBotBase.Sessions
try try
{ {
m = await (this.Client.TelegramClient.SendTextMessageAsync(this.DeviceId, text, parseMode, replyToMessageId: replyTo, replyMarkup: markup, disableNotification: disableNotification)); m = await (this.Client.TelegramClient.SendTextMessageAsync(deviceId, text, parseMode, replyToMessageId: replyTo, replyMarkup: markup, disableNotification: disableNotification));
OnMessageSent(new MessageSentEventArgs(m)); OnMessageSent(new MessageSentEventArgs(m));
} }
@ -287,6 +287,19 @@ namespace TelegramBotBase.Sessions
return m; return m;
} }
/// <summary>
/// Sends a simple text message
/// </summary>
/// <param name="text"></param>
/// <param name="buttons"></param>
/// <param name="replyTo"></param>
/// <param name="disableNotification"></param>
/// <returns></returns>
public async Task<Message> Send(String text, ButtonForm buttons = null, int replyTo = 0, bool disableNotification = false, ParseMode parseMode = ParseMode.Default, bool MarkdownV2AutoEscape = true)
{
return await Send(this.DeviceId, text, buttons, replyTo, disableNotification, parseMode, MarkdownV2AutoEscape);
}
/// <summary> /// <summary>
/// Sends a simple text message /// Sends a simple text message
/// </summary> /// </summary>