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

Make OnMessageSent async as well

Browse Source
This commit is contained in:
FlorianDahn 2022-07-02 14:07:25 +02:00
parent e814046d29
commit df7880fcf3
4 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TelegramBotBase/Args/MessageSentEventArgs.cs
View File

@ -7,7 +7,7 @@ using Telegram.Bot.Types;
namespace TelegramBotBase.Args namespace TelegramBotBase.Args
{ {
public class MessageSentEventArgs public class MessageSentEventArgs : EventArgs
{ {
public int MessageId public int MessageId
{ {

2
TelegramBotBase/Controls/Hybrid/MultiView.cs
View File

@ -50,7 +50,7 @@ namespace TelegramBotBase.Controls.Hybrid
} }
private void Device_MessageSent(object sender, MessageSentEventArgs e) private async Task Device_MessageSent(object sender, MessageSentEventArgs e)
{ {
if (e.Origin == null || !e.Origin.IsSubclassOf(typeof(MultiView))) if (e.Origin == null || !e.Origin.IsSubclassOf(typeof(MultiView)))
return; return;

2
TelegramBotBase/Form/AutoCleanForm.cs
View File

@ -67,7 +67,7 @@ namespace TelegramBotBase.Form
this.OldMessages.Add(e.Message.MessageId); this.OldMessages.Add(e.Message.MessageId);
} }
private void Device_MessageSent(object sender, MessageSentEventArgs e) private async Task Device_MessageSent(object sender, MessageSentEventArgs e)
{ {
if (this.DeleteSide == eDeleteSide.UserOnly) if (this.DeleteSide == eDeleteSide.UserOnly)
return; return;

37
TelegramBotBase/Sessions/DeviceSession.cs
View File

@ -291,7 +291,8 @@ namespace TelegramBotBase.Sessions
var t = API(a => a.SendTextMessageAsync(deviceId, text, parseMode, replyToMessageId: replyTo, replyMarkup: markup, disableNotification: disableNotification)); var t = API(a => a.SendTextMessageAsync(deviceId, text, parseMode, replyToMessageId: replyTo, replyMarkup: markup, disableNotification: disableNotification));
var o = GetOrigin(new StackTrace()); var o = GetOrigin(new StackTrace());
OnMessageSent(new MessageSentEventArgs(await t, o));
await OnMessageSent(new MessageSentEventArgs(await t, o));
return await t; return await t;
} }
@ -342,7 +343,7 @@ namespace TelegramBotBase.Sessions
var t = API(a => a.SendTextMessageAsync(this.DeviceId, text, parseMode, replyToMessageId: replyTo, replyMarkup: markup, disableNotification: disableNotification)); var t = API(a => a.SendTextMessageAsync(this.DeviceId, text, parseMode, replyToMessageId: replyTo, replyMarkup: markup, disableNotification: disableNotification));
var o = GetOrigin(new StackTrace()); var o = GetOrigin(new StackTrace());
OnMessageSent(new MessageSentEventArgs(await t, o)); await OnMessageSent(new MessageSentEventArgs(await t, o));
return await t; return await t;
} }
@ -380,7 +381,7 @@ namespace TelegramBotBase.Sessions
var t = API(a => a.SendTextMessageAsync(this.DeviceId, text, parseMode, replyToMessageId: replyTo, replyMarkup: markup, disableNotification: disableNotification)); var t = API(a => a.SendTextMessageAsync(this.DeviceId, text, parseMode, replyToMessageId: replyTo, replyMarkup: markup, disableNotification: disableNotification));
var o = GetOrigin(new StackTrace()); var o = GetOrigin(new StackTrace());
OnMessageSent(new MessageSentEventArgs(await t, o)); await OnMessageSent(new MessageSentEventArgs(await t, o));
return await t; return await t;
} }
@ -410,7 +411,7 @@ namespace TelegramBotBase.Sessions
var t = API(a => a.SendPhotoAsync(this.DeviceId, file, caption: caption, parseMode: parseMode, replyToMessageId: replyTo, replyMarkup: markup, disableNotification: disableNotification)); var t = API(a => a.SendPhotoAsync(this.DeviceId, file, caption: caption, parseMode: parseMode, replyToMessageId: replyTo, replyMarkup: markup, disableNotification: disableNotification));
var o = GetOrigin(new StackTrace()); var o = GetOrigin(new StackTrace());
OnMessageSent(new MessageSentEventArgs(await t, o)); await OnMessageSent(new MessageSentEventArgs(await t, o));
return await t; return await t;
} }
@ -440,7 +441,7 @@ namespace TelegramBotBase.Sessions
var t = API(a => a.SendVideoAsync(this.DeviceId, file, caption: caption, parseMode: parseMode, replyToMessageId: replyTo, replyMarkup: markup, disableNotification: disableNotification)); var t = API(a => a.SendVideoAsync(this.DeviceId, file, caption: caption, parseMode: parseMode, replyToMessageId: replyTo, replyMarkup: markup, disableNotification: disableNotification));
var o = GetOrigin(new StackTrace()); var o = GetOrigin(new StackTrace());
OnMessageSent(new MessageSentEventArgs(await t, o)); await OnMessageSent(new MessageSentEventArgs(await t, o));
return await t; return await t;
} }
@ -470,7 +471,7 @@ namespace TelegramBotBase.Sessions
var t = API(a => a.SendVideoAsync(this.DeviceId, new InputOnlineFile(url), parseMode: parseMode, replyToMessageId: replyTo, replyMarkup: markup, disableNotification: disableNotification)); var t = API(a => a.SendVideoAsync(this.DeviceId, new InputOnlineFile(url), parseMode: parseMode, replyToMessageId: replyTo, replyMarkup: markup, disableNotification: disableNotification));
var o = GetOrigin(new StackTrace()); var o = GetOrigin(new StackTrace());
OnMessageSent(new MessageSentEventArgs(await t, o)); await OnMessageSent(new MessageSentEventArgs(await t, o));
return await t; return await t;
} }
@ -505,7 +506,7 @@ namespace TelegramBotBase.Sessions
var t = API(a => a.SendVideoAsync(this.DeviceId, fts, parseMode: parseMode, replyToMessageId: replyTo, replyMarkup: markup, disableNotification: disableNotification)); var t = API(a => a.SendVideoAsync(this.DeviceId, fts, parseMode: parseMode, replyToMessageId: replyTo, replyMarkup: markup, disableNotification: disableNotification));
var o = GetOrigin(new StackTrace()); var o = GetOrigin(new StackTrace());
OnMessageSent(new MessageSentEventArgs(await t, o)); await OnMessageSent(new MessageSentEventArgs(await t, o));
return await t; return await t;
} }
@ -542,7 +543,7 @@ namespace TelegramBotBase.Sessions
var t = API(a => a.SendVideoAsync(this.DeviceId, fts, parseMode: parseMode, replyToMessageId: replyTo, replyMarkup: markup, disableNotification: disableNotification)); var t = API(a => a.SendVideoAsync(this.DeviceId, fts, parseMode: parseMode, replyToMessageId: replyTo, replyMarkup: markup, disableNotification: disableNotification));
var o = GetOrigin(new StackTrace()); var o = GetOrigin(new StackTrace());
OnMessageSent(new MessageSentEventArgs(await t, o)); await OnMessageSent(new MessageSentEventArgs(await t, o));
return await t; return await t;
} }
@ -619,7 +620,7 @@ namespace TelegramBotBase.Sessions
var t = API(a => a.SendDocumentAsync(this.DeviceId, document, caption, replyMarkup: markup, disableNotification: disableNotification, replyToMessageId: replyTo)); var t = API(a => a.SendDocumentAsync(this.DeviceId, document, caption, replyMarkup: markup, disableNotification: disableNotification, replyToMessageId: replyTo));
var o = GetOrigin(new StackTrace()); var o = GetOrigin(new StackTrace());
OnMessageSent(new MessageSentEventArgs(await t, o)); await OnMessageSent(new MessageSentEventArgs(await t, o));
return await t; return await t;
} }
@ -882,7 +883,7 @@ namespace TelegramBotBase.Sessions
/// <summary> /// <summary>
/// Eventhandler for sent messages /// Eventhandler for sent messages
/// </summary> /// </summary>
public event EventHandler<MessageSentEventArgs> MessageSent public event Base.Async.AsyncEventHandler<MessageSentEventArgs> MessageSent
{ {
add add
{ {
@ -895,9 +896,21 @@ namespace TelegramBotBase.Sessions
} }
public void OnMessageSent(MessageSentEventArgs e) public async Task OnMessageSent(MessageSentEventArgs e)
{ {
(this.__Events[__evMessageSent] as EventHandler<MessageSentEventArgs>)?.Invoke(this, e); if (e.Message == null)
return;
var handler = this.__Events[__evMessageSent]?.GetInvocationList().Cast<Base.Async.AsyncEventHandler<MessageSentEventArgs>>();
if (handler == null)
return;
foreach (var h in handler)
{
await Base.Async.InvokeAllAsync<MessageSentEventArgs>(h, this, e);
}
//(this.__Events[__evMessageSent] as EventHandler<MessageSentEventArgs>)?.Invoke(this, e);
} }
/// <summary> /// <summary>