Compare commits

...

7 Commits

Author SHA1 Message Date
Tsubasahane
1786ad1683 Update LightlessAPI 2025-12-31 22:56:32 +08:00
Tsubasahane
53e089a65b ToggleLocationSharing returns bool 2025-12-29 15:35:54 +08:00
Tsubasahane
c3e87eb7df ShareLocation : Migration 2025-12-29 09:55:53 +08:00
Tsubasahane
a533fca195 transfer sharing status 2025-12-28 19:54:26 +08:00
Tsubasahane
717d8e46f1 Location Share but with expireAt 2025-12-28 13:07:36 +08:00
Tsubasahane
d3790013c6 Revert "Share Location"
This reverts commit 9971b14177.
2025-12-28 11:00:50 +08:00
Tsubasahane
9971b14177 Share Location 2025-12-27 19:52:28 +08:00
9 changed files with 1491 additions and 4 deletions

3
.gitignore vendored
View File

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

View File

@@ -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");
}
}

View File

@@ -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;
@@ -1233,6 +1231,120 @@ 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))
{
_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<LocationDto>(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<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()
{
_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)
.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;
}
[GeneratedRegex(@"^([a-z0-9_ '+&,\.\-\{\}]+\/)+([a-z0-9_ '+&,\.\-\{\}]+\.[a-z]{3,4})$", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.ECMAScript)]
private static partial Regex GamePathRegex();

View File

@@ -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;
@@ -218,6 +220,8 @@ public partial class LightlessHub : Hub<ILightlessHub>, ILightlessHub
_lightlessCensus.ClearStatistics(UserUID);
await UpdateLocation(new LocationDto(new UserData(UserUID), new LocationInfo()), offline: true).ConfigureAwait(false);
await SendOfflineToAllPairedUsers().ConfigureAwait(false);
DbContext.RemoveRange(DbContext.Files.Where(f => !f.Uploaded && f.UploaderUID == UserUID));

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,30 @@
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");
}
}
}

View File

@@ -941,6 +941,10 @@ 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");

View File

@@ -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;
}