Fix device list addr filter

Author: psi-4ward

app/server.ts

@@ -13,15 +13,16 @@ if (existsSync(resolve(__dirname, './package.json'))) {
   ({version} = require('../package.json'));
 }
 
+// No default values here to not overwrite store-defaults
 commander
   .description(`AskSin Analyzer XS v${version}\nhttps://github.com/psi-4ward/AskSinAnalyzerXS`)
   .version(version, '-v, --version', 'output the current version')
   .option('-l, --list-ports', 'List available serial ports')
   .option('-p, --serial-port <serialPort>', 'SerialPort')
-  .option('-b, --baud <baudRate>', 'BaudRate of SerialPort', '57600')
+  .option('-b, --baud <baudRate>', 'BaudRate of SerialPort')
   .option('-u, --url <deviceListUrl>', 'Host or IP of the CCU or URL to fetch the device-list')
   .option('-c, --ccu <bool>', 'Fetch the device-list from a CCU',
-      (arg: string) => !(arg === 'false' || arg === 'no' || arg === '0'), true)
+      (arg: string) => !(arg === 'false' || arg === 'no' || arg === '0'))
   .option('-d, --data <string>', 'Directory to store persistent data')
   .parse(process.argv);
 

ui/src/Service.js

@@ -175,21 +175,21 @@ export default class Service {
       if (fromName && !this.devicesSet.has(fromName)) {
         this.devicesSet.add(fromName);
         newDeviceAdded = true;
-      } else if (!this.devicesSet.has(fromAddr)) {
+      } else if (!fromName && !this.devicesSet.has(fromAddr)) {
         this.devicesSet.add(fromAddr);
         newDeviceAdded = true;
       }
       if (toName && !this.devicesSet.has(toName)) {
         this.devicesSet.add(toName);
         newDeviceAdded = true;
-      } else if (!this.devicesSet.has(toAddr)) {
+      } else if (!toName && !this.devicesSet.has(toAddr)) {
         this.devicesSet.add(toAddr);
         newDeviceAdded = true;
       }
     });
     if(newDeviceAdded) {
       const devices = Array.from(this.devicesSet);
-      devices.sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()));
+      devices.sort((a, b) => a.toString().toLowerCase().localeCompare(b.toString().toLowerCase()));
       this.data.devices.splice(0, devices.length, ...devices);
     }
   }

ui/src/components/TelegramList.vue

@@ -169,7 +169,7 @@
         if (this.filter.fromName.length) {
           result = result.filter(v => {
             return this.filter.fromName.includes(v.fromName)
-              || this.filter.fromAddr.includes(v.fromName)
+              || this.filter.fromName.includes(v.fromAddr)
               || this.filter.fromName.includes('==Unbekannt==') && v.fromName === '';
           });
         }