Chatterino · pajlada · Apr 8, 2023 · Apr 8, 2023 · Apr 8, 2023 · Apr 8, 2023
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Breaking: Remove the `/twitchemotes/` endpoints. See [issue 332](https://github.com/Chatterino/api/issues/332) for more information. (#465)
+
 ## 2.0.2
 
 - Minor: Our User-Agent now properly reflects the version of the API. (#459)

diff --git a/README.md b/README.md
@@ -7,21 +7,6 @@ Go web service that serves as a cache to APIs that each Chatterino client could
 
 ## Routes
 
-### Resolve Twitch emote set
-
-`twitchemotes/set/:setID`  
-Returns information about a given Twitch emote set. Example response:
-
-```javascript
-{
-  "channel_name": "forsen", // twitch user name
-  "channel_id": "22484632", // twitch user id
-  "type": "sub",            // string describing what type of emote set this is (e.g. "sub")
-  "custom": false           // indicates whether this is added/modified by us or straight passthrough from the twitchemotes API
-  "tier": 1,                // integer describing what tier the sub emote is part of
-}
-```
-
 ### Resolve URL
 
 `link_resolver/:url`  

diff --git a/cmd/api/main.go b/cmd/api/main.go
@@ -8,12 +8,10 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/Chatterino/api/internal/caches/twitchusernamecache"
 	"github.com/Chatterino/api/internal/db"
 	"github.com/Chatterino/api/internal/logger"
 	"github.com/Chatterino/api/internal/migration"
 	defaultresolver "github.com/Chatterino/api/internal/resolvers/default"
-	"github.com/Chatterino/api/internal/routes/twitchemotes"
 	"github.com/Chatterino/api/internal/twitchapiclient"
 	"github.com/Chatterino/api/pkg/cache"
 	"github.com/Chatterino/api/pkg/config"
@@ -124,23 +122,18 @@ func main() {
 	// Strip trailing slashes from API requests
 	router.Use(StripSlashes)
 
-	var helixUsernameCache cache.Cache
-
 	helixClient, err := twitchapiclient.New(ctx, cfg)
 	if err != nil {
 		log.Warnw("Error initializing Twitch API client",
 			"error", err,
 		)
-	} else {
-		helixUsernameCache = twitchusernamecache.New(ctx, cfg, pool, helixClient)
 	}
 
 	if cfg.EnablePrometheus {
 		// Host a prometheus metrics instance on cfg.PrometheusBindAddress (127.0.0.1:9382 by default)
 		listenPrometheus(cfg)
 	}
 
-	twitchemotes.Initialize(ctx, cfg, pool, router, helixClient, helixUsernameCache)
 	handleRoot(router)
 	handleHealth(router)
 	handleLegal(router)

diff --git a/config.yaml b/config.yaml
@@ -42,9 +42,6 @@
 # Cache duration for Twitch clip links
 #twitch-clip-cache-duration: 1h
 
-# Cache duration for the Twitchemotes.com emote cache
-#twitchemotes-emote-cache-duration: 30m
-
 # YouTube API key, provides rich information for YouTube video links
 #youtube-api-key: ""
 

diff --git a/internal/caches/twitchusernamecache/cache.go b/internal/caches/twitchusernamecache/cache.go
diff --git a/internal/caches/twitchusernamecache/cache_test.go b/internal/caches/twitchusernamecache/cache_test.go
diff --git a/internal/caches/twitchusernamecache/username_loader.go b/internal/caches/twitchusernamecache/username_loader.go
diff --git a/internal/routes/twitchemotes/initialize.go b/internal/routes/twitchemotes/initialize.go
diff --git a/internal/routes/twitchemotes/initialize_test.go b/internal/routes/twitchemotes/initialize_test.go
diff --git a/internal/routes/twitchemotes/set_loader.go b/internal/routes/twitchemotes/set_loader.go
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -67,7 +67,6 @@ func init() {
 	pflag.Bool("enable-animated-thumbnails", true, "When enabled, will attempt to use libvips library to build animated thumbnails. Can increase CPU usage and cache storage by a lot. Enabled by default")
 	pflag.Uint("max-thumbnail-size", 300, "Maximum width/height pixel size count of the thumbnails sent to the clients.")
 	pflag.Duration("twitch-username-cache-duration", 1*time.Hour, "Cache timeout for twitch usernames")
-	pflag.Duration("twitchemotes-emote-cache-duration", 30*time.Minute, "Cache timeout for twitch emotes")
 	pflag.Duration("bttv-emote-cache-duration", 1*time.Hour, "Cache timeout for bttv emotes")
 	pflag.Duration("thumbnail-cache-duration", 10*time.Minute, "Cache timeout for default thumbnails")
 	pflag.Duration("default-link-cache-duration", 10*time.Minute, "Cache timeout for default links")

diff --git a/pkg/config/model.go b/pkg/config/model.go
@@ -12,7 +12,6 @@ type APIConfig struct {
 	MaxThumbnailSize         uint   `mapstructure:"max-thumbnail-size" json:"max-thumbnail-size"`
 
 	TwitchUsernameCacheDuration      time.Duration `mapstructure:"twitch-username-cache-duration" json:"twitch-username-cache-duration"`
-	TwitchemotesEmoteCacheDuration   time.Duration `mapstructure:"twitchemotes-emote-cache-duration" json:"twitchemotes-emote-cache-duration"`
 	BttvEmoteCacheDuration           time.Duration `mapstructure:"bttv-emote-cache-duration" json:"bttv-emote-cache-duration"`
 	ThumbnailCacheDuration           time.Duration `mapstructure:"thumbnail-cache-duration" json:"thumbnail-cache-duration"`
 	DefaultLinkCacheDuration         time.Duration `mapstructure:"default-link-cache-duration" json:"default-link-cache-duration"`