From bf4e62b4b74133bf51a8aeb33d81a5e45117a3fe Mon Sep 17 00:00:00 2001
From: TheSavageTeddy <51810476+TheSavageTeddy@users.noreply.github.com>
Date: Fri, 25 Nov 2022 21:36:17 +0800
Subject: [PATCH] added choice for base85 all-zero character

---
 src/core/operations/FromBase85.mjs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/core/operations/FromBase85.mjs b/src/core/operations/FromBase85.mjs
index afbd6af3..aef16638 100644
--- a/src/core/operations/FromBase85.mjs
+++ b/src/core/operations/FromBase85.mjs
@@ -37,6 +37,11 @@ class FromBase85 extends Operation {
                 type: "boolean",
                 value: true
             },
+            {
+                name: "All-zero group char",
+                type: "binaryShortString",
+                value: "z"
+            },
         ];
         this.checks = [
             {
@@ -78,6 +83,7 @@ class FromBase85 extends Operation {
         const alphabet = Utils.expandAlphRange(args[0]).join(""),
             encoding = alphabetName(alphabet),
             removeNonAlphChars = args[1],
+            allZeroGroupChar = args[2],
             result = [];
 
         if (alphabet.length !== 85 ||
@@ -91,7 +97,7 @@ class FromBase85 extends Operation {
 
         // Remove non-alphabet characters
         if (removeNonAlphChars) {
-            const re = new RegExp("[^" + "z~" +alphabet.replace(/[[\]\\\-^$]/g, "\\$&") + "]", "g");
+            const re = new RegExp("[^~" + allZeroGroupChar +alphabet.replace(/[[\]\\\-^$]/g, "\\$&") + "]", "g");
             input = input.replace(re, "");
             // Remove delimiters again if present (incase of non-alphabet characters in front/behind delimiters)
             const matches = input.match(/^<~(.+?)~>$/);
@@ -103,7 +109,7 @@ class FromBase85 extends Operation {
         let i = 0;
         let block, blockBytes;
         while (i < input.length) {
-            if (encoding === "Standard" && input[i] === "z") {
+            if (encoding === "Standard" && input[i] === allZeroGroupChar) {
                 result.push(0, 0, 0, 0);
                 i++;
             } else {
@@ -113,7 +119,7 @@ class FromBase85 extends Operation {
                     .split("")
                     .map((chr, idx) => {
                         const digit = alphabet.indexOf(chr);
-                        if ((digit < 0 || digit > 84) && chr !== "z") {
+                        if ((digit < 0 || digit > 84) && chr !== allZeroGroupChar) {
                             throw `Invalid character '${chr}' at index ${i + idx}`;
                         }
                         return digit;