Merge 4932e6c into 0c35556

ninoseki · Oct 14, 2021 · 8db495a · 8db495a
2 parents 0c35556 + 4932e6c
commit 8db495a
Show file tree

Hide file tree

Showing 16 changed files with 2,396 additions and 1,986 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -11,7 +11,7 @@ repos:
           ]
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.23.3
+    rev: v2.29.0
     hooks:
       - id: pyupgrade
         args: [--py37-plus]
@@ -25,7 +25,7 @@ repos:
         exclude: ^.*/?setup\.py$
 
   - repo: https://github.com/psf/black
-    rev: stable
+    rev: 21.9b0
     hooks:
       - id: black
 

diff --git a/app/__init__.py b/app/__init__.py
@@ -12,7 +12,10 @@ def create_app():
         settings.LOG_FILE, level=settings.LOG_LEVEL, backtrace=settings.LOG_BACKTRACE
     )
 
-    app = FastAPI(debug=settings.DEBUG, title=settings.PROJECT_NAME,)
+    app = FastAPI(
+        debug=settings.DEBUG,
+        title=settings.PROJECT_NAME,
+    )
     # add middleware
     app.add_middleware(GZipMiddleware, minimum_size=1000)
 

diff --git a/app/factories/spamassassin.py b/app/factories/spamassassin.py
@@ -43,7 +43,10 @@ async def to_model(self) -> Verdict:
         score = report.score
         malicious = report.is_spam()
         return Verdict(
-            name=self.name, malicious=malicious, score=score, details=details,
+            name=self.name,
+            malicious=malicious,
+            score=score,
+            details=details,
         )
 
     @classmethod

diff --git a/app/services/inquest.py b/app/services/inquest.py
@@ -40,7 +40,9 @@ async def dfi_upload(self, file_: BytesIO) -> dict:
         files = {"file": file_}
 
         r = await self.client.post(
-            self._url_for("/dfi/upload"), files=files, headers=self._headers(),
+            self._url_for("/dfi/upload"),
+            files=files,
+            headers=self._headers(),
         )
         r.raise_for_status()
         return cast(dict, r.json())
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -11,30 +11,30 @@
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "5.15.4",
-    "@mdi/font": "5.9.55",
-    "@vue/composition-api": "^1.0.6",
-    "@vueuse/core": "^5.2.0",
-    "axios": "0.21.1",
-    "buefy": "0.9.8",
-    "core-js": "3.16.1",
-    "dayjs": "1.10.6",
+    "@mdi/font": "6.2.95",
+    "@vue/composition-api": "^1.2.4",
+    "@vueuse/core": "^6.5.3",
+    "axios": "0.23.0",
+    "buefy": "0.9.10",
+    "core-js": "3.18.3",
+    "dayjs": "1.10.7",
     "filesize.js": "2.0.0",
     "highlight.js": "11.2.0",
-    "js-base64": "3.6.1",
+    "js-base64": "3.7.2",
     "js-file-download": "^0.4.12",
     "js-sha256": "0.9.0",
     "qs": "6.10.1",
     "url-parse": "1.5.3",
     "vue": "2.6.14",
-    "vue-concurrency": "^2.1.2",
+    "vue-concurrency": "^2.2.1",
     "vue-markdown": "2.2.4",
     "vue-router": "3.5.2"
   },
   "devDependencies": {
-    "@types/jest": "26.0.24",
+    "@types/jest": "27.0.2",
     "@types/js-base64": "3.3.1",
     "@types/qs": "6.9.7",
-    "@types/url-parse": "1.4.3",
+    "@types/url-parse": "1.4.4",
     "@typescript-eslint/eslint-plugin": "4.29.0",
     "@typescript-eslint/parser": "4.29.0",
     "@vue/cli-plugin-babel": "4.5.13",
@@ -48,9 +48,9 @@
     "eslint": "6.8.0",
     "eslint-plugin-prettier": "3.4.0",
     "eslint-plugin-simple-import-sort": "7.0.0",
-    "eslint-plugin-vue": "7.15.1",
-    "prettier": "2.3.2",
-    "typescript": "4.3.5",
+    "eslint-plugin-vue": "7.19.1",
+    "prettier": "2.4.1",
+    "typescript": "4.4.4",
     "vue-template-compiler": "2.6.14"
   }
 }
diff --git a/frontend/src/submitters/inquest.ts b/frontend/src/submitters/inquest.ts
@@ -27,7 +27,8 @@ export class InQuest implements Submitter {
       );
       return response.data;
     } catch (error) {
-      const data = error.response.data as ErrorData;
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const data = (error as any).response.data as ErrorData;
       throw data;
     }
   }

diff --git a/frontend/src/submitters/virustotal.ts b/frontend/src/submitters/virustotal.ts
@@ -27,7 +27,8 @@ export class VirusTotal implements Submitter {
       );
       return response.data;
     } catch (error) {
-      const data = error.response.data as ErrorData;
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const data = (error as any).response.data as ErrorData;
       throw data;
     }
   }

diff --git a/frontend/src/views/Home.vue b/frontend/src/views/Home.vue
@@ -83,7 +83,8 @@ export default defineComponent({
       } catch (error) {
         loadingComponent.close();
 
-        const data = error.response.data as ErrorData;
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const data = (error as any).response.data as ErrorData;
         alertError(data, context);
       }
     };