minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-09-11 09:48:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

all calls to .WithAuthor and .WithFooter no longer use their respective builders

Browse Source
This commit is contained in:
Kwoth
2021-07-08 02:54:55 +02:00
parent cbecd823c1
commit a17d0afc7d
12 changed files with 71 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/NadekoBot/Modules/Music/Music.cs
View File

@@ -9,7 +9,6 @@ using NadekoBot.Common;
using NadekoBot.Common.Attributes;
using NadekoBot.Services.Database.Models;
using NadekoBot.Extensions;
using NadekoBot.Modules;
using NadekoBot.Modules.Administration.Services;
using NadekoBot.Modules.Music.Services;
@@ -18,6 +17,7 @@ namespace NadekoBot.Modules.Music
[NoPublicBot]
public sealed partial class Music : NadekoModule<IMusicService>
{
public const string MusicIconUrl = "http://i.imgur.com/nhKS3PT.png";
private readonly ILogCommandService _logService;
public Music(ILogCommandService _logService)
@@ -114,9 +114,9 @@ namespace NadekoBot.Modules.Music
{
var embed = new EmbedBuilder()
.WithOkColor()
.WithAuthor(eab => eab.WithName(GetText("queued_song") + " #" + (index + 1)).WithMusicIcon())
.WithAuthor(GetText("queued_song") + " #" + (index + 1), MusicIconUrl)
.WithDescription($"{trackInfo.PrettyName()}\n{GetText("queue")} ")
.WithFooter(ef => ef.WithText(trackInfo.Platform.ToString()));
.WithFooter(trackInfo.Platform.ToString());
if (!string.IsNullOrWhiteSpace(trackInfo.Thumbnail))
embed.WithThumbnailUrl(trackInfo.Thumbnail);
@@ -329,9 +329,8 @@ namespace NadekoBot.Modules.Music
desc = add + "\n" + desc;
var embed = new EmbedBuilder()
.WithAuthor(eab => eab
.WithName(GetText("player_queue", curPage + 1, (tracks.Count / LQ_ITEMS_PER_PAGE) + 1))
.WithMusicIcon())
.WithAuthor(GetText("player_queue", curPage + 1, (tracks.Count / LQ_ITEMS_PER_PAGE) + 1),
MusicIconUrl)
.WithDescription(desc)
.WithFooter($" {mp.PrettyVolume()} | 🎶 {tracks.Count} | ⌛ {mp.PrettyTotalTime()} ")
.WithOkColor();
@@ -432,9 +431,9 @@ namespace NadekoBot.Modules.Music
}
var embed = new EmbedBuilder()
.WithAuthor(eab => eab.WithName(GetText("removed_song") + " #" + (index)).WithMusicIcon())
.WithAuthor(GetText("removed_song") + " #" + (index), MusicIconUrl)
.WithDescription(song.PrettyName())
.WithFooter(ef => ef.WithText(song.PrettyInfo()))
.WithFooter(song.PrettyInfo())
.WithErrorColor();
await _service.SendToOutputAsync(Context.Guild.Id, embed);
@@ -616,7 +615,7 @@ namespace NadekoBot.Modules.Music
var embed = new EmbedBuilder()
.WithTitle(track.Title.TrimTo(65))
.WithAuthor(eab => eab.WithName(GetText("song_moved")).WithIconUrl("https://cdn.discordapp.com/attachments/155726317222887425/258605269972549642/music1.png"))
.WithAuthor(GetText("song_moved"), MusicIconUrl)
.AddField(GetText("from_position"), $"#{from + 1}", true)
.AddField(GetText("to_position"), $"#{to + 1}", true)
.WithColor(Bot.OkColor);
@@ -703,7 +702,7 @@ namespace NadekoBot.Modules.Music
return;
var embed = new EmbedBuilder().WithOkColor()
.WithAuthor(eab => eab.WithName(GetText("now_playing")).WithMusicIcon())
.WithAuthor(GetText("now_playing"), MusicIconUrl)
.WithDescription(currentTrack.PrettyName())
.WithThumbnailUrl(currentTrack.Thumbnail)
.WithFooter($"{mp.PrettyVolume()} | {mp.PrettyTotalTime()} | {currentTrack.Platform} | {currentTrack.Queuer}");

2
src/NadekoBot/Modules/Music/PlaylistCommands.cs
View File

@@ -62,7 +62,7 @@ namespace NadekoBot.Modules.Music
}
var embed = new EmbedBuilder()
.WithAuthor(eab => eab.WithName(GetText("playlists_page", num)).WithMusicIcon())
.WithAuthor(GetText("playlists_page", num), MusicIconUrl)
.WithDescription(string.Join("\n", playlists.Select(r =>
GetText("playlists", r.Id, r.Name, r.Author, r.Songs.Count))))
.WithOkColor();

6
src/NadekoBot/Modules/Music/Services/MusicService.cs
View File

@@ -205,7 +205,7 @@ namespace NadekoBot.Modules.Music.Services
_ = lastFinishedMessage?.DeleteAsync();
var embed = new EmbedBuilder()
.WithOkColor()
.WithAuthor(eab => eab.WithName(GetText(guildId, "finished_song")).WithMusicIcon())
.WithAuthor(GetText(guildId, "finished_song"), Music.MusicIconUrl)
.WithDescription(trackInfo.PrettyName())
.WithFooter(trackInfo.PrettyTotalTime());
@@ -220,9 +220,9 @@ namespace NadekoBot.Modules.Music.Services
{
_ = lastPlayingMessage?.DeleteAsync();
var embed = new EmbedBuilder().WithOkColor()
.WithAuthor(eab => eab.WithName(GetText(guildId, "playing_song", index + 1)).WithMusicIcon())
.WithAuthor(GetText(guildId, "playing_song", index + 1), Music.MusicIconUrl)
.WithDescription(trackInfo.PrettyName())
.WithFooter(ef => ef.WithText($"{mp.PrettyVolume()} | {trackInfo.PrettyInfo()}"));
.WithFooter($"{mp.PrettyVolume()} | {trackInfo.PrettyInfo()}");
lastPlayingMessage = await SendToOutputAsync(guildId, embed);
};