liz/PluralKit
liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lint

Browse Source
This commit is contained in:
spiral 2021-09-26 22:50:08 -04:00
parent 0517c76abf
commit fb4aaad19f
No known key found for this signature in database
GPG Key ID: A6059F0CA0E1BD31
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Myriad/Rest/DiscordApiClient.cs
View File

@ -132,7 +132,7 @@ namespace Myriad.Rest
var url = $"/webhooks/{webhookId}/{webhookToken}/messages/{messageId}"; var url = $"/webhooks/{webhookId}/{webhookToken}/messages/{messageId}";
if (threadId != null) if (threadId != null)
url += $"?thread_id={threadId}"; url += $"?thread_id={threadId}";
return _client.Patch<Message>(url, ("EditWebhookMessage", webhookId), request)!; return _client.Patch<Message>(url, ("EditWebhookMessage", webhookId), request)!;
} }

8
PluralKit.Bot/Commands/CommandTree.cs
View File

@ -485,10 +485,10 @@ namespace PluralKit.Bot
else if (ctx.Match("move", "shift", "offset")) else if (ctx.Match("move", "shift", "offset"))
await ctx.Execute<Switch>(SwitchMove, m => m.SwitchMove(ctx)); await ctx.Execute<Switch>(SwitchMove, m => m.SwitchMove(ctx));
else if (ctx.Match("edit", "replace")) else if (ctx.Match("edit", "replace"))
if (ctx.Match("out")) if (ctx.Match("out"))
await ctx.Execute<Switch>(SwitchEditOut, m => m.SwitchEditOut(ctx)); await ctx.Execute<Switch>(SwitchEditOut, m => m.SwitchEditOut(ctx));
else else
await ctx.Execute<Switch>(SwitchEdit, m => m.SwitchEdit(ctx)); await ctx.Execute<Switch>(SwitchEdit, m => m.SwitchEdit(ctx));
else if (ctx.Match("delete", "remove", "erase", "cancel", "yeet")) else if (ctx.Match("delete", "remove", "erase", "cancel", "yeet"))
await ctx.Execute<Switch>(SwitchDelete, m => m.SwitchDelete(ctx)); await ctx.Execute<Switch>(SwitchDelete, m => m.SwitchDelete(ctx));
else if (ctx.Match("commands", "help")) else if (ctx.Match("commands", "help"))

10
PluralKit.Bot/Commands/Switch.cs
View File

@ -142,12 +142,12 @@ namespace PluralKit.Bot
var lastSwitchDeltaStr = (SystemClock.Instance.GetCurrentInstant() - lastSwitch.Timestamp).FormatDuration(); var lastSwitchDeltaStr = (SystemClock.Instance.GetCurrentInstant() - lastSwitch.Timestamp).FormatDuration();
var lastSwitchMemberStr = string.Join(", ", await lastSwitchMembers.Select(m => m.NameFor(ctx)).ToListAsync()); var lastSwitchMemberStr = string.Join(", ", await lastSwitchMembers.Select(m => m.NameFor(ctx)).ToListAsync());
var newSwitchMemberStr = string.Join(", ", members.Select(m => m.NameFor(ctx))); var newSwitchMemberStr = string.Join(", ", members.Select(m => m.NameFor(ctx)));
string msg; string msg;
if (members.Count == 0) if (members.Count == 0)
msg = $"{Emojis.Warn} This will turn the latest switch ({lastSwitchMemberStr}, {lastSwitchDeltaStr} ago) into a switch-out. Is this okay?"; msg = $"{Emojis.Warn} This will turn the latest switch ({lastSwitchMemberStr}, {lastSwitchDeltaStr} ago) into a switch-out. Is this okay?";
else else
msg = $"{Emojis.Warn} This will change the latest switch ({lastSwitchMemberStr}, {lastSwitchDeltaStr} ago) to {newSwitchMemberStr}. Is this okay?"; msg = $"{Emojis.Warn} This will change the latest switch ({lastSwitchMemberStr}, {lastSwitchDeltaStr} ago) to {newSwitchMemberStr}. Is this okay?";
if (!await ctx.PromptYesNo(msg, "Edit")) throw Errors.SwitchEditCancelled; if (!await ctx.PromptYesNo(msg, "Edit")) throw Errors.SwitchEditCancelled;
// Actually edit the switch // Actually edit the switch
@ -155,9 +155,9 @@ namespace PluralKit.Bot
// Tell the user the edit suceeded // Tell the user the edit suceeded
if (members.Count == 0) if (members.Count == 0)
await ctx.Reply($"{Emojis.Success} Switch edited. The latest switch is now a switch-out."); await ctx.Reply($"{Emojis.Success} Switch edited. The latest switch is now a switch-out.");
else else
await ctx.Reply($"{Emojis.Success} Switch edited. Current fronter is now {newSwitchMemberStr}."); await ctx.Reply($"{Emojis.Success} Switch edited. Current fronter is now {newSwitchMemberStr}.");
} }
public async Task SwitchDelete(Context ctx) public async Task SwitchDelete(Context ctx)

4
PluralKit.Bot/Proxy/ProxyTagParser.cs
View File

@ -40,8 +40,8 @@ namespace PluralKit.Bot
// Skip blank tags (shouldn't ever happen in practice) // Skip blank tags (shouldn't ever happen in practice)
if (tag.Prefix == null && tag.Suffix == null) continue; if (tag.Prefix == null && tag.Suffix == null) continue;
if(tag.Prefix == "<" && prefixPattern.IsMatch(input)) continue; if (tag.Prefix == "<" && prefixPattern.IsMatch(input)) continue;
if(tag.Suffix == ">" && suffixPattern.IsMatch(input)) continue; if (tag.Suffix == ">" && suffixPattern.IsMatch(input)) continue;
// Can we match with these tags? // Can we match with these tags?
if (TryMatchTagsInner(input, tag, out result.Content)) if (TryMatchTagsInner(input, tag, out result.Content))

2
PluralKit.Core/Database/Repository/ModelRepository.Switch.cs
View File

@ -46,7 +46,7 @@ namespace PluralKit.Core
// Remove the old members from the switch // Remove the old members from the switch
await conn.ExecuteAsync("delete from switch_members where switch = @Switch", await conn.ExecuteAsync("delete from switch_members where switch = @Switch",
new {Switch = switchId}); new { Switch = switchId });
// Add the new members // Add the new members
await using (var w = conn.BeginBinaryImport("copy switch_members (switch, member) from stdin (format binary)")) await using (var w = conn.BeginBinaryImport("copy switch_members (switch, member) from stdin (format binary)"))