refactor: Find, MessageSends

artworks/artworks.go

@@ -1,7 +1,6 @@
 package artworks
 
 import (
-	"errors"
 	"fmt"
 	"regexp"
 	"strings"
@@ -19,36 +18,18 @@ type Provider interface {
 type Artwork interface {
 	StoreArtwork() *store.Artwork
 	MessageSends(footer string, tags bool) ([]*discordgo.MessageSend, error)
+	ID() string
 	URL() string
 	Len() int
 }
 
-type Error struct {
-	provider string
-	cause    error
-}
-
-func (e *Error) Error() string {
-	return fmt.Sprintf("provider %v returned an error: %v", e.provider, e.cause.Error())
-}
-
-func (e *Error) Unwrap() error {
-	return e.cause
-}
-
 func NewError(p Provider, err error) error {
 	return &Error{
 		provider: fmt.Sprintf("%T", p),
 		cause:    err,
 	}
 }
 
-// Common errors
-var (
-	ErrArtworkNotFound = errors.New("artwork not found")
-	ErrRateLimited     = errors.New("provider rate limited")
-)
-
 func EscapeMarkdown(content string) string {
 	contents := strings.Split(content, "\n")
 	regex := regexp.MustCompile("^#{1,3}")

artworks/deviant/deviant.go

@@ -33,7 +33,9 @@ type Artwork struct {
 	Comments     int
 	AIGenerated  bool
 	CreatedAt    time.Time
-	url          string
+
+	id  string
+	url string
 }
 
 type Author struct {
@@ -78,7 +80,7 @@ func (d *DeviantArt) Find(id string) (artworks.Artwork, error) {
 	return artwork, nil
 }
 
-func (d *DeviantArt) _find(id string) (artworks.Artwork, error) {
+func (*DeviantArt) _find(id string) (artworks.Artwork, error) {
 	reqURL := "https://backend.deviantart.com/oembed?url=" + url.QueryEscape("deviantart.com/art/"+id)
 	resp, err := http.Get(reqURL)
 	if err != nil {
@@ -105,7 +107,9 @@ func (d *DeviantArt) _find(id string) (artworks.Artwork, error) {
 		Favorites:    res.Community.Statistics.Attributes.Favorites,
 		Comments:     res.Community.Statistics.Attributes.Comments,
 		CreatedAt:    res.Pubdate,
-		url:          res.AuthorURL + "/art/" + id,
+
+		id:  id,
+		url: res.AuthorURL + "/art/" + id,
 	}
 
 	artwork.AIGenerated = artworks.IsAIGenerated(artwork.Tags...)
@@ -122,7 +126,7 @@ func (d *DeviantArt) Match(s string) (string, bool) {
 	return res[1], true
 }
 
-func (d *DeviantArt) Enabled(g *store.Guild) bool {
+func (*DeviantArt) Enabled(g *store.Guild) bool {
 	return g.Deviant
 }
 
@@ -172,6 +176,10 @@ func (a *Artwork) URL() string {
 	return a.url
 }
 
-func (a *Artwork) Len() int {
+func (a *Artwork) ID() string {
+	return a.id
+}
+
+func (*Artwork) Len() int {
 	return 1
 }

artworks/errors.go

@@ -0,0 +1,37 @@
+package artworks
+
+import (
+	"errors"
+	"fmt"
+)
+
+// Common errors
+var (
+	ErrArtworkNotFound = errors.New("artwork not found")
+	ErrRateLimited     = errors.New("provider rate limited")
+)
+
+type Error struct {
+	provider string
+	cause    error
+}
+
+func (e *Error) Error() string {
+	return fmt.Sprintf("provider %v returned an error: %v", e.provider, e.cause.Error())
+}
+
+func (e *Error) Unwrap() error {
+	return e.cause
+}
+
+func WrapError(p Provider, find func() (Artwork, error)) (Artwork, error) {
+	artwork, err := find()
+	if err != nil {
+		return nil, &Error{
+			provider: fmt.Sprintf("%T", p),
+			cause:    err,
+		}
+	}
+
+	return artwork, nil
+}