Merge pull request #1397 from samdivaio/1.5-music-changes
Stop no longer resets current song index 0, formatting changes. Use `.srm all` to get pre-update `.stop` behavior (clears the queue and stops the player)
This commit is contained in:
commit
1c72d2864a
@ -185,6 +185,8 @@ in order to open the database file you will need [DB Browser for SQLite](http://
|
|||||||
- click on **Apply**
|
- click on **Apply**
|
||||||
- click on **Write Changes**
|
- click on **Write Changes**
|
||||||
|
|
||||||
|
![nadekodb](https://cdn.discordapp.com/attachments/251504306010849280/254067055240806400/nadekodb.gif)
|
||||||
|
|
||||||
and that will save all the changes.
|
and that will save all the changes.
|
||||||
|
|
||||||
## Sharding your bot
|
## Sharding your bot
|
||||||
@ -205,7 +207,6 @@ and that will save all the changes.
|
|||||||
- Bot uses a random UDP port in [5000, 6000) range for communication between shards
|
- Bot uses a random UDP port in [5000, 6000) range for communication between shards
|
||||||
|
|
||||||
|
|
||||||
![nadekodb](https://cdn.discordapp.com/attachments/251504306010849280/254067055240806400/nadekodb.gif)
|
|
||||||
|
|
||||||
[Google Console]: https://console.developers.google.com
|
[Google Console]: https://console.developers.google.com
|
||||||
[DiscordApp]: https://discordapp.com/developers/applications/me
|
[DiscordApp]: https://discordapp.com/developers/applications/me
|
||||||
|
@ -24,6 +24,8 @@ brew install opusfile
|
|||||||
brew install libffi
|
brew install libffi
|
||||||
brew install libsodium
|
brew install libsodium
|
||||||
brew install tmux
|
brew install tmux
|
||||||
|
brew install python
|
||||||
|
brew install youtube-dl
|
||||||
```
|
```
|
||||||
|
|
||||||
#### Installing .NET Core SDK
|
#### Installing .NET Core SDK
|
||||||
|
@ -106,8 +106,8 @@ namespace NadekoBot.Modules.Administration
|
|||||||
[OwnerOnly]
|
[OwnerOnly]
|
||||||
public async Task LogEvents()
|
public async Task LogEvents()
|
||||||
{
|
{
|
||||||
await Context.Channel.SendConfirmAsync(GetText("log_events") + "\n" +
|
await Context.Channel.SendConfirmAsync(Format.Bold(GetText("log_events")) + "\n" +
|
||||||
string.Join(", ", Enum.GetNames(typeof(LogType)).Cast<string>()))
|
$"```fix\n{string.Join(", ", Enum.GetNames(typeof(LogType)).Cast<string>())}```")
|
||||||
.ConfigureAwait(false);
|
.ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -100,13 +100,13 @@ namespace NadekoBot.Modules.Administration
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
await Context.Channel.SendConfirmAsync("", string.Join("\n--\n", scmds.Select(x =>
|
await Context.Channel.SendConfirmAsync("", string.Join("\n", scmds.Select(x =>
|
||||||
{
|
{
|
||||||
string str = Format.Code(GetText("server")) + ": " + (x.GuildId == null ? "-" : x.GuildName + "/" + x.GuildId);
|
string str = $"```css\n[{GetText("server") + "]: " + (x.GuildId == null ? "-" : x.GuildName + " #" + x.GuildId)}";
|
||||||
|
|
||||||
str += $@"
|
str += $@"
|
||||||
{Format.Code(GetText("channel"))}: {x.ChannelName}/{x.ChannelId}
|
[{GetText("channel")}]: {x.ChannelName} #{x.ChannelId}
|
||||||
{Format.Code(GetText("command_text"))}: {x.CommandText}";
|
[{GetText("command_text")}]: {x.CommandText}```";
|
||||||
return str;
|
return str;
|
||||||
})), footer: GetText("page", page + 1))
|
})), footer: GetText("page", page + 1))
|
||||||
.ConfigureAwait(false);
|
.ConfigureAwait(false);
|
||||||
|
@ -161,11 +161,12 @@ namespace NadekoBot.Modules.Utility
|
|||||||
var usrs = (await Context.Guild.GetUsersAsync()).ToArray();
|
var usrs = (await Context.Guild.GetUsersAsync()).ToArray();
|
||||||
var roleUsers = usrs.Where(u => u.RoleIds.Contains(role.Id)).Select(u => u.ToString())
|
var roleUsers = usrs.Where(u => u.RoleIds.Contains(role.Id)).Select(u => u.ToString())
|
||||||
.ToArray();
|
.ToArray();
|
||||||
|
var inroleusers = string.Join(", ", roleUsers
|
||||||
|
.OrderBy(x => rng.Next())
|
||||||
|
.Take(50));
|
||||||
var embed = new EmbedBuilder().WithOkColor()
|
var embed = new EmbedBuilder().WithOkColor()
|
||||||
.WithTitle("ℹ️ " + Format.Bold(GetText("inrole_list", Format.Bold(role.Name))) + $" - {roleUsers.Length}")
|
.WithTitle("ℹ️ " + Format.Bold(GetText("inrole_list", Format.Bold(role.Name))) + $" - {roleUsers.Length}")
|
||||||
.WithDescription(string.Join(", ", roleUsers
|
.WithDescription($"```css\n[{role.Name}]\n{inroleusers}```");
|
||||||
.OrderBy(x => rng.Next())
|
|
||||||
.Take(50)));
|
|
||||||
await Context.Channel.EmbedAsync(embed).ConfigureAwait(false);
|
await Context.Channel.EmbedAsync(embed).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -62,7 +62,7 @@ namespace NadekoBot.Services.Music
|
|||||||
public bool RepeatCurrentSong { get; private set; }
|
public bool RepeatCurrentSong { get; private set; }
|
||||||
public bool Shuffle { get; private set; }
|
public bool Shuffle { get; private set; }
|
||||||
public bool Autoplay { get; private set; }
|
public bool Autoplay { get; private set; }
|
||||||
public bool RepeatPlaylist { get; private set; } = true;
|
public bool RepeatPlaylist { get; private set; } = false;
|
||||||
public uint MaxQueueSize
|
public uint MaxQueueSize
|
||||||
{
|
{
|
||||||
get => Queue.MaxQueueSize;
|
get => Queue.MaxQueueSize;
|
||||||
@ -447,7 +447,7 @@ namespace NadekoBot.Services.Music
|
|||||||
lock (locker)
|
lock (locker)
|
||||||
{
|
{
|
||||||
Stopped = true;
|
Stopped = true;
|
||||||
Queue.ResetCurrent();
|
//Queue.ResetCurrent();
|
||||||
if (clearQueue)
|
if (clearQueue)
|
||||||
Queue.Clear();
|
Queue.Clear();
|
||||||
Unpause();
|
Unpause();
|
||||||
|
Loading…
Reference in New Issue
Block a user