fixed crash when deleting Raids
removed Raid from Reminders and DiscordMessages
This commit is contained in:
parent
5d429ff90f
commit
893ec1f16d
11 changed files with 825 additions and 47 deletions
|
@ -6,11 +6,6 @@ namespace Lieb.Models.GuildWars2.Raid
|
|||
{
|
||||
public int DiscordRaidMessageId { get; set; }
|
||||
|
||||
public int RaidId { get; set; }
|
||||
|
||||
[JsonIgnore(Condition = JsonIgnoreCondition.Always)]
|
||||
public Raid Raid { get; set; }
|
||||
|
||||
public ulong DiscordMessageId { get; set; }
|
||||
|
||||
public ulong DiscordChannelId { get; set; }
|
||||
|
|
|
@ -72,16 +72,15 @@ namespace Lieb.Models.GuildWars2.Raid
|
|||
DiscordChannelId = reminder.DiscordChannelId,
|
||||
ReminderTimeUTC = reminder.ReminderTimeUTC,
|
||||
Message = reminder.Message,
|
||||
Sent = reminder.Sent,
|
||||
Sent = false,
|
||||
Type = reminder.Type,
|
||||
RaidId = reminder.RaidId
|
||||
TimeType = reminder.TimeType
|
||||
});
|
||||
}
|
||||
foreach (DiscordRaidMessage message in template.DiscordRaidMessages)
|
||||
{
|
||||
this.DiscordRaidMessages.Add(new DiscordRaidMessage()
|
||||
{
|
||||
RaidId = message.RaidId,
|
||||
DiscordChannelId = message.DiscordChannelId,
|
||||
DiscordGuildId = message.DiscordGuildId
|
||||
});
|
||||
|
|
|
@ -32,6 +32,7 @@ namespace Lieb.Models.GuildWars2.Raid
|
|||
[JsonIgnore(Condition = JsonIgnoreCondition.Always)]
|
||||
public Raid? Raid { get; set; }
|
||||
|
||||
[JsonIgnore(Condition = JsonIgnoreCondition.Always)]
|
||||
public RaidTemplate? RaidTemplate { get; set; }
|
||||
|
||||
public static RaidLog CreateRaidLog(ulong userId, Raid raid)
|
||||
|
|
|
@ -39,11 +39,6 @@ namespace Lieb.Models.GuildWars2.Raid
|
|||
public ulong DiscordChannelId { get; set; }
|
||||
|
||||
public bool Sent { get; set; } = false;
|
||||
|
||||
public int RaidId { get; set; }
|
||||
|
||||
[JsonIgnore(Condition = JsonIgnoreCondition.Always)]
|
||||
public Raid Raid { get; set; }
|
||||
}
|
||||
|
||||
public class StaticRaidReminder : RaidReminder
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue