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

Clarified .feedadd errors

Browse Source
This commit is contained in:
Kwoth
2022-10-11 19:14:04 +02:00
parent dc568fe0e2
commit 0469705037
3 changed files with 47 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/NadekoBot/Modules/Searches/Feeds/FeedCommands.cs
View File

@@ -32,33 +32,43 @@ public partial class Searches
[UserPerm(GuildPerm.ManageMessages)]
public async Task Feed(string url, [Leftover] ITextChannel channel = null)
{
var success = Uri.TryCreate(url, UriKind.Absolute, out var uri)
&& (uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps);
if (success)
if (Uri.TryCreate(url, UriKind.Absolute, out var uri)
&& (uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps))
{
channel ??= (ITextChannel)ctx.Channel;
try
{
await FeedReader.ReadAsync(url);
}
catch (Exception ex)
{
Log.Information(ex, "Unable to get feeds from that url");
success = false;
}
await ReplyErrorLocalizedAsync(strs.feed_invalid_url);
return;
}
if (success)
channel ??= (ITextChannel)ctx.Channel;
try
{
success = _service.AddFeed(ctx.Guild.Id, channel.Id, url);
if (success)
{
await ReplyConfirmLocalizedAsync(strs.feed_added);
return;
}
await FeedReader.ReadAsync(url);
}
catch (Exception ex)
{
Log.Information(ex, "Unable to get feeds from that url");
await ReplyErrorLocalizedAsync(strs.feed_cant_parse);
return;
}
await ReplyConfirmLocalizedAsync(strs.feed_not_valid);
var result = _service.AddFeed(ctx.Guild.Id, channel.Id, url);
if (result == FeedAddResult.Success)
{
await ReplyConfirmLocalizedAsync(strs.feed_added);
return;
}
if (result == FeedAddResult.Duplicate)
{
await ReplyErrorLocalizedAsync(strs.feed_duplicate);
return;
}
if (result == FeedAddResult.LimitReached)
{
await ReplyErrorLocalizedAsync(strs.feed_limit_reached);
return;
}
}
[Cmd]

16
src/NadekoBot/Modules/Searches/Feeds/FeedsService.cs
View File

@@ -207,7 +207,7 @@ public class FeedsService : INService
.ToList();
}
public bool AddFeed(ulong guildId, ulong channelId, string rssFeed)
public FeedAddResult AddFeed(ulong guildId, ulong channelId, string rssFeed)
{
ArgumentNullException.ThrowIfNull(rssFeed, nameof(rssFeed));
@@ -221,9 +221,9 @@ public class FeedsService : INService
var gc = uow.GuildConfigsForId(guildId, set => set.Include(x => x.FeedSubs));
if (gc.FeedSubs.Any(x => x.Url.ToLower() == fs.Url.ToLower()))
return false;
return FeedAddResult.Duplicate;
if (gc.FeedSubs.Count >= 10)
return false;
return FeedAddResult.LimitReached;
gc.FeedSubs.Add(fs);
uow.SaveChanges();
@@ -242,7 +242,7 @@ public class FeedsService : INService
});
}
return true;
return FeedAddResult.Success;
}
public bool RemoveFeed(ulong guildId, int index)
@@ -270,4 +270,12 @@ public class FeedsService : INService
return true;
}
}
public enum FeedAddResult
{
Success,
LimitReached,
Invalid,
Duplicate,
}