-
Notifications
You must be signed in to change notification settings - Fork 281
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Loading status checks…
fix: resolve conflict
Showing
16 changed files
with
391 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
namespace Lagrange.Core.Common.Entity; | ||
|
||
[Serializable] | ||
public class BotFriendRequest | ||
{ | ||
public BotFriendRequest(string targetUid, string sourceUid, uint eventState, string comment, string source, uint time) | ||
{ | ||
TargetUid = targetUid; | ||
SourceUid = sourceUid; | ||
EventState = (State)eventState; | ||
Comment = comment; | ||
Source = source; | ||
Time = DateTime.UnixEpoch.AddSeconds(time); | ||
} | ||
|
||
public string TargetUid { get; set; } | ||
|
||
public uint TargetUin { get; set; } | ||
|
||
public string SourceUid { get; set; } | ||
|
||
public uint SourceUin { get; set; } | ||
|
||
public State EventState { get; set; } | ||
|
||
|
||
public string Comment { get; set; } | ||
|
||
public string Source { get; set; } | ||
|
||
public DateTime Time { get; set; } | ||
|
||
public enum State | ||
{ | ||
Pending = 1, | ||
Disapproved = 2, | ||
Approved = 3, | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
Lagrange.Core/Internal/Event/Action/FetchGroupAtAllRemainEvent.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
namespace Lagrange.Core.Internal.Event.Action; | ||
|
||
internal class FetchGroupAtAllRemainEvent : ProtocolEvent | ||
{ | ||
public uint GroupUin { get; set; } | ||
|
||
public uint RemainAtAllCountForUin { get; set; } | ||
|
||
public uint RemainAtAllCountForGroup { get; set; } | ||
|
||
private FetchGroupAtAllRemainEvent(uint groupUin) : base(true) | ||
{ | ||
GroupUin = groupUin; | ||
} | ||
|
||
private FetchGroupAtAllRemainEvent(int resultCode, uint remainAtAllCountForUin, uint remainAtAllCountForGroup) : base(resultCode) | ||
{ | ||
RemainAtAllCountForUin = remainAtAllCountForUin; | ||
RemainAtAllCountForGroup = remainAtAllCountForGroup; | ||
} | ||
|
||
public static FetchGroupAtAllRemainEvent Create(uint groupUin) => new(groupUin); | ||
|
||
public static FetchGroupAtAllRemainEvent Result(int resultCode, uint remainAtAllCountForUin, uint remainAtAllCountForGroup) => | ||
new(resultCode, remainAtAllCountForUin, remainAtAllCountForGroup); | ||
} |
Oops, something went wrong.