Compare commits
1 Commits
fix-prune
...
discord-bo
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8c1af6f31c |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -351,6 +351,3 @@ MigrationBackup/
|
|||||||
|
|
||||||
# docker run data
|
# docker run data
|
||||||
Docker/run/data/
|
Docker/run/data/
|
||||||
|
|
||||||
#idea files
|
|
||||||
*.idea
|
|
||||||
Submodule LightlessAPI updated: 4ecd5375e6...35f3390dda
@@ -41,10 +41,8 @@ public partial class LightlessHub
|
|||||||
|
|
||||||
var groupInfos = await DbContext.Groups
|
var groupInfos = await DbContext.Groups
|
||||||
.AsNoTracking()
|
.AsNoTracking()
|
||||||
.Where(g => g.ChatEnabled
|
.Where(g => g.OwnerUID == userUid
|
||||||
&& (g.OwnerUID == userUid
|
|
||||||
|| DbContext.GroupPairs.Any(p => p.GroupGID == g.GID && p.GroupUserUID == userUid))
|
|| DbContext.GroupPairs.Any(p => p.GroupGID == g.GID && p.GroupUserUID == userUid))
|
||||||
)
|
|
||||||
.ToListAsync()
|
.ToListAsync()
|
||||||
.ConfigureAwait(false);
|
.ConfigureAwait(false);
|
||||||
|
|
||||||
@@ -164,13 +162,6 @@ public partial class LightlessHub
|
|||||||
throw new HubException("Unsupported chat channel.");
|
throw new HubException("Unsupported chat channel.");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!group.ChatEnabled)
|
|
||||||
{
|
|
||||||
TryInvokeChatService(() => _chatChannelService.RemovePresence(UserUID, channel), "removing chat presence", channel);
|
|
||||||
await Clients.Caller.Client_ReceiveServerMessage(MessageSeverity.Warning, "This Syncshell chat is disabled.").ConfigureAwait(false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var isMember = string.Equals(group.OwnerUID, UserUID, StringComparison.Ordinal)
|
var isMember = string.Equals(group.OwnerUID, UserUID, StringComparison.Ordinal)
|
||||||
|| await DbContext.GroupPairs
|
|| await DbContext.GroupPairs
|
||||||
.AsNoTracking()
|
.AsNoTracking()
|
||||||
@@ -216,23 +207,6 @@ public partial class LightlessHub
|
|||||||
|
|
||||||
var channel = request.Channel.WithNormalizedCustomKey();
|
var channel = request.Channel.WithNormalizedCustomKey();
|
||||||
|
|
||||||
if (channel.Type == ChatChannelType.Group)
|
|
||||||
{
|
|
||||||
var groupId = channel.CustomKey ?? string.Empty;
|
|
||||||
var chatEnabled = !string.IsNullOrEmpty(groupId) && await DbContext.Groups
|
|
||||||
.AsNoTracking()
|
|
||||||
.Where(g => g.GID == groupId)
|
|
||||||
.Select(g => g.ChatEnabled)
|
|
||||||
.SingleOrDefaultAsync(RequestAbortedToken)
|
|
||||||
.ConfigureAwait(false);
|
|
||||||
|
|
||||||
if (!chatEnabled)
|
|
||||||
{
|
|
||||||
await Clients.Caller.Client_ReceiveServerMessage(MessageSeverity.Warning, "This Syncshell chat is disabled.").ConfigureAwait(false);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (await HandleIfChatBannedAsync(UserUID).ConfigureAwait(false))
|
if (await HandleIfChatBannedAsync(UserUID).ConfigureAwait(false))
|
||||||
{
|
{
|
||||||
throw new HubException("Chat access has been revoked.");
|
throw new HubException("Chat access has been revoked.");
|
||||||
|
|||||||
@@ -40,6 +40,5 @@ namespace LightlessSyncServer.Hubs
|
|||||||
public Task Client_GposeLobbyPushPoseData(UserData userData, PoseData poseData) => throw new PlatformNotSupportedException("Calling clientside method on server not supported");
|
public Task Client_GposeLobbyPushPoseData(UserData userData, PoseData poseData) => throw new PlatformNotSupportedException("Calling clientside method on server not supported");
|
||||||
public Task Client_GposeLobbyPushWorldData(UserData userData, WorldData worldData) => throw new PlatformNotSupportedException("Calling clientside method on server not supported");
|
public Task Client_GposeLobbyPushWorldData(UserData userData, WorldData worldData) => throw new PlatformNotSupportedException("Calling clientside method on server not supported");
|
||||||
public Task Client_ChatReceive(ChatMessageDto message) => throw new PlatformNotSupportedException("Calling clientside method on server not supported");
|
public Task Client_ChatReceive(ChatMessageDto message) => throw new PlatformNotSupportedException("Calling clientside method on server not supported");
|
||||||
public Task Client_SendLocationToClient(LocationDto locationDto, DateTimeOffset expireAt) => throw new PlatformNotSupportedException("Calling clientside method on server not supported");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
using LightlessSync.API.Data;
|
using LightlessSync.API.Data;
|
||||||
using LightlessSync.API.Data.Enum;
|
using LightlessSync.API.Data.Enum;
|
||||||
using LightlessSync.API.Data.Extensions;
|
using LightlessSync.API.Data.Extensions;
|
||||||
using LightlessSync.API.Dto.Chat;
|
|
||||||
using LightlessSync.API.Dto.Group;
|
using LightlessSync.API.Dto.Group;
|
||||||
using LightlessSync.API.Dto.User;
|
using LightlessSync.API.Dto.User;
|
||||||
using LightlessSyncServer.Models;
|
using LightlessSyncServer.Models;
|
||||||
@@ -12,8 +11,10 @@ using LightlessSyncShared.Utils;
|
|||||||
using Microsoft.AspNetCore.Authorization;
|
using Microsoft.AspNetCore.Authorization;
|
||||||
using Microsoft.AspNetCore.SignalR;
|
using Microsoft.AspNetCore.SignalR;
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
using SixLabors.ImageSharp;
|
using SixLabors.ImageSharp;
|
||||||
using System.Collections.Concurrent;
|
using SixLabors.ImageSharp.PixelFormats;
|
||||||
|
using System.Reflection;
|
||||||
using System.Security.Cryptography;
|
using System.Security.Cryptography;
|
||||||
|
|
||||||
namespace LightlessSyncServer.Hubs;
|
namespace LightlessSyncServer.Hubs;
|
||||||
@@ -51,8 +52,6 @@ public partial class LightlessHub
|
|||||||
_logger.LogCallInfo(LightlessHubLogger.Args(dto, "Success"));
|
_logger.LogCallInfo(LightlessHubLogger.Args(dto, "Success"));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static readonly ConcurrentDictionary<string, DateTime> GroupChatToggleCooldowns = new(StringComparer.Ordinal);
|
|
||||||
|
|
||||||
[Authorize(Policy = "Identified")]
|
[Authorize(Policy = "Identified")]
|
||||||
public async Task GroupChangeGroupPermissionState(GroupPermissionDto dto)
|
public async Task GroupChangeGroupPermissionState(GroupPermissionDto dto)
|
||||||
{
|
{
|
||||||
@@ -61,73 +60,15 @@ public partial class LightlessHub
|
|||||||
var (hasRights, group) = await TryValidateGroupModeratorOrOwner(dto.Group.GID).ConfigureAwait(false);
|
var (hasRights, group) = await TryValidateGroupModeratorOrOwner(dto.Group.GID).ConfigureAwait(false);
|
||||||
if (!hasRights) return;
|
if (!hasRights) return;
|
||||||
|
|
||||||
var permissions = dto.Permissions;
|
group.InvitesEnabled = !dto.Permissions.HasFlag(GroupPermissions.DisableInvites);
|
||||||
var isOwner = string.Equals(group.OwnerUID, UserUID, StringComparison.Ordinal);
|
group.PreferDisableSounds = dto.Permissions.HasFlag(GroupPermissions.PreferDisableSounds);
|
||||||
var chatEnabled = group.ChatEnabled;
|
group.PreferDisableAnimations = dto.Permissions.HasFlag(GroupPermissions.PreferDisableAnimations);
|
||||||
var chatChanged = false;
|
group.PreferDisableVFX = dto.Permissions.HasFlag(GroupPermissions.PreferDisableVFX);
|
||||||
|
|
||||||
if (!isOwner)
|
|
||||||
{
|
|
||||||
permissions.SetDisableChat(!group.ChatEnabled);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
var requestedChatEnabled = !permissions.IsDisableChat();
|
|
||||||
if (requestedChatEnabled != group.ChatEnabled)
|
|
||||||
{
|
|
||||||
var now = DateTime.UtcNow;
|
|
||||||
if (GroupChatToggleCooldowns.TryGetValue(group.GID, out var lockedUntil) && lockedUntil > now)
|
|
||||||
{
|
|
||||||
var remaining = lockedUntil - now;
|
|
||||||
var minutes = Math.Max(1, (int)Math.Ceiling(remaining.TotalMinutes));
|
|
||||||
await Clients.Caller.Client_ReceiveServerMessage(
|
|
||||||
MessageSeverity.Warning,
|
|
||||||
$"Syncshell chat can be toggled again in {minutes} minute{(minutes == 1 ? string.Empty : "s")}."
|
|
||||||
).ConfigureAwait(false);
|
|
||||||
permissions.SetDisableChat(!group.ChatEnabled);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
chatEnabled = requestedChatEnabled;
|
|
||||||
group.ChatEnabled = chatEnabled;
|
|
||||||
GroupChatToggleCooldowns[group.GID] = now.AddMinutes(5);
|
|
||||||
chatChanged = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
group.InvitesEnabled = !permissions.HasFlag(GroupPermissions.DisableInvites);
|
|
||||||
group.PreferDisableSounds = permissions.HasFlag(GroupPermissions.PreferDisableSounds);
|
|
||||||
group.PreferDisableAnimations = permissions.HasFlag(GroupPermissions.PreferDisableAnimations);
|
|
||||||
group.PreferDisableVFX = permissions.HasFlag(GroupPermissions.PreferDisableVFX);
|
|
||||||
|
|
||||||
await DbContext.SaveChangesAsync(RequestAbortedToken).ConfigureAwait(false);
|
await DbContext.SaveChangesAsync(RequestAbortedToken).ConfigureAwait(false);
|
||||||
|
|
||||||
var groupPairs = DbContext.GroupPairs.Where(p => p.GroupGID == dto.Group.GID).Select(p => p.GroupUserUID).ToList();
|
var groupPairs = DbContext.GroupPairs.Where(p => p.GroupGID == dto.Group.GID).Select(p => p.GroupUserUID).ToList();
|
||||||
await Clients.Users(groupPairs).Client_GroupChangePermissions(new GroupPermissionDto(dto.Group, permissions)).ConfigureAwait(false);
|
await Clients.Users(groupPairs).Client_GroupChangePermissions(new GroupPermissionDto(dto.Group, dto.Permissions)).ConfigureAwait(false);
|
||||||
|
|
||||||
if (isOwner && chatChanged && !chatEnabled)
|
|
||||||
{
|
|
||||||
var groupDisplayName = string.IsNullOrWhiteSpace(group.Alias) ? group.GID : group.Alias;
|
|
||||||
var descriptor = new ChatChannelDescriptor
|
|
||||||
{
|
|
||||||
Type = ChatChannelType.Group,
|
|
||||||
WorldId = 0,
|
|
||||||
ZoneId = 0,
|
|
||||||
CustomKey = group.GID
|
|
||||||
};
|
|
||||||
|
|
||||||
foreach (var uid in groupPairs)
|
|
||||||
{
|
|
||||||
TryInvokeChatService(() => _chatChannelService.RemovePresence(uid, descriptor), "removing group chat presence", descriptor, uid);
|
|
||||||
}
|
|
||||||
|
|
||||||
await Clients.Users(groupPairs)
|
|
||||||
.Client_ReceiveServerMessage(
|
|
||||||
MessageSeverity.Information,
|
|
||||||
$"Syncshell chat for '{groupDisplayName}' has been disabled.")
|
|
||||||
.ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[Authorize(Policy = "Identified")]
|
[Authorize(Policy = "Identified")]
|
||||||
@@ -294,7 +235,6 @@ public partial class LightlessHub
|
|||||||
PreferDisableAnimations = defaultPermissions.DisableGroupAnimations,
|
PreferDisableAnimations = defaultPermissions.DisableGroupAnimations,
|
||||||
PreferDisableSounds = defaultPermissions.DisableGroupSounds,
|
PreferDisableSounds = defaultPermissions.DisableGroupSounds,
|
||||||
PreferDisableVFX = defaultPermissions.DisableGroupVFX,
|
PreferDisableVFX = defaultPermissions.DisableGroupVFX,
|
||||||
ChatEnabled = true,
|
|
||||||
CreatedDate = currentTime,
|
CreatedDate = currentTime,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -924,6 +864,12 @@ public partial class LightlessHub
|
|||||||
{
|
{
|
||||||
groupProfileDb.Group ??= group;
|
groupProfileDb.Group ??= group;
|
||||||
|
|
||||||
|
if (groupProfileDb?.ProfileDisabled ?? false)
|
||||||
|
{
|
||||||
|
await Clients.Caller.Client_ReceiveServerMessage(MessageSeverity.Error, "Your profile was permanently disabled and cannot be edited").ConfigureAwait(false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
groupProfileDb.UpdateProfileFromDto(dto, sanitizedProfileImage, sanitizedBannerImage);
|
groupProfileDb.UpdateProfileFromDto(dto, sanitizedProfileImage, sanitizedBannerImage);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +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 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;
|
||||||
@@ -1169,6 +1171,12 @@ public partial class LightlessHub
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (profileData.ProfileDisabled)
|
||||||
|
{
|
||||||
|
await Clients.Caller.Client_ReceiveServerMessage(MessageSeverity.Error, "Your profile was permanently disabled and cannot be edited").ConfigureAwait(false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
profileData.UpdateProfileFromDto(dto, profileResult.Base64Image, bannerResult.Base64Image);
|
profileData.UpdateProfileFromDto(dto, profileResult.Base64Image, bannerResult.Base64Image);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -1231,120 +1239,6 @@ public partial class LightlessHub
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
[Authorize(Policy = "Identified")]
|
|
||||||
public async Task UpdateLocation(LocationDto dto, bool offline = false)
|
|
||||||
{
|
|
||||||
_logger.LogCallInfo(LightlessHubLogger.Args(UserUID,dto));
|
|
||||||
if (string.IsNullOrEmpty(dto.User.UID))
|
|
||||||
{
|
|
||||||
_logger.LogCallWarning(LightlessHubLogger.Args("LocationDto with no userinfo :",UserUID, dto));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!string.Equals(UserUID, dto.User.UID, StringComparison.Ordinal))
|
|
||||||
{
|
|
||||||
_logger.LogCallWarning(LightlessHubLogger.Args("LocationDto with another UID :",UserUID, dto));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
var 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,8 +16,6 @@ using Microsoft.AspNetCore.SignalR;
|
|||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
using StackExchange.Redis.Extensions.Core.Abstractions;
|
using StackExchange.Redis.Extensions.Core.Abstractions;
|
||||||
using System.Collections.Concurrent;
|
using System.Collections.Concurrent;
|
||||||
using LightlessSync.API.Dto.CharaData;
|
|
||||||
using LightlessSync.API.Dto.User;
|
|
||||||
using LightlessSyncServer.Services.Interfaces;
|
using LightlessSyncServer.Services.Interfaces;
|
||||||
|
|
||||||
namespace LightlessSyncServer.Hubs;
|
namespace LightlessSyncServer.Hubs;
|
||||||
@@ -220,8 +218,6 @@ 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));
|
||||||
|
|||||||
@@ -2,19 +2,15 @@
|
|||||||
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, IRedisDatabase redis) : IPruneService
|
public class PruneService(LightlessDbContext dbContext) : 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)
|
||||||
@@ -24,14 +20,17 @@ namespace LightlessSyncServer.Services
|
|||||||
var inactivitySpan = GetInactivitySpan(days);
|
var inactivitySpan = GetInactivitySpan(days);
|
||||||
var now = DateTime.UtcNow;
|
var now = DateTime.UtcNow;
|
||||||
|
|
||||||
var usersToPrune = GetPruneUserList(allGroupUsers, onlineUids, inactivitySpan, now);
|
var usersToPrune = allGroupUsers.Where(p =>
|
||||||
return usersToPrune.Count;
|
!p.IsPinned &&
|
||||||
|
!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)
|
||||||
@@ -41,7 +40,12 @@ namespace LightlessSyncServer.Services
|
|||||||
var inactivitySpan = GetInactivitySpan(days);
|
var inactivitySpan = GetInactivitySpan(days);
|
||||||
var now = DateTime.UtcNow;
|
var now = DateTime.UtcNow;
|
||||||
|
|
||||||
var usersToPrune = GetPruneUserList(allGroupUsers, onlineUids, inactivitySpan, now);
|
var usersToPrune = allGroupUsers.Where(p =>
|
||||||
|
!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);
|
||||||
@@ -49,52 +53,8 @@ namespace LightlessSyncServer.Services
|
|||||||
return usersToPrune;
|
return usersToPrune;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static List<GroupPair> GetPruneUserList(
|
private static TimeSpan GetInactivitySpan(int days) => days == 0
|
||||||
List<GroupPair> allGroupUsers,
|
? TimeSpan.FromMinutes(15)
|
||||||
HashSet<string> onlineUids,
|
: TimeSpan.FromDays(days);
|
||||||
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,7 +118,6 @@ public static class Extensions
|
|||||||
permissions.SetPreferDisableSounds(group.PreferDisableSounds);
|
permissions.SetPreferDisableSounds(group.PreferDisableSounds);
|
||||||
permissions.SetPreferDisableVFX(group.PreferDisableVFX);
|
permissions.SetPreferDisableVFX(group.PreferDisableVFX);
|
||||||
permissions.SetDisableInvites(!group.InvitesEnabled);
|
permissions.SetDisableInvites(!group.InvitesEnabled);
|
||||||
permissions.SetDisableChat(!group.ChatEnabled);
|
|
||||||
return permissions;
|
return permissions;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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)
|
.Where(g => g.AutoPruneEnabled && g.AutoPruneDays > 0)
|
||||||
.ToListAsync(stoppingToken).ConfigureAwait(false);
|
.ToListAsync(stoppingToken).ConfigureAwait(false);
|
||||||
|
|
||||||
foreach (var group in groups)
|
foreach (var group in groups)
|
||||||
|
|||||||
@@ -80,9 +80,6 @@ public class LightlessDbContext : DbContext
|
|||||||
.WithOne(p => p.Group)
|
.WithOne(p => p.Group)
|
||||||
.HasForeignKey<GroupProfile>(p => p.GroupGID)
|
.HasForeignKey<GroupProfile>(p => p.GroupGID)
|
||||||
.IsRequired(false);
|
.IsRequired(false);
|
||||||
mb.Entity<Group>()
|
|
||||||
.Property(g => g.ChatEnabled)
|
|
||||||
.HasDefaultValue(true);
|
|
||||||
mb.Entity<GroupPair>().ToTable("group_pairs");
|
mb.Entity<GroupPair>().ToTable("group_pairs");
|
||||||
mb.Entity<GroupPair>().HasKey(u => new { u.GroupGID, u.GroupUserUID });
|
mb.Entity<GroupPair>().HasKey(u => new { u.GroupGID, u.GroupUserUID });
|
||||||
mb.Entity<GroupPair>().HasIndex(c => c.GroupUserUID);
|
mb.Entity<GroupPair>().HasIndex(c => c.GroupUserUID);
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,29 +0,0 @@
|
|||||||
using Microsoft.EntityFrameworkCore.Migrations;
|
|
||||||
|
|
||||||
#nullable disable
|
|
||||||
|
|
||||||
namespace LightlessSyncServer.Migrations
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
public partial class ChatReportFixes : Migration
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
protected override void Up(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.DropColumn(
|
|
||||||
name: "sender_token",
|
|
||||||
table: "reported_chat_messages");
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
protected override void Down(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.AddColumn<string>(
|
|
||||||
name: "sender_token",
|
|
||||||
table: "reported_chat_messages",
|
|
||||||
type: "text",
|
|
||||||
nullable: false,
|
|
||||||
defaultValue: "");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,29 +0,0 @@
|
|||||||
using Microsoft.EntityFrameworkCore.Migrations;
|
|
||||||
|
|
||||||
#nullable disable
|
|
||||||
|
|
||||||
namespace LightlessSyncServer.Migrations
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
public partial class DisableChatGroups : Migration
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
protected override void Up(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.AddColumn<bool>(
|
|
||||||
name: "chat_enabled",
|
|
||||||
table: "groups",
|
|
||||||
type: "boolean",
|
|
||||||
nullable: false,
|
|
||||||
defaultValue: true);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
protected override void Down(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.DropColumn(
|
|
||||||
name: "chat_enabled",
|
|
||||||
table: "groups");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -1,30 +0,0 @@
|
|||||||
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,12 +438,6 @@ namespace LightlessSyncServer.Migrations
|
|||||||
.HasColumnType("boolean")
|
.HasColumnType("boolean")
|
||||||
.HasColumnName("auto_prune_enabled");
|
.HasColumnName("auto_prune_enabled");
|
||||||
|
|
||||||
b.Property<bool>("ChatEnabled")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("boolean")
|
|
||||||
.HasDefaultValue(true)
|
|
||||||
.HasColumnName("chat_enabled");
|
|
||||||
|
|
||||||
b.Property<DateTime>("CreatedDate")
|
b.Property<DateTime>("CreatedDate")
|
||||||
.ValueGeneratedOnAdd()
|
.ValueGeneratedOnAdd()
|
||||||
.HasColumnType("timestamp with time zone")
|
.HasColumnType("timestamp with time zone")
|
||||||
@@ -782,6 +776,11 @@ namespace LightlessSyncServer.Migrations
|
|||||||
.HasColumnType("text")
|
.HasColumnType("text")
|
||||||
.HasColumnName("sender_hashed_cid");
|
.HasColumnName("sender_hashed_cid");
|
||||||
|
|
||||||
|
b.Property<string>("SenderToken")
|
||||||
|
.IsRequired()
|
||||||
|
.HasColumnType("text")
|
||||||
|
.HasColumnName("sender_token");
|
||||||
|
|
||||||
b.Property<bool>("SenderWasLightfinder")
|
b.Property<bool>("SenderWasLightfinder")
|
||||||
.HasColumnType("boolean")
|
.HasColumnType("boolean")
|
||||||
.HasColumnName("sender_was_lightfinder");
|
.HasColumnName("sender_was_lightfinder");
|
||||||
@@ -941,10 +940,6 @@ 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,6 +19,5 @@ public class Group
|
|||||||
public bool PreferDisableSounds { get; set; }
|
public bool PreferDisableSounds { get; set; }
|
||||||
public bool PreferDisableAnimations { get; set; }
|
public bool PreferDisableAnimations { get; set; }
|
||||||
public bool PreferDisableVFX { get; set; }
|
public bool PreferDisableVFX { get; set; }
|
||||||
public bool ChatEnabled { get; set; } = true;
|
|
||||||
public DateTime CreatedDate { get; set; } = DateTime.UtcNow;
|
public DateTime CreatedDate { get; set; } = DateTime.UtcNow;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,5 +15,4 @@ public class UserPermissionSet
|
|||||||
public bool DisableAnimations { get; set; } = false;
|
public bool DisableAnimations { get; set; } = false;
|
||||||
public bool DisableVFX { get; set; } = false;
|
public bool DisableVFX { get; set; } = false;
|
||||||
public bool DisableSounds { get; set; } = false;
|
public bool DisableSounds { get; set; } = false;
|
||||||
public DateTimeOffset ShareLocationUntil { get; set; } = DateTimeOffset.MinValue;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -102,37 +102,36 @@ 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);
|
||||||
|
}
|
||||||
|
|
||||||
File.SetLastAccessTimeUtc(coldStorageFilePath.FullName, DateTime.UtcNow);
|
return false;
|
||||||
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)
|
||||||
{
|
{
|
||||||
@@ -171,22 +170,15 @@ 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;
|
||||||
|
|
||||||
try
|
fi.LastAccessTimeUtc = DateTime.UtcNow;
|
||||||
{
|
|
||||||
File.SetLastAccessTimeUtc(fi.FullName, DateTime.UtcNow);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
_logger.LogWarning(ex, "Failed to update LastAccessTimeUtc for file {hash}", hash);
|
|
||||||
}
|
|
||||||
|
|
||||||
_fileStatisticsService.LogFile(hash, fi.Length);
|
_fileStatisticsService.LogFile(hash, fi.Length);
|
||||||
|
|
||||||
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