Compare commits

..

1 Commits

Author SHA1 Message Date
defnotken
8c1af6f31c Discord-bot + server updates 2025-12-18 18:16:23 -06:00
23 changed files with 63 additions and 4352 deletions

1
.gitignore vendored
View File

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

View File

@@ -41,10 +41,8 @@ public partial class LightlessHub
var groupInfos = await DbContext.Groups var groupInfos = await DbContext.Groups
.AsNoTracking() .AsNoTracking()
.Where(g => g.ChatEnabled .Where(g => g.OwnerUID == userUid
&& (g.OwnerUID == userUid
|| DbContext.GroupPairs.Any(p => p.GroupGID == g.GID && p.GroupUserUID == userUid)) || DbContext.GroupPairs.Any(p => p.GroupGID == g.GID && p.GroupUserUID == userUid))
)
.ToListAsync() .ToListAsync()
.ConfigureAwait(false); .ConfigureAwait(false);
@@ -164,13 +162,6 @@ public partial class LightlessHub
throw new HubException("Unsupported chat channel."); throw new HubException("Unsupported chat channel.");
} }
if (!group.ChatEnabled)
{
TryInvokeChatService(() => _chatChannelService.RemovePresence(UserUID, channel), "removing chat presence", channel);
await Clients.Caller.Client_ReceiveServerMessage(MessageSeverity.Warning, "This Syncshell chat is disabled.").ConfigureAwait(false);
return;
}
var isMember = string.Equals(group.OwnerUID, UserUID, StringComparison.Ordinal) var isMember = string.Equals(group.OwnerUID, UserUID, StringComparison.Ordinal)
|| await DbContext.GroupPairs || await DbContext.GroupPairs
.AsNoTracking() .AsNoTracking()
@@ -216,23 +207,6 @@ public partial class LightlessHub
var channel = request.Channel.WithNormalizedCustomKey(); var channel = request.Channel.WithNormalizedCustomKey();
if (channel.Type == ChatChannelType.Group)
{
var groupId = channel.CustomKey ?? string.Empty;
var chatEnabled = !string.IsNullOrEmpty(groupId) && await DbContext.Groups
.AsNoTracking()
.Where(g => g.GID == groupId)
.Select(g => g.ChatEnabled)
.SingleOrDefaultAsync(RequestAbortedToken)
.ConfigureAwait(false);
if (!chatEnabled)
{
await Clients.Caller.Client_ReceiveServerMessage(MessageSeverity.Warning, "This Syncshell chat is disabled.").ConfigureAwait(false);
return;
}
}
if (await HandleIfChatBannedAsync(UserUID).ConfigureAwait(false)) if (await HandleIfChatBannedAsync(UserUID).ConfigureAwait(false))
{ {
throw new HubException("Chat access has been revoked."); throw new HubException("Chat access has been revoked.");

View File

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

View File

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

View File

@@ -1,7 +1,6 @@
using LightlessSync.API.Data; using LightlessSync.API.Data;
using LightlessSync.API.Data.Enum; using LightlessSync.API.Data.Enum;
using LightlessSync.API.Data.Extensions; using LightlessSync.API.Data.Extensions;
using LightlessSync.API.Dto.Chat;
using LightlessSync.API.Dto.Group; using LightlessSync.API.Dto.Group;
using LightlessSync.API.Dto.User; using LightlessSync.API.Dto.User;
using LightlessSyncServer.Models; using LightlessSyncServer.Models;
@@ -12,8 +11,10 @@ using LightlessSyncShared.Utils;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.SignalR; using Microsoft.AspNetCore.SignalR;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Newtonsoft.Json.Linq;
using SixLabors.ImageSharp; using SixLabors.ImageSharp;
using System.Collections.Concurrent; using SixLabors.ImageSharp.PixelFormats;
using System.Reflection;
using System.Security.Cryptography; using System.Security.Cryptography;
namespace LightlessSyncServer.Hubs; namespace LightlessSyncServer.Hubs;
@@ -51,8 +52,6 @@ public partial class LightlessHub
_logger.LogCallInfo(LightlessHubLogger.Args(dto, "Success")); _logger.LogCallInfo(LightlessHubLogger.Args(dto, "Success"));
} }
private static readonly ConcurrentDictionary<string, DateTime> GroupChatToggleCooldowns = new(StringComparer.Ordinal);
[Authorize(Policy = "Identified")] [Authorize(Policy = "Identified")]
public async Task GroupChangeGroupPermissionState(GroupPermissionDto dto) public async Task GroupChangeGroupPermissionState(GroupPermissionDto dto)
{ {
@@ -61,73 +60,15 @@ public partial class LightlessHub
var (hasRights, group) = await TryValidateGroupModeratorOrOwner(dto.Group.GID).ConfigureAwait(false); var (hasRights, group) = await TryValidateGroupModeratorOrOwner(dto.Group.GID).ConfigureAwait(false);
if (!hasRights) return; if (!hasRights) return;
var permissions = dto.Permissions; group.InvitesEnabled = !dto.Permissions.HasFlag(GroupPermissions.DisableInvites);
var isOwner = string.Equals(group.OwnerUID, UserUID, StringComparison.Ordinal); group.PreferDisableSounds = dto.Permissions.HasFlag(GroupPermissions.PreferDisableSounds);
var chatEnabled = group.ChatEnabled; group.PreferDisableAnimations = dto.Permissions.HasFlag(GroupPermissions.PreferDisableAnimations);
var chatChanged = false; group.PreferDisableVFX = dto.Permissions.HasFlag(GroupPermissions.PreferDisableVFX);
if (!isOwner)
{
permissions.SetDisableChat(!group.ChatEnabled);
}
else
{
var requestedChatEnabled = !permissions.IsDisableChat();
if (requestedChatEnabled != group.ChatEnabled)
{
var now = DateTime.UtcNow;
if (GroupChatToggleCooldowns.TryGetValue(group.GID, out var lockedUntil) && lockedUntil > now)
{
var remaining = lockedUntil - now;
var minutes = Math.Max(1, (int)Math.Ceiling(remaining.TotalMinutes));
await Clients.Caller.Client_ReceiveServerMessage(
MessageSeverity.Warning,
$"Syncshell chat can be toggled again in {minutes} minute{(minutes == 1 ? string.Empty : "s")}."
).ConfigureAwait(false);
permissions.SetDisableChat(!group.ChatEnabled);
}
else
{
chatEnabled = requestedChatEnabled;
group.ChatEnabled = chatEnabled;
GroupChatToggleCooldowns[group.GID] = now.AddMinutes(5);
chatChanged = true;
}
}
}
group.InvitesEnabled = !permissions.HasFlag(GroupPermissions.DisableInvites);
group.PreferDisableSounds = permissions.HasFlag(GroupPermissions.PreferDisableSounds);
group.PreferDisableAnimations = permissions.HasFlag(GroupPermissions.PreferDisableAnimations);
group.PreferDisableVFX = permissions.HasFlag(GroupPermissions.PreferDisableVFX);
await DbContext.SaveChangesAsync(RequestAbortedToken).ConfigureAwait(false); await DbContext.SaveChangesAsync(RequestAbortedToken).ConfigureAwait(false);
var groupPairs = DbContext.GroupPairs.Where(p => p.GroupGID == dto.Group.GID).Select(p => p.GroupUserUID).ToList(); var groupPairs = DbContext.GroupPairs.Where(p => p.GroupGID == dto.Group.GID).Select(p => p.GroupUserUID).ToList();
await Clients.Users(groupPairs).Client_GroupChangePermissions(new GroupPermissionDto(dto.Group, permissions)).ConfigureAwait(false); await Clients.Users(groupPairs).Client_GroupChangePermissions(new GroupPermissionDto(dto.Group, dto.Permissions)).ConfigureAwait(false);
if (isOwner && chatChanged && !chatEnabled)
{
var groupDisplayName = string.IsNullOrWhiteSpace(group.Alias) ? group.GID : group.Alias;
var descriptor = new ChatChannelDescriptor
{
Type = ChatChannelType.Group,
WorldId = 0,
ZoneId = 0,
CustomKey = group.GID
};
foreach (var uid in groupPairs)
{
TryInvokeChatService(() => _chatChannelService.RemovePresence(uid, descriptor), "removing group chat presence", descriptor, uid);
}
await Clients.Users(groupPairs)
.Client_ReceiveServerMessage(
MessageSeverity.Information,
$"Syncshell chat for '{groupDisplayName}' has been disabled.")
.ConfigureAwait(false);
}
} }
[Authorize(Policy = "Identified")] [Authorize(Policy = "Identified")]
@@ -294,7 +235,6 @@ public partial class LightlessHub
PreferDisableAnimations = defaultPermissions.DisableGroupAnimations, PreferDisableAnimations = defaultPermissions.DisableGroupAnimations,
PreferDisableSounds = defaultPermissions.DisableGroupSounds, PreferDisableSounds = defaultPermissions.DisableGroupSounds,
PreferDisableVFX = defaultPermissions.DisableGroupVFX, PreferDisableVFX = defaultPermissions.DisableGroupVFX,
ChatEnabled = true,
CreatedDate = currentTime, CreatedDate = currentTime,
}; };
@@ -504,7 +444,6 @@ public partial class LightlessHub
preferredPermissions.DisableVFX = dto.GroupUserPreferredPermissions.IsDisableVFX(); preferredPermissions.DisableVFX = dto.GroupUserPreferredPermissions.IsDisableVFX();
preferredPermissions.DisableAnimations = dto.GroupUserPreferredPermissions.IsDisableAnimations(); preferredPermissions.DisableAnimations = dto.GroupUserPreferredPermissions.IsDisableAnimations();
preferredPermissions.IsPaused = false; preferredPermissions.IsPaused = false;
preferredPermissions.ShareLocation = dto.GroupUserPreferredPermissions.IsSharingLocation();
DbContext.Update(preferredPermissions); DbContext.Update(preferredPermissions);
} }
@@ -550,8 +489,7 @@ public partial class LightlessHub
DisableSounds = preferredPermissions.DisableSounds, DisableSounds = preferredPermissions.DisableSounds,
DisableVFX = preferredPermissions.DisableVFX, DisableVFX = preferredPermissions.DisableVFX,
IsPaused = preferredPermissions.IsPaused, IsPaused = preferredPermissions.IsPaused,
Sticky = false, Sticky = false
ShareLocation = preferredPermissions.ShareLocation,
}; };
await DbContext.Permissions.AddAsync(ownPermissionsToOther).ConfigureAwait(false); await DbContext.Permissions.AddAsync(ownPermissionsToOther).ConfigureAwait(false);
@@ -563,7 +501,6 @@ public partial class LightlessHub
existingPermissionsOnDb.DisableVFX = preferredPermissions.DisableVFX; existingPermissionsOnDb.DisableVFX = preferredPermissions.DisableVFX;
existingPermissionsOnDb.IsPaused = false; existingPermissionsOnDb.IsPaused = false;
existingPermissionsOnDb.Sticky = false; existingPermissionsOnDb.Sticky = false;
existingPermissionsOnDb.ShareLocation = preferredPermissions.ShareLocation;
DbContext.Update(existingPermissionsOnDb); DbContext.Update(existingPermissionsOnDb);
@@ -579,7 +516,6 @@ public partial class LightlessHub
ownPermissionsToOther.DisableVFX = preferredPermissions.DisableVFX; ownPermissionsToOther.DisableVFX = preferredPermissions.DisableVFX;
ownPermissionsToOther.DisableSounds = preferredPermissions.DisableSounds; ownPermissionsToOther.DisableSounds = preferredPermissions.DisableSounds;
ownPermissionsToOther.IsPaused = false; ownPermissionsToOther.IsPaused = false;
ownPermissionsToOther.ShareLocation = preferredPermissions.ShareLocation;
DbContext.Update(ownPermissionsToOther); DbContext.Update(ownPermissionsToOther);
} }
@@ -601,8 +537,7 @@ public partial class LightlessHub
DisableSounds = otherPreferred.DisableSounds, DisableSounds = otherPreferred.DisableSounds,
DisableVFX = otherPreferred.DisableVFX, DisableVFX = otherPreferred.DisableVFX,
IsPaused = otherPreferred.IsPaused, IsPaused = otherPreferred.IsPaused,
Sticky = false, Sticky = false
ShareLocation = otherPreferred.ShareLocation,
}; };
await DbContext.AddAsync(otherExistingPermsOnDb).ConfigureAwait(false); await DbContext.AddAsync(otherExistingPermsOnDb).ConfigureAwait(false);
@@ -614,7 +549,6 @@ public partial class LightlessHub
otherExistingPermsOnDb.DisableSounds = otherPreferred.DisableSounds; otherExistingPermsOnDb.DisableSounds = otherPreferred.DisableSounds;
otherExistingPermsOnDb.DisableVFX = otherPreferred.DisableVFX; otherExistingPermsOnDb.DisableVFX = otherPreferred.DisableVFX;
otherExistingPermsOnDb.IsPaused = otherPreferred.IsPaused; otherExistingPermsOnDb.IsPaused = otherPreferred.IsPaused;
otherExistingPermsOnDb.ShareLocation = otherPreferred.ShareLocation;
DbContext.Update(otherExistingPermsOnDb); DbContext.Update(otherExistingPermsOnDb);
} }
@@ -628,7 +562,6 @@ public partial class LightlessHub
otherPermissionToSelf.DisableSounds = otherPreferred.DisableSounds; otherPermissionToSelf.DisableSounds = otherPreferred.DisableSounds;
otherPermissionToSelf.DisableVFX = otherPreferred.DisableVFX; otherPermissionToSelf.DisableVFX = otherPreferred.DisableVFX;
otherPermissionToSelf.IsPaused = otherPreferred.IsPaused; otherPermissionToSelf.IsPaused = otherPreferred.IsPaused;
otherPermissionToSelf.ShareLocation = otherPreferred.ShareLocation;
DbContext.Update(otherPermissionToSelf); DbContext.Update(otherPermissionToSelf);
} }
@@ -931,6 +864,12 @@ public partial class LightlessHub
{ {
groupProfileDb.Group ??= group; groupProfileDb.Group ??= group;
if (groupProfileDb?.ProfileDisabled ?? false)
{
await Clients.Caller.Client_ReceiveServerMessage(MessageSeverity.Error, "Your profile was permanently disabled and cannot be edited").ConfigureAwait(false);
return;
}
groupProfileDb.UpdateProfileFromDto(dto, sanitizedProfileImage, sanitizedBannerImage); groupProfileDb.UpdateProfileFromDto(dto, sanitizedProfileImage, sanitizedBannerImage);
} }

View File

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

View File

@@ -86,8 +86,7 @@ public partial class LightlessHub
DisableSounds = ownDefaultPermissions.DisableIndividualSounds, DisableSounds = ownDefaultPermissions.DisableIndividualSounds,
DisableVFX = ownDefaultPermissions.DisableIndividualVFX, DisableVFX = ownDefaultPermissions.DisableIndividualVFX,
IsPaused = false, 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); 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.DisableVFX = permissions.DisableVFX;
existingDbPerms.IsPaused = false; existingDbPerms.IsPaused = false;
existingDbPerms.Sticky = true; existingDbPerms.Sticky = true;
existingDbPerms.ShareLocation = permissions.ShareLocation;
DbContext.Permissions.Update(existingDbPerms); DbContext.Permissions.Update(existingDbPerms);
} }
@@ -1173,6 +1171,12 @@ public partial class LightlessHub
return; return;
} }
if (profileData.ProfileDisabled)
{
await Clients.Caller.Client_ReceiveServerMessage(MessageSeverity.Error, "Your profile was permanently disabled and cannot be edited").ConfigureAwait(false);
return;
}
profileData.UpdateProfileFromDto(dto, profileResult.Base64Image, bannerResult.Base64Image); profileData.UpdateProfileFromDto(dto, profileResult.Base64Image, bannerResult.Base64Image);
} }
else else
@@ -1235,84 +1239,6 @@ public partial class LightlessHub
return true; 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<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)
{
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);
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<List<LocationDto>> 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<LocationDto>(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)] [GeneratedRegex(@"^([a-z0-9_ '+&,\.\-\{\}]+\/)+([a-z0-9_ '+&,\.\-\{\}]+\.[a-z]{3,4})$", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.ECMAScript)]
private static partial Regex GamePathRegex(); private static partial Regex GamePathRegex();

View File

@@ -16,8 +16,6 @@ using Microsoft.AspNetCore.SignalR;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using StackExchange.Redis.Extensions.Core.Abstractions; using StackExchange.Redis.Extensions.Core.Abstractions;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using LightlessSync.API.Dto.CharaData;
using LightlessSync.API.Dto.User;
using LightlessSyncServer.Services.Interfaces; using LightlessSyncServer.Services.Interfaces;
namespace LightlessSyncServer.Hubs; namespace LightlessSyncServer.Hubs;
@@ -222,9 +220,6 @@ public partial class LightlessHub : Hub<ILightlessHub>, ILightlessHub
await SendOfflineToAllPairedUsers().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)); DbContext.RemoveRange(DbContext.Files.Where(f => !f.Uploaded && f.UploaderUID == UserUID));
await DbContext.SaveChangesAsync().ConfigureAwait(false); await DbContext.SaveChangesAsync().ConfigureAwait(false);

View File

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

View File

@@ -118,7 +118,6 @@ public static class Extensions
permissions.SetPreferDisableSounds(group.PreferDisableSounds); permissions.SetPreferDisableSounds(group.PreferDisableSounds);
permissions.SetPreferDisableVFX(group.PreferDisableVFX); permissions.SetPreferDisableVFX(group.PreferDisableVFX);
permissions.SetDisableInvites(!group.InvitesEnabled); permissions.SetDisableInvites(!group.InvitesEnabled);
permissions.SetDisableChat(!group.ChatEnabled);
return permissions; return permissions;
} }
@@ -129,7 +128,6 @@ public static class Extensions
permissions.SetDisableSounds(groupPair.DisableSounds); permissions.SetDisableSounds(groupPair.DisableSounds);
permissions.SetPaused(groupPair.IsPaused); permissions.SetPaused(groupPair.IsPaused);
permissions.SetDisableVFX(groupPair.DisableVFX); permissions.SetDisableVFX(groupPair.DisableVFX);
permissions.SetShareLocation(groupPair.ShareLocation);
return permissions; return permissions;
} }
@@ -150,7 +148,6 @@ public static class Extensions
perm.SetDisableAnimations(permissions.DisableAnimations); perm.SetDisableAnimations(permissions.DisableAnimations);
perm.SetDisableSounds(permissions.DisableSounds); perm.SetDisableSounds(permissions.DisableSounds);
perm.SetDisableVFX(permissions.DisableVFX); perm.SetDisableVFX(permissions.DisableVFX);
perm.SetShareLocation(permissions.ShareLocation);
if (setSticky) if (setSticky)
perm.SetSticky(permissions.Sticky); perm.SetSticky(permissions.Sticky);
return perm; return perm;

View File

@@ -80,9 +80,6 @@ public class LightlessDbContext : DbContext
.WithOne(p => p.Group) .WithOne(p => p.Group)
.HasForeignKey<GroupProfile>(p => p.GroupGID) .HasForeignKey<GroupProfile>(p => p.GroupGID)
.IsRequired(false); .IsRequired(false);
mb.Entity<Group>()
.Property(g => g.ChatEnabled)
.HasDefaultValue(true);
mb.Entity<GroupPair>().ToTable("group_pairs"); mb.Entity<GroupPair>().ToTable("group_pairs");
mb.Entity<GroupPair>().HasKey(u => new { u.GroupGID, u.GroupUserUID }); mb.Entity<GroupPair>().HasKey(u => new { u.GroupGID, u.GroupUserUID });
mb.Entity<GroupPair>().HasIndex(c => c.GroupUserUID); mb.Entity<GroupPair>().HasIndex(c => c.GroupUserUID);

View File

@@ -1,29 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace LightlessSyncServer.Migrations
{
/// <inheritdoc />
public partial class ChatReportFixes : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "sender_token",
table: "reported_chat_messages");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "sender_token",
table: "reported_chat_messages",
type: "text",
nullable: false,
defaultValue: "");
}
}
}

View File

@@ -1,29 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace LightlessSyncServer.Migrations
{
/// <inheritdoc />
public partial class DisableChatGroups : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "chat_enabled",
table: "groups",
type: "boolean",
nullable: false,
defaultValue: true);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "chat_enabled",
table: "groups");
}
}
}

View File

@@ -1,40 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace LightlessSyncServer.Migrations
{
/// <inheritdoc />
public partial class LocationSharing : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "share_location",
table: "user_permission_sets",
type: "boolean",
nullable: false,
defaultValue: false);
migrationBuilder.AddColumn<bool>(
name: "share_location",
table: "group_pair_preferred_permissions",
type: "boolean",
nullable: false,
defaultValue: false);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "share_location",
table: "user_permission_sets");
migrationBuilder.DropColumn(
name: "share_location",
table: "group_pair_preferred_permissions");
}
}
}

View File

@@ -438,12 +438,6 @@ namespace LightlessSyncServer.Migrations
.HasColumnType("boolean") .HasColumnType("boolean")
.HasColumnName("auto_prune_enabled"); .HasColumnName("auto_prune_enabled");
b.Property<bool>("ChatEnabled")
.ValueGeneratedOnAdd()
.HasColumnType("boolean")
.HasDefaultValue(true)
.HasColumnName("chat_enabled");
b.Property<DateTime>("CreatedDate") b.Property<DateTime>("CreatedDate")
.ValueGeneratedOnAdd() .ValueGeneratedOnAdd()
.HasColumnType("timestamp with time zone") .HasColumnType("timestamp with time zone")
@@ -584,10 +578,6 @@ namespace LightlessSyncServer.Migrations
.HasColumnType("boolean") .HasColumnType("boolean")
.HasColumnName("is_paused"); .HasColumnName("is_paused");
b.Property<bool>("ShareLocation")
.HasColumnType("boolean")
.HasColumnName("share_location");
b.HasKey("UserUID", "GroupGID") b.HasKey("UserUID", "GroupGID")
.HasName("pk_group_pair_preferred_permissions"); .HasName("pk_group_pair_preferred_permissions");
@@ -786,6 +776,11 @@ namespace LightlessSyncServer.Migrations
.HasColumnType("text") .HasColumnType("text")
.HasColumnName("sender_hashed_cid"); .HasColumnName("sender_hashed_cid");
b.Property<string>("SenderToken")
.IsRequired()
.HasColumnType("text")
.HasColumnName("sender_token");
b.Property<bool>("SenderWasLightfinder") b.Property<bool>("SenderWasLightfinder")
.HasColumnType("boolean") .HasColumnType("boolean")
.HasColumnName("sender_was_lightfinder"); .HasColumnName("sender_was_lightfinder");
@@ -945,10 +940,6 @@ namespace LightlessSyncServer.Migrations
.HasColumnType("boolean") .HasColumnType("boolean")
.HasColumnName("is_paused"); .HasColumnName("is_paused");
b.Property<bool>("ShareLocation")
.HasColumnType("boolean")
.HasColumnName("share_location");
b.Property<bool>("Sticky") b.Property<bool>("Sticky")
.HasColumnType("boolean") .HasColumnType("boolean")
.HasColumnName("sticky"); .HasColumnName("sticky");

View File

@@ -19,6 +19,5 @@ public class Group
public bool PreferDisableSounds { get; set; } public bool PreferDisableSounds { get; set; }
public bool PreferDisableAnimations { get; set; } public bool PreferDisableAnimations { get; set; }
public bool PreferDisableVFX { get; set; } public bool PreferDisableVFX { get; set; }
public bool ChatEnabled { get; set; } = true;
public DateTime CreatedDate { get; set; } = DateTime.UtcNow; public DateTime CreatedDate { get; set; } = DateTime.UtcNow;
} }

View File

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

View File

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

View File

@@ -116,12 +116,11 @@ public sealed class CachedFileProvider : IDisposable
var tempFileName = destinationFilePath + ".dl"; var tempFileName = destinationFilePath + ".dl";
File.Copy(coldStorageFilePath.FullName, tempFileName, true); File.Copy(coldStorageFilePath.FullName, tempFileName, true);
File.Move(tempFileName, destinationFilePath, true); File.Move(tempFileName, destinationFilePath, true);
coldStorageFilePath.LastAccessTimeUtc = DateTime.UtcNow;
File.SetLastAccessTimeUtc(coldStorageFilePath.FullName, DateTime.UtcNow); var destinationFile = new FileInfo(destinationFilePath);
File.SetLastAccessTimeUtc(destinationFilePath, DateTime.UtcNow); destinationFile.LastAccessTimeUtc = DateTime.UtcNow;
File.SetCreationTimeUtc(destinationFilePath, DateTime.UtcNow); destinationFile.CreationTimeUtc = DateTime.UtcNow;
File.SetLastWriteTimeUtc(destinationFilePath, DateTime.UtcNow); destinationFile.LastWriteTimeUtc = DateTime.UtcNow;
_metrics.IncGauge(MetricsAPI.GaugeFilesTotal); _metrics.IncGauge(MetricsAPI.GaugeFilesTotal);
_metrics.IncGauge(MetricsAPI.GaugeFilesTotalSize, new FileInfo(destinationFilePath).Length); _metrics.IncGauge(MetricsAPI.GaugeFilesTotalSize, new FileInfo(destinationFilePath).Length);
return true; return true;
@@ -174,14 +173,7 @@ public sealed class CachedFileProvider : IDisposable
var fi = FilePathUtil.GetFileInfoForHash(_hotStoragePath, hash); var fi = FilePathUtil.GetFileInfoForHash(_hotStoragePath, hash);
if (fi == null) return null; if (fi == null) return null;
try fi.LastAccessTimeUtc = DateTime.UtcNow;
{
File.SetLastAccessTimeUtc(fi.FullName, DateTime.UtcNow);
}
catch (Exception ex)
{
_logger.LogWarning(ex, "Failed to update LastAccessTimeUtc for file {hash}", hash);
}
_fileStatisticsService.LogFile(hash, fi.Length); _fileStatisticsService.LogFile(hash, fi.Length);