From 268f252e0d517f2693b30d03fb8a68a0764a43bc Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Mon, 12 Sep 2022 13:03:23 +0200
Subject: [feature] Fetch + display custom emoji in statuses from remote
 instances (#807)

* start implementing remote emoji fetcher

* update status where pk

* aaa

* tidy up a little

* check size limits for emojis

* thank you linter, i love you <3

* update swagger docs

* add emoji dereference test

* make emoji max sizes configurable

* normalize db.ErrAlreadyExists
---
 internal/db/error.go | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'internal/db/error.go')

diff --git a/internal/db/error.go b/internal/db/error.go
index 9ac0b6aa0..8dc344360 100644
--- a/internal/db/error.go
+++ b/internal/db/error.go
@@ -28,19 +28,8 @@ var (
 	ErrNoEntries Error = fmt.Errorf("no entries")
 	// ErrMultipleEntries is returned when a caller expected ONE entry for a query, but multiples were found.
 	ErrMultipleEntries Error = fmt.Errorf("multiple entries")
+	// ErrAlreadyExists is returned when a conflict was encountered in the db when doing an insert.
+	ErrAlreadyExists Error = fmt.Errorf("already exists")
 	// ErrUnknown denotes an unknown database error.
 	ErrUnknown Error = fmt.Errorf("unknown error")
 )
-
-// ErrAlreadyExists is returned when a caller tries to insert a database entry that already exists in the db.
-type ErrAlreadyExists struct {
-	message string
-}
-
-func (e *ErrAlreadyExists) Error() string {
-	return e.message
-}
-
-func NewErrAlreadyExists(msg string) error {
-	return &ErrAlreadyExists{message: msg}
-}
-- 
cgit v1.2.3