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

Massive cleanup

Browse Source 
- Removed GuildConfigs repository, moved to extensions
- Moved StreamSettings extension to GuildConfig extensions
- namespace NadekoBot.Core has been simplified to NadekoBot in many places (more to come)
- Replaced some raw delete queries with simple linqtodb queries
This commit is contained in:
Kwoth
2021-06-19 03:32:48 +02:00
parent c7ff982ec1
commit 15dac7e3ed
191 changed files with 563 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/NadekoBot/Modules/Music/Common/ICachableTrackData.cs
View File

@@ -1,6 +1,6 @@
using System;
namespace NadekoBot.Core.Modules.Music
namespace NadekoBot.Modules.Music
{
public interface ICachableTrackData
{

2
src/NadekoBot/Modules/Music/Common/ILocalTrackResolver.cs
View File

@@ -1,6 +1,6 @@
using System.Collections.Generic;
namespace NadekoBot.Core.Modules.Music
namespace NadekoBot.Modules.Music
{
public interface ILocalTrackResolver : IPlatformQueryResolver
{

2
src/NadekoBot/Modules/Music/Common/IMusicPlayer.cs
View File

@@ -4,7 +4,7 @@ using System.Threading.Tasks;
using NadekoBot.Core.Services.Database.Models;
#nullable enable
namespace NadekoBot.Core.Modules.Music
namespace NadekoBot.Modules.Music
{
public interface IMusicPlayer : IDisposable
{

2
src/NadekoBot/Modules/Music/Common/IMusicQueue.cs
View File

@@ -2,7 +2,7 @@
using System;
using System.Collections.Generic;
namespace NadekoBot.Core.Modules.Music
namespace NadekoBot.Modules.Music
{
public interface IMusicQueue
{

2
src/NadekoBot/Modules/Music/Common/IPlatformQueryResolver.cs
View File

@@ -1,7 +1,7 @@
#nullable enable
using System.Threading.Tasks;
namespace NadekoBot.Core.Modules.Music
namespace NadekoBot.Modules.Music
{
public interface IPlatformQueryResolver
{

2
src/NadekoBot/Modules/Music/Common/IQueuedTrackInfo.cs
View File

@@ -1,4 +1,4 @@
namespace NadekoBot.Core.Modules.Music
namespace NadekoBot.Modules.Music
{
public interface IQueuedTrackInfo : ITrackInfo
{

2
src/NadekoBot/Modules/Music/Common/IRadioResolver.cs
View File

@@ -1,4 +1,4 @@
namespace NadekoBot.Core.Modules.Music
namespace NadekoBot.Modules.Music
{
public interface IRadioResolver : IPlatformQueryResolver
{

2
src/NadekoBot/Modules/Music/Common/ISoundcloudResolver.cs
View File

@@ -1,6 +1,6 @@
using System.Collections.Generic;
namespace NadekoBot.Core.Modules.Music
namespace NadekoBot.Modules.Music
{
public interface ISoundcloudResolver : IPlatformQueryResolver
{

2
src/NadekoBot/Modules/Music/Common/ITrackCacher.cs
View File

@@ -3,7 +3,7 @@ using System;
using System.Collections.Generic;
using System.Threading.Tasks;
namespace NadekoBot.Core.Modules.Music
namespace NadekoBot.Modules.Music
{
public interface ITrackCacher
{

2
src/NadekoBot/Modules/Music/Common/ITrackInfo.cs
View File

@@ -2,7 +2,7 @@
using System;
using System.Threading.Tasks;
namespace NadekoBot.Core.Modules.Music
namespace NadekoBot.Modules.Music
{
public interface ITrackInfo
{

2
src/NadekoBot/Modules/Music/Common/ITrackResolveProvider.cs
View File

@@ -1,7 +1,7 @@
#nullable enable
using System.Threading.Tasks;
namespace NadekoBot.Core.Modules.Music
namespace NadekoBot.Modules.Music
{
public interface ITrackResolveProvider
{

2
src/NadekoBot/Modules/Music/Common/IYoutubeResolver.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
namespace NadekoBot.Core.Modules.Music
namespace NadekoBot.Modules.Music
{
public interface IYoutubeResolver : IPlatformQueryResolver
{

2
src/NadekoBot/Modules/Music/Common/Impl/CachableTrackData.cs
View File

@@ -1,7 +1,7 @@
using System;
using System.Text.Json.Serialization;
namespace NadekoBot.Core.Modules.Music
namespace NadekoBot.Modules.Music
{
public sealed class CachableTrackData : ICachableTrackData
{

2
src/NadekoBot/Modules/Music/Common/Impl/MultimediaTimer.cs
View File

@@ -2,7 +2,7 @@
using System.Runtime.InteropServices;
using Serilog;
namespace NadekoBot.Core.Modules.Music.Common
namespace NadekoBot.Modules.Music.Common
{
public sealed class MultimediaTimer : IDisposable
{

2
src/NadekoBot/Modules/Music/Common/Impl/MusicExtensions.cs
View File

@@ -2,7 +2,7 @@
using Discord;
using NadekoBot.Extensions;
namespace NadekoBot.Core.Modules.Music
namespace NadekoBot.Modules.Music
{
public static class MusicExtensions
{

2
src/NadekoBot/Modules/Music/Common/Impl/MusicPlatform.cs
View File

@@ -1,4 +1,4 @@
namespace NadekoBot.Core.Modules.Music
namespace NadekoBot.Modules.Music
{
public enum MusicPlatform
{

4
src/NadekoBot/Modules/Music/Common/Impl/MusicPlayer.cs
View File

@@ -10,13 +10,13 @@ using System.Threading;
using System.Threading.Tasks;
using Ayu.Discord.Voice;
using NadekoBot.Common;
using NadekoBot.Core.Modules.Music.Common;
using NadekoBot.Modules.Music.Common;
using NadekoBot.Core.Services.Database.Models;
using NadekoBot.Extensions;
using NadekoBot.Modules.Music;
using Serilog;
namespace NadekoBot.Core.Modules.Music
namespace NadekoBot.Modules.Music
{
public sealed class MusicPlayer : IMusicPlayer
{

2
src/NadekoBot/Modules/Music/Common/Impl/MusicQueue.cs
View File

@@ -4,7 +4,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace NadekoBot.Core.Modules.Music
namespace NadekoBot.Modules.Music
{
public sealed partial class MusicQueue
{

2
src/NadekoBot/Modules/Music/Common/Impl/RedisTrackCacher.cs
View File

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
using Serilog;
using StackExchange.Redis;
namespace NadekoBot.Core.Modules.Music
namespace NadekoBot.Modules.Music
{
public sealed class RedisTrackCacher : ITrackCacher
{

2
src/NadekoBot/Modules/Music/Common/Impl/RemoteTrackInfo.cs
View File

@@ -2,7 +2,7 @@
using System;
using System.Threading.Tasks;
namespace NadekoBot.Core.Modules.Music
namespace NadekoBot.Modules.Music
{
public sealed class RemoteTrackInfo : ITrackInfo
{

2
src/NadekoBot/Modules/Music/Common/Impl/SimpleTrackInfo.cs
View File

@@ -2,7 +2,7 @@
using System;
using System.Threading.Tasks;
namespace NadekoBot.Core.Modules.Music
namespace NadekoBot.Modules.Music
{
public sealed class SimpleTrackInfo : ITrackInfo
{

2
src/NadekoBot/Modules/Music/Common/Resolvers/LocalTrackResolver.cs
View File

@@ -6,7 +6,7 @@ using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using NadekoBot.Core.Modules.Music;
using NadekoBot.Modules.Music;
using NadekoBot.Extensions;
using Serilog;

2
src/NadekoBot/Modules/Music/Common/Resolvers/RadioResolveStrategy.cs
View File

@@ -2,7 +2,7 @@
using System.Net.Http;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using NadekoBot.Core.Modules.Music;
using NadekoBot.Modules.Music;
using NadekoBot.Extensions;
using Serilog;

3
src/NadekoBot/Modules/Music/Common/Resolvers/SoundcloudResolver.cs
View File

@@ -3,9 +3,8 @@ using System.Collections.Generic;
using System.Linq;
using System.Net.Http;
using System.Runtime.CompilerServices;
using NadekoBot.Core.Services.Impl;
using System.Threading.Tasks;
using NadekoBot.Core.Modules.Music;
using NadekoBot.Core.Services.Impl;
using NadekoBot.Extensions;
using Newtonsoft.Json.Linq;

2
src/NadekoBot/Modules/Music/Common/Resolvers/TrackResolveProvider.cs
View File

@@ -3,7 +3,7 @@ using System;
using System.Threading.Tasks;
using Serilog;
namespace NadekoBot.Core.Modules.Music
namespace NadekoBot.Modules.Music
{
public sealed class TrackResolveProvider : ITrackResolveProvider
{

2
src/NadekoBot/Modules/Music/Common/Resolvers/YtdlYoutubeResolver.cs
View File

@@ -10,7 +10,7 @@ using NadekoBot.Core.Services.Impl;
using NadekoBot.Extensions;
using Serilog;
namespace NadekoBot.Core.Modules.Music
namespace NadekoBot.Modules.Music
{
public sealed class YtdlYoutubeResolver : IYoutubeResolver
{

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

@@ -13,7 +13,7 @@ using NadekoBot.Modules;
using NadekoBot.Modules.Administration.Services;
using NadekoBot.Modules.Music.Services;
namespace NadekoBot.Core.Modules.Music
namespace NadekoBot.Modules.Music
{
[NoPublicBot]
public sealed partial class Music : NadekoModule<IMusicService>

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

@@ -8,13 +8,15 @@ using Discord.Commands;
using NadekoBot.Common.Attributes;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
using NadekoBot.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Extensions;
using NadekoBot.Modules;
using NadekoBot.Modules.Music;
using NadekoBot.Modules.Music.Services;
using Serilog;
namespace NadekoBot.Core.Modules.Music
namespace NadekoBot.Modules.Music
{
public sealed partial class Music
{

2
src/NadekoBot/Modules/Music/Services/IMusicService.cs
View File

@@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis;
using System.Threading.Tasks;
using Discord;
using NadekoBot.Core.Common;
using NadekoBot.Core.Modules.Music;
using NadekoBot.Modules.Music;
using NadekoBot.Core.Services.Database.Models;
namespace NadekoBot.Modules.Music.Services

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

@@ -7,10 +7,13 @@ using System.Linq;
using System.Threading.Tasks;
using Discord;
using Discord.WebSocket;
using NadekoBot.Core.Modules.Music;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
using NadekoBot.Core.Services.Database.Repositories.Impl;
using NadekoBot.Modules.Music;
using NadekoBot.Services;
using NadekoBot.Services.Database.Models;
using NadekoBot.Services.Database.Repositories.Impl;
using NadekoBot.Extensions;
using Serilog;

8
src/NadekoBot/Modules/Music/Services/_OldMusicService.cs
View File

@@ -82,7 +82,7 @@
// {
// using (var uow = _db.GetDbContext())
// {
// return uow.GuildConfigs.ForId(guildId, set => set).DefaultMusicVolume;
// return uow._context.GuildConfigsForId(guildId, set => set).DefaultMusicVolume;
// }
// });
// }
@@ -256,7 +256,7 @@
// bool val;
// using (var uow = _db.GetDbContext())
// {
// var gc = uow.GuildConfigs.ForId(id, set => set);
// var gc = uow._context.GuildConfigsForId(id, set => set);
// val = gc.AutoDcFromVc = !gc.AutoDcFromVc;
// uow.SaveChanges();
// }
@@ -278,7 +278,7 @@
// {
// using (var uow = _db.GetDbContext())
// {
// var ms = uow.GuildConfigs.ForId(guildId, set => set.Include(x => x.MusicSettings)).MusicSettings;
// var ms = uow._context.GuildConfigsForId(guildId, set => set.Include(x => x.MusicSettings)).MusicSettings;
// ms.MusicChannelId = cid;
// uow.SaveChanges();
// }
@@ -288,7 +288,7 @@
// {
// using (var uow = _db.GetDbContext())
// {
// var ms = uow.GuildConfigs.ForId(guildId, set => set.Include(x => x.MusicSettings)).MusicSettings;
// var ms = uow._context.GuildConfigsForId(guildId, set => set.Include(x => x.MusicSettings)).MusicSettings;
// ms.SongAutoDelete = val;
// uow.SaveChanges();
// }

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

@@ -395,7 +395,7 @@
// }
// using (var uow = _db.GetDbContext())
// {
// uow.GuildConfigs.ForId(ctx.Guild.Id, set => set).DefaultMusicVolume = val / 100.0f;
// uow._context.GuildConfigsForId(ctx.Guild.Id, set => set).DefaultMusicVolume = val / 100.0f;
// uow.SaveChanges();
// }
// await ReplyConfirmLocalizedAsync("defvol_set", val).ConfigureAwait(false);