- Removed some duplicated code from custom reactions

- CREmbed completely removed and replaced by SmartText
This commit is contained in:
Kwoth
2021-07-12 03:02:38 +02:00
parent 9f6cbe0929
commit 0b71e9c28f
5 changed files with 20 additions and 273 deletions

View File

@@ -1,125 +0,0 @@
using Discord;
using NadekoBot.Extensions;
using Newtonsoft.Json;
using System;
using NadekoBot.Services;
namespace NadekoBot.Common
{
public class CREmbed
{
public CREmbedAuthor Author { get; set; }
public string PlainText { get; set; }
public string Title { get; set; }
public string Description { get; set; }
public string Url { get; set; }
public CREmbedFooter Footer { get; set; }
public string Thumbnail { get; set; }
public string Image { get; set; }
public CREmbedField[] Fields { get; set; }
public uint Color { get; set; } = 7458112;
public bool IsValid =>
IsEmbedValid || !string.IsNullOrWhiteSpace(PlainText);
public bool IsEmbedValid =>
!string.IsNullOrWhiteSpace(Title) ||
!string.IsNullOrWhiteSpace(Description) ||
!string.IsNullOrWhiteSpace(Url) ||
!string.IsNullOrWhiteSpace(Thumbnail) ||
!string.IsNullOrWhiteSpace(Image) ||
(Footer != null && (!string.IsNullOrWhiteSpace(Footer.Text) || !string.IsNullOrWhiteSpace(Footer.IconUrl))) ||
(Fields != null && Fields.Length > 0);
public IEmbedBuilder ToEmbed(IEmbedBuilderService eb)
{
var embed = new EmbedBuilder();
if (!string.IsNullOrWhiteSpace(Title))
embed.WithTitle(Title);
if (!string.IsNullOrWhiteSpace(Description))
embed.WithDescription(Description);
if (Url != null && Uri.IsWellFormedUriString(Url, UriKind.Absolute))
embed.WithUrl(Url);
embed.WithColor(new Discord.Color(Color));
if (Footer != null)
embed.WithFooter(Footer.Text,
Uri.IsWellFormedUriString(Footer.IconUrl, UriKind.Absolute)
? Footer.IconUrl
: null);
if (Thumbnail != null && Uri.IsWellFormedUriString(Thumbnail, UriKind.Absolute))
embed.WithThumbnailUrl(Thumbnail);
if (Image != null && Uri.IsWellFormedUriString(Image, UriKind.Absolute))
embed.WithImageUrl(Image);
if (Author != null && !string.IsNullOrWhiteSpace(Author.Name))
{
if (!Uri.IsWellFormedUriString(Author.IconUrl, UriKind.Absolute))
Author.IconUrl = null;
if (!Uri.IsWellFormedUriString(Author.Url, UriKind.Absolute))
Author.Url = null;
embed.WithAuthor(Author.Name, Author.IconUrl, Author.Url);
}
if (Fields != null)
foreach (var f in Fields)
{
if (!string.IsNullOrWhiteSpace(f.Name) && !string.IsNullOrWhiteSpace(f.Value))
embed.AddField(f.Name, f.Value, f.Inline);
}
return eb.Create(embed);
}
public static bool TryParse(string input, out CREmbed embed)
{
embed = null;
if (string.IsNullOrWhiteSpace(input) || !input.Trim().StartsWith('{'))
return false;
try
{
var crembed = JsonConvert.DeserializeObject<CREmbed>(input);
if (crembed.Fields != null && crembed.Fields.Length > 0)
foreach (var f in crembed.Fields)
{
f.Name = f.Name.TrimTo(256);
f.Value = f.Value.TrimTo(1024);
}
if (!crembed.IsValid)
return false;
embed = crembed;
return true;
}
catch
{
return false;
}
}
}
public class CREmbedField
{
public string Name { get; set; }
public string Value { get; set; }
public bool Inline { get; set; }
}
public class CREmbedFooter
{
public string Text { get; set; }
public string IconUrl { get; set; }
[JsonProperty("icon_url")]
private string Icon_Url { set => IconUrl = value; }
}
public class CREmbedAuthor
{
public string Name { get; set; }
public string IconUrl { get; set; }
[JsonProperty("icon_url")]
private string Icon_Url { set => IconUrl = value; }
public string Url { get; set; }
}
}

View File

@@ -85,34 +85,5 @@ namespace NadekoBot.Common.Replacements
return newEmbedData;
}
public CREmbed Replace(CREmbed embedData)
{
embedData.PlainText = Replace(embedData.PlainText);
embedData.Description = Replace(embedData.Description);
embedData.Title = Replace(embedData.Title);
embedData.Thumbnail = Replace(embedData.Thumbnail);
embedData.Image = Replace(embedData.Image);
if (embedData.Author != null)
{
embedData.Author.Name = Replace(embedData.Author.Name);
embedData.Author.IconUrl = Replace(embedData.Author.IconUrl);
}
if (embedData.Fields != null)
foreach (var f in embedData.Fields)
{
f.Name = Replace(f.Name);
f.Value = Replace(f.Value);
}
if (embedData.Footer != null)
{
embedData.Footer.Text = Replace(embedData.Footer.Text);
embedData.Footer.IconUrl = Replace(embedData.Footer.IconUrl);
}
return embedData;
}
}
}