Finished new response system

2025-09-11 01:38:27 -04:00 · 2024-05-02 06:47:01 +00:00
parent a25adefc65
commit fc4858830c
102 changed files with 1811 additions and 1818 deletions
--- a/src/NadekoBot/Modules/Music/Music.cs
+++ b/src/NadekoBot/Modules/Music/Music.cs
@@ -109,11 +109,11 @@ public sealed partial class Music : NadekoModule<IMusicService>

        try
        {
-            var embed = new EmbedBuilder()
-                           .WithOkColor()
-                           .WithAuthor(GetText(strs.queued_track) + " #" + (index + 1), MUSIC_ICON_URL)
-                           .WithDescription($"{trackInfo.PrettyName()}\n{GetText(strs.queue)} ")
-                           .WithFooter(trackInfo.Platform.ToString());
+            var embed = _sender.CreateEmbed()
+                        .WithOkColor()
+                        .WithAuthor(GetText(strs.queued_track) + " #" + (index + 1), MUSIC_ICON_URL)
+                        .WithDescription($"{trackInfo.PrettyName()}\n{GetText(strs.queue)} ")
+                        .WithFooter(trackInfo.Platform.ToString());

            if (!string.IsNullOrWhiteSpace(trackInfo.Thumbnail))
                embed.WithThumbnailUrl(trackInfo.Thumbnail);
@@ -273,7 +273,7 @@ public sealed partial class Music : NadekoModule<IMusicService>
            return;
        }

-        EmbedBuilder PrintAction(int curPage)
+        EmbedBuilder PrintAction(IReadOnlyList<IQueuedTrackInfo> tracks, int curPage)
        {
            var desc = string.Empty;
            var current = mp.GetCurrentTrack(out var currentIndex);
@@ -300,32 +300,38 @@ public sealed partial class Music : NadekoModule<IMusicService>
            }


-            desc += tracks.Skip(LQ_ITEMS_PER_PAGE * curPage)
-                          .Take(LQ_ITEMS_PER_PAGE)
-                          .Select((v, index) =>
-                          {
-                              index += LQ_ITEMS_PER_PAGE * curPage;
-                              if (index == currentIndex)
-                                  return $"**⇒**`{index + 1}.` {v.PrettyFullName()}";
+            desc += tracks
+                    .Select((v, index) =>
+                    {
+                        index += LQ_ITEMS_PER_PAGE * curPage;
+                        if (index == currentIndex)
+                            return $"**⇒**`{index + 1}.` {v.PrettyFullName()}";

-                              return $"`{index + 1}.` {v.PrettyFullName()}";
-                          })
-                          .Join('\n');
+                        return $"`{index + 1}.` {v.PrettyFullName()}";
+                    })
+                    .Join('\n');

            if (!string.IsNullOrWhiteSpace(add))
                desc = add + "\n" + desc;

-            var embed = new EmbedBuilder()
-                           .WithAuthor(GetText(strs.player_queue(curPage + 1, (tracks.Count / LQ_ITEMS_PER_PAGE) + 1)),
-                               MUSIC_ICON_URL)
-                           .WithDescription(desc)
-                           .WithFooter($"  {mp.PrettyVolume()}  |  🎶 {tracks.Count}  |  ⌛ {mp.PrettyTotalTime()}  ")
-                           .WithOkColor();
+            var embed = _sender.CreateEmbed()
+                        .WithAuthor(GetText(strs.player_queue(curPage + 1, (tracks.Count / LQ_ITEMS_PER_PAGE) + 1)),
+                            MUSIC_ICON_URL)
+                        .WithDescription(desc)
+                        .WithFooter($"  {mp.PrettyVolume()}  |  🎶 {tracks.Count}  |  ⌛ {mp.PrettyTotalTime()}  ")
+                        .WithOkColor();

            return embed;
        }

-        await ctx.SendPaginatedConfirmAsync(page, PrintAction, tracks.Count, LQ_ITEMS_PER_PAGE, false);
+        await Response()
+              .Paginated()
+              .Items(tracks)
+              .PageSize(LQ_ITEMS_PER_PAGE)
+              .CurrentPage(page)
+              .AddFooter(false)
+              .Page(PrintAction)
+              .SendAsync();
    }

    // search
@@ -408,11 +414,11 @@ public sealed partial class Music : NadekoModule<IMusicService>
            return;
        }

-        var embed = new EmbedBuilder()
-                       .WithAuthor(GetText(strs.removed_track) + " #" + index, MUSIC_ICON_URL)
-                       .WithDescription(track.PrettyName())
-                       .WithFooter(track.PrettyInfo())
-                       .WithErrorColor();
+        var embed = _sender.CreateEmbed()
+                    .WithAuthor(GetText(strs.removed_track) + " #" + index, MUSIC_ICON_URL)
+                    .WithDescription(track.PrettyName())
+                    .WithFooter(track.PrettyInfo())
+                    .WithErrorColor();

        await _service.SendToOutputAsync(ctx.Guild.Id, embed);
    }
@@ -576,12 +582,12 @@ public sealed partial class Music : NadekoModule<IMusicService>
            return;
        }

-        var embed = new EmbedBuilder()
-                       .WithTitle(track.Title.TrimTo(65))
-                       .WithAuthor(GetText(strs.track_moved), MUSIC_ICON_URL)
-                       .AddField(GetText(strs.from_position), $"#{from + 1}", true)
-                       .AddField(GetText(strs.to_position), $"#{to + 1}", true)
-                       .WithOkColor();
+        var embed = _sender.CreateEmbed()
+                    .WithTitle(track.Title.TrimTo(65))
+                    .WithAuthor(GetText(strs.track_moved), MUSIC_ICON_URL)
+                    .AddField(GetText(strs.from_position), $"#{from + 1}", true)
+                    .AddField(GetText(strs.to_position), $"#{to + 1}", true)
+                    .WithOkColor();

        if (Uri.IsWellFormedUriString(track.Url, UriKind.Absolute))
            embed.WithUrl(track.Url);
@@ -635,13 +641,13 @@ public sealed partial class Music : NadekoModule<IMusicService>
        if (currentTrack is null)
            return;

-        var embed = new EmbedBuilder()
-                       .WithOkColor()
-                       .WithAuthor(GetText(strs.now_playing), MUSIC_ICON_URL)
-                       .WithDescription(currentTrack.PrettyName())
-                       .WithThumbnailUrl(currentTrack.Thumbnail)
-                       .WithFooter(
-                           $"{mp.PrettyVolume()} | {mp.PrettyTotalTime()} | {currentTrack.Platform} | {currentTrack.Queuer}");
+        var embed = _sender.CreateEmbed()
+                    .WithOkColor()
+                    .WithAuthor(GetText(strs.now_playing), MUSIC_ICON_URL)
+                    .WithDescription(currentTrack.PrettyName())
+                    .WithThumbnailUrl(currentTrack.Thumbnail)
+                    .WithFooter(
+                        $"{mp.PrettyVolume()} | {mp.PrettyTotalTime()} | {currentTrack.Platform} | {currentTrack.Queuer}");

        await Response().Embed(embed).SendAsync();
    }
--- a/src/NadekoBot/Modules/Music/PlaylistCommands.cs
+++ b/src/NadekoBot/Modules/Music/PlaylistCommands.cs
@@ -50,7 +50,7 @@ public sealed partial class Music
                playlists = uow.Set<MusicPlaylist>().GetPlaylistsOnPage(num);
            }

-            var embed = new EmbedBuilder()
+            var embed = _sender.CreateEmbed()
                        .WithAuthor(GetText(strs.playlists_page(num)), MUSIC_ICON_URL)
                        .WithDescription(string.Join("\n",
                            playlists.Select(r => GetText(strs.playlists(r.Id, r.Name, r.Author, r.Songs.Count)))))
@@ -103,20 +103,22 @@ public sealed partial class Music
                mpl = uow.Set<MusicPlaylist>().GetWithSongs(id);
            }

-            await ctx.SendPaginatedConfirmAsync(page,
-                cur =>
-                {
-                    var i = 0;
-                    var str = string.Join("\n",
-                        mpl.Songs.Skip(cur * 20)
-                           .Take(20)
-                           .Select(x => $"`{++i}.` [{x.Title.TrimTo(45)}]({x.Query}) `{x.Provider}`"));
-                    return new EmbedBuilder().WithTitle($"\"{mpl.Name}\" by {mpl.Author}")
-                                             .WithOkColor()
-                                             .WithDescription(str);
-                },
-                mpl.Songs.Count,
-                20);
+            await Response()
+                  .Paginated()
+                  .Items(mpl.Songs)
+                  .PageSize(20)
+                  .CurrentPage(page)
+                  .Page((items, _) =>
+                  {
+                      var i = 0;
+                      var str = string.Join("\n",
+                          items
+                              .Select(x => $"`{++i}.` [{x.Title.TrimTo(45)}]({x.Query}) `{x.Provider}`"));
+                      return _sender.CreateEmbed().WithTitle($"\"{mpl.Name}\" by {mpl.Author}")
+                                               .WithOkColor()
+                                               .WithDescription(str);
+                  })
+                  .SendAsync();
        }

        [Cmd]
@@ -154,7 +156,7 @@ public sealed partial class Music
            }

            await Response()
-                  .Embed(new EmbedBuilder()
+                  .Embed(_sender.CreateEmbed()
                         .WithOkColor()
                         .WithTitle(GetText(strs.playlist_saved))
                         .AddField(GetText(strs.name), name)
--- a/src/NadekoBot/Modules/Music/Services/MusicService.cs
+++ b/src/NadekoBot/Modules/Music/Services/MusicService.cs
@@ -163,7 +163,9 @@ public sealed class MusicService : IMusicService
    {
        if (_outputChannels.TryGetValue(guildId, out var chan))
        {
-            var msg = await (chan.Override ?? chan.Default).EmbedAsync(embed);
+            var msg = await _sender.Response(chan.Override ?? chan.Default)
+                                   .Embed(embed)
+                                   .SendAsync();
            return msg;
        }

@@ -176,11 +178,11 @@ public sealed class MusicService : IMusicService
        return async (mp, trackInfo) =>
        {
            _ = lastFinishedMessage?.DeleteAsync();
-            var embed = new EmbedBuilder()
-                .WithOkColor()
-                .WithAuthor(GetText(guildId, strs.finished_track), Music.MUSIC_ICON_URL)
-                .WithDescription(trackInfo.PrettyName())
-                .WithFooter(trackInfo.PrettyTotalTime());
+            var embed = _sender.CreateEmbed()
+                        .WithOkColor()
+                        .WithAuthor(GetText(guildId, strs.finished_track), Music.MUSIC_ICON_URL)
+                        .WithDescription(trackInfo.PrettyName())
+                        .WithFooter(trackInfo.PrettyTotalTime());

            lastFinishedMessage = await SendToOutputAsync(guildId, embed);
        };
@@ -192,11 +194,11 @@ public sealed class MusicService : IMusicService
        return async (mp, trackInfo, index) =>
        {
            _ = lastPlayingMessage?.DeleteAsync();
-            var embed = new EmbedBuilder()
-                .WithOkColor()
-                .WithAuthor(GetText(guildId, strs.playing_track(index + 1)), Music.MUSIC_ICON_URL)
-                .WithDescription(trackInfo.PrettyName())
-                .WithFooter($"{mp.PrettyVolume()} | {trackInfo.PrettyInfo()}");
+            var embed = _sender.CreateEmbed()
+                        .WithOkColor()
+                        .WithAuthor(GetText(guildId, strs.playing_track(index + 1)), Music.MUSIC_ICON_URL)
+                        .WithDescription(trackInfo.PrettyName())
+                        .WithFooter($"{mp.PrettyVolume()} | {trackInfo.PrettyInfo()}");

            lastPlayingMessage = await SendToOutputAsync(guildId, embed);
        };
@@ -279,9 +281,9 @@ public sealed class MusicService : IMusicService
        yield return ("%music.playing%", () =>
        {
            var randomPlayingTrack = _players.Select(x => x.Value.GetCurrentTrack(out _))
-                .Where(x => x is not null)
-                .Shuffle()
-                .FirstOrDefault();
+                                             .Where(x => x is not null)
+                                             .Shuffle()
+                                             .FirstOrDefault();

            if (randomPlayingTrack is null)
                return "-";