NadekoBot.Extensions should now be fully annotated with nullable reference types as well as many classes from NadekoBot.Common

This commit is contained in:
Kwoth
2021-12-28 10:44:00 +01:00
parent 0634470a8a
commit 59f5056035
543 changed files with 1895 additions and 1448 deletions

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class AntiRaidSetting : DbEntity
{
@@ -60,4 +61,4 @@ public class AntiSpamIgnore : DbEntity
=> obj is AntiSpamIgnore inst
? inst.ChannelId == ChannelId
: false;
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class AutoCommand : DbEntity
{
@@ -10,4 +11,4 @@ public class AutoCommand : DbEntity
public ulong? VoiceChannelId {get; set; }
public string VoiceChannelName { get; set; }
public int Interval { get; set; }
}
}

View File

@@ -1,3 +1,4 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class AutoTranslateChannel : DbEntity
@@ -6,4 +7,4 @@ public class AutoTranslateChannel : DbEntity
public ulong ChannelId { get; set; }
public bool AutoDelete { get; set; }
public IList<AutoTranslateUser> Users { get; set; } = new List<AutoTranslateUser>();
}
}

View File

@@ -1,3 +1,4 @@
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class AutoTranslateUser : DbEntity
@@ -7,4 +8,4 @@ public class AutoTranslateUser : DbEntity
public ulong UserId { get; set; }
public string Source { get; set; }
public string Target { get; set; }
}
}

View File

@@ -1,7 +1,8 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class BanTemplate : DbEntity
{
public ulong GuildId { get; set; }
public string Text { get; set; }
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class BlacklistEntry : DbEntity
{
@@ -11,4 +12,4 @@ public enum BlacklistType
Server,
Channel,
User
}
}

View File

@@ -1,4 +1,5 @@
using System.ComponentModel.DataAnnotations;
#nullable disable
using System.ComponentModel.DataAnnotations;
using NadekoBot.Services.Database.Models;
namespace NadekoBot.Db.Models;
@@ -42,4 +43,4 @@ public class ClubBans
public int UserId { get; set; }
public DiscordUser User { get; set; }
}
}

View File

@@ -1,7 +1,8 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class CommandAlias : DbEntity
{
public string Trigger { get; set; }
public string Mapping { get; set; }
}
}

View File

@@ -1,7 +1,8 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class CommandCooldown : DbEntity
{
public int Seconds { get; set; }
public string CommandName { get; set; }
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class CurrencyTransaction : DbEntity
{
@@ -12,4 +13,4 @@ public class CurrencyTransaction : DbEntity
Reason = Reason,
UserId = UserId,
};
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class CustomReaction : DbEntity
{
@@ -24,4 +25,4 @@ public class ReactionResponse : DbEntity
{
public bool OwnerOnly { get; set; }
public string Text { get; set; }
}
}

View File

@@ -1,4 +1,5 @@
using System.ComponentModel.DataAnnotations;
#nullable disable
using System.ComponentModel.DataAnnotations;
namespace NadekoBot.Services.Database.Models;
@@ -7,4 +8,4 @@ public class DbEntity
[Key]
public int Id { get; set; }
public DateTime? DateAdded { get; set; } = DateTime.UtcNow;
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class DelMsgOnCmdChannel : DbEntity
{
@@ -11,4 +12,4 @@ public class DelMsgOnCmdChannel : DbEntity
public override bool Equals(object obj)
=> obj is DelMsgOnCmdChannel x
&& x.ChannelId == ChannelId;
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class DiscordPermOverride : DbEntity
{
@@ -6,4 +7,4 @@ public class DiscordPermOverride : DbEntity
public ulong? GuildId { get; set; }
public string Command { get; set; }
}
}

View File

@@ -1,4 +1,5 @@
using NadekoBot.Services.Database.Models;
#nullable disable
using NadekoBot.Services.Database.Models;
namespace NadekoBot.Db.Models;
@@ -29,4 +30,4 @@ public class DiscordUser : DbEntity
public override string ToString() =>
Username + "#" + Discriminator;
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class CurrencyEvent
{
@@ -41,4 +42,4 @@ public class CurrencyEvent
public class AwardedUser
{
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class FeedSub : DbEntity
{
@@ -15,4 +16,4 @@ public class FeedSub : DbEntity
=> obj is FeedSub s
&& s.Url.ToLower() == Url.ToLower()
&& s.GuildConfigId == GuildConfigId;
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class FilterChannelId : DbEntity
{
@@ -26,4 +27,4 @@ public class FilterInvitesChannelId : DbEntity
public override int GetHashCode()
=> ChannelId.GetHashCode();
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class FilterLinksChannelId : DbEntity
{
@@ -10,4 +11,4 @@ public class FilterLinksChannelId : DbEntity
public override int GetHashCode()
=> ChannelId.GetHashCode();
}
}

View File

@@ -1,6 +1,7 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class FilteredWord : DbEntity
{
public string Word { get; set; }
}
}

View File

@@ -1,4 +1,5 @@
using NadekoBot.Services.Database.Models;
#nullable disable
using NadekoBot.Services.Database.Models;
using NadekoBot.Modules.Searches.Common;
namespace NadekoBot.Db.Models;
@@ -31,4 +32,4 @@ public class FollowedStream : DbEntity
=> obj is FollowedStream fs && Equals(fs);
public StreamDataKey CreateKey() => new(Type, Username.ToLower());
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class GCChannelId : DbEntity
{
@@ -12,4 +13,4 @@ public class GCChannelId : DbEntity
public override int GetHashCode() =>
this.ChannelId.GetHashCode();
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class GroupName : DbEntity
{
@@ -7,4 +8,4 @@ public class GroupName : DbEntity
public int Number { get; set; }
public string Name { get; set; }
}
}

View File

@@ -1,4 +1,5 @@
using NadekoBot.Common.Collections;
#nullable disable
using NadekoBot.Common.Collections;
using NadekoBot.Db.Models;
namespace NadekoBot.Services.Database.Models;
@@ -103,4 +104,4 @@ public class GuildConfig : DbEntity
public List<GroupName> SelfAssignableRoleGroupNames { get; set; }
public int WarnExpireHours { get; set; } = 0;
public WarnExpireAction WarnExpireAction { get; set; } = WarnExpireAction.Clear;
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class IgnoredLogItem : DbEntity
{
@@ -12,4 +13,4 @@ public enum IgnoredItemType
{
Channel,
User,
}
}

View File

@@ -1,7 +1,8 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class IgnoredVoicePresenceChannel : DbEntity
{
public LogSetting LogSetting { get; set; }
public ulong ChannelId { get; set; }
}
}

View File

@@ -1,7 +1,8 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class ImageOnlyChannel : DbEntity
{
public ulong GuildId { get; set; }
public ulong ChannelId { get; set; }
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class LogSetting : DbEntity
{
@@ -28,4 +29,4 @@ public class LogSetting : DbEntity
public ulong? LogVoicePresenceId { get; set; }
public ulong? LogVoicePresenceTTSId { get; set; }
}
}

View File

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

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class MusicPlayerSettings
{
@@ -52,4 +53,4 @@ public enum PlayerRepeatType
None,
Track,
Queue
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class MutedUserId : DbEntity
{
@@ -11,4 +12,4 @@ public class MutedUserId : DbEntity
=> obj is MutedUserId mui
? mui.UserId == UserId
: false;
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class NsfwBlacklistedTag : DbEntity
{
@@ -10,4 +11,4 @@ public class NsfwBlacklistedTag : DbEntity
public override bool Equals(object obj)
=> obj is NsfwBlacklistedTag x && x.Tag == Tag;
}
}

View File

@@ -1,4 +1,5 @@
using System.ComponentModel.DataAnnotations.Schema;
#nullable disable
using System.ComponentModel.DataAnnotations.Schema;
using System.Diagnostics;
namespace NadekoBot.Services.Database.Models;
@@ -55,4 +56,4 @@ public enum SecondaryPermissionType
Module,
Command,
AllModules
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class PlantedCurrency : DbEntity
{
@@ -8,4 +9,4 @@ public class PlantedCurrency : DbEntity
public ulong ChannelId { get; set; }
public ulong UserId { get; set; }
public ulong MessageId { get; set; }
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class PlaylistSong : DbEntity
{
@@ -15,4 +16,4 @@ public enum MusicType
YouTube,
Local,
Soundcloud
}
}

View File

@@ -1,4 +1,5 @@
using NadekoBot.Common.Collections;
#nullable disable
using NadekoBot.Common.Collections;
namespace NadekoBot.Services.Database.Models;
@@ -15,4 +16,4 @@ public class PollAnswer : DbEntity, IIndexed
{
public int Index { get; set; }
public string Text { get; set; }
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class PollVote : DbEntity
{
@@ -12,4 +13,4 @@ public class PollVote : DbEntity
=> obj is PollVote p
? p.UserId == UserId
: false;
}
}

View File

@@ -1,4 +1,5 @@
using System.ComponentModel.DataAnnotations;
#nullable disable
using System.ComponentModel.DataAnnotations;
namespace NadekoBot.Services.Database.Models;
@@ -19,4 +20,4 @@ public enum OrderType
{
Id = -1,
Keyword = -2
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class ReactionRoleMessage : DbEntity, IIndexed
{
@@ -18,4 +19,4 @@ public class ReactionRole : DbEntity
{
public string EmoteName { get; set; }
public ulong RoleId { get; set; }
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class Reminder : DbEntity
{
@@ -8,4 +9,4 @@ public class Reminder : DbEntity
public ulong UserId { get; set; }
public string Message { get; set; }
public bool IsPrivate { get; set; }
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class Repeater
{
@@ -11,4 +12,4 @@ public class Repeater
public TimeSpan? StartTimeOfDay { get; set; }
public bool NoRedundant { get; set; }
public DateTime DateAdded { get; set; }
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class RewardedUser : DbEntity
{
@@ -6,4 +7,4 @@ public class RewardedUser : DbEntity
public string PatreonUserId { get; set; }
public int AmountRewardedThisMonth { get; set; }
public DateTime LastReward { get; set; }
}
}

View File

@@ -1,7 +1,8 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class RotatingPlayingStatus : DbEntity
{
public string Status { get; set; }
public ActivityType Type { get; set; }
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class SelfAssignedRole : DbEntity
{
@@ -7,4 +8,4 @@ public class SelfAssignedRole : DbEntity
public int Group { get; set; }
public int LevelRequirement { get; set; }
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public enum ShopEntryType
{
@@ -39,4 +40,4 @@ public class ShopEntryItem : DbEntity
public override int GetHashCode() =>
Text.GetHashCode(StringComparison.InvariantCulture);
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class SlowmodeIgnoredRole : DbEntity
{
@@ -18,4 +19,4 @@ public class SlowmodeIgnoredRole : DbEntity
// override object.GetHashCode
public override int GetHashCode()
=> RoleId.GetHashCode();
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class SlowmodeIgnoredUser : DbEntity
{
@@ -18,4 +19,4 @@ public class SlowmodeIgnoredUser : DbEntity
// override object.GetHashCode
public override int GetHashCode()
=> UserId.GetHashCode();
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class StreamRoleSettings : DbEntity
{
@@ -66,4 +67,4 @@ public class StreamRoleWhitelistedUser : DbEntity
public override int GetHashCode()
=> UserId.GetHashCode();
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class UnbanTimer : DbEntity
{
@@ -12,4 +13,4 @@ public class UnbanTimer : DbEntity
=> obj is UnbanTimer ut
? ut.UserId == UserId
: false;
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class UnmuteTimer : DbEntity
{
@@ -12,4 +13,4 @@ public class UnmuteTimer : DbEntity
=> obj is UnmuteTimer ut
? ut.UserId == UserId
: false;
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class UnroleTimer : DbEntity
{
@@ -13,4 +14,4 @@ public class UnroleTimer : DbEntity
=> obj is UnroleTimer ut
? ut.UserId == UserId && ut.RoleId == RoleId
: false;
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class UserXpStats : DbEntity
{
@@ -10,4 +11,4 @@ public class UserXpStats : DbEntity
public DateTime LastLevelUp { get; set; } = DateTime.UtcNow;
}
public enum XpNotificationLocation { None, Dm, Channel }
public enum XpNotificationLocation { None, Dm, Channel }

View File

@@ -1,7 +1,8 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class VcRoleInfo : DbEntity
{
public ulong VoiceChannelId { get; set; }
public ulong RoleId { get; set; }
}
}

View File

@@ -1,4 +1,5 @@
using NadekoBot.Db.Models;
#nullable disable
using NadekoBot.Db.Models;
namespace NadekoBot.Services.Database.Models;
@@ -83,4 +84,4 @@ public class WaifuLbResult
}
return $"**{waifuUsername}#{Discrim}** - claimed by **{claimer}**\n\t{status}";
}
}
}

View File

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

View File

@@ -1,4 +1,5 @@
using NadekoBot.Db.Models;
#nullable disable
using NadekoBot.Db.Models;
namespace NadekoBot.Services.Database.Models;
@@ -19,4 +20,4 @@ public enum WaifuUpdateType
{
AffinityChanged,
Claimed
}
}

View File

@@ -1,7 +1,8 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public enum WarnExpireAction
{
Clear,
Delete
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class Warning : DbEntity
{
@@ -9,4 +10,4 @@ public class Warning : DbEntity
public string ForgivenBy { get; set; }
public string Moderator { get; set; }
public int Weight { get; set; }
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class WarningPunishment : DbEntity
{
@@ -6,4 +7,4 @@ public class WarningPunishment : DbEntity
public PunishmentAction Punishment { get; set; }
public int Time { get; set; }
public ulong? RoleId { get; set; }
}
}

View File

@@ -1,4 +1,5 @@
namespace NadekoBot.Services.Database.Models;
#nullable disable
namespace NadekoBot.Services.Database.Models;
public class XpSettings : DbEntity
{
@@ -58,4 +59,4 @@ public class ExcludedItem : DbEntity
public override bool Equals(object obj)
=> obj is ExcludedItem ei && ei.ItemId == ItemId && ei.ItemType == ItemType;
}
}