update 19.9.0

genmonke

@@ -74,7 +74,7 @@ mv tv.twitch.android.util.EmoteUrlUtil.smali.patch emotes/.
 mv tv.twitch.android.shared.ui.elements.span.GlideChatImageTarget.smali.patch emotes/.
 mv tv.twitch.android.shared.ui.elements.span.GlideChatImageCustomTarget.smali.patch emotes/.
 mv tv.twitch.android.shared.emotes.utils.AnimatedEmotesUrlUtil.smali.patch emotes/.
-mv tv.twitch.android.sdk.ChatController.smali.patch emotes/.
+mv tv.twitch.android.shared.chat.ChatController.smali.patch emotes/.
 mv tv.twitch.android.shared.chomments.impl.ChommentsFetcherImpl.smali.patch emotes/.
 mv tv.twitch.android.shared.chat.ChatMessageDelegate.smali.patch emotes/.
 mv tv.twitch.android.shared.chat.messagefactory.* emotes/.

mod/app/src/main/java/bttv/Data.java

@@ -48,6 +48,7 @@ public static void setCurrentBroadcasterName(CharSequence name) {
         Data.currentBroadcasterName = name.toString();
     }
 
+    /** @noinspection unused */
     public static void setCurrentBroadcasterId(ChannelModel channel) {
         setCurrentBroadcasterId(channel.component1());
     }

mod/app/src/main/java/bttv/Tokenizer.java

@@ -20,11 +20,6 @@
 import tv.twitch.android.shared.chat.pub.model.messages.MessageToken.EmoticonToken;
 import tv.twitch.android.shared.chat.pub.messages.ui.ChatMessageInterface;
 import tv.twitch.android.shared.chat.ChatMessageDelegate;
-import tv.twitch.chat.AutoModFlags;
-import tv.twitch.chat.ChatEmoticonToken;
-import tv.twitch.chat.ChatMessageToken;
-import tv.twitch.chat.ChatMessageTokenType;
-import tv.twitch.chat.ChatTextToken;
 import tv.twitch.chat.library.model.ChatMessageInfo;
 
 public class Tokenizer {
@@ -107,95 +102,6 @@ public static void retokenizeLiveChatMessage(ChatMessageInterface chatMessageInt
         }
     }
 
-    /** @noinspection unused */
-    public static void retokenizeLiveChatMessage(tv.twitch.chat.ChatMessageInfo info) {
-        try {
-            Context ctx = Data.ctx;
-            int channel = Data.currentBroadcasterId;
-
-            ArrayList<tv.twitch.chat.ChatMessageToken> newTokens = new ArrayList<>(info.tokens.length + 10);
-
-            boolean shouldHighlight = false;
-            boolean shouldBlock = false;
-
-            for (tv.twitch.chat.ChatMessageToken token : info.tokens) {
-                Log.d("LBTTV", "retokenizeLiveChatMessage: " + token);
-                if (!isTextTokenOld(token)) {
-                    if (isEmoteTokenOld(token) && !newTokens.isEmpty()) {
-                        tv.twitch.chat.ChatMessageToken prevToken = newTokens.get(newTokens.size() - 1);
-                        if (prevToken != null && !endsWithSpaceOld(prevToken)) {
-                            ChatTextToken spaceToken = new ChatTextToken();
-                            spaceToken.text = " ";
-                            spaceToken.autoModFlags = new AutoModFlags();
-                            newTokens.add(spaceToken);
-                        }
-                    }
-                    newTokens.add(token);
-                    continue;
-                }
-
-                ChatTextToken textToken = (ChatTextToken) token;
-                String text = textToken.text;
-
-                if (text.equals(" ")) {
-                    // " ".split(" ") will produce an empty array
-                    // this is why we need to handle this edge-case
-                    newTokens.add(textToken);
-                    continue;
-                }
-                String[] tokens = text.split(" ");
-
-                StringBuilder currentText = new StringBuilder();
-                for (String word : tokens) {
-                    if (Blacklist.shouldBlock(word)) {
-                        shouldBlock = true;
-                    }
-                    if (Highlight.shouldHighlight(word)) {
-                        shouldHighlight = true;
-                    }
-                    Emote emote = Emotes.getEmote(ctx, word, channel);
-                    if (emote == null) {
-                        currentText.append(word).append(" ");
-                        continue;
-                    }
-                    // emote found
-                    String before = currentText.toString();
-                    if (!before.isEmpty()) {
-                        ChatTextToken everythingBeforeEmote = new ChatTextToken();
-                        everythingBeforeEmote.text = before;
-                        everythingBeforeEmote.autoModFlags = textToken.autoModFlags;
-                        newTokens.add(everythingBeforeEmote);
-                    }
-                    ChatEmoticonToken emoteToken = new ChatEmoticonToken();
-                    emoteToken.emoticonText = word;
-                    emoteToken.emoticonId = "BTTV-" + emote.id;
-                    newTokens.add(emoteToken);
-
-                    // prepare next TextToken
-                    currentText.setLength(0);
-                    currentText.append(' ');
-                }
-                String before = currentText.toString();
-                if (!before.trim().isEmpty()) {
-                    ChatTextToken everything = new ChatTextToken();
-                    everything.text = before;
-                    everything.autoModFlags = textToken.autoModFlags;
-                    newTokens.add(everything);
-                }
-            }
-
-            info.tokens = newTokens.toArray(new ChatMessageToken[0]);
-
-            if (shouldBlock) {
-                info.messageType = "bttv-blocked-message";
-            } else if (shouldHighlight) {
-                info.messageType = "bttv-highlighted-message";
-            }
-        } catch (Throwable throwable) {
-            Log.e("LBTTV", "retokenizeLiveChatMessage: " + throwable.getMessage());
-        }
-    }
-
     public static void retokenizeLiveChatMessage(ChatMessageInfo info) {
         Context ctx = Data.ctx;
         int channel = Data.currentBroadcasterId;
@@ -290,45 +196,17 @@ private static boolean endsWithSpace(@NotNull tv.twitch.chat.library.model.Messa
         return lastChar == ' ';
     }
 
-    private static boolean endsWithSpaceOld(@NotNull tv.twitch.chat.ChatMessageToken token) {
-        if (token.type.getValue() != ChatMessageTokenType.Text.getValue()) {
-            return false;
-        }
-        ChatTextToken textToken = (ChatTextToken) token;
-        String text = textToken.text;
-        if (text.isEmpty()) {
-            return false;
-        }
-        char lastChar = text.charAt(text.length() - 1);
-        return lastChar == ' ';
-    }
-
     private static boolean isTextToken(tv.twitch.chat.library.model.MessageToken token) {
         if (token == null) {
             return false;
         }
         return token instanceof tv.twitch.chat.library.model.MessageToken.TextToken;
     }
 
-    private static boolean isTextTokenOld(tv.twitch.chat.ChatMessageToken token) {
-        if (token == null) {
-            return false;
-        }
-        return token.type.getValue() == ChatMessageTokenType.Text.getValue();
-    }
-
-
     private static boolean isEmoteToken(tv.twitch.chat.library.model.MessageToken token) {
         if (token == null) {
             return false;
         }
         return token instanceof tv.twitch.chat.library.model.MessageToken.EmoteToken;
     }
-
-    private static boolean isEmoteTokenOld(tv.twitch.chat.ChatMessageToken token) {
-        if (token == null) {
-            return false;
-        }
-        return token.type.getValue() == ChatMessageTokenType.Emoticon.getValue();
-    }
 }

mod/app/src/test/java/bttv/mod/RetokenizeTest.java

@@ -20,13 +20,7 @@
 import bttv.Tokenizer;
 import bttv.emote.Emote;
 import bttv.emote.Emotes;
-import tv.twitch.chat.ChatEmoticonToken;
-import tv.twitch.chat.ChatMentionToken;
 import tv.twitch.chat.library.model.ChatMessageInfo;
-import tv.twitch.chat.ChatMessageToken;
-import tv.twitch.chat.ChatMessageTokenType;
-import tv.twitch.chat.ChatTextToken;
-import tv.twitch.chat.ChatUrlToken;
 import tv.twitch.chat.library.model.MessageToken;
 
 import static org.junit.Assert.assertEquals;