diff --git a/LightlessSyncAPI/Data/Enum/UserPermissions.cs b/LightlessSyncAPI/Data/Enum/UserPermissions.cs index 7f92d42..7d875d7 100644 --- a/LightlessSyncAPI/Data/Enum/UserPermissions.cs +++ b/LightlessSyncAPI/Data/Enum/UserPermissions.cs @@ -9,5 +9,4 @@ public enum UserPermissions DisableSounds = 4, DisableVFX = 8, Sticky = 16, - ShareLocation = 32, } \ No newline at end of file diff --git a/LightlessSyncAPI/Data/Extensions/UserPermissionsExtensions.cs b/LightlessSyncAPI/Data/Extensions/UserPermissionsExtensions.cs index 63b516e..6357b8f 100644 --- a/LightlessSyncAPI/Data/Extensions/UserPermissionsExtensions.cs +++ b/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; - } } \ No newline at end of file diff --git a/LightlessSyncAPI/Dto/User/LocationSharingDto.cs b/LightlessSyncAPI/Dto/User/LocationSharingDto.cs index 57381c6..d0f949e 100644 --- a/LightlessSyncAPI/Dto/User/LocationSharingDto.cs +++ b/LightlessSyncAPI/Dto/User/LocationSharingDto.cs @@ -9,4 +9,7 @@ namespace LightlessSync.API.Dto.User; public record LocationDto(UserData User, LocationInfo Location); [MessagePackObject(keyAsPropertyName: true)] -public record LocationWithTimeDto(LocationDto Location, DateTimeOffset ExpireAt); \ No newline at end of file +public record LocationWithTimeDto(LocationDto Location, DateTimeOffset ExpireAt); + +[MessagePackObject(keyAsPropertyName: true)] +public record SharingStatusDto(UserData User, DateTimeOffset ExpireAt); diff --git a/LightlessSyncAPI/SignalR/ILightlessHub.cs b/LightlessSyncAPI/SignalR/ILightlessHub.cs index f271969..45af3f6 100644 --- a/LightlessSyncAPI/SignalR/ILightlessHub.cs +++ b/LightlessSyncAPI/SignalR/ILightlessHub.cs @@ -118,7 +118,7 @@ public interface ILightlessHub Task SetChatParticipantMute(ChatParticipantMuteRequestDto request); Task UpdateLocation(LocationDto locationDto, bool offline); - Task> RequestAllLocationInfo(); + Task<(List, List)> RequestAllLocationInfo(); Task ToggleLocationSharing(LocationSharingToggleDto dto); }