EllieBotDevs/elliebot
4
1
Fork 1
Code Issues Pull requests Projects Releases57 Packages3 Wiki Activity

.feed will now properly add feeds to the database

Browse source
This commit is contained in:
Toastie 2025-04-03 17:56:08 +13:00
parent 8f6ecff5af
commit 172b1ed5e6
Signed by: toastie_t0ast
GPG key ID: 0861BE54AD481DC7
4 changed files with 63 additions and 58 deletions

7
CHANGELOG.md
View file

@ -2,7 +2,12 @@
*a,c,f,r,o* *a,c,f,r,o*
## [6.1.1] - 02.04.2025 ## [6.1.2] - 03.04.2025
### Fixed
- Fixed `.feed` not adding new feeds to the database
## [6.1.1] - 03.04.2025
### Added ### Added
- Added some config options for .conf fish - Added some config options for .conf fish

2
src/EllieBot/EllieBot.csproj
View file

@ -4,7 +4,7 @@
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>true</ImplicitUsings> <ImplicitUsings>true</ImplicitUsings>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages> <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
<Version>6.1.1</Version> <Version>6.1.2</Version>
<!-- Output/build --> <!-- Output/build -->
<RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory> <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>

38
src/EllieBot/Modules/Searches/Feeds/FeedCommands.cs
View file

@ -53,6 +53,8 @@ public partial class Searches
[Priority(1)] [Priority(1)]
public async Task Feed(string url, ITextChannel? channel = null, [Leftover] string? message = null) public async Task Feed(string url, ITextChannel? channel = null, [Leftover] string? message = null)
{ {
await ctx.Channel.TriggerTypingAsync();
if (!Uri.TryCreate(url, UriKind.Absolute, out var uri) if (!Uri.TryCreate(url, UriKind.Absolute, out var uri)
|| (uri.Scheme != Uri.UriSchemeHttp && uri.Scheme != Uri.UriSchemeHttps)) || (uri.Scheme != Uri.UriSchemeHttp && uri.Scheme != Uri.UriSchemeHttps))
{ {
@ -61,7 +63,7 @@ public partial class Searches
} }
channel ??= (ITextChannel)ctx.Channel; channel ??= (ITextChannel)ctx.Channel;
if (!((IGuildUser)ctx.User).GetPermissions(channel).MentionEveryone) if (!((IGuildUser)ctx.User).GetPermissions(channel).MentionEveryone)
message = message?.SanitizeAllMentions(); message = message?.SanitizeAllMentions();
@ -79,7 +81,7 @@ public partial class Searches
if (ctx.User is not IGuildUser gu || !gu.GuildPermissions.Administrator) if (ctx.User is not IGuildUser gu || !gu.GuildPermissions.Administrator)
message = message?.SanitizeMentions(true); message = message?.SanitizeMentions(true);
var result = _service.AddFeed(ctx.Guild.Id, channel.Id, url, message); var result = await _service.AddFeedAsync(ctx.Guild.Id, channel.Id, url, message);
if (result == FeedAddResult.Success) if (result == FeedAddResult.Success)
{ {
await Response().Confirm(strs.feed_added).SendAsync(); await Response().Confirm(strs.feed_added).SendAsync();
@ -117,32 +119,32 @@ public partial class Searches
{ {
if (--page < 0) if (--page < 0)
return; return;
var feeds = _service.GetFeeds(ctx.Guild.Id); var feeds = _service.GetFeeds(ctx.Guild.Id);
if (!feeds.Any()) if (!feeds.Any())
{ {
await Response() await Response()
.Embed(CreateEmbed().WithOkColor().WithDescription(GetText(strs.feed_no_feed))) .Embed(CreateEmbed().WithOkColor().WithDescription(GetText(strs.feed_no_feed)))
.SendAsync(); .SendAsync();
return; return;
} }
await Response() await Response()
.Paginated() .Paginated()
.Items(feeds) .Items(feeds)
.PageSize(10) .PageSize(10)
.CurrentPage(page) .CurrentPage(page)
.Page((items, cur) => .Page((items, cur) =>
{ {
var embed = CreateEmbed().WithOkColor(); var embed = CreateEmbed().WithOkColor();
var i = 0; var i = 0;
var fs = string.Join("\n", var fs = string.Join("\n",
items.Select(x => $"`{(cur * 10) + ++i}.` <#{x.ChannelId}> {x.Url}")); items.Select(x => $"`{(cur * 10) + ++i}.` <#{x.ChannelId}> {x.Url}"));
return embed.WithDescription(fs); return embed.WithDescription(fs);
}) })
.SendAsync(); .SendAsync();
} }
} }
} }

74
src/EllieBot/Modules/Searches/Feeds/FeedsService.cs
View file

@ -40,13 +40,13 @@ public class FeedsService : IEService, IReadyExecutor
await using (var uow = _db.GetDbContext()) await using (var uow = _db.GetDbContext())
{ {
var subs = await uow.Set<FeedSub>() var subs = await uow.Set<FeedSub>()
.AsQueryable() .AsQueryable()
.Where(x => Queries.GuildOnShard(x.GuildId, _shardData.TotalShards, _shardData.ShardId)) .Where(x => Queries.GuildOnShard(x.GuildId, _shardData.TotalShards, _shardData.ShardId))
.ToListAsyncLinqToDB(); .ToListAsyncLinqToDB();
_subs = subs _subs = subs
.GroupBy(x => x.Url.ToLower()) .GroupBy(x => x.Url.ToLower())
.ToDictionary(x => x.Key, x => x.ToList()) .ToDictionary(x => x.Key, x => x.ToList())
.ToConcurrent(); .ToConcurrent();
} }
await TrackFeeds(); await TrackFeeds();
@ -66,7 +66,7 @@ public class FeedsService : IEService, IReadyExecutor
// remove from db // remove from db
await using var ctx = _db.GetDbContext(); await using var ctx = _db.GetDbContext();
await ctx.GetTable<FeedSub>() await ctx.GetTable<FeedSub>()
.DeleteAsync(x => ids.Contains(x.Id)); .DeleteAsync(x => ids.Contains(x.Id));
// remove from the local cache // remove from the local cache
_subs.TryRemove(url, out _); _subs.TryRemove(url, out _);
@ -163,12 +163,12 @@ public class FeedsService : IEService, IReadyExecutor
if (!gotImage && feedItem.SpecificItem is AtomFeedItem afi) if (!gotImage && feedItem.SpecificItem is AtomFeedItem afi)
{ {
var previewElement = afi.Element.Elements() var previewElement = afi.Element.Elements()
.FirstOrDefault(x => x.Name.LocalName == "preview"); .FirstOrDefault(x => x.Name.LocalName == "preview");
if (previewElement is null) if (previewElement is null)
{ {
previewElement = afi.Element.Elements() previewElement = afi.Element.Elements()
.FirstOrDefault(x => x.Name.LocalName == "thumbnail"); .FirstOrDefault(x => x.Name.LocalName == "thumbnail");
} }
if (previewElement is not null) if (previewElement is not null)
@ -201,11 +201,11 @@ public class FeedsService : IEService, IReadyExecutor
continue; continue;
var sendTask = _sender.Response(ch) var sendTask = _sender.Response(ch)
.Embed(embed) .Embed(embed)
.Text(string.IsNullOrWhiteSpace(val.Message) .Text(string.IsNullOrWhiteSpace(val.Message)
? string.Empty ? string.Empty
: val.Message) : val.Message)
.SendAsync(); .SendAsync();
tasks.Add(sendTask); tasks.Add(sendTask);
} }
@ -236,12 +236,14 @@ public class FeedsService : IEService, IReadyExecutor
using var uow = _db.GetDbContext(); using var uow = _db.GetDbContext();
return uow.GetTable<FeedSub>() return uow.GetTable<FeedSub>()
.Where(x => x.GuildId == guildId) .Where(x => x.GuildId == guildId)
.OrderBy(x => x.Id) .OrderBy(x => x.Id)
.ToList(); .ToList();
} }
public FeedAddResult AddFeed( private const int MAX_FEEDS = 10;
public async Task<FeedAddResult> AddFeedAsync(
ulong guildId, ulong guildId,
ulong channelId, ulong channelId,
string rssFeed, string rssFeed,
@ -249,25 +251,24 @@ public class FeedsService : IEService, IReadyExecutor
{ {
ArgumentNullException.ThrowIfNull(rssFeed, nameof(rssFeed)); ArgumentNullException.ThrowIfNull(rssFeed, nameof(rssFeed));
var fs = new FeedSub await using var uow = _db.GetDbContext();
{ var feedUrl = rssFeed.Trim();
ChannelId = channelId, if (await uow.GetTable<FeedSub>().AnyAsyncLinqToDB(x => x.GuildId == guildId &&
Url = rssFeed.Trim(), x.Url.ToLower() == feedUrl.ToLower()))
Message = message
};
using var uow = _db.GetDbContext();
var feeds = uow.GetTable<FeedSub>()
.Where(x => x.GuildId == guildId)
.ToArray();
if (feeds.Any(x => x.Url.ToLower() == fs.Url.ToLower()))
return FeedAddResult.Duplicate; return FeedAddResult.Duplicate;
if (feeds.Length >= 10)
var count = await uow.GetTable<FeedSub>().CountAsyncLinqToDB(x => x.GuildId == guildId);
if (count >= MAX_FEEDS)
return FeedAddResult.LimitReached; return FeedAddResult.LimitReached;
uow.Add(fs); var fs = await uow.GetTable<FeedSub>()
uow.SaveChanges(); .InsertWithOutputAsync(() => new FeedSub
{
GuildId = guildId,
ChannelId = channelId,
Url = feedUrl,
Message = message,
});
_subs.AddOrUpdate(fs.Url.ToLower(), _subs.AddOrUpdate(fs.Url.ToLower(),
[fs], [fs],
@ -293,10 +294,7 @@ public class FeedsService : IEService, IReadyExecutor
var toRemove = items[index]; var toRemove = items[index];
_subs.AddOrUpdate(toRemove.Url.ToLower(), _subs.AddOrUpdate(toRemove.Url.ToLower(),
[], [],
(_, old) => (_, old) => { return old.Where(x => x.Id != toRemove.Id).ToList(); });
{
return old.Where(x => x.Id != toRemove.Id).ToList();
});
uow.Remove(toRemove); uow.Remove(toRemove);
uow.SaveChanges(); uow.SaveChanges();