Compare commits

...

27 Commits

Author SHA1 Message Date
6216664e18 Merge branch 'master' into cache-test-fix 2025-12-23 17:12:45 +00:00
54992234d5 Merge pull request 'disable-chat-groups' (#45) from disable-chat-groups into master
Reviewed-on: #45
2025-12-23 16:55:33 +00:00
90e81fb955 Merge branch 'master' into disable-chat-groups 2025-12-23 16:55:21 +00:00
defnotken
4012b33f98 Trying a different method of setting access time. 2025-12-23 10:36:38 -06:00
33fb6ba2eb Merge pull request 'Done same for user' (#47) from fix-profile-hide into master
Reviewed-on: #47
2025-12-22 20:31:36 +00:00
cake
d1526fa49e Done same for user 2025-12-22 21:20:32 +01:00
5b5f8edc3b Merge pull request 'Removed code that would prevent changes on disabled profile.' (#46) from fix-profile-hide into master
Reviewed-on: #46
Reviewed-by: defnotken <defnotken@noreply.git.lightless-sync.org>
2025-12-22 14:53:52 +00:00
cake
8515364ffd Removed code that would prevent changes on disabled profile. 2025-12-22 15:46:52 +01:00
defnotken
4ec6169ebd fix context 2025-12-21 21:02:59 -06:00
defnotken
ec26abaeb5 Revert "Merge pull request 'revert ce9b94a534c1239b4b89c4ccf05354c477da49d9' (#44) from defnotken-patch-1 into master"
This reverts commit 76bdbe28da, reversing
changes made to ce9b94a534.
2025-12-21 21:00:53 -06:00
3350f2ebf6 Merge branch 'master' into disable-chat-groups 2025-12-22 02:57:55 +00:00
defnotken
670e0e01f1 Merge branch 'disable-chat-groups' of https://git.lightless-sync.org/Lightless-Sync/LightlessServer into disable-chat-groups 2025-12-21 20:48:22 -06:00
defnotken
12d51dc689 Generate migration 2025-12-21 20:48:07 -06:00
defnotken
860bc955a4 Generate migration 2025-12-21 20:43:24 -06:00
76bdbe28da Merge pull request 'revert ce9b94a534c1239b4b89c4ccf05354c477da49d9' (#44) from defnotken-patch-1 into master
Reviewed-on: #44
2025-12-22 02:27:14 +00:00
f4753505aa revert ce9b94a534
revert Merge pull request 'add capability to disable chat feature for groups/syncshells' (#43) from disable-chat-groups into master

Reviewed-on: #43
2025-12-22 02:25:40 +00:00
ce9b94a534 Merge pull request 'add capability to disable chat feature for groups/syncshells' (#43) from disable-chat-groups into master
Reviewed-on: #43
2025-12-22 02:18:00 +00:00
Abelfreyja
e58210e770 add capability to disable chat feature for groups/syncshells 2025-12-22 10:24:34 +09:00
6d49389bd4 Merge pull request 'bump-api' (#42) from bump-api into master
Reviewed-on: #42
2025-12-19 15:38:53 +00:00
defnotken
9a964b4933 Merge branch 'bump-api' of https://git.lightless-sync.org/Lightless-Sync/LightlessServer into bump-api 2025-12-19 09:37:49 -06:00
defnotken
2ca0fe0697 bumping tha api 2025-12-19 09:37:15 -06:00
10bcf5dd1f Merge pull request 'migration-fix' (#41) from migration-fix into master
Reviewed-on: #41
2025-12-19 12:04:12 +00:00
defnotken
dda22594f1 db migration add for chat changes 2025-12-19 05:52:52 -06:00
defnotken
802077371b fixed db migration for chat 2025-12-19 05:52:00 -06:00
6321f385da Discord-bot + server updates (#39)
Co-authored-by: defnotken <itsdefnotken@gmail.com>
Reviewed-on: #39
Co-authored-by: defnotken <defnotken@noreply.git.lightless-sync.org>
Co-committed-by: defnotken <defnotken@noreply.git.lightless-sync.org>
2025-12-19 10:38:51 +00:00
cake
7cd463d4b7 bump api server 2025-12-19 07:12:09 +01:00
dda45e8e73 Merge pull request 'Chat adjustment for release' (#38) from chat-adjustments into master
Reviewed-on: #38
2025-12-18 21:19:55 +00:00
21 changed files with 2943 additions and 118 deletions

View File

@@ -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>

View File

@@ -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.");

View File

@@ -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)
{ {

View File

@@ -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);
} }

View File

@@ -336,7 +336,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 +438,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 +477,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 +536,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 +590,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 +645,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 +728,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 +1171,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

View File

@@ -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>

View File

@@ -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;
} }

View File

@@ -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);
} }
} }
} }

View File

@@ -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)

View File

@@ -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>

View File

@@ -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);

View File

@@ -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>

File diff suppressed because it is too large Load Diff

View File

@@ -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: "");
}
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -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");
}
}
}

View File

@@ -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");

View File

@@ -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;
} }

View File

@@ -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>

View File

@@ -116,11 +116,12 @@ public sealed class CachedFileProvider : IDisposable
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); File.SetLastAccessTimeUtc(coldStorageFilePath.FullName, DateTime.UtcNow);
destinationFile.LastAccessTimeUtc = DateTime.UtcNow; File.SetLastAccessTimeUtc(destinationFilePath, DateTime.UtcNow);
destinationFile.CreationTimeUtc = DateTime.UtcNow; File.SetCreationTimeUtc(destinationFilePath, DateTime.UtcNow);
destinationFile.LastWriteTimeUtc = DateTime.UtcNow; File.SetLastWriteTimeUtc(destinationFilePath, DateTime.UtcNow);
_metrics.IncGauge(MetricsAPI.GaugeFilesTotal); _metrics.IncGauge(MetricsAPI.GaugeFilesTotal);
_metrics.IncGauge(MetricsAPI.GaugeFilesTotalSize, new FileInfo(destinationFilePath).Length); _metrics.IncGauge(MetricsAPI.GaugeFilesTotalSize, new FileInfo(destinationFilePath).Length);
return true; return true;
@@ -173,7 +174,14 @@ public sealed class CachedFileProvider : IDisposable
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);