Compare commits
20 Commits
0170ac377d
...
location
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c3caa7e25c | ||
|
|
852e2a005f | ||
|
|
03243c93c6 | ||
|
|
f1817c5974 | ||
|
|
67cdf2c384 | ||
|
|
fdd492a8f4 | ||
|
|
9feb0b3c35 | ||
| 56566003e0 | |||
|
|
d78f9dafcc | ||
| 8e4432af45 | |||
|
|
d92496020e | ||
| 35f3390dda | |||
| efc0ef09f9 | |||
|
|
6b543529aa | ||
| dfb0594a5b | |||
|
|
8e7d7bf489 | ||
|
|
9b2fea6fa4 | ||
|
|
efb5a8072b | ||
|
|
8ea337ab2d | ||
|
|
b1d7ee5b34 |
@@ -8,4 +8,5 @@ public enum GroupPermissions
|
|||||||
PreferDisableSounds = 0x2,
|
PreferDisableSounds = 0x2,
|
||||||
DisableInvites = 0x4,
|
DisableInvites = 0x4,
|
||||||
PreferDisableVFX = 0x8,
|
PreferDisableVFX = 0x8,
|
||||||
|
DisableChat = 0x10,
|
||||||
}
|
}
|
||||||
@@ -24,6 +24,11 @@ public static class GroupPermissionsExtensions
|
|||||||
return perm.HasFlag(GroupPermissions.PreferDisableVFX);
|
return perm.HasFlag(GroupPermissions.PreferDisableVFX);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static bool IsDisableChat(this GroupPermissions perm)
|
||||||
|
{
|
||||||
|
return perm.HasFlag(GroupPermissions.DisableChat);
|
||||||
|
}
|
||||||
|
|
||||||
public static void SetDisableInvites(this ref GroupPermissions perm, bool set)
|
public static void SetDisableInvites(this ref GroupPermissions perm, bool set)
|
||||||
{
|
{
|
||||||
if (set) perm |= GroupPermissions.DisableInvites;
|
if (set) perm |= GroupPermissions.DisableInvites;
|
||||||
@@ -47,4 +52,10 @@ public static class GroupPermissionsExtensions
|
|||||||
if (set) perm |= GroupPermissions.PreferDisableVFX;
|
if (set) perm |= GroupPermissions.PreferDisableVFX;
|
||||||
else perm &= ~GroupPermissions.PreferDisableVFX;
|
else perm &= ~GroupPermissions.PreferDisableVFX;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void SetDisableChat(this ref GroupPermissions perm, bool set)
|
||||||
|
{
|
||||||
|
if (set) perm |= GroupPermissions.DisableChat;
|
||||||
|
else perm &= ~GroupPermissions.DisableChat;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -59,6 +59,7 @@ public record struct LocationInfo
|
|||||||
[Key(4)] public uint WardId { get; set; }
|
[Key(4)] public uint WardId { get; set; }
|
||||||
[Key(5)] public uint HouseId { get; set; }
|
[Key(5)] public uint HouseId { get; set; }
|
||||||
[Key(6)] public uint RoomId { get; set; }
|
[Key(6)] public uint RoomId { get; set; }
|
||||||
|
[Key(7)] public uint InstanceId { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
[MessagePackObject]
|
[MessagePackObject]
|
||||||
|
|||||||
@@ -61,15 +61,10 @@ public readonly record struct ChatReportSubmitDto(
|
|||||||
string? AdditionalContext);
|
string? AdditionalContext);
|
||||||
|
|
||||||
[MessagePackObject(keyAsPropertyName: true)]
|
[MessagePackObject(keyAsPropertyName: true)]
|
||||||
public readonly record struct ChatParticipantResolveRequestDto(
|
public readonly record struct ChatParticipantMuteRequestDto(
|
||||||
ChatChannelDescriptor Channel,
|
ChatChannelDescriptor Channel,
|
||||||
string Token);
|
string Token,
|
||||||
|
bool Mute);
|
||||||
[MessagePackObject(keyAsPropertyName: true)]
|
|
||||||
public readonly record struct ChatParticipantResolveResultDto(
|
|
||||||
ChatChannelDescriptor Channel,
|
|
||||||
ChatSenderDescriptor Sender,
|
|
||||||
UserProfileDto? Profile);
|
|
||||||
|
|
||||||
[MessagePackObject(keyAsPropertyName: true)]
|
[MessagePackObject(keyAsPropertyName: true)]
|
||||||
public readonly record struct ZoneChatChannelInfoDto(
|
public readonly record struct ZoneChatChannelInfoDto(
|
||||||
|
|||||||
@@ -7,8 +7,9 @@ namespace LightlessSync.API.Dto.Group;
|
|||||||
[MessagePackObject(keyAsPropertyName: true)]
|
[MessagePackObject(keyAsPropertyName: true)]
|
||||||
public record GroupFullInfoDto(GroupData Group, UserData Owner, GroupPermissions GroupPermissions,
|
public record GroupFullInfoDto(GroupData Group, UserData Owner, GroupPermissions GroupPermissions,
|
||||||
GroupUserPreferredPermissions GroupUserPermissions, GroupPairUserInfo GroupUserInfo,
|
GroupUserPreferredPermissions GroupUserPermissions, GroupPairUserInfo GroupUserInfo,
|
||||||
Dictionary<string, GroupPairUserInfo> GroupPairUserInfos) : GroupInfoDto(Group, Owner, GroupPermissions)
|
Dictionary<string, GroupPairUserInfo> GroupPairUserInfos, int GroupUserCount) : GroupInfoDto(Group, Owner, GroupPermissions)
|
||||||
{
|
{
|
||||||
public GroupUserPreferredPermissions GroupUserPermissions { get; set; } = GroupUserPermissions;
|
public GroupUserPreferredPermissions GroupUserPermissions { get; set; } = GroupUserPermissions;
|
||||||
public GroupPairUserInfo GroupUserInfo { get; set; } = GroupUserInfo;
|
public GroupPairUserInfo GroupUserInfo { get; set; } = GroupUserInfo;
|
||||||
|
public int GroupUserCount { get; set; } = GroupUserCount;
|
||||||
}
|
}
|
||||||
7
LightlessSyncAPI/Dto/Group/GroupPruneSettingsDto.cs
Normal file
7
LightlessSyncAPI/Dto/Group/GroupPruneSettingsDto.cs
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
using LightlessSync.API.Data;
|
||||||
|
using MessagePack;
|
||||||
|
|
||||||
|
namespace LightlessSync.API.Dto.Group;
|
||||||
|
|
||||||
|
[MessagePackObject(keyAsPropertyName: true)]
|
||||||
|
public record GroupPruneSettingsDto(GroupData Group, bool AutoPruneEnabled, int AutoPruneDays);
|
||||||
15
LightlessSyncAPI/Dto/User/LocationSharingDto.cs
Normal file
15
LightlessSyncAPI/Dto/User/LocationSharingDto.cs
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
using LightlessSync.API.Data;
|
||||||
|
using LightlessSync.API.Dto.CharaData;
|
||||||
|
using MessagePack;
|
||||||
|
|
||||||
|
namespace LightlessSync.API.Dto.User;
|
||||||
|
|
||||||
|
|
||||||
|
[MessagePackObject(keyAsPropertyName: true)]
|
||||||
|
public record LocationDto(UserData User, LocationInfo Location);
|
||||||
|
|
||||||
|
[MessagePackObject(keyAsPropertyName: true)]
|
||||||
|
public record LocationWithTimeDto(LocationDto LocationDto, DateTimeOffset ExpireAt);
|
||||||
|
|
||||||
|
[MessagePackObject(keyAsPropertyName: true)]
|
||||||
|
public record SharingStatusDto(UserData User, DateTimeOffset ExpireAt);
|
||||||
6
LightlessSyncAPI/Dto/User/LocationSharingToggleDto.cs
Normal file
6
LightlessSyncAPI/Dto/User/LocationSharingToggleDto.cs
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
using MessagePack;
|
||||||
|
|
||||||
|
namespace LightlessSync.API.Dto.User;
|
||||||
|
|
||||||
|
[MessagePackObject(keyAsPropertyName: true)]
|
||||||
|
public record LocationSharingToggleDto(List<string> users, DateTimeOffset duration);
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ namespace LightlessSync.API.SignalR;
|
|||||||
|
|
||||||
public interface ILightlessHub
|
public interface ILightlessHub
|
||||||
{
|
{
|
||||||
const int ApiVersion = 34;
|
const int ApiVersion = 35;
|
||||||
const string Path = "/lightless";
|
const string Path = "/lightless";
|
||||||
|
|
||||||
Task<bool> CheckClientHealth();
|
Task<bool> CheckClientHealth();
|
||||||
@@ -45,6 +45,7 @@ public interface ILightlessHub
|
|||||||
Task Client_GposeLobbyPushPoseData(UserData userData, PoseData poseData);
|
Task Client_GposeLobbyPushPoseData(UserData userData, PoseData poseData);
|
||||||
Task Client_GposeLobbyPushWorldData(UserData userData, WorldData worldData);
|
Task Client_GposeLobbyPushWorldData(UserData userData, WorldData worldData);
|
||||||
Task Client_ChatReceive(ChatMessageDto message);
|
Task Client_ChatReceive(ChatMessageDto message);
|
||||||
|
Task Client_SendLocationToClient(LocationDto locationDto, DateTimeOffset expireAt);
|
||||||
|
|
||||||
Task<ConnectionDto> GetConnectionDto();
|
Task<ConnectionDto> GetConnectionDto();
|
||||||
Task<IReadOnlyList<ZoneChatChannelInfoDto>> GetZoneChatChannels();
|
Task<IReadOnlyList<ZoneChatChannelInfoDto>> GetZoneChatChannels();
|
||||||
@@ -68,6 +69,8 @@ public interface ILightlessHub
|
|||||||
Task<GroupProfileDto> GroupGetProfile(GroupDto dto);
|
Task<GroupProfileDto> GroupGetProfile(GroupDto dto);
|
||||||
Task GroupSetProfile(GroupProfileDto dto);
|
Task GroupSetProfile(GroupProfileDto dto);
|
||||||
Task GroupSetUserInfo(GroupPairUserInfoDto groupPair);
|
Task GroupSetUserInfo(GroupPairUserInfoDto groupPair);
|
||||||
|
Task<GroupPruneSettingsDto> GroupGetPruneSettings(GroupDto dto);
|
||||||
|
Task GroupSetPruneSettings(GroupPruneSettingsDto dto);
|
||||||
Task<List<GroupFullInfoDto>> GroupsGetAll();
|
Task<List<GroupFullInfoDto>> GroupsGetAll();
|
||||||
Task GroupUnbanUser(GroupPairDto groupPair);
|
Task GroupUnbanUser(GroupPairDto groupPair);
|
||||||
Task<int> GroupPrune(GroupDto group, int days, bool execute);
|
Task<int> GroupPrune(GroupDto group, int days, bool execute);
|
||||||
@@ -112,5 +115,10 @@ public interface ILightlessHub
|
|||||||
Task UpdateChatPresence(ChatPresenceUpdateDto presence);
|
Task UpdateChatPresence(ChatPresenceUpdateDto presence);
|
||||||
Task SendChatMessage(ChatSendRequestDto request);
|
Task SendChatMessage(ChatSendRequestDto request);
|
||||||
Task ReportChatMessage(ChatReportSubmitDto request);
|
Task ReportChatMessage(ChatReportSubmitDto request);
|
||||||
Task<ChatParticipantResolveResultDto?> ResolveChatParticipant(ChatParticipantResolveRequestDto request);
|
Task SetChatParticipantMute(ChatParticipantMuteRequestDto request);
|
||||||
|
|
||||||
|
Task UpdateLocation(LocationDto locationDto, bool offline);
|
||||||
|
Task<(List<LocationWithTimeDto>, List<SharingStatusDto>)> RequestAllLocationInfo();
|
||||||
|
Task<bool> ToggleLocationSharing(LocationSharingToggleDto dto);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -58,4 +58,5 @@ public interface ILightlessHubClient : ILightlessHub
|
|||||||
void OnGposeLobbyPushCharacterData(Action<CharaDataDownloadDto> act);
|
void OnGposeLobbyPushCharacterData(Action<CharaDataDownloadDto> act);
|
||||||
void OnGposeLobbyPushPoseData(Action<UserData, PoseData> act);
|
void OnGposeLobbyPushPoseData(Action<UserData, PoseData> act);
|
||||||
void OnGposeLobbyPushWorldData(Action<UserData, WorldData> act);
|
void OnGposeLobbyPushWorldData(Action<UserData, WorldData> act);
|
||||||
|
void OnReceiveLocation(Action<LocationDto, DateTimeOffset> act);
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user