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

Merge pull request #14 from MajMcCloud/development

Browse Source 
AutoCleanForm FIX
This commit is contained in:
Florian Dahn 2021-10-01 18:36:24 +02:00 committed by GitHub
commit 9162c0894c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
TelegramBotBase/Form/AutoCleanForm.cs
View File

@ -49,8 +49,15 @@ namespace TelegramBotBase.Form
this.Device.MessageSent += Device_MessageSent; this.Device.MessageSent += Device_MessageSent;
this.Device.MessageReceived += Device_MessageReceived; this.Device.MessageReceived += Device_MessageReceived;
this.Device.MessageDeleted += Device_MessageDeleted;
} }
private void Device_MessageDeleted(object sender, MessageDeletedEventArgs e)
{
if (OldMessages.Contains(e.MessageId))
OldMessages.Remove(e.MessageId);
}
private void Device_MessageReceived(object sender, MessageReceivedEventArgs e) private void Device_MessageReceived(object sender, MessageReceivedEventArgs e)
{ {
@ -157,7 +164,7 @@ namespace TelegramBotBase.Form
retryAfterTask = Task.Delay(retryAfterSeconds * 1000); retryAfterTask = Task.Delay(retryAfterSeconds * 1000);
} }
deletedMessages.AsParallel().ForAll(i => Device.OnMessageDeleted(new MessageDeletedEventArgs(i))); //deletedMessages.AsParallel().ForAll(i => Device.OnMessageDeleted(new MessageDeletedEventArgs(i)));
oldMessages = oldMessages.Where(x => !deletedMessages.Contains(x)); oldMessages = oldMessages.Where(x => !deletedMessages.Contains(x));
if (retryAfterTask != null) if (retryAfterTask != null)
@ -190,7 +197,7 @@ namespace TelegramBotBase.Form
retryAfterTask = Task.Delay(retryAfterSeconds * 1000); retryAfterTask = Task.Delay(retryAfterSeconds * 1000);
} }
deletedMessages.AsParallel().ForAll(i => Device.OnMessageDeleted(new MessageDeletedEventArgs(i))); //deletedMessages.AsParallel().ForAll(i => Device.OnMessageDeleted(new MessageDeletedEventArgs(i)));
oldMessages = oldMessages.Where(x => !deletedMessages.Contains(x)); oldMessages = oldMessages.Where(x => !deletedMessages.Contains(x));
if (retryAfterTask != null) if (retryAfterTask != null)

12
TelegramBotBase/Sessions/DeviceSession.cs
View File

@ -644,18 +644,12 @@ namespace TelegramBotBase.Sessions
/// <returns></returns> /// <returns></returns>
public virtual async Task<bool> DeleteMessage(int messageId = -1) public virtual async Task<bool> DeleteMessage(int messageId = -1)
{ {
try
{
await RAW(a => a.DeleteMessageAsync(this.DeviceId, messageId));
return true; await RAW(a => a.DeleteMessageAsync(this.DeviceId, messageId));
}
catch (ApiRequestException)
{
} OnMessageDeleted(new MessageDeletedEventArgs(messageId));
return false; return true;
} }
/// <summary> /// <summary>