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

.sad, .smch now persist restarts. .usmch added to unset music channel, since destroying a player won't reset it, Added --start-delay option for .race command

Browse Source
This commit is contained in:
Master Kwoth 2017-11-28 02:50:24 +07:00
parent 2ea157902e
commit 60e248c78a
10 changed files with 2168 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2051
NadekoBot.Core/Migrations/20171126024327_persist-sad-and-musicchannel.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

46
NadekoBot.Core/Migrations/20171126024327_persist-sad-and-musicchannel.cs Normal file
View File

@ -0,0 +1,46 @@
using Microsoft.EntityFrameworkCore.Migrations;
using System;
using System.Collections.Generic;
namespace NadekoBot.Migrations
{
public partial class persistsadandmusicchannel : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "MusicSettings",
columns: table => new
{
Id = table.Column<int>(type: "INTEGER", nullable: false)
.Annotation("Sqlite:Autoincrement", true),
DateAdded = table.Column<DateTime>(type: "TEXT", nullable: true),
GuildConfigId = table.Column<int>(type: "INTEGER", nullable: false),
MusicChannelId = table.Column<ulong>(type: "INTEGER", nullable: true),
SongAutoDelete = table.Column<bool>(type: "INTEGER", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_MusicSettings", x => x.Id);
table.ForeignKey(
name: "FK_MusicSettings_GuildConfigs_GuildConfigId",
column: x => x.GuildConfigId,
principalTable: "GuildConfigs",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateIndex(
name: "IX_MusicSettings_GuildConfigId",
table: "MusicSettings",
column: "GuildConfigId",
unique: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "MusicSettings");
}
}
}

10
NadekoBot.Core/Modules/Gambling/AnimalRacingCommands.cs
View File

@ -10,6 +10,8 @@ using NadekoBot.Common.Attributes;
using NadekoBot.Modules.Gambling.Common.AnimalRacing.Exceptions;
using NadekoBot.Modules.Gambling.Common.AnimalRacing;
using NadekoBot.Modules.Gambling.Services;
using NadekoBot.Core.Modules.Gambling.Common.AnimalRacing;
using CommandLine;
namespace NadekoBot.Modules.Gambling
{
@ -33,9 +35,13 @@ namespace NadekoBot.Modules.Gambling
[NadekoCommand, Usage, Description, Aliases]
[RequireContext(ContextType.Guild)]
public Task Race()
public Task Race(params string[] args)
{
var ar = new AnimalRace(_cs, _bc.BotConfig.RaceAnimals.Shuffle().ToArray());
var options = new RaceOptions();
var res = Parser.Default.ParseArguments<RaceOptions>(args);
res.MapResult(x => options, x => options);
var ar = new AnimalRace(options, _cs, _bc.BotConfig.RaceAnimals.Shuffle().ToArray());
if (!_service.AnimalRaces.TryAdd(Context.Guild.Id, ar))
return Context.Channel.SendErrorAsync(GetText("animal_race"), GetText("animal_race_already_started"));

14
NadekoBot.Core/Modules/Gambling/Common/AnimalRacing/AnimalRace.cs
View File

@ -9,6 +9,7 @@ using System.Collections.Immutable;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using NadekoBot.Core.Modules.Gambling.Common.AnimalRacing;
namespace NadekoBot.Modules.Gambling.Common.AnimalRacing
{
@ -36,12 +37,15 @@ namespace NadekoBot.Modules.Gambling.Common.AnimalRacing
private readonly SemaphoreSlim _locker = new SemaphoreSlim(1, 1);
private readonly HashSet<AnimalRacingUser> _users = new HashSet<AnimalRacingUser>();
private readonly CurrencyService _currency;
private readonly RaceOptions _options;
private readonly Queue<RaceAnimal> _animalsQueue;
public int MaxUsers { get; }
public AnimalRace(CurrencyService currency, RaceAnimal[] availableAnimals)
public AnimalRace(RaceOptions options, CurrencyService currency, RaceAnimal[] availableAnimals)
{
NormalizeOptions(options);
this._currency = currency;
this._options = options;
this._animalsQueue = new Queue<RaceAnimal>(availableAnimals);
this.MaxUsers = availableAnimals.Length;
@ -49,11 +53,17 @@ namespace NadekoBot.Modules.Gambling.Common.AnimalRacing
CurrentPhase = Phase.Ended;
}
private void NormalizeOptions(RaceOptions options)
{
if (options.StartDelay < 10 || options.StartDelay > 120)
options.StartDelay = 20;
}
public void Initialize() //lame name
{
var _t = Task.Run(async () =>
{
await Task.Delay(_startingDelayMiliseconds).ConfigureAwait(false);
await Task.Delay(_options.StartDelay * 1000).ConfigureAwait(false);
await _locker.WaitAsync().ConfigureAwait(false);
try

10
NadekoBot.Core/Modules/Gambling/Common/AnimalRacing/RaceOptions.cs Normal file
View File

@ -0,0 +1,10 @@
using CommandLine;
namespace NadekoBot.Core.Modules.Gambling.Common.AnimalRacing
{
public class RaceOptions
{
[Option("start-delay", Default = 20, Required = false)]
public int StartDelay { get; set; }
}
}

18
NadekoBot.Core/Modules/Music/Common/MusicPlayer.cs
View File

@ -11,6 +11,7 @@ using NadekoBot.Common.Collections;
using NadekoBot.Modules.Music.Services;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
using Discord.WebSocket;
namespace NadekoBot.Modules.Music.Common
{
@ -25,6 +26,8 @@ namespace NadekoBot.Modules.Music.Common
{
private readonly Thread _player;
public IVoiceChannel VoiceChannel { get; private set; }
private readonly ITextChannel _originalTextChannel;
private readonly Logger _log;
private MusicQueue Queue { get; } = new MusicQueue();
@ -130,15 +133,19 @@ namespace NadekoBot.Modules.Music.Common
: new TimeSpan(songs.Sum(s => s.TotalTime.Ticks));
}
}
public MusicPlayer(MusicService musicService, IGoogleApiService google, IVoiceChannel vch, ITextChannel output, float volume)
public MusicPlayer(MusicService musicService, MusicSettings ms, IGoogleApiService google,
IVoiceChannel vch, ITextChannel original, float volume)
{
_log = LogManager.GetCurrentClassLogger();
this.Volume = volume;
this.VoiceChannel = vch;
this._originalTextChannel = original;
this.SongCancelSource = new CancellationTokenSource();
this.OutputTextChannel = output;
if(ms.MusicChannelId is ulong cid)
{
this.OutputTextChannel = ((SocketGuild)original.Guild).GetTextChannel(cid) ?? original;
}
this._musicService = musicService;
this._google = google;
@ -657,6 +664,11 @@ namespace NadekoBot.Modules.Music.Common
public SongInfo MoveSong(int n1, int n2)
=> Queue.MoveSong(n1, n2);
public void SetMusicChannelToOriginal()
{
this.OutputTextChannel = _originalTextChannel;
}
//// this should be written better
//public TimeSpan TotalPlaytime =>
// _playlist.Any(s => s.TotalTime == TimeSpan.MaxValue) ?

14
NadekoBot.Core/Modules/Music/Services/MusicService.cs
View File

@ -15,6 +15,7 @@ using NadekoBot.Modules.Music.Common;
using NadekoBot.Modules.Music.Common.Exceptions;
using NadekoBot.Modules.Music.Common.SongResolver;
using NadekoBot.Common.Collections;
using System;
namespace NadekoBot.Modules.Music.Services
{
@ -27,6 +28,7 @@ namespace NadekoBot.Modules.Music.Services
private readonly ILocalization _localization;
private readonly DbService _db;
private readonly Logger _log;
private readonly ConcurrentDictionary<ulong, MusicSettings> _musicSettings;
private readonly SoundCloudApiService _sc;
private readonly IBotCredentials _creds;
private readonly ConcurrentDictionary<ulong, float> _defaultVolumes;
@ -49,6 +51,8 @@ namespace NadekoBot.Modules.Music.Services
_sc = sc;
_creds = creds;
_log = LogManager.GetCurrentClassLogger();
_musicSettings = bot.AllGuildConfigs.ToDictionary(x => x.GuildId, x => x.MusicSettings)
.ToConcurrent();
_client.LeftGuild += _client_LeftGuild;
@ -110,7 +114,10 @@ namespace NadekoBot.Modules.Music.Services
return MusicPlayers.GetOrAdd(guildId, _ =>
{
var vol = GetDefaultVolume(guildId);
var mp = new MusicPlayer(this, _google, voiceCh, textCh, vol);
if (!_musicSettings.TryGetValue(guildId, out var ms))
ms = new MusicSettings();
var mp = new MusicPlayer(this, ms, _google, voiceCh, textCh, vol);
IUserMessage playingMessage = null;
IUserMessage lastFinishedMessage = null;
@ -264,5 +271,10 @@ namespace NadekoBot.Modules.Music.Services
return val;
}
public void UpdateSettings(ulong id, MusicSettings musicSettings)
{
_musicSettings.AddOrUpdate(id, musicSettings, delegate { return musicSettings; });
}
}
}

1
NadekoBot.Core/NadekoBot.Core.csproj
View File

@ -8,6 +8,7 @@
<ItemGroup>
<PackageReference Include="AngleSharp" Version="0.9.9" />
<PackageReference Include="CommandLineParser" Version="2.1.1-beta" />
<PackageReference Include="Discord.Net" Version="2.0.0-alpha-build-00839" />
<PackageReference Include="CoreCLR-NCalc" Version="2.1.3" />
<PackageReference Include="Google.Apis.Urlshortener.v1" Version="1.29.1.138" />

3
NadekoBot.Core/Services/Database/Models/GuildConfig.cs
View File

@ -92,8 +92,7 @@ namespace NadekoBot.Core.Services.Database.Models
public XpSettings XpSettings { get; set; }
public List<FeedSub> FeedSubs { get; set; } = new List<FeedSub>();
public bool AutoDcFromVc { get; set; }
//public List<ProtectionIgnoredChannel> ProtectionIgnoredChannels { get; set; } = new List<ProtectionIgnoredChannel>();
public MusicSettings MusicSettings { get; set; } = new MusicSettings();
}
public class NsfwBlacklitedTag : DbEntity

11
NadekoBot.Core/Services/Database/Models/MusicSettings.cs Normal file
View File

@ -0,0 +1,11 @@
namespace NadekoBot.Core.Services.Database.Models
{
public class MusicSettings : DbEntity
{
public int GuildConfigId { get; set; }
public GuildConfig GuildConfig { get; set; }
public bool SongAutoDelete { get; set; } = false;
public ulong? MusicChannelId { get; set; } = null;
}
}