Compare commits
41 Commits
chat-adjus
...
fix-prune
| Author | SHA1 | Date | |
|---|---|---|---|
| c3784de9cd | |||
|
|
5aaa6ff35c | ||
|
|
2ef0725f4e | ||
| 1716750347 | |||
|
|
6e540ad0c6 | ||
|
|
863042d1fe | ||
|
|
b29475ea41 | ||
|
|
53e089a65b | ||
|
|
c3e87eb7df | ||
|
|
a533fca195 | ||
|
|
717d8e46f1 | ||
|
|
d3790013c6 | ||
|
|
9971b14177 | ||
| d39a922482 | |||
| 6216664e18 | |||
| 54992234d5 | |||
| 90e81fb955 | |||
|
|
4012b33f98 | ||
| 33fb6ba2eb | |||
|
|
d1526fa49e | ||
| 5b5f8edc3b | |||
|
|
8515364ffd | ||
|
|
4ec6169ebd | ||
|
|
ec26abaeb5 | ||
| 3350f2ebf6 | |||
|
|
670e0e01f1 | ||
|
|
12d51dc689 | ||
|
|
860bc955a4 | ||
| 76bdbe28da | |||
| f4753505aa | |||
| ce9b94a534 | |||
|
|
e58210e770 | ||
| 6d49389bd4 | |||
|
|
9a964b4933 | ||
|
|
2ca0fe0697 | ||
| 10bcf5dd1f | |||
|
|
dda22594f1 | ||
|
|
802077371b | ||
| 6321f385da | |||
|
|
7cd463d4b7 | ||
| dda45e8e73 |
5
.gitignore
vendored
5
.gitignore
vendored
@@ -350,4 +350,7 @@ MigrationBackup/
|
|||||||
.ionide/
|
.ionide/
|
||||||
|
|
||||||
# docker run data
|
# docker run data
|
||||||
Docker/run/data/
|
Docker/run/data/
|
||||||
|
|
||||||
|
#idea files
|
||||||
|
*.idea
|
||||||
Submodule LightlessAPI updated: 35f3390dda...4ecd5375e6
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net9.0</TargetFramework>
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -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");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -152,7 +152,7 @@ public partial class LightlessHub
|
|||||||
BroadcastRedisEntry? entry;
|
BroadcastRedisEntry? entry;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
entry = JsonSerializer.Deserialize<BroadcastRedisEntry>(broadcastValue!);
|
entry = JsonSerializer.Deserialize<BroadcastRedisEntry>(broadcastValue.ToString()!);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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;
|
||||||
@@ -52,6 +51,8 @@ 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)
|
||||||
{
|
{
|
||||||
@@ -60,15 +61,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 +294,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,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -864,12 +924,6 @@ 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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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;
|
||||||
@@ -336,7 +334,7 @@ public partial class LightlessHub
|
|||||||
BroadcastRedisEntry? entry;
|
BroadcastRedisEntry? entry;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
entry = JsonSerializer.Deserialize<BroadcastRedisEntry>(broadcastValue.Value!);
|
entry = JsonSerializer.Deserialize<BroadcastRedisEntry>(broadcastValue.Value.ToString()!);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@@ -438,7 +436,7 @@ public partial class LightlessHub
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
existingEntry = JsonSerializer.Deserialize<BroadcastRedisEntry>(existingValue!);
|
existingEntry = JsonSerializer.Deserialize<BroadcastRedisEntry>(existingValue.ToString()!);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@@ -477,7 +475,7 @@ public partial class LightlessHub
|
|||||||
BroadcastRedisEntry? entry;
|
BroadcastRedisEntry? entry;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
entry = JsonSerializer.Deserialize<BroadcastRedisEntry>(value!);
|
entry = JsonSerializer.Deserialize<BroadcastRedisEntry>(value.ToString()!);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@@ -536,7 +534,7 @@ public partial class LightlessHub
|
|||||||
BroadcastRedisEntry? entry;
|
BroadcastRedisEntry? entry;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
entry = JsonSerializer.Deserialize<BroadcastRedisEntry>(value.Value!);
|
entry = JsonSerializer.Deserialize<BroadcastRedisEntry>(value.Value.ToString()!);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@@ -590,7 +588,7 @@ public partial class LightlessHub
|
|||||||
BroadcastRedisEntry? entry;
|
BroadcastRedisEntry? entry;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
entry = JsonSerializer.Deserialize<BroadcastRedisEntry>(result.Value!);
|
entry = JsonSerializer.Deserialize<BroadcastRedisEntry>(result.Value.ToString()!);
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
@@ -645,7 +643,7 @@ public partial class LightlessHub
|
|||||||
BroadcastRedisEntry? entry;
|
BroadcastRedisEntry? entry;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
entry = JsonSerializer.Deserialize<BroadcastRedisEntry>(value!);
|
entry = JsonSerializer.Deserialize<BroadcastRedisEntry>(value.ToString()!);
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
@@ -728,7 +726,7 @@ public partial class LightlessHub
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
entry = JsonSerializer.Deserialize<BroadcastRedisEntry>(raw!);
|
entry = JsonSerializer.Deserialize<BroadcastRedisEntry>(raw.ToString()!);
|
||||||
if (entry is not null && !string.Equals(entry.HashedCID, cid, StringComparison.Ordinal))
|
if (entry is not null && !string.Equals(entry.HashedCID, cid, StringComparison.Ordinal))
|
||||||
{
|
{
|
||||||
_logger.LogCallWarning(LightlessHubLogger.Args("mismatched broadcast cid in batch", "Requested", cid, "EntryCID", entry.HashedCID));
|
_logger.LogCallWarning(LightlessHubLogger.Args("mismatched broadcast cid in batch", "Requested", cid, "EntryCID", entry.HashedCID));
|
||||||
@@ -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
|
||||||
@@ -1238,6 +1230,120 @@ public partial class LightlessHub
|
|||||||
errorMessage = string.Empty;
|
errorMessage = string.Empty;
|
||||||
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;
|
||||||
@@ -217,6 +219,8 @@ public partial class LightlessHub : Hub<ILightlessHub>, ILightlessHub
|
|||||||
await RemoveUserFromRedis().ConfigureAwait(false);
|
await RemoveUserFromRedis().ConfigureAwait(false);
|
||||||
|
|
||||||
_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);
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net9.0</TargetFramework>
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
<UserSecretsId>aspnet-LightlessSyncServer-BA82A12A-0B30-463C-801D-B7E81318CD50</UserSecretsId>
|
<UserSecretsId>aspnet-LightlessSyncServer-BA82A12A-0B30-463C-801D-B7E81318CD50</UserSecretsId>
|
||||||
<AssemblyVersion>1.1.0.0</AssemblyVersion>
|
<AssemblyVersion>1.1.0.0</AssemblyVersion>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
|||||||
@@ -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)
|
||||||
|
|||||||
@@ -1,9 +1,6 @@
|
|||||||
using System.Collections.Generic;
|
|
||||||
using System;
|
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Linq;
|
|
||||||
using Discord;
|
using Discord;
|
||||||
using Discord.Interactions;
|
using Discord.Interactions;
|
||||||
using Discord.Rest;
|
using Discord.Rest;
|
||||||
@@ -872,16 +869,17 @@ internal class DiscordBot : IHostedService
|
|||||||
string? SenderHashedCid,
|
string? SenderHashedCid,
|
||||||
string Message);
|
string Message);
|
||||||
|
|
||||||
private async Task UpdateStatusAsync(CancellationToken token)
|
private async Task UpdateStatusAsync(CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
while (!token.IsCancellationRequested)
|
while (!cancellationToken.IsCancellationRequested)
|
||||||
{
|
{
|
||||||
var endPoint = _connectionMultiplexer.GetEndPoints().First();
|
var endPoint = _connectionMultiplexer.GetEndPoints().First();
|
||||||
var onlineUsers = await _connectionMultiplexer.GetServer(endPoint).KeysAsync(pattern: "UID:*").CountAsync().ConfigureAwait(false);
|
var keys = _connectionMultiplexer.GetServer(endPoint).KeysAsync(pattern: "UID:*");
|
||||||
|
var onlineUsers = await keys.CountAsync(cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
_logger.LogInformation("Users online: " + onlineUsers);
|
_logger.LogInformation("Users online: " + onlineUsers);
|
||||||
await _discordClient.SetActivityAsync(new Game("Lightless for " + onlineUsers + " Users")).ConfigureAwait(false);
|
await _discordClient.SetActivityAsync(new Game("Lightless for " + onlineUsers + " Users")).ConfigureAwait(false);
|
||||||
await Task.Delay(TimeSpan.FromSeconds(10)).ConfigureAwait(false);
|
await Task.Delay(TimeSpan.FromSeconds(10), cancellationToken).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,33 +43,54 @@ public class LightlessModule : InteractionModuleBase
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
EmbedBuilder eb = new();
|
|
||||||
|
|
||||||
using var scope = _services.CreateScope();
|
using var scope = _services.CreateScope();
|
||||||
var db = scope.ServiceProvider.GetRequiredService<LightlessDbContext>();
|
var db = scope.ServiceProvider.GetRequiredService<LightlessDbContext>();
|
||||||
await using (db.ConfigureAwait(false))
|
await using (db.ConfigureAwait(false))
|
||||||
{
|
{
|
||||||
eb = await HandleUserInfo(eb, db, Context.User.Id, secondaryUid, discordUser?.Id ?? null, uid);
|
var (mainEmbed, profileEmbed) = await HandleUserInfo(db, Context.User.Id, secondaryUid, discordUser?.Id ?? null, uid);
|
||||||
|
|
||||||
string uidToGet = await GetUserUID(db, secondaryUid, discordUser?.Id ?? null, uid).ConfigureAwait(false);
|
string uidToGet = await GetUserUID(db, secondaryUid, discordUser?.Id ?? null, uid).ConfigureAwait(false);
|
||||||
var profileData = await GetUserProfileData(db, uidToGet).ConfigureAwait(false);
|
var profileData = await GetUserProfileData(db, uidToGet).ConfigureAwait(false);
|
||||||
|
|
||||||
|
List<Embed> embeds = new() { mainEmbed };
|
||||||
|
if (profileEmbed != null)
|
||||||
|
{
|
||||||
|
embeds.Add(profileEmbed);
|
||||||
|
}
|
||||||
|
|
||||||
if (profileData != null)
|
if (profileData != null)
|
||||||
{
|
{
|
||||||
byte[] profileImage = GetProfileImage(profileData);
|
byte[] profileImage = GetProfileImage(profileData);
|
||||||
byte[] bannerImage = GetBannerImage(profileData);
|
byte[] bannerImage = GetBannerImage(profileData);
|
||||||
using MemoryStream profileImgStream = new(profileImage);
|
using MemoryStream profileImgStream = new(profileImage);
|
||||||
using MemoryStream bannerImgStream = new(bannerImage);
|
using MemoryStream bannerImgStream = new(bannerImage);
|
||||||
eb.WithThumbnailUrl("attachment://profileimage.png");
|
|
||||||
eb.WithImageUrl("attachment://bannerimage.png");
|
var mainEmbedData = embeds[0];
|
||||||
|
var mainEmbedBuilder = new EmbedBuilder()
|
||||||
|
.WithTitle(mainEmbedData.Title)
|
||||||
|
.WithDescription(mainEmbedData.Description)
|
||||||
|
.WithThumbnailUrl("attachment://profileimage.png")
|
||||||
|
.WithImageUrl("attachment://bannerimage.png");
|
||||||
|
|
||||||
|
if (mainEmbedData.Fields != null)
|
||||||
|
{
|
||||||
|
foreach (var field in mainEmbedData.Fields)
|
||||||
|
{
|
||||||
|
mainEmbedBuilder.AddField(field.Name, field.Value, field.Inline);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
embeds[0] = mainEmbedBuilder.Build();
|
||||||
|
|
||||||
await RespondWithFilesAsync(
|
await RespondWithFilesAsync(
|
||||||
new[] { new FileAttachment(profileImgStream, "profileimage.png"), new FileAttachment(bannerImgStream, "bannerimage.png") },
|
new[] { new FileAttachment(profileImgStream, "profileimage.png"), new FileAttachment(bannerImgStream, "bannerimage.png") },
|
||||||
embeds: new[] { eb.Build() },
|
embeds: embeds.ToArray(),
|
||||||
ephemeral: true).ConfigureAwait(false);
|
ephemeral: true).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
await RespondAsync(
|
await RespondAsync(
|
||||||
embeds: new[] { eb.Build() },
|
embeds: embeds.ToArray(),
|
||||||
ephemeral: true).ConfigureAwait(false);
|
ephemeral: true).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -449,7 +470,7 @@ public class LightlessModule : InteractionModuleBase
|
|||||||
return embed.Build();
|
return embed.Build();
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task<EmbedBuilder> HandleUserInfo(EmbedBuilder eb, LightlessDbContext db, ulong id, string? secondaryUserUid = null, ulong? optionalUser = null, string? uid = null)
|
private async Task<(Embed mainEmbed, Embed? profileEmbed)> HandleUserInfo(LightlessDbContext db, ulong id, string? secondaryUserUid = null, ulong? optionalUser = null, string? uid = null)
|
||||||
{
|
{
|
||||||
bool showForSecondaryUser = secondaryUserUid != null;
|
bool showForSecondaryUser = secondaryUserUid != null;
|
||||||
|
|
||||||
@@ -459,18 +480,20 @@ public class LightlessModule : InteractionModuleBase
|
|||||||
|
|
||||||
if (primaryUser == null)
|
if (primaryUser == null)
|
||||||
{
|
{
|
||||||
|
EmbedBuilder eb = new();
|
||||||
eb.WithTitle("No account");
|
eb.WithTitle("No account");
|
||||||
eb.WithDescription("No Lightless account was found associated to your Discord user");
|
eb.WithDescription("No Lightless account was found associated to your Discord user");
|
||||||
return eb;
|
return (eb.Build(), null);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool isAdminCall = primaryUser.User.IsModerator || primaryUser.User.IsAdmin;
|
bool isAdminCall = primaryUser.User.IsModerator || primaryUser.User.IsAdmin;
|
||||||
|
|
||||||
if ((optionalUser != null || uid != null) && !isAdminCall)
|
if ((optionalUser != null || uid != null) && !isAdminCall)
|
||||||
{
|
{
|
||||||
|
EmbedBuilder eb = new();
|
||||||
eb.WithTitle("Unauthorized");
|
eb.WithTitle("Unauthorized");
|
||||||
eb.WithDescription("You are not authorized to view another users' information");
|
eb.WithDescription("You are not authorized to view another users' information");
|
||||||
return eb;
|
return (eb.Build(), null);
|
||||||
}
|
}
|
||||||
else if ((optionalUser != null || uid != null) && isAdminCall)
|
else if ((optionalUser != null || uid != null) && isAdminCall)
|
||||||
{
|
{
|
||||||
@@ -486,9 +509,10 @@ public class LightlessModule : InteractionModuleBase
|
|||||||
|
|
||||||
if (userInDb == null)
|
if (userInDb == null)
|
||||||
{
|
{
|
||||||
|
EmbedBuilder eb = new();
|
||||||
eb.WithTitle("No account");
|
eb.WithTitle("No account");
|
||||||
eb.WithDescription("The Discord user has no valid Lightless account");
|
eb.WithDescription("The Discord user has no valid Lightless account");
|
||||||
return eb;
|
return (eb.Build(), null);
|
||||||
}
|
}
|
||||||
|
|
||||||
userToCheckForDiscordId = userInDb.DiscordId;
|
userToCheckForDiscordId = userInDb.DiscordId;
|
||||||
@@ -501,9 +525,10 @@ public class LightlessModule : InteractionModuleBase
|
|||||||
dbUser = (await db.Auth.Include(u => u.User).SingleOrDefaultAsync(u => u.PrimaryUserUID == dbUser.UID && u.UserUID == secondaryUserUid))?.User;
|
dbUser = (await db.Auth.Include(u => u.User).SingleOrDefaultAsync(u => u.PrimaryUserUID == dbUser.UID && u.UserUID == secondaryUserUid))?.User;
|
||||||
if (dbUser == null)
|
if (dbUser == null)
|
||||||
{
|
{
|
||||||
|
EmbedBuilder eb = new();
|
||||||
eb.WithTitle("No such secondary UID");
|
eb.WithTitle("No such secondary UID");
|
||||||
eb.WithDescription($"A secondary UID {secondaryUserUid} was not found attached to your primary UID {primaryUser.User.UID}.");
|
eb.WithDescription($"A secondary UID {secondaryUserUid} was not found attached to your primary UID {primaryUser.User.UID}.");
|
||||||
return eb;
|
return (eb.Build(), null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -513,55 +538,61 @@ public class LightlessModule : InteractionModuleBase
|
|||||||
var profile = await db.UserProfileData.Where(u => u.UserUID == dbUser.UID).SingleOrDefaultAsync().ConfigureAwait(false);
|
var profile = await db.UserProfileData.Where(u => u.UserUID == dbUser.UID).SingleOrDefaultAsync().ConfigureAwait(false);
|
||||||
var identity = await _connectionMultiplexer.GetDatabase().StringGetAsync("UID:" + dbUser.UID).ConfigureAwait(false);
|
var identity = await _connectionMultiplexer.GetDatabase().StringGetAsync("UID:" + dbUser.UID).ConfigureAwait(false);
|
||||||
|
|
||||||
eb.WithTitle("User Information");
|
EmbedBuilder mainEmbed = new();
|
||||||
eb.WithDescription("This is the user information for Discord User <@" + userToCheckForDiscordId + ">" + Environment.NewLine + Environment.NewLine
|
mainEmbed.WithTitle("User Information");
|
||||||
|
mainEmbed.WithDescription("This is the user information for Discord User <@" + userToCheckForDiscordId + ">" + Environment.NewLine + Environment.NewLine
|
||||||
+ "If you want to verify your secret key is valid, go to https://emn178.github.io/online-tools/sha256.html and copy your secret key into there and compare it to the Hashed Secret Key provided below.");
|
+ "If you want to verify your secret key is valid, go to https://emn178.github.io/online-tools/sha256.html and copy your secret key into there and compare it to the Hashed Secret Key provided below.");
|
||||||
eb.AddField("UID", dbUser.UID);
|
mainEmbed.AddField("UID", dbUser.UID);
|
||||||
if (!string.IsNullOrEmpty(dbUser.Alias))
|
if (!string.IsNullOrEmpty(dbUser.Alias))
|
||||||
{
|
{
|
||||||
eb.AddField("Vanity UID", dbUser.Alias);
|
mainEmbed.AddField("Vanity UID", dbUser.Alias);
|
||||||
}
|
}
|
||||||
if (showForSecondaryUser)
|
if (showForSecondaryUser)
|
||||||
{
|
{
|
||||||
eb.AddField("Primary UID for " + dbUser.UID, auth.PrimaryUserUID);
|
mainEmbed.AddField("Primary UID for " + dbUser.UID, auth.PrimaryUserUID);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
var secondaryUIDs = await db.Auth.Where(p => p.PrimaryUserUID == dbUser.UID).Select(p => p.UserUID).ToListAsync();
|
var secondaryUIDs = await db.Auth.Where(p => p.PrimaryUserUID == dbUser.UID).Select(p => p.UserUID).ToListAsync();
|
||||||
if (secondaryUIDs.Any())
|
if (secondaryUIDs.Any())
|
||||||
{
|
{
|
||||||
eb.AddField("Secondary UIDs", string.Join(Environment.NewLine, secondaryUIDs));
|
mainEmbed.AddField("Secondary UIDs", string.Join(Environment.NewLine, secondaryUIDs));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(profile != null)
|
mainEmbed.AddField("Last Online (UTC)", dbUser.LastLoggedIn.ToString("U"));
|
||||||
{
|
mainEmbed.AddField("Currently online ", !string.IsNullOrEmpty(identity));
|
||||||
eb.AddField("Profile Description", string.IsNullOrEmpty(profile.UserDescription) ? "(No description set)" : profile.UserDescription);
|
mainEmbed.AddField("Hashed Secret Key", auth.HashedKey);
|
||||||
eb.AddField("Profile NSFW", profile.IsNSFW);
|
mainEmbed.AddField("Joined Syncshells", groupsJoined.Count);
|
||||||
eb.AddField("Profile Disabled", profile.ProfileDisabled);
|
mainEmbed.AddField("Owned Syncshells", groups.Count);
|
||||||
eb.AddField("Profile Flagged for Report", profile.FlaggedForReport);
|
|
||||||
eb.AddField("Profile Tags", profile.Tags != null && profile.Tags.Length > 0 ? string.Join(", ", profile.Tags) : "(No tags set)");
|
|
||||||
}
|
|
||||||
eb.AddField("Last Online (UTC)", dbUser.LastLoggedIn.ToString("U"));
|
|
||||||
eb.AddField("Currently online ", !string.IsNullOrEmpty(identity));
|
|
||||||
eb.AddField("Hashed Secret Key", auth.HashedKey);
|
|
||||||
eb.AddField("Joined Syncshells", groupsJoined.Count);
|
|
||||||
eb.AddField("Owned Syncshells", groups.Count);
|
|
||||||
foreach (var group in groups)
|
foreach (var group in groups)
|
||||||
{
|
{
|
||||||
var syncShellUserCount = await db.GroupPairs.CountAsync(g => g.GroupGID == group.GID).ConfigureAwait(false);
|
var syncShellUserCount = await db.GroupPairs.CountAsync(g => g.GroupGID == group.GID).ConfigureAwait(false);
|
||||||
if (!string.IsNullOrEmpty(group.Alias))
|
if (!string.IsNullOrEmpty(group.Alias))
|
||||||
{
|
{
|
||||||
eb.AddField("Owned Syncshell " + group.GID + " Vanity ID", group.Alias);
|
mainEmbed.AddField("Owned Syncshell " + group.GID + " Vanity ID", group.Alias);
|
||||||
}
|
}
|
||||||
eb.AddField("Owned Syncshell " + group.GID + " User Count", syncShellUserCount);
|
mainEmbed.AddField("Owned Syncshell " + group.GID + " User Count", syncShellUserCount);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isAdminCall && !string.IsNullOrEmpty(identity))
|
if (isAdminCall && !string.IsNullOrEmpty(identity))
|
||||||
{
|
{
|
||||||
eb.AddField("Character Ident", identity);
|
mainEmbed.AddField("Character Ident", identity);
|
||||||
}
|
}
|
||||||
|
|
||||||
return eb;
|
Embed? profileEmbedResult = null;
|
||||||
|
if (profile != null)
|
||||||
|
{
|
||||||
|
EmbedBuilder profileEmbedBuilder = new();
|
||||||
|
profileEmbedBuilder.WithTitle("User Profile");
|
||||||
|
profileEmbedBuilder.WithDescription("Profile Description: " + (string.IsNullOrEmpty(profile.UserDescription) ? "(No description set)" : profile.UserDescription));
|
||||||
|
profileEmbedBuilder.AddField("Profile NSFW", profile.IsNSFW);
|
||||||
|
profileEmbedBuilder.AddField("Profile Disabled", profile.ProfileDisabled);
|
||||||
|
profileEmbedBuilder.AddField("Profile Flagged for Report", profile.FlaggedForReport);
|
||||||
|
profileEmbedBuilder.AddField("Profile Tags", profile.Tags != null && profile.Tags.Length > 0 ? string.Join(", ", profile.Tags) : "(No tags set)");
|
||||||
|
profileEmbedResult = profileEmbedBuilder.Build();
|
||||||
|
}
|
||||||
|
|
||||||
|
return (mainEmbed.Build(), profileEmbedResult);
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task<string> GetUserUID(LightlessDbContext db, string? secondaryUserUid = null, ulong? optionalUser = null, string? uid = null)
|
private async Task<string> GetUserUID(LightlessDbContext db, string? secondaryUserUid = null, ulong? optionalUser = null, string? uid = null)
|
||||||
@@ -578,7 +609,7 @@ public class LightlessModule : InteractionModuleBase
|
|||||||
}
|
}
|
||||||
else if (uid != null)
|
else if (uid != null)
|
||||||
{
|
{
|
||||||
userInDb = await db.LodeStoneAuth.Include(u => u.User).SingleOrDefaultAsync(u => u.User.UID == uid || u.User.Alias == uid).ConfigureAwait(false);
|
userInDb = await db.LodeStoneAuth.Include(u => u.User).SingleOrDefaultAsync(u => u.User.UID == uid || u.User.Alias == uid). ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
if (userInDb == null)
|
if (userInDb == null)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net9.0</TargetFramework>
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
@@ -21,7 +21,7 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Discord.Net" Version="3.17.0" />
|
<PackageReference Include="Discord.Net" Version="3.18.0" />
|
||||||
<PackageReference Include="IDisposableAnalyzers" Version="4.0.8">
|
<PackageReference Include="IDisposableAnalyzers" Version="4.0.8">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
@@ -32,6 +32,7 @@
|
|||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="9.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="9.0.0" />
|
||||||
|
<PackageReference Include="System.Linq.Async" Version="7.0.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net9.0</TargetFramework>
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
@@ -47,7 +47,6 @@
|
|||||||
<PackageReference Include="StackExchange.Redis.Extensions.Core" Version="10.2.0" />
|
<PackageReference Include="StackExchange.Redis.Extensions.Core" Version="10.2.0" />
|
||||||
<PackageReference Include="StackExchange.Redis.Extensions.System.Text.Json" Version="10.2.0" />
|
<PackageReference Include="StackExchange.Redis.Extensions.System.Text.Json" Version="10.2.0" />
|
||||||
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.3.0" />
|
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.3.0" />
|
||||||
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
1322
LightlessSyncServer/LightlessSyncShared/Migrations/20251219115131_ChatReportFixes.Designer.cs
generated
Normal file
1322
LightlessSyncServer/LightlessSyncShared/Migrations/20251219115131_ChatReportFixes.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 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: "");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
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")
|
||||||
@@ -776,11 +782,6 @@ 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");
|
||||||
@@ -940,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;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net9.0</TargetFramework>
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|||||||
@@ -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)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user