fix: remove obsolete properties & fix NRE

This commit is contained in:
ZavaruKitsu
2022-10-08 20:37:35 +03:00
parent d566cf858e
commit 8d02b54b05
9 changed files with 28 additions and 45 deletions
+8 -1
View File
@@ -33,7 +33,7 @@ public class MessageResult : ResultBase
/// <summary>
/// The message id
/// </summary>
public new int MessageId =>
public override int MessageId =>
UpdateData?.Message?.MessageId
?? Message?.MessageId
?? UpdateData?.CallbackQuery?.Message?.MessageId
@@ -45,6 +45,13 @@ public class MessageResult : ResultBase
public MessageType MessageType => Message?.Type ?? MessageType.Unknown;
public override Message Message =>
UpdateData?.Message
?? UpdateData?.EditedMessage
?? UpdateData?.ChannelPost
?? UpdateData?.EditedChannelPost
?? UpdateData?.CallbackQuery?.Message;
/// <summary>
/// Is this an action ? (i.e. button click)
/// </summary>
+2 -2
View File
@@ -12,7 +12,7 @@ public class ResultBase : EventArgs
public virtual long DeviceId { get; set; }
public int MessageId => Message.MessageId;
public virtual int MessageId => Message.MessageId;
public virtual Message Message { get; set; }
@@ -42,4 +42,4 @@ public class ResultBase : EventArgs
{
}
}
}
}