Updated to .net10

LightlessSyncAPI/Data/Enum/GroupPermissions.cs

@@ -1,12 +1,11 @@
 namespace LightlessSync.API.Data.Enum;
 
 [Flags]
-public enum GroupPermissions
-{
-    NoneSet = 0x0,
-    PreferDisableAnimations = 0x1,
-    PreferDisableSounds = 0x2,
-    DisableInvites = 0x4,
-    PreferDisableVFX = 0x8,
-    DisableChat = 0x10,
+public enum GroupPermissions
+{
+    NoneSet = 0x0,
+    PreferDisableAnimations = 0x1,
+    PreferDisableSounds = 0x2,
+    DisableInvites = 0x4,
+    PreferDisableVFX = 0x8,
 }

LightlessSyncAPI/Data/Enum/GroupUserPreferredPermissions.cs

@@ -8,5 +8,4 @@ public enum GroupUserPreferredPermissions
     DisableAnimations = 0x2,
     DisableSounds = 0x4,
     DisableVFX = 0x8,
-    ShareLocation = 0x10,
 }

LightlessSyncAPI/Data/Enum/UserPermissions.cs

@@ -9,5 +9,4 @@ public enum UserPermissions
     DisableSounds = 4,
     DisableVFX = 8,
     Sticky = 16,
-    ShareLocation = 32
 }

LightlessSyncAPI/Data/Extensions/GroupPermissionsExtensions.cs

@@ -19,16 +19,11 @@ public static class GroupPermissionsExtensions
         return perm.HasFlag(GroupPermissions.PreferDisableSounds);
     }
 
-    public static bool IsPreferDisableVFX(this GroupPermissions perm)
-    {
-        return perm.HasFlag(GroupPermissions.PreferDisableVFX);
-    }
-
-    public static bool IsDisableChat(this GroupPermissions perm)
-    {
-        return perm.HasFlag(GroupPermissions.DisableChat);
-    }
-
+    public static bool IsPreferDisableVFX(this GroupPermissions perm)
+    {
+        return perm.HasFlag(GroupPermissions.PreferDisableVFX);
+    }
+
     public static void SetDisableInvites(this ref GroupPermissions perm, bool set)
     {
         if (set) perm |= GroupPermissions.DisableInvites;
@@ -47,15 +42,9 @@ public static class GroupPermissionsExtensions
         else perm &= ~GroupPermissions.PreferDisableSounds;
     }
 
-    public static void SetPreferDisableVFX(this ref GroupPermissions perm, bool set)
-    {
-        if (set) 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;
-    }
+    public static void SetPreferDisableVFX(this ref GroupPermissions perm, bool set)
+    {
+        if (set) perm |= GroupPermissions.PreferDisableVFX;
+        else perm &= ~GroupPermissions.PreferDisableVFX;
+    }
 }

LightlessSyncAPI/Data/Extensions/GroupUserPermissionsExtensions.cs

@@ -23,11 +23,6 @@ public static class GroupUserPermissionsExtensions
     {
         return perm.HasFlag(GroupUserPreferredPermissions.Paused);
     }
-    
-    public static bool IsSharingLocation(this GroupUserPreferredPermissions perm)
-    {
-        return perm.HasFlag(GroupUserPreferredPermissions.ShareLocation);
-    }
 
     public static void SetDisableAnimations(this ref GroupUserPreferredPermissions perm, bool set)
     {
@@ -52,10 +47,4 @@ public static class GroupUserPermissionsExtensions
         if (set) perm |= GroupUserPreferredPermissions.Paused;
         else perm &= ~GroupUserPreferredPermissions.Paused;
     }
-    
-    public static void SetShareLocation(this ref GroupUserPreferredPermissions perm, bool set)
-    {
-        if (set) perm |= GroupUserPreferredPermissions.ShareLocation;
-        else perm &= ~GroupUserPreferredPermissions.ShareLocation;
-    }
 }

LightlessSyncAPI/Data/Extensions/UserPermissionsExtensions.cs

@@ -28,10 +28,6 @@ public static class UserPermissionsExtensions
     {
         return perm.HasFlag(UserPermissions.Sticky);
     }
-    public static bool IsSharingLocation(this UserPermissions perm)
-    {
-        return perm.HasFlag(UserPermissions.ShareLocation);
-    }
 
     public static void SetDisableAnimations(this ref UserPermissions perm, bool set)
     {
@@ -62,10 +58,4 @@ public static class UserPermissionsExtensions
         if (sticky) perm |= UserPermissions.Sticky;
         else perm &= ~UserPermissions.Sticky;
     }
-    
-    public static void SetShareLocation(this ref UserPermissions perm, bool? set)
-    {
-        if (set == true) perm |= UserPermissions.ShareLocation;
-        else perm &= ~UserPermissions.ShareLocation;
-    }
 }

LightlessSyncAPI/Dto/CharaData/CharaDataFullDto.cs

@@ -59,7 +59,6 @@ public record struct LocationInfo
     [Key(4)] public uint WardId { get; set; }
     [Key(5)] public uint HouseId { get; set; }
     [Key(6)] public uint RoomId { get; set; }
-    [Key(7)] public uint InstanceId { get; set; }
 }
 
 [MessagePackObject]

LightlessSyncAPI/Dto/Chat/ChatDtos.cs

@@ -61,10 +61,15 @@ public readonly record struct ChatReportSubmitDto(
     string? AdditionalContext);
 
 [MessagePackObject(keyAsPropertyName: true)]
-public readonly record struct ChatParticipantMuteRequestDto(
+public readonly record struct ChatParticipantResolveRequestDto(
     ChatChannelDescriptor Channel,
-    string Token,
-    bool Mute);
+    string Token);
+
+[MessagePackObject(keyAsPropertyName: true)]
+public readonly record struct ChatParticipantResolveResultDto(
+    ChatChannelDescriptor Channel,
+    ChatSenderDescriptor Sender,
+    UserProfileDto? Profile);
 
 [MessagePackObject(keyAsPropertyName: true)]
 public readonly record struct ZoneChatChannelInfoDto(

LightlessSyncAPI/Dto/Group/GroupFullInfoDto.cs

@@ -7,9 +7,8 @@ namespace LightlessSync.API.Dto.Group;
 [MessagePackObject(keyAsPropertyName: true)]
 public record GroupFullInfoDto(GroupData Group, UserData Owner, GroupPermissions GroupPermissions,
     GroupUserPreferredPermissions GroupUserPermissions, GroupPairUserInfo GroupUserInfo,
-    Dictionary<string, GroupPairUserInfo> GroupPairUserInfos, int GroupUserCount) : GroupInfoDto(Group, Owner, GroupPermissions)
+    Dictionary<string, GroupPairUserInfo> GroupPairUserInfos) : GroupInfoDto(Group, Owner, GroupPermissions)
 {
     public GroupUserPreferredPermissions GroupUserPermissions { get; set; } = GroupUserPermissions;
     public GroupPairUserInfo GroupUserInfo { get; set; } = GroupUserInfo;
-    public int GroupUserCount { get; set; } = GroupUserCount;
 }

LightlessSyncAPI/Dto/Group/GroupPruneSettingsDto.cs

@@ -1,7 +0,0 @@
-using LightlessSync.API.Data;
-using MessagePack;
-
-namespace LightlessSync.API.Dto.Group;
-
-[MessagePackObject(keyAsPropertyName: true)]
-public record GroupPruneSettingsDto(GroupData Group, bool AutoPruneEnabled, int AutoPruneDays);

LightlessSyncAPI/Dto/User/LocationDto.cs

@@ -1,9 +0,0 @@
-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);

LightlessSyncAPI/LightlessSync.API.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>

LightlessSyncAPI/SignalR/ILightlessHub.cs

@@ -8,9 +8,9 @@ using LightlessSync.API.Dto.User;
 
 namespace LightlessSync.API.SignalR;
 
-public interface ILightlessHub
-{
-    const int ApiVersion = 35;
+public interface ILightlessHub
+{
+    const int ApiVersion = 34;
     const string Path = "/lightless";
 
     Task<bool> CheckClientHealth();
@@ -45,11 +45,10 @@ public interface ILightlessHub
     Task Client_GposeLobbyPushPoseData(UserData userData, PoseData poseData);
     Task Client_GposeLobbyPushWorldData(UserData userData, WorldData worldData);
     Task Client_ChatReceive(ChatMessageDto message);
-    Task Client_SendLocationToClient(LocationDto locationDto);
 
-    Task<ConnectionDto> GetConnectionDto();
-    Task<IReadOnlyList<ZoneChatChannelInfoDto>> GetZoneChatChannels();
-    Task<IReadOnlyList<GroupChatChannelInfoDto>> GetGroupChatChannels();
+    Task<ConnectionDto> GetConnectionDto();
+    Task<IReadOnlyList<ZoneChatChannelInfoDto>> GetZoneChatChannels();
+    Task<IReadOnlyList<GroupChatChannelInfoDto>> GetGroupChatChannels();
 
     Task GroupBanUser(GroupPairDto dto, string reason);
     Task GroupChangeGroupPermissionState(GroupPermissionDto dto);
@@ -69,8 +68,6 @@ public interface ILightlessHub
     Task<GroupProfileDto> GroupGetProfile(GroupDto dto);
     Task GroupSetProfile(GroupProfileDto dto);
     Task GroupSetUserInfo(GroupPairUserInfoDto groupPair);
-    Task<GroupPruneSettingsDto> GroupGetPruneSettings(GroupDto dto);
-    Task GroupSetPruneSettings(GroupPruneSettingsDto dto);
     Task<List<GroupFullInfoDto>> GroupsGetAll();
     Task GroupUnbanUser(GroupPairDto groupPair);
     Task<int> GroupPrune(GroupDto group, int days, bool execute);
@@ -112,12 +109,8 @@ public interface ILightlessHub
     Task GposeLobbyPushCharacterData(CharaDataDownloadDto charaDownloadDto);
     Task GposeLobbyPushPoseData(PoseData poseData);
     Task GposeLobbyPushWorldData(WorldData worldData);
-    Task UpdateChatPresence(ChatPresenceUpdateDto presence);
-    Task SendChatMessage(ChatSendRequestDto request);
-    Task ReportChatMessage(ChatReportSubmitDto request);
-    Task SetChatParticipantMute(ChatParticipantMuteRequestDto request);
-    
-    Task UpdateLocation(LocationDto locationDto, bool offline);
-    Task<List<LocationDto>> RequestAllLocationInfo();
-    
-}
+    Task UpdateChatPresence(ChatPresenceUpdateDto presence);
+    Task SendChatMessage(ChatSendRequestDto request);
+    Task ReportChatMessage(ChatReportSubmitDto request);
+    Task<ChatParticipantResolveResultDto?> ResolveChatParticipant(ChatParticipantResolveRequestDto request);
+}

LightlessSyncAPI/SignalR/ILightlessHubClient.cs

@@ -58,5 +58,4 @@ public interface ILightlessHubClient : ILightlessHub
     void OnGposeLobbyPushCharacterData(Action<CharaDataDownloadDto> act);
     void OnGposeLobbyPushPoseData(Action<UserData, PoseData> act);
     void OnGposeLobbyPushWorldData(Action<UserData, WorldData> act);
-    void OnReciveLocation(Action<LocationDto> act);
 }