From 858dcdc5d9206754fa430868d6fa61461ca1c94b Mon Sep 17 00:00:00 2001
From: fruzitent <40008647+fruzitent@users.noreply.github.com>
Date: Mon, 1 Jul 2024 08:35:07 +0300
Subject: [PATCH] feat: target chatterino2 v2.5.0 (#19)

* chore: add reference links

* feat: do not force line below the most recent message

* feat: target chatterino2 v2.5.0

* fixup! feat: target chatterino2 v2.5.0

* fixup! fixup! feat: target chatterino2 v2.5.0
---
 templates/settings.json.tera | 26 +++++++++++++++++++++-----
 templates/themes.json.tera   |  5 ++++-
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/templates/settings.json.tera b/templates/settings.json.tera
index 7de138e..f608e7e 100644
--- a/templates/settings.json.tera
+++ b/templates/settings.json.tera
@@ -7,17 +7,27 @@ whiskers:
     - "flavor"
   version: "2.4.0"
 ---
+{# @help: https://github.com/Chatterino/chatterino2/blob/v2.5.0/src/singletons/Settings.hpp #}
 {
   "appearance": {
     "messages": {
-      "lastMessageColor": "{{ flavor.colors[accent].hex }}",
-      "showLastMessageIndicator": true
+      "lastMessageColor": "{{ flavor.colors[accent].hex }}"
     },
     "theme": {
-      "name": "{{ flavor.identifier }}-{{ accent }}.json"
+{%- if flavor.dark %}
+      "darkSystem": "{{ flavor.identifier }}-{{ accent }}.json",
+      "lightSystem": "Light",
+{%- else %}
+      "darkSystem": "Dark",
+      "lightSystem": "{{ flavor.identifier }}-{{ accent }}.json",
+{%- endif %}
+      "name": "System"
     }
   },
   "highlighting": {
+    "automod": {
+      "color": "{{ surface2 | mod(opacity=0.15) | get(key="hex") }}"
+    },
     "elevatedMessageHighlight": {
       "color": "{{ yellow | mod(opacity=0.25) | get(key="hex") }}"
     },
@@ -25,9 +35,15 @@ whiskers:
     "redeemedHighlightColor": "{{ teal| mod(opacity=0.25) | get(key="hex") }}",
     "selfHighlightColor": "{{ red | mod(opacity=0.50) | get(key="hex") }}",
     "selfMessageHighlight": {
-      "color": "{{ flavor.colors[accent] | mod(opacity=1.00) | get(key="hex") }}"
+      "color": "{{ flavor.colors[accent] | mod(opacity=0.20) | get(key="hex") }}"
     },
     "subHighlightColor": "{{ mauve| mod(opacity=0.40) | get(key="hex") }}",
-    "threadHighlightColor": "{{ red | mod(opacity=0.25) | get(key="hex") }}"
+    "threadHighlightColor": "{{ red | mod(opacity=0.25) | get(key="hex") }}",
+    "users": [
+      {
+        "color": "{{ flavor.colors[accent] | mod(opacity=0.20) | get(key="hex") }}",
+        "pattern": "testaccount_420"
+      }
+    ]
   }
 }
diff --git a/templates/themes.json.tera b/templates/themes.json.tera
index a9329f5..2ef5525 100644
--- a/templates/themes.json.tera
+++ b/templates/themes.json.tera
@@ -7,8 +7,9 @@ whiskers:
     - "flavor"
   version: "2.4.0"
 ---
+{# @help: https://github.com/Chatterino/chatterino2/blob/v2.5.0/src/singletons/Theme.hpp #}
 {
-  "$schema": "https://raw.githubusercontent.com/Chatterino/chatterino2/v2.4.6/docs/ChatterinoTheme.schema.json",
+  "$schema": "https://raw.githubusercontent.com/Chatterino/chatterino2/v2.5.0/docs/ChatterinoTheme.schema.json",
   "colors": {
     "accent": "{{ flavor.colors[accent].hex }}",
     "messages": {
@@ -70,6 +71,7 @@ whiskers:
         },
         "text": "{{ subtext1.hex }}"
       },
+      "liveIndicator": "{{ red.hex }}",
       "newMessage": {
         "backgrounds": {
           "hover": "{{ mantle.hex }}",
@@ -96,6 +98,7 @@ whiskers:
         },
         "text": "{{ subtext0.hex }}"
       },
+      "rerunIndicator": "{{ yellow.hex }}",
       "selected": {
         "backgrounds": {
           "hover": "{{ surface0.hex }}",