Compare commits

..
5 Commits
Author SHA1 Message Date
FlorianDahn 8e29652148 Fixing possible Deadlock in AutoCleanForm 2021-10-17 15:39:31 +02:00
Florian Dahn 5bb316d874 Merge pull request #15 from victorrar/f/update-readme
Fix documentation inaccuracy

Thanks !
2021-10-04 21:35:59 +02:00
Victor d2ae08771e Fix documentation inaccuracy 2021-10-04 21:55:41 +03:00
Florian Dahn 9162c0894c Merge pull request #14 from MajMcCloud/development
AutoCleanForm FIX
2021-10-01 18:36:24 +02:00
FlorianDahn e0ec133209 AutoCleanForm FIX
- adding MessageDeleted event to AutoCleanForm for catching messages getting deleted outside of AutoCleanForm
- added OnMessageDelete invoke to DeleteMessage in DeviceSession
2021-10-01 18:35:05 +02:00
3 changed files with 35 additions and 22 deletions
+2 -4
View File
@@ -169,11 +169,9 @@ public class StartForm : FormBase
} }
//Gets invoked during Navigation to this form //Gets invoked during Navigation to this form
public override async Task Init(params object[] param)
{
} //Init() got replaced with event handler
//Opened() got replaced with event handler //Opened() got replaced with event handler
+28 -7
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)
{ {
@@ -143,8 +150,15 @@ namespace TelegramBotBase.Form
{ {
parallelQuery.ForAll(i => parallelQuery.ForAll(i =>
{ {
Device.DeleteMessage(i).GetAwaiter().GetResult(); try
deletedMessages.Add(i); {
Device.DeleteMessage(i).GetAwaiter().GetResult();
deletedMessages.Add(i);
}
catch (ApiRequestException req) when (req.ErrorCode == 400)
{
deletedMessages.Add(i);
}
}); });
} }
catch (AggregateException ex) catch (AggregateException ex)
@@ -153,11 +167,11 @@ namespace TelegramBotBase.Form
var retryAfterSeconds = ex.InnerExceptions var retryAfterSeconds = ex.InnerExceptions
.Where(e => e is ApiRequestException apiEx && apiEx.ErrorCode == 429) .Where(e => e is ApiRequestException apiEx && apiEx.ErrorCode == 429)
.Max(e =>(int?) ((ApiRequestException)e).Parameters.RetryAfter) ?? 0; .Max(e => (int?)((ApiRequestException)e).Parameters.RetryAfter) ?? 0;
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)
@@ -176,8 +190,15 @@ namespace TelegramBotBase.Form
{ {
parallelQuery.ForAll(i => parallelQuery.ForAll(i =>
{ {
Device.DeleteMessage(i).GetAwaiter().GetResult(); try
deletedMessages.Add(i); {
Device.DeleteMessage(i).GetAwaiter().GetResult();
deletedMessages.Add(i);
}
catch (ApiRequestException req) when (req.ErrorCode == 400)
{
deletedMessages.Add(i);
}
}); });
} }
catch (AggregateException ex) catch (AggregateException ex)
@@ -190,7 +211,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)
+3 -9
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>