minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-11-03 00:04:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

.feed should now correctly display the message (if any)

Browse Source
This commit is contained in:
Kwoth
2024-04-24 23:48:43 +00:00
parent 006fa1a9fe
commit b34f383649
3 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Nadeko.Bot.Modules.Searches/Feeds/FeedCommands.cs
View File

@@ -16,12 +16,23 @@ public partial class Searches
[Cmd]
[RequireContext(ContextType.Guild)]
[UserPerm(GuildPerm.ManageMessages)]
[Priority(1)]
public Task YtUploadNotif(string url, [Leftover] string message = null)
=> YtUploadNotif(url, null, message);
[Cmd]
[RequireContext(ContextType.Guild)]
[UserPerm(GuildPerm.ManageMessages)]
[Priority(2)]
public Task YtUploadNotif(string url, ITextChannel channel = null, [Leftover] string message = null)
{
var m = _ytChannelRegex.Match(url);
if (!m.Success)
return ReplyErrorLocalizedAsync(strs.invalid_input);
if (!((IGuildUser)ctx.User).GetPermissions(channel).MentionEveryone)
message = message?.SanitizeAllMentions();
var channelId = m.Groups["channelid"].Value;
return Feed($"https://www.youtube.com/feeds/videos.xml?channel_id={channelId}", channel, message);
@@ -30,15 +41,27 @@ public partial class Searches
[Cmd]
[RequireContext(ContextType.Guild)]
[UserPerm(GuildPerm.ManageMessages)]
[Priority(0)]
public Task Feed(string url, [Leftover] string message = null)
=> Feed(url, null, message);
[Cmd]
[RequireContext(ContextType.Guild)]
[UserPerm(GuildPerm.ManageMessages)]
[Priority(1)]
public async Task Feed(string url, ITextChannel channel = null, [Leftover] string message = null)
{
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))
{
await ReplyErrorLocalizedAsync(strs.feed_invalid_url);
return;
return;
}
if (!((IGuildUser)ctx.User).GetPermissions(channel).MentionEveryone)
message = message?.SanitizeAllMentions();
channel ??= (ITextChannel)ctx.Channel;
try
{
@@ -53,7 +76,7 @@ public partial class Searches
if (ctx.User is not IGuildUser gu || !gu.GuildPermissions.Administrator)
message = message?.SanitizeMentions(true);
var result = _service.AddFeed(ctx.Guild.Id, channel.Id, url, message);
if (result == FeedAddResult.Success)
{

5
src/Nadeko.Bot.Modules.Searches/Feeds/FeedsService.cs
View File

@@ -173,7 +173,7 @@ public class FeedsService : INService
.Where(x => x.GuildConfig is not null)
.Select(x => _client.GetGuild(x.GuildConfig.GuildId)
?.GetTextChannel(x.ChannelId)
?.EmbedAsync(embed, x.Message))
?.EmbedAsync(embed, string.IsNullOrWhiteSpace(x.Message) ? "" : x.Message))
.Where(x => x is not null);
allSendTasks.Add(feedSendTasks.WhenAll());
@@ -213,7 +213,8 @@ public class FeedsService : INService
var fs = new FeedSub
{
ChannelId = channelId,
Url = rssFeed.Trim()
Url = rssFeed.Trim(),
Message = message
};
using var uow = _db.GetDbContext();