Fixes '--fix-ssl-permissions' errors mistakenly parsed as blockchain …

…version farmrBot: splits messages every 4096 characters
gilnobrega · Jan 3, 2022 · 9115b6d · 9115b6d
1 parent 0ff64a1
commit 9115b6d
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 8 deletions.
diff --git a/environment_config.yaml b/environment_config.yaml
@@ -6,6 +6,6 @@ environment_config:
   fields: # set of fields for command
     version: # key name
       const: true # optional, default to TRUE
-      default: 1.7.7.3 # optional, default value for key, if not provided key will be required during command run
+      default: 1.7.7.4 # optional, default value for key, if not provided key will be required during command run
       dotenv: true # optional, default to FALSE, if this field should be added to .env file
 
diff --git a/lib/harvester/harvester.dart b/lib/harvester/harvester.dart
@@ -158,6 +158,9 @@ class Harvester
             .stdout
             .toString()
             .trim();
+
+        if (_blockchainVersion.length > 32 && _blockchainVersion.contains("\n"))
+          _blockchainVersion = _blockchainVersion.split("\n").last;
       } catch (error) {
         log.warning("Failed to get ${blockchain.binaryName} version");
       }
@@ -190,8 +193,10 @@ class Harvester
     //loads version from json
     if (object['version'] != null) _version = object['version'];
 
-    if (object['blockchainVersion'] != null)
+    if (object['blockchainVersion'] != null) {
       _blockchainVersion = object['blockchainVersion'];
+      if (_blockchainVersion.length > 32) _blockchainVersion = "N/A";
+    }
 
     loadDisksFromJson(object);
 

diff --git a/server/farmr_server.dart b/server/farmr_server.dart
@@ -145,6 +145,8 @@ Future<void> main(List<String> args) async {
           .where((client) => (client is Farmer || client is HPool))
           .first as Farmer; //Selects newest farm as main farm
 
+      List<String> lines = [];
+
       if (args.contains("workers")) {
         //Sorts workers by alphabetical order
         harvesters.sort((harvester1, harvester2) =>
@@ -158,7 +160,7 @@ Future<void> main(List<String> args) async {
           harvester.filterDuplicates(false);
           harvester.sortPlots();
 
-          print(Stats.showHarvester(
+          lines.add(Stats.showHarvester(
               harvester,
               harvestersCount,
               farmersCount,
@@ -170,8 +172,6 @@ Future<void> main(List<String> args) async {
               (blockchain == "xch")
                   ? price.rates[harvester.currency]
                   : Price().rates[harvester.currency]));
-
-          if (harvester != harvesters.last) print(';;');
         }
       } else {
         //Sorts harvesters by farmer/harvester type
@@ -189,11 +189,10 @@ Future<void> main(List<String> args) async {
 
         if (args.contains("wallets")) {
           for (Wallet wallet in farm.wallets) {
-            print(Stats.showWalletInfo(wallet, blockchain));
-            if (wallet != farm.wallets.last) print(';;');
+            lines.add(Stats.showWalletInfo(wallet, blockchain));
           }
         } else
-          print(Stats.showHarvester(
+          lines.add(Stats.showHarvester(
               farm,
               harvestersCount,
               farmersCount,
@@ -206,6 +205,25 @@ Future<void> main(List<String> args) async {
                   ? price.rates[farm.currency]
                   : Price().rates[farm.currency]));
       }
+
+      const discordLimit = 4000; //actually 4096
+
+      for (var line in lines) {
+        if (line.length < discordLimit) {
+          print(line);
+          if (line != lines.last) print(';;');
+          //splits line into two discord messages if longer than 4000 characters
+        } else {
+          RegExp exp = new RegExp(r"\d{" + "$discordLimit}");
+          var matches = exp.allMatches(line);
+          var list = matches.map((m) => m.group(0) ?? "");
+
+          for (String splitLine in list) {
+            print(splitLine);
+            if (splitLine != list.last) print(';;');
+          }
+        }
+      }
     } catch (Exception) {
       if (farmersCount == 0) print("Error: Farmer not found.");
       if (harvesters.length > 0)