RPCS3/archived-discord-bot
1
0
Fork 0
mirror of https://github.com/RPCS3/discord-bot.git synced 2026-01-31 01:25:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

use components v2 for game updates

Browse Source
This commit is contained in:
13xforever
2025-08-18 23:22:12 +05:00
parent e1fea75c56
commit 01c24210ce
2 changed files with 95 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
CompatBot/Commands/Psn.Check.cs
View File

@@ -34,28 +34,32 @@ internal static partial class Psn
}
await ctx.DeferResponseAsync(ephemeral).ConfigureAwait(false);
List<DiscordEmbedBuilder> embeds;
List<DiscordMessageBuilder> msgList;
try
{
var updateInfo = await TitleUpdateInfoProvider.GetAsync(id, Config.Cts.Token).ConfigureAwait(false);
embeds = await updateInfo.AsEmbedAsync(ctx.Client, id).ConfigureAwait(false);
msgList = await updateInfo.AsMessageAsync(ctx.Client, id).ConfigureAwait(false);
}
catch (Exception e)
{
Config.Log.Warn(e, "Failed to get title update info");
embeds =
msgList =
[
new()
{
Color = Config.Colors.Maintenance,
Title = "Service is unavailable",
Description = "There was an error communicating with the service. Try again in a few minutes.",
}
new DiscordMessageBuilder()
.EnableV2Components()
.AddContainerComponent(
new([new DiscordTextDisplayComponent(
$"""
### Service is unavailable
There was an error communicating with the service. Try again in a few minutes.
"""
)], color: Config.Colors.Maintenance)
)
];
}
await ctx.RespondAsync(embeds[0], ephemeral: ephemeral).ConfigureAwait(false);
foreach (var embed in embeds.Skip(1).Take(EmbedPager.MaxFollowupMessages))
await ctx.FollowupAsync(embed, ephemeral: ephemeral).ConfigureAwait(false);
await ctx.RespondAsync(new DiscordInteractionResponseBuilder(msgList[0]).AsEphemeral(ephemeral: ephemeral)).ConfigureAwait(false);
foreach (var msg in msgList.Skip(1).Take(EmbedPager.MaxFollowupMessages))
await ctx.FollowupAsync(new DiscordInteractionResponseBuilder(msg).AsEphemeral(ephemeral: ephemeral)).ConfigureAwait(false);
}
[Command("firmware")]

119
CompatBot/Utils/ResultFormatters/TitlePatchFormatter.cs
View File

@@ -9,65 +9,104 @@ namespace CompatBot.Utils.ResultFormatters;
internal static class TitlePatchFormatter
{
// thanks BCES00569
public static async Task<List<DiscordEmbedBuilder>> AsEmbedAsync(this TitlePatch? patch, DiscordClient client, string productCode)
public static async Task<List<DiscordMessageBuilder>> AsMessageAsync(this TitlePatch? patch, DiscordClient client, string productCode)
{
var result = new List<DiscordEmbedBuilder>();
var pkgs = patch?.Tag?.Packages;
var title = pkgs?.Select(p => p.ParamSfo?.Title).LastOrDefault(t => !string.IsNullOrEmpty(t))
?? await ThumbnailProvider.GetTitleNameAsync(productCode, Config.Cts.Token).ConfigureAwait(false)
?? productCode;
var content = new StringBuilder();
var thumbnailUrl = await client.GetThumbnailUrlAsync(productCode).ConfigureAwait(false);
var embedBuilder = new DiscordEmbedBuilder
if (pkgs is {Length: >0})
{
Title = title,
Color = Config.Colors.DownloadLinks,
}.WithThumbnail(thumbnailUrl);
if (pkgs?.Length > 1)
{
var pages = pkgs.Length / EmbedPager.MaxFields + (pkgs.Length % EmbedPager.MaxFields == 0 ? 0 : 1);
if (pages > 1)
embedBuilder.Title = $"{title} [Part 1 of {pages}]".Trim(EmbedPager.MaxFieldTitleLength);
embedBuilder.Description = $"""
ℹ️ Total download size of all {pkgs.Length} packages is {pkgs.Sum(p => p.Size).AsStorageUnit()}.
⏩ You can use tools such as [rusty-psn](https://github.com/RainbowCookie32/rusty-psn/releases/latest) or [PySN](https://github.com/AphelionWasTaken/PySN/releases/latest) for mass download of all updates.
content.AppendLine($"### {title}");
if (pkgs.Length > 1)
content.AppendLine(
$"""
ℹ️ Total download size of all {pkgs.Length} packages is {pkgs.Sum(p => p.Size).AsStorageUnit()}.
⏩ You can use tools such as [rusty-psn](https://github.com/RainbowCookie32/rusty-psn/releases/latest) or [PySN](https://github.com/AphelionWasTaken/PySN/releases/latest) for mass download of all updates.
⚠️ You **must** install listed updates in order, starting with the first one. You **can not** skip intermediate versions.
""";
var i = 0;
do
{
var pkg = pkgs[i++];
embedBuilder.AddField($"Update v{pkg.Version} ({pkg.Size.AsStorageUnit()})", $"[⏬ {GetLinkName(pkg.Url)}]({pkg.Url})");
if (i % EmbedPager.MaxFields == 0)
{
result.Add(embedBuilder);
embedBuilder = new DiscordEmbedBuilder
{
Title = $"{title} [Part {i / EmbedPager.MaxFields + 1} of {pages}]".Trim(EmbedPager.MaxFieldTitleLength),
Color = Config.Colors.DownloadLinks,
}.WithThumbnail(thumbnailUrl);
}
} while (i < pkgs.Length);
⚠️ You **must** install listed updates in order, starting with the first one. You **can not** skip intermediate versions.
"""
).AppendLine();
foreach (var pkg in pkgs)
content.AppendLine($"""[⏬ Update v`{pkg.Version}` ({pkg.Size.AsStorageUnit()})]({pkg.Url})""");
}
else if (pkgs?.Length == 1)
else if (pkgs is [var pkg])
{
embedBuilder.Title = $"{title} update v{pkgs[0].Version} ({pkgs[0].Size.AsStorageUnit()})";
embedBuilder.Description = $"[⏬ {Path.GetFileName(GetLinkName(pkgs[0].Url))}]({pkgs[0].Url})";
content.AppendLine(
$"""
### {title} update v{pkg.Version} ({pkg.Size.AsStorageUnit()})
[⏬ {Path.GetFileName(GetLinkName(pkg.Url))}]({pkg.Url})
"""
);
}
else if (patch != null)
embedBuilder.Description = "No updates available";
else
embedBuilder.Description = "No update information available";
if (!result.Any() || embedBuilder.Fields.Any())
result.Add(embedBuilder);
content.AppendLine($"### {title}")
.AppendLine("No updates available");
if (patch?.OfflineCacheTimestamp is DateTime cacheTimestamp)
result[^1].WithFooter($"Offline cache, last updated {(DateTime.UtcNow - cacheTimestamp).AsTimeDeltaDescription()} ago");
content.AppendLine()
.AppendLine($"-# Offline cache, last updated {(DateTime.UtcNow - cacheTimestamp).AsTimeDeltaDescription()} ago");
var result = new List<DiscordMessageBuilder>();
IReadOnlyList<DiscordTextDisplayComponent> contentParts = Split(content);
foreach (var page in contentParts)
{
IReadOnlyList<DiscordComponent> msgBody;
if (thumbnailUrl is { Length: > 0 })
msgBody =
[
new DiscordSectionComponent([page], new DiscordThumbnailComponent(thumbnailUrl))
];
else
msgBody = [page];
var msgBuilder = new DiscordMessageBuilder()
.EnableV2Components()
.AddContainerComponent(
new(
msgBody,
color: Config.Colors.DownloadLinks
)
);
result.Add(msgBuilder);
}
return result;
}
private static List<DiscordTextDisplayComponent> Split(StringBuilder content)
{
var lines = content.ToString().TrimEnd().Split(Environment.NewLine);
var isMultiPage = content.Length > 4001;
var title = lines[0];
var result = new List<DiscordTextDisplayComponent>();
content.Clear();
content.Append(title);
if (isMultiPage)
content.Append(" [Page 1 of 2]");
foreach (var l in lines.Skip(1))
{
check:
if (content.Length + l.Length + 1 <= 4000)
content.Append('\n').Append(l);
else if (content.Length is 0)
content.Append(l.Trim(4000));
else
{
result.Add(new(content.ToString()));
content.Clear();
content.Append(title).Append(" [Page 2 of 2]");
goto check;
}
}
result.Add(new(content.ToString()));
return result;
}
private static string GetLinkName(string link)
{
var fname = Path.GetFileName(link);
if (fname.EndsWith("-PE.pkg"))
fname = fname[..^7] + fname[^4..];
try
{
var match = PsnScraper.ContentIdMatcher().Match(fname);