Share Location

.gitignore

@@ -351,6 +351,4 @@ MigrationBackup/
 
 # docker run data
 Docker/run/data/
-
-#idea files
-*.idea
+*.idea

LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.ClientStubs.cs

@@ -40,6 +40,6 @@ namespace LightlessSyncServer.Hubs
         public Task Client_GposeLobbyPushPoseData(UserData userData, PoseData poseData) => throw new PlatformNotSupportedException("Calling clientside method on server not supported");
         public Task Client_GposeLobbyPushWorldData(UserData userData, WorldData worldData) => throw new PlatformNotSupportedException("Calling clientside method on server not supported");
         public Task Client_ChatReceive(ChatMessageDto message) => throw new PlatformNotSupportedException("Calling clientside method on server not supported");
-        public Task Client_SendLocationToClient(LocationDto locationDto, DateTimeOffset expireAt) => throw new PlatformNotSupportedException("Calling clientside method on server not supported");
+        public Task Client_SendLocationToClient(LocationDto locationDto) => throw new PlatformNotSupportedException("Calling clientside method on server not supported");
     }
 }

LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Functions.cs

@@ -585,6 +585,11 @@ public partial class LightlessHub
 
         return await result.Distinct().AsNoTracking().ToListAsync().ConfigureAwait(false);
     }
+    
+    private async Task CleanVisibilityCacheFromRedis()
+    {
+        await _redis.RemoveAsync($"Visibility:{UserUID}", CommandFlags.FireAndForget).ConfigureAwait(false);
+    }
 
     public record UserInfo(
         string Alias,

LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Groups.cs

@@ -28,72 +28,25 @@ public partial class LightlessHub
         var (userHasRights, group) = await TryValidateGroupModeratorOrOwner(dto.Group.GID).ConfigureAwait(false);
         if (!userHasRights) return;
 
-        var targetUid = dto.User.UID?.Trim();
-        if (string.IsNullOrWhiteSpace(targetUid)) return;
+        var (userExists, groupPair) = await TryValidateUserInGroup(dto.Group.GID, dto.User.UID).ConfigureAwait(false);
+        if (!userExists) return;
 
-        if (string.Equals(group.OwnerUID, targetUid, StringComparison.Ordinal))
-            return;
+        if (groupPair.IsModerator || string.Equals(group.OwnerUID, dto.User.UID, StringComparison.Ordinal)) return;
 
-        var groupPair = await DbContext.GroupPairs
-            .Include(p => p.GroupUser)
-            .SingleOrDefaultAsync(p => p.GroupGID == dto.Group.GID && p.GroupUserUID == targetUid, cancellationToken: RequestAbortedToken).ConfigureAwait(false);
-
-        if (groupPair?.IsModerator == true)
-            return;
-
-        var now = DateTime.UtcNow;
-
-        var existingBan = await DbContext.Set<GroupBan>().SingleOrDefaultAsync(b => b.GroupGID == dto.Group.GID && b.BannedUserUID == targetUid, cancellationToken: RequestAbortedToken).ConfigureAwait(false);
-        var userExists = await DbContext.Users.AsNoTracking().AnyAsync(u => u.UID == targetUid || u.Alias == targetUid, RequestAbortedToken).ConfigureAwait(false);
-
-        if (!userExists && existingBan == null)
-            return;
-
-        const string marker = " (Alias at time of ban:";
-        string suffix;
-
-        if (existingBan?.BannedReason is { } existingReason)
+        var alias = string.IsNullOrEmpty(groupPair.GroupUser.Alias) ? "-" : groupPair.GroupUser.Alias;
+        var ban = new GroupBan()
         {
-            var idx = existingReason.IndexOf(marker, StringComparison.Ordinal);
-            suffix = idx >= 0 ? existingReason.Substring(startIndex: idx) : string.Empty;
-        }
-        else
-        {
-            var alias = groupPair?.GroupUser?.Alias;
-            alias = string.IsNullOrWhiteSpace(alias) ? "-" : alias;
-            suffix = $" (Alias at time of ban: {alias})";
-        }
+            BannedByUID = UserUID,
+            BannedReason = $"{reason} (Alias at time of ban: {alias})",
+            BannedOn = DateTime.UtcNow,
+            BannedUserUID = dto.User.UID,
+            GroupGID = dto.Group.GID,
+        };
 
-        var baseReason = (reason ?? string.Empty).Trim();
-        var finalReason = string.IsNullOrEmpty(suffix) ? baseReason : (baseReason + suffix);
+        DbContext.Add(ban);
+        await DbContext.SaveChangesAsync().ConfigureAwait(false);
 
-        if (existingBan != null)
-        {
-            existingBan.BannedByUID = UserUID;
-            existingBan.BannedReason = finalReason;
-
-            DbContext.Update(existingBan);
-        }
-        else
-        {
-            var ban = new GroupBan
-            {
-                BannedByUID = UserUID,
-                BannedReason = finalReason,
-                BannedOn = now,
-                BannedUserUID = targetUid,
-                GroupGID = dto.Group.GID,
-            };
-
-            DbContext.Add(ban);
-        }
-
-        await DbContext.SaveChangesAsync(RequestAbortedToken).ConfigureAwait(false);
-
-        if (groupPair != null)
-        {
-            await GroupRemoveUser(dto).ConfigureAwait(false);
-        }
+        await GroupRemoveUser(dto).ConfigureAwait(false);
 
         _logger.LogCallInfo(LightlessHubLogger.Args(dto, "Success"));
     }
@@ -373,7 +326,7 @@ public partial class LightlessHub
         await Clients.User(UserUID).Client_GroupSendFullInfo(new GroupFullInfoDto(newGroup.ToGroupData(), self.ToUserData(),
             newGroup.ToEnum(), initialPrefPermissions.ToEnum(), initialPair.ToEnum(), new(StringComparer.Ordinal), 1))
             .ConfigureAwait(false);
-
+        
         _logger.LogCallInfo(LightlessHubLogger.Args(gid));
 
         return new GroupJoinDto(newGroup.ToGroupData(), passwd, initialPrefPermissions.ToEnum());
@@ -447,9 +400,9 @@ public partial class LightlessHub
 
         var banEntries = await DbContext.GroupBans.Include(b => b.BannedUser).Where(g => g.GroupGID == dto.Group.GID).AsNoTracking().ToListAsync(cancellationToken: RequestAbortedToken).ConfigureAwait(false);
 
-        List<BannedGroupUserDto> bannedGroupUsers = [.. banEntries.Select(b =>
+        List<BannedGroupUserDto> bannedGroupUsers = banEntries.Select(b =>
             new BannedGroupUserDto(group.ToGroupData(), b.BannedUser.ToUserData(), b.BannedReason, b.BannedOn,
-                b.BannedByUID))];
+                b.BannedByUID)).ToList();
 
         _logger.LogCallInfo(LightlessHubLogger.Args(dto, bannedGroupUsers.Count));
 
@@ -551,6 +504,7 @@ public partial class LightlessHub
             preferredPermissions.DisableVFX = dto.GroupUserPreferredPermissions.IsDisableVFX();
             preferredPermissions.DisableAnimations = dto.GroupUserPreferredPermissions.IsDisableAnimations();
             preferredPermissions.IsPaused = false;
+            preferredPermissions.ShareLocation = dto.GroupUserPreferredPermissions.IsSharingLocation();
             DbContext.Update(preferredPermissions);
         }
 
@@ -596,7 +550,8 @@ public partial class LightlessHub
                         DisableSounds = preferredPermissions.DisableSounds,
                         DisableVFX = preferredPermissions.DisableVFX,
                         IsPaused = preferredPermissions.IsPaused,
-                        Sticky = false
+                        Sticky = false,
+                        ShareLocation = preferredPermissions.ShareLocation,
                     };
 
                     await DbContext.Permissions.AddAsync(ownPermissionsToOther).ConfigureAwait(false);
@@ -608,6 +563,7 @@ public partial class LightlessHub
                     existingPermissionsOnDb.DisableVFX = preferredPermissions.DisableVFX;
                     existingPermissionsOnDb.IsPaused = false;
                     existingPermissionsOnDb.Sticky = false;
+                    existingPermissionsOnDb.ShareLocation = preferredPermissions.ShareLocation;
 
                     DbContext.Update(existingPermissionsOnDb);
 
@@ -623,6 +579,7 @@ public partial class LightlessHub
                 ownPermissionsToOther.DisableVFX = preferredPermissions.DisableVFX;
                 ownPermissionsToOther.DisableSounds = preferredPermissions.DisableSounds;
                 ownPermissionsToOther.IsPaused = false;
+                ownPermissionsToOther.ShareLocation = preferredPermissions.ShareLocation;
 
                 DbContext.Update(ownPermissionsToOther);
             }
@@ -644,7 +601,8 @@ public partial class LightlessHub
                         DisableSounds = otherPreferred.DisableSounds,
                         DisableVFX = otherPreferred.DisableVFX,
                         IsPaused = otherPreferred.IsPaused,
-                        Sticky = false
+                        Sticky = false,
+                        ShareLocation = otherPreferred.ShareLocation,
                     };
 
                     await DbContext.AddAsync(otherExistingPermsOnDb).ConfigureAwait(false);
@@ -656,6 +614,7 @@ public partial class LightlessHub
                     otherExistingPermsOnDb.DisableSounds = otherPreferred.DisableSounds;
                     otherExistingPermsOnDb.DisableVFX = otherPreferred.DisableVFX;
                     otherExistingPermsOnDb.IsPaused = otherPreferred.IsPaused;
+                    otherExistingPermsOnDb.ShareLocation = otherPreferred.ShareLocation;
 
                     DbContext.Update(otherExistingPermsOnDb);
                 }
@@ -669,6 +628,7 @@ public partial class LightlessHub
                 otherPermissionToSelf.DisableSounds = otherPreferred.DisableSounds;
                 otherPermissionToSelf.DisableVFX = otherPreferred.DisableVFX;
                 otherPermissionToSelf.IsPaused = otherPreferred.IsPaused;
+                otherPermissionToSelf.ShareLocation = otherPreferred.ShareLocation;
 
                 DbContext.Update(otherPermissionToSelf);
             }
@@ -878,7 +838,7 @@ public partial class LightlessHub
         }
 
         var data = await DbContext.GroupProfiles
-            .Include(gp => gp.Group)
+            .Include(gp => gp.Group) 
             .FirstOrDefaultAsync(
                 g => g.Group.GID == dto.Group.GID || g.Group.Alias == dto.Group.AliasOrGID,
                 cancellationToken
@@ -909,85 +869,85 @@ public partial class LightlessHub
     [Authorize(Policy = "Identified")]
     public async Task GroupSetProfile(GroupProfileDto dto)
     {
-        _logger.LogCallInfo(LightlessHubLogger.Args(dto));
+            _logger.LogCallInfo(LightlessHubLogger.Args(dto));
 
-        var cancellationToken = RequestAbortedToken;
+            var cancellationToken = RequestAbortedToken;
 
-        if (dto.Group == null) return;
+            if (dto.Group == null) return;
 
-        var (hasRights, group) = await TryValidateGroupModeratorOrOwner(dto.Group.GID).ConfigureAwait(false);
-        if (!hasRights) return;
+            var (hasRights, group) = await TryValidateGroupModeratorOrOwner(dto.Group.GID).ConfigureAwait(false);
+            if (!hasRights) return;
 
-        var groupProfileDb = await DbContext.GroupProfiles
-            .Include(g => g.Group)
-            .FirstOrDefaultAsync(g => g.GroupGID == dto.Group.GID, cancellationToken)
-            .ConfigureAwait(false);
-
-        ImageCheckService.ImageLoadResult profileResult = new();
-        ImageCheckService.ImageLoadResult bannerResult = new();
-
-        //Avatar image validation
-        if (!string.IsNullOrEmpty(dto.PictureBase64))
-        {
-            profileResult = await ImageCheckService.ValidateImageAsync(dto.PictureBase64, banner: false, RequestAbortedToken).ConfigureAwait(false);
-
-            if (!profileResult.Success)
-            {
-                await Clients.Caller.Client_ReceiveServerMessage(MessageSeverity.Error, profileResult.ErrorMessage).ConfigureAwait(false);
-                return;
-            }
-        }
-
-        //Banner image validation
-        if (!string.IsNullOrEmpty(dto.BannerBase64))
-        {
-            bannerResult = await ImageCheckService.ValidateImageAsync(dto.BannerBase64, banner: true, RequestAbortedToken).ConfigureAwait(false);
-
-            if (!bannerResult.Success)
-            {
-                await Clients.Caller.Client_ReceiveServerMessage(MessageSeverity.Error, bannerResult.ErrorMessage).ConfigureAwait(false);
-                return;
-            }
-        }
-
-        var sanitizedProfileImage = profileResult?.Base64Image;
-        var sanitizedBannerImage = bannerResult?.Base64Image;
-
-        if (groupProfileDb == null)
-        {
-            groupProfileDb = new GroupProfile
-            {
-                GroupGID = dto.Group.GID,
-                Group = group,
-                ProfileDisabled = dto.IsDisabled ?? false,
-                IsNSFW = dto.IsNsfw ?? false,
-
-            };
-
-            groupProfileDb.UpdateProfileFromDto(dto, sanitizedProfileImage, sanitizedBannerImage);
-            await DbContext.GroupProfiles.AddAsync(groupProfileDb, cancellationToken).ConfigureAwait(false);
-        }
-        else
-        {
-            groupProfileDb.Group ??= group;
-
-            groupProfileDb.UpdateProfileFromDto(dto, sanitizedProfileImage, sanitizedBannerImage);
-        }
-
-        var userIds = await DbContext.GroupPairs
-            .Where(p => p.GroupGID == groupProfileDb.GroupGID)
-            .Select(p => p.GroupUserUID)
-            .ToListAsync(cancellationToken)
-            .ConfigureAwait(false);
-
-        if (userIds.Count > 0)
-        {
-            var profileDto = groupProfileDb.ToDTO();
-            await Clients.Users(userIds).Client_GroupSendProfile(profileDto)
+            var groupProfileDb = await DbContext.GroupProfiles
+                .Include(g => g.Group)
+                .FirstOrDefaultAsync(g => g.GroupGID == dto.Group.GID, cancellationToken)
                 .ConfigureAwait(false);
-        }
 
-        await DbContext.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
+            ImageCheckService.ImageLoadResult profileResult = new();
+            ImageCheckService.ImageLoadResult bannerResult = new();
+
+            //Avatar image validation
+            if (!string.IsNullOrEmpty(dto.PictureBase64))
+            {
+                profileResult = await ImageCheckService.ValidateImageAsync(dto.PictureBase64, banner: false, RequestAbortedToken).ConfigureAwait(false);
+
+                if (!profileResult.Success)
+                {
+                    await Clients.Caller.Client_ReceiveServerMessage(MessageSeverity.Error, profileResult.ErrorMessage).ConfigureAwait(false);
+                    return;
+                }
+            }
+
+            //Banner image validation
+            if (!string.IsNullOrEmpty(dto.BannerBase64))
+            {
+                bannerResult = await ImageCheckService.ValidateImageAsync(dto.BannerBase64, banner: true, RequestAbortedToken).ConfigureAwait(false);
+
+                if (!bannerResult.Success)
+                {
+                    await Clients.Caller.Client_ReceiveServerMessage(MessageSeverity.Error, bannerResult.ErrorMessage).ConfigureAwait(false);
+                    return;
+                }
+            }
+
+            var sanitizedProfileImage = profileResult?.Base64Image;
+            var sanitizedBannerImage = bannerResult?.Base64Image;
+
+            if (groupProfileDb == null)
+            {
+                groupProfileDb = new GroupProfile
+                {
+                    GroupGID = dto.Group.GID,
+                    Group = group,
+                    ProfileDisabled = dto.IsDisabled ?? false,
+                    IsNSFW = dto.IsNsfw ?? false,
+                    
+                };
+
+                groupProfileDb.UpdateProfileFromDto(dto, sanitizedProfileImage, sanitizedBannerImage);
+                await DbContext.GroupProfiles.AddAsync(groupProfileDb, cancellationToken).ConfigureAwait(false);
+            }
+            else
+            {
+                groupProfileDb.Group ??= group;
+
+                groupProfileDb.UpdateProfileFromDto(dto, sanitizedProfileImage, sanitizedBannerImage);
+            }
+
+            var userIds = await DbContext.GroupPairs
+                .Where(p => p.GroupGID == groupProfileDb.GroupGID)
+                .Select(p => p.GroupUserUID)
+                .ToListAsync(cancellationToken)
+                .ConfigureAwait(false);
+
+            if (userIds.Count > 0)
+            {
+                var profileDto = groupProfileDb.ToDTO();
+                await Clients.Users(userIds).Client_GroupSendProfile(profileDto)
+                    .ConfigureAwait(false);
+            }
+
+            await DbContext.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
     }
 
     [Authorize(Policy = "Identified")]
@@ -1150,11 +1110,11 @@ public partial class LightlessHub
             return false;
         }
 
-        var (isOwnerOrMod, _) = await TryValidateGroupModeratorOrOwner(dto.GID).ConfigureAwait(false);
-        if (!isOwnerOrMod)
+        var (isOwner, _) = await TryValidateOwner(dto.GID).ConfigureAwait(false);
+        if (!isOwner)
         {
             _logger.LogCallWarning(LightlessHubLogger.Args("Unauthorized syncshell broadcast change", "User", UserUID, "GID", dto.GID));
-            await Clients.Caller.Client_ReceiveServerMessage(MessageSeverity.Error, "You must be the owner or moderator of the syncshell to broadcast it.");
+            await Clients.Caller.Client_ReceiveServerMessage(MessageSeverity.Error, "You must be the owner of the syncshell to broadcast it.");
             return false;
         }
 

LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Permissions.cs

@@ -66,6 +66,7 @@ public partial class LightlessHub
             prevPermissions.DisableSounds = newPerm.IsDisableSounds();
             prevPermissions.DisableVFX = newPerm.IsDisableVFX();
             prevPermissions.Sticky = newPerm.IsSticky() || setSticky;
+            prevPermissions.ShareLocation = newPerm.IsSharingLocation();
             DbContext.Update(prevPermissions);
 
             // send updated data to pair
@@ -112,6 +113,7 @@ public partial class LightlessHub
             groupPreferredPermissions.DisableAnimations = group.Value.IsDisableAnimations();
             groupPreferredPermissions.IsPaused = group.Value.IsPaused();
             groupPreferredPermissions.DisableVFX = group.Value.IsDisableVFX();
+            groupPreferredPermissions.ShareLocation = group.Value.IsSharingLocation();
 
             var nonStickyPairs = allUsers.Where(u => !u.Value.OwnPermissions.Sticky).ToList();
             var affectedGroupPairs = nonStickyPairs.Where(u => u.Value.GIDs.Contains(group.Key, StringComparer.Ordinal)).ToList();
@@ -126,6 +128,7 @@ public partial class LightlessHub
                 perm.DisableAnimations = groupPreferredPermissions.DisableAnimations;
                 perm.IsPaused = groupPreferredPermissions.IsPaused;
                 perm.DisableVFX = groupPreferredPermissions.DisableVFX;
+                perm.ShareLocation = groupPreferredPermissions.ShareLocation;
             }
 
             UserPermissions permissions = UserPermissions.NoneSet;
@@ -133,6 +136,7 @@ public partial class LightlessHub
             permissions.SetDisableAnimations(groupPreferredPermissions.DisableAnimations);
             permissions.SetDisableSounds(groupPreferredPermissions.DisableSounds);
             permissions.SetDisableVFX(groupPreferredPermissions.DisableVFX);
+            permissions.SetShareLocation(groupPreferredPermissions.ShareLocation);
 
             await Clients.Users(affectedGroupPairs
                 .Select(k => k.Key))

LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.User.cs

@@ -12,6 +12,8 @@ using LightlessSyncShared.Utils;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.EntityFrameworkCore;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.PixelFormats;
 using StackExchange.Redis;
 using System.Text;
 using System.Text.Json;
@@ -84,7 +86,8 @@ public partial class LightlessHub
                 DisableSounds = ownDefaultPermissions.DisableIndividualSounds,
                 DisableVFX = ownDefaultPermissions.DisableIndividualVFX,
                 IsPaused = false,
-                Sticky = true
+                Sticky = true,
+                ShareLocation = false,
             };
 
             var existingDbPerms = await DbContext.Permissions.SingleOrDefaultAsync(u => u.UserUID == UserUID && u.OtherUserUID == otherUser.UID, cancellationToken: RequestAbortedToken).ConfigureAwait(false);
@@ -99,6 +102,7 @@ public partial class LightlessHub
                 existingDbPerms.DisableVFX = permissions.DisableVFX;
                 existingDbPerms.IsPaused = false;
                 existingDbPerms.Sticky = true;
+                existingDbPerms.ShareLocation = permissions.ShareLocation;
 
                 DbContext.Permissions.Update(existingDbPerms);
             }
@@ -1231,118 +1235,82 @@ public partial class LightlessHub
         return true;
     }
     
+    
     [Authorize(Policy = "Identified")]
     public async Task UpdateLocation(LocationDto dto, bool offline = false)
     {
         _logger.LogCallInfo(LightlessHubLogger.Args(UserUID,dto));
-        if (string.IsNullOrEmpty(dto.User.UID))
+        if (string.IsNullOrEmpty(dto.user.UID))
         {
             _logger.LogCallWarning(LightlessHubLogger.Args("LocationDto with no userinfo :",UserUID, dto));
             return;
         }
 
-        if (!string.Equals(UserUID, dto.User.UID, StringComparison.Ordinal))
+        if (!string.Equals(UserUID, dto.user.UID, StringComparison.Ordinal))
         {
             _logger.LogCallWarning(LightlessHubLogger.Args("LocationDto with another UID :",UserUID, dto));
             return;
         }
+        
+        var visibilityCacheKey = $"Visibility:{UserUID}";
+        
+        var allUsers = await _redis.GetAsync<List<string>>(visibilityCacheKey).ConfigureAwait(false);
+        if (allUsers == null)
+        {
+            var permissibleGroupGIDsQuery = DbContext.GroupPairPreferredPermissions.AsNoTracking()
+                .Where(gpp => gpp.UserUID == dto.user.UID && !gpp.IsPaused && gpp.ShareLocation == true)
+                .Select(gpp => gpp.GroupGID);
+
+            var groupUserUIDsQuery = DbContext.GroupPairs.AsNoTracking()
+                .Where(gp => permissibleGroupGIDsQuery.Contains(gp.GroupGID))
+                .Select(gp => gp.GroupUserUID);
+
+            var directlySharedUserUIDsQuery = DbContext.Permissions.AsNoTracking()
+                .Where(p => p.UserUID == dto.user.UID && !p.IsPaused && p.ShareLocation == true)
+                .Select(p => p.OtherUserUID);
+
+            allUsers = await directlySharedUserUIDsQuery
+                .Union(groupUserUIDsQuery)
+                .Distinct()
+                .ToListAsync().ConfigureAwait(false);
+            
+            await _redis.AddAsync(
+                visibilityCacheKey, 
+                allUsers, 
+                TimeSpan.FromMinutes(30), 
+                StackExchange.Redis.When.Always, 
+                StackExchange.Redis.CommandFlags.FireAndForget
+            ).ConfigureAwait(false);
+        }
+        
         var key = $"Location:{UserUID}";
         
         if (offline)
         {
-            var allUsers = await GetSharingUsers().ConfigureAwait(false);   
-            await _redis.RemoveAsync(key, CommandFlags.FireAndForget).ConfigureAwait(false);
-            await Clients.Users(allUsers.Keys).Client_SendLocationToClient(dto, DateTimeOffset.MinValue).ConfigureAwait(false);
+            await _redis.RemoveAsync(key, StackExchange.Redis.CommandFlags.FireAndForget).ConfigureAwait(false);
+            await Clients.Users(allUsers).Client_SendLocationToClient(dto).ConfigureAwait(false);
         }
         else
         {
             var currentLocation = await _redis.GetAsync<LocationDto>(key).ConfigureAwait(false);
-            if (currentLocation != dto)
+            
+            await _redis.AddAsync(key, dto).ConfigureAwait(false);
+            if (allUsers.Count != 0 && currentLocation != dto)
             {
-                var allUsers = await GetSharingUsers().ConfigureAwait(false);   
-                await _redis.AddAsync(key, dto).ConfigureAwait(false);
-                var sendTasks = allUsers.Select(pair => Clients.User(pair.Key).Client_SendLocationToClient(dto, pair.Value));
-                await Task.WhenAll(sendTasks).ConfigureAwait(false);
+                await Clients.Users(allUsers).Client_SendLocationToClient(dto).ConfigureAwait(false);
             }
         }
     }
-    
-    private async Task<Dictionary<string, DateTimeOffset>> GetSharingUsers()
-    {
-        return await DbContext.Permissions.AsNoTracking()
-            .Where(x => x.UserUID == UserUID && x.ShareLocationUntil > DateTimeOffset.UtcNow)
-            .ToDictionaryAsync(x => x.OtherUserUID, x => x.ShareLocationUntil, RequestAbortedToken)
-            .ConfigureAwait(false);
-    }
 
     [Authorize(Policy = "Identified")]
-    public async Task<(List<LocationWithTimeDto>, List<SharingStatusDto>)> RequestAllLocationInfo()
+    public async Task<List<LocationDto>> RequestAllLocationInfo()
     {
         _logger.LogCallInfo();
-        var locationWithTime = await GetLocationWithTime().ConfigureAwait(false);
-        var sharingStatus = await GetSharingStatus().ConfigureAwait(false);
-        return (locationWithTime, sharingStatus);
-    }
-
-    private async Task<List<LocationWithTimeDto>> GetLocationWithTime()
-    {
-        var dictionary = await DbContext.Permissions.AsNoTracking()
-            .Where(x => x.OtherUserUID == UserUID && x.ShareLocationUntil > DateTimeOffset.UtcNow)
-            .ToDictionaryAsync(x => x.UserUID, x => x.ShareLocationUntil, cancellationToken: RequestAbortedToken)
+        var uids = DbContext.Permissions.AsNoTracking().Where(x => x.OtherUserUID == UserUID && x.ShareLocation == true)
+            .Select(x => x.UserUID).ToList();
+        var data =await _redis.GetAllAsync<LocationDto>(uids.Select(x => $"Location:{x}").ToHashSet(StringComparer.Ordinal))
             .ConfigureAwait(false);
-        if (dictionary.Count == 0)
-        {
-            return [];
-        }
-
-        var redisKeys = dictionary.Keys.Select(uid => $"Location:{uid}").ToHashSet(StringComparer.Ordinal);
-        var data = await _redis.GetAllAsync<LocationDto>(redisKeys).ConfigureAwait(false);
-        var result = new List<LocationWithTimeDto>();
-
-        foreach (var (userUid, expireAt) in dictionary)
-        {
-            var redisKey = $"Location:{userUid}";
-
-            if (data.TryGetValue(redisKey, out var locationDto) && locationDto is not null)
-            {
-                result.Add(new LocationWithTimeDto(locationDto, expireAt));
-            }
-        }
-        return result;
-    }
-
-    private async Task<List<SharingStatusDto>> GetSharingStatus()
-    {
-        return await DbContext.Permissions.AsNoTracking()
-            .Where(x => x.UserUID == UserUID && x.ShareLocationUntil > DateTimeOffset.UtcNow)
-            .Select(x => new SharingStatusDto(new UserData(x.OtherUserUID), x.ShareLocationUntil))
-            .ToListAsync(cancellationToken: RequestAbortedToken).ConfigureAwait(false);
-    }
-
-
-
-    [Authorize(Policy = "Identified")]
-    public async Task<bool> ToggleLocationSharing(LocationSharingToggleDto dto)
-    {
-        _logger.LogCallInfo(LightlessHubLogger.Args(UserUID,dto));
-        try
-        {
-            await DbContext.Permissions.Where(x => x.UserUID == UserUID && dto.users.Contains(x.OtherUserUID))
-                .ExecuteUpdateAsync(setter =>
-                        setter.SetProperty(x => x.ShareLocationUntil, dto.duration.ToUniversalTime()),
-                    cancellationToken: RequestAbortedToken).ConfigureAwait(false);
-
-            //update user's location for target users
-            var currentLocation = await _redis.GetAsync<LocationDto>($"Location:{UserUID}").ConfigureAwait(false);
-            await Clients.Users(dto.users).Client_SendLocationToClient(currentLocation, dto.duration.ToUniversalTime())
-                .ConfigureAwait(false);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "ToggleLocationSharing error:");
-            return false;
-        }
-        return true;
+        return data.Where(x => x.Value is not null).Select(x => x.Value).ToList();
     }
 
     [GeneratedRegex(@"^([a-z0-9_ '+&,\.\-\{\}]+\/)+([a-z0-9_ '+&,\.\-\{\}]+\.[a-z]{3,4})$", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.ECMAScript)]

LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.cs

@@ -219,10 +219,11 @@ public partial class LightlessHub : Hub<ILightlessHub>, ILightlessHub
                 await RemoveUserFromRedis().ConfigureAwait(false);
 
                 _lightlessCensus.ClearStatistics(UserUID);
-                
-                await UpdateLocation(new LocationDto(new UserData(UserUID), new LocationInfo()), offline: true).ConfigureAwait(false);
 
                 await SendOfflineToAllPairedUsers().ConfigureAwait(false);
+                
+                await UpdateLocation(new LocationDto(new UserData(UserUID), new LocationInfo()), offline: true).ConfigureAwait(false);
+                await CleanVisibilityCacheFromRedis().ConfigureAwait(false);
 
                 DbContext.RemoveRange(DbContext.Files.Where(f => !f.Uploaded && f.UploaderUID == UserUID));
                 await DbContext.SaveChangesAsync().ConfigureAwait(false);

LightlessSyncServer/LightlessSyncServer/Services/LightlessCensus.cs

@@ -72,7 +72,7 @@ public class LightlessCensus : IHostedService
 
         Dictionary<ushort, short> worldDcs = new();
 
-        var dcs = await client.GetStringAsync("https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/en/WorldDCGroupType.csv", cancellationToken).ConfigureAwait(false);
+        var dcs = await client.GetStringAsync("https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/WorldDCGroupType.csv", cancellationToken).ConfigureAwait(false);
         // dc: https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/WorldDCGroupType.csv
         // id, name, region
 
@@ -92,7 +92,7 @@ public class LightlessCensus : IHostedService
             _dcs[id] = name;
         }
 
-        var worlds = await client.GetStringAsync("https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/en/World.csv", cancellationToken).ConfigureAwait(false);
+        var worlds = await client.GetStringAsync("https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/World.csv", cancellationToken).ConfigureAwait(false);
         // world: https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/World.csv
         // id, internalname, name, region, usertype, datacenter, ispublic
 
@@ -114,7 +114,7 @@ public class LightlessCensus : IHostedService
             _logger.LogInformation("World: ID: {id}, Name: {name}, DC: {dc}", id, name, dc);
         }
 
-        var races = await client.GetStringAsync("https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/en/Race.csv", cancellationToken).ConfigureAwait(false);
+        var races = await client.GetStringAsync("https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/Race.csv", cancellationToken).ConfigureAwait(false);
         // race: https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/Race.csv
         // id, masc name, fem name, other crap I don't care about
 
@@ -134,7 +134,7 @@ public class LightlessCensus : IHostedService
             _logger.LogInformation("Race: ID: {id}, Name: {name}", id, name);
         }
 
-        var tribe = await client.GetStringAsync("https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/en/Tribe.csv", cancellationToken).ConfigureAwait(false);
+        var tribe = await client.GetStringAsync("https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/Tribe.csv", cancellationToken).ConfigureAwait(false);
         // tribe: https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/Tribe.csv
         // id masc name, fem name, other crap I don't care about
 

LightlessSyncServer/LightlessSyncServer/Services/PairService.cs

@@ -67,6 +67,7 @@ public class PairService
                     DisableVFX = defaultPerms.DisableIndividualVFX,
                     IsPaused = false,
                     Sticky = true,
+                    ShareLocation = false,
                 });
                 modified = true;
             }
@@ -88,6 +89,7 @@ public class PairService
                     DisableVFX = defaultPerms.DisableIndividualVFX,
                     IsPaused = false,
                     Sticky = true,
+                    ShareLocation = false,
                 });
                 modified = true;
             }

LightlessSyncServer/LightlessSyncServer/Services/PruneService.cs

@@ -2,19 +2,15 @@
 using LightlessSyncShared.Data;
 using LightlessSyncShared.Models;
 using Microsoft.EntityFrameworkCore;
-using StackExchange.Redis.Extensions.Core.Abstractions;
 
 namespace LightlessSyncServer.Services
 {
-    public class PruneService(LightlessDbContext dbContext, IRedisDatabase redis) : IPruneService
+    public class PruneService(LightlessDbContext dbContext) : IPruneService
     {
         private readonly LightlessDbContext _dbContext = dbContext;
-        private readonly IRedisDatabase _redis = redis;
 
         public async Task<int> CountPrunableUsersAsync(string groupGid, int days, CancellationToken ct)
         {
-            var onlineUids = await GetOnlineUidsAsync().ConfigureAwait(false);
-
             var allGroupUsers = await _dbContext.GroupPairs
                 .Include(p => p.GroupUser)
                 .Include(p => p.Group)
@@ -24,14 +20,17 @@ namespace LightlessSyncServer.Services
             var inactivitySpan = GetInactivitySpan(days);
             var now = DateTime.UtcNow;
 
-            var usersToPrune = GetPruneUserList(allGroupUsers, onlineUids, inactivitySpan, now);
-            return usersToPrune.Count;
+            var usersToPrune = allGroupUsers.Where(p =>
+                !p.IsPinned &&
+                !p.IsModerator &&
+                !string.Equals(p.Group.OwnerUID, p.GroupUserUID, StringComparison.Ordinal) &&
+                p.GroupUser.LastLoggedIn < now - inactivitySpan);
+
+            return usersToPrune.Count();
         }
 
         public async Task<IReadOnlyList<GroupPair>> ExecutePruneAsync(string groupGid, int days, CancellationToken ct)
         {
-            var onlineUids = await GetOnlineUidsAsync().ConfigureAwait(false);
-
             var allGroupUsers = await _dbContext.GroupPairs
                 .Include(p => p.GroupUser)
                 .Include(p => p.Group)
@@ -41,7 +40,12 @@ namespace LightlessSyncServer.Services
             var inactivitySpan = GetInactivitySpan(days);
             var now = DateTime.UtcNow;
 
-            var usersToPrune = GetPruneUserList(allGroupUsers, onlineUids, inactivitySpan, now);
+            var usersToPrune = allGroupUsers.Where(p =>
+                !p.IsPinned &&
+                !p.IsModerator &&
+                !string.Equals(p.Group.OwnerUID, p.GroupUserUID, StringComparison.Ordinal) &&
+                p.GroupUser.LastLoggedIn < now - inactivitySpan)
+                .ToList();
 
             _dbContext.GroupPairs.RemoveRange(usersToPrune);
             await _dbContext.SaveChangesAsync(ct).ConfigureAwait(false);
@@ -49,52 +53,8 @@ namespace LightlessSyncServer.Services
             return usersToPrune;
         }
 
-        private static List<GroupPair> GetPruneUserList(
-            List<GroupPair> allGroupUsers,
-            HashSet<string> onlineUids,
-            TimeSpan inactivitySpan,
-            DateTime now)
-        {
-            return
-            [
-                .. allGroupUsers.Where(p =>
-                    !p.IsPinned &&
-                    !p.IsModerator &&
-                    !string.Equals(p.Group.OwnerUID, p.GroupUserUID, StringComparison.Ordinal) &&
-                    !onlineUids.Contains(p.GroupUserUID) &&
-                    p.GroupUser.LastLoggedIn < now - inactivitySpan),
-            ];
-        }
-
-        private async Task<HashSet<string>> GetOnlineUidsAsync()
-        {
-            var keys = await _redis.SearchKeysAsync("UID:*").ConfigureAwait(false);
-
-            var set = new HashSet<string>(StringComparer.Ordinal);
-
-            foreach (var k in keys)
-            {
-                if (string.IsNullOrEmpty(k)) continue;
-
-                const string prefix = "UID:";
-                if (k.StartsWith(prefix, StringComparison.Ordinal))
-                {
-                    var uid = k.Substring(prefix.Length);
-                    if (!string.IsNullOrEmpty(uid))
-                        set.Add(uid);
-                }
-                else
-                {
-                    var idx = k.IndexOf(':', StringComparison.Ordinal);
-                    if (idx >= 0 && idx < k.Length - 1)
-                        set.Add(k[(idx + 1)..]);
-                }
-            }
-
-            return set;
-        }
-
-        private static TimeSpan GetInactivitySpan(int days) =>
-            days == 0 ? TimeSpan.FromHours(2) : TimeSpan.FromDays(days);
+        private static TimeSpan GetInactivitySpan(int days) => days == 0
+                ? TimeSpan.FromMinutes(15)
+                : TimeSpan.FromDays(days);
     }
-}
+}

LightlessSyncServer/LightlessSyncServer/Utils/Extensions.cs

@@ -129,6 +129,7 @@ public static class Extensions
         permissions.SetDisableSounds(groupPair.DisableSounds);
         permissions.SetPaused(groupPair.IsPaused);
         permissions.SetDisableVFX(groupPair.DisableVFX);
+        permissions.SetShareLocation(groupPair.ShareLocation);
         return permissions;
     }
 
@@ -149,6 +150,7 @@ public static class Extensions
         perm.SetDisableAnimations(permissions.DisableAnimations);
         perm.SetDisableSounds(permissions.DisableSounds);
         perm.SetDisableVFX(permissions.DisableVFX);
+        perm.SetShareLocation(permissions.ShareLocation);
         if (setSticky)
             perm.SetSticky(permissions.Sticky);
         return perm;

LightlessSyncServer/LightlessSyncServer/Worker/AutoPruneWorker.cs

@@ -24,7 +24,7 @@ namespace LightlessSyncServer.Worker
                         var hubContext = scope.ServiceProvider.GetRequiredService<IHubContext<LightlessHub>>();
 
                         var groups = await db.Groups
-                            .Where(g => g.AutoPruneEnabled)
+                            .Where(g => g.AutoPruneEnabled && g.AutoPruneDays > 0)
                             .ToListAsync(stoppingToken).ConfigureAwait(false);
 
                         foreach (var group in groups)

LightlessSyncServer/LightlessSyncShared/Migrations/20251229015535_ShareLocation.cs

@@ -1,30 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace LightlessSyncServer.Migrations
-{
-    /// <inheritdoc />
-    public partial class ShareLocation : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<DateTimeOffset>(
-                name: "share_location_until",
-                table: "user_permission_sets",
-                type: "timestamp with time zone",
-                nullable: false,
-                defaultValue: new DateTimeOffset(new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), new TimeSpan(0, 0, 0, 0, 0)));
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "share_location_until",
-                table: "user_permission_sets");
-        }
-    }
-}

LightlessSyncServer/LightlessSyncShared/Migrations/LightlessDbContextModelSnapshot.cs

@@ -941,10 +941,6 @@ namespace LightlessSyncServer.Migrations
                         .HasColumnType("boolean")
                         .HasColumnName("is_paused");
 
-                    b.Property<DateTimeOffset>("ShareLocationUntil")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("share_location_until");
-
                     b.Property<bool>("Sticky")
                         .HasColumnType("boolean")
                         .HasColumnName("sticky");

LightlessSyncServer/LightlessSyncShared/Models/GroupPairPreferredPermission.cs

@@ -10,4 +10,5 @@ public class GroupPairPreferredPermission
     public bool DisableAnimations { get; set; }
     public bool DisableSounds { get; set; }
     public bool DisableVFX { get; set; }
+    public bool ShareLocation  { get; set; }
 }

LightlessSyncServer/LightlessSyncShared/Models/UserPermissionSet.cs

@@ -15,5 +15,5 @@ public class UserPermissionSet
     public bool DisableAnimations { get; set; } = false;
     public bool DisableVFX { get; set; } = false;
     public bool DisableSounds { get; set; } = false;
-    public DateTimeOffset ShareLocationUntil { get; set; } = DateTimeOffset.MinValue;
+    public bool ShareLocation  { get; set; } = false;
 }