Emotions-stuff/elliebot
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 23 Packages Wiki Activity

Moved streamlist logic to the service file

Browse source
This commit is contained in:
Toastie (DCS Team) 2024-08-11 20:00:01 +12:00
parent 53b7ba640d
commit cd92577095
Signed by: toastie_t0ast
GPG key ID: 27F3B6855AFD40A4
2 changed files with 28 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/EllieBot/Modules/Searches/StreamNotification/StreamNotificationCommands.cs
View file

@ -69,22 +69,7 @@ public partial class Searches
if (page-- < 1) if (page-- < 1)
return; return;
var allStreams = new List<FollowedStream>(); var allStreams = await _service.GetAllStreamsAsync((SocketGuild)ctx.Guild);
await using (var uow = _db.GetDbContext())
{
var all = uow.GuildConfigsForId(ctx.Guild.Id, set => set.Include(gc => gc.FollowedStreams))
.FollowedStreams.OrderBy(x => x.Id)
.ToList();
for (var index = all.Count - 1; index >= 0; index--)
{
var fs = all[index];
if (((SocketGuild)ctx.Guild).GetTextChannel(fs.ChannelId) is null)
await _service.UnfollowStreamAsync(fs.GuildId, index);
else
allStreams.Insert(0, fs);
}
}
await Response() await Response()
.Paginated() .Paginated()

33
src/EllieBot/Modules/Searches/StreamNotification/StreamNotificationService.cs
View file

@ -253,7 +253,7 @@ public sealed class StreamNotificationService : IEService, IReadyExecutor
{ {
var ch = _client.GetGuild(fs.GuildId) var ch = _client.GetGuild(fs.GuildId)
?.GetTextChannel(fs.ChannelId); ?.GetTextChannel(fs.ChannelId);
if (ch is null) if (ch is null)
return Task.CompletedTask; return Task.CompletedTask;
@ -492,10 +492,10 @@ public sealed class StreamNotificationService : IEService, IReadyExecutor
public EmbedBuilder GetEmbed(ulong guildId, StreamData status, bool showViewers = true) public EmbedBuilder GetEmbed(ulong guildId, StreamData status, bool showViewers = true)
{ {
var embed = _sender.CreateEmbed() var embed = _sender.CreateEmbed()
.WithTitle(status.Name) .WithTitle(status.Name)
.WithUrl(status.StreamUrl) .WithUrl(status.StreamUrl)
.WithDescription(status.StreamUrl) .WithDescription(status.StreamUrl)
.AddField(GetText(guildId, strs.status), status.IsLive ? "🟢 Online" : "🔴 Offline", true); .AddField(GetText(guildId, strs.status), status.IsLive ? "🟢 Online" : "🔴 Offline", true);
if (showViewers) if (showViewers)
{ {
@ -625,7 +625,7 @@ public sealed class StreamNotificationService : IEService, IReadyExecutor
all.ForEach(x => x.Message = message); all.ForEach(x => x.Message = message);
uow.SaveChanges(); uow.SaveChanges();
lock (_shardLock) lock (_shardLock)
{ {
foreach (var fs in all) foreach (var fs in all)
@ -647,4 +647,25 @@ public sealed class StreamNotificationService : IEService, IReadyExecutor
public StreamDataKey Key { get; init; } public StreamDataKey Key { get; init; }
public ulong GuildId { get; init; } public ulong GuildId { get; init; }
} }
public async Task<List<FollowedStream>> GetAllStreamsAsync(SocketGuild guild)
{
var allStreams = new List<FollowedStream>();
await using var uow = _db.GetDbContext();
var all = uow.GuildConfigsForId(guild.Id, set => set.Include(gc => gc.FollowedStreams))
.FollowedStreams
.OrderBy(x => x.Id)
.ToList();
for (var index = all.Count - 1; index >= 0; index--)
{
var fs = all[index];
if (guild.GetTextChannel(fs.ChannelId) is null)
await UnfollowStreamAsync(fs.GuildId, index);
else
allStreams.Insert(0, fs);
}
return allStreams;
}
} }