diff --git a/README.md b/README.md index 8757b142..e9785795 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ # Features - Internal account system (Optional). * Subscriptions are end-to-end encrypted. + * History & watch progress syncing. * [Proof-of-work Captcha](https://github.com/altcha-org/altcha). - Subscription importing/exporting * Automatically import/export Invidious/Materialious. @@ -25,7 +26,6 @@ * Enjoy Materialious without a Invidious instance via our YouTube backend. * Local video fallback if Invidious fails loading videos. - Invidious companion support. -- [Invidious API extended integration.](https://github.com/Materialious/api-extended) - Android TV support. - Support for disabling certificate validation for homelab users. - Sync your watch progress between Invidious sessions. diff --git a/docs/DOCKER-FULL.md b/docs/DOCKER-FULL.md index 76c9bc07..328bfd4d 100644 --- a/docs/DOCKER-FULL.md +++ b/docs/DOCKER-FULL.md @@ -136,37 +136,3 @@ ryd-proxy: ``` Modify/add `VITE_DEFAULT_RETURNYTDISLIKES_INSTANCE` for Materialious to be the reverse proxied URL of RYD-Proxy. - -## Step 3 (Optional, but recommended): Self-host Invidious API extended -```yaml -services: - api_extended: - image: wardpearce/invidious_api_extended:latest - restart: unless-stopped - ports: - - 3004:80 - environment: - api_extended_postgre: '{"host": "invidious-db", "port": 5432, "database": "invidious", "user": "kemal", "password": "kemal"}' - api_extended_allowed_origins: '["https://materialious.example.com"]' - api_extended_debug: false - - # No trailing backslashes! - api_extended_invidious_instance: "https://invidious.example.com" - api_extended_production_instance: "https://syncious.example.com" -``` - -Add these additional environment variables to Materialious. -```yaml -VITE_DEFAULT_API_EXTENDED_INSTANCE: "https://syncious.example.com" -``` - -## Step 4 (Optional): Self-host PeerJS -[Read the official guide.](https://github.com/peers/peerjs-server?tab=readme-ov-file#docker) - -Add these additional environment variables to Materialious. -```yaml -# Will differ depending on how you self-host peerjs. -VITE_DEFAULT_PEERJS_HOST: "peerjs.example.com" -VITE_DEFAULT_PEERJS_PATH: "/" -VITE_DEFAULT_PEERJS_PORT: 443 -``` diff --git a/docs/DOCKER.md b/docs/DOCKER.md index ae04b025..e1ee4757 100644 --- a/docs/DOCKER.md +++ b/docs/DOCKER.md @@ -278,34 +278,7 @@ http: ### Step 3: Modify/add `VITE_DEFAULT_RETURNYTDISLIKES_INSTANCE` for Materialious to be the reverse proxied URL of RYD-Proxy. -## Step 5 (Optional, but recommended): Self-host Invidious API extended - -### Step 1: Docker compose -Add the following to your docker compose - -```yaml -services: - api_extended: - image: wardpearce/invidious_api_extended:latest - restart: unless-stopped - ports: - - 3004:80 - environment: - api_extended_postgre: '{"host": "invidious-db", "port": 5432, "database": "invidious", "user": "kemal", "password": "kemal"}' - api_extended_allowed_origins: '["https://materialious.example.com"]' - api_extended_debug: false - - # No trailing backslashes! - api_extended_invidious_instance: "https://invidious.example.com" - api_extended_production_instance: "https://syncious.example.com" -``` - -Add these additional environment variables to Materialious. -```yaml -VITE_DEFAULT_API_EXTENDED_INSTANCE: "https://syncious.example.com" -``` - -## Step 6 (Optional): Self-host PeerJS +## Step 5 (Optional): Self-host PeerJS [Read the official guide.](https://github.com/peers/peerjs-server?tab=readme-ov-file#docker) Add these additional environment variables to Materialious. diff --git a/materialious/Dockerfile b/materialious/Dockerfile index 35595a05..198e5109 100644 --- a/materialious/Dockerfile +++ b/materialious/Dockerfile @@ -20,10 +20,6 @@ RUN echo "VITE_DEFAULT_INVIDIOUS_INSTANCE=VITE_DEFAULT_INVIDIOUS_INSTANCE_PLACEH echo "VITE_DEFAULT_PEERJS_HOST=VITE_DEFAULT_PEERJS_HOST_PLACEHOLDER" >> .env && \ echo "VITE_DEFAULT_PEERJS_PATH=VITE_DEFAULT_PEERJS_PATH_PLACEHOLDER" >> .env && \ echo "VITE_DEFAULT_PEERJS_PORT=VITE_DEFAULT_PEERJS_PORT_PLACEHOLDER" >> .env && \ - echo "VITE_DEFAULT_DOWNLOAD_ENABLED=VITE_DEFAULT_DOWNLOAD_ENABLED_PLACEHOLDER" >> .env && \ - echo "VITE_DEFAULT_SYNCIOUS_INSTANCE=VITE_DEFAULT_SYNCIOUS_INSTANCE_PLACEHOLDER" >> .env && \ - echo "VITE_DEFAULT_API_EXTENDED_INSTANCE=VITE_DEFAULT_API_EXTENDED_INSTANCE_PLACEHOLDER" >> .env && \ - echo "VITE_DEFAULT_DASH_BITRATE=VITE_DEFAULT_DASH_BITRATE_PLACEHOLDER" >> .env && \ echo "VITE_DEFAULT_SETTINGS='\"VITE_DEFAULT_SETTINGS_PLACEHOLDER\"'" >> .env && \ echo "VITE_DEFAULT_RETURNYTDISLIKES_INSTANCE=VITE_DEFAULT_RETURNYTDISLIKES_INSTANCE_PLACEHOLDER" >> .env diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index e34011ab..694e35a1 100644 --- a/materialious/android/app/build.gradle +++ b/materialious/android/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "us.materialio.app" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 223 - versionName "1.16.5" + versionCode 224 + versionName "1.16.6" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/materialious/electron/materialious.metainfo.xml b/materialious/electron/materialious.metainfo.xml index ee4a6251..8f1b2e56 100644 --- a/materialious/electron/materialious.metainfo.xml +++ b/materialious/electron/materialious.metainfo.xml @@ -88,7 +88,11 @@ - + + + https://github.com/Materialious/Materialious/releases/tag/1.16.6 + + https://github.com/Materialious/Materialious/releases/tag/1.16.5 diff --git a/materialious/electron/package-lock.json b/materialious/electron/package-lock.json index 7f5aa708..2c6820ff 100644 --- a/materialious/electron/package-lock.json +++ b/materialious/electron/package-lock.json @@ -1,12 +1,12 @@ { "name": "Materialious", - "version": "1.16.1", + "version": "1.16.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "Materialious", - "version": "1.16.1", + "version": "1.16.6", "license": "MIT", "dependencies": { "@capacitor-community/electron": "^5.0.0", @@ -16,14 +16,14 @@ "electron-is-dev": "~2.0.0", "electron-serve": "~3.0.0", "electron-unhandled": "^4.0.1", - "electron-updater": "^6.3.4", + "electron-updater": "^6.8.3", "electron-window-state": "^5.0.3", "jsdom": "^28.0.0", "jsonfile": "^6.2.0", "youtubei.js": "^16.0.1" }, "devDependencies": { - "electron": "^40.0.0", + "electron": "^40.6.0", "electron-builder": "^26.0.12", "electron-rebuild": "^3.2.9", "typescript": "^5.9.3" @@ -227,7 +227,6 @@ "resolved": "https://registry.npmjs.org/@capacitor/core/-/core-7.4.2.tgz", "integrity": "sha512-akCf9A1FUR8AWTtmgGjHEq6LmGsjA2U7igaJ9PxiCBfyxKqlDbuGHrlNdpvHEjV5tUPH3KYtkze6gtFcNKPU9A==", "license": "MIT", - "peer": true, "dependencies": { "tslib": "^2.1.0" } @@ -316,7 +315,6 @@ } ], "license": "MIT", - "peer": true, "engines": { "node": ">=20.19.0" }, @@ -355,7 +353,6 @@ } ], "license": "MIT", - "peer": true, "engines": { "node": ">=20.19.0" } @@ -418,9 +415,9 @@ } }, "node_modules/@electron/asar/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.3.tgz", + "integrity": "sha512-M2GCs7Vk83NxkUyQV1bkABc4yxgz9kILhHImZiBPAZ9ybuvCb0/H7lEl5XvIg3g+9d4eNotkZA5IWwYl0tibaA==", "dev": true, "license": "ISC", "dependencies": { @@ -660,6 +657,29 @@ "node": "^18.17.0 || >=20.5.0" } }, + "node_modules/@electron/rebuild/node_modules/balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "18 || 20 || >=22" + } + }, + "node_modules/@electron/rebuild/node_modules/brace-expansion": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz", + "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "18 || 20 || >=22" + } + }, "node_modules/@electron/rebuild/node_modules/cacache": { "version": "19.0.1", "resolved": "https://registry.npmjs.org/cacache/-/cacache-19.0.1.tgz", @@ -730,13 +750,13 @@ } }, "node_modules/@electron/rebuild/node_modules/isexe": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz", - "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.5.tgz", + "integrity": "sha512-6B3tLtFqtQS4ekarvLVMZ+X+VlvQekbe4taUkf/rhVO3d/h0M2rfARm/pXLcPEsjjMsFgrFgSrhQIxcSVrBz8w==", "dev": true, - "license": "ISC", + "license": "BlueOak-1.0.0", "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/@electron/rebuild/node_modules/lru-cache": { @@ -770,13 +790,13 @@ } }, "node_modules/@electron/rebuild/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "version": "9.0.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.6.tgz", + "integrity": "sha512-kQAVowdR33euIqeA0+VZTDqU+qo1IeVY+hrKYtZMio3Pg0P0vuh/kwRylLUddJhB6pf3q/botcOvRtx4IN1wqQ==", "dev": true, "license": "ISC", "dependencies": { - "brace-expansion": "^2.0.1" + "brace-expansion": "^5.0.2" }, "engines": { "node": ">=16 || 14 >=14.17" @@ -786,11 +806,11 @@ } }, "node_modules/@electron/rebuild/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz", + "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==", "dev": true, - "license": "ISC", + "license": "BlueOak-1.0.0", "engines": { "node": ">=16 || 14 >=14.17" } @@ -930,9 +950,9 @@ } }, "node_modules/@electron/rebuild/node_modules/tar": { - "version": "7.5.7", - "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.7.tgz", - "integrity": "sha512-fov56fJiRuThVFXD6o6/Q354S7pnWMJIVlDBYijsTNx6jKSE4pvrDTs6lUnmGvNyfJwFQQwWy3owKz1ucIhveQ==", + "version": "7.5.9", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.9.tgz", + "integrity": "sha512-BTLcK0xsDh2+PUe9F6c2TlRp4zOOBMTkoQHQIWSIzI0R7KG46uEwq4OPk2W7bZcprBMsuaeFsqwYr7pjh6CuHg==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { @@ -1017,14 +1037,37 @@ "node": ">=16.4" } }, + "node_modules/@electron/universal/node_modules/balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "18 || 20 || >=22" + } + }, + "node_modules/@electron/universal/node_modules/brace-expansion": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz", + "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "18 || 20 || >=22" + } + }, "node_modules/@electron/universal/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "version": "9.0.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.6.tgz", + "integrity": "sha512-kQAVowdR33euIqeA0+VZTDqU+qo1IeVY+hrKYtZMio3Pg0P0vuh/kwRylLUddJhB6pf3q/botcOvRtx4IN1wqQ==", "dev": true, "license": "ISC", "dependencies": { - "brace-expansion": "^2.0.1" + "brace-expansion": "^5.0.2" }, "engines": { "node": ">=16 || 14 >=14.17" @@ -1040,6 +1083,7 @@ "dev": true, "license": "BSD-2-Clause", "optional": true, + "peer": true, "dependencies": { "cross-dirname": "^0.1.0", "debug": "^4.3.4", @@ -1217,27 +1261,6 @@ "node": ">=16.0.0" } }, - "node_modules/@isaacs/balanced-match": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz", - "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==", - "license": "MIT", - "engines": { - "node": "20 || >=22" - } - }, - "node_modules/@isaacs/brace-expansion": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.1.tgz", - "integrity": "sha512-WMz71T1JS624nWj2n2fnYAuPovhv7EUhk69R6i9dsVyzxt5eM3bjwvgk9L+APE1TRscGysAVMANkB0jh0LQZrQ==", - "license": "MIT", - "dependencies": { - "@isaacs/balanced-match": "^4.0.1" - }, - "engines": { - "node": "20 || >=22" - } - }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", @@ -1727,12 +1750,11 @@ } }, "node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz", + "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -1786,9 +1808,9 @@ "license": "MIT" }, "node_modules/app-builder-lib": { - "version": "26.7.0", - "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-26.7.0.tgz", - "integrity": "sha512-/UgCD8VrO79Wv8aBNpjMfsS1pIUfIPURoRn0Ik6tMe5avdZF+vQgl/juJgipcMmH3YS0BD573lCdCHyoi84USg==", + "version": "26.8.1", + "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-26.8.1.tgz", + "integrity": "sha512-p0Im/Dx5C4tmz8QEE1Yn4MkuPC8PrnlRneMhWJj7BBXQfNTJUshM/bp3lusdEsDbvvfJZpXWnYesgSLvwtM2Zw==", "dev": true, "license": "MIT", "dependencies": { @@ -1803,7 +1825,7 @@ "@malept/flatpak-bundler": "^0.4.0", "@types/fs-extra": "9.0.13", "async-exit-hook": "^2.0.1", - "builder-util": "26.4.1", + "builder-util": "26.8.1", "builder-util-runtime": "9.5.1", "chromium-pickle-js": "^0.2.0", "ci-info": "4.3.1", @@ -1811,7 +1833,7 @@ "dotenv": "^16.4.5", "dotenv-expand": "^11.0.6", "ejs": "^3.1.8", - "electron-publish": "26.6.0", + "electron-publish": "26.8.1", "fs-extra": "^10.1.0", "hosted-git-info": "^4.1.0", "isbinaryfile": "^5.0.0", @@ -1833,8 +1855,8 @@ "node": ">=14.0.0" }, "peerDependencies": { - "dmg-builder": "26.7.0", - "electron-builder-squirrel-windows": "26.7.0" + "dmg-builder": "26.8.1", + "electron-builder-squirrel-windows": "26.8.1" } }, "node_modules/app-builder-lib/node_modules/@electron/get": { @@ -1956,21 +1978,21 @@ } }, "node_modules/app-builder-lib/node_modules/isexe": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz", - "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.5.tgz", + "integrity": "sha512-6B3tLtFqtQS4ekarvLVMZ+X+VlvQekbe4taUkf/rhVO3d/h0M2rfARm/pXLcPEsjjMsFgrFgSrhQIxcSVrBz8w==", "dev": true, - "license": "ISC", + "license": "BlueOak-1.0.0", "engines": { - "node": ">=16" + "node": ">=18" } }, "node_modules/app-builder-lib/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz", + "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==", "dev": true, - "license": "ISC", + "license": "BlueOak-1.0.0", "engines": { "node": ">=16 || 14 >=14.17" } @@ -1989,9 +2011,9 @@ } }, "node_modules/app-builder-lib/node_modules/tar": { - "version": "7.5.7", - "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.7.tgz", - "integrity": "sha512-fov56fJiRuThVFXD6o6/Q354S7pnWMJIVlDBYijsTNx6jKSE4pvrDTs6lUnmGvNyfJwFQQwWy3owKz1ucIhveQ==", + "version": "7.5.9", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.9.tgz", + "integrity": "sha512-BTLcK0xsDh2+PUe9F6c2TlRp4zOOBMTkoQHQIWSIzI0R7KG46uEwq4OPk2W7bZcprBMsuaeFsqwYr7pjh6CuHg==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { @@ -2249,9 +2271,9 @@ "license": "MIT" }, "node_modules/builder-util": { - "version": "26.4.1", - "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-26.4.1.tgz", - "integrity": "sha512-FlgH43XZ50w3UtS1RVGDWOz8v9qMXPC7upMtKMtBEnYdt1OVoS61NYhKm/4x+cIaWqJTXua0+VVPI+fSPGXNIw==", + "version": "26.8.1", + "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-26.8.1.tgz", + "integrity": "sha512-pm1lTYbGyc90DHgCDO7eo8Rl4EqKLciayNbZqGziqnH9jrlKe8ZANGdityLZU+pJh16dfzjAx2xQq9McuIPEtw==", "dev": true, "license": "MIT", "dependencies": { @@ -2770,7 +2792,8 @@ "integrity": "sha512-+R08/oI0nl3vfPcqftZRpytksBXDzOUveBq/NBVx0sUp1axwzPQrKinNx5yd5sxPu8j1wIy8AfnVQ+5eFdha6Q==", "dev": true, "license": "MIT", - "optional": true + "optional": true, + "peer": true }, "node_modules/cross-spawn": { "version": "7.0.6", @@ -3015,9 +3038,9 @@ } }, "node_modules/dir-compare/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.3.tgz", + "integrity": "sha512-M2GCs7Vk83NxkUyQV1bkABc4yxgz9kILhHImZiBPAZ9ybuvCb0/H7lEl5XvIg3g+9d4eNotkZA5IWwYl0tibaA==", "dev": true, "license": "ISC", "dependencies": { @@ -3028,15 +3051,14 @@ } }, "node_modules/dmg-builder": { - "version": "26.7.0", - "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-26.7.0.tgz", - "integrity": "sha512-uOOBA3f+kW3o4KpSoMQ6SNpdXU7WtxlJRb9vCZgOvqhTz4b3GjcoWKstdisizNZLsylhTMv8TLHFPFW0Uxsj/g==", + "version": "26.8.1", + "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-26.8.1.tgz", + "integrity": "sha512-glMJgnTreo8CFINujtAhCgN96QAqApDMZ8Vl1r8f0QT8QprvC1UCltV4CcWj20YoIyLZx6IUskaJZ0NV8fokcg==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "app-builder-lib": "26.7.0", - "builder-util": "26.4.1", + "app-builder-lib": "26.8.1", + "builder-util": "26.8.1", "fs-extra": "^10.1.0", "iconv-lite": "^0.6.2", "js-yaml": "^4.1.0" @@ -3154,9 +3176,9 @@ } }, "node_modules/electron": { - "version": "40.4.1", - "resolved": "https://registry.npmjs.org/electron/-/electron-40.4.1.tgz", - "integrity": "sha512-N1ZXybQZL8kYemO8vAeh9nrk4mSvqlAO8xs0QCHkXIvRnuB/7VGwEehjvQbsU5/f4bmTKpG+2GQERe/zmKpudQ==", + "version": "40.6.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-40.6.0.tgz", + "integrity": "sha512-ett8W+yOFGDuM0vhJMamYSkrbV3LoaffzJd9GfjI96zRAxyrNqUSKqBpf/WGbQCweDxX2pkUCUfrv4wwKpsFZA==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -3173,18 +3195,18 @@ } }, "node_modules/electron-builder": { - "version": "26.7.0", - "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-26.7.0.tgz", - "integrity": "sha512-LoXbCvSFxLesPneQ/fM7FB4OheIDA2tjqCdUkKlObV5ZKGhYgi5VHPHO/6UUOUodAlg7SrkPx7BZJPby+Vrtbg==", + "version": "26.8.1", + "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-26.8.1.tgz", + "integrity": "sha512-uWhx1r74NGpCagG0ULs/P9Nqv2nsoo+7eo4fLUOB8L8MdWltq9odW/uuLXMFCDGnPafknYLZgjNX0ZIFRzOQAw==", "dev": true, "license": "MIT", "dependencies": { - "app-builder-lib": "26.7.0", - "builder-util": "26.4.1", + "app-builder-lib": "26.8.1", + "builder-util": "26.8.1", "builder-util-runtime": "9.5.1", "chalk": "^4.1.2", "ci-info": "^4.2.0", - "dmg-builder": "26.7.0", + "dmg-builder": "26.8.1", "fs-extra": "^10.1.0", "lazy-val": "^1.0.5", "simple-update-notifier": "2.0.0", @@ -3199,15 +3221,15 @@ } }, "node_modules/electron-builder-squirrel-windows": { - "version": "26.7.0", - "resolved": "https://registry.npmjs.org/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-26.7.0.tgz", - "integrity": "sha512-3EqkQK+q0kGshdPSKEPb2p5F75TENMKu6Fe5aTdeaPfdzFK4Yjp5L0d6S7K8iyvqIsGQ/ei4bnpyX9wt+kVCKQ==", + "version": "26.8.1", + "resolved": "https://registry.npmjs.org/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-26.8.1.tgz", + "integrity": "sha512-o288fIdgPLHA76eDrFADHPoo7VyGkDCYbLV1GzndaMSAVBoZrGvM9m2IehdcVMzdAZJ2eV9bgyissQXHv5tGzA==", "dev": true, "license": "MIT", "peer": true, "dependencies": { - "app-builder-lib": "26.7.0", - "builder-util": "26.4.1", + "app-builder-lib": "26.8.1", + "builder-util": "26.8.1", "electron-winstaller": "5.4.0" } }, @@ -3236,14 +3258,14 @@ } }, "node_modules/electron-publish": { - "version": "26.6.0", - "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-26.6.0.tgz", - "integrity": "sha512-LsyHMMqbvJ2vsOvuWJ19OezgF2ANdCiHpIucDHNiLhuI+/F3eW98ouzWSRmXXi82ZOPZXC07jnIravY4YYwCLQ==", + "version": "26.8.1", + "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-26.8.1.tgz", + "integrity": "sha512-q+jrSTIh/Cv4eGZa7oVR+grEJo/FoLMYBAnSL5GCtqwUpr1T+VgKB/dn1pnzxIxqD8S/jP1yilT9VrwCqINR4w==", "dev": true, "license": "MIT", "dependencies": { "@types/fs-extra": "^9.0.11", - "builder-util": "26.4.1", + "builder-util": "26.8.1", "builder-util-runtime": "9.5.1", "chalk": "^4.1.2", "form-data": "^4.0.5", @@ -3361,9 +3383,9 @@ } }, "node_modules/electron-updater": { - "version": "6.7.3", - "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.7.3.tgz", - "integrity": "sha512-EgkT8Z9noqXKbwc3u5FkJA+r48jwZ5DTUiOkJMOTEEH//n5Am6wfQGz7nvSFEA2oIAMv9jRzn5JKTyWeSKOPgg==", + "version": "6.8.3", + "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.8.3.tgz", + "integrity": "sha512-Z6sgw3jgbikWKXei1ENdqFOxBP0WlXg3TtKfz0rgw2vIZFJUyI4pD7ZN7jrkm7EoMK+tcm/qTnPUdqfZukBlBQ==", "license": "MIT", "dependencies": { "builder-util-runtime": "9.5.1", @@ -3419,6 +3441,7 @@ "dev": true, "hasInstallScript": true, "license": "MIT", + "peer": true, "dependencies": { "@electron/asar": "^3.2.1", "debug": "^4.1.1", @@ -3439,6 +3462,7 @@ "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "graceful-fs": "^4.1.2", "jsonfile": "^4.0.0", @@ -3454,6 +3478,7 @@ "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", "dev": true, "license": "MIT", + "peer": true, "optionalDependencies": { "graceful-fs": "^4.1.6" } @@ -3464,6 +3489,7 @@ "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">= 4.0.0" } @@ -3721,26 +3747,16 @@ } }, "node_modules/filelist": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", - "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.5.tgz", + "integrity": "sha512-ct/ckWBV/9Dg3MlvCXsLcSUyoWwv9mCKqlhLNB2DAuXR/NZolSXlQqP5dyy6guWlPXBhodZyZ5lGPQcbQDxrEQ==", "dev": true, "license": "Apache-2.0", "dependencies": { - "minimatch": "^5.0.1" - } - }, - "node_modules/filelist/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "license": "ISC", - "dependencies": { - "brace-expansion": "^2.0.1" + "minimatch": "^10.2.1" }, "engines": { - "node": ">=10" + "node": "20 || >=22" } }, "node_modules/foreground-child": { @@ -4876,20 +4892,41 @@ } }, "node_modules/minimatch": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz", - "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==", + "version": "10.2.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.2.tgz", + "integrity": "sha512-+G4CpNBxa5MprY+04MbgOw1v7So6n5JY166pFi9KfYwT78fxScCeSNQSNzp6dpPSW2rONOps6Ocam1wFhCgoVw==", "license": "BlueOak-1.0.0", "dependencies": { - "@isaacs/brace-expansion": "^5.0.0" + "brace-expansion": "^5.0.2" }, "engines": { - "node": "20 || >=22" + "node": "18 || 20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/minimatch/node_modules/balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "license": "MIT", + "engines": { + "node": "18 || 20 || >=22" + } + }, + "node_modules/minimatch/node_modules/brace-expansion": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz", + "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "18 || 20 || >=22" + } + }, "node_modules/minimist": { "version": "1.2.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", @@ -5361,11 +5398,11 @@ "license": "ISC" }, "node_modules/path-scurry/node_modules/minipass": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz", + "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==", "dev": true, - "license": "ISC", + "license": "BlueOak-1.0.0", "engines": { "node": ">=16 || 14 >=14.17" } @@ -5404,7 +5441,6 @@ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, "license": "MIT", - "peer": true, "engines": { "node": ">=12" }, @@ -5433,6 +5469,7 @@ "dev": true, "license": "MIT", "optional": true, + "peer": true, "dependencies": { "commander": "^9.4.0" }, @@ -5450,6 +5487,7 @@ "dev": true, "license": "MIT", "optional": true, + "peer": true, "engines": { "node": "^12.20.0 || >=14" } @@ -6216,6 +6254,7 @@ "integrity": "sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "mkdirp": "^0.5.1", "rimraf": "~2.6.2" @@ -6257,6 +6296,7 @@ "deprecated": "Rimraf versions prior to v4 are no longer supported", "dev": true, "license": "ISC", + "peer": true, "dependencies": { "glob": "^7.1.3" }, diff --git a/materialious/electron/package.json b/materialious/electron/package.json index 5b43a27b..40ae1854 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -1,6 +1,6 @@ { "name": "Materialious", - "version": "1.16.5", + "version": "1.16.6", "description": "Modern material design for YouTube and Invidious.", "author": { "name": "Ward Pearce", @@ -24,19 +24,18 @@ "dependencies": { "@capacitor-community/electron": "^5.0.0", "bgutils-js": "^3.2.0", - "capacitor-nodejs": "https://github.com/hampoelz/capacitor-nodejs/releases/download/v1.0.0-beta.9/capacitor-nodejs.tgz", "chokidar": "~5.0.0", "electron-is-dev": "~2.0.0", "electron-serve": "~3.0.0", "electron-unhandled": "^4.0.1", - "electron-updater": "^6.3.4", + "electron-updater": "^6.8.3", "electron-window-state": "^5.0.3", "jsdom": "^28.0.0", "jsonfile": "^6.2.0", "youtubei.js": "^16.0.1" }, "devDependencies": { - "electron": "^40.0.0", + "electron": "^40.6.0", "electron-builder": "^26.0.12", "electron-rebuild": "^3.2.9", "typescript": "^5.9.3" diff --git a/materialious/electron/src/rt/electron-plugins.js b/materialious/electron/src/rt/electron-plugins.js index 5f312366..b33b2826 100644 --- a/materialious/electron/src/rt/electron-plugins.js +++ b/materialious/electron/src/rt/electron-plugins.js @@ -1,6 +1,4 @@ /* eslint-disable @typescript-eslint/no-var-requires */ -const CapacitorNodejs = require('../../../node_modules/capacitor-nodejs/electron/dist/plugin.js'); module.exports = { - CapacitorNodejs, } \ No newline at end of file diff --git a/materialious/package-lock.json b/materialious/package-lock.json index 04118e5e..82194db5 100644 --- a/materialious/package-lock.json +++ b/materialious/package-lock.json @@ -1,29 +1,29 @@ { "name": "materialious", - "version": "1.16.4", + "version": "1.16.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "materialious", - "version": "1.16.4", + "version": "1.16.6", "hasInstallScript": true, "dependencies": { "@capacitor-community/electron": "^5.0.1", "@capacitor/android": "^8.0.0", "@capacitor/app": "^8.0.0", - "@capacitor/browser": "^8.0.0", + "@capacitor/browser": "^8.0.1", "@capacitor/clipboard": "^8.0.0", "@capacitor/core": "^8.0.0", "@capacitor/network": "^8.0.0", - "@capacitor/preferences": "^8.0.0", + "@capacitor/preferences": "^8.0.1", "@capacitor/screen-orientation": "^8.0.0", "@capacitor/share": "^8.0.0", "@macfja/serializer": "^1.1.4", "@macfja/svelte-persistent-store": "^2.4.2", "altcha": "^2.3.0", "altcha-lib": "^1.4.1", - "beercss": "^4.0.2", + "beercss": "^4.0.15", "bgutils-js": "^3.2.0", "buffer": "^6.0.3", "capacitor-music-controls-plugin": "^6.1.0", @@ -2106,9 +2106,9 @@ } }, "node_modules/@capacitor/browser": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@capacitor/browser/-/browser-8.0.0.tgz", - "integrity": "sha512-xey7maszGABKuStvXDV4vXN+EzIyz0o7zlyzw4JKG6o/1GzqeqHqVuE+8Ux+Hks3DZji4LoriWZVgVF6mR6RGg==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@capacitor/browser/-/browser-8.0.1.tgz", + "integrity": "sha512-cCEYK9DGJvamfCKOh95QP+VafApblySDR/eodOcl1Qt+d/Y+NNPzc8NYm/dztQlRf3aMLJ7ne1HrRCfu2UOMnw==", "license": "MIT", "peerDependencies": { "@capacitor/core": ">=8.0.0" @@ -2266,9 +2266,9 @@ } }, "node_modules/@capacitor/preferences": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@capacitor/preferences/-/preferences-8.0.0.tgz", - "integrity": "sha512-NsE7Srk9Zr0SxiVelHGiAJR7M238eyCD6dI/sDhu3ckKwFrXn8/GRyGr+SZcnGLlQKy948li8Pfcfr0dqxNf1g==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@capacitor/preferences/-/preferences-8.0.1.tgz", + "integrity": "sha512-T6no3ebi79XJCk91U3Jp/liJUwgBdvHR+s6vhvPkPxSuch7z3zx5Rv1bdWM6sWruNx+pViuEGqZvbfCdyBvcHQ==", "license": "MIT", "peerDependencies": { "@capacitor/core": ">=8.0.0" @@ -2968,20 +2968,20 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.3.tgz", - "integrity": "sha512-Kr+LPIUVKz2qkx1HAMH8q1q6azbqBAsXJUxBl/ODDuVPX45Z9DfwB8tPjTi6nNZ8BuM3nbJxC5zCAg5elnBUTQ==", + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.4.tgz", + "integrity": "sha512-4h4MVF8pmBsncB60r0wSJiIeUKTSD4m7FmTFThG8RHlsg9ajqckLm9OraguFGZE4vVdpiI1Q4+hFnisopmG6gQ==", "dev": true, "license": "MIT", "dependencies": { - "ajv": "^6.12.4", + "ajv": "^6.14.0", "debug": "^4.3.2", "espree": "^10.0.1", "globals": "^14.0.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", "js-yaml": "^4.1.1", - "minimatch": "^3.1.2", + "minimatch": "^3.1.3", "strip-json-comments": "^3.1.1" }, "engines": { @@ -4740,17 +4740,17 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.56.0.tgz", - "integrity": "sha512-lRyPDLzNCuae71A3t9NEINBiTn7swyOhvUj3MyUOxb8x6g6vPEFoOU+ZRmGMusNC3X3YMhqMIX7i8ShqhT74Pw==", + "version": "8.56.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.56.1.tgz", + "integrity": "sha512-Jz9ZztpB37dNC+HU2HI28Bs9QXpzCz+y/twHOwhyrIRdbuVDxSytJNDl6z/aAKlaRIwC7y8wJdkBv7FxYGgi0A==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.12.2", - "@typescript-eslint/scope-manager": "8.56.0", - "@typescript-eslint/type-utils": "8.56.0", - "@typescript-eslint/utils": "8.56.0", - "@typescript-eslint/visitor-keys": "8.56.0", + "@typescript-eslint/scope-manager": "8.56.1", + "@typescript-eslint/type-utils": "8.56.1", + "@typescript-eslint/utils": "8.56.1", + "@typescript-eslint/visitor-keys": "8.56.1", "ignore": "^7.0.5", "natural-compare": "^1.4.0", "ts-api-utils": "^2.4.0" @@ -4763,7 +4763,7 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^8.56.0", + "@typescript-eslint/parser": "^8.56.1", "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.0.0" } @@ -4779,16 +4779,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.56.0.tgz", - "integrity": "sha512-IgSWvLobTDOjnaxAfDTIHaECbkNlAlKv2j5SjpB2v7QHKv1FIfjwMy8FsDbVfDX/KjmCmYICcw7uGaXLhtsLNg==", + "version": "8.56.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.56.1.tgz", + "integrity": "sha512-klQbnPAAiGYFyI02+znpBRLyjL4/BrBd0nyWkdC0s/6xFLkXYQ8OoRrSkqacS1ddVxf/LDyODIKbQ5TgKAf/Fg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.56.0", - "@typescript-eslint/types": "8.56.0", - "@typescript-eslint/typescript-estree": "8.56.0", - "@typescript-eslint/visitor-keys": "8.56.0", + "@typescript-eslint/scope-manager": "8.56.1", + "@typescript-eslint/types": "8.56.1", + "@typescript-eslint/typescript-estree": "8.56.1", + "@typescript-eslint/visitor-keys": "8.56.1", "debug": "^4.4.3" }, "engines": { @@ -4829,14 +4829,14 @@ "license": "MIT" }, "node_modules/@typescript-eslint/project-service": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.56.0.tgz", - "integrity": "sha512-M3rnyL1vIQOMeWxTWIW096/TtVP+8W3p/XnaFflhmcFp+U4zlxUxWj4XwNs6HbDeTtN4yun0GNTTDBw/SvufKg==", + "version": "8.56.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.56.1.tgz", + "integrity": "sha512-TAdqQTzHNNvlVFfR+hu2PDJrURiwKsUvxFn1M0h95BB8ah5jejas08jUWG4dBA68jDMI988IvtfdAI53JzEHOQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.56.0", - "@typescript-eslint/types": "^8.56.0", + "@typescript-eslint/tsconfig-utils": "^8.56.1", + "@typescript-eslint/types": "^8.56.1", "debug": "^4.4.3" }, "engines": { @@ -4876,14 +4876,14 @@ "license": "MIT" }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.56.0.tgz", - "integrity": "sha512-7UiO/XwMHquH+ZzfVCfUNkIXlp/yQjjnlYUyYz7pfvlK3/EyyN6BK+emDmGNyQLBtLGaYrTAI6KOw8tFucWL2w==", + "version": "8.56.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.56.1.tgz", + "integrity": "sha512-YAi4VDKcIZp0O4tz/haYKhmIDZFEUPOreKbfdAN3SzUDMcPhJ8QI99xQXqX+HoUVq8cs85eRKnD+rne2UAnj2w==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.56.0", - "@typescript-eslint/visitor-keys": "8.56.0" + "@typescript-eslint/types": "8.56.1", + "@typescript-eslint/visitor-keys": "8.56.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -4894,9 +4894,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.56.0.tgz", - "integrity": "sha512-bSJoIIt4o3lKXD3xmDh9chZcjCz5Lk8xS7Rxn+6l5/pKrDpkCwtQNQQwZ2qRPk7TkUYhrq3WPIHXOXlbXP0itg==", + "version": "8.56.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.56.1.tgz", + "integrity": "sha512-qOtCYzKEeyr3aR9f28mPJqBty7+DBqsdd63eO0yyDwc6vgThj2UjWfJIcsFeSucYydqcuudMOprZ+x1SpF3ZuQ==", "dev": true, "license": "MIT", "engines": { @@ -4911,15 +4911,15 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.56.0.tgz", - "integrity": "sha512-qX2L3HWOU2nuDs6GzglBeuFXviDODreS58tLY/BALPC7iu3Fa+J7EOTwnX9PdNBxUI7Uh0ntP0YWGnxCkXzmfA==", + "version": "8.56.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.56.1.tgz", + "integrity": "sha512-yB/7dxi7MgTtGhZdaHCemf7PuwrHMenHjmzgUW1aJpO+bBU43OycnM3Wn+DdvDO/8zzA9HlhaJ0AUGuvri4oGg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.56.0", - "@typescript-eslint/typescript-estree": "8.56.0", - "@typescript-eslint/utils": "8.56.0", + "@typescript-eslint/types": "8.56.1", + "@typescript-eslint/typescript-estree": "8.56.1", + "@typescript-eslint/utils": "8.56.1", "debug": "^4.4.3", "ts-api-utils": "^2.4.0" }, @@ -4961,9 +4961,9 @@ "license": "MIT" }, "node_modules/@typescript-eslint/types": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.56.0.tgz", - "integrity": "sha512-DBsLPs3GsWhX5HylbP9HNG15U0bnwut55Lx12bHB9MpXxQ+R5GC8MwQe+N1UFXxAeQDvEsEDY6ZYwX03K7Z6HQ==", + "version": "8.56.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.56.1.tgz", + "integrity": "sha512-dbMkdIUkIkchgGDIv7KLUpa0Mda4IYjo4IAMJUZ+3xNoUXxMsk9YtKpTHSChRS85o+H9ftm51gsK1dZReY9CVw==", "dev": true, "license": "MIT", "engines": { @@ -4975,18 +4975,18 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.56.0.tgz", - "integrity": "sha512-ex1nTUMWrseMltXUHmR2GAQ4d+WjkZCT4f+4bVsps8QEdh0vlBsaCokKTPlnqBFqqGaxilDNJG7b8dolW2m43Q==", + "version": "8.56.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.56.1.tgz", + "integrity": "sha512-qzUL1qgalIvKWAf9C1HpvBjif+Vm6rcT5wZd4VoMb9+Km3iS3Cv9DY6dMRMDtPnwRAFyAi7YXJpTIEXLvdfPxg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.56.0", - "@typescript-eslint/tsconfig-utils": "8.56.0", - "@typescript-eslint/types": "8.56.0", - "@typescript-eslint/visitor-keys": "8.56.0", + "@typescript-eslint/project-service": "8.56.1", + "@typescript-eslint/tsconfig-utils": "8.56.1", + "@typescript-eslint/types": "8.56.1", + "@typescript-eslint/visitor-keys": "8.56.1", "debug": "^4.4.3", - "minimatch": "^9.0.5", + "minimatch": "^10.2.2", "semver": "^7.7.3", "tinyglobby": "^0.2.15", "ts-api-utils": "^2.4.0" @@ -5003,26 +5003,26 @@ } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/balanced-match": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.3.tgz", - "integrity": "sha512-1pHv8LX9CpKut1Zp4EXey7Z8OfH11ONNH6Dhi2WDUt31VVZFXZzKwXcysBgqSumFCmR+0dqjMK5v5JiFHzi0+g==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", "dev": true, "license": "MIT", "engines": { - "node": "20 || >=22" + "node": "18 || 20 || >=22" } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.2.tgz", - "integrity": "sha512-Pdk8c9poy+YhOgVWw1JNN22/HcivgKWwpxKq04M/jTmHyCZn12WPJebZxdjSa5TmBqISrUSgNYU3eRORljfCCw==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz", + "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==", "dev": true, "license": "MIT", "dependencies": { "balanced-match": "^4.0.2" }, "engines": { - "node": "20 || >=22" + "node": "18 || 20 || >=22" } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/debug": { @@ -5044,16 +5044,16 @@ } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { - "version": "9.0.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.6.tgz", - "integrity": "sha512-kQAVowdR33euIqeA0+VZTDqU+qo1IeVY+hrKYtZMio3Pg0P0vuh/kwRylLUddJhB6pf3q/botcOvRtx4IN1wqQ==", + "version": "10.2.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.2.tgz", + "integrity": "sha512-+G4CpNBxa5MprY+04MbgOw1v7So6n5JY166pFi9KfYwT78fxScCeSNQSNzp6dpPSW2rONOps6Ocam1wFhCgoVw==", "dev": true, - "license": "ISC", + "license": "BlueOak-1.0.0", "dependencies": { "brace-expansion": "^5.0.2" }, "engines": { - "node": ">=16 || 14 >=14.17" + "node": "18 || 20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -5067,16 +5067,16 @@ "license": "MIT" }, "node_modules/@typescript-eslint/utils": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.56.0.tgz", - "integrity": "sha512-RZ3Qsmi2nFGsS+n+kjLAYDPVlrzf7UhTffrDIKr+h2yzAlYP/y5ZulU0yeDEPItos2Ph46JAL5P/On3pe7kDIQ==", + "version": "8.56.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.56.1.tgz", + "integrity": "sha512-HPAVNIME3tABJ61siYlHzSWCGtOoeP2RTIaHXFMPqjrQKCGB9OgUVdiNgH7TJS2JNIQ5qQ4RsAUDuGaGme/KOA==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", - "@typescript-eslint/scope-manager": "8.56.0", - "@typescript-eslint/types": "8.56.0", - "@typescript-eslint/typescript-estree": "8.56.0" + "@typescript-eslint/scope-manager": "8.56.1", + "@typescript-eslint/types": "8.56.1", + "@typescript-eslint/typescript-estree": "8.56.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -5091,13 +5091,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.56.0.tgz", - "integrity": "sha512-q+SL+b+05Ud6LbEE35qe4A99P+htKTKVbyiNEe45eCbJFyh/HVK9QXwlrbz+Q4L8SOW4roxSVwXYj4DMBT7Ieg==", + "version": "8.56.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.56.1.tgz", + "integrity": "sha512-KiROIzYdEV85YygXw6BI/Dx4fnBlFQu6Mq4QE4MOH9fFnhohw6wX/OAvDY2/C+ut0I3RSPKenvZJIVYqJNkhEw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.56.0", + "@typescript-eslint/types": "8.56.1", "eslint-visitor-keys": "^5.0.0" }, "engines": { @@ -5748,9 +5748,9 @@ } }, "node_modules/beercss": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/beercss/-/beercss-4.0.2.tgz", - "integrity": "sha512-pkkm1zOH8UqVMLUwnMRi3ueT+397KNqWDwJEejVBxGQmvSnpmSVf4mnVXjidQI0BvN5uklVdMu8UjcW2c28ZgQ==", + "version": "4.0.15", + "resolved": "https://registry.npmjs.org/beercss/-/beercss-4.0.15.tgz", + "integrity": "sha512-SpxOOkZReQJCQOTldKxLaYo62uK6aC2RgZhSVM6R1Rbdsuu2XR0yMpbiEHk/iuVh2miaVTyarOg7C/fFwbNteQ==", "license": "MIT", "dependencies": { "material-dynamic-colors": "^1.1.4" @@ -8101,36 +8101,55 @@ "license": "MIT" }, "node_modules/filelist": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", - "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.5.tgz", + "integrity": "sha512-ct/ckWBV/9Dg3MlvCXsLcSUyoWwv9mCKqlhLNB2DAuXR/NZolSXlQqP5dyy6guWlPXBhodZyZ5lGPQcbQDxrEQ==", "dev": true, "license": "Apache-2.0", "dependencies": { - "minimatch": "^5.0.1" + "minimatch": "^10.2.1" + }, + "engines": { + "node": "20 || >=22" + } + }, + "node_modules/filelist/node_modules/balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "18 || 20 || >=22" } }, "node_modules/filelist/node_modules/brace-expansion": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz", + "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==", "dev": true, "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0" + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "18 || 20 || >=22" } }, "node_modules/filelist/node_modules/minimatch": { - "version": "5.1.7", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.7.tgz", - "integrity": "sha512-FjiwU9HaHW6YB3H4a1sFudnv93lvydNjz2lmyUXR6IwKhGI+bgL3SOZrBGn6kvvX2pJvhEkGSGjyTHN47O4rqA==", + "version": "10.2.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.2.tgz", + "integrity": "sha512-+G4CpNBxa5MprY+04MbgOw1v7So6n5JY166pFi9KfYwT78fxScCeSNQSNzp6dpPSW2rONOps6Ocam1wFhCgoVw==", "dev": true, - "license": "ISC", + "license": "BlueOak-1.0.0", "dependencies": { - "brace-expansion": "^2.0.1" + "brace-expansion": "^5.0.2" }, "engines": { - "node": ">=10" + "node": "18 || 20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/fill-range": { @@ -15200,16 +15219,16 @@ } }, "node_modules/typescript-eslint": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.56.0.tgz", - "integrity": "sha512-c7toRLrotJ9oixgdW7liukZpsnq5CZ7PuKztubGYlNppuTqhIoWfhgHo/7EU0v06gS2l/x0i2NEFK1qMIf0rIg==", + "version": "8.56.1", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.56.1.tgz", + "integrity": "sha512-U4lM6pjmBX7J5wk4szltF7I1cGBHXZopnAXCMXb3+fZ3B/0Z3hq3wS/CCUB2NZBNAExK92mCU2tEohWuwVMsDQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/eslint-plugin": "8.56.0", - "@typescript-eslint/parser": "8.56.0", - "@typescript-eslint/typescript-estree": "8.56.0", - "@typescript-eslint/utils": "8.56.0" + "@typescript-eslint/eslint-plugin": "8.56.1", + "@typescript-eslint/parser": "8.56.1", + "@typescript-eslint/typescript-estree": "8.56.1", + "@typescript-eslint/utils": "8.56.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" diff --git a/materialious/package.json b/materialious/package.json index a689899d..5e0c6f26 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -1,6 +1,6 @@ { "name": "materialious", - "version": "1.16.5", + "version": "1.16.6", "private": true, "scripts": { "dev": "npm run patch:github && vite dev", @@ -48,18 +48,18 @@ "@capacitor-community/electron": "^5.0.1", "@capacitor/android": "^8.0.0", "@capacitor/app": "^8.0.0", - "@capacitor/browser": "^8.0.0", + "@capacitor/browser": "^8.0.1", "@capacitor/clipboard": "^8.0.0", "@capacitor/core": "^8.0.0", "@capacitor/network": "^8.0.0", - "@capacitor/preferences": "^8.0.0", + "@capacitor/preferences": "^8.0.1", "@capacitor/screen-orientation": "^8.0.0", "@capacitor/share": "^8.0.0", "@macfja/serializer": "^1.1.4", "@macfja/svelte-persistent-store": "^2.4.2", "altcha": "^2.3.0", "altcha-lib": "^1.4.1", - "beercss": "^4.0.2", + "beercss": "^4.0.15", "bgutils-js": "^3.2.0", "buffer": "^6.0.3", "capacitor-music-controls-plugin": "^6.1.0", diff --git a/materialious/replace_env_vars.sh b/materialious/replace_env_vars.sh index 18f71f88..a2fcbbe3 100644 --- a/materialious/replace_env_vars.sh +++ b/materialious/replace_env_vars.sh @@ -11,8 +11,4 @@ find "$ROOT_DIR" -type f \( -name "*.js" -o -name "*.html" \) -exec sed -i 's|VI find "$ROOT_DIR" -type f \( -name "*.js" -o -name "*.html" \) -exec sed -i 's|VITE_DEFAULT_PEERJS_HOST_PLACEHOLDER|'"$VITE_DEFAULT_PEERJS_HOST"'|g' {} + find "$ROOT_DIR" -type f \( -name "*.js" -o -name "*.html" \) -exec sed -i 's|VITE_DEFAULT_PEERJS_PATH_PLACEHOLDER|'"$VITE_DEFAULT_PEERJS_PATH"'|g' {} + find "$ROOT_DIR" -type f \( -name "*.js" -o -name "*.html" \) -exec sed -i 's|VITE_DEFAULT_PEERJS_PORT_PLACEHOLDER|'"$VITE_DEFAULT_PEERJS_PORT"'|g' {} + -find "$ROOT_DIR" -type f \( -name "*.js" -o -name "*.html" \) -exec sed -i 's|VITE_DEFAULT_DOWNLOAD_ENABLED_PLACEHOLDER|'"$VITE_DEFAULT_DOWNLOAD_ENABLED"'|g' {} + -find "$ROOT_DIR" -type f \( -name "*.js" -o -name "*.html" \) -exec sed -i 's|VITE_DEFAULT_SYNCIOUS_INSTANCE_PLACEHOLDER|'"$VITE_DEFAULT_SYNCIOUS_INSTANCE"'|g' {} + -find "$ROOT_DIR" -type f \( -name "*.js" -o -name "*.html" \) -exec sed -i 's|VITE_DEFAULT_DASH_BITRATE_PLACEHOLDER|'"$VITE_DEFAULT_DASH_BITRATE"'|g' {} + -find "$ROOT_DIR" -type f \( -name "*.js" -o -name "*.html" \) -exec sed -i 's|VITE_DEFAULT_API_EXTENDED_INSTANCE_PLACEHOLDER|'"$VITE_DEFAULT_API_EXTENDED_INSTANCE"'|g' {} + find "$ROOT_DIR" -type f \( -name "*.js" -o -name "*.html" \) -exec sed -i 's|VITE_DEFAULT_SETTINGS_PLACEHOLDER|'"$VITE_DEFAULT_SETTINGS"'|g' {} + diff --git a/materialious/src/lib/api/backend.ts b/materialious/src/lib/api/backend.ts deleted file mode 100644 index 9f25ab1a..00000000 --- a/materialious/src/lib/api/backend.ts +++ /dev/null @@ -1,287 +0,0 @@ -import sodium from 'libsodium-wrappers-sumo'; -import { rawMasterKeyStore } from '../store'; -import { get } from 'svelte/store'; -import { parseChannelRSS } from './youtubejs/subscriptions'; -import { getChannelYTjs } from './youtubejs/channel'; -import type { ChannelSubscriptions } from '$lib/dexie'; - -async function getInternalAuthorId(authorId: string, rawKey: Uint8Array): Promise { - await sodium.ready; - return sodium.to_base64( - sodium.crypto_generichash(sodium.crypto_generichash_BYTES, authorId, rawKey) - ); -} - -async function getRawKey(): Promise { - const rawMasterKey = get(rawMasterKeyStore); - if (!rawMasterKey) return; - - await sodium.ready; - - return sodium.from_base64(rawMasterKey); -} - -export async function getSubscriptionsBackend(): Promise { - const resp = await fetch(`/api/user/subscriptions`, { - method: 'GET', - credentials: 'same-origin' - }); - - if (!resp.ok) return []; - - const subscriptions: ChannelSubscriptions[] = []; - - const respJson = await resp.json(); - - for (const sub of respJson.subscriptions) { - subscriptions.push({ - channelName: (await decryptWithMasterKey(sub.channelNameNonce, sub.channelNameCipher)) ?? '', - channelId: (await decryptWithMasterKey(sub.channelIdNonce, sub.channelIdCipher)) ?? '', - lastRSSFetch: new Date(sub.lastRSSFetch) - }); - } - - return subscriptions; -} - -export async function updateRSSLastUpdated(authorId: string) { - const rawKey = await getRawKey(); - if (!rawKey) return false; - - const internalAuthorId = await getInternalAuthorId(authorId, rawKey); - - await fetch(`/api/user/subscriptions/${internalAuthorId}`, { - method: 'PATCH', - credentials: 'same-origin' - }); -} - -export async function amSubscribedBackend(authorId: string): Promise { - const rawKey = await getRawKey(); - if (!rawKey) return false; - - const internalAuthorId = await getInternalAuthorId(authorId, rawKey); - - const resp = await fetch(`/api/user/subscriptions/${internalAuthorId}`, { - method: 'GET', - credentials: 'same-origin' - }); - if (!resp.ok) return false; - - const respJson = await resp.json(); - - return respJson.amSubscribed; -} - -export async function deleteUnsubscribeBackend(authorId: string) { - const rawKey = await getRawKey(); - if (!rawKey) return false; - - const internalAuthorId = await getInternalAuthorId(authorId, rawKey); - - await fetch(`/api/user/subscriptions/${internalAuthorId}`, { - method: 'DELETE', - credentials: 'same-origin' - }); -} - -export async function postSubscribeBackend( - authorId: string, - authorName: string | undefined = undefined -) { - const rawKey = await getRawKey(); - if (!rawKey) return; - - const internalAuthorId = await getInternalAuthorId(authorId, rawKey); - - if (!authorName) { - const channel = await getChannelYTjs(authorId); - authorName = channel.author; - } - - const channelId = await encryptWithMasterKey(authorId); - const channelName = await encryptWithMasterKey(authorName); - - const resp = await fetch(`/api/user/subscriptions/${internalAuthorId}`, { - method: 'POST', - body: JSON.stringify({ - channelIdCipher: channelId?.cipher, - channelIdNonce: channelId?.nonce, - channelNameCipher: channelName?.cipher, - channelNameNonce: channelName?.nonce - }), - credentials: 'same-origin' - }); - - if (resp.ok) parseChannelRSS(authorId); -} - -export type DerivePassword = (rawPassword: string, passwordSalt: Uint8Array) => Promise; - -export async function createUserBackend( - username: string, - rawPassword: string, - captchaPayload: string, - derivePassword: DerivePassword -): Promise { - await sodium.ready; - - const passwordSalt = sodium.randombytes_buf(sodium.crypto_pwhash_SALTBYTES); - - const loginHash = await derivePassword(rawPassword, passwordSalt); - - const decryptionKeySalt = sodium.randombytes_buf(sodium.crypto_pwhash_SALTBYTES); - const rawDecryptionKey = sodium.crypto_pwhash( - 32, - rawPassword, - decryptionKeySalt, - sodium.crypto_pwhash_OPSLIMIT_INTERACTIVE, - sodium.crypto_pwhash_MEMLIMIT_INTERACTIVE, - sodium.crypto_pwhash_ALG_DEFAULT - ); - - const rawDecryptionMasterKey = sodium.randombytes_buf(sodium.crypto_secretbox_KEYBYTES); - const decryptionMasterKeyNonce = sodium.randombytes_buf(sodium.crypto_secretbox_NONCEBYTES); - - const masterKeyCipher = sodium.crypto_secretbox_easy( - rawDecryptionMasterKey, - decryptionMasterKeyNonce, - rawDecryptionKey - ); - - const userCreateResp = await fetch('/api/user/create', { - method: 'POST', - body: JSON.stringify({ - username: username, - password: { - hash: sodium.to_base64(loginHash), - salt: sodium.to_base64(passwordSalt) - }, - decryptionKeySalt: sodium.to_base64(decryptionKeySalt), - masterKey: { - cipher: sodium.to_base64(masterKeyCipher), - nonce: sodium.to_base64(decryptionMasterKeyNonce) - }, - captchaPayload - }), - credentials: 'same-origin' - }); - - if (!userCreateResp.ok) return false; - - rawMasterKeyStore.set(sodium.to_base64(rawDecryptionMasterKey)); - - return true; -} - -export async function loginUserBackend( - username: string, - rawPassword: string, - captchaPayload: string, - derivePassword: DerivePassword -): Promise { - await sodium.ready; - - const passwordSaltsResp = await fetch(`/api/user/${username}/public`); - if (!passwordSaltsResp.ok) return false; - - const passwordSalts = await passwordSaltsResp.json(); - - const loginHash = await derivePassword( - rawPassword, - sodium.from_base64(passwordSalts.passwordSalt) - ); - - const loginResp = await fetch('/api/user/login', { - method: 'POST', - body: JSON.stringify({ - username, - passwordHash: sodium.to_base64(loginHash), - captchaPayload - }), - credentials: 'same-origin' - }); - - if (!loginResp.ok) return false; - - const loginJson = await loginResp.json(); - - const rawDecryptionKey = sodium.crypto_pwhash( - sodium.crypto_secretbox_KEYBYTES, - rawPassword, - sodium.from_base64(passwordSalts.decryptionKeySalt), - sodium.crypto_pwhash_OPSLIMIT_INTERACTIVE, - sodium.crypto_pwhash_MEMLIMIT_INTERACTIVE, - sodium.crypto_pwhash_ALG_DEFAULT - ); - - const rawDecryptionMasterKey = sodium.crypto_secretbox_open_easy( - sodium.from_base64(loginJson.masterKeyCipher), - sodium.from_base64(loginJson.masterKeyNonce), - rawDecryptionKey - ); - - rawMasterKeyStore.set(sodium.to_base64(rawDecryptionMasterKey)); - - return true; -} - -export async function addOrUpdateKeyValue(key: string, value: string) { - const valueEncrypted = await encryptWithMasterKey(value); - - await fetch(`/api/user/keyValue/${key}`, { - method: 'POST', - credentials: 'same-origin', - body: JSON.stringify({ - valueCipher: valueEncrypted?.cipher, - valueNonce: valueEncrypted?.nonce - }) - }); -} - -export async function deleteKeyValue(key: string) { - await fetch(`/api/user/keyValue/${key}`, { - method: 'DELETE', - credentials: 'same-origin' - }); -} - -export type KeyValue = boolean | number | string[] | string | object | undefined; - -export async function getKeyValue(key: string): Promise { - const resp = await fetch(`/api/user/keyValue/${key}`, { - method: 'GET', - credentials: 'same-origin' - }); - - if (!resp.ok) return null; - - const respJson = await resp.json(); - return (await decryptWithMasterKey(respJson.valueNonce, respJson.valueCipher)) ?? null; -} - -async function encryptWithMasterKey( - text: string -): Promise<{ nonce: string; cipher: string } | undefined> { - await sodium.ready; - const rawKey = await getRawKey(); - if (!rawKey) return; - - const nonce = sodium.randombytes_buf(sodium.crypto_secretbox_NONCEBYTES); - const cipher = sodium.crypto_secretbox_easy(new TextEncoder().encode(text), nonce, rawKey); - - return { - nonce: sodium.to_base64(nonce), - cipher: sodium.to_base64(cipher) - }; -} - -async function decryptWithMasterKey(nonce: string, cipher: string): Promise { - await sodium.ready; - const rawKey = await getRawKey(); - if (!rawKey) return; - - return new TextDecoder().decode( - sodium.crypto_secretbox_open_easy(sodium.from_base64(cipher), sodium.from_base64(nonce), rawKey) - ); -} diff --git a/materialious/src/lib/api/backend/encryption.ts b/materialious/src/lib/api/backend/encryption.ts new file mode 100644 index 00000000..8aa71947 --- /dev/null +++ b/materialious/src/lib/api/backend/encryption.ts @@ -0,0 +1,48 @@ +import { rawMasterKeyStore } from '$lib/store'; +import sodium from 'libsodium-wrappers-sumo'; +import { get } from 'svelte/store'; + +export async function getSecureHash(toHash: string, rawKey: Uint8Array): Promise { + await sodium.ready; + return sodium.to_base64( + sodium.crypto_generichash(sodium.crypto_generichash_BYTES, toHash, rawKey) + ); +} + +export async function getRawKey(): Promise { + const rawMasterKey = get(rawMasterKeyStore); + if (!rawMasterKey) return; + + await sodium.ready; + + return sodium.from_base64(rawMasterKey); +} + +export async function encryptWithMasterKey( + text: string +): Promise<{ nonce: string; cipher: string } | undefined> { + await sodium.ready; + const rawKey = await getRawKey(); + if (!rawKey) return; + + const nonce = sodium.randombytes_buf(sodium.crypto_secretbox_NONCEBYTES); + const cipher = sodium.crypto_secretbox_easy(new TextEncoder().encode(text), nonce, rawKey); + + return { + nonce: sodium.to_base64(nonce), + cipher: sodium.to_base64(cipher) + }; +} + +export async function decryptWithMasterKey( + nonce: string, + cipher: string +): Promise { + await sodium.ready; + const rawKey = await getRawKey(); + if (!rawKey) return; + + return new TextDecoder().decode( + sodium.crypto_secretbox_open_easy(sodium.from_base64(cipher), sodium.from_base64(nonce), rawKey) + ); +} diff --git a/materialious/src/lib/api/backend/history.ts b/materialious/src/lib/api/backend/history.ts new file mode 100644 index 00000000..f2d5f680 --- /dev/null +++ b/materialious/src/lib/api/backend/history.ts @@ -0,0 +1,159 @@ +import sodium from 'libsodium-wrappers-sumo'; +import { decryptWithMasterKey, encryptWithMasterKey, getRawKey, getSecureHash } from './encryption'; +import type { VideoPlay, VideoWatchHistory } from '../model'; +import { getBestThumbnail } from '$lib/images'; +import { get } from 'svelte/store'; +import { watchHistoryEnabledStore } from '$lib/store'; + +export async function updateWatchHistory(videoId: string, progress: number) { + await sodium.ready; + const rawKey = await getRawKey(); + if (!rawKey) return; + + const videoHash = await getSecureHash(videoId, rawKey); + + await fetch(`/api/user/history/${videoHash}`, { + method: 'POST', + credentials: 'same-origin', + body: JSON.stringify({ + watched: new Date(), + progress + }) + }); +} + +async function decryptWatchHistory( + history: Record +): Promise { + const author = (await decryptWithMasterKey( + history.authorNonce as string, + history.authorCipher as string + )) as string; + const title = (await decryptWithMasterKey( + history.titleNonce as string, + history.titleCipher as string + )) as string; + const thumbnail = (await decryptWithMasterKey( + history.thumbnailNonce as string, + history.thumbnailCipher as string + )) as string; + const videoId = (await decryptWithMasterKey( + history.videoIdNonce as string, + history.videoIdCipher as string + )) as string; + + return { + author, + title, + thumbnail, + videoId, + watched: new Date(history.watched), + lengthSeconds: history.lengthSeconds as number, + id: history.id as string, + progress: history.progress as number, + type: 'historyVideo' + }; +} + +export async function getVideoWatchHistory( + videoId: string +): Promise { + await sodium.ready; + const rawKey = await getRawKey(); + if (!rawKey) return; + + const videoHash = await getSecureHash(videoId, rawKey); + + const resp = await fetch(`/api/user/history/${videoHash}`, { + method: 'GET', + credentials: 'same-origin' + }); + + if (!resp.ok) return; + + return await decryptWatchHistory(await resp.json()); +} + +export async function getWatchHistory( + options: { page?: number; videoIds?: string[] } = { page: undefined, videoIds: undefined } +): Promise { + await sodium.ready; + const rawKey = await getRawKey(); + if (!rawKey) return []; + + const videoHashes: string[] = []; + if (options.videoIds) { + for (const videoId of options.videoIds) { + videoHashes.push(await getSecureHash(videoId, rawKey)); + } + } + + const params = new URLSearchParams(); + + if (options.page) { + params.set('page', options.page.toString()); + } + + if (options.videoIds && options.videoIds.length > 0) { + params.set('videoHashes', videoHashes.join(',')); + } + + const resp = await fetch(`/api/user/history?${params.toString()}`); + if (!resp.ok) return []; + + const rawHistory = await resp.json(); + + const history: VideoWatchHistory[] = []; + + for (const item of rawHistory) { + history.push(await decryptWatchHistory(item)); + } + + return history; +} + +export async function deleteWatchHistory() { + await fetch('/api/user/history', { method: 'DELETE' }); +} + +export async function saveWatchHistory(video: VideoPlay, progress: number = 0) { + if (!get(watchHistoryEnabledStore)) return; + + await sodium.ready; + const rawKey = await getRawKey(); + if (!rawKey) return; + + const videoHash = await getSecureHash(video.videoId, rawKey); + + const title = await encryptWithMasterKey(video.title); + const author = await encryptWithMasterKey(video.author); + const thumbnail = await encryptWithMasterKey(getBestThumbnail(video.videoThumbnails)); + const videoId = await encryptWithMasterKey(video.videoId); + + await fetch('/api/user/history', { + method: 'POST', + credentials: 'same-origin', + body: JSON.stringify({ + id: videoHash, + watched: new Date(), + progress: progress, + title: { + cipher: title?.cipher, + nonce: title?.nonce + }, + author: { + cipher: author?.cipher, + nonce: author?.nonce + }, + thumbnail: { + cipher: thumbnail?.cipher, + nonce: thumbnail?.nonce + }, + videoId: { + cipher: videoId?.cipher, + nonce: videoId?.nonce + }, + lengthSeconds: video.lengthSeconds + }) + }); +} diff --git a/materialious/src/lib/api/apiExtended.ts b/materialious/src/lib/api/backend/historyPool.ts similarity index 59% rename from materialious/src/lib/api/apiExtended.ts rename to materialious/src/lib/api/backend/historyPool.ts index 77d73063..5c6be48d 100644 --- a/materialious/src/lib/api/apiExtended.ts +++ b/materialious/src/lib/api/backend/historyPool.ts @@ -1,8 +1,8 @@ -import type { ApiExntendedProgressModel } from './model'; -import { getVideoProgress } from '.'; +import type { VideoWatchHistory } from '../model'; +import { getWatchHistory } from './history'; const videoIds: string[] = []; -const pendingResolves = new Map void>(); +const pendingResolves = new Map void>(); let timeout: ReturnType | null = null; const DEBOUNCE_MS = 1000; @@ -15,15 +15,15 @@ async function processBatches(): Promise { batches.push(videoIds.splice(0, BATCH_SIZE)); } - const results: ApiExntendedProgressModel[] = []; + const results: VideoWatchHistory[] = []; for (const batch of batches) { - const res: ApiExntendedProgressModel[] = await getVideoProgress(batch.join(',')); + const res: VideoWatchHistory[] = await getWatchHistory({ videoIds: batch }); results.push(...res); // Resolve pending promises for this batch for (const videoId of batch) { - const match = res.find((item) => item.video_id === videoId); + const match = res.find((item) => item.videoId === videoId); const resolve = pendingResolves.get(videoId); if (resolve) { resolve(match); @@ -33,12 +33,10 @@ async function processBatches(): Promise { } } -export function queueGetWatchProgress( - videoId: string -): Promise { +export function queueGetWatchHistory(videoId: string): Promise { videoIds.push(videoId); - const promise = new Promise((resolve) => { + const promise = new Promise((resolve) => { pendingResolves.set(videoId, resolve); }); diff --git a/materialious/src/lib/api/backend/index.ts b/materialious/src/lib/api/backend/index.ts new file mode 100644 index 00000000..df1d9162 --- /dev/null +++ b/materialious/src/lib/api/backend/index.ts @@ -0,0 +1,112 @@ +import sodium from 'libsodium-wrappers-sumo'; +import { rawMasterKeyStore } from '$lib/store'; + +export type DerivePassword = (rawPassword: string, passwordSalt: Uint8Array) => Promise; + +export async function createUserBackend( + username: string, + rawPassword: string, + captchaPayload: string, + derivePassword: DerivePassword +): Promise { + await sodium.ready; + + const passwordSalt = sodium.randombytes_buf(sodium.crypto_pwhash_SALTBYTES); + + const loginHash = await derivePassword(rawPassword, passwordSalt); + + const decryptionKeySalt = sodium.randombytes_buf(sodium.crypto_pwhash_SALTBYTES); + const rawDecryptionKey = sodium.crypto_pwhash( + 32, + rawPassword, + decryptionKeySalt, + sodium.crypto_pwhash_OPSLIMIT_INTERACTIVE, + sodium.crypto_pwhash_MEMLIMIT_INTERACTIVE, + sodium.crypto_pwhash_ALG_DEFAULT + ); + + const rawDecryptionMasterKey = sodium.randombytes_buf(sodium.crypto_secretbox_KEYBYTES); + const decryptionMasterKeyNonce = sodium.randombytes_buf(sodium.crypto_secretbox_NONCEBYTES); + + const masterKeyCipher = sodium.crypto_secretbox_easy( + rawDecryptionMasterKey, + decryptionMasterKeyNonce, + rawDecryptionKey + ); + + const userCreateResp = await fetch('/api/user/create', { + method: 'POST', + body: JSON.stringify({ + username: username, + password: { + hash: sodium.to_base64(loginHash), + salt: sodium.to_base64(passwordSalt) + }, + decryptionKeySalt: sodium.to_base64(decryptionKeySalt), + masterKey: { + cipher: sodium.to_base64(masterKeyCipher), + nonce: sodium.to_base64(decryptionMasterKeyNonce) + }, + captchaPayload + }), + credentials: 'same-origin' + }); + + if (!userCreateResp.ok) return false; + + rawMasterKeyStore.set(sodium.to_base64(rawDecryptionMasterKey)); + + return true; +} + +export async function loginUserBackend( + username: string, + rawPassword: string, + captchaPayload: string, + derivePassword: DerivePassword +): Promise { + await sodium.ready; + + const passwordSaltsResp = await fetch(`/api/user/${username}/public`); + if (!passwordSaltsResp.ok) return false; + + const passwordSalts = await passwordSaltsResp.json(); + + const loginHash = await derivePassword( + rawPassword, + sodium.from_base64(passwordSalts.passwordSalt) + ); + + const loginResp = await fetch('/api/user/login', { + method: 'POST', + body: JSON.stringify({ + username, + passwordHash: sodium.to_base64(loginHash), + captchaPayload + }), + credentials: 'same-origin' + }); + + if (!loginResp.ok) return false; + + const loginJson = await loginResp.json(); + + const rawDecryptionKey = sodium.crypto_pwhash( + sodium.crypto_secretbox_KEYBYTES, + rawPassword, + sodium.from_base64(passwordSalts.decryptionKeySalt), + sodium.crypto_pwhash_OPSLIMIT_INTERACTIVE, + sodium.crypto_pwhash_MEMLIMIT_INTERACTIVE, + sodium.crypto_pwhash_ALG_DEFAULT + ); + + const rawDecryptionMasterKey = sodium.crypto_secretbox_open_easy( + sodium.from_base64(loginJson.masterKeyCipher), + sodium.from_base64(loginJson.masterKeyNonce), + rawDecryptionKey + ); + + rawMasterKeyStore.set(sodium.to_base64(rawDecryptionMasterKey)); + + return true; +} diff --git a/materialious/src/lib/api/backend/keyvalue.ts b/materialious/src/lib/api/backend/keyvalue.ts new file mode 100644 index 00000000..695ef00f --- /dev/null +++ b/materialious/src/lib/api/backend/keyvalue.ts @@ -0,0 +1,35 @@ +import { decryptWithMasterKey, encryptWithMasterKey } from './encryption'; + +export async function addOrUpdateKeyValue(key: string, value: string) { + const valueEncrypted = await encryptWithMasterKey(value); + + await fetch(`/api/user/keyValue/${key}`, { + method: 'POST', + credentials: 'same-origin', + body: JSON.stringify({ + valueCipher: valueEncrypted?.cipher, + valueNonce: valueEncrypted?.nonce + }) + }); +} + +export async function deleteKeyValue(key: string) { + await fetch(`/api/user/keyValue/${key}`, { + method: 'DELETE', + credentials: 'same-origin' + }); +} + +export type KeyValue = boolean | number | string[] | string | object | undefined; + +export async function getKeyValue(key: string): Promise { + const resp = await fetch(`/api/user/keyValue/${key}`, { + method: 'GET', + credentials: 'same-origin' + }); + + if (!resp.ok) return null; + + const respJson = await resp.json(); + return (await decryptWithMasterKey(respJson.valueNonce, respJson.valueCipher)) ?? null; +} diff --git a/materialious/src/lib/api/backend/subscriptions.ts b/materialious/src/lib/api/backend/subscriptions.ts new file mode 100644 index 00000000..248a07f5 --- /dev/null +++ b/materialious/src/lib/api/backend/subscriptions.ts @@ -0,0 +1,99 @@ +import { parseChannelRSS } from '$lib/api/youtubejs/subscriptions'; +import { getChannelYTjs } from '$lib/api/youtubejs/channel'; +import type { ChannelSubscriptions } from '$lib/dexie'; +import { decryptWithMasterKey, encryptWithMasterKey, getRawKey, getSecureHash } from './encryption'; + +export async function getSubscriptionsBackend(): Promise { + const resp = await fetch(`/api/user/subscriptions`, { + method: 'GET', + credentials: 'same-origin' + }); + + if (!resp.ok) return []; + + const subscriptions: ChannelSubscriptions[] = []; + + const respJson = await resp.json(); + + for (const sub of respJson.subscriptions) { + subscriptions.push({ + channelName: (await decryptWithMasterKey(sub.channelNameNonce, sub.channelNameCipher)) ?? '', + channelId: (await decryptWithMasterKey(sub.channelIdNonce, sub.channelIdCipher)) ?? '', + lastRSSFetch: new Date(sub.lastRSSFetch) + }); + } + + return subscriptions; +} + +export async function updateRSSLastUpdated(authorId: string) { + const rawKey = await getRawKey(); + if (!rawKey) return false; + + const internalAuthorId = await getSecureHash(authorId, rawKey); + + await fetch(`/api/user/subscriptions/${internalAuthorId}`, { + method: 'PATCH', + credentials: 'same-origin' + }); +} + +export async function amSubscribedBackend(authorId: string): Promise { + const rawKey = await getRawKey(); + if (!rawKey) return false; + + const internalAuthorId = await getSecureHash(authorId, rawKey); + + const resp = await fetch(`/api/user/subscriptions/${internalAuthorId}`, { + method: 'GET', + credentials: 'same-origin' + }); + if (!resp.ok) return false; + + const respJson = await resp.json(); + + return respJson.amSubscribed; +} + +export async function deleteUnsubscribeBackend(authorId: string) { + const rawKey = await getRawKey(); + if (!rawKey) return false; + + const internalAuthorId = await getSecureHash(authorId, rawKey); + + await fetch(`/api/user/subscriptions/${internalAuthorId}`, { + method: 'DELETE', + credentials: 'same-origin' + }); +} + +export async function postSubscribeBackend( + authorId: string, + authorName: string | undefined = undefined +) { + const rawKey = await getRawKey(); + if (!rawKey) return; + + const internalAuthorId = await getSecureHash(authorId, rawKey); + + if (!authorName) { + const channel = await getChannelYTjs(authorId); + authorName = channel.author; + } + + const channelId = await encryptWithMasterKey(authorId); + const channelName = await encryptWithMasterKey(authorName); + + const resp = await fetch(`/api/user/subscriptions/${internalAuthorId}`, { + method: 'POST', + body: JSON.stringify({ + channelIdCipher: channelId?.cipher, + channelIdNonce: channelId?.nonce, + channelNameCipher: channelName?.cipher, + channelNameNonce: channelName?.nonce + }), + credentials: 'same-origin' + }); + + if (resp.ok) parseChannelRSS(authorId); +} diff --git a/materialious/src/lib/api/index.ts b/materialious/src/lib/api/index.ts index 928d0d9a..434816a2 100644 --- a/materialious/src/lib/api/index.ts +++ b/materialious/src/lib/api/index.ts @@ -9,8 +9,7 @@ import { playerYouTubeJsAlways, playerYouTubeJsFallback, rawMasterKeyStore, - returnYTDislikesInstanceStore, - synciousInstanceStore + returnYTDislikesInstanceStore } from '../store'; import type { ChannelPage, @@ -22,7 +21,6 @@ import type { ReturnYTDislikes, SearchSuggestion, Subscription, - ApiExntendedProgressModel, Video, VideoPlay, SearchOptions, @@ -52,7 +50,7 @@ import { deleteUnsubscribeBackend, getSubscriptionsBackend, postSubscribeBackend -} from './backend'; +} from './backend/subscriptions'; import { getUserLocale } from '$lib/i18n'; export function buildPath(path: string): URL { @@ -597,62 +595,3 @@ export async function getThumbnail( ); return URL.createObjectURL(await resp.blob()); } - -function buildApiExtendedAuthHeaders(): Record> { - const authToken = get(invidiousAuthStore)?.token ?? ''; - return { headers: { Authorization: `Bearer ${authToken.replace('SID=', '')}` } }; -} - -export async function getVideoProgress( - videoId: string, - fetchOptions: RequestInit = {} -): Promise { - const resp = await fetchErrorHandle( - await fetch(`${get(synciousInstanceStore)}/video/${encodeURIComponent(videoId)}`, { - ...buildApiExtendedAuthHeaders(), - ...fetchOptions - }) - ); - - return resp.json(); -} - -export async function saveVideoProgress( - videoId: string, - time: number, - fetchOptions: RequestInit = {} -) { - const headers: Record> = buildApiExtendedAuthHeaders(); - headers['headers']['Content-type'] = 'application/json'; - - await fetchErrorHandle( - await fetch(`${get(synciousInstanceStore)}/video/${encodeURIComponent(videoId)}`, { - ...headers, - method: 'POST', - body: JSON.stringify({ - time: time - }), - ...fetchOptions - }) - ); -} - -export async function deleteVideoProgress(videoId: string, fetchOptions: RequestInit = {}) { - await fetchErrorHandle( - await fetch(`${get(synciousInstanceStore)}/video/${videoId}`, { - method: 'DELETE', - ...buildApiExtendedAuthHeaders(), - ...fetchOptions - }) - ); -} - -export async function deleteAllVideoProgress(fetchOptions: RequestInit = {}) { - await fetchErrorHandle( - await fetch(`${get(synciousInstanceStore)}/videos`, { - method: 'DELETE', - ...buildApiExtendedAuthHeaders(), - ...fetchOptions - }) - ); -} diff --git a/materialious/src/lib/api/model.ts b/materialious/src/lib/api/model.ts index 793e795c..46ecc93b 100644 --- a/materialious/src/lib/api/model.ts +++ b/materialious/src/lib/api/model.ts @@ -302,15 +302,6 @@ export interface DeArrow { videoDuration: number; } -export interface ApiExntendedProgressModel { - time: number; - video_id: string; -} - -export interface SynciousSaveProgressModel { - time: number; -} - export type SearchResults = (Channel | Video | Playlist | HashTag)[] & { getContinuation?: () => Promise; }; @@ -330,3 +321,15 @@ export type ChannelOptions = { continuation?: string; sortBy?: ChannelSortBy; }; + +export interface VideoWatchHistory { + author: string; + watched: Date; + lengthSeconds: number; + progress: number; + id: string; + title: string; + thumbnail: string; + videoId: string; + type: 'historyVideo'; +} diff --git a/materialious/src/lib/api/youtubejs/subscriptions.ts b/materialious/src/lib/api/youtubejs/subscriptions.ts index 7853634e..57e28f44 100644 --- a/materialious/src/lib/api/youtubejs/subscriptions.ts +++ b/materialious/src/lib/api/youtubejs/subscriptions.ts @@ -10,7 +10,7 @@ import { engineMaxConcurrentChannelsStore, rawMasterKeyStore } from '$lib/store'; -import { getSubscriptionsBackend } from '../backend'; +import { getSubscriptionsBackend } from '../backend/subscriptions'; export async function getSubscriptionsYTjs(): Promise { const subscriptions: Subscription[] = []; diff --git a/materialious/src/lib/components/Author.svelte b/materialious/src/lib/components/Author.svelte index bc7f8407..b64cdc9e 100644 --- a/materialious/src/lib/components/Author.svelte +++ b/materialious/src/lib/components/Author.svelte @@ -89,7 +89,6 @@ class:primary={!favoritedChannel} class:surface-container-highest={favoritedChannel} onclick={toggleFavourited} - class="square" > star
diff --git a/materialious/src/lib/components/Search.svelte b/materialious/src/lib/components/Search.svelte index eee62751..7c5569fc 100644 --- a/materialious/src/lib/components/Search.svelte +++ b/materialious/src/lib/components/Search.svelte @@ -123,18 +123,12 @@ }} role="presentation" > -
+
search - + {#if showSearchBox} - -
+ +
dispatch('searchCancelled')} >arrow_back diff --git a/materialious/src/lib/components/SyncParty.svelte b/materialious/src/lib/components/SyncParty.svelte index 20599beb..11aff461 100644 --- a/materialious/src/lib/components/SyncParty.svelte +++ b/materialious/src/lib/components/SyncParty.svelte @@ -192,7 +192,7 @@ onclick={async () => { await shareURL(`${syncOrigin}${resolve(`/?sync=${createShareBase64()}`, {})}`); }} - class="square round" + class="round" > content_copy diff --git a/materialious/src/lib/components/layout/ItemsList.svelte b/materialious/src/lib/components/layout/ItemsList.svelte index e161549f..4e40f774 100644 --- a/materialious/src/lib/components/layout/ItemsList.svelte +++ b/materialious/src/lib/components/layout/ItemsList.svelte @@ -249,7 +249,7 @@ } }} > - {#if item.type === 'video' || item.type === 'shortVideo' || item.type === 'stream'} + {#if item.type === 'video' || item.type === 'shortVideo' || item.type === 'stream' || item.type === 'historyVideo'} {#key item.videoId} {/key} diff --git a/materialious/src/lib/components/player/Player.svelte b/materialious/src/lib/components/player/Player.svelte index 4285041e..c21972e4 100644 --- a/materialious/src/lib/components/player/Player.svelte +++ b/materialious/src/lib/components/player/Player.svelte @@ -13,10 +13,8 @@ import { _ } from '$lib/i18n'; import { get } from 'svelte/store'; import { Slider } from 'melt/builders'; - import { deleteVideoProgress, getVideoProgress, saveVideoProgress } from '$lib/api'; import type { VideoPlay } from '$lib/api/model'; import { - invidiousAuthStore, isAndroidTvStore, playerAlwaysLoopStore, playerAndroidLockOrientation, @@ -31,12 +29,11 @@ playerState, playertheatreModeIsActive, playerYouTubeJsFallback, + rawMasterKeyStore, sponsorBlockCategoriesStore, sponsorBlockDisplayToastStore, sponsorBlockStore, - sponsorBlockUrlStore, - synciousInstanceStore, - synciousStore + sponsorBlockUrlStore } from '$lib/store'; import { setStatusBarColor } from '$lib/theme'; import { getVideoYTjs } from '$lib/api/youtubejs/video'; @@ -65,6 +62,7 @@ import { Network, type ConnectionStatus } from '@capacitor/network'; import { ScreenOrientation, type ScreenOrientationResult } from '@capacitor/screen-orientation'; import ClosedCaptions from './ClosedCaptions.svelte'; + import { getVideoWatchHistory, updateWatchHistory } from '$lib/api/backend/history'; interface Props { data: { video: VideoPlay; content: ParsedDescription; playlistId: string | null }; @@ -257,7 +255,7 @@ clearInterval(watchProgressInterval); } // Auto save watch progress every minute. - watchProgressInterval = setInterval(() => savePlayerPos(), 60000); + watchProgressInterval = setInterval(() => savePlayerbackHistory(), 60000); let dashUrl: string; @@ -284,9 +282,9 @@ !data.video.fallbackPatch ) { const manifest = await manifestDomainInclusion(dashUrl); - await player.load(manifest, await getLastPlayPos()); + await player.load(manifest, await getPlaybackHistory()); } else { - await player.load(dashUrl, await getLastPlayPos()); + await player.load(dashUrl, await getPlaybackHistory()); } if (data.content.timestamps) { @@ -675,7 +673,7 @@ playerElement?.addEventListener('pause', async () => { playerCurrentPlaybackState = false; playerIsBuffering = false; - savePlayerPos(); + savePlayerbackHistory(); showPlayerUI(); }); @@ -739,7 +737,7 @@ updateVideoPlayerHeight(); }); - async function getLastPlayPos(): Promise { + async function getPlaybackHistory(): Promise { if (loadTimeFromUrl($page) || !$playerSavePlaybackPositionStore) return 0; let toSetTime = 0; @@ -753,47 +751,33 @@ // Continue regardless of error } - if ($synciousStore && $synciousInstanceStore && $invidiousAuthStore) { - try { - toSetTime = (await getVideoProgress(data.video.videoId))[0].time; - } catch { - // Continue regardless of error - } + if (isOwnBackend()?.internalAuth && get(rawMasterKeyStore)) { + const watchHistory = await getVideoWatchHistory(data.video.videoId); + if (watchHistory) toSetTime = watchHistory.progress; } return toSetTime; } - function savePlayerPos() { - if (data.video.liveNow) return; + function savePlayerbackHistory() { + if (data.video.liveNow || !$playerSavePlaybackPositionStore || !playerElement) return; - const synciousEnabled = $synciousStore && $synciousInstanceStore && $invidiousAuthStore; - - if ($playerSavePlaybackPositionStore && playerElement) { - if ( - playerElement.currentTime < playerElement.duration - 10 && - playerElement.currentTime > 10 - ) { - try { - localStorage.setItem(`v_${data.video.videoId}`, playerElement.currentTime.toString()); - } catch { - // Continue regardless of error - } - - if (synciousEnabled) { - saveVideoProgress(data.video.videoId, playerElement.currentTime); - } - } else { - try { - localStorage.removeItem(`v_${data.video.videoId}`); - } catch { - // Continue regardless of error - } - - if (synciousEnabled) { - deleteVideoProgress(data.video.videoId); - } + if (playerElement.currentTime < playerElement.duration - 10 && playerElement.currentTime > 10) { + try { + localStorage.setItem(`v_${data.video.videoId}`, playerElement.currentTime.toString()); + } catch { + // Continue regardless of error } + } else { + try { + localStorage.removeItem(`v_${data.video.videoId}`); + } catch { + // Continue regardless of error + } + } + + if (isOwnBackend()?.internalAuth && get(rawMasterKeyStore)) { + updateWatchHistory(data.video.videoId, playerElement.currentTime); } } @@ -814,7 +798,7 @@ } try { - savePlayerPos(); + savePlayerbackHistory(); } catch { // Continue regardless of error } diff --git a/materialious/src/lib/components/player/Timeline.svelte b/materialious/src/lib/components/player/Timeline.svelte index 06392478..5ebbcfa4 100644 --- a/materialious/src/lib/components/player/Timeline.svelte +++ b/materialious/src/lib/components/player/Timeline.svelte @@ -320,7 +320,7 @@ display: block; margin-bottom: 0.1rem; height: 100px; - border-radius: 0.25rem; + border-radius: 1rem 1rem 0 0; } .timeline.tooltip { @@ -332,6 +332,7 @@ will-change: transform; padding: 0; display: block; + border-radius: var(--border-radius); } .tooltip.thumb { @@ -349,8 +350,8 @@ transform: translateY(-50%); z-index: 1; pointer-events: none; - border-top-right-radius: 0.25rem; - border-bottom-right-radius: 0.25rem; + border-top-right-radius: var(--player-border-radius); + border-bottom-right-radius: var(--player-border-radius); opacity: 0.5; } @@ -361,7 +362,7 @@ left: 0; height: var(--player-timeline-height); background-color: var(--secondary); - border-radius: 0.25rem; + border-radius: var(--player-border-radius); z-index: 2; pointer-events: none; opacity: 0.5; diff --git a/materialious/src/lib/components/settings/ApiExtended.svelte b/materialious/src/lib/components/settings/ApiExtended.svelte deleted file mode 100644 index 903f1c44..00000000 --- a/materialious/src/lib/components/settings/ApiExtended.svelte +++ /dev/null @@ -1,42 +0,0 @@ - - -
- synciousInstanceStore.set(ensureNoTrailingSlash(synciousInstance)) - )} -> - -
- - diff --git a/materialious/src/lib/components/settings/DeArrow.svelte b/materialious/src/lib/components/settings/DeArrow.svelte index aec7cd74..f6e0adb1 100644 --- a/materialious/src/lib/components/settings/DeArrow.svelte +++ b/materialious/src/lib/components/settings/DeArrow.svelte @@ -22,7 +22,7 @@
- @@ -35,7 +35,7 @@
- diff --git a/materialious/src/lib/components/settings/Engine.svelte b/materialious/src/lib/components/settings/Engine.svelte index d34cc84d..2c81fa92 100644 --- a/materialious/src/lib/components/settings/Engine.svelte +++ b/materialious/src/lib/components/settings/Engine.svelte @@ -16,7 +16,7 @@ import { postSubscribeYTjs } from '$lib/api/youtubejs/subscriptions'; import { addToast } from '../Toast.svelte'; import { isOwnBackend } from '$lib/shared'; - import { postSubscribeBackend } from '$lib/api/backend'; + import { postSubscribeBackend } from '$lib/api/backend/subscriptions'; const engineFallbacks: EngineFallback[] = [ 'Channel', diff --git a/materialious/src/lib/components/settings/Interface.svelte b/materialious/src/lib/components/settings/Interface.svelte index 8a79e274..72c90204 100644 --- a/materialious/src/lib/components/settings/Interface.svelte +++ b/materialious/src/lib/components/settings/Interface.svelte @@ -167,7 +167,7 @@ > {/if}
- diff --git a/materialious/src/lib/components/settings/InternalAccount.svelte b/materialious/src/lib/components/settings/InternalAccount.svelte index d9e28c80..d6180e78 100644 --- a/materialious/src/lib/components/settings/InternalAccount.svelte +++ b/materialious/src/lib/components/settings/InternalAccount.svelte @@ -1,6 +1,7 @@ -
Delete account
+
+ +
+
+
+
+
- diff --git a/materialious/src/lib/components/settings/Settings.svelte b/materialious/src/lib/components/settings/Settings.svelte index 7d7f4415..e8038828 100644 --- a/materialious/src/lib/components/settings/Settings.svelte +++ b/materialious/src/lib/components/settings/Settings.svelte @@ -1,7 +1,6 @@ + +{#if data.videos.length > 0} + +
+{/if} + + + diff --git a/materialious/src/routes/(app)/history/+page.ts b/materialious/src/routes/(app)/history/+page.ts new file mode 100644 index 00000000..3e08ee47 --- /dev/null +++ b/materialious/src/routes/(app)/history/+page.ts @@ -0,0 +1,13 @@ +import { resolve } from '$app/paths'; +import { getWatchHistory } from '$lib/api/backend/history'; +import { isOwnBackend } from '$lib/shared'; +import { rawMasterKeyStore } from '$lib/store'; +import { redirect } from '@sveltejs/kit'; +import { get } from 'svelte/store'; + +export async function load() { + if (!isOwnBackend()?.internalAuth || !get(rawMasterKeyStore)) + throw redirect(302, resolve('/', {})); + + return { videos: await getWatchHistory() }; +} diff --git a/materialious/src/routes/(app)/playlists/+page.svelte b/materialious/src/routes/(app)/playlists/+page.svelte index 8c76ce82..8a5e411f 100644 --- a/materialious/src/routes/(app)/playlists/+page.svelte +++ b/materialious/src/routes/(app)/playlists/+page.svelte @@ -51,7 +51,7 @@ diff --git a/materialious/src/routes/(app)/watch/[slug]/+page.svelte b/materialious/src/routes/(app)/watch/[slug]/+page.svelte index 6e1d9316..b77f2695 100644 --- a/materialious/src/routes/(app)/watch/[slug]/+page.svelte +++ b/materialious/src/routes/(app)/watch/[slug]/+page.svelte @@ -41,7 +41,7 @@ import { page } from '$app/state'; import Share from '$lib/components/Share.svelte'; import Playlist from '$lib/components/watch/Playlist.svelte'; - import type { PlayerEvents } from '$lib/player/index.js'; + import type { PlayerEvents } from '$lib/player/index'; let { data = $bindable() } = $props(); @@ -397,10 +397,10 @@
{letterCase(data.video.title)}
-
+
-
+
@@ -451,25 +451,25 @@ }, { type: 'invidious', - path: `/watch?=${data.video.videoId}`, + path: `/watch?v=${data.video.videoId}`, param: { - key: 'v', + key: 't', value: () => Math.round(playerCurrentTime) } }, { type: 'invidious redirect', - path: `/watch?=${data.video.videoId}`, + path: `/watch?v=${data.video.videoId}`, param: { - key: 'v', + key: 't', value: () => Math.round(playerCurrentTime) } }, { type: 'youtube', - path: `/watch?=${data.video.videoId}`, + path: `/watch?v=${data.video.videoId}`, param: { - key: 'v', + key: 't', value: () => Math.round(playerCurrentTime) } } @@ -695,7 +695,7 @@ height: 50vh; } - @media screen and (max-width: 1000px) { + @media screen and (max-width: 1200px) { .video-actions { align-items: flex-start; flex-direction: column; diff --git a/materialious/src/routes/api/proxy/[urlToProxy]/+server.ts b/materialious/src/routes/api/proxy/[urlToProxy]/+server.ts index c5d3c786..f4b81f8a 100644 --- a/materialious/src/routes/api/proxy/[urlToProxy]/+server.ts +++ b/materialious/src/routes/api/proxy/[urlToProxy]/+server.ts @@ -32,7 +32,7 @@ const allowedBaseDomains: string[] = [ 'youtube.com', 'ytimg.com', 'googlevideo.com', - 'returnyoutubedislike.com', + 'returnyoutubedislikeapi.com', 'ajay.app' ]; @@ -48,7 +48,6 @@ const dynamicAllowDomainsEnvVars = [ env.PUBLIC_DEFAULT_INVIDIOUS_INSTANCE, env.PUBLIC_DEFAULT_RETURNYTDISLIKES_INSTANCE, env.PUBLIC_DEFAULT_API_EXTENDED_INSTANCE, - env.PUBLIC_DEFAULT_SYNCIOUS_INSTANCE, env.PUBLIC_DEFAULT_COMPANION_INSTANCE ]; diff --git a/materialious/src/routes/api/user/history/+server.ts b/materialious/src/routes/api/user/history/+server.ts new file mode 100644 index 00000000..778339db --- /dev/null +++ b/materialious/src/routes/api/user/history/+server.ts @@ -0,0 +1,121 @@ +import { getSequelize } from '$lib/server/database'; +import { error, json } from '@sveltejs/kit'; +import z from 'zod'; +import { Op } from 'sequelize'; + +const zUserHistory = z.object({ + id: z.string().max(255), + watched: z.coerce.date(), + progress: z.number().max(115200), + lengthSeconds: z.number().max(115200), + title: z.object({ + cipher: z.string().max(255), + nonce: z.string().max(255) + }), + author: z.object({ + cipher: z.string().max(255), + nonce: z.string().max(255) + }), + thumbnail: z.object({ + cipher: z.string().max(1000), + nonce: z.string().max(255) + }), + videoId: z.object({ + cipher: z.string().max(255), + nonce: z.string().max(255) + }) +}); + +export async function POST({ locals, request }) { + if (!locals.userId) throw error(401, 'Unauthorized'); + + const data = zUserHistory.safeParse(await request.json()); + + if (!data.success) throw error(400, data.error.message); + + const history = await getSequelize().UserHistoryTable.findOne({ + where: { + UserId: locals.userId, + id: data.data.id + } + }); + + const toStore = { + watched: data.data.watched, + lengthSeconds: data.data.lengthSeconds, + titleCipher: data.data.title.cipher, + titleNonce: data.data.title.nonce, + authorCipher: data.data.author.cipher, + authorNonce: data.data.author.nonce, + thumbnailCipher: data.data.thumbnail.cipher, + thumbnailNonce: data.data.thumbnail.nonce, + videoIdCipher: data.data.videoId.cipher, + videoIdNonce: data.data.videoId.nonce + }; + + if (history) { + await history.update(toStore); + } else { + await getSequelize().UserHistoryTable.create({ + UserId: locals.userId, + id: data.data.id, + progress: data.data.progress, + ...toStore + }); + } + + // Cull any history older then 3 months. + const threeMonthsAgo = new Date(); + threeMonthsAgo.setMonth(threeMonthsAgo.getMonth() - 3); + getSequelize().UserHistoryTable.destroy({ + where: { + UserId: locals.userId, + watched: { + [Op.lt]: threeMonthsAgo + } + } + }); + + return new Response(); +} + +export async function GET({ locals, url }) { + if (!locals.userId) throw error(401, 'Unauthorized'); + + const limit = 100; + const page = Number(url.searchParams.get('page') ?? 0); + + const videoHashes = url.searchParams.get('videoHashes'); + let videoHashesList: string[] = []; + + if (videoHashes) { + videoHashesList = videoHashes.split(','); + } + + const whereClause: any = { + UserId: locals.userId + }; + + if (videoHashesList.length > 0) { + whereClause.id = { [Op.in]: videoHashesList }; + } + + const history = await getSequelize().UserHistoryTable.findAll({ + where: whereClause, + limit, + offset: page > 0 ? limit * page : undefined, + order: [['watched', 'DESC']] + }); + + return json(history); +} + +export async function DELETE({ locals }) { + await getSequelize().UserHistoryTable.destroy({ + where: { + UserId: locals.userId + } + }); + + return new Response(); +} diff --git a/materialious/src/routes/api/user/history/[videoHash]/+server.ts b/materialious/src/routes/api/user/history/[videoHash]/+server.ts new file mode 100644 index 00000000..e84f9516 --- /dev/null +++ b/materialious/src/routes/api/user/history/[videoHash]/+server.ts @@ -0,0 +1,47 @@ +import { getSequelize } from '$lib/server/database'; +import { error, json } from '@sveltejs/kit'; +import z from 'zod'; + +const zUserHistoryUpdate = z + .object({ + watched: z.coerce.date().optional(), + progress: z.number().max(115200).optional() + }) + .transform((data) => { + return Object.fromEntries(Object.entries(data).filter(([, v]) => v !== undefined)); + }); + +export async function POST({ locals, request, params }) { + if (!locals.userId) throw error(401, 'Unauthorized'); + + const data = zUserHistoryUpdate.safeParse(await request.json()); + if (!data.success) throw error(400, data.error.message); + + await getSequelize().UserHistoryTable.update(data.data, { + where: { UserId: locals.userId, id: params.videoHash } + }); + + return new Response(); +} + +export async function DELETE({ locals, params }) { + if (!locals.userId) throw error(401, 'Unauthorized'); + + await getSequelize().UserHistoryTable.destroy({ + where: { UserId: locals.userId, id: params.videoHash } + }); + + return new Response(); +} + +export async function GET({ locals, params }) { + if (!locals.userId) throw error(401, 'Unauthorized'); + + const history = await getSequelize().UserHistoryTable.findOne({ + where: { UserId: locals.userId, id: params.videoHash } + }); + + if (!history) throw error(404); + + return json(history); +} diff --git a/materialious/src/routes/api/user/keyValue/[key]/+server.ts b/materialious/src/routes/api/user/keyValue/[key]/+server.ts index 26bdd8f3..3208b5fd 100644 --- a/materialious/src/routes/api/user/keyValue/[key]/+server.ts +++ b/materialious/src/routes/api/user/keyValue/[key]/+server.ts @@ -1,5 +1,5 @@ -import { persistedStoreKeys } from '$lib/externalSettings/settings.js'; -import { getUser } from '$lib/server/user.js'; +import { persistedStoreKeys } from '$lib/externalSettings/settings'; +import { getUser } from '$lib/server/user'; import { error, json } from '@sveltejs/kit'; import z from 'zod'; diff --git a/materialious/static/localApi/ghContributors.json b/materialious/static/localApi/ghContributors.json index 39019fba..ef4306ef 100644 --- a/materialious/static/localApi/ghContributors.json +++ b/materialious/static/localApi/ghContributors.json @@ -1 +1 @@ -[{"login":"WardPearce","id":27844174,"node_id":"MDQ6VXNlcjI3ODQ0MTc0","avatar_url":"https://avatars.githubusercontent.com/u/27844174?v=4","gravatar_id":"","url":"https://api.github.com/users/WardPearce","html_url":"https://github.com/WardPearce","followers_url":"https://api.github.com/users/WardPearce/followers","following_url":"https://api.github.com/users/WardPearce/following{/other_user}","gists_url":"https://api.github.com/users/WardPearce/gists{/gist_id}","starred_url":"https://api.github.com/users/WardPearce/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/WardPearce/subscriptions","organizations_url":"https://api.github.com/users/WardPearce/orgs","repos_url":"https://api.github.com/users/WardPearce/repos","events_url":"https://api.github.com/users/WardPearce/events{/privacy}","received_events_url":"https://api.github.com/users/WardPearce/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":2156},{"login":"dependabot[bot]","id":49699333,"node_id":"MDM6Qm90NDk2OTkzMzM=","avatar_url":"https://avatars.githubusercontent.com/in/29110?v=4","gravatar_id":"","url":"https://api.github.com/users/dependabot%5Bbot%5D","html_url":"https://github.com/apps/dependabot","followers_url":"https://api.github.com/users/dependabot%5Bbot%5D/followers","following_url":"https://api.github.com/users/dependabot%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/dependabot%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/dependabot%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dependabot%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/dependabot%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/dependabot%5Bbot%5D/repos","events_url":"https://api.github.com/users/dependabot%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/dependabot%5Bbot%5D/received_events","type":"Bot","user_view_type":"public","site_admin":false,"contributions":230},{"login":"Lezurex","id":48829956,"node_id":"MDQ6VXNlcjQ4ODI5OTU2","avatar_url":"https://avatars.githubusercontent.com/u/48829956?v=4","gravatar_id":"","url":"https://api.github.com/users/Lezurex","html_url":"https://github.com/Lezurex","followers_url":"https://api.github.com/users/Lezurex/followers","following_url":"https://api.github.com/users/Lezurex/following{/other_user}","gists_url":"https://api.github.com/users/Lezurex/gists{/gist_id}","starred_url":"https://api.github.com/users/Lezurex/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Lezurex/subscriptions","organizations_url":"https://api.github.com/users/Lezurex/orgs","repos_url":"https://api.github.com/users/Lezurex/repos","events_url":"https://api.github.com/users/Lezurex/events{/privacy}","received_events_url":"https://api.github.com/users/Lezurex/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":39},{"login":"Coool","id":8421903,"node_id":"MDQ6VXNlcjg0MjE5MDM=","avatar_url":"https://avatars.githubusercontent.com/u/8421903?v=4","gravatar_id":"","url":"https://api.github.com/users/Coool","html_url":"https://github.com/Coool","followers_url":"https://api.github.com/users/Coool/followers","following_url":"https://api.github.com/users/Coool/following{/other_user}","gists_url":"https://api.github.com/users/Coool/gists{/gist_id}","starred_url":"https://api.github.com/users/Coool/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Coool/subscriptions","organizations_url":"https://api.github.com/users/Coool/orgs","repos_url":"https://api.github.com/users/Coool/repos","events_url":"https://api.github.com/users/Coool/events{/privacy}","received_events_url":"https://api.github.com/users/Coool/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":15},{"login":"araujosemacento","id":60983392,"node_id":"MDQ6VXNlcjYwOTgzMzky","avatar_url":"https://avatars.githubusercontent.com/u/60983392?v=4","gravatar_id":"","url":"https://api.github.com/users/araujosemacento","html_url":"https://github.com/araujosemacento","followers_url":"https://api.github.com/users/araujosemacento/followers","following_url":"https://api.github.com/users/araujosemacento/following{/other_user}","gists_url":"https://api.github.com/users/araujosemacento/gists{/gist_id}","starred_url":"https://api.github.com/users/araujosemacento/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/araujosemacento/subscriptions","organizations_url":"https://api.github.com/users/araujosemacento/orgs","repos_url":"https://api.github.com/users/araujosemacento/repos","events_url":"https://api.github.com/users/araujosemacento/events{/privacy}","received_events_url":"https://api.github.com/users/araujosemacento/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":14},{"login":"ghostofsparta222","id":251893418,"node_id":"U_kgDODwOWqg","avatar_url":"https://avatars.githubusercontent.com/u/251893418?v=4","gravatar_id":"","url":"https://api.github.com/users/ghostofsparta222","html_url":"https://github.com/ghostofsparta222","followers_url":"https://api.github.com/users/ghostofsparta222/followers","following_url":"https://api.github.com/users/ghostofsparta222/following{/other_user}","gists_url":"https://api.github.com/users/ghostofsparta222/gists{/gist_id}","starred_url":"https://api.github.com/users/ghostofsparta222/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ghostofsparta222/subscriptions","organizations_url":"https://api.github.com/users/ghostofsparta222/orgs","repos_url":"https://api.github.com/users/ghostofsparta222/repos","events_url":"https://api.github.com/users/ghostofsparta222/events{/privacy}","received_events_url":"https://api.github.com/users/ghostofsparta222/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":13},{"login":"toolatebot","id":169580663,"node_id":"U_kgDOChuYdw","avatar_url":"https://avatars.githubusercontent.com/u/169580663?v=4","gravatar_id":"","url":"https://api.github.com/users/toolatebot","html_url":"https://github.com/toolatebot","followers_url":"https://api.github.com/users/toolatebot/followers","following_url":"https://api.github.com/users/toolatebot/following{/other_user}","gists_url":"https://api.github.com/users/toolatebot/gists{/gist_id}","starred_url":"https://api.github.com/users/toolatebot/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/toolatebot/subscriptions","organizations_url":"https://api.github.com/users/toolatebot/orgs","repos_url":"https://api.github.com/users/toolatebot/repos","events_url":"https://api.github.com/users/toolatebot/events{/privacy}","received_events_url":"https://api.github.com/users/toolatebot/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":9},{"login":"Precific","id":30053082,"node_id":"MDQ6VXNlcjMwMDUzMDgy","avatar_url":"https://avatars.githubusercontent.com/u/30053082?v=4","gravatar_id":"","url":"https://api.github.com/users/Precific","html_url":"https://github.com/Precific","followers_url":"https://api.github.com/users/Precific/followers","following_url":"https://api.github.com/users/Precific/following{/other_user}","gists_url":"https://api.github.com/users/Precific/gists{/gist_id}","starred_url":"https://api.github.com/users/Precific/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Precific/subscriptions","organizations_url":"https://api.github.com/users/Precific/orgs","repos_url":"https://api.github.com/users/Precific/repos","events_url":"https://api.github.com/users/Precific/events{/privacy}","received_events_url":"https://api.github.com/users/Precific/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":9},{"login":"yzqzss","id":30341059,"node_id":"MDQ6VXNlcjMwMzQxMDU5","avatar_url":"https://avatars.githubusercontent.com/u/30341059?v=4","gravatar_id":"","url":"https://api.github.com/users/yzqzss","html_url":"https://github.com/yzqzss","followers_url":"https://api.github.com/users/yzqzss/followers","following_url":"https://api.github.com/users/yzqzss/following{/other_user}","gists_url":"https://api.github.com/users/yzqzss/gists{/gist_id}","starred_url":"https://api.github.com/users/yzqzss/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/yzqzss/subscriptions","organizations_url":"https://api.github.com/users/yzqzss/orgs","repos_url":"https://api.github.com/users/yzqzss/repos","events_url":"https://api.github.com/users/yzqzss/events{/privacy}","received_events_url":"https://api.github.com/users/yzqzss/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":4},{"login":"thejenja","id":65224669,"node_id":"MDQ6VXNlcjY1MjI0NjY5","avatar_url":"https://avatars.githubusercontent.com/u/65224669?v=4","gravatar_id":"","url":"https://api.github.com/users/thejenja","html_url":"https://github.com/thejenja","followers_url":"https://api.github.com/users/thejenja/followers","following_url":"https://api.github.com/users/thejenja/following{/other_user}","gists_url":"https://api.github.com/users/thejenja/gists{/gist_id}","starred_url":"https://api.github.com/users/thejenja/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/thejenja/subscriptions","organizations_url":"https://api.github.com/users/thejenja/orgs","repos_url":"https://api.github.com/users/thejenja/repos","events_url":"https://api.github.com/users/thejenja/events{/privacy}","received_events_url":"https://api.github.com/users/thejenja/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":4},{"login":"cookiennn","id":114363954,"node_id":"U_kgDOBtEOMg","avatar_url":"https://avatars.githubusercontent.com/u/114363954?v=4","gravatar_id":"","url":"https://api.github.com/users/cookiennn","html_url":"https://github.com/cookiennn","followers_url":"https://api.github.com/users/cookiennn/followers","following_url":"https://api.github.com/users/cookiennn/following{/other_user}","gists_url":"https://api.github.com/users/cookiennn/gists{/gist_id}","starred_url":"https://api.github.com/users/cookiennn/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cookiennn/subscriptions","organizations_url":"https://api.github.com/users/cookiennn/orgs","repos_url":"https://api.github.com/users/cookiennn/repos","events_url":"https://api.github.com/users/cookiennn/events{/privacy}","received_events_url":"https://api.github.com/users/cookiennn/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":4},{"login":"SecularSteve","id":33793273,"node_id":"MDQ6VXNlcjMzNzkzMjcz","avatar_url":"https://avatars.githubusercontent.com/u/33793273?v=4","gravatar_id":"","url":"https://api.github.com/users/SecularSteve","html_url":"https://github.com/SecularSteve","followers_url":"https://api.github.com/users/SecularSteve/followers","following_url":"https://api.github.com/users/SecularSteve/following{/other_user}","gists_url":"https://api.github.com/users/SecularSteve/gists{/gist_id}","starred_url":"https://api.github.com/users/SecularSteve/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/SecularSteve/subscriptions","organizations_url":"https://api.github.com/users/SecularSteve/orgs","repos_url":"https://api.github.com/users/SecularSteve/repos","events_url":"https://api.github.com/users/SecularSteve/events{/privacy}","received_events_url":"https://api.github.com/users/SecularSteve/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":4},{"login":"R0GGER","id":8298741,"node_id":"MDQ6VXNlcjgyOTg3NDE=","avatar_url":"https://avatars.githubusercontent.com/u/8298741?v=4","gravatar_id":"","url":"https://api.github.com/users/R0GGER","html_url":"https://github.com/R0GGER","followers_url":"https://api.github.com/users/R0GGER/followers","following_url":"https://api.github.com/users/R0GGER/following{/other_user}","gists_url":"https://api.github.com/users/R0GGER/gists{/gist_id}","starred_url":"https://api.github.com/users/R0GGER/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/R0GGER/subscriptions","organizations_url":"https://api.github.com/users/R0GGER/orgs","repos_url":"https://api.github.com/users/R0GGER/repos","events_url":"https://api.github.com/users/R0GGER/events{/privacy}","received_events_url":"https://api.github.com/users/R0GGER/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":3},{"login":"arcoast","id":81871508,"node_id":"MDQ6VXNlcjgxODcxNTA4","avatar_url":"https://avatars.githubusercontent.com/u/81871508?v=4","gravatar_id":"","url":"https://api.github.com/users/arcoast","html_url":"https://github.com/arcoast","followers_url":"https://api.github.com/users/arcoast/followers","following_url":"https://api.github.com/users/arcoast/following{/other_user}","gists_url":"https://api.github.com/users/arcoast/gists{/gist_id}","starred_url":"https://api.github.com/users/arcoast/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/arcoast/subscriptions","organizations_url":"https://api.github.com/users/arcoast/orgs","repos_url":"https://api.github.com/users/arcoast/repos","events_url":"https://api.github.com/users/arcoast/events{/privacy}","received_events_url":"https://api.github.com/users/arcoast/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":3},{"login":"maboroshin","id":41102508,"node_id":"MDQ6VXNlcjQxMTAyNTA4","avatar_url":"https://avatars.githubusercontent.com/u/41102508?v=4","gravatar_id":"","url":"https://api.github.com/users/maboroshin","html_url":"https://github.com/maboroshin","followers_url":"https://api.github.com/users/maboroshin/followers","following_url":"https://api.github.com/users/maboroshin/following{/other_user}","gists_url":"https://api.github.com/users/maboroshin/gists{/gist_id}","starred_url":"https://api.github.com/users/maboroshin/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/maboroshin/subscriptions","organizations_url":"https://api.github.com/users/maboroshin/orgs","repos_url":"https://api.github.com/users/maboroshin/repos","events_url":"https://api.github.com/users/maboroshin/events{/privacy}","received_events_url":"https://api.github.com/users/maboroshin/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":3},{"login":"lamarios","id":1192563,"node_id":"MDQ6VXNlcjExOTI1NjM=","avatar_url":"https://avatars.githubusercontent.com/u/1192563?v=4","gravatar_id":"","url":"https://api.github.com/users/lamarios","html_url":"https://github.com/lamarios","followers_url":"https://api.github.com/users/lamarios/followers","following_url":"https://api.github.com/users/lamarios/following{/other_user}","gists_url":"https://api.github.com/users/lamarios/gists{/gist_id}","starred_url":"https://api.github.com/users/lamarios/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lamarios/subscriptions","organizations_url":"https://api.github.com/users/lamarios/orgs","repos_url":"https://api.github.com/users/lamarios/repos","events_url":"https://api.github.com/users/lamarios/events{/privacy}","received_events_url":"https://api.github.com/users/lamarios/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":2},{"login":"bonswouar","id":615053,"node_id":"MDQ6VXNlcjYxNTA1Mw==","avatar_url":"https://avatars.githubusercontent.com/u/615053?v=4","gravatar_id":"","url":"https://api.github.com/users/bonswouar","html_url":"https://github.com/bonswouar","followers_url":"https://api.github.com/users/bonswouar/followers","following_url":"https://api.github.com/users/bonswouar/following{/other_user}","gists_url":"https://api.github.com/users/bonswouar/gists{/gist_id}","starred_url":"https://api.github.com/users/bonswouar/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/bonswouar/subscriptions","organizations_url":"https://api.github.com/users/bonswouar/orgs","repos_url":"https://api.github.com/users/bonswouar/repos","events_url":"https://api.github.com/users/bonswouar/events{/privacy}","received_events_url":"https://api.github.com/users/bonswouar/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":2},{"login":"yurtpage","id":155876573,"node_id":"U_kgDOCUp83Q","avatar_url":"https://avatars.githubusercontent.com/u/155876573?v=4","gravatar_id":"","url":"https://api.github.com/users/yurtpage","html_url":"https://github.com/yurtpage","followers_url":"https://api.github.com/users/yurtpage/followers","following_url":"https://api.github.com/users/yurtpage/following{/other_user}","gists_url":"https://api.github.com/users/yurtpage/gists{/gist_id}","starred_url":"https://api.github.com/users/yurtpage/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/yurtpage/subscriptions","organizations_url":"https://api.github.com/users/yurtpage/orgs","repos_url":"https://api.github.com/users/yurtpage/repos","events_url":"https://api.github.com/users/yurtpage/events{/privacy}","received_events_url":"https://api.github.com/users/yurtpage/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":2},{"login":"Vladik01-11","id":70571714,"node_id":"MDQ6VXNlcjcwNTcxNzE0","avatar_url":"https://avatars.githubusercontent.com/u/70571714?v=4","gravatar_id":"","url":"https://api.github.com/users/Vladik01-11","html_url":"https://github.com/Vladik01-11","followers_url":"https://api.github.com/users/Vladik01-11/followers","following_url":"https://api.github.com/users/Vladik01-11/following{/other_user}","gists_url":"https://api.github.com/users/Vladik01-11/gists{/gist_id}","starred_url":"https://api.github.com/users/Vladik01-11/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Vladik01-11/subscriptions","organizations_url":"https://api.github.com/users/Vladik01-11/orgs","repos_url":"https://api.github.com/users/Vladik01-11/repos","events_url":"https://api.github.com/users/Vladik01-11/events{/privacy}","received_events_url":"https://api.github.com/users/Vladik01-11/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":2},{"login":"Midou36O","id":45198486,"node_id":"MDQ6VXNlcjQ1MTk4NDg2","avatar_url":"https://avatars.githubusercontent.com/u/45198486?v=4","gravatar_id":"","url":"https://api.github.com/users/Midou36O","html_url":"https://github.com/Midou36O","followers_url":"https://api.github.com/users/Midou36O/followers","following_url":"https://api.github.com/users/Midou36O/following{/other_user}","gists_url":"https://api.github.com/users/Midou36O/gists{/gist_id}","starred_url":"https://api.github.com/users/Midou36O/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Midou36O/subscriptions","organizations_url":"https://api.github.com/users/Midou36O/orgs","repos_url":"https://api.github.com/users/Midou36O/repos","events_url":"https://api.github.com/users/Midou36O/events{/privacy}","received_events_url":"https://api.github.com/users/Midou36O/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":2},{"login":"Makhuta","id":23267923,"node_id":"MDQ6VXNlcjIzMjY3OTIz","avatar_url":"https://avatars.githubusercontent.com/u/23267923?v=4","gravatar_id":"","url":"https://api.github.com/users/Makhuta","html_url":"https://github.com/Makhuta","followers_url":"https://api.github.com/users/Makhuta/followers","following_url":"https://api.github.com/users/Makhuta/following{/other_user}","gists_url":"https://api.github.com/users/Makhuta/gists{/gist_id}","starred_url":"https://api.github.com/users/Makhuta/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Makhuta/subscriptions","organizations_url":"https://api.github.com/users/Makhuta/orgs","repos_url":"https://api.github.com/users/Makhuta/repos","events_url":"https://api.github.com/users/Makhuta/events{/privacy}","received_events_url":"https://api.github.com/users/Makhuta/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":2},{"login":"viraj-sh","id":214743952,"node_id":"U_kgDODMy7kA","avatar_url":"https://avatars.githubusercontent.com/u/214743952?v=4","gravatar_id":"","url":"https://api.github.com/users/viraj-sh","html_url":"https://github.com/viraj-sh","followers_url":"https://api.github.com/users/viraj-sh/followers","following_url":"https://api.github.com/users/viraj-sh/following{/other_user}","gists_url":"https://api.github.com/users/viraj-sh/gists{/gist_id}","starred_url":"https://api.github.com/users/viraj-sh/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/viraj-sh/subscriptions","organizations_url":"https://api.github.com/users/viraj-sh/orgs","repos_url":"https://api.github.com/users/viraj-sh/repos","events_url":"https://api.github.com/users/viraj-sh/events{/privacy}","received_events_url":"https://api.github.com/users/viraj-sh/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":1},{"login":"Sphet98","id":260131232,"node_id":"U_kgDOD4FJoA","avatar_url":"https://avatars.githubusercontent.com/u/260131232?v=4","gravatar_id":"","url":"https://api.github.com/users/Sphet98","html_url":"https://github.com/Sphet98","followers_url":"https://api.github.com/users/Sphet98/followers","following_url":"https://api.github.com/users/Sphet98/following{/other_user}","gists_url":"https://api.github.com/users/Sphet98/gists{/gist_id}","starred_url":"https://api.github.com/users/Sphet98/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Sphet98/subscriptions","organizations_url":"https://api.github.com/users/Sphet98/orgs","repos_url":"https://api.github.com/users/Sphet98/repos","events_url":"https://api.github.com/users/Sphet98/events{/privacy}","received_events_url":"https://api.github.com/users/Sphet98/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":1},{"login":"simplylu","id":55274241,"node_id":"MDQ6VXNlcjU1Mjc0MjQx","avatar_url":"https://avatars.githubusercontent.com/u/55274241?v=4","gravatar_id":"","url":"https://api.github.com/users/simplylu","html_url":"https://github.com/simplylu","followers_url":"https://api.github.com/users/simplylu/followers","following_url":"https://api.github.com/users/simplylu/following{/other_user}","gists_url":"https://api.github.com/users/simplylu/gists{/gist_id}","starred_url":"https://api.github.com/users/simplylu/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/simplylu/subscriptions","organizations_url":"https://api.github.com/users/simplylu/orgs","repos_url":"https://api.github.com/users/simplylu/repos","events_url":"https://api.github.com/users/simplylu/events{/privacy}","received_events_url":"https://api.github.com/users/simplylu/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":1},{"login":"ramazansancar","id":8878055,"node_id":"MDQ6VXNlcjg4NzgwNTU=","avatar_url":"https://avatars.githubusercontent.com/u/8878055?v=4","gravatar_id":"","url":"https://api.github.com/users/ramazansancar","html_url":"https://github.com/ramazansancar","followers_url":"https://api.github.com/users/ramazansancar/followers","following_url":"https://api.github.com/users/ramazansancar/following{/other_user}","gists_url":"https://api.github.com/users/ramazansancar/gists{/gist_id}","starred_url":"https://api.github.com/users/ramazansancar/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ramazansancar/subscriptions","organizations_url":"https://api.github.com/users/ramazansancar/orgs","repos_url":"https://api.github.com/users/ramazansancar/repos","events_url":"https://api.github.com/users/ramazansancar/events{/privacy}","received_events_url":"https://api.github.com/users/ramazansancar/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":1},{"login":"ptah-alexs","id":705210,"node_id":"MDQ6VXNlcjcwNTIxMA==","avatar_url":"https://avatars.githubusercontent.com/u/705210?v=4","gravatar_id":"","url":"https://api.github.com/users/ptah-alexs","html_url":"https://github.com/ptah-alexs","followers_url":"https://api.github.com/users/ptah-alexs/followers","following_url":"https://api.github.com/users/ptah-alexs/following{/other_user}","gists_url":"https://api.github.com/users/ptah-alexs/gists{/gist_id}","starred_url":"https://api.github.com/users/ptah-alexs/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ptah-alexs/subscriptions","organizations_url":"https://api.github.com/users/ptah-alexs/orgs","repos_url":"https://api.github.com/users/ptah-alexs/repos","events_url":"https://api.github.com/users/ptah-alexs/events{/privacy}","received_events_url":"https://api.github.com/users/ptah-alexs/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":1},{"login":"polarwood","id":199823813,"node_id":"U_kgDOC-kRxQ","avatar_url":"https://avatars.githubusercontent.com/u/199823813?v=4","gravatar_id":"","url":"https://api.github.com/users/polarwood","html_url":"https://github.com/polarwood","followers_url":"https://api.github.com/users/polarwood/followers","following_url":"https://api.github.com/users/polarwood/following{/other_user}","gists_url":"https://api.github.com/users/polarwood/gists{/gist_id}","starred_url":"https://api.github.com/users/polarwood/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/polarwood/subscriptions","organizations_url":"https://api.github.com/users/polarwood/orgs","repos_url":"https://api.github.com/users/polarwood/repos","events_url":"https://api.github.com/users/polarwood/events{/privacy}","received_events_url":"https://api.github.com/users/polarwood/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":1},{"login":"coolvitto","id":160416811,"node_id":"U_kgDOCY_EKw","avatar_url":"https://avatars.githubusercontent.com/u/160416811?v=4","gravatar_id":"","url":"https://api.github.com/users/coolvitto","html_url":"https://github.com/coolvitto","followers_url":"https://api.github.com/users/coolvitto/followers","following_url":"https://api.github.com/users/coolvitto/following{/other_user}","gists_url":"https://api.github.com/users/coolvitto/gists{/gist_id}","starred_url":"https://api.github.com/users/coolvitto/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/coolvitto/subscriptions","organizations_url":"https://api.github.com/users/coolvitto/orgs","repos_url":"https://api.github.com/users/coolvitto/repos","events_url":"https://api.github.com/users/coolvitto/events{/privacy}","received_events_url":"https://api.github.com/users/coolvitto/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":1},{"login":"beboprocky","id":110792083,"node_id":"U_kgDOBpqNkw","avatar_url":"https://avatars.githubusercontent.com/u/110792083?v=4","gravatar_id":"","url":"https://api.github.com/users/beboprocky","html_url":"https://github.com/beboprocky","followers_url":"https://api.github.com/users/beboprocky/followers","following_url":"https://api.github.com/users/beboprocky/following{/other_user}","gists_url":"https://api.github.com/users/beboprocky/gists{/gist_id}","starred_url":"https://api.github.com/users/beboprocky/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/beboprocky/subscriptions","organizations_url":"https://api.github.com/users/beboprocky/orgs","repos_url":"https://api.github.com/users/beboprocky/repos","events_url":"https://api.github.com/users/beboprocky/events{/privacy}","received_events_url":"https://api.github.com/users/beboprocky/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":1},{"login":"Poussinou","id":19646549,"node_id":"MDQ6VXNlcjE5NjQ2NTQ5","avatar_url":"https://avatars.githubusercontent.com/u/19646549?v=4","gravatar_id":"","url":"https://api.github.com/users/Poussinou","html_url":"https://github.com/Poussinou","followers_url":"https://api.github.com/users/Poussinou/followers","following_url":"https://api.github.com/users/Poussinou/following{/other_user}","gists_url":"https://api.github.com/users/Poussinou/gists{/gist_id}","starred_url":"https://api.github.com/users/Poussinou/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Poussinou/subscriptions","organizations_url":"https://api.github.com/users/Poussinou/orgs","repos_url":"https://api.github.com/users/Poussinou/repos","events_url":"https://api.github.com/users/Poussinou/events{/privacy}","received_events_url":"https://api.github.com/users/Poussinou/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":1}] \ No newline at end of file +[{"login":"WardPearce","id":27844174,"node_id":"MDQ6VXNlcjI3ODQ0MTc0","avatar_url":"https://avatars.githubusercontent.com/u/27844174?v=4","gravatar_id":"","url":"https://api.github.com/users/WardPearce","html_url":"https://github.com/WardPearce","followers_url":"https://api.github.com/users/WardPearce/followers","following_url":"https://api.github.com/users/WardPearce/following{/other_user}","gists_url":"https://api.github.com/users/WardPearce/gists{/gist_id}","starred_url":"https://api.github.com/users/WardPearce/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/WardPearce/subscriptions","organizations_url":"https://api.github.com/users/WardPearce/orgs","repos_url":"https://api.github.com/users/WardPearce/repos","events_url":"https://api.github.com/users/WardPearce/events{/privacy}","received_events_url":"https://api.github.com/users/WardPearce/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":2161},{"login":"dependabot[bot]","id":49699333,"node_id":"MDM6Qm90NDk2OTkzMzM=","avatar_url":"https://avatars.githubusercontent.com/in/29110?v=4","gravatar_id":"","url":"https://api.github.com/users/dependabot%5Bbot%5D","html_url":"https://github.com/apps/dependabot","followers_url":"https://api.github.com/users/dependabot%5Bbot%5D/followers","following_url":"https://api.github.com/users/dependabot%5Bbot%5D/following{/other_user}","gists_url":"https://api.github.com/users/dependabot%5Bbot%5D/gists{/gist_id}","starred_url":"https://api.github.com/users/dependabot%5Bbot%5D/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dependabot%5Bbot%5D/subscriptions","organizations_url":"https://api.github.com/users/dependabot%5Bbot%5D/orgs","repos_url":"https://api.github.com/users/dependabot%5Bbot%5D/repos","events_url":"https://api.github.com/users/dependabot%5Bbot%5D/events{/privacy}","received_events_url":"https://api.github.com/users/dependabot%5Bbot%5D/received_events","type":"Bot","user_view_type":"public","site_admin":false,"contributions":230},{"login":"Lezurex","id":48829956,"node_id":"MDQ6VXNlcjQ4ODI5OTU2","avatar_url":"https://avatars.githubusercontent.com/u/48829956?v=4","gravatar_id":"","url":"https://api.github.com/users/Lezurex","html_url":"https://github.com/Lezurex","followers_url":"https://api.github.com/users/Lezurex/followers","following_url":"https://api.github.com/users/Lezurex/following{/other_user}","gists_url":"https://api.github.com/users/Lezurex/gists{/gist_id}","starred_url":"https://api.github.com/users/Lezurex/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Lezurex/subscriptions","organizations_url":"https://api.github.com/users/Lezurex/orgs","repos_url":"https://api.github.com/users/Lezurex/repos","events_url":"https://api.github.com/users/Lezurex/events{/privacy}","received_events_url":"https://api.github.com/users/Lezurex/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":39},{"login":"Coool","id":8421903,"node_id":"MDQ6VXNlcjg0MjE5MDM=","avatar_url":"https://avatars.githubusercontent.com/u/8421903?v=4","gravatar_id":"","url":"https://api.github.com/users/Coool","html_url":"https://github.com/Coool","followers_url":"https://api.github.com/users/Coool/followers","following_url":"https://api.github.com/users/Coool/following{/other_user}","gists_url":"https://api.github.com/users/Coool/gists{/gist_id}","starred_url":"https://api.github.com/users/Coool/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Coool/subscriptions","organizations_url":"https://api.github.com/users/Coool/orgs","repos_url":"https://api.github.com/users/Coool/repos","events_url":"https://api.github.com/users/Coool/events{/privacy}","received_events_url":"https://api.github.com/users/Coool/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":15},{"login":"araujosemacento","id":60983392,"node_id":"MDQ6VXNlcjYwOTgzMzky","avatar_url":"https://avatars.githubusercontent.com/u/60983392?v=4","gravatar_id":"","url":"https://api.github.com/users/araujosemacento","html_url":"https://github.com/araujosemacento","followers_url":"https://api.github.com/users/araujosemacento/followers","following_url":"https://api.github.com/users/araujosemacento/following{/other_user}","gists_url":"https://api.github.com/users/araujosemacento/gists{/gist_id}","starred_url":"https://api.github.com/users/araujosemacento/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/araujosemacento/subscriptions","organizations_url":"https://api.github.com/users/araujosemacento/orgs","repos_url":"https://api.github.com/users/araujosemacento/repos","events_url":"https://api.github.com/users/araujosemacento/events{/privacy}","received_events_url":"https://api.github.com/users/araujosemacento/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":14},{"login":"ghostofsparta222","id":251893418,"node_id":"U_kgDODwOWqg","avatar_url":"https://avatars.githubusercontent.com/u/251893418?v=4","gravatar_id":"","url":"https://api.github.com/users/ghostofsparta222","html_url":"https://github.com/ghostofsparta222","followers_url":"https://api.github.com/users/ghostofsparta222/followers","following_url":"https://api.github.com/users/ghostofsparta222/following{/other_user}","gists_url":"https://api.github.com/users/ghostofsparta222/gists{/gist_id}","starred_url":"https://api.github.com/users/ghostofsparta222/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ghostofsparta222/subscriptions","organizations_url":"https://api.github.com/users/ghostofsparta222/orgs","repos_url":"https://api.github.com/users/ghostofsparta222/repos","events_url":"https://api.github.com/users/ghostofsparta222/events{/privacy}","received_events_url":"https://api.github.com/users/ghostofsparta222/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":13},{"login":"toolatebot","id":169580663,"node_id":"U_kgDOChuYdw","avatar_url":"https://avatars.githubusercontent.com/u/169580663?v=4","gravatar_id":"","url":"https://api.github.com/users/toolatebot","html_url":"https://github.com/toolatebot","followers_url":"https://api.github.com/users/toolatebot/followers","following_url":"https://api.github.com/users/toolatebot/following{/other_user}","gists_url":"https://api.github.com/users/toolatebot/gists{/gist_id}","starred_url":"https://api.github.com/users/toolatebot/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/toolatebot/subscriptions","organizations_url":"https://api.github.com/users/toolatebot/orgs","repos_url":"https://api.github.com/users/toolatebot/repos","events_url":"https://api.github.com/users/toolatebot/events{/privacy}","received_events_url":"https://api.github.com/users/toolatebot/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":9},{"login":"Precific","id":30053082,"node_id":"MDQ6VXNlcjMwMDUzMDgy","avatar_url":"https://avatars.githubusercontent.com/u/30053082?v=4","gravatar_id":"","url":"https://api.github.com/users/Precific","html_url":"https://github.com/Precific","followers_url":"https://api.github.com/users/Precific/followers","following_url":"https://api.github.com/users/Precific/following{/other_user}","gists_url":"https://api.github.com/users/Precific/gists{/gist_id}","starred_url":"https://api.github.com/users/Precific/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Precific/subscriptions","organizations_url":"https://api.github.com/users/Precific/orgs","repos_url":"https://api.github.com/users/Precific/repos","events_url":"https://api.github.com/users/Precific/events{/privacy}","received_events_url":"https://api.github.com/users/Precific/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":9},{"login":"yzqzss","id":30341059,"node_id":"MDQ6VXNlcjMwMzQxMDU5","avatar_url":"https://avatars.githubusercontent.com/u/30341059?v=4","gravatar_id":"","url":"https://api.github.com/users/yzqzss","html_url":"https://github.com/yzqzss","followers_url":"https://api.github.com/users/yzqzss/followers","following_url":"https://api.github.com/users/yzqzss/following{/other_user}","gists_url":"https://api.github.com/users/yzqzss/gists{/gist_id}","starred_url":"https://api.github.com/users/yzqzss/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/yzqzss/subscriptions","organizations_url":"https://api.github.com/users/yzqzss/orgs","repos_url":"https://api.github.com/users/yzqzss/repos","events_url":"https://api.github.com/users/yzqzss/events{/privacy}","received_events_url":"https://api.github.com/users/yzqzss/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":4},{"login":"thejenja","id":65224669,"node_id":"MDQ6VXNlcjY1MjI0NjY5","avatar_url":"https://avatars.githubusercontent.com/u/65224669?v=4","gravatar_id":"","url":"https://api.github.com/users/thejenja","html_url":"https://github.com/thejenja","followers_url":"https://api.github.com/users/thejenja/followers","following_url":"https://api.github.com/users/thejenja/following{/other_user}","gists_url":"https://api.github.com/users/thejenja/gists{/gist_id}","starred_url":"https://api.github.com/users/thejenja/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/thejenja/subscriptions","organizations_url":"https://api.github.com/users/thejenja/orgs","repos_url":"https://api.github.com/users/thejenja/repos","events_url":"https://api.github.com/users/thejenja/events{/privacy}","received_events_url":"https://api.github.com/users/thejenja/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":4},{"login":"cookiennn","id":114363954,"node_id":"U_kgDOBtEOMg","avatar_url":"https://avatars.githubusercontent.com/u/114363954?v=4","gravatar_id":"","url":"https://api.github.com/users/cookiennn","html_url":"https://github.com/cookiennn","followers_url":"https://api.github.com/users/cookiennn/followers","following_url":"https://api.github.com/users/cookiennn/following{/other_user}","gists_url":"https://api.github.com/users/cookiennn/gists{/gist_id}","starred_url":"https://api.github.com/users/cookiennn/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cookiennn/subscriptions","organizations_url":"https://api.github.com/users/cookiennn/orgs","repos_url":"https://api.github.com/users/cookiennn/repos","events_url":"https://api.github.com/users/cookiennn/events{/privacy}","received_events_url":"https://api.github.com/users/cookiennn/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":4},{"login":"SecularSteve","id":33793273,"node_id":"MDQ6VXNlcjMzNzkzMjcz","avatar_url":"https://avatars.githubusercontent.com/u/33793273?v=4","gravatar_id":"","url":"https://api.github.com/users/SecularSteve","html_url":"https://github.com/SecularSteve","followers_url":"https://api.github.com/users/SecularSteve/followers","following_url":"https://api.github.com/users/SecularSteve/following{/other_user}","gists_url":"https://api.github.com/users/SecularSteve/gists{/gist_id}","starred_url":"https://api.github.com/users/SecularSteve/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/SecularSteve/subscriptions","organizations_url":"https://api.github.com/users/SecularSteve/orgs","repos_url":"https://api.github.com/users/SecularSteve/repos","events_url":"https://api.github.com/users/SecularSteve/events{/privacy}","received_events_url":"https://api.github.com/users/SecularSteve/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":4},{"login":"R0GGER","id":8298741,"node_id":"MDQ6VXNlcjgyOTg3NDE=","avatar_url":"https://avatars.githubusercontent.com/u/8298741?v=4","gravatar_id":"","url":"https://api.github.com/users/R0GGER","html_url":"https://github.com/R0GGER","followers_url":"https://api.github.com/users/R0GGER/followers","following_url":"https://api.github.com/users/R0GGER/following{/other_user}","gists_url":"https://api.github.com/users/R0GGER/gists{/gist_id}","starred_url":"https://api.github.com/users/R0GGER/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/R0GGER/subscriptions","organizations_url":"https://api.github.com/users/R0GGER/orgs","repos_url":"https://api.github.com/users/R0GGER/repos","events_url":"https://api.github.com/users/R0GGER/events{/privacy}","received_events_url":"https://api.github.com/users/R0GGER/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":3},{"login":"arcoast","id":81871508,"node_id":"MDQ6VXNlcjgxODcxNTA4","avatar_url":"https://avatars.githubusercontent.com/u/81871508?v=4","gravatar_id":"","url":"https://api.github.com/users/arcoast","html_url":"https://github.com/arcoast","followers_url":"https://api.github.com/users/arcoast/followers","following_url":"https://api.github.com/users/arcoast/following{/other_user}","gists_url":"https://api.github.com/users/arcoast/gists{/gist_id}","starred_url":"https://api.github.com/users/arcoast/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/arcoast/subscriptions","organizations_url":"https://api.github.com/users/arcoast/orgs","repos_url":"https://api.github.com/users/arcoast/repos","events_url":"https://api.github.com/users/arcoast/events{/privacy}","received_events_url":"https://api.github.com/users/arcoast/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":3},{"login":"maboroshin","id":41102508,"node_id":"MDQ6VXNlcjQxMTAyNTA4","avatar_url":"https://avatars.githubusercontent.com/u/41102508?v=4","gravatar_id":"","url":"https://api.github.com/users/maboroshin","html_url":"https://github.com/maboroshin","followers_url":"https://api.github.com/users/maboroshin/followers","following_url":"https://api.github.com/users/maboroshin/following{/other_user}","gists_url":"https://api.github.com/users/maboroshin/gists{/gist_id}","starred_url":"https://api.github.com/users/maboroshin/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/maboroshin/subscriptions","organizations_url":"https://api.github.com/users/maboroshin/orgs","repos_url":"https://api.github.com/users/maboroshin/repos","events_url":"https://api.github.com/users/maboroshin/events{/privacy}","received_events_url":"https://api.github.com/users/maboroshin/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":3},{"login":"lamarios","id":1192563,"node_id":"MDQ6VXNlcjExOTI1NjM=","avatar_url":"https://avatars.githubusercontent.com/u/1192563?v=4","gravatar_id":"","url":"https://api.github.com/users/lamarios","html_url":"https://github.com/lamarios","followers_url":"https://api.github.com/users/lamarios/followers","following_url":"https://api.github.com/users/lamarios/following{/other_user}","gists_url":"https://api.github.com/users/lamarios/gists{/gist_id}","starred_url":"https://api.github.com/users/lamarios/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/lamarios/subscriptions","organizations_url":"https://api.github.com/users/lamarios/orgs","repos_url":"https://api.github.com/users/lamarios/repos","events_url":"https://api.github.com/users/lamarios/events{/privacy}","received_events_url":"https://api.github.com/users/lamarios/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":2},{"login":"bonswouar","id":615053,"node_id":"MDQ6VXNlcjYxNTA1Mw==","avatar_url":"https://avatars.githubusercontent.com/u/615053?v=4","gravatar_id":"","url":"https://api.github.com/users/bonswouar","html_url":"https://github.com/bonswouar","followers_url":"https://api.github.com/users/bonswouar/followers","following_url":"https://api.github.com/users/bonswouar/following{/other_user}","gists_url":"https://api.github.com/users/bonswouar/gists{/gist_id}","starred_url":"https://api.github.com/users/bonswouar/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/bonswouar/subscriptions","organizations_url":"https://api.github.com/users/bonswouar/orgs","repos_url":"https://api.github.com/users/bonswouar/repos","events_url":"https://api.github.com/users/bonswouar/events{/privacy}","received_events_url":"https://api.github.com/users/bonswouar/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":2},{"login":"yurtpage","id":155876573,"node_id":"U_kgDOCUp83Q","avatar_url":"https://avatars.githubusercontent.com/u/155876573?v=4","gravatar_id":"","url":"https://api.github.com/users/yurtpage","html_url":"https://github.com/yurtpage","followers_url":"https://api.github.com/users/yurtpage/followers","following_url":"https://api.github.com/users/yurtpage/following{/other_user}","gists_url":"https://api.github.com/users/yurtpage/gists{/gist_id}","starred_url":"https://api.github.com/users/yurtpage/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/yurtpage/subscriptions","organizations_url":"https://api.github.com/users/yurtpage/orgs","repos_url":"https://api.github.com/users/yurtpage/repos","events_url":"https://api.github.com/users/yurtpage/events{/privacy}","received_events_url":"https://api.github.com/users/yurtpage/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":2},{"login":"Vladik01-11","id":70571714,"node_id":"MDQ6VXNlcjcwNTcxNzE0","avatar_url":"https://avatars.githubusercontent.com/u/70571714?v=4","gravatar_id":"","url":"https://api.github.com/users/Vladik01-11","html_url":"https://github.com/Vladik01-11","followers_url":"https://api.github.com/users/Vladik01-11/followers","following_url":"https://api.github.com/users/Vladik01-11/following{/other_user}","gists_url":"https://api.github.com/users/Vladik01-11/gists{/gist_id}","starred_url":"https://api.github.com/users/Vladik01-11/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Vladik01-11/subscriptions","organizations_url":"https://api.github.com/users/Vladik01-11/orgs","repos_url":"https://api.github.com/users/Vladik01-11/repos","events_url":"https://api.github.com/users/Vladik01-11/events{/privacy}","received_events_url":"https://api.github.com/users/Vladik01-11/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":2},{"login":"Midou36O","id":45198486,"node_id":"MDQ6VXNlcjQ1MTk4NDg2","avatar_url":"https://avatars.githubusercontent.com/u/45198486?v=4","gravatar_id":"","url":"https://api.github.com/users/Midou36O","html_url":"https://github.com/Midou36O","followers_url":"https://api.github.com/users/Midou36O/followers","following_url":"https://api.github.com/users/Midou36O/following{/other_user}","gists_url":"https://api.github.com/users/Midou36O/gists{/gist_id}","starred_url":"https://api.github.com/users/Midou36O/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Midou36O/subscriptions","organizations_url":"https://api.github.com/users/Midou36O/orgs","repos_url":"https://api.github.com/users/Midou36O/repos","events_url":"https://api.github.com/users/Midou36O/events{/privacy}","received_events_url":"https://api.github.com/users/Midou36O/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":2},{"login":"Makhuta","id":23267923,"node_id":"MDQ6VXNlcjIzMjY3OTIz","avatar_url":"https://avatars.githubusercontent.com/u/23267923?v=4","gravatar_id":"","url":"https://api.github.com/users/Makhuta","html_url":"https://github.com/Makhuta","followers_url":"https://api.github.com/users/Makhuta/followers","following_url":"https://api.github.com/users/Makhuta/following{/other_user}","gists_url":"https://api.github.com/users/Makhuta/gists{/gist_id}","starred_url":"https://api.github.com/users/Makhuta/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Makhuta/subscriptions","organizations_url":"https://api.github.com/users/Makhuta/orgs","repos_url":"https://api.github.com/users/Makhuta/repos","events_url":"https://api.github.com/users/Makhuta/events{/privacy}","received_events_url":"https://api.github.com/users/Makhuta/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":2},{"login":"viraj-sh","id":214743952,"node_id":"U_kgDODMy7kA","avatar_url":"https://avatars.githubusercontent.com/u/214743952?v=4","gravatar_id":"","url":"https://api.github.com/users/viraj-sh","html_url":"https://github.com/viraj-sh","followers_url":"https://api.github.com/users/viraj-sh/followers","following_url":"https://api.github.com/users/viraj-sh/following{/other_user}","gists_url":"https://api.github.com/users/viraj-sh/gists{/gist_id}","starred_url":"https://api.github.com/users/viraj-sh/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/viraj-sh/subscriptions","organizations_url":"https://api.github.com/users/viraj-sh/orgs","repos_url":"https://api.github.com/users/viraj-sh/repos","events_url":"https://api.github.com/users/viraj-sh/events{/privacy}","received_events_url":"https://api.github.com/users/viraj-sh/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":1},{"login":"Sphet98","id":260131232,"node_id":"U_kgDOD4FJoA","avatar_url":"https://avatars.githubusercontent.com/u/260131232?v=4","gravatar_id":"","url":"https://api.github.com/users/Sphet98","html_url":"https://github.com/Sphet98","followers_url":"https://api.github.com/users/Sphet98/followers","following_url":"https://api.github.com/users/Sphet98/following{/other_user}","gists_url":"https://api.github.com/users/Sphet98/gists{/gist_id}","starred_url":"https://api.github.com/users/Sphet98/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Sphet98/subscriptions","organizations_url":"https://api.github.com/users/Sphet98/orgs","repos_url":"https://api.github.com/users/Sphet98/repos","events_url":"https://api.github.com/users/Sphet98/events{/privacy}","received_events_url":"https://api.github.com/users/Sphet98/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":1},{"login":"simplylu","id":55274241,"node_id":"MDQ6VXNlcjU1Mjc0MjQx","avatar_url":"https://avatars.githubusercontent.com/u/55274241?v=4","gravatar_id":"","url":"https://api.github.com/users/simplylu","html_url":"https://github.com/simplylu","followers_url":"https://api.github.com/users/simplylu/followers","following_url":"https://api.github.com/users/simplylu/following{/other_user}","gists_url":"https://api.github.com/users/simplylu/gists{/gist_id}","starred_url":"https://api.github.com/users/simplylu/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/simplylu/subscriptions","organizations_url":"https://api.github.com/users/simplylu/orgs","repos_url":"https://api.github.com/users/simplylu/repos","events_url":"https://api.github.com/users/simplylu/events{/privacy}","received_events_url":"https://api.github.com/users/simplylu/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":1},{"login":"ramazansancar","id":8878055,"node_id":"MDQ6VXNlcjg4NzgwNTU=","avatar_url":"https://avatars.githubusercontent.com/u/8878055?v=4","gravatar_id":"","url":"https://api.github.com/users/ramazansancar","html_url":"https://github.com/ramazansancar","followers_url":"https://api.github.com/users/ramazansancar/followers","following_url":"https://api.github.com/users/ramazansancar/following{/other_user}","gists_url":"https://api.github.com/users/ramazansancar/gists{/gist_id}","starred_url":"https://api.github.com/users/ramazansancar/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ramazansancar/subscriptions","organizations_url":"https://api.github.com/users/ramazansancar/orgs","repos_url":"https://api.github.com/users/ramazansancar/repos","events_url":"https://api.github.com/users/ramazansancar/events{/privacy}","received_events_url":"https://api.github.com/users/ramazansancar/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":1},{"login":"ptah-alexs","id":705210,"node_id":"MDQ6VXNlcjcwNTIxMA==","avatar_url":"https://avatars.githubusercontent.com/u/705210?v=4","gravatar_id":"","url":"https://api.github.com/users/ptah-alexs","html_url":"https://github.com/ptah-alexs","followers_url":"https://api.github.com/users/ptah-alexs/followers","following_url":"https://api.github.com/users/ptah-alexs/following{/other_user}","gists_url":"https://api.github.com/users/ptah-alexs/gists{/gist_id}","starred_url":"https://api.github.com/users/ptah-alexs/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ptah-alexs/subscriptions","organizations_url":"https://api.github.com/users/ptah-alexs/orgs","repos_url":"https://api.github.com/users/ptah-alexs/repos","events_url":"https://api.github.com/users/ptah-alexs/events{/privacy}","received_events_url":"https://api.github.com/users/ptah-alexs/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":1},{"login":"polarwood","id":199823813,"node_id":"U_kgDOC-kRxQ","avatar_url":"https://avatars.githubusercontent.com/u/199823813?v=4","gravatar_id":"","url":"https://api.github.com/users/polarwood","html_url":"https://github.com/polarwood","followers_url":"https://api.github.com/users/polarwood/followers","following_url":"https://api.github.com/users/polarwood/following{/other_user}","gists_url":"https://api.github.com/users/polarwood/gists{/gist_id}","starred_url":"https://api.github.com/users/polarwood/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/polarwood/subscriptions","organizations_url":"https://api.github.com/users/polarwood/orgs","repos_url":"https://api.github.com/users/polarwood/repos","events_url":"https://api.github.com/users/polarwood/events{/privacy}","received_events_url":"https://api.github.com/users/polarwood/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":1},{"login":"coolvitto","id":160416811,"node_id":"U_kgDOCY_EKw","avatar_url":"https://avatars.githubusercontent.com/u/160416811?v=4","gravatar_id":"","url":"https://api.github.com/users/coolvitto","html_url":"https://github.com/coolvitto","followers_url":"https://api.github.com/users/coolvitto/followers","following_url":"https://api.github.com/users/coolvitto/following{/other_user}","gists_url":"https://api.github.com/users/coolvitto/gists{/gist_id}","starred_url":"https://api.github.com/users/coolvitto/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/coolvitto/subscriptions","organizations_url":"https://api.github.com/users/coolvitto/orgs","repos_url":"https://api.github.com/users/coolvitto/repos","events_url":"https://api.github.com/users/coolvitto/events{/privacy}","received_events_url":"https://api.github.com/users/coolvitto/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":1},{"login":"beboprocky","id":110792083,"node_id":"U_kgDOBpqNkw","avatar_url":"https://avatars.githubusercontent.com/u/110792083?v=4","gravatar_id":"","url":"https://api.github.com/users/beboprocky","html_url":"https://github.com/beboprocky","followers_url":"https://api.github.com/users/beboprocky/followers","following_url":"https://api.github.com/users/beboprocky/following{/other_user}","gists_url":"https://api.github.com/users/beboprocky/gists{/gist_id}","starred_url":"https://api.github.com/users/beboprocky/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/beboprocky/subscriptions","organizations_url":"https://api.github.com/users/beboprocky/orgs","repos_url":"https://api.github.com/users/beboprocky/repos","events_url":"https://api.github.com/users/beboprocky/events{/privacy}","received_events_url":"https://api.github.com/users/beboprocky/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":1},{"login":"Poussinou","id":19646549,"node_id":"MDQ6VXNlcjE5NjQ2NTQ5","avatar_url":"https://avatars.githubusercontent.com/u/19646549?v=4","gravatar_id":"","url":"https://api.github.com/users/Poussinou","html_url":"https://github.com/Poussinou","followers_url":"https://api.github.com/users/Poussinou/followers","following_url":"https://api.github.com/users/Poussinou/following{/other_user}","gists_url":"https://api.github.com/users/Poussinou/gists{/gist_id}","starred_url":"https://api.github.com/users/Poussinou/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Poussinou/subscriptions","organizations_url":"https://api.github.com/users/Poussinou/orgs","repos_url":"https://api.github.com/users/Poussinou/repos","events_url":"https://api.github.com/users/Poussinou/events{/privacy}","received_events_url":"https://api.github.com/users/Poussinou/received_events","type":"User","user_view_type":"public","site_admin":false,"contributions":1}] \ No newline at end of file diff --git a/update_versions.py b/update_versions.py index 551eb373..85380a7f 100644 --- a/update_versions.py +++ b/update_versions.py @@ -3,7 +3,7 @@ import os import re from datetime import datetime -LATEST_VERSION = "1.16.5" +LATEST_VERSION = "1.16.6" RELEASE_DATE = datetime.now().strftime("%Y-%-m-%d") # Format: YYYY-M-D WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious")