Merge pull request 'location' (#19) from location into main

Reviewed-on: #19

LightlessSyncAPI/Data/Enum/GroupUserPreferredPermissions.cs

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

LightlessSyncAPI/Data/Enum/UserPermissions.cs

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

LightlessSyncAPI/Data/Extensions/GroupUserPermissionsExtensions.cs

@@ -23,6 +23,11 @@ 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)
     {
@@ -47,4 +52,10 @@ 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,6 +28,10 @@ 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)
     {
@@ -58,4 +62,10 @@ 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/User/LocationDto.cs

@@ -0,0 +1,9 @@
+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/Dto/User/LocationSharingDto.cs

@@ -1,15 +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);
-
-[MessagePackObject(keyAsPropertyName: true)]
-public record LocationWithTimeDto(LocationDto LocationDto, DateTimeOffset ExpireAt);
-
-[MessagePackObject(keyAsPropertyName: true)]
-public record SharingStatusDto(UserData User, DateTimeOffset ExpireAt);

LightlessSyncAPI/Dto/User/LocationSharingToggleDto.cs

@@ -1,6 +0,0 @@
-using MessagePack;
-
-namespace LightlessSync.API.Dto.User;
-
-[MessagePackObject(keyAsPropertyName: true)]
-public record LocationSharingToggleDto(List<string> users, DateTimeOffset duration);

LightlessSyncAPI/SignalR/ILightlessHub.cs

@@ -45,7 +45,7 @@ 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, DateTimeOffset expireAt);
+    Task Client_SendLocationToClient(LocationDto locationDto);
 
     Task<ConnectionDto> GetConnectionDto();
     Task<IReadOnlyList<ZoneChatChannelInfoDto>> GetZoneChatChannels();
@@ -118,7 +118,6 @@ public interface ILightlessHub
     Task SetChatParticipantMute(ChatParticipantMuteRequestDto request);
     
     Task UpdateLocation(LocationDto locationDto, bool offline);
-    Task<(List<LocationWithTimeDto>, List<SharingStatusDto>)> RequestAllLocationInfo();
-    Task<bool> ToggleLocationSharing(LocationSharingToggleDto dto);
+    Task<List<LocationDto>> RequestAllLocationInfo();
     
 }

LightlessSyncAPI/SignalR/ILightlessHubClient.cs

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