eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-08 14:57:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

General bits of cleanup

Browse source
This commit is contained in:
Ske 2020-06-13 22:20:24 +02:00
parent 4b69ef806a
commit 2702c45b4f
5 changed files with 7 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

3
PluralKit.Bot/Lists/SortFilterOptions.cs
View file

@ -64,7 +64,8 @@ namespace PluralKit.Bot
{
PrivacyFilter.PrivateOnly => PrivacyLevel.Private,
PrivacyFilter.PublicOnly => PrivacyLevel.Public,
PrivacyFilter.All => null
PrivacyFilter.All => null,
_ => throw new ArgumentOutOfRangeException($"Unknown privacy filter {PrivacyFilter}")
}, Filter, SearchInDescription);
private IEnumerable<ListedMember> Sort(IEnumerable<ListedMember> input)

6
PluralKit.Bot/Proxy/ProxyMatcher.cs
View file

@ -9,10 +9,10 @@ namespace PluralKit.Bot
{
public class ProxyMatcher
{
public static readonly Duration LatchExpiryTime = Duration.FromHours(6);
private static readonly Duration LatchExpiryTime = Duration.FromHours(6);
private IClock _clock;
private ProxyTagParser _parser;
private readonly IClock _clock;
private readonly ProxyTagParser _parser;
public ProxyMatcher(ProxyTagParser parser, IClock clock)
{

2
PluralKit.Bot/Proxy/ProxyService.cs
View file

@ -18,7 +18,7 @@ namespace PluralKit.Bot
{
public class ProxyService
{
public static readonly TimeSpan MessageDeletionDelay = TimeSpan.FromMilliseconds(1000);
private static readonly TimeSpan MessageDeletionDelay = TimeSpan.FromMilliseconds(1000);
private readonly LogChannelService _logChannel;
private readonly IDatabase _db;

15
PluralKit.Bot/Proxy/ProxyTagParser.cs
View file

@ -1,5 +1,4 @@
#nullable enable
using System;
using System.Collections.Generic;
using System.Linq;
@ -49,20 +48,6 @@ namespace PluralKit.Bot
return false;
}
public bool TryMatchTags(string input, ProxyTag tag, out string inner)
{
// This just wraps TryMatchTagsInner w/ support for leading mentions
var leadingMention = ExtractLeadingMention(ref input);
inner = "";
if (!TryMatchTagsInner(input, tag, out var innerRaw)) return false;
// Add leading mentions back
inner = leadingMention == null ? innerRaw : $"{leadingMention} {innerRaw}";
return true;
}
private bool TryMatchTagsInner(string input, ProxyTag tag, out string inner)
{
inner = "";

79
PluralKit.Bot/Utils/HandlerQueue.cs
View file

@ -1,79 +0,0 @@
using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using NodaTime;
namespace PluralKit.Bot
{
public class HandlerQueue<T>
{
private readonly List<HandlerEntry> _handlers = new List<HandlerEntry>();
public HandlerEntry Add(Func<T, Task<bool>> handler)
{
var entry = new HandlerEntry {Handler = handler};
_handlers.Add(entry);
return entry;
}
public async Task<T> WaitFor(Func<T, bool> predicate, Duration? timeout = null, CancellationToken ct = default)
{
var timeoutTask = Task.Delay(timeout?.ToTimeSpan() ?? TimeSpan.FromMilliseconds(-1), ct);
var tcs = new TaskCompletionSource<T>();
Task<bool> Handler(T e)
{
var matches = predicate(e);
if (matches) tcs.SetResult(e);
return Task.FromResult(matches);
}
var entry = new HandlerEntry {Handler = Handler};
_handlers.Add(entry);
// Wait for either the event task or the timeout task
// If the timeout task finishes first, raise, otherwise pass event through
try
{
var theTask = await Task.WhenAny(timeoutTask, tcs.Task);
if (theTask == timeoutTask)
throw new TimeoutException();
}
finally
{
entry.Remove();
}
return await tcs.Task;
}
public async Task<bool> TryHandle(T evt)
{
_handlers.RemoveAll(he => !he.Alive);
var now = SystemClock.Instance.GetCurrentInstant();
foreach (var entry in _handlers)
{
if (entry.Expiry < now) entry.Alive = false;
else if (entry.Alive && await entry.Handler(evt))
{
entry.Alive = false;
return true;
}
}
return false;
}
public class HandlerEntry
{
internal Func<T, Task<bool>> Handler;
internal bool Alive = true;
internal Instant Expiry = SystemClock.Instance.GetCurrentInstant() + Duration.FromMinutes(30);
public void Remove() => Alive = false;
}
}
}