chore: convert various files from JS to TS (#2010)

3 files changed, 41 insertions, 18 deletions

diff --git a/src/lib/DBus.js b/src/lib/DBus.ts
index 9baaea014..b1febc2d1 100644
--- a/src/lib/DBus.js
+++ b/src/lib/DBus.ts
@@ -1,10 +1,12 @@
-import { sessionBus } from 'dbus-next';
+import { MessageBus, sessionBus } from 'dbus-next';
 import { isLinux } from '../environment';
 
 export default class DBus {
-  bus = null;
+  bus: MessageBus | null = null;
 
-  constructor(trayIcon) {
+  trayIcon: any;
+
+  constructor(trayIcon: any) {
     this.trayIcon = trayIcon;
   }
 
@@ -19,15 +21,23 @@ export default class DBus {
     }
 
     // HACK Hook onto the MessageBus to track StatusNotifierWatchers
-    this.bus._addMatch("type='signal',sender='org.freedesktop.DBus',interface='org.freedesktop.DBus',path='/org/freedesktop/DBus',member='NameOwnerChanged'");
+    // @ts-expect-error Property '_addMatch' does not exist on type 'MessageBus'.
+    this.bus._addMatch(
+      "type='signal',sender='org.freedesktop.DBus',interface='org.freedesktop.DBus',path='/org/freedesktop/DBus',member='NameOwnerChanged'",
+    );
     const mangled = JSON.stringify({
       path: '/org/freedesktop/DBus',
       interface: 'org.freedesktop.DBus',
       member: 'NameOwnerChanged',
     });
-    this.bus._signals.on(mangled, (msg) => {
+    // @ts-expect-error Property '_signals' does not exist on type 'MessageBus'.
+    this.bus._signals.on(mangled, (msg: { body: [any, any, any] }) => {
       const [name, oldOwner, newOwner] = msg.body;
-      if (name === 'org.kde.StatusNotifierWatcher' && oldOwner !== newOwner && newOwner !== '') {
+      if (
+        name === 'org.kde.StatusNotifierWatcher' &&
+        oldOwner !== newOwner &&
+        newOwner !== ''
+      ) {
         // Leave ample time for the StatusNotifierWatcher to be initialized
         setTimeout(() => {
           this.trayIcon.recreateIfVisible();
diff --git a/src/lib/Form.js b/src/lib/Form.ts
index 9b8321948..9b8321948 100644
--- a/src/lib/Form.js
+++ b/src/lib/Form.ts
diff --git a/src/lib/TouchBar.js b/src/lib/TouchBar.ts
index c80931200..417e20411 100644
--- a/src/lib/TouchBar.js
+++ b/src/lib/TouchBar.ts
@@ -5,7 +5,13 @@ import { autorun } from 'mobx';
 import { isMac, osRelease } from '../environment';
 
 export default class FranzTouchBar {
-  constructor(stores, actions) {
+  stores: any;
+
+  actions: any;
+
+  build: any;
+
+  constructor(stores: any, actions: any) {
     this.stores = stores;
     this.actions = actions;
 
@@ -26,18 +32,25 @@ export default class FranzTouchBar {
     if (this.stores.user.isLoggedIn) {
       const { TouchBarButton, TouchBarSpacer } = TouchBar;
 
-      const buttons = [];
+      const buttons: any[] = [];
       for (const service of this.stores.services.allDisplayed) {
-        buttons.push(new TouchBarButton({
-          label: `${service.name}${service.unreadDirectMessageCount > 0
-            ? ' 🔴' : ''} ${service.unreadDirectMessageCount === 0
-              && service.unreadIndirectMessageCount > 0
-            ? ' ⚪️' : ''}`,
-          backgroundColor: service.isActive ? '#3498DB' : null,
-          click: () => {
-            this.actions.service.setActive({ serviceId: service.id });
-          },
-        }), new TouchBarSpacer({ size: 'small' }));
+        buttons.push(
+          new TouchBarButton({
+            label: `${service.name}${
+              service.unreadDirectMessageCount > 0 ? ' 🔴' : ''
+            } ${
+              service.unreadDirectMessageCount === 0 &&
+              service.unreadIndirectMessageCount > 0
+                ? ' ⚪️'
+                : ''
+            }`,
+            backgroundColor: service.isActive && '#3498DB',
+            click: () => {
+              this.actions.service.setActive({ serviceId: service.id });
+            },
+          }),
+          new TouchBarSpacer({ size: 'small' }),
+        );
       }
 
       const touchBar = new TouchBar({ items: buttons });