Merge branch 'main' into 25-improve-fct-deobfuscator

# Conflicts:
#	src/vipyr_deobf/cli.py

src/vipyr_deobf/cli.py

@@ -6,20 +6,20 @@
 from .deobfuscators.fct import deobf_fct, format_fct
 from .deobfuscators.hyperion import deobf_hyperion, format_hyperion
 from .deobfuscators.lzmaspam import deobf_lzma_b64, format_lzma_b64
-from .deobfuscators.vore import deobf_vore, format_vore
+from .deobfuscators.vare import deobf_vare, format_vare
 from .exceptions import DeobfuscationFailError, InvalidSchemaError
 
 R = TypeVar('R')
 
 supported_obfuscators: dict[str, tuple[Callable[[TextIO], R], Callable[[R], str]]] = {
     'hyperion': (deobf_hyperion, format_hyperion),
     'lzmaspam': (deobf_lzma_b64, format_lzma_b64),
-    'vore': (deobf_vore, format_vore),
+    'vore': (deobf_vare, format_vare),
     'fct': (deobf_fct, format_fct),
 }
 
 alias_dict: dict[str, str] = {
-    'vare': 'vore',
+    'vore': 'vare',
     'hyperd': 'hyperion',
     'fct_obfuscate': 'fct',
     'not_pyobfuscate': 'fct',

src/vipyr_deobf/deobfuscators/vore.py → src/vipyr_deobf/deobfuscators/vare.py

@@ -16,7 +16,7 @@
 from ..utils import WEBHOOK_REGEX
 
 
-def deobf_vore(file: TextIO) -> str:
+def deobf_vare(file: TextIO) -> str:
     """
     Extracts the entire source code from code
     """
@@ -33,7 +33,7 @@ def deobf_vore(file: TextIO) -> str:
     ).decode()
 
 
-def format_vore(result: str) -> str:
+def format_vare(result: str) -> str:
     return result + '\n\n' + '\n'.join(re.findall(WEBHOOK_REGEX, result))