Add embed builder, some more ported classes
This commit is contained in:
Ske
@@ -8,6 +8,7 @@ using DSharpPlus.Entities;
|
||||
|
||||
using Humanizer;
|
||||
|
||||
using Myriad.Builders;
|
||||
using Myriad.Cache;
|
||||
using Myriad.Rest;
|
||||
using Myriad.Types;
|
||||
@@ -62,55 +63,52 @@ namespace PluralKit.Bot {
|
||||
|
||||
var memberCount = cctx.MatchPrivateFlag(ctx) ? await _repo.GetSystemMemberCount(conn, system.Id, PrivacyLevel.Public) : await _repo.GetSystemMemberCount(conn, system.Id);
|
||||
|
||||
var embed = new Embed
|
||||
{
|
||||
Title = system.Name,
|
||||
Thumbnail = new(system.AvatarUrl),
|
||||
Footer = new($"System ID: {system.Hid} | Created on {system.Created.FormatZoned(system)}"),
|
||||
Color = (uint?) DiscordUtils.Gray.Value
|
||||
};
|
||||
var fields = new List<Embed.Field>();
|
||||
|
||||
var eb = new EmbedBuilder()
|
||||
.Title(system.Name)
|
||||
.Thumbnail(new(system.AvatarUrl))
|
||||
.Footer(new($"System ID: {system.Hid} | Created on {system.Created.FormatZoned(system)}"))
|
||||
.Color((uint) DiscordUtils.Gray.Value);
|
||||
|
||||
var latestSwitch = await _repo.GetLatestSwitch(conn, system.Id);
|
||||
if (latestSwitch != null && system.FrontPrivacy.CanAccess(ctx))
|
||||
{
|
||||
var switchMembers = await _repo.GetSwitchMembers(conn, latestSwitch.Id).ToListAsync();
|
||||
if (switchMembers.Count > 0)
|
||||
fields.Add(new("Fronter".ToQuantity(switchMembers.Count, ShowQuantityAs.None), string.Join(", ", switchMembers.Select(m => m.NameFor(ctx)))));
|
||||
eb.Field(new("Fronter".ToQuantity(switchMembers.Count, ShowQuantityAs.None), string.Join(", ", switchMembers.Select(m => m.NameFor(ctx)))));
|
||||
}
|
||||
|
||||
if (system.Tag != null)
|
||||
fields.Add(new("Tag", system.Tag.EscapeMarkdown()));
|
||||
fields.Add(new("Linked accounts", string.Join("\n", users).Truncate(1000), true));
|
||||
eb.Field(new("Tag", system.Tag.EscapeMarkdown()));
|
||||
eb.Field(new("Linked accounts", string.Join("\n", users).Truncate(1000), true));
|
||||
|
||||
if (system.MemberListPrivacy.CanAccess(ctx))
|
||||
{
|
||||
if (memberCount > 0)
|
||||
fields.Add(new($"Members ({memberCount})", $"(see `pk;system {system.Hid} list` or `pk;system {system.Hid} list full`)", true));
|
||||
eb.Field(new($"Members ({memberCount})", $"(see `pk;system {system.Hid} list` or `pk;system {system.Hid} list full`)", true));
|
||||
else
|
||||
fields.Add(new($"Members ({memberCount})", "Add one with `pk;member new`!", true));
|
||||
eb.Field(new($"Members ({memberCount})", "Add one with `pk;member new`!", true));
|
||||
}
|
||||
|
||||
if (system.DescriptionFor(ctx) is { } desc)
|
||||
fields.Add(new("Description", desc.NormalizeLineEndSpacing().Truncate(1024), false));
|
||||
eb.Field(new("Description", desc.NormalizeLineEndSpacing().Truncate(1024), false));
|
||||
|
||||
return embed with { Fields = fields.ToArray() };
|
||||
return eb.Build();
|
||||
}
|
||||
|
||||
public DiscordEmbed CreateLoggedMessageEmbed(PKSystem system, PKMember member, ulong messageId, ulong originalMsgId, DiscordUser sender, string content, DiscordChannel channel) {
|
||||
public Embed CreateLoggedMessageEmbed(PKSystem system, PKMember member, ulong messageId, ulong originalMsgId, User sender, string content, Channel channel) {
|
||||
// TODO: pronouns in ?-reacted response using this card
|
||||
var timestamp = DiscordUtils.SnowflakeToInstant(messageId);
|
||||
var name = member.NameFor(LookupContext.ByNonOwner);
|
||||
return new DiscordEmbedBuilder()
|
||||
.WithAuthor($"#{channel.Name}: {name}", iconUrl: DiscordUtils.WorkaroundForUrlBug(member.AvatarFor(LookupContext.ByNonOwner)))
|
||||
.WithThumbnail(member.AvatarFor(LookupContext.ByNonOwner))
|
||||
.WithDescription(content?.NormalizeLineEndSpacing())
|
||||
.WithFooter($"System ID: {system.Hid} | Member ID: {member.Hid} | Sender: {sender.Username}#{sender.Discriminator} ({sender.Id}) | Message ID: {messageId} | Original Message ID: {originalMsgId}")
|
||||
.WithTimestamp(timestamp.ToDateTimeOffset())
|
||||
return new EmbedBuilder()
|
||||
.Author(new($"#{channel.Name}: {name}", IconUrl: DiscordUtils.WorkaroundForUrlBug(member.AvatarFor(LookupContext.ByNonOwner))))
|
||||
.Thumbnail(new(member.AvatarFor(LookupContext.ByNonOwner)))
|
||||
.Description(content?.NormalizeLineEndSpacing())
|
||||
.Footer(new($"System ID: {system.Hid} | Member ID: {member.Hid} | Sender: {sender.Username}#{sender.Discriminator} ({sender.Id}) | Message ID: {messageId} | Original Message ID: {originalMsgId}"))
|
||||
.Timestamp(timestamp.ToDateTimeOffset().ToString("O"))
|
||||
.Build();
|
||||
}
|
||||
|
||||
public async Task<DiscordEmbed> CreateMemberEmbed(PKSystem system, PKMember member, DiscordGuild guild, LookupContext ctx)
|
||||
public async Task<Embed> CreateMemberEmbed(PKSystem system, PKMember member, DiscordGuild guild, LookupContext ctx)
|
||||
{
|
||||
|
||||
// string FormatTimestamp(Instant timestamp) => DateTimeFormats.ZonedDateTimeFormat.Format(timestamp.InZone(system.Zone));
|
||||
@@ -141,13 +139,14 @@ namespace PluralKit.Bot {
|
||||
.Where(g => g.Visibility.CanAccess(ctx))
|
||||
.OrderBy(g => g.Name, StringComparer.InvariantCultureIgnoreCase)
|
||||
.ToListAsync();
|
||||
|
||||
var eb = new DiscordEmbedBuilder()
|
||||
|
||||
var eb = new EmbedBuilder()
|
||||
// TODO: add URL of website when that's up
|
||||
.WithAuthor(name, iconUrl: DiscordUtils.WorkaroundForUrlBug(avatar))
|
||||
.Author(new(name, IconUrl: DiscordUtils.WorkaroundForUrlBug(avatar)))
|
||||
// .WithColor(member.ColorPrivacy.CanAccess(ctx) ? color : DiscordUtils.Gray)
|
||||
.WithColor(color)
|
||||
.WithFooter($"System ID: {system.Hid} | Member ID: {member.Hid} {(member.MetadataPrivacy.CanAccess(ctx) ? $"| Created on {member.Created.FormatZoned(system)}":"")}");
|
||||
.Color((uint?) color.Value)
|
||||
.Footer(new(
|
||||
$"System ID: {system.Hid} | Member ID: {member.Hid} {(member.MetadataPrivacy.CanAccess(ctx) ? $"| Created on {member.Created.FormatZoned(system)}" : "")}"));
|
||||
|
||||
var description = "";
|
||||
if (member.MemberVisibility == PrivacyLevel.Private) description += "*(this member is hidden)*\n";
|
||||
@@ -156,21 +155,21 @@ namespace PluralKit.Bot {
|
||||
description += $"*(this member has a server-specific avatar set; [click here]({member.AvatarUrl}) to see the global avatar)*\n";
|
||||
else
|
||||
description += "*(this member has a server-specific avatar set)*\n";
|
||||
if (description != "") eb.WithDescription(description);
|
||||
if (description != "") eb.Description(description);
|
||||
|
||||
if (avatar != null) eb.WithThumbnail(avatar);
|
||||
if (avatar != null) eb.Thumbnail(new(avatar));
|
||||
|
||||
if (!member.DisplayName.EmptyOrNull() && member.NamePrivacy.CanAccess(ctx)) eb.AddField("Display Name", member.DisplayName.Truncate(1024), true);
|
||||
if (guild != null && guildDisplayName != null) eb.AddField($"Server Nickname (for {guild.Name})", guildDisplayName.Truncate(1024), true);
|
||||
if (member.BirthdayFor(ctx) != null) eb.AddField("Birthdate", member.BirthdayString, true);
|
||||
if (member.PronounsFor(ctx) is {} pronouns && !string.IsNullOrWhiteSpace(pronouns)) eb.AddField("Pronouns", pronouns.Truncate(1024), true);
|
||||
if (member.MessageCountFor(ctx) is {} count && count > 0) eb.AddField("Message Count", member.MessageCount.ToString(), true);
|
||||
if (member.HasProxyTags) eb.AddField("Proxy Tags", member.ProxyTagsString("\n").Truncate(1024), true);
|
||||
if (!member.DisplayName.EmptyOrNull() && member.NamePrivacy.CanAccess(ctx)) eb.Field(new("Display Name", member.DisplayName.Truncate(1024), true));
|
||||
if (guild != null && guildDisplayName != null) eb.Field(new($"Server Nickname (for {guild.Name})", guildDisplayName.Truncate(1024), true));
|
||||
if (member.BirthdayFor(ctx) != null) eb.Field(new("Birthdate", member.BirthdayString, true));
|
||||
if (member.PronounsFor(ctx) is {} pronouns && !string.IsNullOrWhiteSpace(pronouns)) eb.Field(new("Pronouns", pronouns.Truncate(1024), true));
|
||||
if (member.MessageCountFor(ctx) is {} count && count > 0) eb.Field(new("Message Count", member.MessageCount.ToString(), true));
|
||||
if (member.HasProxyTags) eb.Field(new("Proxy Tags", member.ProxyTagsString("\n").Truncate(1024), true));
|
||||
// --- For when this gets added to the member object itself or however they get added
|
||||
// if (member.LastMessage != null && member.MetadataPrivacy.CanAccess(ctx)) eb.AddField("Last message:" FormatTimestamp(DiscordUtils.SnowflakeToInstant(m.LastMessage.Value)));
|
||||
// if (member.LastSwitchTime != null && m.MetadataPrivacy.CanAccess(ctx)) eb.AddField("Last switched in:", FormatTimestamp(member.LastSwitchTime.Value));
|
||||
// if (!member.Color.EmptyOrNull() && member.ColorPrivacy.CanAccess(ctx)) eb.AddField("Color", $"#{member.Color}", true);
|
||||
if (!member.Color.EmptyOrNull()) eb.AddField("Color", $"#{member.Color}", true);
|
||||
if (!member.Color.EmptyOrNull()) eb.Field(new("Color", $"#{member.Color}", true));
|
||||
|
||||
if (groups.Count > 0)
|
||||
{
|
||||
@@ -178,15 +177,16 @@ namespace PluralKit.Bot {
|
||||
var content = groups.Count > 5
|
||||
? string.Join(", ", groups.Select(g => g.DisplayName ?? g.Name))
|
||||
: string.Join("\n", groups.Select(g => $"[`{g.Hid}`] **{g.DisplayName ?? g.Name}**"));
|
||||
eb.AddField($"Groups ({groups.Count})", content.Truncate(1000));
|
||||
eb.Field(new($"Groups ({groups.Count})", content.Truncate(1000)));
|
||||
}
|
||||
|
||||
if (member.DescriptionFor(ctx) is {} desc) eb.AddField("Description", member.Description.NormalizeLineEndSpacing(), false);
|
||||
if (member.DescriptionFor(ctx) is {} desc)
|
||||
eb.Field(new("Description", member.Description.NormalizeLineEndSpacing(), false));
|
||||
|
||||
return eb.Build();
|
||||
}
|
||||
|
||||
public async Task<DiscordEmbed> CreateGroupEmbed(Context ctx, PKSystem system, PKGroup target)
|
||||
public async Task<Embed> CreateGroupEmbed(Context ctx, PKSystem system, PKGroup target)
|
||||
{
|
||||
await using var conn = await _db.Obtain();
|
||||
|
||||
@@ -197,43 +197,43 @@ namespace PluralKit.Bot {
|
||||
if (system.Name != null)
|
||||
nameField = $"{nameField} ({system.Name})";
|
||||
|
||||
var eb = new DiscordEmbedBuilder()
|
||||
.WithAuthor(nameField, iconUrl: DiscordUtils.WorkaroundForUrlBug(target.IconFor(pctx)))
|
||||
.WithFooter($"System ID: {system.Hid} | Group ID: {target.Hid} | Created on {target.Created.FormatZoned(system)}");
|
||||
var eb = new EmbedBuilder()
|
||||
.Author(new(nameField, IconUrl: DiscordUtils.WorkaroundForUrlBug(target.IconFor(pctx))))
|
||||
.Footer(new($"System ID: {system.Hid} | Group ID: {target.Hid} | Created on {target.Created.FormatZoned(system)}"));
|
||||
|
||||
if (target.DisplayName != null)
|
||||
eb.AddField("Display Name", target.DisplayName);
|
||||
eb.Field(new("Display Name", target.DisplayName));
|
||||
|
||||
if (target.ListPrivacy.CanAccess(pctx))
|
||||
{
|
||||
if (memberCount == 0 && pctx == LookupContext.ByOwner)
|
||||
// Only suggest the add command if this is actually the owner lol
|
||||
eb.AddField("Members (0)", $"Add one with `pk;group {target.Reference()} add <member>`!", true);
|
||||
eb.Field(new("Members (0)", $"Add one with `pk;group {target.Reference()} add <member>`!", true));
|
||||
else
|
||||
eb.AddField($"Members ({memberCount})", $"(see `pk;group {target.Reference()} list`)", true);
|
||||
eb.Field(new($"Members ({memberCount})", $"(see `pk;group {target.Reference()} list`)", true));
|
||||
}
|
||||
|
||||
if (target.DescriptionFor(pctx) is {} desc)
|
||||
eb.AddField("Description", desc);
|
||||
if (target.DescriptionFor(pctx) is { } desc)
|
||||
eb.Field(new("Description", desc));
|
||||
|
||||
if (target.IconFor(pctx) is {} icon)
|
||||
eb.WithThumbnail(icon);
|
||||
eb.Thumbnail(new(icon));
|
||||
|
||||
return eb.Build();
|
||||
}
|
||||
|
||||
public async Task<DiscordEmbed> CreateFronterEmbed(PKSwitch sw, DateTimeZone zone, LookupContext ctx)
|
||||
public async Task<Embed> CreateFronterEmbed(PKSwitch sw, DateTimeZone zone, LookupContext ctx)
|
||||
{
|
||||
var members = await _db.Execute(c => _repo.GetSwitchMembers(c, sw.Id).ToListAsync().AsTask());
|
||||
var timeSinceSwitch = SystemClock.Instance.GetCurrentInstant() - sw.Timestamp;
|
||||
return new DiscordEmbedBuilder()
|
||||
.WithColor(members.FirstOrDefault()?.Color?.ToDiscordColor() ?? DiscordUtils.Gray)
|
||||
.AddField($"Current {"fronter".ToQuantity(members.Count, ShowQuantityAs.None)}", members.Count > 0 ? string.Join(", ", members.Select(m => m.NameFor(ctx))) : "*(no fronter)*")
|
||||
.AddField("Since", $"{sw.Timestamp.FormatZoned(zone)} ({timeSinceSwitch.FormatDuration()} ago)")
|
||||
return new EmbedBuilder()
|
||||
.Color((uint?) (members.FirstOrDefault()?.Color?.ToDiscordColor()?.Value ?? DiscordUtils.Gray.Value))
|
||||
.Field(new($"Current {"fronter".ToQuantity(members.Count, ShowQuantityAs.None)}", members.Count > 0 ? string.Join(", ", members.Select(m => m.NameFor(ctx))) : "*(no fronter)*"))
|
||||
.Field(new("Since", $"{sw.Timestamp.FormatZoned(zone)} ({timeSinceSwitch.FormatDuration()} ago)"))
|
||||
.Build();
|
||||
}
|
||||
|
||||
public async Task<DiscordEmbed> CreateMessageInfoEmbed(DiscordClient client, FullMessage msg)
|
||||
public async Task<Embed> CreateMessageInfoEmbed(DiscordClient client, FullMessage msg)
|
||||
{
|
||||
var ctx = LookupContext.ByNonOwner;
|
||||
var channel = await _client.GetChannel(msg.Message.Channel);
|
||||
@@ -257,32 +257,32 @@ namespace PluralKit.Bot {
|
||||
else userStr = $"*(deleted user {msg.Message.Sender})*";
|
||||
|
||||
// Put it all together
|
||||
var eb = new DiscordEmbedBuilder()
|
||||
.WithAuthor(msg.Member.NameFor(ctx), iconUrl: DiscordUtils.WorkaroundForUrlBug(msg.Member.AvatarFor(ctx)))
|
||||
.WithDescription(serverMsg?.Content?.NormalizeLineEndSpacing() ?? "*(message contents deleted or inaccessible)*")
|
||||
.WithImageUrl(serverMsg?.Attachments?.FirstOrDefault()?.Url)
|
||||
.AddField("System",
|
||||
msg.System.Name != null ? $"{msg.System.Name} (`{msg.System.Hid}`)" : $"`{msg.System.Hid}`", true)
|
||||
.AddField("Member", $"{msg.Member.NameFor(ctx)} (`{msg.Member.Hid}`)", true)
|
||||
.AddField("Sent by", userStr, inline: true)
|
||||
.WithTimestamp(DiscordUtils.SnowflakeToInstant(msg.Message.Mid).ToDateTimeOffset());
|
||||
var eb = new EmbedBuilder()
|
||||
.Author(new(msg.Member.NameFor(ctx), IconUrl: DiscordUtils.WorkaroundForUrlBug(msg.Member.AvatarFor(ctx))))
|
||||
.Description(serverMsg?.Content?.NormalizeLineEndSpacing() ?? "*(message contents deleted or inaccessible)*")
|
||||
.Image(new(serverMsg?.Attachments?.FirstOrDefault()?.Url))
|
||||
.Field(new("System",
|
||||
msg.System.Name != null ? $"{msg.System.Name} (`{msg.System.Hid}`)" : $"`{msg.System.Hid}`", true))
|
||||
.Field(new("Member", $"{msg.Member.NameFor(ctx)} (`{msg.Member.Hid}`)", true))
|
||||
.Field(new("Sent by", userStr, true))
|
||||
.Timestamp(DiscordUtils.SnowflakeToInstant(msg.Message.Mid).ToDateTimeOffset().ToString("O"));
|
||||
|
||||
var roles = memberInfo?.Roles?.ToList();
|
||||
if (roles != null && roles.Count > 0)
|
||||
{
|
||||
var rolesString = string.Join(", ", roles.Select(role => role.Name));
|
||||
eb.AddField($"Account roles ({roles.Count})", rolesString.Truncate(1024));
|
||||
eb.Field(new($"Account roles ({roles.Count})", rolesString.Truncate(1024)));
|
||||
}
|
||||
|
||||
return eb.Build();
|
||||
}
|
||||
|
||||
public Task<DiscordEmbed> CreateFrontPercentEmbed(FrontBreakdown breakdown, DateTimeZone tz, LookupContext ctx)
|
||||
public Task<Embed> CreateFrontPercentEmbed(FrontBreakdown breakdown, DateTimeZone tz, LookupContext ctx)
|
||||
{
|
||||
var actualPeriod = breakdown.RangeEnd - breakdown.RangeStart;
|
||||
var eb = new DiscordEmbedBuilder()
|
||||
.WithColor(DiscordUtils.Gray)
|
||||
.WithFooter($"Since {breakdown.RangeStart.FormatZoned(tz)} ({actualPeriod.FormatDuration()} ago)");
|
||||
var eb = new EmbedBuilder()
|
||||
.Color((uint?) DiscordUtils.Gray.Value)
|
||||
.Footer(new($"Since {breakdown.RangeStart.FormatZoned(tz)} ({actualPeriod.FormatDuration()} ago)"));
|
||||
|
||||
var maxEntriesToDisplay = 24; // max 25 fields allowed in embed - reserve 1 for "others"
|
||||
|
||||
@@ -296,15 +296,15 @@ namespace PluralKit.Bot {
|
||||
foreach (var pair in membersOrdered)
|
||||
{
|
||||
var frac = pair.Value / actualPeriod;
|
||||
eb.AddField(pair.Key?.NameFor(ctx) ?? "*(no fronter)*", $"{frac*100:F0}% ({pair.Value.FormatDuration()})");
|
||||
eb.Field(new(pair.Key?.NameFor(ctx) ?? "*(no fronter)*", $"{frac*100:F0}% ({pair.Value.FormatDuration()})"));
|
||||
}
|
||||
|
||||
if (membersOrdered.Count > maxEntriesToDisplay)
|
||||
{
|
||||
eb.AddField("(others)",
|
||||
eb.Field(new("(others)",
|
||||
membersOrdered.Skip(maxEntriesToDisplay)
|
||||
.Aggregate(Duration.Zero, (prod, next) => prod + next.Value)
|
||||
.FormatDuration(), true);
|
||||
.FormatDuration(), true));
|
||||
}
|
||||
|
||||
return Task.FromResult(eb.Build());
|
||||
|
||||
@@ -4,7 +4,8 @@ using System.Threading.Tasks;
|
||||
|
||||
using App.Metrics;
|
||||
|
||||
using DSharpPlus.Entities;
|
||||
using Myriad.Builders;
|
||||
using Myriad.Rest;
|
||||
|
||||
using NodaTime;
|
||||
|
||||
@@ -19,54 +20,61 @@ namespace PluralKit.Bot
|
||||
|
||||
private readonly IMetrics _metrics;
|
||||
private readonly ILogger _logger;
|
||||
private readonly DiscordApiClient _rest;
|
||||
|
||||
public ErrorMessageService(IMetrics metrics, ILogger logger)
|
||||
public ErrorMessageService(IMetrics metrics, ILogger logger, DiscordApiClient rest)
|
||||
{
|
||||
_metrics = metrics;
|
||||
_logger = logger;
|
||||
_rest = rest;
|
||||
}
|
||||
|
||||
public async Task SendErrorMessage(DiscordChannel channel, string errorId)
|
||||
public async Task SendErrorMessage(ulong channelId, string errorId)
|
||||
{
|
||||
var now = SystemClock.Instance.GetCurrentInstant();
|
||||
if (!ShouldSendErrorMessage(channel, now))
|
||||
if (!ShouldSendErrorMessage(channelId, now))
|
||||
{
|
||||
_logger.Warning("Rate limited sending error message to {ChannelId} with error code {ErrorId}", channel.Id, errorId);
|
||||
_logger.Warning("Rate limited sending error message to {ChannelId} with error code {ErrorId}", channelId, errorId);
|
||||
_metrics.Measure.Meter.Mark(BotMetrics.ErrorMessagesSent, "throttled");
|
||||
return;
|
||||
}
|
||||
|
||||
var embed = new DiscordEmbedBuilder()
|
||||
.WithColor(new DiscordColor(0xE74C3C))
|
||||
.WithTitle("Internal error occurred")
|
||||
.WithDescription("For support, please send the error code above in **#bug-reports-and-errors** on **[the support server *(click to join)*](https://discord.gg/PczBt78)** with a description of what you were doing at the time.")
|
||||
.WithFooter(errorId)
|
||||
.WithTimestamp(now.ToDateTimeOffset());
|
||||
var embed = new EmbedBuilder()
|
||||
.Color(0xE74C3C)
|
||||
.Title("Internal error occurred")
|
||||
.Description("For support, please send the error code above in **#bug-reports-and-errors** on **[the support server *(click to join)*](https://discord.gg/PczBt78)** with a description of what you were doing at the time.")
|
||||
.Footer(new(errorId))
|
||||
.Timestamp(now.ToDateTimeOffset().ToString("O"));
|
||||
|
||||
try
|
||||
{
|
||||
await channel.SendMessageAsync($"> **Error code:** `{errorId}`", embed: embed.Build());
|
||||
_logger.Information("Sent error message to {ChannelId} with error code {ErrorId}", channel.Id, errorId);
|
||||
await _rest.CreateMessage(channelId, new()
|
||||
{
|
||||
Content = $"> **Error code:** `{errorId}`",
|
||||
Embed = embed.Build()
|
||||
});
|
||||
|
||||
_logger.Information("Sent error message to {ChannelId} with error code {ErrorId}", channelId, errorId);
|
||||
_metrics.Measure.Meter.Mark(BotMetrics.ErrorMessagesSent, "sent");
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
_logger.Error(e, "Error sending error message to {ChannelId}", channel.Id);
|
||||
_logger.Error(e, "Error sending error message to {ChannelId}", channelId);
|
||||
_metrics.Measure.Meter.Mark(BotMetrics.ErrorMessagesSent, "failed");
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
private bool ShouldSendErrorMessage(DiscordChannel channel, Instant now)
|
||||
private bool ShouldSendErrorMessage(ulong channelId, Instant now)
|
||||
{
|
||||
if (_lastErrorInChannel.TryGetValue(channel.Id, out var lastErrorTime))
|
||||
if (_lastErrorInChannel.TryGetValue(channelId, out var lastErrorTime))
|
||||
{
|
||||
var interval = now - lastErrorTime;
|
||||
if (interval < MinErrorInterval)
|
||||
return false;
|
||||
}
|
||||
|
||||
_lastErrorInChannel[channel.Id] = now;
|
||||
_lastErrorInChannel[channelId] = now;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ using System.Threading.Tasks;
|
||||
using Dapper;
|
||||
|
||||
using Myriad.Cache;
|
||||
using Myriad.Extensions;
|
||||
using Myriad.Rest;
|
||||
using Myriad.Types;
|
||||
|
||||
@@ -18,14 +19,16 @@ namespace PluralKit.Bot {
|
||||
private readonly ILogger _logger;
|
||||
private readonly IDiscordCache _cache;
|
||||
private readonly DiscordApiClient _rest;
|
||||
private readonly Bot _bot;
|
||||
|
||||
public LogChannelService(EmbedService embed, ILogger logger, IDatabase db, ModelRepository repo, IDiscordCache cache, DiscordApiClient rest)
|
||||
public LogChannelService(EmbedService embed, ILogger logger, IDatabase db, ModelRepository repo, IDiscordCache cache, DiscordApiClient rest, Bot bot)
|
||||
{
|
||||
_embed = embed;
|
||||
_db = db;
|
||||
_repo = repo;
|
||||
_cache = cache;
|
||||
_rest = rest;
|
||||
_bot = bot;
|
||||
_logger = logger.ForContext<LogChannelService>();
|
||||
}
|
||||
|
||||
@@ -36,25 +39,28 @@ namespace PluralKit.Bot {
|
||||
// Find log channel and check if valid
|
||||
var logChannel = await FindLogChannel(trigger.GuildId!.Value, ctx.LogChannel.Value);
|
||||
if (logChannel == null || logChannel.Type != Channel.ChannelType.GuildText) return;
|
||||
|
||||
var triggerChannel = _cache.GetChannel(trigger.ChannelId);
|
||||
|
||||
// Check bot permissions
|
||||
// if (!logChannel.BotHasAllPermissions(Permissions.SendMessages | Permissions.EmbedLinks))
|
||||
// {
|
||||
// _logger.Information(
|
||||
// "Does not have permission to proxy log, ignoring (channel: {ChannelId}, guild: {GuildId}, bot permissions: {BotPermissions})",
|
||||
// ctx.LogChannel.Value, trigger.GuildId!.Value, trigger.Channel.BotPermissions());
|
||||
// return;
|
||||
// }
|
||||
//
|
||||
var perms = _bot.PermissionsIn(logChannel.Id);
|
||||
if (!perms.HasFlag(PermissionSet.SendMessages | PermissionSet.EmbedLinks))
|
||||
{
|
||||
_logger.Information(
|
||||
"Does not have permission to proxy log, ignoring (channel: {ChannelId}, guild: {GuildId}, bot permissions: {BotPermissions})",
|
||||
ctx.LogChannel.Value, trigger.GuildId!.Value, perms);
|
||||
return;
|
||||
}
|
||||
|
||||
// Send embed!
|
||||
|
||||
// TODO: fix?
|
||||
// await using var conn = await _db.Obtain();
|
||||
// var embed = _embed.CreateLoggedMessageEmbed(await _repo.GetSystem(conn, ctx.SystemId.Value),
|
||||
// await _repo.GetMember(conn, proxy.Member.Id), hookMessage, trigger.Id, trigger.Author, proxy.Content,
|
||||
// trigger.Channel);
|
||||
// var url = $"https://discord.com/channels/{trigger.Channel.GuildId}/{trigger.ChannelId}/{hookMessage}";
|
||||
// await logChannel.SendMessageFixedAsync(content: url, embed: embed);
|
||||
await using var conn = await _db.Obtain();
|
||||
var embed = _embed.CreateLoggedMessageEmbed(await _repo.GetSystem(conn, ctx.SystemId.Value),
|
||||
await _repo.GetMember(conn, proxy.Member.Id), hookMessage, trigger.Id, trigger.Author, proxy.Content,
|
||||
triggerChannel);
|
||||
var url = $"https://discord.com/channels/{trigger.GuildId}/{trigger.ChannelId}/{hookMessage}";
|
||||
await _rest.CreateMessage(logChannel.Id, new() {Content = url, Embed = embed});
|
||||
}
|
||||
|
||||
private async Task<Channel?> FindLogChannel(ulong guildId, ulong channelId)
|
||||
|
||||
Reference in New Issue
Block a user