Emotions-stuff/elliebot
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 23 Packages Wiki Activity

Updated the Ellie.Bot.Db module

Browse source
This commit is contained in:
Emotion 2023-08-07 21:16:16 +12:00
parent efcb8db259
commit fd210a8d9f
No known key found for this signature in database
GPG key ID: D7D3E4C27A98C37B
49 changed files with 122 additions and 459 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Ellie.Bot.Db/.globalconfig Normal file
View file

@ -0,0 +1 @@
dotnet_diagnostic.CS8981.severity = none

6
src/Ellie.Bot.Db/Extensions/GuildConfigExtensions.cs
View file

@ -29,7 +29,7 @@ public static class GuildConfigExtensions
/// <param name="ctx">Db Context</param>
/// <param name="guildId">Id of the guild to get stream role settings for.</param>
/// <returns>Guild'p stream role settings</returns>
public static StreamRoleSettings GetStreamRoleSettings(this EllieBaseContext ctx, ulong guildId)
public static StreamRoleSettings GetStreamRoleSettings(this DbContext ctx, ulong guildId)
{
var conf = ctx.GuildConfigsForId(guildId,
set => set.Include(y => y.StreamRole)
@ -120,7 +120,7 @@ public static class GuildConfigExtensions
// .First(x => x.GuildId == guildId);
}
public static LogSetting LogSettingsFor(this EllieBaseContext ctx, ulong guildId)
public static LogSetting LogSettingsFor(this DbContext ctx, ulong guildId)
{
var logSetting = ctx.Set<LogSetting>()
.AsQueryable()
@ -148,7 +148,7 @@ public static class GuildConfigExtensions
return query.ToList();
}
public static GuildConfig GcWithPermissionsFor(this EllieBaseContext ctx, ulong guildId)
public static GuildConfig GcWithPermissionsFor(this DbContext ctx, ulong guildId)
{
var config = ctx.Set<GuildConfig>().AsQueryable()
.Where(gc => gc.GuildId == guildId)

27
src/Ellie.Bot.Db/Extensions/MusicPlayerSettingsExtensions.cs
View file

@ -1,27 +0,0 @@
#nullable disable
using Microsoft.EntityFrameworkCore;
using Ellie.Services.Database.Models;
namespace Ellie.Db;
public static class MusicPlayerSettingsExtensions
{
public static async Task<MusicPlayerSettings> ForGuildAsync(this DbSet<MusicPlayerSettings> settings, ulong guildId)
{
var toReturn = await settings.AsQueryable().FirstOrDefaultAsync(x => x.GuildId == guildId);
if (toReturn is null)
{
var newSettings = new MusicPlayerSettings
{
GuildId = guildId,
PlayerRepeat = PlayerRepeatType.Queue
};
await settings.AddAsync(newSettings);
return newSettings;
}
return toReturn;
}
}

19
src/Ellie.Bot.Db/Extensions/MusicPlaylistExtensions.cs
View file

@ -1,19 +0,0 @@
#nullable disable
using Microsoft.EntityFrameworkCore;
using Ellie.Services.Database.Models;
namespace Ellie.Db;
public static class MusicPlaylistExtensions
{
public static List<MusicPlaylist> GetPlaylistsOnPage(this DbSet<MusicPlaylist> playlists, int num)
{
if (num < 1)
throw new ArgumentOutOfRangeException(nameof(num));
return playlists.AsQueryable().Skip((num - 1) * 20).Take(20).Include(pl => pl.Songs).ToList();
}
public static MusicPlaylist GetWithSongs(this DbSet<MusicPlaylist> playlists, int id)
=> playlists.Include(mpl => mpl.Songs).FirstOrDefault(mpl => mpl.Id == id);
}

145
src/Ellie.Bot.Db/Extensions/WaifuExtensions.cs
View file

@ -1,145 +0,0 @@
#nullable disable
using LinqToDB;
using LinqToDB.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore;
using Ellie.Db.Models;
using Ellie.Services.Database;
using Ellie.Services.Database.Models;
namespace Ellie.Db;
public class WaifuInfoStats
{
public int WaifuId { get; init; }
public string FullName { get; init; }
public long Price { get; init; }
public string ClaimerName { get; init; }
public string AffinityName { get; init; }
public int AffinityCount { get; init; }
public int DivorceCount { get; init; }
public int ClaimCount { get; init; }
}
public static class WaifuExtensions
{
public static WaifuInfo ByWaifuUserId(
this DbSet<WaifuInfo> waifus,
ulong userId,
Func<DbSet<WaifuInfo>, IQueryable<WaifuInfo>> includes = null)
{
if (includes is null)
{
return waifus.Include(wi => wi.Waifu)
.Include(wi => wi.Affinity)
.Include(wi => wi.Claimer)
.Include(wi => wi.Items)
.FirstOrDefault(wi => wi.Waifu.UserId == userId);
}
return includes(waifus).AsQueryable().FirstOrDefault(wi => wi.Waifu.UserId == userId);
}
public static IEnumerable<WaifuLbResult> GetTop(this DbSet<WaifuInfo> waifus, int count, int skip = 0)
{
if (count < 0)
throw new ArgumentOutOfRangeException(nameof(count));
if (count == 0)
return new List<WaifuLbResult>();
return waifus.Include(wi => wi.Waifu)
.Include(wi => wi.Affinity)
.Include(wi => wi.Claimer)
.OrderByDescending(wi => wi.Price)
.Skip(skip)
.Take(count)
.Select(x => new WaifuLbResult
{
Affinity = x.Affinity == null ? null : x.Affinity.Username,
AffinityDiscrim = x.Affinity == null ? null : x.Affinity.Discriminator,
Claimer = x.Claimer == null ? null : x.Claimer.Username,
ClaimerDiscrim = x.Claimer == null ? null : x.Claimer.Discriminator,
Username = x.Waifu.Username,
Discrim = x.Waifu.Discriminator,
Price = x.Price
})
.ToList();
}
public static decimal GetTotalValue(this DbSet<WaifuInfo> waifus)
=> waifus.AsQueryable().Where(x => x.ClaimerId != null).Sum(x => x.Price);
public static ulong GetWaifuUserId(this DbSet<WaifuInfo> waifus, ulong ownerId, string name)
=> waifus.AsQueryable()
.AsNoTracking()
.Where(x => x.Claimer.UserId == ownerId && x.Waifu.Username + "#" + x.Waifu.Discriminator == name)
.Select(x => x.Waifu.UserId)
.FirstOrDefault();
public static async Task<WaifuInfoStats> GetWaifuInfoAsync(this DbContext ctx, ulong userId)
{
await ctx.Set<WaifuInfo>()
.ToLinqToDBTable()
.InsertOrUpdateAsync(() => new()
{
AffinityId = null,
ClaimerId = null,
Price = 1,
WaifuId = ctx.Set<DiscordUser>().Where(x => x.UserId == userId).Select(x => x.Id).First()
},
_ => new(),
() => new()
{
WaifuId = ctx.Set<DiscordUser>().Where(x => x.UserId == userId).Select(x => x.Id).First()
});
var toReturn = ctx.Set<WaifuInfo>().AsQueryable()
.Where(w => w.WaifuId
== ctx.Set<DiscordUser>()
.AsQueryable()
.Where(u => u.UserId == userId)
.Select(u => u.Id)
.FirstOrDefault())
.Select(w => new WaifuInfoStats
{
WaifuId = w.WaifuId,
FullName =
ctx.Set<DiscordUser>()
.AsQueryable()
.Where(u => u.UserId == userId)
.Select(u => u.Username + "#" + u.Discriminator)
.FirstOrDefault(),
AffinityCount =
ctx.Set<WaifuUpdate>()
.AsQueryable()
.Count(x => x.UserId == w.WaifuId
&& x.UpdateType == WaifuUpdateType.AffinityChanged
&& x.NewId != null),
AffinityName =
ctx.Set<DiscordUser>()
.AsQueryable()
.Where(u => u.Id == w.AffinityId)
.Select(u => u.Username + "#" + u.Discriminator)
.FirstOrDefault(),
ClaimCount = ctx.Set<WaifuInfo>().AsQueryable().Count(x => x.ClaimerId == w.WaifuId),
ClaimerName =
ctx.Set<DiscordUser>()
.AsQueryable()
.Where(u => u.Id == w.ClaimerId)
.Select(u => u.Username + "#" + u.Discriminator)
.FirstOrDefault(),
DivorceCount =
ctx.Set<WaifuUpdate>()
.AsQueryable()
.Count(x => x.OldId == w.WaifuId
&& x.NewId == null
&& x.UpdateType == WaifuUpdateType.Claimed),
Price = w.Price,
})
.FirstOrDefault();
if (toReturn is null)
return null;
return toReturn;
}
}

67
src/Ellie.Bot.Db/Models/AntiProtection.cs
View file

@ -1,67 +0,0 @@
#nullable disable
namespace Ellie.Services.Database.Models;
// todo db required, nullable?
public class AntiRaidSetting : DbEntity
{
public int GuildConfigId { get; set; }
public GuildConfig GuildConfig { get; set; }
public int UserThreshold { get; set; }
public int Seconds { get; set; }
public PunishmentAction Action { get; set; }
/// <summary>
/// Duration of the punishment, in minutes. This works only for supported Actions, like:
/// Mute, Chatmute, Voicemute, etc...
/// </summary>
public int PunishDuration { get; set; }
}
public class AntiSpamSetting : DbEntity
{
public int GuildConfigId { get; set; }
public GuildConfig GuildConfig { get; set; }
public PunishmentAction Action { get; set; }
public int MessageThreshold { get; set; } = 3;
public int MuteTime { get; set; }
public ulong? RoleId { get; set; }
public HashSet<AntiSpamIgnore> IgnoredChannels { get; set; } = new();
}
public class AntiAltSetting
{
public int Id { get; set; }
public int GuildConfigId { get; set; }
public TimeSpan MinAge { get; set; }
public PunishmentAction Action { get; set; }
public int ActionDurationMinutes { get; set; }
public ulong? RoleId { get; set; }
}
public enum PunishmentAction
{
Mute,
Kick,
Ban,
Softban,
RemoveRoles,
ChatMute,
VoiceMute,
AddRole,
Warn,
TimeOut
}
public class AntiSpamIgnore : DbEntity
{
public ulong ChannelId { get; set; }
public override int GetHashCode()
=> ChannelId.GetHashCode();
public override bool Equals(object obj)
=> obj is AntiSpamIgnore inst ? inst.ChannelId == ChannelId : false;
}

2
src/Ellie.Bot.Db/Models/AutoPublishChannel.cs
View file

@ -2,7 +2,7 @@ using Ellie.Services.Database.Models;
namespace Ellie.Db.Models;
public class AutoPublishChannel : DbEntity
public class AutoPublishChannel
{
public ulong GuildId { get; set; }
public ulong ChannelId { get; set; }

0
src/Ellie.Bot.Db/Models/DiscordPemOverride.cs → src/Ellie.Bot.Db/Models/DiscordPermOverride.cs
View file

1
src/Ellie.Bot.Db/Models/DiscordUser.cs
View file

@ -3,7 +3,6 @@ using Ellie.Services.Database.Models;
namespace Ellie.Db.Models;
// FUTURE remove LastLevelUp from here and UserXpStats
public class DiscordUser : DbEntity
{

1
src/Ellie.Bot.Db/Models/FollowedStream.cs
View file

@ -31,5 +31,4 @@ public class FollowedStream : DbEntity
public override bool Equals(object obj)
=> obj is FollowedStream fs && Equals(fs);
}

10
src/Ellie.Bot.Db/Models/MusicPlaylist.cs
View file

@ -1,10 +0,0 @@
#nullable disable
namespace Ellie.Services.Database.Models;
public class MusicPlaylist : DbEntity
{
public string Name { get; set; }
public string Author { get; set; }
public ulong AuthorId { get; set; }
public List<PlaylistSong> Songs { get; set; } = new();
}

61
src/Ellie.Bot.Db/Models/MusicSettings.cs
View file

@ -1,61 +0,0 @@
#nullable disable
namespace Ellie.Services.Database.Models;
public class MusicPlayerSettings
{
/// <summary>
/// Auto generated Id
/// </summary>
public int Id { get; set; }
/// <summary>
/// Id of the guild
/// </summary>
public ulong GuildId { get; set; }
/// <summary>
/// Queue repeat type
/// </summary>
public PlayerRepeatType PlayerRepeat { get; set; } = PlayerRepeatType.Queue;
/// <summary>
/// Channel id the bot will always try to send track related messages to
/// </summary>
public ulong? MusicChannelId { get; set; }
/// <summary>
/// Default volume player will be created with
/// </summary>
public int Volume { get; set; } = 100;
/// <summary>
/// Whether the bot should auto disconnect from the voice channel once the queue is done
/// This only has effect if
/// </summary>
public bool AutoDisconnect { get; set; }
/// <summary>
/// Selected quality preset for the music player
/// </summary>
public QualityPreset QualityPreset { get; set; }
/// <summary>
/// Whether the bot will automatically queue related songs
/// </summary>
public bool AutoPlay { get; set; }
}
public enum QualityPreset
{
Highest,
High,
Medium,
Low
}
public enum PlayerRepeatType
{
None,
Track,
Queue
}

2
src/Ellie.Bot.Db/Models/StreamOnlineMessage.cs
View file

@ -1,4 +1,4 @@
#nullable disable
#nullable disable
using Ellie.Services.Database.Models;
namespace Ellie.Db.Models;

33
src/Ellie.Bot.Db/Models/Waifu.cs
View file

@ -1,33 +0,0 @@
#nullable disable
using Ellie.Db.Models;
namespace Ellie.Services.Database.Models;
public class WaifuInfo : DbEntity
{
public int WaifuId { get; set; }
public DiscordUser Waifu { get; set; }
public int? ClaimerId { get; set; }
public DiscordUser Claimer { get; set; }
public int? AffinityId { get; set; }
public DiscordUser Affinity { get; set; }
public long Price { get; set; }
public List<WaifuItem> Items { get; set; } = new();
}
public class WaifuLbResult
{
public string Username { get; set; }
public string Discrim { get; set; }
public string Claimer { get; set; }
public string ClaimerDiscrim { get; set; }
public string Affinity { get; set; }
public string AffinityDiscrim { get; set; }
public long Price { get; set; }
}

10
src/Ellie.Bot.Db/Models/WaifuItem.cs
View file

@ -1,10 +0,0 @@
#nullable disable
namespace Ellie.Services.Database.Models;
public class WaifuItem : DbEntity
{
public WaifuInfo WaifuInfo { get; set; }
public int? WaifuInfoId { get; set; }
public string ItemEmoji { get; set; }
public string Name { get; set; }
}

23
src/Ellie.Bot.Db/Models/WaifuUpdate.cs
View file

@ -1,23 +0,0 @@
#nullable disable
using Ellie.Db.Models;
namespace Ellie.Services.Database.Models;
public class WaifuUpdate : DbEntity
{
public int UserId { get; set; }
public DiscordUser User { get; set; }
public WaifuUpdateType UpdateType { get; set; }
public int? OldId { get; set; }
public DiscordUser Old { get; set; }
public int? NewId { get; set; }
public DiscordUser New { get; set; }
}
public enum WaifuUpdateType
{
AffinityChanged,
Claimed
}

18
src/Ellie.Bot.Db/Models/XpShopOwnedItem.cs
View file

@ -1,18 +0,0 @@
#nullable disable warnings
using Ellie.Services.Database.Models;
namespace Ellie.Db.Models;
public class XpShopOwnedItem : DbEntity
{
public ulong UserId { get; set; }
public XpShopItemType ItemType { get; set; }
public bool IsUsing { get; set; }
public string ItemKey { get; set; }
}
public enum XpShopItemType
{
Background = 0,
Frame = 1,
}

11
src/Ellie.Bot.Db/Models/anti/AntiAltSetting.cs Normal file
View file

@ -0,0 +1,11 @@
namespace Ellie.Services.Database.Models;
public class AntiAltSetting
{
public int Id { get; set; }
public int GuildConfigId { get; set; }
public TimeSpan MinAge { get; set; }
public PunishmentAction Action { get; set; }
public int ActionDurationMinutes { get; set; }
public ulong? RoleId { get; set; }
}

19
src/Ellie.Bot.Db/Models/anti/AntiRaidSetting.cs Normal file
View file

@ -0,0 +1,19 @@
#nullable disable
namespace Ellie.Services.Database.Models;
// todo db required, nullable?
public class AntiRaidSetting : DbEntity
{
public int GuildConfigId { get; set; }
public GuildConfig GuildConfig { get; set; }
public int UserThreshold { get; set; }
public int Seconds { get; set; }
public PunishmentAction Action { get; set; }
/// <summary>
/// Duration of the punishment, in minutes. This works only for supported Actions, like:
/// Mute, Chatmute, Voicemute, etc...
/// </summary>
public int PunishDuration { get; set; }
}

12
src/Ellie.Bot.Db/Models/anti/AntiSpamIgnore.cs Normal file
View file

@ -0,0 +1,12 @@
namespace Ellie.Services.Database.Models;
public class AntiSpamIgnore : DbEntity
{
public ulong ChannelId { get; set; }
public override int GetHashCode()
=> ChannelId.GetHashCode();
public override bool Equals(object obj)
=> obj is AntiSpamIgnore inst ? inst.ChannelId == ChannelId : false;
}

13
src/Ellie.Bot.Db/Models/anti/AntiSpamSetting.cs Normal file
View file

@ -0,0 +1,13 @@
namespace Ellie.Services.Database.Models;
public class AntiSpamSetting : DbEntity
{
public int GuildConfigId { get; set; }
public GuildConfig GuildConfig { get; set; }
public PunishmentAction Action { get; set; }
public int MessageThreshold { get; set; } = 3;
public int MuteTime { get; set; }
public ulong? RoleId { get; set; }
public HashSet<AntiSpamIgnore> IgnoredChannels { get; set; } = new();
}

0
src/Ellie.Bot.Db/Models/ClubInfo.cs → src/Ellie.Bot.Db/Models/club/ClubInfo.cs
View file

2
src/Ellie.Bot.Db/Models/BankUser.cs → src/Ellie.Bot.Db/Models/currency/BankUser.cs
View file

@ -1,4 +1,4 @@
using Ellie.Services.Database.Models;
using Ellie.Services.Database.Models;
namespace Ellie.Db.Models;

0
src/Ellie.Bot.Db/Models/EllieExpression.cs → src/Ellie.Bot.Db/Models/expr/EllieExpression.cs
View file

1
src/Ellie.Bot.Db/Models/Quote.cs → src/Ellie.Bot.Db/Models/expr/Quote.cs
View file

@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations;
namespace Ellie.Services.Database.Models;
public class Quote : DbEntity
{
public ulong GuildId { get; set; }

0
src/Ellie.Bot.Db/Models/FilterChannelId.cs → src/Ellie.Bot.Db/Models/filter/FilterChannelId.cs
View file

0
src/Ellie.Bot.Db/Models/FilterLinksChannelId.cs → src/Ellie.Bot.Db/Models/filter/FilterLinksChannelId.cs
View file

0
src/Ellie.Bot.Db/Models/FilteredWord.cs → src/Ellie.Bot.Db/Models/filter/FilteredWord.cs
View file

0
src/Ellie.Bot.Db/Models/BanTemplate.cs → src/Ellie.Bot.Db/Models/punish/BanTemplate.cs
View file

0
src/Ellie.Bot.Db/Models/MutedUserId.cs → src/Ellie.Bot.Db/Models/punish/MutedUserId.cs
View file

0
src/Ellie.Bot.Db/Models/WarnExpireAction.cs → src/Ellie.Bot.Db/Models/punish/WarnExpireAction.cs
View file

0
src/Ellie.Bot.Db/Models/Warning.cs → src/Ellie.Bot.Db/Models/punish/Warning.cs
View file

0
src/Ellie.Bot.Db/Models/WarningPunishment.cs → src/Ellie.Bot.Db/Models/punish/WarningPunishment.cs
View file

0
src/Ellie.Bot.Db/Models/SlowmodeIgnoredRole.cs → src/Ellie.Bot.Db/Models/slowmode/SlowmodeIgnoredRole.cs
View file

0
src/Ellie.Bot.Db/Models/SlowmodeIgnoredUser.cs → src/Ellie.Bot.Db/Models/slowmode/SlowmodeIgnoredUser.cs
View file

2
src/Ellie.Bot.Db/Models/PatronQuota.cs → src/Ellie.Bot.Db/Models/support/PatronQuota.cs
View file

@ -1,4 +1,4 @@
#nullable disable
#nullable disable
namespace Ellie.Db.Models;
/// <summary>

0
src/Ellie.Bot.Db/Models/RewardedUser.cs → src/Ellie.Bot.Db/Models/support/RewardUser.cs
View file

0
src/Ellie.Bot.Db/Models/UnbanTimer.cs → src/Ellie.Bot.Db/Models/untimer/UnbanTimer.cs
View file

0
src/Ellie.Bot.Db/Models/UnmuteTimer.cs → src/Ellie.Bot.Db/Models/untimer/UnmuteTimer.cs
View file

0
src/Ellie.Bot.Db/Models/UnroleTimer.cs → src/Ellie.Bot.Db/Models/untimer/UnroleTimer.cs
View file

0
src/Ellie.Bot.Db/Models/UserXpStats.cs → src/Ellie.Bot.Db/Models/xp/UserXpStats.cs
View file

21
src/Ellie.Bot.Modules.Searches/_common/StreamNotifications/Models/StreamData.cs Normal file
View file

@ -0,0 +1,21 @@
#nullable disable
using Ellie.Db.Models;
namespace Ellie.Modules.Searches.Common;
public record StreamData
{
public FollowedStream.FType StreamType { get; set; }
public string Name { get; set; }
public string UniqueName { get; set; }
public int Viewers { get; set; }
public string Title { get; set; }
public string Game { get; set; }
public string Preview { get; set; }
public bool IsLive { get; set; }
public string StreamUrl { get; set; }
public string AvatarUrl { get; set; }
public StreamDataKey CreateKey()
=> new(StreamType, UniqueName.ToLower());
}