Too many gifs are bad, mkay

PlasmaPower · Dec 24, 2015 · 3c53eda · 3c53eda
1 parent fd06c6d
commit 3c53eda
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/betterttv.js b/betterttv.js
@@ -2422,6 +2422,8 @@ var bttvEmoticonize = exports.bttvEmoticonize = function(message, emote, sender)
 var bttvMessageTokenize = exports.bttvMessageTokenize = function(sender, message) {
     var tokenizedString = message.split(' ');
 
+    var gifCount = 0;
+
     for (var i = 0; i < tokenizedString.length; i++) {
         var piece = tokenizedString[i];
 
@@ -2447,9 +2449,11 @@ var bttvMessageTokenize = exports.bttvMessageTokenize = function(sender, message
             emote &&
             emote.urlTemplate &&
             bttv.settings.get('bttvEmotes') === true &&
-            (emote.imageType === 'png' || (emote.imageType === 'gif' && bttv.settings.get('bttvGIFEmotes') === true))
+            (emote.imageType === 'png' || (emote.imageType === 'gif' && bttv.settings.get('bttvGIFEmotes') === true)) &&
+            gifCount < 5
         ) {
             piece = bttvEmoticonize(piece, emote, sender);
+            gifCount++;
         } else {
             piece = escape(piece);
             piece = linkify(piece);

diff --git a/src/chat/templates.js b/src/chat/templates.js
@@ -133,6 +133,8 @@ var bttvEmoticonize = exports.bttvEmoticonize = function(message, emote, sender)
 var bttvMessageTokenize = exports.bttvMessageTokenize = function(sender, message) {
     var tokenizedString = message.split(' ');
 
+    var gifCount = 0;
+
     for (var i = 0; i < tokenizedString.length; i++) {
         var piece = tokenizedString[i];
 
@@ -158,9 +160,11 @@ var bttvMessageTokenize = exports.bttvMessageTokenize = function(sender, message
             emote &&
             emote.urlTemplate &&
             bttv.settings.get('bttvEmotes') === true &&
-            (emote.imageType === 'png' || (emote.imageType === 'gif' && bttv.settings.get('bttvGIFEmotes') === true))
+            (emote.imageType === 'png' || (emote.imageType === 'gif' && bttv.settings.get('bttvGIFEmotes') === true)) &&
+            gifCount < 5
         ) {
             piece = bttvEmoticonize(piece, emote, sender);
+            gifCount++;
         } else {
             piece = escape(piece);
             piece = linkify(piece);