Lightless-Sync/LightlessServer
8
0
Fork 0
Code Issues 3 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request 'Reduced content length of message, commented out the pending report.' (#37) from chat-changes into master

Browse Source 
Reviewed-on: #37
Reviewed-by: defnotken <defnotken@noreply.git.lightless-sync.org>
This commit was merged in pull request #37.
This commit is contained in:
defnotken
2025-12-16 12:00:08 +00:00
parent c731b265ff 6294b1d496
commit 2fb41d0b9f
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Chat.cs
View File

@@ -1,13 +1,9 @@
using System;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Text.Json; using System.Text.Json;
using LightlessSync.API.Data.Enum; using LightlessSync.API.Data.Enum;
using LightlessSync.API.Dto.Chat; using LightlessSync.API.Dto.Chat;
using LightlessSync.API.Dto.User; using LightlessSync.API.Dto.User;
using LightlessSyncServer.Models; using LightlessSyncServer.Models;
using LightlessSyncServer.Services;
using LightlessSyncServer.Utils; using LightlessSyncServer.Utils;
using LightlessSyncShared.Models; using LightlessSyncShared.Models;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
@@ -18,7 +14,7 @@ namespace LightlessSyncServer.Hubs;
public partial class LightlessHub public partial class LightlessHub
{ {
private const int MaxChatMessageLength = 400; private const int MaxChatMessageLength = 200;
private const int ChatRateLimitMessages = 7; private const int ChatRateLimitMessages = 7;
private static readonly TimeSpan ChatRateLimitWindow = TimeSpan.FromMinutes(1); private static readonly TimeSpan ChatRateLimitWindow = TimeSpan.FromMinutes(1);
private static readonly ConcurrentDictionary<string, ChatRateLimitState> ChatRateLimiters = new(StringComparer.Ordinal); private static readonly ConcurrentDictionary<string, ChatRateLimitState> ChatRateLimiters = new(StringComparer.Ordinal);
@@ -67,7 +63,7 @@ public partial class LightlessHub
descriptor, descriptor,
displayName, displayName,
g.GID, g.GID,
g.OwnerUID == userUid); string.Equals(g.OwnerUID, userUid, StringComparison.Ordinal));
}) })
.OrderBy(info => info.DisplayName, StringComparer.OrdinalIgnoreCase) .OrderBy(info => info.DisplayName, StringComparer.OrdinalIgnoreCase)
.ToList(); .ToList();
@@ -406,7 +402,7 @@ public partial class LightlessHub
return; return;
} }
if (!string.IsNullOrEmpty(messageEntry.SenderUserUid)) /* if (!string.IsNullOrEmpty(messageEntry.SenderUserUid))
{ {
var targetAlreadyPending = await DbContext.ReportedChatMessages var targetAlreadyPending = await DbContext.ReportedChatMessages
.AsNoTracking() .AsNoTracking()
@@ -418,7 +414,7 @@ public partial class LightlessHub
await Clients.Caller.Client_ReceiveServerMessage(MessageSeverity.Information, "This user already has a report pending review.").ConfigureAwait(false); await Clients.Caller.Client_ReceiveServerMessage(MessageSeverity.Information, "This user already has a report pending review.").ConfigureAwait(false);
return; return;
} }
} } */
var snapshotEntries = _chatChannelService.GetRecentMessages(messageEntry.Channel, 25); var snapshotEntries = _chatChannelService.GetRecentMessages(messageEntry.Channel, 25);
var snapshotItems = snapshotEntries var snapshotItems = snapshotEntries

2
LightlessSyncServer/LightlessSyncServices/Discord/DiscordBot.cs
View File

@@ -162,7 +162,7 @@ internal class DiscordBot : IHostedService
try try
{ {
await Task.Delay(TimeSpan.FromMinutes(10), token).ConfigureAwait(false); await Task.Delay(TimeSpan.FromMinutes(1), token).ConfigureAwait(false);
} }
catch (OperationCanceledException) catch (OperationCanceledException)
{ {