build: update lock files, formatter, and build (#2015)

JustinBeckwith · Mar 30, 2021 · a6c9665 · a6c9665
1 parent bf3fd57
commit a6c9665
Show file tree

Hide file tree

Showing 9 changed files with 1,245 additions and 1,485 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,7 +1,7 @@
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
 name: ci
 jobs:
@@ -13,7 +13,7 @@ jobs:
         service: [web, worker]
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: 14
       - run: npm install
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2
         with:
           node-version: 14
       - run: npm install

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # CLOUD CATS
 
-[![CircleCI badge](https://circleci.com/gh/JustinBeckwith/cloudcats/tree/master.svg?style=shield)](https://circleci.com/gh/JustinBeckwith/cloudcats/tree/master)
+![GitHub Actions](https://github.com/JustinBeckwith/cloudcats/actions/workflows/ci.yaml/badge.svg?branch=main)
 [![XO code style](https://img.shields.io/badge/code_style-XO-5ed9c7.svg)](https://github.com/xojs/xo)
 [![Known Vulnerabilities](https://snyk.io/test/github/justinbeckwith/cloudcats/badge.svg)](https://snyk.io/test/github/justinbeckwith/cloudcats)
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -19,9 +19,6 @@
     "url": "https://github.com/JustinBeckwith/cloudcats/issues"
   },
   "homepage": "https://github.com/JustinBeckwith/cloudcats#readme",
-  "dependencies": {
-    "axios": "^0.21.0"
-  },
   "devDependencies": {
     "xo": "^0.38.0"
   },

diff --git a/web/package-lock.json b/web/package-lock.json
diff --git a/worker/analyzer.js b/worker/analyzer.js
@@ -74,13 +74,13 @@ async function analyze(call) {
 	const ai = callbackify(analyzeImage);
 	const urls = await reddit.getImageUrls();
 	const q = async.queue((url, callback) => {
-		ai(url, call, err => {
-			if (!err) {
+		ai(url, call, error => {
+			if (!error) {
 				cnt++;
 				logger.info(`${cnt} objects complete`);
 			}
 
-			callback(err);
+			callback(error);
 		});
 	}, 15);
 	q.push(urls);

diff --git a/worker/gcperror.js b/worker/gcperror.js
@@ -1,12 +1,12 @@
 const logger = require('./logger');
 
 module.exports = {
-	dig: err => {
-		if (err.name === 'PartialFailureError') {
-			for (const err1 of err.errors) {
+	dig: error => {
+		if (error.name === 'PartialFailureError') {
+			for (const error1 of error.errors) {
 				logger.error('Failed to analyze image');
-				for (const err2 of err1.errors) {
-					logger.error(err2);
+				for (const error2 of error1.errors) {
+					logger.error(error2);
 				}
 			}
 		}