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

Removed music playlist and warning repositories

Browse Source
This commit is contained in:
Kwoth
2021-06-18 22:22:30 +02:00
parent a3fa8224c4
commit a6c7f1a629
9 changed files with 35 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/NadekoBot/Modules/Administration/Services/UserPunishService.cs
View File

@@ -13,6 +13,7 @@ using NadekoBot.Core.Common.TypeReaders.Models;
using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
using NadekoBot.Extensions;
using NadekoBot.Modules.Administration.Common;
using NadekoBot.Modules.Permissions.Services;
using Newtonsoft.Json;
using Serilog;
@@ -63,12 +64,13 @@ namespace NadekoBot.Modules.Administration.Services
ps = uow.GuildConfigs.ForId(guildId, set => set.Include(x => x.WarnPunishments))
.WarnPunishments;
warnings += uow.Warnings
warnings += uow._context
.Warnings
.ForId(guildId, userId)
.Where(w => !w.Forgiven && w.UserId == userId)
.Count();
uow.Warnings.Add(warn);
uow._context.Warnings.Add(warn);
uow.SaveChanges();
}
@@ -244,7 +246,7 @@ WHERE GuildId={guildId}
{
using (var uow = _db.GetDbContext())
{
return uow.Warnings.GetForGuild(gid).GroupBy(x => x.UserId).ToArray();
return uow._context.Warnings.GetForGuild(gid).GroupBy(x => x.UserId).ToArray();
}
}
@@ -252,7 +254,7 @@ WHERE GuildId={guildId}
{
using (var uow = _db.GetDbContext())
{
return uow.Warnings.ForId(gid, userId);
return uow._context.Warnings.ForId(gid, userId);
}
}
@@ -263,11 +265,11 @@ WHERE GuildId={guildId}
{
if (index == 0)
{
await uow.Warnings.ForgiveAll(guildId, userId, moderator);
await uow._context.Warnings.ForgiveAll(guildId, userId, moderator);
}
else
{
toReturn = uow.Warnings.Forgive(guildId, userId, moderator, index - 1);
toReturn = uow._context.Warnings.Forgive(guildId, userId, moderator, index - 1);
}
uow.SaveChanges();
}

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

@@ -10,6 +10,7 @@ using NadekoBot.Core.Services;
using NadekoBot.Core.Services.Database.Models;
using NadekoBot.Extensions;
using NadekoBot.Modules;
using NadekoBot.Modules.Music;
using NadekoBot.Modules.Music.Services;
using Serilog;
@@ -55,7 +56,7 @@ namespace NadekoBot.Core.Modules.Music
using (var uow = _db.GetDbContext())
{
playlists = uow.MusicPlaylists.GetPlaylistsOnPage(num);
playlists = uow._context.MusicPlaylists.GetPlaylistsOnPage(num);
}
var embed = new EmbedBuilder()
@@ -75,13 +76,13 @@ namespace NadekoBot.Core.Modules.Music
{
using (var uow = _db.GetDbContext())
{
var pl = uow.MusicPlaylists.GetById(id);
var pl = uow._context.MusicPlaylists.FirstOrDefault(x => x.Id == id);
if (pl != null)
{
if (_creds.IsOwner(ctx.User) || pl.AuthorId == ctx.User.Id)
{
uow.MusicPlaylists.Remove(pl);
uow._context.MusicPlaylists.Remove(pl);
await uow.SaveChangesAsync();
success = true;
}
@@ -109,7 +110,7 @@ namespace NadekoBot.Core.Modules.Music
MusicPlaylist mpl;
using (var uow = _db.GetDbContext())
{
mpl = uow.MusicPlaylists.GetWithSongs(id);
mpl = uow._context.MusicPlaylists.GetWithSongs(id);
}
await ctx.SendPaginatedConfirmAsync(page, (cur) =>
@@ -155,7 +156,7 @@ namespace NadekoBot.Core.Modules.Music
AuthorId = ctx.User.Id,
Songs = songs.ToList(),
};
uow.MusicPlaylists.Add(playlist);
uow._context.MusicPlaylists.Add(playlist);
await uow.SaveChangesAsync();
}
@@ -207,7 +208,7 @@ namespace NadekoBot.Core.Modules.Music
MusicPlaylist mpl;
using (var uow = _db.GetDbContext())
{
mpl = uow.MusicPlaylists.GetWithSongs(id);
mpl = uow._context.MusicPlaylists.GetWithSongs(id);
}
if (mpl == null)