Skip to content

Commit b8e7a10

Browse files
committed
[Core/Milky] Use UTC time for EventBase and remove LocalTimeToUnixTimeSeconds
1 parent 75252b7 commit b8e7a10

3 files changed

Lines changed: 11 additions & 10 deletions

File tree

Lagrange.Core/Events/EventBase.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@ namespace Lagrange.Core.Events;
22

33
public abstract class EventBase : System.EventArgs
44
{
5+
/// <summary>
6+
/// Local receipt time, not server arrival time.
7+
/// </summary>
58
public DateTime EventTime { get; }
69

7-
internal EventBase() => EventTime = DateTime.Now;
10+
internal EventBase() => EventTime = DateTime.UtcNow;
811

912
public abstract string ToEventMessage();
1013

Lagrange.Milky/Extension/DateTimeExtension.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,4 @@ namespace Lagrange.Milky.Extension;
33
public static class DateTimeExtension
44
{
55
public static long ToUnixTimeSeconds(this DateTime time) => new DateTimeOffset(time, TimeSpan.Zero).ToUnixTimeSeconds();
6-
7-
public static long LocalTimeToUnixTimeSeconds(this DateTime time) => new DateTimeOffset(time).ToUnixTimeSeconds();
86
}

Lagrange.Milky/Utility/EntityConvert.Event.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace Lagrange.Milky.Utility;
77
public partial class EntityConvert
88
{
99
public BotOfflineEvent BotOfflineEvent(LgrEventArgs.BotOfflineEvent @event) => new(
10-
@event.EventTime.LocalTimeToUnixTimeSeconds(),
10+
@event.EventTime.ToUnixTimeSeconds(),
1111
_bot.BotUin,
1212
new BotOfflineEventData($"{@event.Reason} {@event.Tips?.Tag} {@event.Tips?.Message}")
1313
);
@@ -19,13 +19,13 @@ public partial class EntityConvert
1919
);
2020

2121
public GroupNudgeEvent GroupNudgeEvent(LgrEventArgs.BotGroupNudgeEvent @event) => new(
22-
@event.EventTime.LocalTimeToUnixTimeSeconds(),
22+
@event.EventTime.ToUnixTimeSeconds(),
2323
_bot.BotUin,
2424
new GroupNudgeEventData(@event.GroupUin, @event.OperatorUin, @event.TargetUin, @event.Action, @event.Suffix, @event.ActionImageUrl)
2525
);
2626

2727
public GroupMemberIncreaseEvent GroupMemberIncreaseEvent(LgrEventArgs.BotGroupMemberIncreaseEvent @event) => new(
28-
@event.EventTime.LocalTimeToUnixTimeSeconds(),
28+
@event.EventTime.ToUnixTimeSeconds(),
2929
_bot.BotUin,
3030
new GroupMemberIncreaseEventData(
3131
@event.GroupUin,
@@ -36,7 +36,7 @@ public partial class EntityConvert
3636
);
3737

3838
public GroupMemberDecreaseEvent GroupMemberDecreaseEvent(LgrEventArgs.BotGroupMemberDecreaseEvent @event) => new(
39-
@event.EventTime.LocalTimeToUnixTimeSeconds(),
39+
@event.EventTime.ToUnixTimeSeconds(),
4040
_bot.BotUin,
4141
new GroupMemberDecreaseEventData(
4242
@event.GroupUin,
@@ -46,7 +46,7 @@ public partial class EntityConvert
4646
);
4747

4848
public FriendRequestEvent FriendRequestEvent(LgrEventArgs.BotFriendRequestEvent @event) => new(
49-
@event.EventTime.LocalTimeToUnixTimeSeconds(),
49+
@event.EventTime.ToUnixTimeSeconds(),
5050
_bot.BotUin,
5151
new FriendRequestEventData(
5252
@event.InitiatorUid,
@@ -57,7 +57,7 @@ public partial class EntityConvert
5757
);
5858

5959
public MessageRecallEvent MessageRecallEvent(LgrEventArgs.BotGroupRecallEvent @event) => new(
60-
@event.EventTime.LocalTimeToUnixTimeSeconds(),
60+
@event.EventTime.ToUnixTimeSeconds(),
6161
_bot.BotUin,
6262
new MessageRecallEventData(
6363
"group",
@@ -69,7 +69,7 @@ public partial class EntityConvert
6969
)
7070
);
7171
public MessageRecallEvent MessageRecallEvent(LgrEventArgs.BotFriendRecallEvent @event) => new(
72-
@event.EventTime.LocalTimeToUnixTimeSeconds(),
72+
@event.EventTime.ToUnixTimeSeconds(),
7373
_bot.BotUin,
7474
new MessageRecallEventData(
7575
"friend",

0 commit comments

Comments
 (0)