Compare commits
1 Commits
9971b14177
...
discord-bo
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8c1af6f31c |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -351,4 +351,3 @@ MigrationBackup/
|
||||
|
||||
# docker run data
|
||||
Docker/run/data/
|
||||
*.idea
|
||||
|
||||
Submodule LightlessAPI updated: 9feb0b3c35...35f3390dda
@@ -41,10 +41,8 @@ public partial class LightlessHub
|
||||
|
||||
var groupInfos = await DbContext.Groups
|
||||
.AsNoTracking()
|
||||
.Where(g => g.ChatEnabled
|
||||
&& (g.OwnerUID == userUid
|
||||
.Where(g => g.OwnerUID == userUid
|
||||
|| DbContext.GroupPairs.Any(p => p.GroupGID == g.GID && p.GroupUserUID == userUid))
|
||||
)
|
||||
.ToListAsync()
|
||||
.ConfigureAwait(false);
|
||||
|
||||
@@ -164,13 +162,6 @@ public partial class LightlessHub
|
||||
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)
|
||||
|| await DbContext.GroupPairs
|
||||
.AsNoTracking()
|
||||
@@ -216,23 +207,6 @@ public partial class LightlessHub
|
||||
|
||||
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))
|
||||
{
|
||||
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_GposeLobbyPushWorldData(UserData userData, WorldData worldData) => throw new PlatformNotSupportedException("Calling clientside method on server not supported");
|
||||
public Task Client_ChatReceive(ChatMessageDto message) => throw new PlatformNotSupportedException("Calling clientside method on server not supported");
|
||||
public Task Client_SendLocationToClient(LocationDto locationDto) => throw new PlatformNotSupportedException("Calling clientside method on server not supported");
|
||||
}
|
||||
}
|
||||
@@ -586,11 +586,6 @@ public partial class LightlessHub
|
||||
return await result.Distinct().AsNoTracking().ToListAsync().ConfigureAwait(false);
|
||||
}
|
||||
|
||||
private async Task CleanVisibilityCacheFromRedis()
|
||||
{
|
||||
await _redis.RemoveAsync($"Visibility:{UserUID}", CommandFlags.FireAndForget).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
public record UserInfo(
|
||||
string Alias,
|
||||
bool IndividuallyPaired,
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
using LightlessSync.API.Data;
|
||||
using LightlessSync.API.Data.Enum;
|
||||
using LightlessSync.API.Data.Extensions;
|
||||
using LightlessSync.API.Dto.Chat;
|
||||
using LightlessSync.API.Dto.Group;
|
||||
using LightlessSync.API.Dto.User;
|
||||
using LightlessSyncServer.Models;
|
||||
@@ -12,8 +11,10 @@ using LightlessSyncShared.Utils;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.SignalR;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using SixLabors.ImageSharp;
|
||||
using System.Collections.Concurrent;
|
||||
using SixLabors.ImageSharp.PixelFormats;
|
||||
using System.Reflection;
|
||||
using System.Security.Cryptography;
|
||||
|
||||
namespace LightlessSyncServer.Hubs;
|
||||
@@ -51,8 +52,6 @@ public partial class LightlessHub
|
||||
_logger.LogCallInfo(LightlessHubLogger.Args(dto, "Success"));
|
||||
}
|
||||
|
||||
private static readonly ConcurrentDictionary<string, DateTime> GroupChatToggleCooldowns = new(StringComparer.Ordinal);
|
||||
|
||||
[Authorize(Policy = "Identified")]
|
||||
public async Task GroupChangeGroupPermissionState(GroupPermissionDto dto)
|
||||
{
|
||||
@@ -61,73 +60,15 @@ public partial class LightlessHub
|
||||
var (hasRights, group) = await TryValidateGroupModeratorOrOwner(dto.Group.GID).ConfigureAwait(false);
|
||||
if (!hasRights) return;
|
||||
|
||||
var permissions = dto.Permissions;
|
||||
var isOwner = string.Equals(group.OwnerUID, UserUID, StringComparison.Ordinal);
|
||||
var chatEnabled = group.ChatEnabled;
|
||||
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);
|
||||
group.InvitesEnabled = !dto.Permissions.HasFlag(GroupPermissions.DisableInvites);
|
||||
group.PreferDisableSounds = dto.Permissions.HasFlag(GroupPermissions.PreferDisableSounds);
|
||||
group.PreferDisableAnimations = dto.Permissions.HasFlag(GroupPermissions.PreferDisableAnimations);
|
||||
group.PreferDisableVFX = dto.Permissions.HasFlag(GroupPermissions.PreferDisableVFX);
|
||||
|
||||
await DbContext.SaveChangesAsync(RequestAbortedToken).ConfigureAwait(false);
|
||||
|
||||
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);
|
||||
|
||||
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);
|
||||
}
|
||||
await Clients.Users(groupPairs).Client_GroupChangePermissions(new GroupPermissionDto(dto.Group, dto.Permissions)).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
[Authorize(Policy = "Identified")]
|
||||
@@ -294,7 +235,6 @@ public partial class LightlessHub
|
||||
PreferDisableAnimations = defaultPermissions.DisableGroupAnimations,
|
||||
PreferDisableSounds = defaultPermissions.DisableGroupSounds,
|
||||
PreferDisableVFX = defaultPermissions.DisableGroupVFX,
|
||||
ChatEnabled = true,
|
||||
CreatedDate = currentTime,
|
||||
};
|
||||
|
||||
@@ -504,7 +444,6 @@ public partial class LightlessHub
|
||||
preferredPermissions.DisableVFX = dto.GroupUserPreferredPermissions.IsDisableVFX();
|
||||
preferredPermissions.DisableAnimations = dto.GroupUserPreferredPermissions.IsDisableAnimations();
|
||||
preferredPermissions.IsPaused = false;
|
||||
preferredPermissions.ShareLocation = dto.GroupUserPreferredPermissions.IsSharingLocation();
|
||||
DbContext.Update(preferredPermissions);
|
||||
}
|
||||
|
||||
@@ -550,8 +489,7 @@ public partial class LightlessHub
|
||||
DisableSounds = preferredPermissions.DisableSounds,
|
||||
DisableVFX = preferredPermissions.DisableVFX,
|
||||
IsPaused = preferredPermissions.IsPaused,
|
||||
Sticky = false,
|
||||
ShareLocation = preferredPermissions.ShareLocation,
|
||||
Sticky = false
|
||||
};
|
||||
|
||||
await DbContext.Permissions.AddAsync(ownPermissionsToOther).ConfigureAwait(false);
|
||||
@@ -563,7 +501,6 @@ public partial class LightlessHub
|
||||
existingPermissionsOnDb.DisableVFX = preferredPermissions.DisableVFX;
|
||||
existingPermissionsOnDb.IsPaused = false;
|
||||
existingPermissionsOnDb.Sticky = false;
|
||||
existingPermissionsOnDb.ShareLocation = preferredPermissions.ShareLocation;
|
||||
|
||||
DbContext.Update(existingPermissionsOnDb);
|
||||
|
||||
@@ -579,7 +516,6 @@ public partial class LightlessHub
|
||||
ownPermissionsToOther.DisableVFX = preferredPermissions.DisableVFX;
|
||||
ownPermissionsToOther.DisableSounds = preferredPermissions.DisableSounds;
|
||||
ownPermissionsToOther.IsPaused = false;
|
||||
ownPermissionsToOther.ShareLocation = preferredPermissions.ShareLocation;
|
||||
|
||||
DbContext.Update(ownPermissionsToOther);
|
||||
}
|
||||
@@ -601,8 +537,7 @@ public partial class LightlessHub
|
||||
DisableSounds = otherPreferred.DisableSounds,
|
||||
DisableVFX = otherPreferred.DisableVFX,
|
||||
IsPaused = otherPreferred.IsPaused,
|
||||
Sticky = false,
|
||||
ShareLocation = otherPreferred.ShareLocation,
|
||||
Sticky = false
|
||||
};
|
||||
|
||||
await DbContext.AddAsync(otherExistingPermsOnDb).ConfigureAwait(false);
|
||||
@@ -614,7 +549,6 @@ public partial class LightlessHub
|
||||
otherExistingPermsOnDb.DisableSounds = otherPreferred.DisableSounds;
|
||||
otherExistingPermsOnDb.DisableVFX = otherPreferred.DisableVFX;
|
||||
otherExistingPermsOnDb.IsPaused = otherPreferred.IsPaused;
|
||||
otherExistingPermsOnDb.ShareLocation = otherPreferred.ShareLocation;
|
||||
|
||||
DbContext.Update(otherExistingPermsOnDb);
|
||||
}
|
||||
@@ -628,7 +562,6 @@ public partial class LightlessHub
|
||||
otherPermissionToSelf.DisableSounds = otherPreferred.DisableSounds;
|
||||
otherPermissionToSelf.DisableVFX = otherPreferred.DisableVFX;
|
||||
otherPermissionToSelf.IsPaused = otherPreferred.IsPaused;
|
||||
otherPermissionToSelf.ShareLocation = otherPreferred.ShareLocation;
|
||||
|
||||
DbContext.Update(otherPermissionToSelf);
|
||||
}
|
||||
@@ -931,6 +864,12 @@ public partial class LightlessHub
|
||||
{
|
||||
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);
|
||||
}
|
||||
|
||||
|
||||
@@ -66,7 +66,6 @@ public partial class LightlessHub
|
||||
prevPermissions.DisableSounds = newPerm.IsDisableSounds();
|
||||
prevPermissions.DisableVFX = newPerm.IsDisableVFX();
|
||||
prevPermissions.Sticky = newPerm.IsSticky() || setSticky;
|
||||
prevPermissions.ShareLocation = newPerm.IsSharingLocation();
|
||||
DbContext.Update(prevPermissions);
|
||||
|
||||
// send updated data to pair
|
||||
@@ -113,7 +112,6 @@ public partial class LightlessHub
|
||||
groupPreferredPermissions.DisableAnimations = group.Value.IsDisableAnimations();
|
||||
groupPreferredPermissions.IsPaused = group.Value.IsPaused();
|
||||
groupPreferredPermissions.DisableVFX = group.Value.IsDisableVFX();
|
||||
groupPreferredPermissions.ShareLocation = group.Value.IsSharingLocation();
|
||||
|
||||
var nonStickyPairs = allUsers.Where(u => !u.Value.OwnPermissions.Sticky).ToList();
|
||||
var affectedGroupPairs = nonStickyPairs.Where(u => u.Value.GIDs.Contains(group.Key, StringComparer.Ordinal)).ToList();
|
||||
@@ -128,7 +126,6 @@ public partial class LightlessHub
|
||||
perm.DisableAnimations = groupPreferredPermissions.DisableAnimations;
|
||||
perm.IsPaused = groupPreferredPermissions.IsPaused;
|
||||
perm.DisableVFX = groupPreferredPermissions.DisableVFX;
|
||||
perm.ShareLocation = groupPreferredPermissions.ShareLocation;
|
||||
}
|
||||
|
||||
UserPermissions permissions = UserPermissions.NoneSet;
|
||||
@@ -136,7 +133,6 @@ public partial class LightlessHub
|
||||
permissions.SetDisableAnimations(groupPreferredPermissions.DisableAnimations);
|
||||
permissions.SetDisableSounds(groupPreferredPermissions.DisableSounds);
|
||||
permissions.SetDisableVFX(groupPreferredPermissions.DisableVFX);
|
||||
permissions.SetShareLocation(groupPreferredPermissions.ShareLocation);
|
||||
|
||||
await Clients.Users(affectedGroupPairs
|
||||
.Select(k => k.Key))
|
||||
|
||||
@@ -86,8 +86,7 @@ public partial class LightlessHub
|
||||
DisableSounds = ownDefaultPermissions.DisableIndividualSounds,
|
||||
DisableVFX = ownDefaultPermissions.DisableIndividualVFX,
|
||||
IsPaused = false,
|
||||
Sticky = true,
|
||||
ShareLocation = false,
|
||||
Sticky = true
|
||||
};
|
||||
|
||||
var existingDbPerms = await DbContext.Permissions.SingleOrDefaultAsync(u => u.UserUID == UserUID && u.OtherUserUID == otherUser.UID, cancellationToken: RequestAbortedToken).ConfigureAwait(false);
|
||||
@@ -102,7 +101,6 @@ public partial class LightlessHub
|
||||
existingDbPerms.DisableVFX = permissions.DisableVFX;
|
||||
existingDbPerms.IsPaused = false;
|
||||
existingDbPerms.Sticky = true;
|
||||
existingDbPerms.ShareLocation = permissions.ShareLocation;
|
||||
|
||||
DbContext.Permissions.Update(existingDbPerms);
|
||||
}
|
||||
@@ -1173,6 +1171,12 @@ public partial class LightlessHub
|
||||
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);
|
||||
}
|
||||
else
|
||||
@@ -1235,84 +1239,6 @@ public partial class LightlessHub
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
[Authorize(Policy = "Identified")]
|
||||
public async Task UpdateLocation(LocationDto dto, bool offline = false)
|
||||
{
|
||||
_logger.LogCallInfo(LightlessHubLogger.Args(UserUID,dto));
|
||||
if (string.IsNullOrEmpty(dto.user.UID))
|
||||
{
|
||||
_logger.LogCallWarning(LightlessHubLogger.Args("LocationDto with no userinfo :",UserUID, dto));
|
||||
return;
|
||||
}
|
||||
|
||||
if (!string.Equals(UserUID, dto.user.UID, StringComparison.Ordinal))
|
||||
{
|
||||
_logger.LogCallWarning(LightlessHubLogger.Args("LocationDto with another UID :",UserUID, dto));
|
||||
return;
|
||||
}
|
||||
|
||||
var visibilityCacheKey = $"Visibility:{UserUID}";
|
||||
|
||||
var allUsers = await _redis.GetAsync<List<string>>(visibilityCacheKey).ConfigureAwait(false);
|
||||
if (allUsers == null)
|
||||
{
|
||||
var permissibleGroupGIDsQuery = DbContext.GroupPairPreferredPermissions.AsNoTracking()
|
||||
.Where(gpp => gpp.UserUID == dto.user.UID && !gpp.IsPaused && gpp.ShareLocation == true)
|
||||
.Select(gpp => gpp.GroupGID);
|
||||
|
||||
var groupUserUIDsQuery = DbContext.GroupPairs.AsNoTracking()
|
||||
.Where(gp => permissibleGroupGIDsQuery.Contains(gp.GroupGID))
|
||||
.Select(gp => gp.GroupUserUID);
|
||||
|
||||
var directlySharedUserUIDsQuery = DbContext.Permissions.AsNoTracking()
|
||||
.Where(p => p.UserUID == dto.user.UID && !p.IsPaused && p.ShareLocation == true)
|
||||
.Select(p => p.OtherUserUID);
|
||||
|
||||
allUsers = await directlySharedUserUIDsQuery
|
||||
.Union(groupUserUIDsQuery)
|
||||
.Distinct()
|
||||
.ToListAsync().ConfigureAwait(false);
|
||||
|
||||
await _redis.AddAsync(
|
||||
visibilityCacheKey,
|
||||
allUsers,
|
||||
TimeSpan.FromMinutes(30),
|
||||
StackExchange.Redis.When.Always,
|
||||
StackExchange.Redis.CommandFlags.FireAndForget
|
||||
).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
var key = $"Location:{UserUID}";
|
||||
|
||||
if (offline)
|
||||
{
|
||||
await _redis.RemoveAsync(key, StackExchange.Redis.CommandFlags.FireAndForget).ConfigureAwait(false);
|
||||
await Clients.Users(allUsers).Client_SendLocationToClient(dto).ConfigureAwait(false);
|
||||
}
|
||||
else
|
||||
{
|
||||
var currentLocation = await _redis.GetAsync<LocationDto>(key).ConfigureAwait(false);
|
||||
|
||||
await _redis.AddAsync(key, dto).ConfigureAwait(false);
|
||||
if (allUsers.Count != 0 && currentLocation != dto)
|
||||
{
|
||||
await Clients.Users(allUsers).Client_SendLocationToClient(dto).ConfigureAwait(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[Authorize(Policy = "Identified")]
|
||||
public async Task<List<LocationDto>> RequestAllLocationInfo()
|
||||
{
|
||||
_logger.LogCallInfo();
|
||||
var uids = DbContext.Permissions.AsNoTracking().Where(x => x.OtherUserUID == UserUID && x.ShareLocation == true)
|
||||
.Select(x => x.UserUID).ToList();
|
||||
var data =await _redis.GetAllAsync<LocationDto>(uids.Select(x => $"Location:{x}").ToHashSet(StringComparer.Ordinal))
|
||||
.ConfigureAwait(false);
|
||||
return data.Where(x => x.Value is not null).Select(x => x.Value).ToList();
|
||||
}
|
||||
|
||||
[GeneratedRegex(@"^([a-z0-9_ '+&,\.\-\{\}]+\/)+([a-z0-9_ '+&,\.\-\{\}]+\.[a-z]{3,4})$", RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.ECMAScript)]
|
||||
private static partial Regex GamePathRegex();
|
||||
|
||||
|
||||
@@ -16,8 +16,6 @@ using Microsoft.AspNetCore.SignalR;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using StackExchange.Redis.Extensions.Core.Abstractions;
|
||||
using System.Collections.Concurrent;
|
||||
using LightlessSync.API.Dto.CharaData;
|
||||
using LightlessSync.API.Dto.User;
|
||||
using LightlessSyncServer.Services.Interfaces;
|
||||
|
||||
namespace LightlessSyncServer.Hubs;
|
||||
@@ -222,9 +220,6 @@ public partial class LightlessHub : Hub<ILightlessHub>, ILightlessHub
|
||||
|
||||
await SendOfflineToAllPairedUsers().ConfigureAwait(false);
|
||||
|
||||
await UpdateLocation(new LocationDto(new UserData(UserUID), new LocationInfo()), offline: true).ConfigureAwait(false);
|
||||
await CleanVisibilityCacheFromRedis().ConfigureAwait(false);
|
||||
|
||||
DbContext.RemoveRange(DbContext.Files.Where(f => !f.Uploaded && f.UploaderUID == UserUID));
|
||||
await DbContext.SaveChangesAsync().ConfigureAwait(false);
|
||||
|
||||
|
||||
@@ -67,7 +67,6 @@ public class PairService
|
||||
DisableVFX = defaultPerms.DisableIndividualVFX,
|
||||
IsPaused = false,
|
||||
Sticky = true,
|
||||
ShareLocation = false,
|
||||
});
|
||||
modified = true;
|
||||
}
|
||||
@@ -89,7 +88,6 @@ public class PairService
|
||||
DisableVFX = defaultPerms.DisableIndividualVFX,
|
||||
IsPaused = false,
|
||||
Sticky = true,
|
||||
ShareLocation = false,
|
||||
});
|
||||
modified = true;
|
||||
}
|
||||
|
||||
@@ -118,7 +118,6 @@ public static class Extensions
|
||||
permissions.SetPreferDisableSounds(group.PreferDisableSounds);
|
||||
permissions.SetPreferDisableVFX(group.PreferDisableVFX);
|
||||
permissions.SetDisableInvites(!group.InvitesEnabled);
|
||||
permissions.SetDisableChat(!group.ChatEnabled);
|
||||
return permissions;
|
||||
}
|
||||
|
||||
@@ -129,7 +128,6 @@ public static class Extensions
|
||||
permissions.SetDisableSounds(groupPair.DisableSounds);
|
||||
permissions.SetPaused(groupPair.IsPaused);
|
||||
permissions.SetDisableVFX(groupPair.DisableVFX);
|
||||
permissions.SetShareLocation(groupPair.ShareLocation);
|
||||
return permissions;
|
||||
}
|
||||
|
||||
@@ -150,7 +148,6 @@ public static class Extensions
|
||||
perm.SetDisableAnimations(permissions.DisableAnimations);
|
||||
perm.SetDisableSounds(permissions.DisableSounds);
|
||||
perm.SetDisableVFX(permissions.DisableVFX);
|
||||
perm.SetShareLocation(permissions.ShareLocation);
|
||||
if (setSticky)
|
||||
perm.SetSticky(permissions.Sticky);
|
||||
return perm;
|
||||
|
||||
@@ -80,9 +80,6 @@ public class LightlessDbContext : DbContext
|
||||
.WithOne(p => p.Group)
|
||||
.HasForeignKey<GroupProfile>(p => p.GroupGID)
|
||||
.IsRequired(false);
|
||||
mb.Entity<Group>()
|
||||
.Property(g => g.ChatEnabled)
|
||||
.HasDefaultValue(true);
|
||||
mb.Entity<GroupPair>().ToTable("group_pairs");
|
||||
mb.Entity<GroupPair>().HasKey(u => new { u.GroupGID, u.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");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -438,12 +438,6 @@ namespace LightlessSyncServer.Migrations
|
||||
.HasColumnType("boolean")
|
||||
.HasColumnName("auto_prune_enabled");
|
||||
|
||||
b.Property<bool>("ChatEnabled")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("boolean")
|
||||
.HasDefaultValue(true)
|
||||
.HasColumnName("chat_enabled");
|
||||
|
||||
b.Property<DateTime>("CreatedDate")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("timestamp with time zone")
|
||||
@@ -782,6 +776,11 @@ namespace LightlessSyncServer.Migrations
|
||||
.HasColumnType("text")
|
||||
.HasColumnName("sender_hashed_cid");
|
||||
|
||||
b.Property<string>("SenderToken")
|
||||
.IsRequired()
|
||||
.HasColumnType("text")
|
||||
.HasColumnName("sender_token");
|
||||
|
||||
b.Property<bool>("SenderWasLightfinder")
|
||||
.HasColumnType("boolean")
|
||||
.HasColumnName("sender_was_lightfinder");
|
||||
|
||||
@@ -19,6 +19,5 @@ public class Group
|
||||
public bool PreferDisableSounds { get; set; }
|
||||
public bool PreferDisableAnimations { get; set; }
|
||||
public bool PreferDisableVFX { get; set; }
|
||||
public bool ChatEnabled { get; set; } = true;
|
||||
public DateTime CreatedDate { get; set; } = DateTime.UtcNow;
|
||||
}
|
||||
|
||||
@@ -10,5 +10,4 @@ public class GroupPairPreferredPermission
|
||||
public bool DisableAnimations { get; set; }
|
||||
public bool DisableSounds { get; set; }
|
||||
public bool DisableVFX { get; set; }
|
||||
public bool ShareLocation { get; set; }
|
||||
}
|
||||
|
||||
@@ -15,5 +15,4 @@ public class UserPermissionSet
|
||||
public bool DisableAnimations { get; set; } = false;
|
||||
public bool DisableVFX { get; set; } = false;
|
||||
public bool DisableSounds { get; set; } = false;
|
||||
public bool ShareLocation { get; set; } = false;
|
||||
}
|
||||
|
||||
@@ -116,12 +116,11 @@ public sealed class CachedFileProvider : IDisposable
|
||||
var tempFileName = destinationFilePath + ".dl";
|
||||
File.Copy(coldStorageFilePath.FullName, tempFileName, true);
|
||||
File.Move(tempFileName, destinationFilePath, true);
|
||||
|
||||
File.SetLastAccessTimeUtc(coldStorageFilePath.FullName, DateTime.UtcNow);
|
||||
File.SetLastAccessTimeUtc(destinationFilePath, DateTime.UtcNow);
|
||||
File.SetCreationTimeUtc(destinationFilePath, DateTime.UtcNow);
|
||||
File.SetLastWriteTimeUtc(destinationFilePath, DateTime.UtcNow);
|
||||
|
||||
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;
|
||||
@@ -174,14 +173,7 @@ public sealed class CachedFileProvider : IDisposable
|
||||
var fi = FilePathUtil.GetFileInfoForHash(_hotStoragePath, hash);
|
||||
if (fi == null) return null;
|
||||
|
||||
try
|
||||
{
|
||||
File.SetLastAccessTimeUtc(fi.FullName, DateTime.UtcNow);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogWarning(ex, "Failed to update LastAccessTimeUtc for file {hash}", hash);
|
||||
}
|
||||
fi.LastAccessTimeUtc = DateTime.UtcNow;
|
||||
|
||||
_fileStatisticsService.LogFile(hash, fi.Length);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user