From 941893a774c83802afdc4cc76e1d30c59b6c5585 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Mon, 2 Jan 2023 13:10:50 +0100
Subject: [chore] The Big Middleware and API Refactor (tm) (#1250)

* interim commit: start refactoring middlewares into package under router

* another interim commit, this is becoming a big job

* another fucking massive interim commit

* refactor bookmarks to new style

* ambassador, wiz zeze commits you are spoiling uz

* she compiles, we're getting there

* we're just normal men; we're just innocent men

* apiutil

* whoopsie

* i'm glad noone reads commit msgs haha :blob_sweat:

* use that weirdo go-bytesize library for maxMultipartMemory

* fix media module paths
---
 internal/text/emojify.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'internal/text')

diff --git a/internal/text/emojify.go b/internal/text/emojify.go
index c9e25e5f9..673631be3 100644
--- a/internal/text/emojify.go
+++ b/internal/text/emojify.go
@@ -22,7 +22,7 @@ import (
 	"bytes"
 	"html"
 
-	"github.com/superseriousbusiness/gotosocial/internal/api/model"
+	apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
 	"github.com/superseriousbusiness/gotosocial/internal/regexes"
 )
 
@@ -30,8 +30,8 @@ import (
 //
 // Callers should ensure that inputText and resulting text are escaped
 // appropriately depending on what they're used for.
-func Emojify(emojis []model.Emoji, inputText string) string {
-	emojisMap := make(map[string]model.Emoji, len(emojis))
+func Emojify(emojis []apimodel.Emoji, inputText string) string {
+	emojisMap := make(map[string]apimodel.Emoji, len(emojis))
 
 	for _, emoji := range emojis {
 		shortcode := ":" + emoji.Shortcode + ":"
-- 
cgit v1.2.3