Merge pull request 'Bluesky: Preparation for video posts' (#1554) from heluecht/friendica-addons:hls into develop

Reviewed-on: friendica/friendica-addons#1554

bluesky/bluesky.php

@@ -45,10 +45,12 @@ use Friendica\Model\Tag;
 use Friendica\Model\User;
 use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPClient\Client\HttpClientOptions;
+use Friendica\Network\HTTPClient\Client\HttpClientRequest;
 use Friendica\Object\Image;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\Relay;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
 const BLUESKY_DEFAULT_POLL_INTERVAL = 10; // given in minutes
@@ -129,8 +131,13 @@ function bluesky_probe_detect(array &$hookData)
 
 	if (parse_url($hookData['uri'], PHP_URL_SCHEME) == 'did') {
 		$did = $hookData['uri'];
-	} elseif (preg_match('#^' . BLUESKY_WEB . '/profile/(.+)#', $hookData['uri'], $matches)) {
+	} elseif (parse_url($hookData['uri'], PHP_URL_PATH) == $hookData['uri'] && strpos($hookData['uri'], '@') === false) {
-		$did = bluesky_get_did($matches[1]);
+		$did = bluesky_get_did($hookData['uri'], $pconfig['uid']);
+		if (empty($did)) {
+			return;
+		}
+	} elseif (Network::isValidHttpUrl($hookData['uri'])) {
+		$did = bluesky_get_did_by_profile($hookData['uri']);
 		if (empty($did)) {
 			return;
 		}
@@ -148,19 +155,14 @@ function bluesky_probe_detect(array &$hookData)
 		return;
 	}
 
-	$hookData['result'] = bluesky_get_contact_fields($data, 0, $pconfig['uid'], false);
+	$hookData['result'] = bluesky_get_contact_fields($data, 0, $pconfig['uid'], true);
-
-	$hookData['result']['baseurl'] = bluesky_get_pds($did);
 
 	// Preparing probe data. This differs slightly from the contact array
-	$hookData['result']['about']    = HTML::toBBCode($data->description ?? '');
 	$hookData['result']['photo']    = $data->avatar ?? '';
-	$hookData['result']['header']   = $data->banner ?? '';
 	$hookData['result']['batch']    = '';
 	$hookData['result']['notify']   = '';
 	$hookData['result']['poll']     = '';
 	$hookData['result']['poco']     = '';
-	$hookData['result']['pubkey']   = '';
 	$hookData['result']['priority'] = 0;
 	$hookData['result']['guid']     = '';
 }
@@ -177,21 +179,21 @@ function bluesky_item_by_link(array &$hookData)
 		return;
 	}
 
-	if (!preg_match('#^' . BLUESKY_WEB . '/profile/(.+)/post/(.+)#', $hookData['uri'], $matches)) {
+	$did = bluesky_get_did_by_profile($hookData['uri']);
-		return;
-	}
-
-	$did = bluesky_get_did($matches[1]);
 	if (empty($did)) {
 		return;
 	}
 
-	Logger::debug('Found bluesky post', ['url' => $hookData['uri'], 'handle' => $matches[1], 'did' => $did, 'cid' => $matches[2]]);
+	if (!preg_match('#/profile/.+/post/(.+)#', $hookData['uri'], $matches)) {
+		return;
+	}
 
-	$uri = 'at://' . $did . '/app.bsky.feed.post/' . $matches[2];
+	Logger::debug('Found bluesky post', ['url' => $hookData['uri'], 'did' => $did, 'cid' => $matches[1]]);
+
+	$uri = 'at://' . $did . '/app.bsky.feed.post/' . $matches[1];
 
 	$uri = bluesky_fetch_missing_post($uri, $hookData['uid'], $hookData['uid'], Item::PR_FETCHED, 0, 0, 0);
-	Logger::debug('Got post', ['profile' => $matches[1], 'cid' => $matches[2], 'result' => $uri]);
+	Logger::debug('Got post', ['did' => $did, 'cid' => $matches[1], 'result' => $uri]);
 	if (!empty($uri)) {
 		$item = Post::selectFirst(['id'], ['uri' => $uri, 'uid' => $hookData['uid']]);
 		if (!empty($item['id'])) {
@@ -1408,6 +1410,19 @@ function bluesky_add_media(stdClass $embed, array $item, int $fetch_uid, int $le
 			}
 			break;
 
+		case 'app.bsky.embed.video#view':
+			$media = [
+				'uri-id'      => $item['uri-id'],
+				'type'        => Post\Media::HLS,
+				'url'         => $embed->playlist,
+				'preview'     => $embed->thumbnail,
+				'description' => $embed->alt ?? '',
+				'height'      => $embed->aspectRatio->height,
+				'width'       => $embed->aspectRatio->width,
+			];
+			Post\Media::insert($media);
+			break;
+	
 		case 'app.bsky.embed.external#view':
 			$media = [
 				'uri-id' => $item['uri-id'],
@@ -1678,10 +1693,14 @@ function bluesky_get_contact_fields(stdClass $author, int $uid, int $fetch_uid,
 		return $fields;
 	}
 
-	$fields['baseurl'] = bluesky_get_pds($author->did);
+	$data = bluesky_get(BLUESKY_DIRECTORY . '/' . $author->did);
-	if (!empty($fields['baseurl'])) {
+	if (!empty($data)) {		
-		GServer::check($fields['baseurl'], Protocol::BLUESKY);
+		$fields['baseurl'] = bluesky_get_pds('', $data);
-		$fields['gsid'] = GServer::getID($fields['baseurl'], true);
+		if (!empty($fields['baseurl'])) {
+			GServer::check($fields['baseurl'], Protocol::BLUESKY);
+			$fields['gsid'] = GServer::getID($fields['baseurl'], true);
+		}
+		$fields['pubkey'] = bluesky_get_public_key('', $data);
 	}
 
 	$data = bluesky_xrpc_get($fetch_uid, 'app.bsky.actor.getProfile', ['actor' => $author->did]);
@@ -1748,6 +1767,49 @@ function bluesky_get_preferences(int $uid): ?stdClass
 	return $data;
 }
 
+function bluesky_get_did_by_profile(string $url): string
+{
+	try {
+		$curlResult = DI::httpClient()->get($url, HttpClientAccept::HTML, [HttpClientOptions::REQUEST => HttpClientRequest::CONTACTINFO]);
+	} catch (\Throwable $th) {
+		return '';
+	}
+	if (!$curlResult->isSuccess()) {
+		return '';
+	}
+	$profile = $curlResult->getBodyString();
+	if (empty($profile)) {
+		return '';
+	}
+
+	$doc = new DOMDocument();
+	try {
+		@$doc->loadHTML($profile);
+	} catch (\Throwable $th) {
+		return '';
+	}
+	$xpath = new DOMXPath($doc);
+	$list = $xpath->query('//p[@id]');
+	foreach ($list as $node) {
+		foreach ($node->attributes as $attribute) {
+			if ($attribute->name == 'id') {
+				$ids[$attribute->value] = $node->textContent;
+			}
+		}
+	}
+
+	if (empty($ids['bsky_handle']) || empty($ids['bsky_did'])) {
+		return '';
+	}
+
+	if (!bluesky_valid_did($ids['bsky_did'], $ids['bsky_handle'])) {
+		Logger::notice('Invalid DID', ['handle' => $ids['bsky_handle'], 'did' => $ids['bsky_did']]);
+		return '';
+	}
+
+	return $ids['bsky_did'];
+}
+
 function bluesky_get_did_by_wellknown(string $handle): string
 {
 	$curlResult = DI::httpClient()->get('http://' . $handle . '/.well-known/atproto-did');
@@ -1757,7 +1819,6 @@ function bluesky_get_did_by_wellknown(string $handle): string
 			Logger::notice('Invalid DID', ['handle' => $handle, 'did' => $did]);
 			return '';
 		}
-		Logger::debug('Got DID by wellknown', ['handle' => $handle, 'did' => $did]);
 		return $did;
 	}
 	return '';
@@ -1776,14 +1837,13 @@ function bluesky_get_did_by_dns(string $handle): string
 				Logger::notice('Invalid DID', ['handle' => $handle, 'did' => $did]);
 				return '';
 			}
-			Logger::debug('Got DID by DNS', ['handle' => $handle, 'did' => $did]);
 			return $did;
 		}
 	}
 	return '';
 }
 
-function bluesky_get_did(string $handle): string
+function bluesky_get_did(string $handle, int $uid): string
 {
 	if ($handle == '') {
 		return '';
@@ -1793,23 +1853,39 @@ function bluesky_get_did(string $handle): string
 		$handle .= '.' . BLUESKY_HOSTNAME;
 	}
 
-	// Deactivated at the moment, since it isn't reliable by now
+	// At first we use the user PDS. That should cover most cases.
-	//$did = bluesky_get_did_by_dns($handle);
+	$pds = DI::pConfig()->get($uid, 'bluesky', 'pds');
-	//if ($did != '') {
+	if (!empty($pds)) {
-	//	return $did;
+		$data = bluesky_get($pds . '/xrpc/com.atproto.identity.resolveHandle?handle=' . urlencode($handle));
-	//}
+		if (!empty($data) && !empty($data->did)) {
-
+			Logger::debug('Got DID by user PDS call', ['handle' => $handle, 'did' => $data->did]);
-	//$did = bluesky_get_did_by_wellknown($handle);
+			return $data->did;
-	//if ($did != '') {
+		}
-	//	return $did;
-	//}
-
-	$data = bluesky_get(BLUESKY_PDS . '/xrpc/com.atproto.identity.resolveHandle?handle=' . urlencode($handle));
-	if (empty($data) || empty($data->did)) {
-		return '';
 	}
-	Logger::debug('Got DID by PDS call', ['handle' => $handle, 'did' => $data->did]);
+
-	return $data->did;
+	// Then we query the DNS, which is used for third party handles (DNS should be faster than wellknown)
+	$did = bluesky_get_did_by_dns($handle);
+	if ($did != '') {
+		Logger::debug('Got DID by DNS', ['handle' => $handle, 'did' => $did]);
+		return $did;
+	}
+
+	// Then we query wellknown, which should mostly cover the rest.
+	$did = bluesky_get_did_by_wellknown($handle);
+	if ($did != '') {
+		Logger::debug('Got DID by wellknown', ['handle' => $handle, 'did' => $did]);
+		return $did;
+	}
+
+	// And finally we use the default PDS from Bluesky.
+	$data = bluesky_get(BLUESKY_PDS . '/xrpc/com.atproto.identity.resolveHandle?handle=' . urlencode($handle));
+	if (!empty($data) && !empty($data->did)) {
+		Logger::debug('Got DID by system PDS call', ['handle' => $handle, 'did' => $data->did]);
+		return $data->did;
+	}
+
+	Logger::notice('No DID detected', ['handle' => $handle]);
+	return '';
 }
 
 function bluesky_get_user_did(int $uid, bool $refresh = false): ?string
@@ -1826,7 +1902,7 @@ function bluesky_get_user_did(int $uid, bool $refresh = false): ?string
 		return null;
 	}
 
-	$did = bluesky_get_did($handle);
+	$did = bluesky_get_did($handle, $uid);
 	if (empty($did)) {
 		return null;
 	}
@@ -1857,9 +1933,11 @@ function bluesky_get_user_pds(int $uid): ?string
 	return $pds;
 }
 
-function bluesky_get_pds(string $did): ?string
+function bluesky_get_pds(string $did, stdClass $data = null): ?string
 {
-	$data = bluesky_get(BLUESKY_DIRECTORY . '/' . $did);
+	if (empty($data)) {
+		$data = bluesky_get(BLUESKY_DIRECTORY . '/' . $did);
+	}
 	if (empty($data) || empty($data->service)) {
 		return null;
 	}
@@ -1873,6 +1951,22 @@ function bluesky_get_pds(string $did): ?string
 	return null;
 }
 
+function bluesky_get_public_key(string $did, stdClass $data = null): ?string
+{
+	if (empty($data)) {
+		$data = bluesky_get(BLUESKY_DIRECTORY . '/' . $did);
+	}
+	if (empty($data) || empty($data->verificationMethod)) {
+		return null;
+	}
+	foreach ($data->verificationMethod as $method) {
+		if (!empty($method->publicKeyMultibase)) {
+			return $method->publicKeyMultibase;
+		}
+	}
+	return null;
+}
+
 function bluesky_valid_did(string $did, string $handle): bool
 {
 	$data = bluesky_get(BLUESKY_DIRECTORY . '/' . $did);

invidious/invidious.php

@@ -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']) {

mailstream/mailstream.php

@@ -6,7 +6,6 @@
  * Author: Matthew Exon <http://mat.exon.name>
  */
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
@@ -16,12 +15,11 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
-use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\User;
 use Friendica\Network\HTTPClient\Client\HttpClientAccept;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Protocol\Activity;
-use Friendica\Util\DateTimeFormat;
 
 /**
  * Sets up the addon hooks and the database table
@@ -53,10 +51,12 @@ function mailstream_addon_admin(string &$o)
 {
 	$frommail = DI::config()->get('mailstream', 'frommail');
 	$template = Renderer::getMarkupTemplate('admin.tpl', 'addon/mailstream/');
-	$config = ['frommail',
+	$config = [
+		'frommail',
 		DI::l10n()->t('From Address'),
 		$frommail,
-		DI::l10n()->t('Email address that stream items will appear to be from.')];
+		DI::l10n()->t('Email address that stream items will appear to be from.')
+	];
 	$o .= Renderer::replaceMacros($template, [
 		'$frommail' => $config,
 		'$submit' => DI::l10n()->t('Save Settings')
@@ -101,7 +101,7 @@ function mailstream_send_hook(array $data)
 
 	$user = User::getById($item['uid']);
 	if (empty($user)) {
-			Logger::error('could not find user', ['uid' => $item['uid']]);
+		Logger::error('could not find user', ['uid' => $item['uid']]);
 		return;
 	}
 
@@ -198,10 +198,13 @@ function mailstream_do_images(array &$item, array &$attachments)
 
 		$cookiejar = tempnam(System::getTempPath(), 'cookiejar-mailstream-');
 		try {
-			$curlResult = DI::httpClient()->fetchFull($url, HttpClientAccept::DEFAULT, 0, $cookiejar);
+			$curlResult = DI::httpClient()->get($url, HttpClientAccept::DEFAULT, [HttpClientOptions::COOKIEJAR => $cookiejar]);
 			if (!$curlResult->isSuccess()) {
 				Logger::debug('mailstream: fetch image url failed', [
-					'url' => $url, 'item_id' => $item['id'], 'return_code' => $curlResult->getReturnCode()]);
+					'url' => $url,
+					'item_id' => $item['id'],
+					'return_code' => $curlResult->getReturnCode()
+				]);
 				continue;
 			}
 		} catch (InvalidArgumentException $e) {
@@ -361,7 +364,7 @@ function mailstream_send(string $message_id, array $item, array $user): bool
 		return true;
 	}
 
-	require_once (dirname(__file__) . '/phpmailer/class.phpmailer.php');
+	require_once(dirname(__file__) . '/phpmailer/class.phpmailer.php');
 
 	$item['body'] = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body']);
 
@@ -406,10 +409,11 @@ function mailstream_send(string $message_id, array $item, array $user): bool
 		$item['body'] = BBCode::convertForUriId($item['uri-id'], $item['body'], BBCode::CONNECTORS);
 		$item['url'] = DI::baseUrl() . '/display/' . $item['guid'];
 		$mail->Body = Renderer::replaceMacros($template, [
-						 '$upstream' => DI::l10n()->t('Upstream'),
+			'$upstream' => DI::l10n()->t('Upstream'),
-						 '$uri' => DI::l10n()->t('URI'),
+			'$uri' => DI::l10n()->t('URI'),
-						 '$local' => DI::l10n()->t('Local'),
+			'$local' => DI::l10n()->t('Local'),
-						 '$item' => $item]);
+			'$item' => $item
+		]);
 		$mail->Body = mailstream_html_wrap($mail->Body);
 		if (!$mail->Send()) {
 			throw new Exception($mail->ErrorInfo);

mastodoncustomemojis/mastodoncustomemojis.php

@@ -1,5 +1,4 @@
 <?php
-
 /*
  * Name: Mastodon Custom Emojis
  * Description: Replace emojis shortcodes in Mastodon posts with their originating server custom emojis images.
@@ -9,7 +8,6 @@
  * Status: Unsupported
  */
 
-use Friendica\App;
 use Friendica\Content\Smilies;
 use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Hook;
@@ -78,7 +76,7 @@ function mastodoncustomemojis_fetch_custom_emojis_for_url($api_base_url)
 
 	$api_url = $api_base_url . '/api/v1/custom_emojis';
 
-	$fetchResult = DI::httpClient()->fetchFull($api_url);
+	$fetchResult = DI::httpClient()->get($api_url);
 
 	if ($fetchResult->isSuccess()) {
 		$emojis_array = json_decode($fetchResult->getBodyString(), true);

smiley_pack/smiley_pack.php

@@ -2,30 +2,28 @@
 /*
  * Name: Smiley Pack
  * Description: Pack of smileys that make master too AOLish.
- * Version: 1.05
+ * Version: 1.06
  * Author: Thomas Willingham (based on Mike Macgirvin's Adult Smile template)
  * Author: Matthias Ebers <https://loma.ml/profile/one>
  * All smileys from sites offering them as Public Domain
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
-function smiley_pack_install() {
+function smiley_pack_install()
+{
 	Hook::register('smilie', 'addon/smiley_pack/smiley_pack.php', 'smiley_pack_smilies');
 }
 
 function smiley_pack_smilies(array &$b)
 {
-#Smileys are split into various directories by the intended range of emotions.  This is in case we get too big and need to modularise things.  We can then cut and paste the right lines, move the right directory, and just change the name of the addon to happy_smilies or whatever.
+	#Smileys are split into various directories by the intended range of emotions.  This is in case we get too big and need to modularise things.  We can then cut and paste the right lines, move the right directory, and just change the name of the addon to happy_smilies or whatever.
 
-#Be careful with invocation strings.  If you have a smiley called foo, and another called foobar, typing :foobar will call foo.  Avoid this with clever naming, using ~ instead of : 
+	#Be careful with invocation strings.  If you have a smiley called foo, and another called foobar, typing :foobar will call foo.  Avoid this with clever naming, using ~ instead of :
-#when all else fails.
+	#when all else fails.
 
-
+	#Animal smileys.
-
-#Animal smileys.
 
 	$b['texts'][] = ':bunnyflowers:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':bunnyflowers:' . '" />';
@@ -99,9 +97,7 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':pig:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/pig.gif' . '" alt="' . ':pig:' . '" />';
 
-
+	#Baby Smileys
-
-#Baby Smileys
 
 	$b['texts'][] = ':baby:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/baby.gif' . '" alt="' . ':baby:' . '" />';
@@ -109,15 +105,13 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':babycot:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':babycot:' . '" />';
 
-
 	$b['texts'][] = ':pregnant:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':pregnant:' . '" />';
 
 	$b['texts'][] = ':stork:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':stork:' . '" />';
 
-
+	#Confused Smileys
-#Confused Smileys	
 	$b['texts'][] = ':confused:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':confused:' . '" />';
 
@@ -130,13 +124,12 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':dazed:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/dazed.gif' . '" alt="' . ':dazed:' . '" />';
 
-
+	#Cool Smileys
-#Cool Smileys
 
 	$b['texts'][] = ':affro:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/cool/affro.gif' . '" alt="' . ':affro:' . '" />';
 
-#Devil/Angel Smileys
+	#Devil/Angel Smileys
 
 	$b['texts'][] = ':angel:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/angel.gif' . '" alt="' . ':angel:' . '" />';
@@ -165,7 +158,7 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':graveside:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':graveside:' . '" />';
 
-#Unpleasent smileys.
+	#Unpleasent smileys.
 
 	$b['texts'][] = ':toilet:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/disgust/toilet.gif' . '" alt="' . ':toilet:' . '" />';
@@ -176,7 +169,7 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':fartblush:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/disgust/fartblush.gif' . '" alt="' . ':fartblush:' . '" />';
 
-#Drinks
+	#Drinks
 
 	$b['texts'][] = ':tea:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/drink/tea.gif' . '" alt="' . ':tea:' . '" />';
@@ -184,7 +177,7 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':drool:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/drool/drool.gif' . '" alt="' . ':drool:' . '" />';
 
-#Sad smileys
+	#Sad smileys
 
 	$b['texts'][] = ':crying:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sad/crying.png' . '" alt="' . ':crying:' . '" />';
@@ -195,12 +188,12 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':sigh:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sad/sigh.gif' . '" alt="' . ':sigh:' . '" />';
 
-#Smoking - only one smiley in here, maybe it needs moving elsewhere?
+	#Smoking - only one smiley in here, maybe it needs moving elsewhere?
 
 	$b['texts'][] = ':smoking:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/smoking/smoking.gif' . '" alt="' . ':smoking:' . '" />';
 
-#Sport smileys
+	#Sport smileys
 
 	$b['texts'][] = ':basketball:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/basketball.gif' . '" alt="' . ':basketball:' . '" />';
@@ -235,7 +228,7 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':horseriding:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':horseriding:' . '" />';
 
-#Love smileys
+	#Love smileys
 
 	$b['texts'][] = ':iloveyou:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/love/iloveyou.gif' . '" alt="' . ':iloveyou:' . '" />';
@@ -255,7 +248,7 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':loveheart:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/love/loveheart.gif' . '" alt="' . ':loveheart:' . '" />';
 
-#Tired/Sleep smileys
+	#Tired/Sleep smileys
 
 	$b['texts'][] = ':countsheep';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/tired/countsheep.gif' . '" alt="' . ':countsheep:' . '" />';
@@ -269,7 +262,7 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':yawn:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/tired/yawn.gif' . '" alt="' . ':yawn:' . '" />';
 
-#Fight/Flame/Violent smileys
+	#Fight/Flame/Violent smileys
 
 	$b['texts'][] = ':2guns:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/2guns.gif' . '" alt="' . ':2guns:' . '" />';
@@ -313,7 +306,7 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':acid:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/acid.gif' . '" alt="' . ':acid:' . '" />';
 
-#Fantasy smileys - monsters and dragons fantasy.  The other type of fantasy belongs in adult smileys
+	#Fantasy smileys - monsters and dragons fantasy.  The other type of fantasy belongs in adult smileys
 
 	$b['texts'][] = ':alienmonster:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fantasy/alienmonster.gif' . '" alt="' . ':alienmonster:' . '" />';
@@ -336,7 +329,7 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':mummy:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fantasy/mummy.gif' . '" alt="' . ':mummy:' . '" />';
 
-#Food smileys
+	#Food smileys
 
 	$b['texts'][] = ':apple:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/apple.gif' . '" alt="' . ':apple:' . '" />';
@@ -368,7 +361,7 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':birthdaycake:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/birthdaycake.gif' . '" alt="' . ':birthdaycake:' . '" />';
 
-#Happy smileys
+	#Happy smileys
 
 	$b['texts'][] = ':cloud9:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/happy/cloud9.gif' . '" alt="' . ':cloud9:' . '" />';
@@ -376,7 +369,7 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':tearsofjoy:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/happy/tearsofjoy.gif' . '" alt="' . ':tearsofjoy:' . '" />';
 
-#Repsect smileys
+	#Repsect smileys
 
 	$b['texts'][] = ':bow:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/respect/bow.gif' . '" alt="' . ':bow:' . '" />';
@@ -390,7 +383,19 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':number1:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/respect/number1.gif' . '" alt="' . ':number1:' . '" />';
 
-#Laugh smileys
+	$b['texts'][] = ':cc_cc:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/respect/cc.png' . '" alt="' . ':cc_cc:' . '" />';
+
+	$b['texts'][] = ':cc_by:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/respect/ccby.png' . '" alt="' . ':cc_by:' . '" />';
+
+	$b['texts'][] = ':cc_sa:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/respect/ccsa.png' . '" alt="' . ':cc_sa:' . '" />';
+
+	$b['texts'][] = ':cc_0:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/respect/cc0.png' . '" alt="' . ':cc_0:' . '" />';
+
+	#Laugh smileys
 
 	$b['texts'][] = ':hahaha:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/laugh/hahaha.gif' . '" alt="' . ':hahaha:' . '" />';
@@ -401,24 +406,23 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':rofl:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/laugh/rofl.gif' . '" alt="' . ':rofl:' . '" />';
 
-#Music smileys
+	#Music smileys
 
 	$b['texts'][] = ':drums:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/music/drums.gif' . '" alt="' . ':drums:' . '" />';
 
-
 	$b['texts'][] = ':guitar:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/music/guitar.gif' . '" alt="' . ':guitar:' . '" />';
 
 	$b['texts'][] = ':trumpet:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/music/trumpet.gif' . '" alt="' . ':trumpet:' . '" />';
 
-#Smileys that used to be in core
+	#Smileys that used to be in core
 
 	$b['texts'][] = ':headbang:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':headbang:' . '" />';
 
-		$b['texts'][] = ':beard:';
+	$b['texts'][] = ':beard:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/beard.png' . '" alt="' . ':beard:' . '" />';
 
 	$b['texts'][] = ':whitebeard:';
@@ -436,7 +440,7 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':headdesk:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':headdesk:' . '" />';
 
-#These two are still in core, so oldcore isn't strictly right, but we don't want too many directories
+	#These two are still in core, so oldcore isn't strictly right, but we don't want too many directories
 
 	$b['texts'][] = ':-d';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/laughing.gif' . '" alt="' . ':-d' . '" />';
@@ -444,8 +448,8 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':-o';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/surprised.gif' . '" alt="' . ':-o' . '" />';
 
-# Regex killers - stick these at the bottom so they appear at the end of the English and 
+	# Regex killers - stick these at the bottom so they appear at the end of the English and
-# at the start of $OtherLanguage.
+	# at the start of $OtherLanguage.
 
 	$b['texts'][] = ':cool:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/cool/cool.gif' . '" alt="' . ':cool:' . '" />';
@@ -480,22 +484,23 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':gangs:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/gangs.gif' . '" alt="' . ':gangs:' . '" />';
 
-
 	$b['texts'][] = ':dj:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/music/dj.gif' . '" alt="' . ':dj:' . '" />';
 
-
 	$b['texts'][] = ':elvis:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/music/elvis.gif' . '" alt="' . ':elivs:' . '" />';
 
 	$b['texts'][] = ':violin:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/music/violin.gif' . '" alt="' . ':violin:' . '" />';
 
-# New Gif Emoji (@one@loma.ml)
+	# New Gif Emoji (@one@loma.ml)
-# Fediverse
+	# Fediverse
 
 	$b['texts'][] = ':friendica:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/friendica.gif' . '" alt="' . ':friendica:' . '" />';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/friendica.png' . '" alt="' . ':friendica:' . '" />';
+
+	$b['texts'][] = ':fediverse:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/fediverse.gif' . '" alt="' . ':fediverse:' . '" />';
 
 	$b['texts'][] = ':mastodon:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/mastodon.gif' . '" alt="' . ':mastodon:' . '" />';
@@ -507,10 +512,10 @@ function smiley_pack_smilies(array &$b)
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/misskey.gif' . '" alt="' . ':misskey:' . '" />';
 
 	$b['texts'][] = ':diaspora:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/diaspora.gif' . '" alt="' . ':diaspora:' . '" />';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/diaspora.png' . '" alt="' . ':diaspora:' . '" />';
 
 	$b['texts'][] = ':hubzilla:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/hubzilla.gif' . '" alt="' . ':hubzilla:' . '" />';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/hubzilla.png' . '" alt="' . ':hubzilla:' . '" />';
 
 	$b['texts'][] = ':pixelfed:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/pixelfed.gif' . '" alt="' . ':pixelfeed:' . '" />';
@@ -521,12 +526,12 @@ function smiley_pack_smilies(array &$b)
 	$b['texts'][] = ':activitypub:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/ap.gif' . '" alt="' . ':activitypub:' . '" />';
 
-# ccc
+	# ccc
 
 	$b['texts'][] = ':ccc event:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/ccc/ccc.gif' . '" alt="' . ':ccc event:' . '" />';
 
-# Commercial
+	# Commercial
 
 	$b['texts'][] = ':youtube:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/youtube.gif' . '" alt="' . ':youtube:' . '" />';
@@ -539,4 +544,107 @@ function smiley_pack_smilies(array &$b)
 
 	$b['texts'][] = ':twitch:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/twitch.gif' . '" alt="' . ':twitch:' . '" />';
+
+	$b['texts'][] = ':facebook:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/facebook.gif' . '" alt="' . ':facebook:' . '" />';
+
+	$b['texts'][] = ':threads:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/threads.png' . '" alt="' . ':threads:' . '" />';
+
+	$b['texts'][] = ':google:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/google.gif' . '" alt="' . ':google:' . '" />';
+
+	$b['texts'][] = ':signal:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/signal.gif' . '" alt="' . ':signal:' . '" />';
+
+	$b['texts'][] = ':tiktok:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/tiktok.gif' . '" alt="' . ':tiktok:' . '" />';
+
+	$b['texts'][] = ':whatsapp:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/whatsapp.gif' . '" alt="' . ':whatsapp:' . '" />';
+
+	$b['texts'][] = ':instagram:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/instagram.gif' . '" alt="' . ':instagram:' . '" />';
+
+	$b['texts'][] = ':telegram:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/telegram.gif' . '" alt="' . ':telegram:' . '" />';
+
+	$b['texts'][] = ':windows:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/windows.png' . '" alt="' . ':windows:' . '" />';
+
+	$b['texts'][] = ':github:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/github.png' . '" alt="' . ':github:' . '" />';
+
+	$b['texts'][] = ':threema:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/threema.png' . '" alt="' . ':threema:' . '" />';
+
+	# nonCommercial
+
+	$b['texts'][] = ':invidious:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/noncommercial/invidious.gif' . '" alt="' . ':invidious:' . '" />';
+
+	$b['texts'][] = ':bluesky:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/noncommercial/bluesky.png' . '" alt="' . ':bluesky:' . '" />';
+
+	$b['texts'][] = ':vivaldi:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/noncommercial/vivaldi.png' . '" alt="' . ':vivaldi:' . '" />';
+
+	# opensource
+
+	$b['texts'][] = ':firefox:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/firefox.png' . '" alt="' . ':firefox:' . '" />';
+
+	$b['texts'][] = ':linuxopensuse:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/opensuse.png' . '" alt="' . ':linuxopensuse:' . '" />';
+
+	$b['texts'][] = ':linuxdebian:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/debian.png' . '" alt="' . ':linuxdebian:' . '" />';
+
+	$b['texts'][] = ':linuxfedora:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/fedora.png' . '" alt="' . ':linuxfedora:' . '" />';
+
+	$b['texts'][] = ':linuxubuntu:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/ubuntu.png' . '" alt="' . ':linuxubuntu:' . '" />';
+
+	$b['texts'][] = ':linuxmint:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/mint.png' . '" alt="' . ':linuxmint:' . '" />';
+
+	$b['texts'][] = ':fdroid:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/fdroid.png' . '" alt="' . ':fdroid:' . '" />';
+
+	$b['texts'][] = ':tutanota:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/tutanota.png' . '" alt="' . ':tutanota:' . '" />';
+
+	$b['texts'][] = ':raspi:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/raspi.png' . '" alt="' . ':raspi:' . '" />';
+
+	$b['texts'][] = ':linux:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/linux.png' . '" alt="' . ':linux:' . '" />';
+
+	$b['texts'][] = ':kde:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/kde.png' . '" alt="' . ':kde:' . '" />';
+
+	$b['texts'][] = ':firefoxnightly:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/firefoxnightly.png' . '" alt="' . ':firefoxnightly:' . '" />';
+
+	$b['texts'][] = ':archlinux:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/archlinux.png' . '" alt="' . ':archlinux:' . '" />';
+
+	$b['texts'][] = ':thunderbird:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/thunderbird.png' . '" alt="' . ':thunderbird:' . '" />';
+
+	$b['texts'][] = ':vivaldi:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/vivaldi.png' . '" alt="' . ':vivaldi:' . '" />';
+
+	$b['texts'][] = ':jabber:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/jabber.png' . '" alt="' . ':jabber:' . '" />';
+
+	$b['texts'][] = ':matrix:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/matrix.png' . '" alt="' . ':matrix:' . '" />';
+
+	$b['texts'][] = ':xmpp:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/xmpp.png' . '" alt="' . ':xmpp:' . '" />';
+
+	$b['texts'][] = ':foss:';
+	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/opensource/foss.png' . '" alt="' . ':foss:' . '" />';
 }

unicode_smilies/unicode_smilies.php

@@ -1293,6 +1293,8 @@ function unicode_smilies_smilies(array &$b)
 	Smilies::add($b, ':microscope:', '&#x1F52C');
 	Smilies::add($b, ':telescope:', '&#x1F52D');
 	Smilies::add($b, ':satellite antenna:', '&#x1F4E1');
+	Smilies::add($b, ':asterism:', '&#8258');
+	Smilies::add($b, ':outlines white star:', '&#9885');
 
 // medical
 	Smilies::add($b, ':syringe:', '&#x1F489');