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

Adding AutoCleanForm Fix for TaggedButtonGrid

Browse Source
This commit is contained in:
FlorianDahn 2021-03-02 15:19:28 +01:00
parent 1caa71cd25
commit d84be50243
1 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
TelegramBotBase/Controls/Hybrid/TaggedButtonGrid.cs
View File

@ -170,6 +170,22 @@ namespace TelegramBotBase.Controls.Hybrid
} }
} }
public override void Init()
{
this.Device.MessageDeleted += Device_MessageDeleted;
}
private void Device_MessageDeleted(object sender, MessageDeletedEventArgs e)
{
if (this.MessageId == null)
return;
if (e.MessageId != this.MessageId)
return;
this.MessageId = null;
}
public async override Task Load(MessageResult result) public async override Task Load(MessageResult result)
{ {
if (this.KeyboardType != eKeyboardType.ReplyKeyboard) if (this.KeyboardType != eKeyboardType.ReplyKeyboard)
@ -185,10 +201,7 @@ namespace TelegramBotBase.Controls.Hybrid
?? SubHeadLayoutButtonRow?.FirstOrDefault(a => a.Text.Trim() == result.MessageText) ?? SubHeadLayoutButtonRow?.FirstOrDefault(a => a.Text.Trim() == result.MessageText)
?? ButtonsForm.ToList().FirstOrDefault(a => a.Text.Trim() == result.MessageText); ?? ButtonsForm.ToList().FirstOrDefault(a => a.Text.Trim() == result.MessageText);
var index = HeadLayoutButtonRow?.IndexOf(button) var index = ButtonsForm.FindRowByButton(button);
?? SubHeadLayoutButtonRow?.IndexOf(button)
?? ButtonsForm.ToList().IndexOf(button);
switch (this.SelectedViewIndex) switch (this.SelectedViewIndex)
@ -326,9 +339,7 @@ namespace TelegramBotBase.Controls.Hybrid
?? SubHeadLayoutButtonRow?.FirstOrDefault(a => a.Value == result.RawData) ?? SubHeadLayoutButtonRow?.FirstOrDefault(a => a.Value == result.RawData)
?? ButtonsForm.ToList().FirstOrDefault(a => a.Value == result.RawData); ?? ButtonsForm.ToList().FirstOrDefault(a => a.Value == result.RawData);
var index = HeadLayoutButtonRow?.IndexOf(button) var index = ButtonsForm.FindRowByButton(button);
?? SubHeadLayoutButtonRow?.IndexOf(button)
?? ButtonsForm.ToList().IndexOf(button);
if (button != null) if (button != null)
{ {
@ -521,15 +532,21 @@ namespace TelegramBotBase.Controls.Hybrid
case eKeyboardType.InlineKeyBoard: case eKeyboardType.InlineKeyBoard:
//Try to edit message if message id is available
//When the returned message is null then the message has been already deleted, resend it
if (this.MessageId != null) if (this.MessageId != null)
{ {
m = await this.Device.Edit(this.MessageId.Value, this.Title, (InlineKeyboardMarkup)form); m = await this.Device.Edit(this.MessageId.Value, this.Title, (InlineKeyboardMarkup)form);
} if (m != null)
else {
{ this.MessageId = m.MessageId;
m = await this.Device.Send(this.Title, (InlineKeyboardMarkup)form, disableNotification: true, parseMode: MessageParseMode, MarkdownV2AutoEscape: false); return;
}
} }
//When no message id is available or it has been deleted due the use of AutoCleanForm re-render automatically
m = await this.Device.Send(this.Title, (InlineKeyboardMarkup)form, disableNotification: true, parseMode: MessageParseMode, MarkdownV2AutoEscape: false);
break; break;
} }
@ -782,6 +799,11 @@ namespace TelegramBotBase.Controls.Hybrid
{ {
this.Updated(); this.Updated();
} }
else
{
//Remove event handler
this.Device.MessageDeleted -= Device_MessageDeleted;
}
} }
/// <summary> /// <summary>