audon/audon.php

@@ -1,8 +1,8 @@
 <?php
 /*
  * Name: Audon Application
- * Description: add a Audon instance. Based on webRTC Addon
- * Version: 0.1
+ * Description: add an Audon instance. Based on webRTC Addon
+ * Version: 0.2
  * Author: Stephen Mahood <https://friends.mayfirst.org/profile/marxistvegan>
  * Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
  * Author: Matthias Ebers <https://loma.ml/profile/feb>
@@ -26,13 +26,13 @@ function audon_addon_admin(string &$o)
 {
 	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/audon/');
 	$o = Renderer::replaceMacros($t, [
-		'$submit'   => DI::l10n()->t('Save Settings'), 
+		'$submit' => DI::l10n()->t('Save Settings'),
 		'$audonurl' => [
-			'audonurl', 
-			DI::l10n()->t('Audon Base URL'), 
-			DI::config()->get('audon','audonurl'), 
-			DI::l10n()->t('Page your users will create an Audon audio chat room on. For example you could use https://audon.space.'), 
-		], 
+			'audonurl',
+			DI::l10n()->t('Audon Base URL'),
+			DI::config()->get('audon', 'audonurl'),
+			DI::l10n()->t('Page your users will create an Audon audio chat room on. For example, you could use https://audon.space.'),
+		],
 	]);
 }
 
@@ -46,23 +46,26 @@ function audon_addon_admin_post()
  * existence of this method is checked to figure out if the addon offers a
  * module.
  */
-function audon_module() {}
+function audon_module()
+{
+}
 
 function audon_content(): string
 {
 	$o = '';
 
-	/* landingpage to create chatrooms */
+	/* landing page to create chatrooms */
 	$audonurl = DI::config()->get('audon', 'audonurl');
 
+	/* open the landing page in a new browser window without controls */
+	$o = '<script>
+				window.open("' . $audonurl . '", "_blank", "toolbar=no,scrollbars=no,resizable=no,top=100,left=100,width=740,height=600");
+			</script>';
 
-	/* embedd the landing page in an iframe */
 	$o .= '<h2>' . DI::l10n()->t('Audio Chat') . '</h2>';
 	$o .= '<p>' . DI::l10n()->t('Audon is an audio conferencing tool. Connect your account to Audon and create a room. Share the generated link to talk to other participants.') . '</p>';
 	if ($audonurl == '') {
 		$o .= '<p>' . DI::l10n()->t('Please contact your Friendica administrator to remind them to configure the Audon addon.') . '</p>';
-	} else {
-		$o .= '<iframe src="' . $audonurl . '" width="740px" height="600px"></iframe>';
 	}
 
 	return $o;

invidious/invidious.php

@@ -2,7 +2,7 @@
 /*
  * Name: invidious
  * Description: Replaces links to youtube.com to an invidious instance in all displays of postings on a node.
- * Version: 0.4
+ * Version: 0.5
  * Author: Matthias Ebers <https://loma.ml/profile/feb>
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  * Status: Unsupported
@@ -96,6 +96,8 @@ function invidious_render(array &$b)
 	$b['html'] = preg_replace("~https?://(?:www\.)?youtube\.com/watch\?v=(.*?)~ism", $server . '/watch?v=$1', $b['html']);
 	$b['html'] = preg_replace("~https?://(?:www\.)?youtube\.com/embed/(.*?)~ism", $server . '/embed/$1', $b['html']);
 	$b['html'] = preg_replace("~https?://(?:www\.)?youtube\.com/shorts/(.*?)~ism", $server . '/shorts/$1', $b['html']);
+	$b['html'] = preg_replace ("/https?:\/\/music.youtube.com\/(.*?)/ism", $server . '/watch?v=$1', $b['html']);
+	$b['html'] = preg_replace ("/https?:\/\/m.youtube.com\/(.*?)/ism", $server . '/watch?v=$1', $b['html']);
 	$b['html'] = preg_replace("/https?:\/\/youtu.be\/(.*?)/ism", $server . '/watch?v=$1', $b['html']);
 
 	if ($original != $b['html']) {

piped/README.md

@@ -0,0 +1,4 @@
+piped Addon for Friendica
+==========================
+
+This addon will replace "youtube.com" with the chosen Piped instance

piped/lang/C/messages.po

@@ -0,0 +1,58 @@
+# ADDON piped
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica piped addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-04-27 08:25+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: piped.php:40
+#, php-format
+msgid ""
+"Which Piped server shall be used for the replacements in the post bodies? "
+"Use the URL with servername and protocol. See %s for a list of available "
+"public Piped servers."
+msgstr ""
+
+#: piped.php:41 piped.php:58
+msgid "Piped server"
+msgstr ""
+
+#: piped.php:41 piped.php:58
+#, php-format
+msgid "See %s for a list of available Piped servers."
+msgstr ""
+
+#: piped.php:42
+msgid "Save Settings"
+msgstr ""
+
+#: piped.php:57
+msgid "Replace Youtube links with links to an Piped server"
+msgstr ""
+
+#: piped.php:57
+msgid ""
+"If enabled, Youtube links are replaced with the links to the specified Piped "
+"server."
+msgstr ""
+
+#: piped.php:63
+msgid "Piped Settings"
+msgstr ""
+
+#: piped.php:104
+#, php-format
+msgid "(Piped addon enabled: YouTube links via %s)"
+msgstr ""

piped/piped.php

@@ -0,0 +1,106 @@
+<?php
+/*
+ * Name: piped
+ * Description: Replaces links to youtube.com to an piped instance in all displays of postings on a node.
+ * Version: 0.1
+ * Author: Matthias Ebers <https://loma.ml/profile/feb>
+ * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
+ * Status:
+ * Note:
+ */
+
+use Friendica\Core\Hook;
+use Friendica\Core\Renderer;
+use Friendica\DI;
+
+CONST PIPED_DEFAULT = 'https://piped.video';
+
+function piped_install()
+{
+	Hook::register('prepare_body_final',  __FILE__, 'piped_render');
+	Hook::register('addon_settings',      __FILE__, 'piped_settings');
+	Hook::register('addon_settings_post', __FILE__, 'piped_settings_post');
+}
+
+/* Handle the send data from the admin settings
+ */
+function piped_addon_admin_post()
+{
+	DI::config()->set('piped', 'server', trim($_POST['pipedserver'], " \n\r\t\v\x00/"));
+}
+
+/* Hook into the admin settings to let the admin choose an
+ * piped server to use for the replacement.
+ */
+function piped_addon_admin(string &$o)
+{
+	$pipedserver = DI::config()->get('piped', 'server', PIPED_DEFAULT);
+	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/piped/');
+	$o = Renderer::replaceMacros($t, [
+		'$settingdescription' => DI::l10n()->t('Which Piped server shall be used for the replacements in the post bodies? Use the URL with servername and protocol. See %s for a list of available public Piped servers.', 'https://github.com/TeamPiped/Piped/wiki/Instances'),
+		'$pipedserver'    => ['pipedserver', DI::l10n()->t('Piped server'), $pipedserver, DI::l10n()->t('See %s for a list of available Piped servers.', '<a href="https://github.com/TeamPiped/Piped/wiki/Instances/">https://github.com/TeamPiped/Piped/wiki/Instances/</a>')],
+		'$submit'             => DI::l10n()->t('Save Settings'),
+	]);
+}
+
+function piped_settings(array &$data)
+{
+	if (!DI::userSession()->getLocalUserId()) {
+		return;
+	}
+
+	$enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'piped', 'enabled');
+	$server  = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'piped', 'server', DI::config()->get('piped', 'server', PIPED_DEFAULT));
+
+	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/piped/');
+	$html = Renderer::replaceMacros($t, [
+		'$enabled' => ['enabled', DI::l10n()->t('Replace Youtube links with links to an Piped server'), $enabled, DI::l10n()->t('If enabled, Youtube links are replaced with the links to the specified Piped server.')],
+		'$server'  => ['server', DI::l10n()->t('Piped server'), $server, DI::l10n()->t('See %s for a list of available Piped servers.', '<a href="https://github.com/TeamPiped/Piped/wiki/Instances/">https://github.com/TeamPiped/Piped/wiki/Instances/</a>')],
+	]);
+
+	$data = [
+		'addon' => 'piped',
+		'title' => DI::l10n()->t('Piped Settings'),
+		'html'  => $html,
+	];
+}
+
+function piped_settings_post(array &$b)
+{
+	if (!DI::userSession()->getLocalUserId() || empty($_POST['piped-submit'])) {
+		return;
+	}
+
+	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'piped', 'enabled', (bool)$_POST['enabled']);
+
+	$server = trim($_POST['server'], " \n\r\t\v\x00/");
+	if ($server != DI::config()->get('piped', 'server', PIPED_DEFAULT) && !empty($server)) {
+		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'piped', 'server', $server);
+	} else {
+		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'piped', 'server');
+	}
+}
+
+/*
+ *  replace "youtube.com" with the chosen Piped instance
+ */
+function piped_render(array &$b)
+{
+	if (!DI::userSession()->getLocalUserId() || !DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'piped', 'enabled')) {
+		return;
+	}
+
+	$original = $b['html'];
+	$server   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'piped', 'server', DI::config()->get('piped', 'server', PIPED_DEFAULT));
+
+	$b['html'] = preg_replace("~https?://(?:www\.)?youtube\.com/watch\?v=(.*?)~ism", $server . '/watch?v=$1', $b['html']);
+	$b['html'] = preg_replace("~https?://(?:www\.)?youtube\.com/embed/(.*?)~ism", $server . '/embed/$1', $b['html']);
+	$b['html'] = preg_replace("~https?://(?:www\.)?youtube\.com/shorts/(.*?)~ism", $server . '/shorts/$1', $b['html']);
+	$b['html'] = preg_replace ("/https?:\/\/music.youtube.com\/(.*?)/ism", $server . '/watch?v=$1', $b['html']);
+	$b['html'] = preg_replace ("/https?:\/\/m.youtube.com\/(.*?)/ism", $server . '/watch?v=$1', $b['html']);
+	$b['html'] = preg_replace("/https?:\/\/youtu.be\/(.*?)/ism", $server . '/watch?v=$1', $b['html']);
+
+	if ($original != $b['html']) {
+		$b['html'] .= '<hr><p><small>' . DI::l10n()->t('(Piped addon enabled: YouTube links via %s)', $server) . '</small></p>';
+	}
+}

piped/templates/admin.tpl

@@ -0,0 +1,5 @@
+<p>{{$settingdescription}}</p>
+
+{{include file="field_input.tpl" field=$pipedserver}}
+
+<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>

piped/templates/settings.tpl

@@ -0,0 +1,2 @@
+{{include file="field_checkbox.tpl" field=$enabled}}
+{{include file="field_input.tpl" field=$server}}