diff --git a/DiscordDelete/Program.cs b/DiscordDelete/Program.cs index f0733d7..567b79e 100644 --- a/DiscordDelete/Program.cs +++ b/DiscordDelete/Program.cs @@ -76,21 +76,23 @@ int finalCode = await CommandLine while (true) { // Scanning direct messages. - ChannelMessagesResponse[]? messages = await client.GetChannelMessages( + var response = await client.GetChannelMessages( opt.ChannelId, offset, opt.Author ); - if (messages is null) + if (response.JsonData is null) return 2; - IEnumerable newMessages = messages.Select(message => new Message - { - ChannelId = message.ChannelId, - MessageId = message.Id, - Content = message.Content - }); + IEnumerable newMessages = response.JsonData.Select( + message => new Message + { + ChannelId = message.ChannelId, + MessageId = message.Id, + Content = message.Content + } + ); foreach (var newMessage in newMessages) { @@ -99,7 +101,7 @@ int finalCode = await CommandLine } await db.SaveChangesAsync(); - Console.WriteLine($"Written {messages.Length} messages."); + Console.WriteLine($"Written {response.JsonData.Length} messages."); offset += 50; await Task.Delay(TimeSpan.FromSeconds(2)); @@ -111,24 +113,25 @@ int finalCode = await CommandLine while (offset < totalMessages) { // Scanning guild messages. - GuildMessageSearchResponse? response = await client.SearchGuildMessages( + var response = await client.SearchGuildMessages( opt.GuildId, offset, opt.Author ); - if (response is null || response.Messages is null) + if (response.JsonData is null || response.JsonData.Messages is null) return 3; - totalMessages = response.TotalMessages; + totalMessages = response.JsonData.TotalMessages; - IEnumerable newMessages = response.Messages.SelectMany(message => - message.Select(messagePart => new Message - { - ChannelId = messagePart.ChannelId, - MessageId = messagePart.Id, - Content = messagePart.Content - }) + IEnumerable newMessages = response.JsonData.Messages.SelectMany( + message => + message.Select(messagePart => new Message + { + ChannelId = messagePart.ChannelId, + MessageId = messagePart.Id, + Content = messagePart.Content + }) ); foreach (var newMessage in newMessages) @@ -138,8 +141,8 @@ int finalCode = await CommandLine } await db.SaveChangesAsync(); - Console.WriteLine($"Written {response.Messages.Length} messages."); - offset += response.Messages.Count(); + Console.WriteLine($"Written {response.JsonData.Messages.Length} messages."); + offset += response.JsonData.Messages.Length; await Task.Delay(TimeSpan.FromSeconds(2)); }