mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of https://github.com/Kwoth/NadekoBot into dev

Browse Source
This commit is contained in:
Kwoth
2016-12-14 17:05:49 +01:00
parent eda44fffb8 f2512fe53c
commit 6b56f0dbc3
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/NadekoBot/Modules/Music/Classes/Song.cs
View File

@@ -12,7 +12,7 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using VideoLibrary; using VideoLibrary;
namespace NadekoBot.Modules.Music.Classes namespace NadekoBot.Modules.Music.Classes//{(SongInfo.Provider ?? "-")}
{ {
public class SongInfo public class SongInfo
{ {
@@ -27,24 +27,29 @@ namespace NadekoBot.Modules.Music.Classes
} }
public class Song public class Song
{ {
public StreamState State { get; set; }
public string PrettyName => public string PrettyName =>
$"**【 {SongInfo.Title.TrimTo(55)} 】**`{(SongInfo.Provider ?? "-")}` `by {QueuerName}`"; $"{SongInfo.Title.TrimTo(70)}";
public SongInfo SongInfo { get; } public SongInfo SongInfo { get; }
public MusicPlayer MusicPlayer { get; set; }
public string PrettyUser =>
$"{QueuerName}";
public string QueuerName { get; set; } public string QueuerName { get; set; }
public MusicPlayer MusicPlayer { get; set; } public string PrettyProvider =>
$"{(SongInfo.Provider ?? "No Provider")}";
public StreamState State { get; set; }
public string PrettyCurrentTime() public string PrettyCurrentTime()
{ {
var time = TimeSpan.FromSeconds(bytesSent / 3840 / 50); var time = TimeSpan.FromSeconds(bytesSent / 3840 / 50);
var str = $"【{(int)time.TotalMinutes}m {time.Seconds}s】**/** "; var str = $"{(int)time.TotalMinutes}m {time.Seconds}s / ";
if (TotalLength == TimeSpan.Zero) if (TotalLength == TimeSpan.Zero)
str += "**?**"; str += "**?**";
else if (TotalLength == TimeSpan.MaxValue) else if (TotalLength == TimeSpan.MaxValue)
str += "**∞**"; str += "**∞**";
else else
str += $"【{(int)TotalLength.TotalMinutes}m {TotalLength.Seconds}s】"; str += $"{(int)TotalLength.TotalMinutes}m {TotalLength.Seconds}s";
return str; return str;
} }

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

@@ -184,8 +184,13 @@ namespace NadekoBot.Modules.Music
{ {
await musicPlayer.UpdateSongDurationsAsync().ConfigureAwait(false); await musicPlayer.UpdateSongDurationsAsync().ConfigureAwait(false);
} }
await channel.SendMessageAsync($"🎵`Now Playing` {currentSong.PrettyName} " + var embed = new EmbedBuilder()
$"{currentSong.PrettyCurrentTime()}").ConfigureAwait(false); .WithAuthor(eab => eab.WithName("🎵 Now Playing"))
.WithTitle($"{currentSong.PrettyName}")
.WithDescription($"{currentSong.PrettyUser}")
.WithFooter(ef => ef.WithText($"{currentSong.PrettyProvider} | {currentSong.PrettyCurrentTime()}"))
.WithColor(NadekoBot.OkColor);
await channel.EmbedAsync(embed.Build()).ConfigureAwait(false);
} }
[NadekoCommand, Usage, Description, Aliases] [NadekoCommand, Usage, Description, Aliases]