Merge pull request #8 from aw-studio/feat/add-opt-api-params-and-chec…

…k-json Add api params to config, checks for json strings
aw-studio · Jan 20, 2022 · d728791 · d728791
2 parents 6e2f0d7 + 7b5057f
commit d728791
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 6 deletions.
diff --git a/config/deeplable.php b/config/deeplable.php
@@ -36,4 +36,16 @@
     'translated_models' => [
         // App\Models\Post::class,
     ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | API-Parameters
+    |--------------------------------------------------------------------------
+    |
+    | Here you can set optional api parameters.
+    |
+    */
+    'api_params' => [
+        //'tag_handling'    => 'xml', // only available in pro version
+    ],
 ];
diff --git a/src/Deepl.php b/src/Deepl.php
@@ -20,6 +20,8 @@ class Deepl
      * Create new Deepl instance.
      *
      * @param  string  $apiToken
+     * @param  string  $apiUrl
+     * @param  string  $fallbackLocale
      * @return void
      */
     public function __construct(
@@ -44,13 +46,23 @@ public function translate(string $string, string $targetLang, string|null $sourc
         if (! $string) {
             return '';
         }
+        if ($this->isJson($string)) {
+            return $string;
+        }
+
+        if (str_contains($this->apiUrl, '-free')) {
+            $string = strip_tags($string);
+        }
 
-        $body = [
-            'auth_key'        => $this->apiToken,
-            'text'            => strip_tags($string, '<h1>,<h2>,<h3>,<h4>,<h5>,<h6>,<p>,<br>,<div>,<span>,<strong>,<b>,<a>'),
-            'source_language' => strtoupper($sourceLanguage ?: $this->fallbackLocale),
-            'target_lang'     => strtoupper($targetLang),
-        ];
+        $body = array_merge(
+            [
+                'auth_key'        => $this->apiToken,
+                'text'            => $string,
+                'source_language' => strtoupper($sourceLanguage ?: $this->fallbackLocale),
+                'target_lang'     => strtoupper($targetLang),
+            ],
+            config('deeplable.api_params')
+        );
 
         $content = $this->apiCall('POST', 'translate', [
             'query' => $body,
@@ -79,4 +91,11 @@ protected function apiCall($method, $action, $params = []): array
 
         return json_decode($response->getBody(), true);
     }
+
+    public function isJson($string)
+    {
+        json_decode($string);
+
+        return json_last_error() === JSON_ERROR_NONE;
+    }
 }