getSystemTheme

Author: JasminDreasond

.env

@@ -52,11 +52,8 @@ NAVIGATION_SIDEBAR_HIDDEN=false
 
 # Limit items rows on emojiboard.
 FAV_EMOJI_ROWS_LIMIT=50
-
 RECENT_EMOJI_ROWS_LIMIT=3
-
 FAV_STICKER_ROWS_LIMIT=3
-
 RECENT_STICKER_ROWS_LIMIT=50
 
 ### Homeserver list

src/client/state/settings.js

@@ -115,6 +115,7 @@ class Settings extends EventEmitter {
       },
     );
 
+    this.systemIsDark = null;
     this.useSystemTheme = this.getUseSystemTheme();
     this.isMarkdown = this.getIsMarkdown();
     this.isPeopleDrawer = this.getIsPeopleDrawer();
@@ -128,6 +129,13 @@ class Settings extends EventEmitter {
       'ontouchstart' in window || navigator.maxTouchPoints > 0 || navigator.msMaxTouchPoints > 0;
   }
 
+  getSystemTheme() {
+    return {
+      enabled: this.useSystemTheme,
+      isDark: this.systemIsDark,
+    };
+  }
+
   getThemeIndex() {
     if (typeof this.themeIndex === 'number') return this.themeIndex;
 
@@ -246,10 +254,12 @@ class Settings extends EventEmitter {
       body.addClass('discord-style');
     }
 
+    this.systemIsDark =
+      window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches;
     if (useSystemTheme) {
       body.addClass('system-theme');
 
-      if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) {
+      if (this.systemIsDark) {
         body.addClass(this.defaultSystemThemeType.dark);
       } else {
         body.addClass(this.defaultSystemThemeType.light);