Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Filtering out invidious instances that don't support the API #2714

Merged
merged 3 commits into from Oct 13, 2022
Merged

Filtering out invidious instances that don't support the API #2714

merged 3 commits into from Oct 13, 2022

Conversation

MarmadileManteater
Copy link
Contributor

Filtering out invidious instances that don't support the API

Pull Request Type

  • Bugfix
  • Feature Implementation
  • Documentation
  • Other

Description

Currently, when filtering invidious instances, there isn't any check for if an invidious instance supports API calls. The result is that, occasionally, the selected invidious instance is one that doesn't support the API whatsoever. For instance, if the selected instance is set to https://yewtu.be/ or https://invidious.snopyta.org/, all invidious API calls will fail, and that won't change until the user selects another instance or the app is restarted.

This PR aims to address this issue by adding two extra conditions to the invidious instances filter:

  • Does this instance support the API?
  • Does this instance support CORS? (This is only checked when IS_ELECTRON is false.)

Screenshots

Before / After:

Desktop (please complete the following information):

  • OS: Windows 10
  • OS Version: Pro Version 21H2 Installed on ‎4/‎3/‎2022 OS build 19044.1889 Experience Windows Feature Experience Pack 120.2212.4180.0
  • FreeTube version: 0.17.1

@MarmadileManteater
Adding two additional checks to the instance filter
1620758 
- Checking if the instance supports the api at all
- Checking if the instance supports cors in web environments
@FreeTubeBot FreeTubeBot enabled auto-merge (squash) October 12, 2022 22:50
@github-actions github-actions bot added the PR: waiting for review For PRs that are complete, tested, and ready for review label Oct 12, 2022
@ChunkyProgrammer
Copy link
Member

Might be a good idea to update https://github.com/FreeTubeApp/FreeTube/blob/development/static/invidious-instances.json as well.

auto-merge was automatically disabled October 13, 2022 11:33

Head branch was pushed to by a user without write access

@FreeTubeBot FreeTubeBot enabled auto-merge (squash) October 13, 2022 11:33
@absidue
Copy link
Member

absidue commented Oct 13, 2022 •
edited

These two hardcoded fallback ones probably need changing then as well: https://github.com/FreeTubeApp/FreeTube/blob/development/src/renderer/store/modules/invidious.js#L52-L56
(fixed the link)

auto-merge was automatically disabled October 13, 2022 11:40

Head branch was pushed to by a user without write access

@FreeTubeBot FreeTubeBot enabled auto-merge (squash) October 13, 2022 11:40
@FreeTubeBot FreeTubeBot merged commit f94d8a9 into FreeTubeApp:development Oct 13, 2022
@github-actions github-actions bot removed the PR: waiting for review For PRs that are complete, tested, and ready for review label Oct 13, 2022
MarmadileManteater added a commit to MarmadileManteater/FreeTubeAndroid that referenced this pull request Oct 18, 2022
@MarmadileManteater
# Automated nightly release 69
e07af70 
commit 9733163
Merge: 25ff177 b5c486b
Author: Emma <MarmadileManteater@proton.me>

Merge branch 'FreeTubeApp:development' into development

commit b5c486b
Author: Emma <MarmadileManteater@proton.me>

Fixing some leftover `showToast(obj)` (FreeTubeApp#2735)

commit 198c3fa
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bump http-proxy-agent from 4.0.1 to 5.0.0 (FreeTubeApp#2733)

commit 25ff177
Merge: 980a387 4ef6369
Author: Emma <MarmadileManteater@proton.me>

Merge branch 'upstream_development' into development

commit 4ef6369
Author: Gediminas Murauskas <muziejusinfo@gmail.com>

Translated using Weblate (Lithuanian)

commit 4440044
Author: Massimo Pissarello <mapi68@gmail.com>

Translated using Weblate (Italian)

commit 8209e7e
Author: Oğuz Ersen <oguz@ersen.moe>

Translated using Weblate (Turkish)

commit 3326224
Author: Jeff Huang <s8321414@gmail.com>

Translated using Weblate (Chinese (Traditional))

commit 546a276
Author: Eric <hamburger1024@mailbox.org>

Translated using Weblate (Chinese (Simplified))

commit 1b68e56
Author: Rex_sa <rex.sa@pm.me>

Translated using Weblate (Arabic)

commit 77a18e8
Merge: 62c70fb eefcd36
Author: Hosted Weblate <hosted@weblate.org>

Merge branch 'origin/development' into Weblate.

commit eefcd36
Author: Gediminas Murauskas <muziejusinfo@gmail.com>

Translated using Weblate (Lithuanian)

commit 94fb11f
Author: Grzegorz Wójcicki <terkaz@gmx.com>

Translated using Weblate (Polish)

commit 37b3b6d
Author: J. Lavoie <j.lavoie@net-c.ca>

Translated using Weblate (French)

commit 097c06a
Author: J. Lavoie <j.lavoie@net-c.ca>

Translated using Weblate (German)

commit 62c70fb
Author: absidue <48293849+absidue@users.noreply.github.com>

Fix fetching the comments from invidious (FreeTubeApp#2721)

commit 077fde7
Author: absidue <48293849+absidue@users.noreply.github.com>

Fix CTRL+clicking on the channel name on the watch page (FreeTubeApp#2713)

commit ad01d2b
Author: absidue <48293849+absidue@users.noreply.github.com>

Make the safe as and open file dialogs blocking (FreeTubeApp#2712)

commit 3aa080d
Author: absidue <48293849+absidue@users.noreply.github.com>

Make showToast a helper (FreeTubeApp#2695)

commit f94d8a9
Author: Emma <MarmadileManteater@proton.me>

Filtering out invidious instances that don't support the API (FreeTubeApp#2714)

commit 21a31cf
Author: PikachuEXE <pikachuexe@gmail.com>

Upgrade electron from 20 > 21 (FreeTubeApp#2717)

commit c0f98ee
Author: absidue <48293849+absidue@users.noreply.github.com>

Use named parameters instead of $ and % in localised strings (FreeTubeApp#2685)

commit 81426ed
Author: absidue <48293849+absidue@users.noreply.github.com>

Don't lint while rebasing (FreeTubeApp#2711)

commit 1695605
Author: Aiz <66974576+Aiz0@users.noreply.github.com>

Remove deprecated @keypress + some accessability improvements (FreeTubeApp#2697)

commit b35d7ea
Author: Sveinn í Felli <sv1@fellsnet.is>

Translated using Weblate (Icelandic)

commit 6b4727c
Merge: bc8261d9 2a60129
Author: Hosted Weblate <hosted@weblate.org>

Merge branch 'origin/development' into Weblate.

commit 2a60129
Author: Fjuro <ifjuro@proton.me>

Translated using Weblate (Czech)

commit 5199114
Author: ovari <ovari123@zoho.com>

Translated using Weblate (Hungarian)

commit 11b3c19
Author: Yaron Shahrabani <sh.yaron@gmail.com>

Translated using Weblate (Hebrew)

commit bd210ab
Author: Егор Ермаков <eg.ermakov2016@yandex.ru>

Translated using Weblate (Russian)

commit bc8261d
Author: absidue <48293849+absidue@users.noreply.github.com>

Move colours from the store to the utils helper (FreeTubeApp#2710)

commit f12b9e1
Author: SC <lalocas@protonmail.com>

Translated using Weblate (Portuguese)

**Full Changelog**: 0.17.1-nightly-68...0.17.1-nightly-69
Open
3 tasks
Merged
1 task
@MarmadileManteater MarmadileManteater deleted the filtering-out-invidious-instances-without-api branch March 16, 2024 15:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@absidue absidue absidue approved these changes

@efb4f5ff-1298-471a-8973-3d47447115dc efb4f5ff-1298-471a-8973-3d47447115dc efb4f5ff-1298-471a-8973-3d47447115dc approved these changes

@ChunkyProgrammer ChunkyProgrammer ChunkyProgrammer approved these changes

@PikachuEXE PikachuEXE Awaiting requested review from PikachuEXE

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@MarmadileManteater @ChunkyProgrammer @absidue @efb4f5ff-1298-471a-8973-3d47447115dc @FreeTubeBot