Merge branch 'master' into discord-enhancements
This commit is contained in:
		
						commit
						dadc270876
					
				
					 4 changed files with 174 additions and 298 deletions
				
			
		
							
								
								
									
										443
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										443
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							|  | @ -552,6 +552,142 @@ | |||
|       "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==", | ||||
|       "dev": true | ||||
|     }, | ||||
|     "@louislam/sqlite3": { | ||||
|       "version": "5.0.3", | ||||
|       "resolved": "https://registry.npmjs.org/@louislam/sqlite3/-/sqlite3-5.0.3.tgz", | ||||
|       "integrity": "sha512-ZA+OAelA/JNI9bDC0oFLTKEagmG1RJCyqQievu6GNY5EaNxTfCHZJETvHkyOZK9HCPVJS4AvRmnbF4gG3WqEKw==", | ||||
|       "requires": { | ||||
|         "@mapbox/node-pre-gyp": "^1.0.0", | ||||
|         "node-addon-api": "^3.0.0", | ||||
|         "node-gyp": "7.x" | ||||
|       }, | ||||
|       "dependencies": { | ||||
|         "lru-cache": { | ||||
|           "version": "6.0.0", | ||||
|           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", | ||||
|           "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", | ||||
|           "optional": true, | ||||
|           "requires": { | ||||
|             "yallist": "^4.0.0" | ||||
|           } | ||||
|         }, | ||||
|         "node-gyp": { | ||||
|           "version": "7.1.2", | ||||
|           "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz", | ||||
|           "integrity": "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==", | ||||
|           "optional": true, | ||||
|           "requires": { | ||||
|             "env-paths": "^2.2.0", | ||||
|             "glob": "^7.1.4", | ||||
|             "graceful-fs": "^4.2.3", | ||||
|             "nopt": "^5.0.0", | ||||
|             "npmlog": "^4.1.2", | ||||
|             "request": "^2.88.2", | ||||
|             "rimraf": "^3.0.2", | ||||
|             "semver": "^7.3.2", | ||||
|             "tar": "^6.0.2", | ||||
|             "which": "^2.0.2" | ||||
|           } | ||||
|         }, | ||||
|         "nopt": { | ||||
|           "version": "5.0.0", | ||||
|           "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", | ||||
|           "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", | ||||
|           "optional": true, | ||||
|           "requires": { | ||||
|             "abbrev": "1" | ||||
|           } | ||||
|         }, | ||||
|         "rimraf": { | ||||
|           "version": "3.0.2", | ||||
|           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", | ||||
|           "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", | ||||
|           "optional": true, | ||||
|           "requires": { | ||||
|             "glob": "^7.1.3" | ||||
|           } | ||||
|         }, | ||||
|         "semver": { | ||||
|           "version": "7.3.5", | ||||
|           "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", | ||||
|           "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", | ||||
|           "optional": true, | ||||
|           "requires": { | ||||
|             "lru-cache": "^6.0.0" | ||||
|           } | ||||
|         }, | ||||
|         "which": { | ||||
|           "version": "2.0.2", | ||||
|           "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", | ||||
|           "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", | ||||
|           "optional": true, | ||||
|           "requires": { | ||||
|             "isexe": "^2.0.0" | ||||
|           } | ||||
|         }, | ||||
|         "yallist": { | ||||
|           "version": "4.0.0", | ||||
|           "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", | ||||
|           "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", | ||||
|           "optional": true | ||||
|         } | ||||
|       } | ||||
|     }, | ||||
|     "@mapbox/node-pre-gyp": { | ||||
|       "version": "1.0.5", | ||||
|       "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.5.tgz", | ||||
|       "integrity": "sha512-4srsKPXWlIxp5Vbqz5uLfBN+du2fJChBoYn/f2h991WLdk7jUvcSk/McVLSv/X+xQIPI8eGD5GjrnygdyHnhPA==", | ||||
|       "requires": { | ||||
|         "detect-libc": "^1.0.3", | ||||
|         "https-proxy-agent": "^5.0.0", | ||||
|         "make-dir": "^3.1.0", | ||||
|         "node-fetch": "^2.6.1", | ||||
|         "nopt": "^5.0.0", | ||||
|         "npmlog": "^4.1.2", | ||||
|         "rimraf": "^3.0.2", | ||||
|         "semver": "^7.3.4", | ||||
|         "tar": "^6.1.0" | ||||
|       }, | ||||
|       "dependencies": { | ||||
|         "lru-cache": { | ||||
|           "version": "6.0.0", | ||||
|           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", | ||||
|           "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", | ||||
|           "requires": { | ||||
|             "yallist": "^4.0.0" | ||||
|           } | ||||
|         }, | ||||
|         "nopt": { | ||||
|           "version": "5.0.0", | ||||
|           "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", | ||||
|           "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", | ||||
|           "requires": { | ||||
|             "abbrev": "1" | ||||
|           } | ||||
|         }, | ||||
|         "rimraf": { | ||||
|           "version": "3.0.2", | ||||
|           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", | ||||
|           "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", | ||||
|           "requires": { | ||||
|             "glob": "^7.1.3" | ||||
|           } | ||||
|         }, | ||||
|         "semver": { | ||||
|           "version": "7.3.5", | ||||
|           "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", | ||||
|           "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", | ||||
|           "requires": { | ||||
|             "lru-cache": "^6.0.0" | ||||
|           } | ||||
|         }, | ||||
|         "yallist": { | ||||
|           "version": "4.0.0", | ||||
|           "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", | ||||
|           "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" | ||||
|         } | ||||
|       } | ||||
|     }, | ||||
|     "@nodelib/fs.scandir": { | ||||
|       "version": "2.1.5", | ||||
|       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", | ||||
|  | @ -1439,15 +1575,6 @@ | |||
|       "resolved": "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz", | ||||
|       "integrity": "sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ=" | ||||
|     }, | ||||
|     "block-stream": { | ||||
|       "version": "0.0.9", | ||||
|       "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", | ||||
|       "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", | ||||
|       "optional": true, | ||||
|       "requires": { | ||||
|         "inherits": "~2.0.0" | ||||
|       } | ||||
|     }, | ||||
|     "bluebird": { | ||||
|       "version": "3.7.2", | ||||
|       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", | ||||
|  | @ -1669,9 +1796,9 @@ | |||
|       } | ||||
|     }, | ||||
|     "chownr": { | ||||
|       "version": "1.1.4", | ||||
|       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", | ||||
|       "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==" | ||||
|       "version": "2.0.0", | ||||
|       "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", | ||||
|       "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==" | ||||
|     }, | ||||
|     "class-utils": { | ||||
|       "version": "0.3.6", | ||||
|  | @ -1934,11 +2061,6 @@ | |||
|       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", | ||||
|       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" | ||||
|     }, | ||||
|     "deep-extend": { | ||||
|       "version": "0.6.0", | ||||
|       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", | ||||
|       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==" | ||||
|     }, | ||||
|     "deep-is": { | ||||
|       "version": "0.1.3", | ||||
|       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", | ||||
|  | @ -2185,6 +2307,12 @@ | |||
|       "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==", | ||||
|       "dev": true | ||||
|     }, | ||||
|     "env-paths": { | ||||
|       "version": "2.2.1", | ||||
|       "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", | ||||
|       "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", | ||||
|       "optional": true | ||||
|     }, | ||||
|     "error-ex": { | ||||
|       "version": "1.3.2", | ||||
|       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", | ||||
|  | @ -2902,29 +3030,6 @@ | |||
|       "dev": true, | ||||
|       "optional": true | ||||
|     }, | ||||
|     "fstream": { | ||||
|       "version": "1.0.12", | ||||
|       "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", | ||||
|       "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", | ||||
|       "optional": true, | ||||
|       "requires": { | ||||
|         "graceful-fs": "^4.1.2", | ||||
|         "inherits": "~2.0.0", | ||||
|         "mkdirp": ">=0.5 0", | ||||
|         "rimraf": "2" | ||||
|       }, | ||||
|       "dependencies": { | ||||
|         "mkdirp": { | ||||
|           "version": "0.5.5", | ||||
|           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", | ||||
|           "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", | ||||
|           "optional": true, | ||||
|           "requires": { | ||||
|             "minimist": "^1.2.5" | ||||
|           } | ||||
|         } | ||||
|       } | ||||
|     }, | ||||
|     "function-bind": { | ||||
|       "version": "1.1.1", | ||||
|       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", | ||||
|  | @ -3319,14 +3424,6 @@ | |||
|       "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", | ||||
|       "dev": true | ||||
|     }, | ||||
|     "ignore-walk": { | ||||
|       "version": "3.0.4", | ||||
|       "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.4.tgz", | ||||
|       "integrity": "sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==", | ||||
|       "requires": { | ||||
|         "minimatch": "^3.0.4" | ||||
|       } | ||||
|     }, | ||||
|     "import-fresh": { | ||||
|       "version": "3.3.0", | ||||
|       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", | ||||
|  | @ -4198,7 +4295,8 @@ | |||
|     "minimist": { | ||||
|       "version": "1.2.5", | ||||
|       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", | ||||
|       "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" | ||||
|       "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", | ||||
|       "dev": true | ||||
|     }, | ||||
|     "minimist-options": { | ||||
|       "version": "4.1.0", | ||||
|  | @ -4309,26 +4407,6 @@ | |||
|       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", | ||||
|       "dev": true | ||||
|     }, | ||||
|     "needle": { | ||||
|       "version": "2.6.0", | ||||
|       "resolved": "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz", | ||||
|       "integrity": "sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg==", | ||||
|       "requires": { | ||||
|         "debug": "^3.2.6", | ||||
|         "iconv-lite": "^0.4.4", | ||||
|         "sax": "^1.2.4" | ||||
|       }, | ||||
|       "dependencies": { | ||||
|         "debug": { | ||||
|           "version": "3.2.7", | ||||
|           "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", | ||||
|           "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", | ||||
|           "requires": { | ||||
|             "ms": "^2.1.1" | ||||
|           } | ||||
|         } | ||||
|       } | ||||
|     }, | ||||
|     "negotiator": { | ||||
|       "version": "0.6.2", | ||||
|       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", | ||||
|  | @ -4344,129 +4422,6 @@ | |||
|       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", | ||||
|       "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==" | ||||
|     }, | ||||
|     "node-gyp": { | ||||
|       "version": "3.8.0", | ||||
|       "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz", | ||||
|       "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", | ||||
|       "optional": true, | ||||
|       "requires": { | ||||
|         "fstream": "^1.0.0", | ||||
|         "glob": "^7.0.3", | ||||
|         "graceful-fs": "^4.1.2", | ||||
|         "mkdirp": "^0.5.0", | ||||
|         "nopt": "2 || 3", | ||||
|         "npmlog": "0 || 1 || 2 || 3 || 4", | ||||
|         "osenv": "0", | ||||
|         "request": "^2.87.0", | ||||
|         "rimraf": "2", | ||||
|         "semver": "~5.3.0", | ||||
|         "tar": "^2.0.0", | ||||
|         "which": "1" | ||||
|       }, | ||||
|       "dependencies": { | ||||
|         "mkdirp": { | ||||
|           "version": "0.5.5", | ||||
|           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", | ||||
|           "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", | ||||
|           "optional": true, | ||||
|           "requires": { | ||||
|             "minimist": "^1.2.5" | ||||
|           } | ||||
|         }, | ||||
|         "semver": { | ||||
|           "version": "5.3.0", | ||||
|           "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", | ||||
|           "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", | ||||
|           "optional": true | ||||
|         }, | ||||
|         "tar": { | ||||
|           "version": "2.2.2", | ||||
|           "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz", | ||||
|           "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", | ||||
|           "optional": true, | ||||
|           "requires": { | ||||
|             "block-stream": "*", | ||||
|             "fstream": "^1.0.12", | ||||
|             "inherits": "2" | ||||
|           } | ||||
|         } | ||||
|       } | ||||
|     }, | ||||
|     "node-pre-gyp": { | ||||
|       "version": "0.11.0", | ||||
|       "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz", | ||||
|       "integrity": "sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q==", | ||||
|       "requires": { | ||||
|         "detect-libc": "^1.0.2", | ||||
|         "mkdirp": "^0.5.1", | ||||
|         "needle": "^2.2.1", | ||||
|         "nopt": "^4.0.1", | ||||
|         "npm-packlist": "^1.1.6", | ||||
|         "npmlog": "^4.0.2", | ||||
|         "rc": "^1.2.7", | ||||
|         "rimraf": "^2.6.1", | ||||
|         "semver": "^5.3.0", | ||||
|         "tar": "^4" | ||||
|       }, | ||||
|       "dependencies": { | ||||
|         "fs-minipass": { | ||||
|           "version": "1.2.7", | ||||
|           "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", | ||||
|           "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==", | ||||
|           "requires": { | ||||
|             "minipass": "^2.6.0" | ||||
|           } | ||||
|         }, | ||||
|         "minipass": { | ||||
|           "version": "2.9.0", | ||||
|           "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz", | ||||
|           "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==", | ||||
|           "requires": { | ||||
|             "safe-buffer": "^5.1.2", | ||||
|             "yallist": "^3.0.0" | ||||
|           } | ||||
|         }, | ||||
|         "minizlib": { | ||||
|           "version": "1.3.3", | ||||
|           "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz", | ||||
|           "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==", | ||||
|           "requires": { | ||||
|             "minipass": "^2.9.0" | ||||
|           } | ||||
|         }, | ||||
|         "mkdirp": { | ||||
|           "version": "0.5.5", | ||||
|           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", | ||||
|           "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", | ||||
|           "requires": { | ||||
|             "minimist": "^1.2.5" | ||||
|           } | ||||
|         }, | ||||
|         "nopt": { | ||||
|           "version": "4.0.3", | ||||
|           "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz", | ||||
|           "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==", | ||||
|           "requires": { | ||||
|             "abbrev": "1", | ||||
|             "osenv": "^0.1.4" | ||||
|           } | ||||
|         }, | ||||
|         "tar": { | ||||
|           "version": "4.4.13", | ||||
|           "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz", | ||||
|           "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==", | ||||
|           "requires": { | ||||
|             "chownr": "^1.1.1", | ||||
|             "fs-minipass": "^1.2.5", | ||||
|             "minipass": "^2.8.6", | ||||
|             "minizlib": "^1.2.1", | ||||
|             "mkdirp": "^0.5.0", | ||||
|             "safe-buffer": "^5.1.2", | ||||
|             "yallist": "^3.0.3" | ||||
|           } | ||||
|         } | ||||
|       } | ||||
|     }, | ||||
|     "node-releases": { | ||||
|       "version": "1.1.73", | ||||
|       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz", | ||||
|  | @ -4478,15 +4433,6 @@ | |||
|       "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.6.3.tgz", | ||||
|       "integrity": "sha512-faZFufgTMrphYoDjvyVpbpJcYzwyFnbAMmQtj1lVBYAUSm3SOy2fIdd9+Mr4UxPosBa0JRw9bJoIwQn+nswiew==" | ||||
|     }, | ||||
|     "nopt": { | ||||
|       "version": "3.0.6", | ||||
|       "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", | ||||
|       "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", | ||||
|       "optional": true, | ||||
|       "requires": { | ||||
|         "abbrev": "1" | ||||
|       } | ||||
|     }, | ||||
|     "normalize-package-data": { | ||||
|       "version": "3.0.2", | ||||
|       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz", | ||||
|  | @ -4543,29 +4489,6 @@ | |||
|       "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=", | ||||
|       "dev": true | ||||
|     }, | ||||
|     "npm-bundled": { | ||||
|       "version": "1.1.2", | ||||
|       "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz", | ||||
|       "integrity": "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==", | ||||
|       "requires": { | ||||
|         "npm-normalize-package-bin": "^1.0.1" | ||||
|       } | ||||
|     }, | ||||
|     "npm-normalize-package-bin": { | ||||
|       "version": "1.0.1", | ||||
|       "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz", | ||||
|       "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==" | ||||
|     }, | ||||
|     "npm-packlist": { | ||||
|       "version": "1.4.8", | ||||
|       "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz", | ||||
|       "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==", | ||||
|       "requires": { | ||||
|         "ignore-walk": "^3.0.1", | ||||
|         "npm-bundled": "^1.0.1", | ||||
|         "npm-normalize-package-bin": "^1.0.1" | ||||
|       } | ||||
|     }, | ||||
|     "npmlog": { | ||||
|       "version": "4.1.2", | ||||
|       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", | ||||
|  | @ -4693,25 +4616,6 @@ | |||
|         "word-wrap": "^1.2.3" | ||||
|       } | ||||
|     }, | ||||
|     "os-homedir": { | ||||
|       "version": "1.0.2", | ||||
|       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", | ||||
|       "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" | ||||
|     }, | ||||
|     "os-tmpdir": { | ||||
|       "version": "1.0.2", | ||||
|       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", | ||||
|       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" | ||||
|     }, | ||||
|     "osenv": { | ||||
|       "version": "0.1.5", | ||||
|       "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", | ||||
|       "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", | ||||
|       "requires": { | ||||
|         "os-homedir": "^1.0.0", | ||||
|         "os-tmpdir": "^1.0.0" | ||||
|       } | ||||
|     }, | ||||
|     "p-limit": { | ||||
|       "version": "2.3.0", | ||||
|       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", | ||||
|  | @ -5327,17 +5231,6 @@ | |||
|         "unpipe": "1.0.0" | ||||
|       } | ||||
|     }, | ||||
|     "rc": { | ||||
|       "version": "1.2.8", | ||||
|       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", | ||||
|       "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", | ||||
|       "requires": { | ||||
|         "deep-extend": "^0.6.0", | ||||
|         "ini": "~1.3.0", | ||||
|         "minimist": "^1.2.0", | ||||
|         "strip-json-comments": "~2.0.1" | ||||
|       } | ||||
|     }, | ||||
|     "read-pkg": { | ||||
|       "version": "5.2.0", | ||||
|       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", | ||||
|  | @ -5609,14 +5502,6 @@ | |||
|       "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", | ||||
|       "dev": true | ||||
|     }, | ||||
|     "rimraf": { | ||||
|       "version": "2.7.1", | ||||
|       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", | ||||
|       "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", | ||||
|       "requires": { | ||||
|         "glob": "^7.1.3" | ||||
|       } | ||||
|     }, | ||||
|     "rollup": { | ||||
|       "version": "2.55.0", | ||||
|       "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.55.0.tgz", | ||||
|  | @ -5662,11 +5547,6 @@ | |||
|         "chokidar": ">=3.0.0 <4.0.0" | ||||
|       } | ||||
|     }, | ||||
|     "sax": { | ||||
|       "version": "1.2.4", | ||||
|       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", | ||||
|       "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" | ||||
|     }, | ||||
|     "semver": { | ||||
|       "version": "5.7.1", | ||||
|       "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", | ||||
|  | @ -6071,16 +5951,6 @@ | |||
|       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", | ||||
|       "dev": true | ||||
|     }, | ||||
|     "sqlite3": { | ||||
|       "version": "5.0.2", | ||||
|       "resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.2.tgz", | ||||
|       "integrity": "sha512-1SdTNo+BVU211Xj1csWa8lV6KM0CtucDwRyA0VHl91wEH1Mgh7RxUpI4rVvG7OhHrzCSGaVyW5g8vKvlrk9DJA==", | ||||
|       "requires": { | ||||
|         "node-addon-api": "^3.0.0", | ||||
|         "node-gyp": "3.x", | ||||
|         "node-pre-gyp": "^0.11.0" | ||||
|       } | ||||
|     }, | ||||
|     "sshpk": { | ||||
|       "version": "1.16.1", | ||||
|       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", | ||||
|  | @ -6163,11 +6033,6 @@ | |||
|         "min-indent": "^1.0.0" | ||||
|       } | ||||
|     }, | ||||
|     "strip-json-comments": { | ||||
|       "version": "2.0.1", | ||||
|       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", | ||||
|       "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" | ||||
|     }, | ||||
|     "style-search": { | ||||
|       "version": "0.1.0", | ||||
|       "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz", | ||||
|  | @ -6524,9 +6389,9 @@ | |||
|       } | ||||
|     }, | ||||
|     "tar": { | ||||
|       "version": "6.1.0", | ||||
|       "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz", | ||||
|       "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==", | ||||
|       "version": "6.1.6", | ||||
|       "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.6.tgz", | ||||
|       "integrity": "sha512-oaWyu5dQbHaYcyZCTfyPpC+VmI62/OM2RTUYavTk1MDr1cwW5Boi3baeYQKiZbY2uSQJGr+iMOzb/JFxLrft+g==", | ||||
|       "requires": { | ||||
|         "chownr": "^2.0.0", | ||||
|         "fs-minipass": "^2.0.0", | ||||
|  | @ -6536,11 +6401,6 @@ | |||
|         "yallist": "^4.0.0" | ||||
|       }, | ||||
|       "dependencies": { | ||||
|         "chownr": { | ||||
|           "version": "2.0.0", | ||||
|           "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", | ||||
|           "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==" | ||||
|         }, | ||||
|         "yallist": { | ||||
|           "version": "4.0.0", | ||||
|           "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", | ||||
|  | @ -7059,7 +6919,8 @@ | |||
|     "yallist": { | ||||
|       "version": "3.1.1", | ||||
|       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", | ||||
|       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" | ||||
|       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", | ||||
|       "dev": true | ||||
|     }, | ||||
|     "yaml": { | ||||
|       "version": "1.10.2", | ||||
|  |  | |||
|  | @ -47,7 +47,7 @@ | |||
|         "redbean-node": "0.0.21", | ||||
|         "socket.io": "^4.1.3", | ||||
|         "socket.io-client": "^4.1.3", | ||||
|         "sqlite3": "^5.0.2", | ||||
|         "@louislam/sqlite3": "^5.0.3", | ||||
|         "tcp-ping": "^0.1.1", | ||||
|         "v-pagination-3": "^0.1.6", | ||||
|         "vue": "^3.1.5", | ||||
|  |  | |||
|  | @ -1,9 +1,8 @@ | |||
| const fs = require("fs"); | ||||
| const { sleep } = require("../src/util"); | ||||
| const { R } = require("redbean-node"); | ||||
| const { | ||||
|     setSetting, setting, | ||||
| } = require("./util-server"); | ||||
| const { setSetting, setting } = require("./util-server"); | ||||
| const knex = require("knex"); | ||||
| 
 | ||||
| class Database { | ||||
| 
 | ||||
|  | @ -12,6 +11,24 @@ class Database { | |||
|     static latestVersion = 5; | ||||
|     static noReject = true; | ||||
| 
 | ||||
|     static connect() { | ||||
|         const Dialect = require("knex/lib/dialects/sqlite3/index.js"); | ||||
|         Dialect.prototype._driver = () => require("@louislam/sqlite3"); | ||||
| 
 | ||||
|         R.setup(knex({ | ||||
|             client: Dialect, | ||||
|             connection: { | ||||
|                 filename: Database.path, | ||||
|             }, | ||||
|             useNullAsDefault: true, | ||||
|             pool: { | ||||
|                 min: 1, | ||||
|                 max: 1, | ||||
|                 idleTimeoutMillis: 30000, | ||||
|             } | ||||
|         })); | ||||
|     } | ||||
| 
 | ||||
|     static async patch() { | ||||
|         let version = parseInt(await setting("database_version")); | ||||
| 
 | ||||
|  |  | |||
|  | @ -649,9 +649,7 @@ async function initDatabase() { | |||
|     } | ||||
| 
 | ||||
|     console.log("Connecting to Database") | ||||
|     R.setup("sqlite", { | ||||
|         filename: Database.path, | ||||
|     }); | ||||
|     Database.connect(); | ||||
|     console.log("Connected") | ||||
| 
 | ||||
|     // Patch the database
 | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue