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

Display member roles in message query card

Browse Source
This commit is contained in:
Ske 2019-09-21 15:19:38 +02:00
parent 86d0b24758
commit 0ec522ca0a
1 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
PluralKit.Bot/Services/EmbedService.cs
View File

@ -3,6 +3,8 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Discord; using Discord;
using Discord.WebSocket;
using Humanizer; using Humanizer;
using NodaTime; using NodaTime;
@ -151,23 +153,44 @@ namespace PluralKit.Bot {
public async Task<Embed> CreateMessageInfoEmbed(MessageStore.StoredMessage msg) public async Task<Embed> CreateMessageInfoEmbed(MessageStore.StoredMessage msg)
{ {
var channel = (ITextChannel) await _client.GetChannelAsync(msg.Message.Channel); var channel = await _client.GetChannelAsync(msg.Message.Channel) as ITextChannel;
var serverMsg = await channel.GetMessageAsync(msg.Message.Mid); var serverMsg = channel != null ? await channel.GetMessageAsync(msg.Message.Mid) : null;
var memberStr = $"{msg.Member.Name} (`{msg.Member.Hid}`)"; var memberStr = $"{msg.Member.Name} (`{msg.Member.Hid}`)";
if (msg.Member.Pronouns != null) memberStr += $"\n*(pronouns: **{msg.Member.Pronouns}**)*";
var user = await _client.GetUserAsync(msg.Message.Sender); var userStr = $"*(deleted user {msg.Message.Sender})*";
var userStr = user.NameAndMention() ?? $"*(deleted user {msg.Message.Sender})*"; ICollection<IRole> roles = null;
return new EmbedBuilder() if (channel != null)
{
// Look up the user with the REST client
// this ensures we'll still get the information even if the user's not cached,
// even if this means an extra API request (meh, it'll be fine)
var shard = ((DiscordShardedClient) _client).GetShardFor(channel.Guild);
var guildUser = await shard.Rest.GetGuildUserAsync(channel.Guild.Id, msg.Message.Sender);
if (guildUser != null)
{
roles = guildUser.RoleIds
.Select(roleId => channel.Guild.GetRole(roleId))
.Where(role => role.Name != "@everyone")
.OrderByDescending(role => role.Position)
.ToList();
userStr = guildUser?.NameAndMention();
}
}
var eb = new EmbedBuilder()
.WithAuthor(msg.Member.Name, msg.Member.AvatarUrl) .WithAuthor(msg.Member.Name, msg.Member.AvatarUrl)
.WithDescription(serverMsg?.Content ?? "*(message contents deleted or inaccessible)*") .WithDescription(serverMsg?.Content ?? "*(message contents deleted or inaccessible)*")
.AddField("System", msg.System.Name != null ? $"{msg.System.Name} (`{msg.System.Hid}`)" : $"`{msg.System.Hid}`", true) .AddField("System",
msg.System.Name != null ? $"{msg.System.Name} (`{msg.System.Hid}`)" : $"`{msg.System.Hid}`", true)
.AddField("Member", memberStr, true) .AddField("Member", memberStr, true)
.AddField("Sent by", userStr, inline: true) .AddField("Sent by", userStr, inline: true)
.WithTimestamp(SnowflakeUtils.FromSnowflake(msg.Message.Mid)) .WithTimestamp(SnowflakeUtils.FromSnowflake(msg.Message.Mid));
.Build();
if (roles != null) eb.AddField($"Account roles ({roles.Count})", string.Join(", ", roles.Select(role => role.Name)));
return eb.Build();
} }
public Task<Embed> CreateFrontPercentEmbed(SwitchStore.PerMemberSwitchDuration frontpercent, DateTimeZone tz) public Task<Embed> CreateFrontPercentEmbed(SwitchStore.PerMemberSwitchDuration frontpercent, DateTimeZone tz)