Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions Courier/Services/FeedService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ private async Task SendMessageAsync(
embedBuilder
.WithAuthor(authorBuilder => authorBuilder
.WithName(feed.Title.Text.ToMarkdown().Truncate(EmbedAuthorBuilder.MaxAuthorNameLength))
.WithIconUrl(feed.ImageUrl.ToString()))
.WithIconUrl(feed.ImageUrl?.ToString()))
.WithFooter(feed.Description.Text.ToMarkdown().Truncate(EmbedFooterBuilder.MaxFooterTextLength))
.WithUrl(item.Links.Count != 0 ? item.Links.First().Uri.ToString() : item.Id)
.WithTitle(item.Title.Text.ToMarkdown().Truncate(EmbedBuilder.MaxTitleLength))
Expand All @@ -162,12 +162,29 @@ private async Task SendMessageAsync(
embeds.Add(embedBuilder.Build());
}

foreach (var embedArray in embeds.Chunk(DiscordConfig.MaxEmbedsPerMessage))
await textChannel.SendMessageAsync(embeds: embedArray, options: new RequestOptions
foreach (var chunk in embeds.Chunk(DiscordConfig.MaxEmbedsPerMessage))
{
if (cancellationToken.IsCancellationRequested) break;

if (chunk.Sum(embed => embed.Length) > EmbedBuilder.MaxEmbedLength)
{
foreach (var embed in chunk)
await textChannel.SendMessageAsync(embed: embed, options: new RequestOptions
{
Timeout = DiscordConfig.DefaultRequestTimeout,
CancelToken = cancellationToken,
RetryMode = RetryMode.AlwaysRetry
});

continue;
}

await textChannel.SendMessageAsync(embeds: chunk, options: new RequestOptions
{
Timeout = DiscordConfig.DefaultRequestTimeout,
CancelToken = cancellationToken,
RetryMode = RetryMode.AlwaysRetry
});
}
}
}