From b73941c8cf46b8c886f9045fc750041d409b9a90 Mon Sep 17 00:00:00 2001
From: Richard Harris <richard.a.harris@gmail.com>
Date: Mon, 19 Aug 2019 08:00:47 -0400
Subject: [PATCH] fix deps, tidy up query

---
 package-lock.json                       | 10 ----------
 package.json                            |  4 ----
 site/package-lock.json                  | 15 ++++++++++-----
 site/package.json                       |  3 ++-
 site/src/routes/repl/[id]/index.json.js |  5 +++--
 5 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c7d7a3ea0e..c84f5146a0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -535,11 +535,6 @@
         "safe-buffer": "~5.1.1"
       }
     },
-    "cookie": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
-    },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@@ -1306,11 +1301,6 @@
       "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==",
       "dev": true
     },
-    "flru": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/flru/-/flru-1.0.2.tgz",
-      "integrity": "sha512-kWyh8ADvHBFz6ua5xYOPnUroZTT/bwWfrCeL0Wj1dzG4/YOmOcfJ99W8dOVyyynJN35rZ9aCOtHChqQovV7yog=="
-    },
     "foreground-child": {
       "version": "1.5.6",
       "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-1.5.6.tgz",
diff --git a/package.json b/package.json
index a8570f5e47..a36ead856e 100644
--- a/package.json
+++ b/package.json
@@ -98,9 +98,5 @@
     ],
     "sourceMap": true,
     "instrument": true
-  },
-  "dependencies": {
-    "cookie": "^0.4.0",
-    "flru": "^1.0.2"
   }
 }
diff --git a/site/package-lock.json b/site/package-lock.json
index f80a81e9d9..a36dea4aeb 100644
--- a/site/package-lock.json
+++ b/site/package-lock.json
@@ -1647,6 +1647,11 @@
         "safe-buffer": "~5.1.1"
       }
     },
+    "cookie": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
+      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
+    },
     "core-js": {
       "version": "2.6.5",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz",
@@ -1906,6 +1911,11 @@
         "is-buffer": "~2.0.3"
       }
     },
+    "flru": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/flru/-/flru-1.0.2.tgz",
+      "integrity": "sha512-kWyh8ADvHBFz6ua5xYOPnUroZTT/bwWfrCeL0Wj1dzG4/YOmOcfJ99W8dOVyyynJN35rZ9aCOtHChqQovV7yog=="
+    },
     "for-each": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
@@ -3840,11 +3850,6 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
       "dev": true
     },
-    "uuid": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-      "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
-    },
     "validate-npm-package-license": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
diff --git a/site/package.json b/site/package.json
index 3b98cbb858..c9ecacbf0e 100644
--- a/site/package.json
+++ b/site/package.json
@@ -15,8 +15,10 @@
   "dependencies": {
     "@polka/redirect": "^1.0.0-next.0",
     "@polka/send": "^1.0.0-next.3",
+    "cookie": "^0.4.0",
     "devalue": "^2.0.0",
     "do-not-zip": "^1.0.0",
+    "flru": "^1.0.2",
     "httpie": "^1.1.2",
     "jsonwebtoken": "^8.5.1",
     "marked": "^0.7.0",
@@ -24,7 +26,6 @@
     "polka": "^1.0.0-next.4",
     "prismjs": "^1.17.1",
     "sirv": "^0.4.2",
-    "uuid": "^3.3.2",
     "yootils": "0.0.16"
   },
   "devDependencies": {
diff --git a/site/src/routes/repl/[id]/index.json.js b/site/src/routes/repl/[id]/index.json.js
index d0b2a11d59..8c7dabb14a 100644
--- a/site/src/routes/repl/[id]/index.json.js
+++ b/site/src/routes/repl/[id]/index.json.js
@@ -23,7 +23,7 @@ async function import_gist(req, res) {
 		if (!user) {
 			const { id, name, login, avatar_url } = data.owner;
 
-			[user] = await query(`
+			user = await find(`
 				insert into users(uid, name, username, avatar)
 				values ($1, $2, $3, $4)
 				returning *
@@ -45,7 +45,8 @@ async function import_gist(req, res) {
 		// add gist to database...
 		await query(`
 			insert into gists(uid, user_id, name, files)
-			values ($1, $2, $3, $4) returning *`, [req.params.id, user.id, data.description, JSON.stringify(files)]);
+			values ($1, $2, $3, $4)
+		`, [req.params.id, user.id, data.description, JSON.stringify(files)]);
 
 		send(res, 200, {
 			uid: req.params.id,