fix: remove obsolete properties & fix NRE
This commit is contained in:
@@ -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>
|
||||
|
||||
@@ -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
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user