diff --git a/.gitignore b/.gitignore index 01396a4..e95f42a 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ source/.env.production # other .minpluto/docker/supabase/.env +.minpluto/docker/supabase/.env diff --git a/.minpluto/docs/TODO.md b/.minpluto/docs/TODO.md index ed1b671..e6d01b9 100644 --- a/.minpluto/docs/TODO.md +++ b/.minpluto/docs/TODO.md @@ -1,13 +1,12 @@ ## To Do - [ ] i18n - - [ ] Drop i18next library for Paraglide - - [x] ~~API~~ - - [ ] ~~Languages~~ - - [x] ~~English~~ - - [x] ~~Japanese~~ - - [ ] ~~French~~ - - [ ] ~~Spanish~~ - - [x] ~~Russian~~ + - [x] API + - [ ] Languages + - [x] English + - [ ] Japanese + - [ ] French + - [ ] Spanish + - [ ] Russian - [x] Data - [x] Track Events (Users should be opted-out by default, OpenPanel will be used) - [x] Make privacy policy adaptive diff --git a/source/astro.mjs b/source/astro.mjs index f70d30c..31440e7 100755 --- a/source/astro.mjs +++ b/source/astro.mjs @@ -31,7 +31,7 @@ export default defineConfig({ // Vite vite: { server: { - hmr: false // Auto Reload + hmr: true // Auto Reload } }, // Others diff --git a/source/src/layouts/Settings.astro b/source/src/layouts/Settings.astro index a019643..8934063 100755 --- a/source/src/layouts/Settings.astro +++ b/source/src/layouts/Settings.astro @@ -61,7 +61,7 @@ import { CodeBrackets, EditPencil, EvPlugXmark, FloppyDisk, HelpCircle, InfoCirc } .settings-sidebar { background: #161616; - width: 180px; + width: 224px; color: white; display: flex; flex-direction: column; diff --git a/source/src/pages/discover.astro b/source/src/pages/discover.astro index 9de7d44..c7ad92c 100755 --- a/source/src/pages/discover.astro +++ b/source/src/pages/discover.astro @@ -27,7 +27,6 @@ if (Astro.url.href.includes('?platform=youtube')) { var YouTubeCategory = DEFAULT_MEDIA_DATA_PROXY + '/api/v1/trending?type=' + SearchQuery var YouTubeFetch = await fetch(YouTubeCategory) var YouTubeData = await YouTubeFetch.json() - console.log(YouTubeCategory) } else if (Astro.url.href.includes('?platform=twitch')) { var PlatformTwitch = true diff --git a/source/src/pages/index.astro b/source/src/pages/index.astro index 94843af..b743c35 100755 --- a/source/src/pages/index.astro +++ b/source/src/pages/index.astro @@ -43,33 +43,29 @@ const TwitchDiscoverData = await TwitchDiscoverFetch.json() --- -
- - -
-
+
{TrendingSplit.map((data) => - +
-

{t("SIDEBAR.CATEGORY_LIST.TRENDING")}

+

{t("SIDEBAR.CATEGORY_LIST.POPULAR")}

 )} {MoviesSplit.map((data) => - +
-

{t("SIDEBAR.CATEGORY_LIST.MOVIES")}

+

{t("SIDEBAR.CATEGORY_LIST.TRAILERS")}

 )} {MusicSplit.map((data) => - +

{t("SIDEBAR.CATEGORY_LIST.MUSIC")}

@@ -78,7 +74,7 @@ const TwitchDiscoverData = await TwitchDiscoverFetch.json() )} {GamingSplit.map((data) => - +

{t("SIDEBAR.CATEGORY_LIST.GAMES")}

@@ -86,22 +82,23 @@ const TwitchDiscoverData = await TwitchDiscoverFetch.json() )}
-
-
+
+
{TwitchDiscoverData.data.map((data) => - +

{data.displayName}

 )}
+
- \ No newline at end of file diff --git a/source/src/pages/privacy.mdx b/source/src/pages/privacy.mdx index 8558c68..9dc469c 100755 --- a/source/src/pages/privacy.mdx +++ b/source/src/pages/privacy.mdx @@ -10,9 +10,9 @@ import PrivacyPolicyAnalytics from '@components/text/PrivacyPolicyAnalytics.astr import PrivacyPolicyCloudflare from '@components/text/PrivacyPolicyCloudflare.astro' import OptButtons from '@components/buttons/Telemtry.astro' -# Privacy Policy +## Privacy Policy -## 3rd Party Services are Proxied +### 3rd Party Services are Proxied Any service in MinPluto that is 3rd party is proxied by this instance or another instance such as images, videos, fonts, scripts, and more. No personal information information is collected and no information is sent to any 3rd party. @@ -20,10 +20,10 @@ Any service in MinPluto that is 3rd party is proxied by this instance or another -## We Don't Know What You're Watching +### We Don't Know What You're Watching When you watch a video on a MinPluto instance with analytics enabled, the analytics software doesn't show what video are you watching. The query in the URL, which is the video ID, is not saved to analytics. What we see is only "/watch", not "/watch?=dQw4w9WgXcQ". This goes for anything else that may have a query in it. -## Telemtry +### Telemtry Telemtry data is used in MinPluto to see metrics of usage on different features and other aspects. This is help SudoVanilla, the developer of MinPluto, make better and informed decisions on what needs priority. By default, all users are opted-out for privacy purposes. @@ -56,7 +56,7 @@ It is expected by the MinPluto developer that all telemtry data is sent to SudoV
-## Liability +### Liability MinPluto and SudoVanilla take no responsibility for the use of our tool, or external instances provided by third parties. It is strongly recommended that you abide by the valid official regulations in your country. Furthermore, we refuse liability for any inappropriate use of MinPluto, such as illegal downloading. MinPluto is licenced under AGPL v3, this software is included with a copy. @@ -80,11 +80,11 @@ along with this program. If not, see https://www.gnu.org/licenses/. ```
-## Links to Other Sites +### Links to Other Sites Channels and videos on MinPluto may contain links to other sites. If you click on a third-party link, you will be directed to that site. Note that these external sites are not operated by SudoVanilla, MinPluto, or the MinPluto instance. Therefore, I strongly advise you to review the privacy policy of these websites. I have no control over and assume no responsibility for the content, privacy policies, or practices of any third-party sites or services. -## Changes to This Privacy Policy +### Changes to This Privacy Policy The developers of MinPluto, SudoVanilla, may update our privacy policy from time to time. Thus, you are advised to review this page periodically for any changes. I will notify you of any changes by posting the new privacy policy on this page. @@ -92,6 +92,6 @@ This also goes for the instance itself. This policy is effective as of March 7th, 2024. -## Contact Us +### Contact Us If you have any questions or suggestions about MinPluto's privacy policy, do not hesitate to contact me at hello@minpluto.org or to [submit an issue](https://ark.sudovanilla.org/MinPluto/MinPluto/issues). \ No newline at end of file diff --git a/source/src/pages/search.astro b/source/src/pages/search.astro index 88b6416..80d4644 100755 --- a/source/src/pages/search.astro +++ b/source/src/pages/search.astro @@ -18,8 +18,6 @@ import { Group, Movie, Play, PlaylistPlay, ReportColumns, VideoCamera } from "@i const SearchQueryWithParameters = Astro.url.href.split("&?").shift() const SearchQuery = SearchQueryWithParameters.split("search?query=").pop() -console.log(SearchQuery) - // Check Filters if (Astro.url.href.includes('?type=channel')) { var ShowChannels = true diff --git a/source/src/pages/telemtry.mdx b/source/src/pages/telemtry.mdx index 00be967..d190776 100755 --- a/source/src/pages/telemtry.mdx +++ b/source/src/pages/telemtry.mdx @@ -1,5 +1,5 @@ --- -layout: '@layouts/Markdown.astro' +layout: '@layouts/Settings.astro' --- import OptButtons from '@components/buttons/Telemtry.astro' diff --git a/source/src/pages/watch.astro b/source/src/pages/watch.astro index 5e19b7f..979331e 100755 --- a/source/src/pages/watch.astro +++ b/source/src/pages/watch.astro @@ -49,7 +49,7 @@ if (FourKCheck.status == 200) { var FourK = false } -const TenEightyCheck = await fetch(DEFAULT_MEDIA_DATA_PROXY + '/latest_version?id=' + video.videoId + '&itag=137') +const TenEightyCheck = await fetch(DEFAULT_MEDIA_DATA_PROXY + '/latest_version?id=' + video.videoId + '&itag=303') if (TenEightyCheck.status == 200) { var TenEighty = true } else { @@ -64,7 +64,7 @@ if (EightK === true) { // 571 } else if (FourK === true) { // 313 var Quality = '313' } else if (TenEighty === true) { // 137 - var Quality = '137' + var Quality = '303' } else if (ThreeSixty === true) { // 134 var Quality = '134' } @@ -73,7 +73,8 @@ if (EightK === true) { // 571