Compare commits
1 Commits
group-ban-
...
discord-bo
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8c1af6f31c |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -351,6 +351,3 @@ MigrationBackup/
|
||||
|
||||
# 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
|
||||
.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, DateTimeOffset expireAt) => throw new PlatformNotSupportedException("Calling clientside method on server not supported");
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
@@ -28,78 +29,29 @@ public partial class LightlessHub
|
||||
var (userHasRights, group) = await TryValidateGroupModeratorOrOwner(dto.Group.GID).ConfigureAwait(false);
|
||||
if (!userHasRights) return;
|
||||
|
||||
var targetUid = dto.User.UID?.Trim();
|
||||
if (string.IsNullOrWhiteSpace(targetUid)) return;
|
||||
var (userExists, groupPair) = await TryValidateUserInGroup(dto.Group.GID, dto.User.UID).ConfigureAwait(false);
|
||||
if (!userExists) return;
|
||||
|
||||
if (string.Equals(group.OwnerUID, targetUid, StringComparison.Ordinal))
|
||||
return;
|
||||
if (groupPair.IsModerator || string.Equals(group.OwnerUID, dto.User.UID, StringComparison.Ordinal)) return;
|
||||
|
||||
var groupPair = await DbContext.GroupPairs
|
||||
.Include(p => p.GroupUser)
|
||||
.SingleOrDefaultAsync(p => p.GroupGID == dto.Group.GID && p.GroupUserUID == targetUid, cancellationToken: RequestAbortedToken).ConfigureAwait(false);
|
||||
|
||||
if (groupPair?.IsModerator == true)
|
||||
return;
|
||||
|
||||
var now = DateTime.UtcNow;
|
||||
|
||||
var existingBan = await DbContext.Set<GroupBan>().SingleOrDefaultAsync(b => b.GroupGID == dto.Group.GID && b.BannedUserUID == targetUid, cancellationToken: RequestAbortedToken).ConfigureAwait(false);
|
||||
var userExists = await DbContext.Users.AsNoTracking().AnyAsync(u => u.UID == targetUid || u.Alias == targetUid, RequestAbortedToken).ConfigureAwait(false);
|
||||
|
||||
if (!userExists && existingBan == null)
|
||||
return;
|
||||
|
||||
const string marker = " (Alias at time of ban:";
|
||||
string suffix;
|
||||
|
||||
if (existingBan?.BannedReason is { } existingReason)
|
||||
{
|
||||
var idx = existingReason.IndexOf(marker, StringComparison.Ordinal);
|
||||
suffix = idx >= 0 ? existingReason.Substring(startIndex: idx) : string.Empty;
|
||||
}
|
||||
else
|
||||
{
|
||||
var alias = groupPair?.GroupUser?.Alias;
|
||||
alias = string.IsNullOrWhiteSpace(alias) ? "-" : alias;
|
||||
suffix = $" (Alias at time of ban: {alias})";
|
||||
}
|
||||
|
||||
var baseReason = (reason ?? string.Empty).Trim();
|
||||
var finalReason = string.IsNullOrEmpty(suffix) ? baseReason : (baseReason + suffix);
|
||||
|
||||
if (existingBan != null)
|
||||
{
|
||||
existingBan.BannedByUID = UserUID;
|
||||
existingBan.BannedReason = finalReason;
|
||||
|
||||
DbContext.Update(existingBan);
|
||||
}
|
||||
else
|
||||
{
|
||||
var ban = new GroupBan
|
||||
var alias = string.IsNullOrEmpty(groupPair.GroupUser.Alias) ? "-" : groupPair.GroupUser.Alias;
|
||||
var ban = new GroupBan()
|
||||
{
|
||||
BannedByUID = UserUID,
|
||||
BannedReason = finalReason,
|
||||
BannedOn = now,
|
||||
BannedUserUID = targetUid,
|
||||
BannedReason = $"{reason} (Alias at time of ban: {alias})",
|
||||
BannedOn = DateTime.UtcNow,
|
||||
BannedUserUID = dto.User.UID,
|
||||
GroupGID = dto.Group.GID,
|
||||
};
|
||||
|
||||
DbContext.Add(ban);
|
||||
}
|
||||
await DbContext.SaveChangesAsync().ConfigureAwait(false);
|
||||
|
||||
await DbContext.SaveChangesAsync(RequestAbortedToken).ConfigureAwait(false);
|
||||
|
||||
if (groupPair != null)
|
||||
{
|
||||
await GroupRemoveUser(dto).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
_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)
|
||||
{
|
||||
@@ -108,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")]
|
||||
@@ -341,7 +235,6 @@ public partial class LightlessHub
|
||||
PreferDisableAnimations = defaultPermissions.DisableGroupAnimations,
|
||||
PreferDisableSounds = defaultPermissions.DisableGroupSounds,
|
||||
PreferDisableVFX = defaultPermissions.DisableGroupVFX,
|
||||
ChatEnabled = true,
|
||||
CreatedDate = currentTime,
|
||||
};
|
||||
|
||||
@@ -447,9 +340,9 @@ public partial class LightlessHub
|
||||
|
||||
var banEntries = await DbContext.GroupBans.Include(b => b.BannedUser).Where(g => g.GroupGID == dto.Group.GID).AsNoTracking().ToListAsync(cancellationToken: RequestAbortedToken).ConfigureAwait(false);
|
||||
|
||||
List<BannedGroupUserDto> bannedGroupUsers = [.. banEntries.Select(b =>
|
||||
List<BannedGroupUserDto> bannedGroupUsers = banEntries.Select(b =>
|
||||
new BannedGroupUserDto(group.ToGroupData(), b.BannedUser.ToUserData(), b.BannedReason, b.BannedOn,
|
||||
b.BannedByUID))];
|
||||
b.BannedByUID)).ToList();
|
||||
|
||||
_logger.LogCallInfo(LightlessHubLogger.Args(dto, bannedGroupUsers.Count));
|
||||
|
||||
@@ -971,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);
|
||||
}
|
||||
|
||||
|
||||
@@ -12,6 +12,8 @@ using LightlessSyncShared.Utils;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.SignalR;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using SixLabors.ImageSharp;
|
||||
using SixLabors.ImageSharp.PixelFormats;
|
||||
using StackExchange.Redis;
|
||||
using System.Text;
|
||||
using System.Text.Json;
|
||||
@@ -1169,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
|
||||
@@ -1231,120 +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 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)]
|
||||
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;
|
||||
@@ -220,8 +218,6 @@ public partial class LightlessHub : Hub<ILightlessHub>, ILightlessHub
|
||||
|
||||
_lightlessCensus.ClearStatistics(UserUID);
|
||||
|
||||
await UpdateLocation(new LocationDto(new UserData(UserUID), new LocationInfo()), offline: true).ConfigureAwait(false);
|
||||
|
||||
await SendOfflineToAllPairedUsers().ConfigureAwait(false);
|
||||
|
||||
DbContext.RemoveRange(DbContext.Files.Where(f => !f.Uploaded && f.UploaderUID == UserUID));
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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");
|
||||
}
|
||||
}
|
||||
}
|
||||
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")
|
||||
.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");
|
||||
@@ -941,10 +940,6 @@ namespace LightlessSyncServer.Migrations
|
||||
.HasColumnType("boolean")
|
||||
.HasColumnName("is_paused");
|
||||
|
||||
b.Property<DateTimeOffset>("ShareLocationUntil")
|
||||
.HasColumnType("timestamp with time zone")
|
||||
.HasColumnName("share_location_until");
|
||||
|
||||
b.Property<bool>("Sticky")
|
||||
.HasColumnType("boolean")
|
||||
.HasColumnName("sticky");
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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 DateTimeOffset ShareLocationUntil { get; set; } = DateTimeOffset.MinValue;
|
||||
}
|
||||
|
||||
@@ -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