From 9971b141774c05aff8f4b320e26131d0e47a7068 Mon Sep 17 00:00:00 2001 From: Tsubasahane Date: Sat, 27 Dec 2025 19:52:28 +0800 Subject: [PATCH 1/6] Share Location --- .gitignore | 3 +- LightlessAPI | 2 +- .../Hubs/LightlessHub.ClientStubs.cs | 1 + .../Hubs/LightlessHub.Functions.cs | 5 ++ .../Hubs/LightlessHub.Groups.cs | 11 ++- .../Hubs/LightlessHub.Permissions.cs | 4 + .../Hubs/LightlessHub.User.cs | 82 ++++++++++++++++++- .../LightlessSyncServer/Hubs/LightlessHub.cs | 5 ++ .../Services/PairService.cs | 2 + .../LightlessSyncServer/Utils/Extensions.cs | 2 + .../Models/GroupPairPreferredPermission.cs | 1 + .../Models/UserPermissionSet.cs | 1 + 12 files changed, 114 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index d9cf9a4..be64548 100644 --- a/.gitignore +++ b/.gitignore @@ -350,4 +350,5 @@ MigrationBackup/ .ionide/ # docker run data -Docker/run/data/ \ No newline at end of file +Docker/run/data/ +*.idea diff --git a/LightlessAPI b/LightlessAPI index 5656600..9feb0b3 160000 --- a/LightlessAPI +++ b/LightlessAPI @@ -1 +1 @@ -Subproject commit 56566003e0e93bba05dcef49fd3ce23c6a204d81 +Subproject commit 9feb0b3c35f67d153607304f93aa3b855d02f445 diff --git a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.ClientStubs.cs b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.ClientStubs.cs index 4e5afcb..a880268 100644 --- a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.ClientStubs.cs +++ b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.ClientStubs.cs @@ -40,5 +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) => throw new PlatformNotSupportedException("Calling clientside method on server not supported"); } } \ No newline at end of file diff --git a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Functions.cs b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Functions.cs index a329f8e..b2c71fa 100644 --- a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Functions.cs +++ b/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, diff --git a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Groups.cs b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Groups.cs index e5d63df..2fa52f2 100644 --- a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Groups.cs +++ b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Groups.cs @@ -504,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); } @@ -549,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); @@ -561,6 +563,7 @@ public partial class LightlessHub existingPermissionsOnDb.DisableVFX = preferredPermissions.DisableVFX; existingPermissionsOnDb.IsPaused = false; existingPermissionsOnDb.Sticky = false; + existingPermissionsOnDb.ShareLocation = preferredPermissions.ShareLocation; DbContext.Update(existingPermissionsOnDb); @@ -576,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); } @@ -597,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); @@ -609,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); } @@ -622,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); } diff --git a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Permissions.cs b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Permissions.cs index f4b7687..299d0bd 100644 --- a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Permissions.cs +++ b/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)) diff --git a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.User.cs b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.User.cs index e278124..595555b 100644 --- a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.User.cs +++ b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.User.cs @@ -86,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); @@ -101,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); } @@ -1232,6 +1234,84 @@ public partial class LightlessHub errorMessage = string.Empty; 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)) + { + _logger.LogCallWarning(LightlessHubLogger.Args("LocationDto with no userinfo :",UserUID, dto)); + return; + } + + 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>(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) + { + 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(key).ConfigureAwait(false); + + await _redis.AddAsync(key, dto).ConfigureAwait(false); + if (allUsers.Count != 0 && currentLocation != dto) + { + await Clients.Users(allUsers).Client_SendLocationToClient(dto).ConfigureAwait(false); + } + } + } + + [Authorize(Policy = "Identified")] + public async Task> RequestAllLocationInfo() + { + _logger.LogCallInfo(); + var uids = DbContext.Permissions.AsNoTracking().Where(x => x.OtherUserUID == UserUID && x.ShareLocation == true) + .Select(x => x.UserUID).ToList(); + var data =await _redis.GetAllAsync(uids.Select(x => $"Location:{x}").ToHashSet(StringComparer.Ordinal)) + .ConfigureAwait(false); + 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)] private static partial Regex GamePathRegex(); diff --git a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.cs b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.cs index 99963d6..2781d2e 100644 --- a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.cs +++ b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.cs @@ -16,6 +16,8 @@ using Microsoft.AspNetCore.SignalR; using Microsoft.EntityFrameworkCore; using StackExchange.Redis.Extensions.Core.Abstractions; using System.Collections.Concurrent; +using LightlessSync.API.Dto.CharaData; +using LightlessSync.API.Dto.User; using LightlessSyncServer.Services.Interfaces; namespace LightlessSyncServer.Hubs; @@ -219,6 +221,9 @@ public partial class LightlessHub : Hub, ILightlessHub _lightlessCensus.ClearStatistics(UserUID); 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); diff --git a/LightlessSyncServer/LightlessSyncServer/Services/PairService.cs b/LightlessSyncServer/LightlessSyncServer/Services/PairService.cs index 854472f..27b678b 100644 --- a/LightlessSyncServer/LightlessSyncServer/Services/PairService.cs +++ b/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; } diff --git a/LightlessSyncServer/LightlessSyncServer/Utils/Extensions.cs b/LightlessSyncServer/LightlessSyncServer/Utils/Extensions.cs index 546cf0c..e9f931d 100644 --- a/LightlessSyncServer/LightlessSyncServer/Utils/Extensions.cs +++ b/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; diff --git a/LightlessSyncServer/LightlessSyncShared/Models/GroupPairPreferredPermission.cs b/LightlessSyncServer/LightlessSyncShared/Models/GroupPairPreferredPermission.cs index 6946810..6bebdc4 100644 --- a/LightlessSyncServer/LightlessSyncShared/Models/GroupPairPreferredPermission.cs +++ b/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; } } diff --git a/LightlessSyncServer/LightlessSyncShared/Models/UserPermissionSet.cs b/LightlessSyncServer/LightlessSyncShared/Models/UserPermissionSet.cs index 5a00f3a..4e1f78f 100644 --- a/LightlessSyncServer/LightlessSyncShared/Models/UserPermissionSet.cs +++ b/LightlessSyncServer/LightlessSyncShared/Models/UserPermissionSet.cs @@ -15,4 +15,5 @@ public class UserPermissionSet public bool DisableAnimations { get; set; } = false; public bool DisableVFX { get; set; } = false; public bool DisableSounds { get; set; } = false; + public bool ShareLocation { get; set; } = false; } From d3790013c63156b7465518008dacc90493894d31 Mon Sep 17 00:00:00 2001 From: Tsubasahane Date: Sun, 28 Dec 2025 11:00:50 +0800 Subject: [PATCH 2/6] Revert "Share Location" This reverts commit 9971b141774c05aff8f4b320e26131d0e47a7068. --- .gitignore | 3 +- LightlessAPI | 2 +- .../Hubs/LightlessHub.ClientStubs.cs | 1 - .../Hubs/LightlessHub.Functions.cs | 5 -- .../Hubs/LightlessHub.Groups.cs | 11 +-- .../Hubs/LightlessHub.Permissions.cs | 4 - .../Hubs/LightlessHub.User.cs | 82 +------------------ .../LightlessSyncServer/Hubs/LightlessHub.cs | 5 -- .../Services/PairService.cs | 2 - .../LightlessSyncServer/Utils/Extensions.cs | 2 - .../Models/GroupPairPreferredPermission.cs | 1 - .../Models/UserPermissionSet.cs | 1 - 12 files changed, 5 insertions(+), 114 deletions(-) diff --git a/.gitignore b/.gitignore index be64548..d9cf9a4 100644 --- a/.gitignore +++ b/.gitignore @@ -350,5 +350,4 @@ MigrationBackup/ .ionide/ # docker run data -Docker/run/data/ -*.idea +Docker/run/data/ \ No newline at end of file diff --git a/LightlessAPI b/LightlessAPI index 9feb0b3..5656600 160000 --- a/LightlessAPI +++ b/LightlessAPI @@ -1 +1 @@ -Subproject commit 9feb0b3c35f67d153607304f93aa3b855d02f445 +Subproject commit 56566003e0e93bba05dcef49fd3ce23c6a204d81 diff --git a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.ClientStubs.cs b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.ClientStubs.cs index a880268..4e5afcb 100644 --- a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.ClientStubs.cs +++ b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.ClientStubs.cs @@ -40,6 +40,5 @@ 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) => throw new PlatformNotSupportedException("Calling clientside method on server not supported"); } } \ No newline at end of file diff --git a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Functions.cs b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Functions.cs index b2c71fa..a329f8e 100644 --- a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Functions.cs +++ b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Functions.cs @@ -585,11 +585,6 @@ 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, diff --git a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Groups.cs b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Groups.cs index 2fa52f2..e5d63df 100644 --- a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Groups.cs +++ b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Groups.cs @@ -504,7 +504,6 @@ 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); } @@ -550,8 +549,7 @@ public partial class LightlessHub DisableSounds = preferredPermissions.DisableSounds, DisableVFX = preferredPermissions.DisableVFX, IsPaused = preferredPermissions.IsPaused, - Sticky = false, - ShareLocation = preferredPermissions.ShareLocation, + Sticky = false }; await DbContext.Permissions.AddAsync(ownPermissionsToOther).ConfigureAwait(false); @@ -563,7 +561,6 @@ public partial class LightlessHub existingPermissionsOnDb.DisableVFX = preferredPermissions.DisableVFX; existingPermissionsOnDb.IsPaused = false; existingPermissionsOnDb.Sticky = false; - existingPermissionsOnDb.ShareLocation = preferredPermissions.ShareLocation; DbContext.Update(existingPermissionsOnDb); @@ -579,7 +576,6 @@ public partial class LightlessHub ownPermissionsToOther.DisableVFX = preferredPermissions.DisableVFX; ownPermissionsToOther.DisableSounds = preferredPermissions.DisableSounds; ownPermissionsToOther.IsPaused = false; - ownPermissionsToOther.ShareLocation = preferredPermissions.ShareLocation; DbContext.Update(ownPermissionsToOther); } @@ -601,8 +597,7 @@ public partial class LightlessHub DisableSounds = otherPreferred.DisableSounds, DisableVFX = otherPreferred.DisableVFX, IsPaused = otherPreferred.IsPaused, - Sticky = false, - ShareLocation = otherPreferred.ShareLocation, + Sticky = false }; await DbContext.AddAsync(otherExistingPermsOnDb).ConfigureAwait(false); @@ -614,7 +609,6 @@ public partial class LightlessHub otherExistingPermsOnDb.DisableSounds = otherPreferred.DisableSounds; otherExistingPermsOnDb.DisableVFX = otherPreferred.DisableVFX; otherExistingPermsOnDb.IsPaused = otherPreferred.IsPaused; - otherExistingPermsOnDb.ShareLocation = otherPreferred.ShareLocation; DbContext.Update(otherExistingPermsOnDb); } @@ -628,7 +622,6 @@ public partial class LightlessHub otherPermissionToSelf.DisableSounds = otherPreferred.DisableSounds; otherPermissionToSelf.DisableVFX = otherPreferred.DisableVFX; otherPermissionToSelf.IsPaused = otherPreferred.IsPaused; - otherPermissionToSelf.ShareLocation = otherPreferred.ShareLocation; DbContext.Update(otherPermissionToSelf); } diff --git a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Permissions.cs b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Permissions.cs index 299d0bd..f4b7687 100644 --- a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Permissions.cs +++ b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Permissions.cs @@ -66,7 +66,6 @@ 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 @@ -113,7 +112,6 @@ 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(); @@ -128,7 +126,6 @@ public partial class LightlessHub perm.DisableAnimations = groupPreferredPermissions.DisableAnimations; perm.IsPaused = groupPreferredPermissions.IsPaused; perm.DisableVFX = groupPreferredPermissions.DisableVFX; - perm.ShareLocation = groupPreferredPermissions.ShareLocation; } UserPermissions permissions = UserPermissions.NoneSet; @@ -136,7 +133,6 @@ 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)) diff --git a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.User.cs b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.User.cs index 595555b..e278124 100644 --- a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.User.cs +++ b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.User.cs @@ -86,8 +86,7 @@ public partial class LightlessHub DisableSounds = ownDefaultPermissions.DisableIndividualSounds, DisableVFX = ownDefaultPermissions.DisableIndividualVFX, IsPaused = false, - Sticky = true, - ShareLocation = false, + Sticky = true }; var existingDbPerms = await DbContext.Permissions.SingleOrDefaultAsync(u => u.UserUID == UserUID && u.OtherUserUID == otherUser.UID, cancellationToken: RequestAbortedToken).ConfigureAwait(false); @@ -102,7 +101,6 @@ public partial class LightlessHub existingDbPerms.DisableVFX = permissions.DisableVFX; existingDbPerms.IsPaused = false; existingDbPerms.Sticky = true; - existingDbPerms.ShareLocation = permissions.ShareLocation; DbContext.Permissions.Update(existingDbPerms); } @@ -1234,84 +1232,6 @@ public partial class LightlessHub errorMessage = string.Empty; 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)) - { - _logger.LogCallWarning(LightlessHubLogger.Args("LocationDto with no userinfo :",UserUID, dto)); - return; - } - - 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>(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) - { - 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(key).ConfigureAwait(false); - - await _redis.AddAsync(key, dto).ConfigureAwait(false); - if (allUsers.Count != 0 && currentLocation != dto) - { - await Clients.Users(allUsers).Client_SendLocationToClient(dto).ConfigureAwait(false); - } - } - } - - [Authorize(Policy = "Identified")] - public async Task> RequestAllLocationInfo() - { - _logger.LogCallInfo(); - var uids = DbContext.Permissions.AsNoTracking().Where(x => x.OtherUserUID == UserUID && x.ShareLocation == true) - .Select(x => x.UserUID).ToList(); - var data =await _redis.GetAllAsync(uids.Select(x => $"Location:{x}").ToHashSet(StringComparer.Ordinal)) - .ConfigureAwait(false); - 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)] private static partial Regex GamePathRegex(); diff --git a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.cs b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.cs index 2781d2e..99963d6 100644 --- a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.cs +++ b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.cs @@ -16,8 +16,6 @@ using Microsoft.AspNetCore.SignalR; using Microsoft.EntityFrameworkCore; using StackExchange.Redis.Extensions.Core.Abstractions; using System.Collections.Concurrent; -using LightlessSync.API.Dto.CharaData; -using LightlessSync.API.Dto.User; using LightlessSyncServer.Services.Interfaces; namespace LightlessSyncServer.Hubs; @@ -221,9 +219,6 @@ public partial class LightlessHub : Hub, ILightlessHub _lightlessCensus.ClearStatistics(UserUID); 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); diff --git a/LightlessSyncServer/LightlessSyncServer/Services/PairService.cs b/LightlessSyncServer/LightlessSyncServer/Services/PairService.cs index 27b678b..854472f 100644 --- a/LightlessSyncServer/LightlessSyncServer/Services/PairService.cs +++ b/LightlessSyncServer/LightlessSyncServer/Services/PairService.cs @@ -67,7 +67,6 @@ public class PairService DisableVFX = defaultPerms.DisableIndividualVFX, IsPaused = false, Sticky = true, - ShareLocation = false, }); modified = true; } @@ -89,7 +88,6 @@ public class PairService DisableVFX = defaultPerms.DisableIndividualVFX, IsPaused = false, Sticky = true, - ShareLocation = false, }); modified = true; } diff --git a/LightlessSyncServer/LightlessSyncServer/Utils/Extensions.cs b/LightlessSyncServer/LightlessSyncServer/Utils/Extensions.cs index e9f931d..546cf0c 100644 --- a/LightlessSyncServer/LightlessSyncServer/Utils/Extensions.cs +++ b/LightlessSyncServer/LightlessSyncServer/Utils/Extensions.cs @@ -129,7 +129,6 @@ public static class Extensions permissions.SetDisableSounds(groupPair.DisableSounds); permissions.SetPaused(groupPair.IsPaused); permissions.SetDisableVFX(groupPair.DisableVFX); - permissions.SetShareLocation(groupPair.ShareLocation); return permissions; } @@ -150,7 +149,6 @@ 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; diff --git a/LightlessSyncServer/LightlessSyncShared/Models/GroupPairPreferredPermission.cs b/LightlessSyncServer/LightlessSyncShared/Models/GroupPairPreferredPermission.cs index 6bebdc4..6946810 100644 --- a/LightlessSyncServer/LightlessSyncShared/Models/GroupPairPreferredPermission.cs +++ b/LightlessSyncServer/LightlessSyncShared/Models/GroupPairPreferredPermission.cs @@ -10,5 +10,4 @@ public class GroupPairPreferredPermission public bool DisableAnimations { get; set; } public bool DisableSounds { get; set; } public bool DisableVFX { get; set; } - public bool ShareLocation { get; set; } } diff --git a/LightlessSyncServer/LightlessSyncShared/Models/UserPermissionSet.cs b/LightlessSyncServer/LightlessSyncShared/Models/UserPermissionSet.cs index 4e1f78f..5a00f3a 100644 --- a/LightlessSyncServer/LightlessSyncShared/Models/UserPermissionSet.cs +++ b/LightlessSyncServer/LightlessSyncShared/Models/UserPermissionSet.cs @@ -15,5 +15,4 @@ public class UserPermissionSet public bool DisableAnimations { get; set; } = false; public bool DisableVFX { get; set; } = false; public bool DisableSounds { get; set; } = false; - public bool ShareLocation { get; set; } = false; } From 717d8e46f1e35cee14ec55012850f254ef6bfbf9 Mon Sep 17 00:00:00 2001 From: Tsubasahane Date: Sun, 28 Dec 2025 13:07:36 +0800 Subject: [PATCH 3/6] Location Share but with expireAt --- .gitignore | 5 +- LightlessAPI | 2 +- .../Hubs/LightlessHub.ClientStubs.cs | 1 + .../Hubs/LightlessHub.User.cs | 90 ++++++++++++++++++- .../LightlessSyncServer/Hubs/LightlessHub.cs | 4 + .../LightlessSyncServer/Utils/Extensions.cs | 1 + .../Models/UserPermissionSet.cs | 1 + 7 files changed, 100 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d9cf9a4..23fcee6 100644 --- a/.gitignore +++ b/.gitignore @@ -350,4 +350,7 @@ MigrationBackup/ .ionide/ # docker run data -Docker/run/data/ \ No newline at end of file +Docker/run/data/ + +#idea files +*.idea \ No newline at end of file diff --git a/LightlessAPI b/LightlessAPI index 5656600..f1817c5 160000 --- a/LightlessAPI +++ b/LightlessAPI @@ -1 +1 @@ -Subproject commit 56566003e0e93bba05dcef49fd3ce23c6a204d81 +Subproject commit f1817c597450bf2ee5425708b982a68916214e3a diff --git a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.ClientStubs.cs b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.ClientStubs.cs index 4e5afcb..39e8040 100644 --- a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.ClientStubs.cs +++ b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.ClientStubs.cs @@ -40,5 +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"); } } \ No newline at end of file diff --git a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.User.cs b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.User.cs index e278124..29c3076 100644 --- a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.User.cs +++ b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.User.cs @@ -12,8 +12,6 @@ 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; @@ -1232,6 +1230,94 @@ public partial class LightlessHub errorMessage = string.Empty; 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)) + { + _logger.LogCallWarning(LightlessHubLogger.Args("LocationDto with no userinfo :",UserUID, dto)); + return; + } + + if (!string.Equals(UserUID, dto.User.UID, StringComparison.Ordinal)) + { + _logger.LogCallWarning(LightlessHubLogger.Args("LocationDto with another UID :",UserUID, dto)); + return; + } + 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); + } + else + { + var currentLocation = await _redis.GetAsync(key).ConfigureAwait(false); + if (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); + } + } + } + + private async Task> 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> RequestAllLocationInfo() + { + _logger.LogCallInfo(); + var dictionary = await DbContext.Permissions.AsNoTracking() + .Where(x => x.OtherUserUID == UserUID && x.ShareLocationUntil > DateTimeOffset.UtcNow) + .ToDictionaryAsync(x => x.UserUID, x => x.ShareLocationUntil, cancellationToken: RequestAbortedToken) + .ConfigureAwait(false); + if (dictionary.Count == 0) + { + return []; + } + + var redisKeys = dictionary.Keys.Select(uid => $"Location:{uid}").ToHashSet(StringComparer.Ordinal); + var data = await _redis.GetAllAsync(redisKeys).ConfigureAwait(false); + var result = new List(); + + 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; + } + + + + [Authorize(Policy = "Identified")] + public async Task ToggleLocationSharing(LocationSharingToggleDto dto) + { + _logger.LogCallInfo(LightlessHubLogger.Args(UserUID,dto)); + 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($"Location:{UserUID}").ConfigureAwait(false); + await Clients.Users(dto.users).Client_SendLocationToClient(currentLocation, dto.duration.ToUniversalTime()).ConfigureAwait(false); + } [GeneratedRegex(@"^([a-z0-9_ '+&,\.\-\{\}]+\/)+([a-z0-9_ '+&,\.\-\{\}]+\.[a-z]{3,4})$", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.ECMAScript)] private static partial Regex GamePathRegex(); diff --git a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.cs b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.cs index 99963d6..96c5c2b 100644 --- a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.cs +++ b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.cs @@ -16,6 +16,8 @@ using Microsoft.AspNetCore.SignalR; using Microsoft.EntityFrameworkCore; using StackExchange.Redis.Extensions.Core.Abstractions; using System.Collections.Concurrent; +using LightlessSync.API.Dto.CharaData; +using LightlessSync.API.Dto.User; using LightlessSyncServer.Services.Interfaces; namespace LightlessSyncServer.Hubs; @@ -217,6 +219,8 @@ public partial class LightlessHub : Hub, 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); diff --git a/LightlessSyncServer/LightlessSyncServer/Utils/Extensions.cs b/LightlessSyncServer/LightlessSyncServer/Utils/Extensions.cs index 546cf0c..92cf499 100644 --- a/LightlessSyncServer/LightlessSyncServer/Utils/Extensions.cs +++ b/LightlessSyncServer/LightlessSyncServer/Utils/Extensions.cs @@ -151,6 +151,7 @@ public static class Extensions perm.SetDisableVFX(permissions.DisableVFX); if (setSticky) perm.SetSticky(permissions.Sticky); + perm.SetShareLocation(permissions.ShareLocationUntil > DateTimeOffset.UtcNow); return perm; } } diff --git a/LightlessSyncServer/LightlessSyncShared/Models/UserPermissionSet.cs b/LightlessSyncServer/LightlessSyncShared/Models/UserPermissionSet.cs index 5a00f3a..2f4ad5b 100644 --- a/LightlessSyncServer/LightlessSyncShared/Models/UserPermissionSet.cs +++ b/LightlessSyncServer/LightlessSyncShared/Models/UserPermissionSet.cs @@ -15,4 +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; } From a533fca195b6f2e750de21799292fb981f86d6bb Mon Sep 17 00:00:00 2001 From: Tsubasahane Date: Sun, 28 Dec 2025 19:54:26 +0800 Subject: [PATCH 4/6] transfer sharing status --- LightlessAPI | 2 +- .../Hubs/LightlessHub.User.cs | 17 ++++++++++++++++- .../LightlessSyncServer/Utils/Extensions.cs | 1 - 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/LightlessAPI b/LightlessAPI index f1817c5..852e2a0 160000 --- a/LightlessAPI +++ b/LightlessAPI @@ -1 +1 @@ -Subproject commit f1817c597450bf2ee5425708b982a68916214e3a +Subproject commit 852e2a005f5bfdf3844e057c6ba71de6f5f84ed8 diff --git a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.User.cs b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.User.cs index 29c3076..bda6d24 100644 --- a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.User.cs +++ b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.User.cs @@ -1276,9 +1276,16 @@ public partial class LightlessHub } [Authorize(Policy = "Identified")] - public async Task> RequestAllLocationInfo() + public async Task<(List, List)> RequestAllLocationInfo() { _logger.LogCallInfo(); + var locationWithTime = await GetLocationWithTime().ConfigureAwait(false); + var sharingStatus = await GetSharingStatus().ConfigureAwait(false); + return (locationWithTime, sharingStatus); + } + + private async Task> 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) @@ -1304,6 +1311,14 @@ public partial class LightlessHub return result; } + private async Task> 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")] diff --git a/LightlessSyncServer/LightlessSyncServer/Utils/Extensions.cs b/LightlessSyncServer/LightlessSyncServer/Utils/Extensions.cs index 92cf499..546cf0c 100644 --- a/LightlessSyncServer/LightlessSyncServer/Utils/Extensions.cs +++ b/LightlessSyncServer/LightlessSyncServer/Utils/Extensions.cs @@ -151,7 +151,6 @@ public static class Extensions perm.SetDisableVFX(permissions.DisableVFX); if (setSticky) perm.SetSticky(permissions.Sticky); - perm.SetShareLocation(permissions.ShareLocationUntil > DateTimeOffset.UtcNow); return perm; } } From c3e87eb7dfc1cddd03401e0cc97770ca312bdca3 Mon Sep 17 00:00:00 2001 From: Tsubasahane Date: Mon, 29 Dec 2025 09:55:53 +0800 Subject: [PATCH 5/6] ShareLocation : Migration --- .../20251229015535_ShareLocation.Designer.cs | 1332 +++++++++++++++++ .../20251229015535_ShareLocation.cs | 30 + .../LightlessDbContextModelSnapshot.cs | 4 + 3 files changed, 1366 insertions(+) create mode 100644 LightlessSyncServer/LightlessSyncShared/Migrations/20251229015535_ShareLocation.Designer.cs create mode 100644 LightlessSyncServer/LightlessSyncShared/Migrations/20251229015535_ShareLocation.cs diff --git a/LightlessSyncServer/LightlessSyncShared/Migrations/20251229015535_ShareLocation.Designer.cs b/LightlessSyncServer/LightlessSyncShared/Migrations/20251229015535_ShareLocation.Designer.cs new file mode 100644 index 0000000..f56c480 --- /dev/null +++ b/LightlessSyncServer/LightlessSyncShared/Migrations/20251229015535_ShareLocation.Designer.cs @@ -0,0 +1,1332 @@ +// +using System; +using LightlessSyncShared.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; + +#nullable disable + +namespace LightlessSyncServer.Migrations +{ + [DbContext(typeof(LightlessDbContext))] + [Migration("20251229015535_ShareLocation")] + partial class ShareLocation + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "9.0.0") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("LightlessSyncShared.Models.Auth", b => + { + b.Property("HashedKey") + .HasMaxLength(64) + .HasColumnType("character varying(64)") + .HasColumnName("hashed_key"); + + b.Property("IsBanned") + .HasColumnType("boolean") + .HasColumnName("is_banned"); + + b.Property("MarkForBan") + .HasColumnType("boolean") + .HasColumnName("mark_for_ban"); + + b.Property("PrimaryUserUID") + .HasColumnType("character varying(10)") + .HasColumnName("primary_user_uid"); + + b.Property("UserUID") + .HasColumnType("character varying(10)") + .HasColumnName("user_uid"); + + b.HasKey("HashedKey") + .HasName("pk_auth"); + + b.HasIndex("PrimaryUserUID") + .HasDatabaseName("ix_auth_primary_user_uid"); + + b.HasIndex("UserUID") + .HasDatabaseName("ix_auth_user_uid"); + + b.ToTable("auth", (string)null); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.Banned", b => + { + b.Property("CharacterIdentification") + .HasMaxLength(100) + .HasColumnType("character varying(100)") + .HasColumnName("character_identification"); + + b.Property("BannedUid") + .HasColumnType("text") + .HasColumnName("banned_uid"); + + b.Property("Reason") + .HasColumnType("text") + .HasColumnName("reason"); + + b.Property("Timestamp") + .IsConcurrencyToken() + .ValueGeneratedOnAddOrUpdate() + .HasColumnType("bytea") + .HasColumnName("timestamp"); + + b.HasKey("CharacterIdentification") + .HasName("pk_banned_users"); + + b.ToTable("banned_users", (string)null); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.BannedRegistrations", b => + { + b.Property("DiscordIdOrLodestoneAuth") + .HasMaxLength(100) + .HasColumnType("character varying(100)") + .HasColumnName("discord_id_or_lodestone_auth"); + + b.HasKey("DiscordIdOrLodestoneAuth") + .HasName("pk_banned_registrations"); + + b.ToTable("banned_registrations", (string)null); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.CharaData", b => + { + b.Property("Id") + .HasColumnType("text") + .HasColumnName("id"); + + b.Property("UploaderUID") + .HasColumnType("character varying(10)") + .HasColumnName("uploader_uid"); + + b.Property("AccessType") + .HasColumnType("integer") + .HasColumnName("access_type"); + + b.Property("CreatedDate") + .HasColumnType("timestamp with time zone") + .HasColumnName("created_date"); + + b.Property("CustomizeData") + .HasColumnType("text") + .HasColumnName("customize_data"); + + b.Property("Description") + .HasColumnType("text") + .HasColumnName("description"); + + b.Property("DownloadCount") + .HasColumnType("integer") + .HasColumnName("download_count"); + + b.Property("ExpiryDate") + .HasColumnType("timestamp with time zone") + .HasColumnName("expiry_date"); + + b.Property("GlamourerData") + .HasColumnType("text") + .HasColumnName("glamourer_data"); + + b.Property("ManipulationData") + .HasColumnType("text") + .HasColumnName("manipulation_data"); + + b.Property("ShareType") + .HasColumnType("integer") + .HasColumnName("share_type"); + + b.Property("UpdatedDate") + .HasColumnType("timestamp with time zone") + .HasColumnName("updated_date"); + + b.HasKey("Id", "UploaderUID") + .HasName("pk_chara_data"); + + b.HasIndex("Id") + .HasDatabaseName("ix_chara_data_id"); + + b.HasIndex("UploaderUID") + .HasDatabaseName("ix_chara_data_uploader_uid"); + + b.ToTable("chara_data", (string)null); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.CharaDataAllowance", b => + { + b.Property("ParentId") + .HasColumnType("text") + .HasColumnName("parent_id"); + + b.Property("ParentUploaderUID") + .HasColumnType("character varying(10)") + .HasColumnName("parent_uploader_uid"); + + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint") + .HasColumnName("id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("AllowedGroupGID") + .HasColumnType("character varying(20)") + .HasColumnName("allowed_group_gid"); + + b.Property("AllowedUserUID") + .HasColumnType("character varying(10)") + .HasColumnName("allowed_user_uid"); + + b.HasKey("ParentId", "ParentUploaderUID", "Id") + .HasName("pk_chara_data_allowance"); + + b.HasIndex("AllowedGroupGID") + .HasDatabaseName("ix_chara_data_allowance_allowed_group_gid"); + + b.HasIndex("AllowedUserUID") + .HasDatabaseName("ix_chara_data_allowance_allowed_user_uid"); + + b.HasIndex("ParentId") + .HasDatabaseName("ix_chara_data_allowance_parent_id"); + + b.ToTable("chara_data_allowance", (string)null); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.CharaDataFile", b => + { + b.Property("ParentId") + .HasColumnType("text") + .HasColumnName("parent_id"); + + b.Property("ParentUploaderUID") + .HasColumnType("character varying(10)") + .HasColumnName("parent_uploader_uid"); + + b.Property("GamePath") + .HasColumnType("text") + .HasColumnName("game_path"); + + b.Property("FileCacheHash") + .HasColumnType("character varying(40)") + .HasColumnName("file_cache_hash"); + + b.HasKey("ParentId", "ParentUploaderUID", "GamePath") + .HasName("pk_chara_data_files"); + + b.HasIndex("FileCacheHash") + .HasDatabaseName("ix_chara_data_files_file_cache_hash"); + + b.HasIndex("ParentId") + .HasDatabaseName("ix_chara_data_files_parent_id"); + + b.ToTable("chara_data_files", (string)null); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.CharaDataFileSwap", b => + { + b.Property("ParentId") + .HasColumnType("text") + .HasColumnName("parent_id"); + + b.Property("ParentUploaderUID") + .HasColumnType("character varying(10)") + .HasColumnName("parent_uploader_uid"); + + b.Property("GamePath") + .HasColumnType("text") + .HasColumnName("game_path"); + + b.Property("FilePath") + .HasColumnType("text") + .HasColumnName("file_path"); + + b.HasKey("ParentId", "ParentUploaderUID", "GamePath") + .HasName("pk_chara_data_file_swaps"); + + b.HasIndex("ParentId") + .HasDatabaseName("ix_chara_data_file_swaps_parent_id"); + + b.ToTable("chara_data_file_swaps", (string)null); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.CharaDataOriginalFile", b => + { + b.Property("ParentId") + .HasColumnType("text") + .HasColumnName("parent_id"); + + b.Property("ParentUploaderUID") + .HasColumnType("character varying(10)") + .HasColumnName("parent_uploader_uid"); + + b.Property("GamePath") + .HasColumnType("text") + .HasColumnName("game_path"); + + b.Property("Hash") + .HasColumnType("text") + .HasColumnName("hash"); + + b.HasKey("ParentId", "ParentUploaderUID", "GamePath") + .HasName("pk_chara_data_orig_files"); + + b.HasIndex("ParentId") + .HasDatabaseName("ix_chara_data_orig_files_parent_id"); + + b.ToTable("chara_data_orig_files", (string)null); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.CharaDataPose", b => + { + b.Property("ParentId") + .HasColumnType("text") + .HasColumnName("parent_id"); + + b.Property("ParentUploaderUID") + .HasColumnType("character varying(10)") + .HasColumnName("parent_uploader_uid"); + + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint") + .HasColumnName("id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Description") + .HasColumnType("text") + .HasColumnName("description"); + + b.Property("PoseData") + .HasColumnType("text") + .HasColumnName("pose_data"); + + b.Property("WorldData") + .HasColumnType("text") + .HasColumnName("world_data"); + + b.HasKey("ParentId", "ParentUploaderUID", "Id") + .HasName("pk_chara_data_poses"); + + b.HasIndex("ParentId") + .HasDatabaseName("ix_chara_data_poses_parent_id"); + + b.ToTable("chara_data_poses", (string)null); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.ClientPair", b => + { + b.Property("UserUID") + .HasMaxLength(10) + .HasColumnType("character varying(10)") + .HasColumnName("user_uid"); + + b.Property("OtherUserUID") + .HasMaxLength(10) + .HasColumnType("character varying(10)") + .HasColumnName("other_user_uid"); + + b.Property("Timestamp") + .IsConcurrencyToken() + .ValueGeneratedOnAddOrUpdate() + .HasColumnType("bytea") + .HasColumnName("timestamp"); + + b.HasKey("UserUID", "OtherUserUID") + .HasName("pk_client_pairs"); + + b.HasIndex("OtherUserUID") + .HasDatabaseName("ix_client_pairs_other_user_uid"); + + b.HasIndex("UserUID") + .HasDatabaseName("ix_client_pairs_user_uid"); + + b.ToTable("client_pairs", (string)null); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.FileCache", b => + { + b.Property("Hash") + .HasMaxLength(40) + .HasColumnType("character varying(40)") + .HasColumnName("hash"); + + b.Property("RawSize") + .HasColumnType("bigint") + .HasColumnName("raw_size"); + + b.Property("Size") + .HasColumnType("bigint") + .HasColumnName("size"); + + b.Property("Timestamp") + .IsConcurrencyToken() + .ValueGeneratedOnAddOrUpdate() + .HasColumnType("bytea") + .HasColumnName("timestamp"); + + b.Property("UploadDate") + .HasColumnType("timestamp with time zone") + .HasColumnName("upload_date"); + + b.Property("Uploaded") + .HasColumnType("boolean") + .HasColumnName("uploaded"); + + b.Property("UploaderUID") + .HasMaxLength(10) + .HasColumnType("character varying(10)") + .HasColumnName("uploader_uid"); + + b.HasKey("Hash") + .HasName("pk_file_caches"); + + b.HasIndex("UploaderUID") + .HasDatabaseName("ix_file_caches_uploader_uid"); + + b.ToTable("file_caches", (string)null); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.ForbiddenUploadEntry", b => + { + b.Property("Hash") + .HasMaxLength(40) + .HasColumnType("character varying(40)") + .HasColumnName("hash"); + + b.Property("ForbiddenBy") + .HasMaxLength(100) + .HasColumnType("character varying(100)") + .HasColumnName("forbidden_by"); + + b.Property("Timestamp") + .IsConcurrencyToken() + .ValueGeneratedOnAddOrUpdate() + .HasColumnType("bytea") + .HasColumnName("timestamp"); + + b.HasKey("Hash") + .HasName("pk_forbidden_upload_entries"); + + b.ToTable("forbidden_upload_entries", (string)null); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.Group", b => + { + b.Property("GID") + .HasMaxLength(20) + .HasColumnType("character varying(20)") + .HasColumnName("gid"); + + b.Property("Alias") + .HasMaxLength(50) + .HasColumnType("character varying(50)") + .HasColumnName("alias"); + + b.Property("AutoPruneDays") + .HasColumnType("integer") + .HasColumnName("auto_prune_days"); + + b.Property("AutoPruneEnabled") + .HasColumnType("boolean") + .HasColumnName("auto_prune_enabled"); + + b.Property("ChatEnabled") + .ValueGeneratedOnAdd() + .HasColumnType("boolean") + .HasDefaultValue(true) + .HasColumnName("chat_enabled"); + + b.Property("CreatedDate") + .ValueGeneratedOnAdd() + .HasColumnType("timestamp with time zone") + .HasColumnName("created_date") + .HasDefaultValueSql("CURRENT_TIMESTAMP"); + + b.Property("HashedPassword") + .HasColumnType("text") + .HasColumnName("hashed_password"); + + b.Property("InvitesEnabled") + .HasColumnType("boolean") + .HasColumnName("invites_enabled"); + + b.Property("OwnerUID") + .HasColumnType("character varying(10)") + .HasColumnName("owner_uid"); + + b.Property("PreferDisableAnimations") + .HasColumnType("boolean") + .HasColumnName("prefer_disable_animations"); + + b.Property("PreferDisableSounds") + .HasColumnType("boolean") + .HasColumnName("prefer_disable_sounds"); + + b.Property("PreferDisableVFX") + .HasColumnType("boolean") + .HasColumnName("prefer_disable_vfx"); + + b.HasKey("GID") + .HasName("pk_groups"); + + b.HasIndex("OwnerUID") + .HasDatabaseName("ix_groups_owner_uid"); + + b.ToTable("groups", (string)null); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.GroupBan", b => + { + b.Property("GroupGID") + .HasColumnType("character varying(20)") + .HasColumnName("group_gid"); + + b.Property("BannedUserUID") + .HasColumnType("character varying(10)") + .HasColumnName("banned_user_uid"); + + b.Property("BannedByUID") + .HasColumnType("character varying(10)") + .HasColumnName("banned_by_uid"); + + b.Property("BannedOn") + .HasColumnType("timestamp with time zone") + .HasColumnName("banned_on"); + + b.Property("BannedReason") + .HasColumnType("text") + .HasColumnName("banned_reason"); + + b.HasKey("GroupGID", "BannedUserUID") + .HasName("pk_group_bans"); + + b.HasIndex("BannedByUID") + .HasDatabaseName("ix_group_bans_banned_by_uid"); + + b.HasIndex("BannedUserUID") + .HasDatabaseName("ix_group_bans_banned_user_uid"); + + b.HasIndex("GroupGID") + .HasDatabaseName("ix_group_bans_group_gid"); + + b.ToTable("group_bans", (string)null); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.GroupPair", b => + { + b.Property("GroupGID") + .HasColumnType("character varying(20)") + .HasColumnName("group_gid"); + + b.Property("GroupUserUID") + .HasColumnType("character varying(10)") + .HasColumnName("group_user_uid"); + + b.Property("FromFinder") + .HasColumnType("boolean") + .HasColumnName("from_finder"); + + b.Property("IsModerator") + .HasColumnType("boolean") + .HasColumnName("is_moderator"); + + b.Property("IsPinned") + .HasColumnType("boolean") + .HasColumnName("is_pinned"); + + b.Property("JoinedGroupOn") + .HasColumnType("timestamp with time zone") + .HasColumnName("joined_group_on"); + + b.HasKey("GroupGID", "GroupUserUID") + .HasName("pk_group_pairs"); + + b.HasIndex("GroupGID") + .HasDatabaseName("ix_group_pairs_group_gid"); + + b.HasIndex("GroupUserUID") + .HasDatabaseName("ix_group_pairs_group_user_uid"); + + b.ToTable("group_pairs", (string)null); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.GroupPairPreferredPermission", b => + { + b.Property("UserUID") + .HasColumnType("character varying(10)") + .HasColumnName("user_uid"); + + b.Property("GroupGID") + .HasColumnType("character varying(20)") + .HasColumnName("group_gid"); + + b.Property("DisableAnimations") + .HasColumnType("boolean") + .HasColumnName("disable_animations"); + + b.Property("DisableSounds") + .HasColumnType("boolean") + .HasColumnName("disable_sounds"); + + b.Property("DisableVFX") + .HasColumnType("boolean") + .HasColumnName("disable_vfx"); + + b.Property("IsPaused") + .HasColumnType("boolean") + .HasColumnName("is_paused"); + + b.HasKey("UserUID", "GroupGID") + .HasName("pk_group_pair_preferred_permissions"); + + b.HasIndex("GroupGID") + .HasDatabaseName("ix_group_pair_preferred_permissions_group_gid"); + + b.HasIndex("UserUID") + .HasDatabaseName("ix_group_pair_preferred_permissions_user_uid"); + + b.ToTable("group_pair_preferred_permissions", (string)null); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.GroupProfile", b => + { + b.Property("GroupGID") + .HasMaxLength(20) + .HasColumnType("character varying(20)") + .HasColumnName("group_gid"); + + b.Property("Base64GroupBannerImage") + .HasColumnType("text") + .HasColumnName("base64group_banner_image"); + + b.Property("Base64GroupProfileImage") + .HasColumnType("text") + .HasColumnName("base64group_profile_image"); + + b.Property("Description") + .HasColumnType("text") + .HasColumnName("description"); + + b.Property("IsNSFW") + .HasColumnType("boolean") + .HasColumnName("is_nsfw"); + + b.Property("ProfileDisabled") + .HasColumnType("boolean") + .HasColumnName("profile_disabled"); + + b.PrimitiveCollection("Tags") + .HasColumnType("integer[]") + .HasColumnName("tags"); + + b.HasKey("GroupGID") + .HasName("pk_group_profiles"); + + b.HasIndex("GroupGID") + .HasDatabaseName("ix_group_profiles_group_gid"); + + b.ToTable("group_profiles", (string)null); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.GroupTempInvite", b => + { + b.Property("GroupGID") + .HasColumnType("character varying(20)") + .HasColumnName("group_gid"); + + b.Property("Invite") + .HasMaxLength(64) + .HasColumnType("character varying(64)") + .HasColumnName("invite"); + + b.Property("ExpirationDate") + .HasColumnType("timestamp with time zone") + .HasColumnName("expiration_date"); + + b.HasKey("GroupGID", "Invite") + .HasName("pk_group_temp_invites"); + + b.HasIndex("GroupGID") + .HasDatabaseName("ix_group_temp_invites_group_gid"); + + b.HasIndex("Invite") + .HasDatabaseName("ix_group_temp_invites_invite"); + + b.ToTable("group_temp_invites", (string)null); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.LodeStoneAuth", b => + { + b.Property("DiscordId") + .ValueGeneratedOnAdd() + .HasColumnType("numeric(20,0)") + .HasColumnName("discord_id"); + + b.Property("HashedLodestoneId") + .HasMaxLength(100) + .HasColumnType("character varying(100)") + .HasColumnName("hashed_lodestone_id"); + + b.Property("LodestoneAuthString") + .HasMaxLength(100) + .HasColumnType("character varying(100)") + .HasColumnName("lodestone_auth_string"); + + b.Property("StartedAt") + .HasColumnType("timestamp with time zone") + .HasColumnName("started_at"); + + b.Property("UserUID") + .HasColumnType("character varying(10)") + .HasColumnName("user_uid"); + + b.HasKey("DiscordId") + .HasName("pk_lodestone_auth"); + + b.HasIndex("UserUID") + .HasDatabaseName("ix_lodestone_auth_user_uid"); + + b.ToTable("lodestone_auth", (string)null); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.ReportedChatMessage", b => + { + b.Property("ReportId") + .ValueGeneratedOnAdd() + .HasColumnType("integer") + .HasColumnName("report_id"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("ReportId")); + + b.Property("AdditionalContext") + .HasColumnType("text") + .HasColumnName("additional_context"); + + b.Property("ChannelKey") + .IsRequired() + .HasColumnType("text") + .HasColumnName("channel_key"); + + b.Property("ChannelType") + .HasColumnType("smallint") + .HasColumnName("channel_type"); + + b.Property("DiscordMessageId") + .HasColumnType("numeric(20,0)") + .HasColumnName("discord_message_id"); + + b.Property("DiscordMessagePostedAtUtc") + .HasColumnType("timestamp with time zone") + .HasColumnName("discord_message_posted_at_utc"); + + b.Property("MessageContent") + .IsRequired() + .HasColumnType("text") + .HasColumnName("message_content"); + + b.Property("MessageId") + .IsRequired() + .HasColumnType("text") + .HasColumnName("message_id"); + + b.Property("MessageSentAtUtc") + .HasColumnType("timestamp with time zone") + .HasColumnName("message_sent_at_utc"); + + b.Property("Reason") + .HasColumnType("text") + .HasColumnName("reason"); + + b.Property("ReportTimeUtc") + .HasColumnType("timestamp with time zone") + .HasColumnName("report_time_utc"); + + b.Property("ReportedUserUid") + .HasColumnType("text") + .HasColumnName("reported_user_uid"); + + b.Property("ReporterUserUid") + .IsRequired() + .HasColumnType("text") + .HasColumnName("reporter_user_uid"); + + b.Property("ResolutionNotes") + .HasColumnType("text") + .HasColumnName("resolution_notes"); + + b.Property("Resolved") + .HasColumnType("boolean") + .HasColumnName("resolved"); + + b.Property("ResolvedAtUtc") + .HasColumnType("timestamp with time zone") + .HasColumnName("resolved_at_utc"); + + b.Property("ResolvedByUserUid") + .HasColumnType("text") + .HasColumnName("resolved_by_user_uid"); + + b.Property("SenderDisplayName") + .HasColumnType("text") + .HasColumnName("sender_display_name"); + + b.Property("SenderHashedCid") + .HasColumnType("text") + .HasColumnName("sender_hashed_cid"); + + b.Property("SenderWasLightfinder") + .HasColumnType("boolean") + .HasColumnName("sender_was_lightfinder"); + + b.Property("SnapshotJson") + .HasColumnType("text") + .HasColumnName("snapshot_json"); + + b.Property("WorldId") + .HasColumnType("integer") + .HasColumnName("world_id"); + + b.Property("ZoneId") + .HasColumnType("integer") + .HasColumnName("zone_id"); + + b.HasKey("ReportId") + .HasName("pk_reported_chat_messages"); + + b.HasIndex("DiscordMessageId") + .HasDatabaseName("ix_reported_chat_messages_discord_message_id"); + + b.HasIndex("MessageId") + .IsUnique() + .HasDatabaseName("ix_reported_chat_messages_message_id"); + + b.HasIndex("ReportedUserUid") + .HasDatabaseName("ix_reported_chat_messages_reported_user_uid"); + + b.HasIndex("ReporterUserUid") + .HasDatabaseName("ix_reported_chat_messages_reporter_user_uid"); + + b.ToTable("reported_chat_messages", (string)null); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.User", b => + { + b.Property("UID") + .HasMaxLength(10) + .HasColumnType("character varying(10)") + .HasColumnName("uid"); + + b.Property("Alias") + .HasMaxLength(15) + .HasColumnType("character varying(15)") + .HasColumnName("alias"); + + b.Property("ChatBanned") + .HasColumnType("boolean") + .HasColumnName("chat_banned"); + + b.Property("HasVanity") + .HasColumnType("boolean") + .HasColumnName("has_vanity"); + + b.Property("IsAdmin") + .HasColumnType("boolean") + .HasColumnName("is_admin"); + + b.Property("IsModerator") + .HasColumnType("boolean") + .HasColumnName("is_moderator"); + + b.Property("LastLoggedIn") + .HasColumnType("timestamp with time zone") + .HasColumnName("last_logged_in"); + + b.Property("TextColorHex") + .HasMaxLength(9) + .HasColumnType("character varying(9)") + .HasColumnName("text_color_hex"); + + b.Property("TextGlowColorHex") + .HasMaxLength(9) + .HasColumnType("character varying(9)") + .HasColumnName("text_glow_color_hex"); + + b.Property("Timestamp") + .IsConcurrencyToken() + .ValueGeneratedOnAddOrUpdate() + .HasColumnType("bytea") + .HasColumnName("timestamp"); + + b.HasKey("UID") + .HasName("pk_users"); + + b.ToTable("users", (string)null); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.UserDefaultPreferredPermission", b => + { + b.Property("UserUID") + .HasMaxLength(10) + .HasColumnType("character varying(10)") + .HasColumnName("user_uid"); + + b.Property("DisableGroupAnimations") + .HasColumnType("boolean") + .HasColumnName("disable_group_animations"); + + b.Property("DisableGroupSounds") + .HasColumnType("boolean") + .HasColumnName("disable_group_sounds"); + + b.Property("DisableGroupVFX") + .HasColumnType("boolean") + .HasColumnName("disable_group_vfx"); + + b.Property("DisableIndividualAnimations") + .HasColumnType("boolean") + .HasColumnName("disable_individual_animations"); + + b.Property("DisableIndividualSounds") + .HasColumnType("boolean") + .HasColumnName("disable_individual_sounds"); + + b.Property("DisableIndividualVFX") + .HasColumnType("boolean") + .HasColumnName("disable_individual_vfx"); + + b.Property("IndividualIsSticky") + .HasColumnType("boolean") + .HasColumnName("individual_is_sticky"); + + b.HasKey("UserUID") + .HasName("pk_user_default_preferred_permissions"); + + b.HasIndex("UserUID") + .HasDatabaseName("ix_user_default_preferred_permissions_user_uid"); + + b.ToTable("user_default_preferred_permissions", (string)null); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.UserPermissionSet", b => + { + b.Property("UserUID") + .HasColumnType("character varying(10)") + .HasColumnName("user_uid"); + + b.Property("OtherUserUID") + .HasColumnType("character varying(10)") + .HasColumnName("other_user_uid"); + + b.Property("DisableAnimations") + .HasColumnType("boolean") + .HasColumnName("disable_animations"); + + b.Property("DisableSounds") + .HasColumnType("boolean") + .HasColumnName("disable_sounds"); + + b.Property("DisableVFX") + .HasColumnType("boolean") + .HasColumnName("disable_vfx"); + + b.Property("IsPaused") + .HasColumnType("boolean") + .HasColumnName("is_paused"); + + b.Property("ShareLocationUntil") + .HasColumnType("timestamp with time zone") + .HasColumnName("share_location_until"); + + b.Property("Sticky") + .HasColumnType("boolean") + .HasColumnName("sticky"); + + b.HasKey("UserUID", "OtherUserUID") + .HasName("pk_user_permission_sets"); + + b.HasIndex("OtherUserUID") + .HasDatabaseName("ix_user_permission_sets_other_user_uid"); + + b.HasIndex("UserUID") + .HasDatabaseName("ix_user_permission_sets_user_uid"); + + b.HasIndex("UserUID", "OtherUserUID", "IsPaused") + .HasDatabaseName("ix_user_permission_sets_user_uid_other_user_uid_is_paused"); + + b.ToTable("user_permission_sets", (string)null); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.UserProfileData", b => + { + b.Property("UserUID") + .HasColumnType("character varying(10)") + .HasColumnName("user_uid"); + + b.Property("Base64BannerImage") + .HasColumnType("text") + .HasColumnName("base64banner_image"); + + b.Property("Base64ProfileImage") + .HasColumnType("text") + .HasColumnName("base64profile_image"); + + b.Property("FlaggedForReport") + .HasColumnType("boolean") + .HasColumnName("flagged_for_report"); + + b.Property("IsNSFW") + .HasColumnType("boolean") + .HasColumnName("is_nsfw"); + + b.Property("ProfileDisabled") + .HasColumnType("boolean") + .HasColumnName("profile_disabled"); + + b.PrimitiveCollection("Tags") + .HasColumnType("integer[]") + .HasColumnName("tags"); + + b.Property("UserDescription") + .HasColumnType("text") + .HasColumnName("user_description"); + + b.HasKey("UserUID") + .HasName("pk_user_profile_data"); + + b.ToTable("user_profile_data", (string)null); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.Auth", b => + { + b.HasOne("LightlessSyncShared.Models.User", "PrimaryUser") + .WithMany() + .HasForeignKey("PrimaryUserUID") + .HasConstraintName("fk_auth_users_primary_user_uid"); + + b.HasOne("LightlessSyncShared.Models.User", "User") + .WithMany() + .HasForeignKey("UserUID") + .HasConstraintName("fk_auth_users_user_uid"); + + b.Navigation("PrimaryUser"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.CharaData", b => + { + b.HasOne("LightlessSyncShared.Models.User", "Uploader") + .WithMany() + .HasForeignKey("UploaderUID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_chara_data_users_uploader_uid"); + + b.Navigation("Uploader"); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.CharaDataAllowance", b => + { + b.HasOne("LightlessSyncShared.Models.Group", "AllowedGroup") + .WithMany() + .HasForeignKey("AllowedGroupGID") + .OnDelete(DeleteBehavior.Cascade) + .HasConstraintName("fk_chara_data_allowance_groups_allowed_group_gid"); + + b.HasOne("LightlessSyncShared.Models.User", "AllowedUser") + .WithMany() + .HasForeignKey("AllowedUserUID") + .OnDelete(DeleteBehavior.Cascade) + .HasConstraintName("fk_chara_data_allowance_users_allowed_user_uid"); + + b.HasOne("LightlessSyncShared.Models.CharaData", "Parent") + .WithMany("AllowedIndividiuals") + .HasForeignKey("ParentId", "ParentUploaderUID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_chara_data_allowance_chara_data_parent_id_parent_uploader_u"); + + b.Navigation("AllowedGroup"); + + b.Navigation("AllowedUser"); + + b.Navigation("Parent"); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.CharaDataFile", b => + { + b.HasOne("LightlessSyncShared.Models.FileCache", "FileCache") + .WithMany() + .HasForeignKey("FileCacheHash") + .OnDelete(DeleteBehavior.Cascade) + .HasConstraintName("fk_chara_data_files_files_file_cache_hash"); + + b.HasOne("LightlessSyncShared.Models.CharaData", "Parent") + .WithMany("Files") + .HasForeignKey("ParentId", "ParentUploaderUID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_chara_data_files_chara_data_parent_id_parent_uploader_uid"); + + b.Navigation("FileCache"); + + b.Navigation("Parent"); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.CharaDataFileSwap", b => + { + b.HasOne("LightlessSyncShared.Models.CharaData", "Parent") + .WithMany("FileSwaps") + .HasForeignKey("ParentId", "ParentUploaderUID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_chara_data_file_swaps_chara_data_parent_id_parent_uploader_"); + + b.Navigation("Parent"); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.CharaDataOriginalFile", b => + { + b.HasOne("LightlessSyncShared.Models.CharaData", "Parent") + .WithMany("OriginalFiles") + .HasForeignKey("ParentId", "ParentUploaderUID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_chara_data_orig_files_chara_data_parent_id_parent_uploader_"); + + b.Navigation("Parent"); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.CharaDataPose", b => + { + b.HasOne("LightlessSyncShared.Models.CharaData", "Parent") + .WithMany("Poses") + .HasForeignKey("ParentId", "ParentUploaderUID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_chara_data_poses_chara_data_parent_id_parent_uploader_uid"); + + b.Navigation("Parent"); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.ClientPair", b => + { + b.HasOne("LightlessSyncShared.Models.User", "OtherUser") + .WithMany() + .HasForeignKey("OtherUserUID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_client_pairs_users_other_user_uid"); + + b.HasOne("LightlessSyncShared.Models.User", "User") + .WithMany() + .HasForeignKey("UserUID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_client_pairs_users_user_uid"); + + b.Navigation("OtherUser"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.FileCache", b => + { + b.HasOne("LightlessSyncShared.Models.User", "Uploader") + .WithMany() + .HasForeignKey("UploaderUID") + .HasConstraintName("fk_file_caches_users_uploader_uid"); + + b.Navigation("Uploader"); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.Group", b => + { + b.HasOne("LightlessSyncShared.Models.User", "Owner") + .WithMany() + .HasForeignKey("OwnerUID") + .HasConstraintName("fk_groups_users_owner_uid"); + + b.Navigation("Owner"); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.GroupBan", b => + { + b.HasOne("LightlessSyncShared.Models.User", "BannedBy") + .WithMany() + .HasForeignKey("BannedByUID") + .HasConstraintName("fk_group_bans_users_banned_by_uid"); + + b.HasOne("LightlessSyncShared.Models.User", "BannedUser") + .WithMany() + .HasForeignKey("BannedUserUID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_group_bans_users_banned_user_uid"); + + b.HasOne("LightlessSyncShared.Models.Group", "Group") + .WithMany() + .HasForeignKey("GroupGID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_group_bans_groups_group_gid"); + + b.Navigation("BannedBy"); + + b.Navigation("BannedUser"); + + b.Navigation("Group"); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.GroupPair", b => + { + b.HasOne("LightlessSyncShared.Models.Group", "Group") + .WithMany() + .HasForeignKey("GroupGID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_group_pairs_groups_group_gid"); + + b.HasOne("LightlessSyncShared.Models.User", "GroupUser") + .WithMany() + .HasForeignKey("GroupUserUID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_group_pairs_users_group_user_uid"); + + b.Navigation("Group"); + + b.Navigation("GroupUser"); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.GroupPairPreferredPermission", b => + { + b.HasOne("LightlessSyncShared.Models.Group", "Group") + .WithMany() + .HasForeignKey("GroupGID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_group_pair_preferred_permissions_groups_group_gid"); + + b.HasOne("LightlessSyncShared.Models.User", "User") + .WithMany() + .HasForeignKey("UserUID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_group_pair_preferred_permissions_users_user_uid"); + + b.Navigation("Group"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.GroupProfile", b => + { + b.HasOne("LightlessSyncShared.Models.Group", "Group") + .WithOne("Profile") + .HasForeignKey("LightlessSyncShared.Models.GroupProfile", "GroupGID") + .OnDelete(DeleteBehavior.Cascade) + .HasConstraintName("fk_group_profiles_groups_group_gid"); + + b.Navigation("Group"); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.GroupTempInvite", b => + { + b.HasOne("LightlessSyncShared.Models.Group", "Group") + .WithMany() + .HasForeignKey("GroupGID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_group_temp_invites_groups_group_gid"); + + b.Navigation("Group"); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.LodeStoneAuth", b => + { + b.HasOne("LightlessSyncShared.Models.User", "User") + .WithMany() + .HasForeignKey("UserUID") + .HasConstraintName("fk_lodestone_auth_users_user_uid"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.UserDefaultPreferredPermission", b => + { + b.HasOne("LightlessSyncShared.Models.User", "User") + .WithMany() + .HasForeignKey("UserUID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_user_default_preferred_permissions_users_user_uid"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.UserPermissionSet", b => + { + b.HasOne("LightlessSyncShared.Models.User", "OtherUser") + .WithMany() + .HasForeignKey("OtherUserUID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_user_permission_sets_users_other_user_uid"); + + b.HasOne("LightlessSyncShared.Models.User", "User") + .WithMany() + .HasForeignKey("UserUID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_user_permission_sets_users_user_uid"); + + b.Navigation("OtherUser"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.UserProfileData", b => + { + b.HasOne("LightlessSyncShared.Models.User", "User") + .WithMany() + .HasForeignKey("UserUID") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired() + .HasConstraintName("fk_user_profile_data_users_user_uid"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.CharaData", b => + { + b.Navigation("AllowedIndividiuals"); + + b.Navigation("FileSwaps"); + + b.Navigation("Files"); + + b.Navigation("OriginalFiles"); + + b.Navigation("Poses"); + }); + + modelBuilder.Entity("LightlessSyncShared.Models.Group", b => + { + b.Navigation("Profile"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/LightlessSyncServer/LightlessSyncShared/Migrations/20251229015535_ShareLocation.cs b/LightlessSyncServer/LightlessSyncShared/Migrations/20251229015535_ShareLocation.cs new file mode 100644 index 0000000..a9747b9 --- /dev/null +++ b/LightlessSyncServer/LightlessSyncShared/Migrations/20251229015535_ShareLocation.cs @@ -0,0 +1,30 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace LightlessSyncServer.Migrations +{ + /// + public partial class ShareLocation : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + 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))); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "share_location_until", + table: "user_permission_sets"); + } + } +} diff --git a/LightlessSyncServer/LightlessSyncShared/Migrations/LightlessDbContextModelSnapshot.cs b/LightlessSyncServer/LightlessSyncShared/Migrations/LightlessDbContextModelSnapshot.cs index 70686e5..b76a782 100644 --- a/LightlessSyncServer/LightlessSyncShared/Migrations/LightlessDbContextModelSnapshot.cs +++ b/LightlessSyncServer/LightlessSyncShared/Migrations/LightlessDbContextModelSnapshot.cs @@ -941,6 +941,10 @@ namespace LightlessSyncServer.Migrations .HasColumnType("boolean") .HasColumnName("is_paused"); + b.Property("ShareLocationUntil") + .HasColumnType("timestamp with time zone") + .HasColumnName("share_location_until"); + b.Property("Sticky") .HasColumnType("boolean") .HasColumnName("sticky"); From 53e089a65b9cb1330de47efc3f38d1fa192784cd Mon Sep 17 00:00:00 2001 From: Tsubasahane Date: Mon, 29 Dec 2025 15:35:54 +0800 Subject: [PATCH 6/6] ToggleLocationSharing returns bool --- LightlessAPI | 2 +- .../Hubs/LightlessHub.User.cs | 27 +++++++++++++------ 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/LightlessAPI b/LightlessAPI index 852e2a0..c3caa7e 160000 --- a/LightlessAPI +++ b/LightlessAPI @@ -1 +1 @@ -Subproject commit 852e2a005f5bfdf3844e057c6ba71de6f5f84ed8 +Subproject commit c3caa7e25cf17fd52c4765bf051ec37c8fd92082 diff --git a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.User.cs b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.User.cs index bda6d24..1614af9 100644 --- a/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.User.cs +++ b/LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.User.cs @@ -1322,16 +1322,27 @@ public partial class LightlessHub [Authorize(Policy = "Identified")] - public async Task ToggleLocationSharing(LocationSharingToggleDto dto) + public async Task ToggleLocationSharing(LocationSharingToggleDto dto) { _logger.LogCallInfo(LightlessHubLogger.Args(UserUID,dto)); - 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($"Location:{UserUID}").ConfigureAwait(false); - await Clients.Users(dto.users).Client_SendLocationToClient(currentLocation, dto.duration.ToUniversalTime()).ConfigureAwait(false); + 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($"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; } [GeneratedRegex(@"^([a-z0-9_ '+&,\.\-\{\}]+\/)+([a-z0-9_ '+&,\.\-\{\}]+\.[a-z]{3,4})$", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.ECMAScript)]