friendica/friendica-addons
7
2
Fork 14
Code Issues 3 Pull requests 3 Releases 16 Wiki Activity

This addon will replace "youtube.com" with the chosen Invidious instance #1441

Merged
MrPetovan merged 19 commits from :develop into 2023.09-rc 2023-12-08 20:50:23 +01:00
Conversation 3 Commits 19 Files changed 5 +111
loma-one commented 2023-12-04 11:13:55 +01:00
Contributor
Copy link
No description provided.
loma-one added 13 commits 2023-12-04 11:13:56 +01:00 
Among other things, I use the page header to inform about current maintenance work or other upcoming work. The information should therefore be provided within an appropriate framework. With a little CSS, the page header gets a frame in green. The font was adjusted to an appropriate size.
Removed commented out code from your pull request
Replaces links to youtube.com to an invidious instance in all displays of postings on a node.
Reviewed-on: loma-one/friendica-addons#2
Redirects from youtu.be do not work reliably. Therefore this one has been removed.
heluecht reviewed 2023-12-04 21:41:28 +01:00
invidious/invidious.php Outdated
@ -0,0 +50,4 @@
$b['html'] = str_replace('https://www.youtube.com', $invidious, $b['html']);
$replaced = true;
}
if (strstr($b['html'], 'https://youtube.com')) {
heluecht commented 2023-12-04 21:41:28 +01:00
Owner
Copy link

Why is this block duplicated?

Why is this block duplicated?
loma-one commented 2023-12-04 21:49:57 +01:00
Author
Contributor
Copy link

To ensure that different spellings with www and without are intercepted and redirected.

To ensure that different spellings with **www** and without are intercepted and redirected.
MrPetovan commented 2023-12-04 21:51:54 +01:00
Owner
Copy link

Thanks for the reply, the indentation still needs to be corrected.

Thanks for the reply, the indentation still needs to be corrected.
heluecht commented 2023-12-04 23:08:27 +01:00
Owner
Copy link

you could combine the str_replace with an array as first parameter.

you could combine the `str_replace` with an array as first parameter.
loma-one added 1 commit 2023-12-04 22:01:48 +01:00
heluecht commented 2023-12-04 22:11:59 +01:00
Owner
Copy link

I just saw: You could even make it user configurable. You just have to use DI::userSession()->getLocalUserId() to fetch the user id.

I just saw: You could even make it user configurable. You just have to use `DI::userSession()->getLocalUserId()` to fetch the user id.
loma-one commented 2023-12-04 22:48:34 +01:00
Author
Contributor
Copy link

@heluecht That would be great. The user should be able to control it themselves. I'm just afraid that my skills are not sufficient for these changes.

@heluecht That would be great. The user should be able to control it themselves. I'm just afraid that my skills are not sufficient for these changes.
loma-one added 1 commit 2023-12-05 09:08:38 +01:00 
URL combine
loma-one commented 2023-12-05 09:16:43 +01:00
Author
Contributor
Copy link

@heluecht Here is a suggestion as to how the URLs can be combined with each other.

@heluecht Here is a suggestion as to how the URLs can be combined with each other.
heluecht reviewed 2023-12-05 22:14:15 +01:00
invidious/invidious.php Outdated
@ -0,0 +54,4 @@
foreach ($youtubeUrls as $youtubeUrl) {
if (strstr($b['html'], $youtubeUrl)) {
$b['html'] = str_replace($youtubeUrl, $invidious, $b['html']);
heluecht commented 2023-12-05 22:14:15 +01:00
Owner
Copy link

You can simply do

            $b['html'] = str_replace(['https://www.youtube.com', 'https://youtube.com'], $invidious, $b['html']);
You can simply do ``` $b['html'] = str_replace(['https://www.youtube.com', 'https://youtube.com'], $invidious, $b['html']); ```
loma-one added 1 commit 2023-12-05 22:40:52 +01:00 
Suggestion from @heluecht for combined URLs adopted
MrPetovan requested changes 2023-12-06 15:30:01 +01:00
invidious/invidious.php Outdated
@ -0,0 +46,4 @@
// this needs to be a system setting
$replaced = false;
$invidious = DI::config()->get('invidious', 'server', 'https://invidio.us');
if (strstr($b['html'], 'https://www.youtube.com')) {
MrPetovan commented 2023-12-06 15:29:56 +01:00
Owner
Copy link

You need to also check for 'https://youtube.com' now that the replacement has been combined. Additionally strpos() has better performance for what you're trying to do here.

And what about https://youtu.be/[video id] links? They need to be replaced by [Invidious domain]/?watch=[video id].

Lastly, I added an ending slash to the needle strings to match video links. If someone just mentions youtube.com and links to it, it shouldn't be replaced with an Invidious link.

if (strpos($b['html'], 'https://www.youtube.com/') !== false || strpos($b['html'], 'https://youtube.com/') !== false || strpos($b['html'], 'https://youtu.be/') !== false) {
    $b['html'] = str_replace('https://youtu.be/', $invidious . '/?watch=', $b['html']);
    $b['html'] = str_replace(['https://www.youtube.com/', 'https://youtube.com/'], $invidious . '/', $b['html']);
You need to also check for `'https://youtube.com'` now that the replacement has been combined. Additionally `strpos()` has better performance for what you're trying to do here. And what about `https://youtu.be/[video id]` links? They need to be replaced by `[Invidious domain]/?watch=[video id]`. Lastly, I added an ending slash to the needle strings to match video links. If someone just mentions youtube.com and links to it, it shouldn't be replaced with an Invidious link. ```php if (strpos($b['html'], 'https://www.youtube.com/') !== false || strpos($b['html'], 'https://youtube.com/') !== false || strpos($b['html'], 'https://youtu.be/') !== false) { $b['html'] = str_replace('https://youtu.be/', $invidious . '/?watch=', $b['html']); $b['html'] = str_replace(['https://www.youtube.com/', 'https://youtube.com/'], $invidious . '/', $b['html']); ```
loma-one added 1 commit 2023-12-06 18:00:37 +01:00 
Many thanks for the hint. With a small change '/watch?v=' the link to https://youtu.be now also works
loma-one added 1 commit 2023-12-06 18:03:50 +01:00
loma-one added 1 commit 2023-12-06 18:07:23 +01:00
MrPetovan approved these changes 2023-12-06 18:22:46 +01:00
MrPetovan left a comment
Owner
Copy link

Looks good to me. @heluecht ?

Looks good to me. @heluecht ?
MrPetovan added the
2023.09
 label 2023-12-06 18:23:16 +01:00
MrPetovan merged commit 3b518462ab into 2023.09-rc 2023-12-08 20:50:23 +01:00
Sign in to join this conversation.
Reviewers
No reviewers
MrPetovan
Labels
Clear labels   
2018.09

   
2019.01

   
2019.03

   
2019.06

   
2019.09

   
2019.12

   
2020.03

   
2020.06

   
2020.09

   
2020.12

   
2021.03

   
2021.07

   
2021.09

   
2022.02

   
2022.06

   
2022.09

   
2022.12

   
2023.04

   
2023.05

   
2023.09

   
2024.03

   
2024.06

   
2024.09

   
2024.12

   
dependencies

Pull requests that update a dependency file

  
Hackathon 2021
No labels
2018.09
2019.01
2019.03
2019.06
2019.09
2019.12
2020.03
2020.06
2020.09
2020.12
2021.03
2021.07
2021.09
2022.02
2022.06
2022.09
2022.12
2023.04
2023.05
2023.09
2024.03
2024.06
2024.09
2024.12
dependencies
Hackathon 2021
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
3 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: friendica/friendica-addons#1441
No description provided.
Delete branch ":develop"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?