Compare commits
23 Commits
defnotken-
...
fix-stuck-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
134268c422 | ||
| e8c56bb3bc | |||
| 8e0dcc6792 | |||
| ac4174f6e0 | |||
| 9fffaf7df2 | |||
| ca0c548373 | |||
| 1716750347 | |||
| d39a922482 | |||
| 6216664e18 | |||
| 54992234d5 | |||
| 90e81fb955 | |||
|
|
4012b33f98 | ||
| 33fb6ba2eb | |||
|
|
d1526fa49e | ||
| 5b5f8edc3b | |||
|
|
8515364ffd | ||
|
|
4ec6169ebd | ||
|
|
ec26abaeb5 | ||
| 3350f2ebf6 | |||
|
|
670e0e01f1 | ||
|
|
12d51dc689 | ||
|
|
860bc955a4 | ||
| 76bdbe28da |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -351,3 +351,6 @@ MigrationBackup/
|
|||||||
|
|
||||||
# docker run data
|
# docker run data
|
||||||
Docker/run/data/
|
Docker/run/data/
|
||||||
|
|
||||||
|
#idea files
|
||||||
|
*.idea
|
||||||
Submodule LightlessAPI updated: 8e4432af45...4ecd5375e6
@@ -41,8 +41,10 @@ public partial class LightlessHub
|
|||||||
|
|
||||||
var groupInfos = await DbContext.Groups
|
var groupInfos = await DbContext.Groups
|
||||||
.AsNoTracking()
|
.AsNoTracking()
|
||||||
.Where(g => g.OwnerUID == userUid
|
.Where(g => g.ChatEnabled
|
||||||
|
&& (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);
|
||||||
|
|
||||||
@@ -162,6 +164,13 @@ 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()
|
||||||
@@ -207,6 +216,23 @@ 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.");
|
||||||
|
|||||||
@@ -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_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, DateTimeOffset expireAt) => throw new PlatformNotSupportedException("Calling clientside method on server not supported");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
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;
|
||||||
@@ -11,10 +12,8 @@ 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 SixLabors.ImageSharp.PixelFormats;
|
using System.Collections.Concurrent;
|
||||||
using System.Reflection;
|
|
||||||
using System.Security.Cryptography;
|
using System.Security.Cryptography;
|
||||||
|
|
||||||
namespace LightlessSyncServer.Hubs;
|
namespace LightlessSyncServer.Hubs;
|
||||||
@@ -29,29 +28,78 @@ public partial class LightlessHub
|
|||||||
var (userHasRights, group) = await TryValidateGroupModeratorOrOwner(dto.Group.GID).ConfigureAwait(false);
|
var (userHasRights, group) = await TryValidateGroupModeratorOrOwner(dto.Group.GID).ConfigureAwait(false);
|
||||||
if (!userHasRights) return;
|
if (!userHasRights) return;
|
||||||
|
|
||||||
var (userExists, groupPair) = await TryValidateUserInGroup(dto.Group.GID, dto.User.UID).ConfigureAwait(false);
|
var targetUid = dto.User.UID?.Trim();
|
||||||
if (!userExists) return;
|
if (string.IsNullOrWhiteSpace(targetUid)) return;
|
||||||
|
|
||||||
if (groupPair.IsModerator || string.Equals(group.OwnerUID, dto.User.UID, StringComparison.Ordinal)) return;
|
if (string.Equals(group.OwnerUID, targetUid, StringComparison.Ordinal))
|
||||||
|
return;
|
||||||
|
|
||||||
var alias = string.IsNullOrEmpty(groupPair.GroupUser.Alias) ? "-" : groupPair.GroupUser.Alias;
|
var groupPair = await DbContext.GroupPairs
|
||||||
var ban = new GroupBan()
|
.Include(p => p.GroupUser)
|
||||||
|
.SingleOrDefaultAsync(p => p.GroupGID == dto.Group.GID && p.GroupUserUID == targetUid, cancellationToken: RequestAbortedToken).ConfigureAwait(false);
|
||||||
|
|
||||||
|
if (groupPair?.IsModerator == true)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var now = DateTime.UtcNow;
|
||||||
|
|
||||||
|
var existingBan = await DbContext.Set<GroupBan>().SingleOrDefaultAsync(b => b.GroupGID == dto.Group.GID && b.BannedUserUID == targetUid, cancellationToken: RequestAbortedToken).ConfigureAwait(false);
|
||||||
|
var userExists = await DbContext.Users.AsNoTracking().AnyAsync(u => u.UID == targetUid || u.Alias == targetUid, RequestAbortedToken).ConfigureAwait(false);
|
||||||
|
|
||||||
|
if (!userExists && existingBan == null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
const string marker = " (Alias at time of ban:";
|
||||||
|
string suffix;
|
||||||
|
|
||||||
|
if (existingBan?.BannedReason is { } existingReason)
|
||||||
{
|
{
|
||||||
BannedByUID = UserUID,
|
var idx = existingReason.IndexOf(marker, StringComparison.Ordinal);
|
||||||
BannedReason = $"{reason} (Alias at time of ban: {alias})",
|
suffix = idx >= 0 ? existingReason.Substring(startIndex: idx) : string.Empty;
|
||||||
BannedOn = DateTime.UtcNow,
|
}
|
||||||
BannedUserUID = dto.User.UID,
|
else
|
||||||
GroupGID = dto.Group.GID,
|
{
|
||||||
};
|
var alias = groupPair?.GroupUser?.Alias;
|
||||||
|
alias = string.IsNullOrWhiteSpace(alias) ? "-" : alias;
|
||||||
|
suffix = $" (Alias at time of ban: {alias})";
|
||||||
|
}
|
||||||
|
|
||||||
DbContext.Add(ban);
|
var baseReason = (reason ?? string.Empty).Trim();
|
||||||
await DbContext.SaveChangesAsync().ConfigureAwait(false);
|
var finalReason = string.IsNullOrEmpty(suffix) ? baseReason : (baseReason + suffix);
|
||||||
|
|
||||||
await GroupRemoveUser(dto).ConfigureAwait(false);
|
if (existingBan != null)
|
||||||
|
{
|
||||||
|
existingBan.BannedByUID = UserUID;
|
||||||
|
existingBan.BannedReason = finalReason;
|
||||||
|
|
||||||
|
DbContext.Update(existingBan);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var ban = new GroupBan
|
||||||
|
{
|
||||||
|
BannedByUID = UserUID,
|
||||||
|
BannedReason = finalReason,
|
||||||
|
BannedOn = now,
|
||||||
|
BannedUserUID = targetUid,
|
||||||
|
GroupGID = dto.Group.GID,
|
||||||
|
};
|
||||||
|
|
||||||
|
DbContext.Add(ban);
|
||||||
|
}
|
||||||
|
|
||||||
|
await DbContext.SaveChangesAsync(RequestAbortedToken).ConfigureAwait(false);
|
||||||
|
|
||||||
|
if (groupPair != null)
|
||||||
|
{
|
||||||
|
await GroupRemoveUser(dto).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
|
||||||
_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)
|
||||||
{
|
{
|
||||||
@@ -60,15 +108,73 @@ 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;
|
||||||
|
|
||||||
group.InvitesEnabled = !dto.Permissions.HasFlag(GroupPermissions.DisableInvites);
|
var permissions = dto.Permissions;
|
||||||
group.PreferDisableSounds = dto.Permissions.HasFlag(GroupPermissions.PreferDisableSounds);
|
var isOwner = string.Equals(group.OwnerUID, UserUID, StringComparison.Ordinal);
|
||||||
group.PreferDisableAnimations = dto.Permissions.HasFlag(GroupPermissions.PreferDisableAnimations);
|
var chatEnabled = group.ChatEnabled;
|
||||||
group.PreferDisableVFX = dto.Permissions.HasFlag(GroupPermissions.PreferDisableVFX);
|
var chatChanged = false;
|
||||||
|
|
||||||
|
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, dto.Permissions)).ConfigureAwait(false);
|
await Clients.Users(groupPairs).Client_GroupChangePermissions(new GroupPermissionDto(dto.Group, 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")]
|
||||||
@@ -235,6 +341,7 @@ 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,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -340,9 +447,9 @@ public partial class LightlessHub
|
|||||||
|
|
||||||
var banEntries = await DbContext.GroupBans.Include(b => b.BannedUser).Where(g => g.GroupGID == dto.Group.GID).AsNoTracking().ToListAsync(cancellationToken: RequestAbortedToken).ConfigureAwait(false);
|
var banEntries = await DbContext.GroupBans.Include(b => b.BannedUser).Where(g => g.GroupGID == dto.Group.GID).AsNoTracking().ToListAsync(cancellationToken: RequestAbortedToken).ConfigureAwait(false);
|
||||||
|
|
||||||
List<BannedGroupUserDto> bannedGroupUsers = banEntries.Select(b =>
|
List<BannedGroupUserDto> bannedGroupUsers = [.. banEntries.Select(b =>
|
||||||
new BannedGroupUserDto(group.ToGroupData(), b.BannedUser.ToUserData(), b.BannedReason, b.BannedOn,
|
new BannedGroupUserDto(group.ToGroupData(), b.BannedUser.ToUserData(), b.BannedReason, b.BannedOn,
|
||||||
b.BannedByUID)).ToList();
|
b.BannedByUID))];
|
||||||
|
|
||||||
_logger.LogCallInfo(LightlessHubLogger.Args(dto, bannedGroupUsers.Count));
|
_logger.LogCallInfo(LightlessHubLogger.Args(dto, bannedGroupUsers.Count));
|
||||||
|
|
||||||
@@ -802,91 +909,85 @@ public partial class LightlessHub
|
|||||||
[Authorize(Policy = "Identified")]
|
[Authorize(Policy = "Identified")]
|
||||||
public async Task GroupSetProfile(GroupProfileDto dto)
|
public async Task GroupSetProfile(GroupProfileDto dto)
|
||||||
{
|
{
|
||||||
_logger.LogCallInfo(LightlessHubLogger.Args(dto));
|
_logger.LogCallInfo(LightlessHubLogger.Args(dto));
|
||||||
|
|
||||||
var cancellationToken = RequestAbortedToken;
|
var cancellationToken = RequestAbortedToken;
|
||||||
|
|
||||||
if (dto.Group == null) return;
|
if (dto.Group == null) return;
|
||||||
|
|
||||||
var (hasRights, group) = await TryValidateGroupModeratorOrOwner(dto.Group.GID).ConfigureAwait(false);
|
var (hasRights, group) = await TryValidateGroupModeratorOrOwner(dto.Group.GID).ConfigureAwait(false);
|
||||||
if (!hasRights) return;
|
if (!hasRights) return;
|
||||||
|
|
||||||
var groupProfileDb = await DbContext.GroupProfiles
|
var groupProfileDb = await DbContext.GroupProfiles
|
||||||
.Include(g => g.Group)
|
.Include(g => g.Group)
|
||||||
.FirstOrDefaultAsync(g => g.GroupGID == dto.Group.GID, cancellationToken)
|
.FirstOrDefaultAsync(g => g.GroupGID == dto.Group.GID, cancellationToken)
|
||||||
|
.ConfigureAwait(false);
|
||||||
|
|
||||||
|
ImageCheckService.ImageLoadResult profileResult = new();
|
||||||
|
ImageCheckService.ImageLoadResult bannerResult = new();
|
||||||
|
|
||||||
|
//Avatar image validation
|
||||||
|
if (!string.IsNullOrEmpty(dto.PictureBase64))
|
||||||
|
{
|
||||||
|
profileResult = await ImageCheckService.ValidateImageAsync(dto.PictureBase64, banner: false, RequestAbortedToken).ConfigureAwait(false);
|
||||||
|
|
||||||
|
if (!profileResult.Success)
|
||||||
|
{
|
||||||
|
await Clients.Caller.Client_ReceiveServerMessage(MessageSeverity.Error, profileResult.ErrorMessage).ConfigureAwait(false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Banner image validation
|
||||||
|
if (!string.IsNullOrEmpty(dto.BannerBase64))
|
||||||
|
{
|
||||||
|
bannerResult = await ImageCheckService.ValidateImageAsync(dto.BannerBase64, banner: true, RequestAbortedToken).ConfigureAwait(false);
|
||||||
|
|
||||||
|
if (!bannerResult.Success)
|
||||||
|
{
|
||||||
|
await Clients.Caller.Client_ReceiveServerMessage(MessageSeverity.Error, bannerResult.ErrorMessage).ConfigureAwait(false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var sanitizedProfileImage = profileResult?.Base64Image;
|
||||||
|
var sanitizedBannerImage = bannerResult?.Base64Image;
|
||||||
|
|
||||||
|
if (groupProfileDb == null)
|
||||||
|
{
|
||||||
|
groupProfileDb = new GroupProfile
|
||||||
|
{
|
||||||
|
GroupGID = dto.Group.GID,
|
||||||
|
Group = group,
|
||||||
|
ProfileDisabled = dto.IsDisabled ?? false,
|
||||||
|
IsNSFW = dto.IsNsfw ?? false,
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
groupProfileDb.UpdateProfileFromDto(dto, sanitizedProfileImage, sanitizedBannerImage);
|
||||||
|
await DbContext.GroupProfiles.AddAsync(groupProfileDb, cancellationToken).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
groupProfileDb.Group ??= group;
|
||||||
|
|
||||||
|
groupProfileDb.UpdateProfileFromDto(dto, sanitizedProfileImage, sanitizedBannerImage);
|
||||||
|
}
|
||||||
|
|
||||||
|
var userIds = await DbContext.GroupPairs
|
||||||
|
.Where(p => p.GroupGID == groupProfileDb.GroupGID)
|
||||||
|
.Select(p => p.GroupUserUID)
|
||||||
|
.ToListAsync(cancellationToken)
|
||||||
|
.ConfigureAwait(false);
|
||||||
|
|
||||||
|
if (userIds.Count > 0)
|
||||||
|
{
|
||||||
|
var profileDto = groupProfileDb.ToDTO();
|
||||||
|
await Clients.Users(userIds).Client_GroupSendProfile(profileDto)
|
||||||
.ConfigureAwait(false);
|
.ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
|
||||||
ImageCheckService.ImageLoadResult profileResult = new();
|
await DbContext.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
|
||||||
ImageCheckService.ImageLoadResult bannerResult = new();
|
|
||||||
|
|
||||||
//Avatar image validation
|
|
||||||
if (!string.IsNullOrEmpty(dto.PictureBase64))
|
|
||||||
{
|
|
||||||
profileResult = await ImageCheckService.ValidateImageAsync(dto.PictureBase64, banner: false, RequestAbortedToken).ConfigureAwait(false);
|
|
||||||
|
|
||||||
if (!profileResult.Success)
|
|
||||||
{
|
|
||||||
await Clients.Caller.Client_ReceiveServerMessage(MessageSeverity.Error, profileResult.ErrorMessage).ConfigureAwait(false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//Banner image validation
|
|
||||||
if (!string.IsNullOrEmpty(dto.BannerBase64))
|
|
||||||
{
|
|
||||||
bannerResult = await ImageCheckService.ValidateImageAsync(dto.BannerBase64, banner: true, RequestAbortedToken).ConfigureAwait(false);
|
|
||||||
|
|
||||||
if (!bannerResult.Success)
|
|
||||||
{
|
|
||||||
await Clients.Caller.Client_ReceiveServerMessage(MessageSeverity.Error, bannerResult.ErrorMessage).ConfigureAwait(false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var sanitizedProfileImage = profileResult?.Base64Image;
|
|
||||||
var sanitizedBannerImage = bannerResult?.Base64Image;
|
|
||||||
|
|
||||||
if (groupProfileDb == null)
|
|
||||||
{
|
|
||||||
groupProfileDb = new GroupProfile
|
|
||||||
{
|
|
||||||
GroupGID = dto.Group.GID,
|
|
||||||
Group = group,
|
|
||||||
ProfileDisabled = dto.IsDisabled ?? false,
|
|
||||||
IsNSFW = dto.IsNsfw ?? false,
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
groupProfileDb.UpdateProfileFromDto(dto, sanitizedProfileImage, sanitizedBannerImage);
|
|
||||||
await DbContext.GroupProfiles.AddAsync(groupProfileDb, cancellationToken).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
groupProfileDb.Group ??= group;
|
|
||||||
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
|
|
||||||
var userIds = await DbContext.GroupPairs
|
|
||||||
.Where(p => p.GroupGID == groupProfileDb.GroupGID)
|
|
||||||
.Select(p => p.GroupUserUID)
|
|
||||||
.ToListAsync(cancellationToken)
|
|
||||||
.ConfigureAwait(false);
|
|
||||||
|
|
||||||
if (userIds.Count > 0)
|
|
||||||
{
|
|
||||||
var profileDto = groupProfileDb.ToDTO();
|
|
||||||
await Clients.Users(userIds).Client_GroupSendProfile(profileDto)
|
|
||||||
.ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
await DbContext.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[Authorize(Policy = "Identified")]
|
[Authorize(Policy = "Identified")]
|
||||||
@@ -1049,11 +1150,11 @@ public partial class LightlessHub
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
var (isOwner, _) = await TryValidateOwner(dto.GID).ConfigureAwait(false);
|
var (isOwnerOrMod, _) = await TryValidateGroupModeratorOrOwner(dto.GID).ConfigureAwait(false);
|
||||||
if (!isOwner)
|
if (!isOwnerOrMod)
|
||||||
{
|
{
|
||||||
_logger.LogCallWarning(LightlessHubLogger.Args("Unauthorized syncshell broadcast change", "User", UserUID, "GID", dto.GID));
|
_logger.LogCallWarning(LightlessHubLogger.Args("Unauthorized syncshell broadcast change", "User", UserUID, "GID", dto.GID));
|
||||||
await Clients.Caller.Client_ReceiveServerMessage(MessageSeverity.Error, "You must be the owner of the syncshell to broadcast it.");
|
await Clients.Caller.Client_ReceiveServerMessage(MessageSeverity.Error, "You must be the owner or moderator of the syncshell to broadcast it.");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,8 +12,6 @@ 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 SixLabors.ImageSharp;
|
|
||||||
using SixLabors.ImageSharp.PixelFormats;
|
|
||||||
using StackExchange.Redis;
|
using StackExchange.Redis;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
@@ -1171,12 +1169,6 @@ 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
|
||||||
@@ -1239,6 +1231,120 @@ 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 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)]
|
[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();
|
||||||
|
|
||||||
|
|||||||
@@ -16,6 +16,8 @@ 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;
|
||||||
@@ -218,6 +220,8 @@ public partial class LightlessHub : Hub<ILightlessHub>, ILightlessHub
|
|||||||
|
|
||||||
_lightlessCensus.ClearStatistics(UserUID);
|
_lightlessCensus.ClearStatistics(UserUID);
|
||||||
|
|
||||||
|
await UpdateLocation(new LocationDto(new UserData(UserUID), new LocationInfo()), offline: true).ConfigureAwait(false);
|
||||||
|
|
||||||
await SendOfflineToAllPairedUsers().ConfigureAwait(false);
|
await SendOfflineToAllPairedUsers().ConfigureAwait(false);
|
||||||
|
|
||||||
DbContext.RemoveRange(DbContext.Files.Where(f => !f.Uploaded && f.UploaderUID == UserUID));
|
DbContext.RemoveRange(DbContext.Files.Where(f => !f.Uploaded && f.UploaderUID == UserUID));
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ public class LightlessCensus : IHostedService
|
|||||||
|
|
||||||
Dictionary<ushort, short> worldDcs = new();
|
Dictionary<ushort, short> worldDcs = new();
|
||||||
|
|
||||||
var dcs = await client.GetStringAsync("https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/WorldDCGroupType.csv", cancellationToken).ConfigureAwait(false);
|
var dcs = await client.GetStringAsync("https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/en/WorldDCGroupType.csv", cancellationToken).ConfigureAwait(false);
|
||||||
// dc: https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/WorldDCGroupType.csv
|
// dc: https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/WorldDCGroupType.csv
|
||||||
// id, name, region
|
// id, name, region
|
||||||
|
|
||||||
@@ -92,7 +92,7 @@ public class LightlessCensus : IHostedService
|
|||||||
_dcs[id] = name;
|
_dcs[id] = name;
|
||||||
}
|
}
|
||||||
|
|
||||||
var worlds = await client.GetStringAsync("https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/World.csv", cancellationToken).ConfigureAwait(false);
|
var worlds = await client.GetStringAsync("https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/en/World.csv", cancellationToken).ConfigureAwait(false);
|
||||||
// world: https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/World.csv
|
// world: https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/World.csv
|
||||||
// id, internalname, name, region, usertype, datacenter, ispublic
|
// id, internalname, name, region, usertype, datacenter, ispublic
|
||||||
|
|
||||||
@@ -114,7 +114,7 @@ public class LightlessCensus : IHostedService
|
|||||||
_logger.LogInformation("World: ID: {id}, Name: {name}, DC: {dc}", id, name, dc);
|
_logger.LogInformation("World: ID: {id}, Name: {name}, DC: {dc}", id, name, dc);
|
||||||
}
|
}
|
||||||
|
|
||||||
var races = await client.GetStringAsync("https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/Race.csv", cancellationToken).ConfigureAwait(false);
|
var races = await client.GetStringAsync("https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/en/Race.csv", cancellationToken).ConfigureAwait(false);
|
||||||
// race: https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/Race.csv
|
// race: https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/Race.csv
|
||||||
// id, masc name, fem name, other crap I don't care about
|
// id, masc name, fem name, other crap I don't care about
|
||||||
|
|
||||||
@@ -134,7 +134,7 @@ public class LightlessCensus : IHostedService
|
|||||||
_logger.LogInformation("Race: ID: {id}, Name: {name}", id, name);
|
_logger.LogInformation("Race: ID: {id}, Name: {name}", id, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
var tribe = await client.GetStringAsync("https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/Tribe.csv", cancellationToken).ConfigureAwait(false);
|
var tribe = await client.GetStringAsync("https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/en/Tribe.csv", cancellationToken).ConfigureAwait(false);
|
||||||
// tribe: https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/Tribe.csv
|
// tribe: https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/Tribe.csv
|
||||||
// id masc name, fem name, other crap I don't care about
|
// id masc name, fem name, other crap I don't care about
|
||||||
|
|
||||||
|
|||||||
@@ -2,15 +2,19 @@
|
|||||||
using LightlessSyncShared.Data;
|
using LightlessSyncShared.Data;
|
||||||
using LightlessSyncShared.Models;
|
using LightlessSyncShared.Models;
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using StackExchange.Redis.Extensions.Core.Abstractions;
|
||||||
|
|
||||||
namespace LightlessSyncServer.Services
|
namespace LightlessSyncServer.Services
|
||||||
{
|
{
|
||||||
public class PruneService(LightlessDbContext dbContext) : IPruneService
|
public class PruneService(LightlessDbContext dbContext, IRedisDatabase redis) : IPruneService
|
||||||
{
|
{
|
||||||
private readonly LightlessDbContext _dbContext = dbContext;
|
private readonly LightlessDbContext _dbContext = dbContext;
|
||||||
|
private readonly IRedisDatabase _redis = redis;
|
||||||
|
|
||||||
public async Task<int> CountPrunableUsersAsync(string groupGid, int days, CancellationToken ct)
|
public async Task<int> CountPrunableUsersAsync(string groupGid, int days, CancellationToken ct)
|
||||||
{
|
{
|
||||||
|
var onlineUids = await GetOnlineUidsAsync().ConfigureAwait(false);
|
||||||
|
|
||||||
var allGroupUsers = await _dbContext.GroupPairs
|
var allGroupUsers = await _dbContext.GroupPairs
|
||||||
.Include(p => p.GroupUser)
|
.Include(p => p.GroupUser)
|
||||||
.Include(p => p.Group)
|
.Include(p => p.Group)
|
||||||
@@ -20,17 +24,14 @@ namespace LightlessSyncServer.Services
|
|||||||
var inactivitySpan = GetInactivitySpan(days);
|
var inactivitySpan = GetInactivitySpan(days);
|
||||||
var now = DateTime.UtcNow;
|
var now = DateTime.UtcNow;
|
||||||
|
|
||||||
var usersToPrune = allGroupUsers.Where(p =>
|
var usersToPrune = GetPruneUserList(allGroupUsers, onlineUids, inactivitySpan, now);
|
||||||
!p.IsPinned &&
|
return usersToPrune.Count;
|
||||||
!p.IsModerator &&
|
|
||||||
!string.Equals(p.Group.OwnerUID, p.GroupUserUID, StringComparison.Ordinal) &&
|
|
||||||
p.GroupUser.LastLoggedIn < now - inactivitySpan);
|
|
||||||
|
|
||||||
return usersToPrune.Count();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<IReadOnlyList<GroupPair>> ExecutePruneAsync(string groupGid, int days, CancellationToken ct)
|
public async Task<IReadOnlyList<GroupPair>> ExecutePruneAsync(string groupGid, int days, CancellationToken ct)
|
||||||
{
|
{
|
||||||
|
var onlineUids = await GetOnlineUidsAsync().ConfigureAwait(false);
|
||||||
|
|
||||||
var allGroupUsers = await _dbContext.GroupPairs
|
var allGroupUsers = await _dbContext.GroupPairs
|
||||||
.Include(p => p.GroupUser)
|
.Include(p => p.GroupUser)
|
||||||
.Include(p => p.Group)
|
.Include(p => p.Group)
|
||||||
@@ -40,12 +41,7 @@ namespace LightlessSyncServer.Services
|
|||||||
var inactivitySpan = GetInactivitySpan(days);
|
var inactivitySpan = GetInactivitySpan(days);
|
||||||
var now = DateTime.UtcNow;
|
var now = DateTime.UtcNow;
|
||||||
|
|
||||||
var usersToPrune = allGroupUsers.Where(p =>
|
var usersToPrune = GetPruneUserList(allGroupUsers, onlineUids, inactivitySpan, now);
|
||||||
!p.IsPinned &&
|
|
||||||
!p.IsModerator &&
|
|
||||||
!string.Equals(p.Group.OwnerUID, p.GroupUserUID, StringComparison.Ordinal) &&
|
|
||||||
p.GroupUser.LastLoggedIn < now - inactivitySpan)
|
|
||||||
.ToList();
|
|
||||||
|
|
||||||
_dbContext.GroupPairs.RemoveRange(usersToPrune);
|
_dbContext.GroupPairs.RemoveRange(usersToPrune);
|
||||||
await _dbContext.SaveChangesAsync(ct).ConfigureAwait(false);
|
await _dbContext.SaveChangesAsync(ct).ConfigureAwait(false);
|
||||||
@@ -53,8 +49,52 @@ namespace LightlessSyncServer.Services
|
|||||||
return usersToPrune;
|
return usersToPrune;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static TimeSpan GetInactivitySpan(int days) => days == 0
|
private static List<GroupPair> GetPruneUserList(
|
||||||
? TimeSpan.FromMinutes(15)
|
List<GroupPair> allGroupUsers,
|
||||||
: TimeSpan.FromDays(days);
|
HashSet<string> onlineUids,
|
||||||
|
TimeSpan inactivitySpan,
|
||||||
|
DateTime now)
|
||||||
|
{
|
||||||
|
return
|
||||||
|
[
|
||||||
|
.. allGroupUsers.Where(p =>
|
||||||
|
!p.IsPinned &&
|
||||||
|
!p.IsModerator &&
|
||||||
|
!string.Equals(p.Group.OwnerUID, p.GroupUserUID, StringComparison.Ordinal) &&
|
||||||
|
!onlineUids.Contains(p.GroupUserUID) &&
|
||||||
|
p.GroupUser.LastLoggedIn < now - inactivitySpan),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task<HashSet<string>> GetOnlineUidsAsync()
|
||||||
|
{
|
||||||
|
var keys = await _redis.SearchKeysAsync("UID:*").ConfigureAwait(false);
|
||||||
|
|
||||||
|
var set = new HashSet<string>(StringComparer.Ordinal);
|
||||||
|
|
||||||
|
foreach (var k in keys)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(k)) continue;
|
||||||
|
|
||||||
|
const string prefix = "UID:";
|
||||||
|
if (k.StartsWith(prefix, StringComparison.Ordinal))
|
||||||
|
{
|
||||||
|
var uid = k.Substring(prefix.Length);
|
||||||
|
if (!string.IsNullOrEmpty(uid))
|
||||||
|
set.Add(uid);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var idx = k.IndexOf(':', StringComparison.Ordinal);
|
||||||
|
if (idx >= 0 && idx < k.Length - 1)
|
||||||
|
set.Add(k[(idx + 1)..]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return set;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static TimeSpan GetInactivitySpan(int days) =>
|
||||||
|
days == 0 ? TimeSpan.FromHours(2) : TimeSpan.FromDays(days);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -118,6 +118,7 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ namespace LightlessSyncServer.Worker
|
|||||||
var hubContext = scope.ServiceProvider.GetRequiredService<IHubContext<LightlessHub>>();
|
var hubContext = scope.ServiceProvider.GetRequiredService<IHubContext<LightlessHub>>();
|
||||||
|
|
||||||
var groups = await db.Groups
|
var groups = await db.Groups
|
||||||
.Where(g => g.AutoPruneEnabled && g.AutoPruneDays > 0)
|
.Where(g => g.AutoPruneEnabled)
|
||||||
.ToListAsync(stoppingToken).ConfigureAwait(false);
|
.ToListAsync(stoppingToken).ConfigureAwait(false);
|
||||||
|
|
||||||
foreach (var group in groups)
|
foreach (var group in groups)
|
||||||
|
|||||||
@@ -80,6 +80,9 @@ 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);
|
||||||
|
|||||||
1328
LightlessSyncServer/LightlessSyncShared/Migrations/20251222024252_DisableChatGroups.Designer.cs
generated
Normal file
1328
LightlessSyncServer/LightlessSyncShared/Migrations/20251222024252_DisableChatGroups.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,29 @@
|
|||||||
|
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");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
1332
LightlessSyncServer/LightlessSyncShared/Migrations/20251229015535_ShareLocation.Designer.cs
generated
Normal file
1332
LightlessSyncServer/LightlessSyncShared/Migrations/20251229015535_ShareLocation.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
@@ -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");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -438,6 +438,12 @@ 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")
|
||||||
@@ -935,6 +941,10 @@ namespace LightlessSyncServer.Migrations
|
|||||||
.HasColumnType("boolean")
|
.HasColumnType("boolean")
|
||||||
.HasColumnName("is_paused");
|
.HasColumnName("is_paused");
|
||||||
|
|
||||||
|
b.Property<DateTimeOffset>("ShareLocationUntil")
|
||||||
|
.HasColumnType("timestamp with time zone")
|
||||||
|
.HasColumnName("share_location_until");
|
||||||
|
|
||||||
b.Property<bool>("Sticky")
|
b.Property<bool>("Sticky")
|
||||||
.HasColumnType("boolean")
|
.HasColumnType("boolean")
|
||||||
.HasColumnName("sticky");
|
.HasColumnName("sticky");
|
||||||
|
|||||||
@@ -19,5 +19,6 @@ 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;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,4 +15,5 @@ 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 DateTimeOffset ShareLocationUntil { get; set; } = DateTimeOffset.MinValue;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,13 +20,14 @@ public class ShardServerFilesController : ControllerBase
|
|||||||
[AllowAnonymous]
|
[AllowAnonymous]
|
||||||
public async Task<IActionResult> DownloadFileDirect(string hash, [FromQuery] long expires, [FromQuery] string signature)
|
public async Task<IActionResult> DownloadFileDirect(string hash, [FromQuery] long expires, [FromQuery] string signature)
|
||||||
{
|
{
|
||||||
var result = await _cdnDownloadsService.GetDownloadAsync(hash, expires, signature).ConfigureAwait(false);
|
var result = _cdnDownloadsService.GetDownloadWithCacheCheck(hash, expires, signature);
|
||||||
|
|
||||||
return result.Status switch
|
return result.Status switch
|
||||||
{
|
{
|
||||||
CDNDownloadsService.ResultStatus.Disabled => NotFound(),
|
CDNDownloadsService.ResultStatus.Disabled => NotFound(),
|
||||||
CDNDownloadsService.ResultStatus.Unauthorized => Unauthorized(),
|
CDNDownloadsService.ResultStatus.Unauthorized => Unauthorized(),
|
||||||
CDNDownloadsService.ResultStatus.NotFound => NotFound(),
|
CDNDownloadsService.ResultStatus.NotFound => NotFound(),
|
||||||
|
CDNDownloadsService.ResultStatus.Downloading => StatusCode(503),
|
||||||
CDNDownloadsService.ResultStatus.Success => PhysicalFile(result.File!.FullName, "application/octet-stream"),
|
CDNDownloadsService.ResultStatus.Success => PhysicalFile(result.File!.FullName, "application/octet-stream"),
|
||||||
_ => NotFound()
|
_ => NotFound()
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -10,7 +10,8 @@ public class CDNDownloadsService
|
|||||||
Disabled,
|
Disabled,
|
||||||
Unauthorized,
|
Unauthorized,
|
||||||
NotFound,
|
NotFound,
|
||||||
Success
|
Success,
|
||||||
|
Downloading
|
||||||
}
|
}
|
||||||
|
|
||||||
public readonly record struct Result(ResultStatus Status, FileInfo? File);
|
public readonly record struct Result(ResultStatus Status, FileInfo? File);
|
||||||
@@ -53,4 +54,32 @@ public class CDNDownloadsService
|
|||||||
|
|
||||||
return new Result(ResultStatus.Success, fileInfo);
|
return new Result(ResultStatus.Success, fileInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Result GetDownloadWithCacheCheck(string hash, long expiresUnixSeconds, string signature)
|
||||||
|
{
|
||||||
|
if (!_cdnDownloadUrlService.DirectDownloadsEnabled)
|
||||||
|
{
|
||||||
|
return new Result(ResultStatus.Disabled, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (string.IsNullOrEmpty(signature) || string.IsNullOrEmpty(hash))
|
||||||
|
{
|
||||||
|
return new Result(ResultStatus.Unauthorized, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
hash = hash.ToUpperInvariant();
|
||||||
|
|
||||||
|
if (!_cdnDownloadUrlService.TryValidateSignature(hash, expiresUnixSeconds, signature))
|
||||||
|
{
|
||||||
|
return new Result(ResultStatus.Unauthorized, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
var fileInfo = _cachedFileProvider.TryGetLocalFileInfo(hash);
|
||||||
|
if (fileInfo == null)
|
||||||
|
{
|
||||||
|
return new Result(ResultStatus.Downloading, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
return new Result(ResultStatus.Success, fileInfo);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -102,36 +102,37 @@ public sealed class CachedFileProvider : IDisposable
|
|||||||
|
|
||||||
private bool TryCopyFromColdStorage(string hash, string destinationFilePath)
|
private bool TryCopyFromColdStorage(string hash, string destinationFilePath)
|
||||||
{
|
{
|
||||||
if (!_configuration.GetValueOrDefault(nameof(StaticFilesServerConfiguration.UseColdStorage), false)) return false;
|
if (!_configuration.GetValueOrDefault(nameof(StaticFilesServerConfiguration.UseColdStorage), false)) return false;
|
||||||
|
|
||||||
string coldStorageDir = _configuration.GetValueOrDefault(nameof(StaticFilesServerConfiguration.ColdStorageDirectory), string.Empty);
|
string coldStorageDir = _configuration.GetValueOrDefault(nameof(StaticFilesServerConfiguration.ColdStorageDirectory), string.Empty);
|
||||||
if (string.IsNullOrEmpty(coldStorageDir)) return false;
|
if (string.IsNullOrEmpty(coldStorageDir)) return false;
|
||||||
|
|
||||||
var coldStorageFilePath = FilePathUtil.GetFileInfoForHash(coldStorageDir, hash);
|
var coldStorageFilePath = FilePathUtil.GetFileInfoForHash(coldStorageDir, hash);
|
||||||
if (coldStorageFilePath == null) return false;
|
if (coldStorageFilePath == null) return false;
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
_logger.LogDebug("Copying {hash} from cold storage: {path}", hash, coldStorageFilePath);
|
_logger.LogDebug("Copying {hash} from cold storage: {path}", hash, coldStorageFilePath);
|
||||||
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;
|
|
||||||
var destinationFile = new FileInfo(destinationFilePath);
|
|
||||||
destinationFile.LastAccessTimeUtc = DateTime.UtcNow;
|
|
||||||
destinationFile.CreationTimeUtc = DateTime.UtcNow;
|
|
||||||
destinationFile.LastWriteTimeUtc = DateTime.UtcNow;
|
|
||||||
_metrics.IncGauge(MetricsAPI.GaugeFilesTotal);
|
|
||||||
_metrics.IncGauge(MetricsAPI.GaugeFilesTotalSize, new FileInfo(destinationFilePath).Length);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
_logger.LogWarning(ex, "Could not copy {coldStoragePath} from cold storage", coldStorageFilePath);
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
File.SetLastAccessTimeUtc(coldStorageFilePath.FullName, DateTime.UtcNow);
|
||||||
}
|
File.SetLastAccessTimeUtc(destinationFilePath, DateTime.UtcNow);
|
||||||
|
File.SetCreationTimeUtc(destinationFilePath, DateTime.UtcNow);
|
||||||
|
File.SetLastWriteTimeUtc(destinationFilePath, DateTime.UtcNow);
|
||||||
|
|
||||||
|
_metrics.IncGauge(MetricsAPI.GaugeFilesTotal);
|
||||||
|
_metrics.IncGauge(MetricsAPI.GaugeFilesTotalSize, new FileInfo(destinationFilePath).Length);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.LogWarning(ex, "Could not copy {coldStoragePath} from cold storage", coldStorageFilePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
public async Task DownloadFileWhenRequired(string hash)
|
public async Task DownloadFileWhenRequired(string hash)
|
||||||
{
|
{
|
||||||
@@ -170,15 +171,22 @@ public sealed class CachedFileProvider : IDisposable
|
|||||||
|
|
||||||
public FileInfo? GetLocalFilePath(string hash)
|
public FileInfo? GetLocalFilePath(string hash)
|
||||||
{
|
{
|
||||||
var fi = FilePathUtil.GetFileInfoForHash(_hotStoragePath, hash);
|
var fi = FilePathUtil.GetFileInfoForHash(_hotStoragePath, hash);
|
||||||
if (fi == null) return null;
|
if (fi == null) return null;
|
||||||
|
|
||||||
fi.LastAccessTimeUtc = DateTime.UtcNow;
|
try
|
||||||
|
{
|
||||||
|
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);
|
||||||
|
|
||||||
return new FileInfo(fi.FullName);
|
return new FileInfo(fi.FullName);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<FileInfo?> DownloadAndGetLocalFileInfo(string hash)
|
public async Task<FileInfo?> DownloadAndGetLocalFileInfo(string hash)
|
||||||
{
|
{
|
||||||
@@ -211,4 +219,27 @@ public sealed class CachedFileProvider : IDisposable
|
|||||||
{
|
{
|
||||||
return hashes.Exists(_currentTransfers.Keys.Contains);
|
return hashes.Exists(_currentTransfers.Keys.Contains);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public FileInfo? TryGetLocalFileInfo(string hash)
|
||||||
|
{
|
||||||
|
var fi = FilePathUtil.GetFileInfoForHash(_hotStoragePath, hash);
|
||||||
|
if (fi != null)
|
||||||
|
{
|
||||||
|
return GetLocalFilePath(hash);
|
||||||
|
}
|
||||||
|
|
||||||
|
_ = Task.Run(async () =>
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await DownloadFileWhenRequired(hash).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.LogWarning(ex, "Download failed for {hash}", hash);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user