summary refs log tree commit diff
diff options
context:
space:
mode:
authorMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2022-07-30 00:32:57 +1000
committerMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2022-07-30 00:32:57 +1000
commit6098649aebeb21aa7870f7ec7510139c168ac012 (patch)
treeee80f9e04be682a07e22926ed9067ef152bd4fdb
parentif tenor or giphy is sent, embed image rather than thumbnail (diff)
parentMerge branch 'fosscord:master' into slowcord (diff)
downloadserver-6098649aebeb21aa7870f7ec7510139c168ac012.tar.xz
Merge branch 'slowcord' of github.com:MaddyUnderStars/fosscord-server into slowcord
-rw-r--r--bundle/package-lock.json12
-rw-r--r--bundle/package.json2
-rw-r--r--cdn/package-lock.json18
-rw-r--r--cdn/package.json2
4 files changed, 18 insertions, 16 deletions
diff --git a/bundle/package-lock.json b/bundle/package-lock.json
index 6e4d70c7..14b94933 100644
--- a/bundle/package-lock.json
+++ b/bundle/package-lock.json
@@ -32,7 +32,7 @@
 				"exif-be-gone": "^1.2.0",
 				"express": "^4.17.1",
 				"express-async-errors": "^3.1.1",
-				"file-type": "^16.5.0",
+				"file-type": "^16.5.4",
 				"form-data": "^4.0.0",
 				"fs-extra": "^10.0.0",
 				"i18next": "^19.9.2",
@@ -5453,8 +5453,9 @@
 			}
 		},
 		"node_modules/file-type": {
-			"version": "16.5.3",
-			"integrity": "sha512-uVsl7iFhHSOY4bEONLlTK47iAHtNsFHWP5YE4xJfZ4rnX7S1Q3wce09XgqSC7E/xh8Ncv/be1lNoyprlUH/x6A==",
+			"version": "16.5.4",
+			"resolved": "https://registry.npmjs.org/file-type/-/file-type-16.5.4.tgz",
+			"integrity": "sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==",
 			"dependencies": {
 				"readable-web-to-node-stream": "^3.0.0",
 				"strtok3": "^6.2.4",
@@ -15325,8 +15326,9 @@
 			"integrity": "sha512-WOn21V8AhyE1QqVfPIVxe3tupJacq1xGkPTB4iagT6o+P2cAgEOOwIxMftr4+ZCTI6d551ij9j61DFr0nsP2uQ=="
 		},
 		"file-type": {
-			"version": "16.5.3",
-			"integrity": "sha512-uVsl7iFhHSOY4bEONLlTK47iAHtNsFHWP5YE4xJfZ4rnX7S1Q3wce09XgqSC7E/xh8Ncv/be1lNoyprlUH/x6A==",
+			"version": "16.5.4",
+			"resolved": "https://registry.npmjs.org/file-type/-/file-type-16.5.4.tgz",
+			"integrity": "sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==",
 			"requires": {
 				"readable-web-to-node-stream": "^3.0.0",
 				"strtok3": "^6.2.4",
diff --git a/bundle/package.json b/bundle/package.json
index 1e6bc5e9..3b79962d 100644
--- a/bundle/package.json
+++ b/bundle/package.json
@@ -81,7 +81,7 @@
 		"exif-be-gone": "^1.2.0",
 		"express": "^4.17.1",
 		"express-async-errors": "^3.1.1",
-		"file-type": "^16.5.0",
+		"file-type": "^16.5.4",
 		"form-data": "^4.0.0",
 		"fs-extra": "^10.0.0",
 		"i18next": "^19.9.2",
diff --git a/cdn/package-lock.json b/cdn/package-lock.json
index e6e9bb1a..62c2cdc8 100644
--- a/cdn/package-lock.json
+++ b/cdn/package-lock.json
@@ -7,7 +7,7 @@
 		"": {
 			"name": "@fosscord/cdn",
 			"version": "1.0.0",
-			"license": "GPLV3",
+			"license": "AGPL-3.0-only",
 			"dependencies": {
 				"@aws-sdk/client-s3": "^3.36.1",
 				"@aws-sdk/node-http-handler": "^3.36.0",
@@ -18,7 +18,7 @@
 				"exif-be-gone": "^1.2.0",
 				"express": "^4.17.1",
 				"express-async-errors": "^3.1.1",
-				"file-type": "^16.5.0",
+				"file-type": "^16.5.4",
 				"form-data": "^4.0.0",
 				"fs-extra": "^10.0.0",
 				"image-size": "^1.0.0",
@@ -51,7 +51,7 @@
 			"name": "@fosscord/util",
 			"version": "1.0.0",
 			"hasInstallScript": true,
-			"license": "GPLV3",
+			"license": "AGPL-3.0-only",
 			"dependencies": {
 				"amqplib": "^0.8.0",
 				"form-data": "^4.0.0",
@@ -3865,9 +3865,9 @@
 			}
 		},
 		"node_modules/file-type": {
-			"version": "16.5.3",
-			"resolved": "https://registry.npmjs.org/file-type/-/file-type-16.5.3.tgz",
-			"integrity": "sha512-uVsl7iFhHSOY4bEONLlTK47iAHtNsFHWP5YE4xJfZ4rnX7S1Q3wce09XgqSC7E/xh8Ncv/be1lNoyprlUH/x6A==",
+			"version": "16.5.4",
+			"resolved": "https://registry.npmjs.org/file-type/-/file-type-16.5.4.tgz",
+			"integrity": "sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==",
 			"dependencies": {
 				"readable-web-to-node-stream": "^3.0.0",
 				"strtok3": "^6.2.4",
@@ -10885,9 +10885,9 @@
 			}
 		},
 		"file-type": {
-			"version": "16.5.3",
-			"resolved": "https://registry.npmjs.org/file-type/-/file-type-16.5.3.tgz",
-			"integrity": "sha512-uVsl7iFhHSOY4bEONLlTK47iAHtNsFHWP5YE4xJfZ4rnX7S1Q3wce09XgqSC7E/xh8Ncv/be1lNoyprlUH/x6A==",
+			"version": "16.5.4",
+			"resolved": "https://registry.npmjs.org/file-type/-/file-type-16.5.4.tgz",
+			"integrity": "sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==",
 			"requires": {
 				"readable-web-to-node-stream": "^3.0.0",
 				"strtok3": "^6.2.4",
diff --git a/cdn/package.json b/cdn/package.json
index ca1e6416..85e05708 100644
--- a/cdn/package.json
+++ b/cdn/package.json
@@ -45,7 +45,7 @@
 		"exif-be-gone": "^1.2.0",
 		"express": "^4.17.1",
 		"express-async-errors": "^3.1.1",
-		"file-type": "^16.5.0",
+		"file-type": "^16.5.4",
 		"form-data": "^4.0.0",
 		"fs-extra": "^10.0.0",
 		"image-size": "^1.0.0",