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

Reviewed-on: friendica/friendica-addons#1554

.woodpecker/.code_standards_check.yml

@@ -4,6 +4,9 @@ pipeline:
   clone_friendica_base:
     image: alpine/git
     commands:
+      - git config --global user.email "no-reply@friendi.ca"
+      - git config --global user.name "Friendica"
+      - git config --global --add safe.directory $CI_WORKSPACE
       - git clone https://github.com/friendica/friendica.git .
       - git checkout $CI_COMMIT_BRANCH
     when:
@@ -13,7 +16,7 @@ pipeline:
     commands:
       - git config --global user.email "no-reply@friendi.ca"
       - git config --global user.name "Friendica"
-      - git clone $CI_REPO_LINK addon
+      - git clone $CI_REPO_CLONE_URL addon
       - cd addon/
       - git checkout $CI_COMMIT_BRANCH
       - git fetch origin $CI_COMMIT_REF

.woodpecker/.continuous-deployment.yml

@@ -9,6 +9,9 @@ pipeline:
   clone_friendica_base:
     image: alpine/git
     commands:
+      - git config --global user.email "no-reply@friendi.ca"
+      - git config --global user.name "Friendica"
+      - git config --global --add safe.directory $CI_WORKSPACE
       - git clone https://github.com/friendica/friendica.git .
       - git checkout $CI_COMMIT_BRANCH
     when:
@@ -20,7 +23,7 @@ pipeline:
     commands:
       - git config --global user.email "no-reply@friendi.ca"
       - git config --global user.name "Friendica"
-      - git clone $CI_REPO_LINK addon
+      - git clone $CI_REPO_CLONE_URL addon
       - cd addon/
       - git checkout $CI_COMMIT_BRANCH
       - git fetch origin $CI_COMMIT_REF

.woodpecker/.messages.po_check.yml

@@ -4,6 +4,9 @@ pipeline:
   clone_friendica_base:
     image: alpine/git
     commands:
+      - git config --global user.email "no-reply@friendi.ca"
+      - git config --global user.name "Friendica"
+      - git config --global --add safe.directory $CI_WORKSPACE
       - git clone https://github.com/friendica/friendica.git .
       - git checkout $CI_COMMIT_BRANCH
     when:
@@ -13,7 +16,7 @@ pipeline:
     commands:
       - git config --global user.email "no-reply@friendi.ca"
       - git config --global user.name "Friendica"
-      - git clone $CI_REPO_LINK addon
+      - git clone $CI_REPO_CLONE_URL addon
       - cd addon/
       - git checkout $CI_COMMIT_BRANCH
       - git fetch origin $CI_COMMIT_REF

.woodpecker/.phpunit.yml

@@ -21,6 +21,9 @@ pipeline:
   clone_friendica_base:
     image: alpine/git
     commands:
+      - git config --global user.email "no-reply@friendi.ca"
+      - git config --global user.name "Friendica"
+      - git config --global --add safe.directory $CI_WORKSPACE
       - git clone https://github.com/friendica/friendica.git .
       - git checkout $CI_COMMIT_BRANCH
   clone_friendica_addon:
@@ -28,7 +31,7 @@ pipeline:
     commands:
       - git config --global user.email "no-reply@friendi.ca"
       - git config --global user.name "Friendica"
-      - git clone $CI_REPO_LINK addon
+      - git clone $CI_REPO_CLONE_URL addon
       - cd addon/
       - git checkout $CI_COMMIT_BRANCH
       - git fetch origin $CI_COMMIT_REF

.woodpecker/.releaser.yml

@@ -9,6 +9,9 @@ pipeline:
   clone_friendica_base:
     image: alpine/git
     commands:
+      - git config --global user.email "no-reply@friendi.ca"
+      - git config --global user.name "Friendica"
+      - git config --global --add safe.directory $CI_WORKSPACE
       - git clone https://github.com/friendica/friendica.git .
       - git checkout $CI_COMMIT_BRANCH
     when:
@@ -19,7 +22,7 @@ pipeline:
     commands:
       - git config --global user.email "no-reply@friendi.ca"
       - git config --global user.name "Friendica"
-      - git clone $CI_REPO_LINK addon
+      - git clone $CI_REPO_CLONE_URL addon
       - cd addon/
       - git checkout $CI_COMMIT_BRANCH
       - git fetch origin $CI_COMMIT_REF

advancedcontentfilter/lang/it/messages.po

@@ -5,7 +5,7 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2018
-# Sylke Vicious <silkevicious@gmail.com>, 2021
+# Sylke Vicious <silkevicious@gmail.com>, 2023
 # 
 #, fuzzy
 msgid ""
@@ -14,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-05-11 08:54-0400\n"
 "PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021\n"
+"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2023\n"
 "Language-Team: Italian (https://app.transifex.com/Friendica/teams/12172/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -125,7 +125,7 @@ msgstr "Annulla"
 
 #: advancedcontentfilter.php:295
 msgid "This addon requires this node having at least one post"
-msgstr ""
+msgstr "Questo addon richiede che questo nodo abbia almeno un messaggio"
 
 #: advancedcontentfilter.php:325 advancedcontentfilter.php:336
 #: advancedcontentfilter.php:347 advancedcontentfilter.php:383

advancedcontentfilter/lang/it/strings.php

@@ -27,6 +27,7 @@ $a->strings['Add new rule'] = 'Aggiungi nuova regola';
 $a->strings['Rule Name'] = 'Nome Regola';
 $a->strings['Rule Expression'] = 'Espressione Regola';
 $a->strings['Cancel'] = 'Annulla';
+$a->strings['This addon requires this node having at least one post'] = 'Questo addon richiede che questo nodo abbia almeno un messaggio';
 $a->strings['You must be logged in to use this method'] = 'Devi essere autenticato per usare questo metodo';
 $a->strings['Invalid form security token, please refresh the page.'] = 'Token di sicurezza invalido, aggiorna la pagina.';
 $a->strings['The rule name and expression are required.'] = 'Il nome e l\'espressione della regola sono richiesti.';

blockbot/blockbot.php

@@ -2,7 +2,7 @@
 /**
  * Name: blockbot
  * Description: Blocking bots based on detecting bots/crawlers/spiders via the user agent and http_from header.
- * Version: 0.2
+ * Version: 1.0
  * Author: Philipp Holzer <admin@philipp.info>
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  *
@@ -13,7 +13,10 @@ use Friendica\DI;
 use Jaybizzle\CrawlerDetect\CrawlerDetect;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
+use Friendica\Core\System;
 use Friendica\Network\HTTPException\ForbiddenException;
+use Friendica\Util\HTTPSignature;
+use Friendica\Util\Network;
 
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
 
@@ -28,115 +31,127 @@ function blockbot_addon_admin(string &$o)
 
 	$o = Renderer::replaceMacros($t, [
 		'$submit'             => DI::l10n()->t('Save Settings'),
-		'$good_crawlers'      => ['good_crawlers', DI::l10n()->t('Allow "good" crawlers'), DI::config()->get('blockbot', 'good_crawlers'), DI::l10n()->t("Don't block fediverse crawlers, relay servers and other bots with good purposes.")],
-		'$socialmedia_agents' => ['socialmedia_agents', DI::l10n()->t('Allow preview agents'), DI::config()->get('blockbot', 'socialmedia_agents'), DI::l10n()->t("Don't block agents from social media systems that want to generate preview data for links that had been set by their users.")],
+		'$security_checker'   => ['security_checker', DI::l10n()->t('Allow security checkers'), DI::config()->get('blockbot', 'security_checker'), DI::l10n()->t("Don't block security checkers. They can be used for good or bad.")],
 		'$http_libraries'     => ['http_libraries', DI::l10n()->t('Allow generic HTTP libraries'), DI::config()->get('blockbot', 'http_libraries'), DI::l10n()->t("Don't block agents from generic HTTP libraries that could be used for good or for bad and that currently can't be traced back to any known Fediverse project.")],
-		'$block_gab'          => ['block_gab', DI::l10n()->t('Block GabSocial'), DI::config()->get('blockbot', 'block_gab'), DI::l10n()->t('Block the software GabSocial. This will block every access for that software. You can block dedicated gab instances in the blocklist settings in the admin section.')],
 		'$training'           => ['training', DI::l10n()->t('Training mode'), DI::config()->get('blockbot', 'training'), DI::l10n()->t("Activates the training mode. This is only meant for developing purposes. Don't activate this on a production machine. This can cut communication with some systems.")],
 	]);
 }
 
 function blockbot_addon_admin_post()
 {
-	DI::config()->set('blockbot', 'good_crawlers', $_POST['good_crawlers'] ?? false);
-	DI::config()->set('blockbot', 'socialmedia_agents', $_POST['socialmedia_agents'] ?? false);
+	DI::config()->set('blockbot', 'security_checker', $_POST['security_checker'] ?? false);
 	DI::config()->set('blockbot', 'http_libraries', $_POST['http_libraries'] ?? false);
-	DI::config()->set('blockbot', 'block_gab', $_POST['block_gab'] ?? false);
 	DI::config()->set('blockbot', 'training', $_POST['training'] ?? false);
 }
 
+function blockbot_reject()
+{
+	throw new ForbiddenException('Bots are not allowed. If you consider this a mistake, create an issue at https://github.com/friendica/friendica');
+}
+
 function blockbot_init_1()
 {
 	if (empty($_SERVER['HTTP_USER_AGENT'])) {
 		return;
 	}
 
-	$logdata = ['agent' => $_SERVER['HTTP_USER_AGENT'], 'uri' => $_SERVER['REQUEST_URI']];
+	$crawlerDetect = new CrawlerDetect();
 
-	// List of known unwanted crawlers.
-	$agents = [
-		'SemrushBot', 's~feedly-nikon3', 'Qwantify/Bleriot/', 'ltx71', 'Sogou web spider/',
-		'Diffbot/', 'YisouSpider', 'evc-batch/', 'LivelapBot/', 'TrendsmapResolver/',
-		'PaperLiBot/', 'Nuzzel', 'um-LN/', 'Google Favicon', 'Datanyze', 'BLEXBot/', '360Spider',
-		'adscanner/', 'HeadlessChrome', 'wpif', 'startmebot/', 'Googlebot/', 'Applebot/',
-		'GoogleImageProxy', 'bingbot/', 'heritrix/', 'ldspider',
-		'AwarioRssBot/', 'TweetmemeBot/', 'dcrawl/', 'PhantomJS/', 'Googlebot-Image/',
-		'CrowdTanglebot/', 'Mediapartners-Google', 'Baiduspider', 'datagnionbot',
-		'MegaIndex.ru/', 'SMUrlExpander', 'Hatena-Favicon/', 'Wappalyzer', 'FlipboardProxy/',
-		'NetcraftSurveyAgent/', 'Dataprovider.com', 'SMTBot/', 'Nimbostratus-Bot/',
-		'DuckDuckGo-Favicons-Bot/', 'IndieWebCards/', 'proximic', 'netEstate NE Crawler',
-		'AhrefsBot/', 'YandexBot/', 'Exabot/', 'Mediumbot-MetaTagFetcher/',
-		'SurdotlyBot/', 'BingPreview/', 'SabsimBot/', 'CCBot/', 'WbSrch/',
-		'DuckDuckBot-Https/', 'HTTP Banner Detection', 'YandexImages/', 'archive.org_bot',
-		'ArchiveTeam ArchiveBot/', 'yacybot', 'https://developers.google.com/+/web/snippet/',
-		'Scrapy/', 'MJ12bot/', 'DotBot/', 'Pinterestbot/', 'Jooblebot/',
-		'Cliqzbot/', 'YaK/', 'Mediatoolkitbot', 'Snacktory', 'FunWebProducts', 'oBot/',
-		'7Siters/', 'KOCMOHABT', 'Google-SearchByImage', 'FemtosearchBot/',
-		'HubSpot Crawler', 'DomainStatsBot/', 'Re-re Studio', 'AwarioSmartBot/',
-		'DNSResearchBot/', 'PetalBot;', 'Nmap Scripting Engine;',
-		'Google-Apps-Script; beanserver;', 'woorankreview/', 'Seekport Crawler;', 'AHC/',
-		'Semanticbot/', 'XoviOnpageCrawler;', 'Pinterest/',
-		'GetHPinfo.com-Bot/', 'BoardReader Favicon Fetcher', 'Google-Adwords-Instant', 'newspaper/',
-		'YurichevBot/', 'Crawling at Home Project', 'InfoTigerBot/', 'AdIdxBot/',
-		'MicrosoftPreview/', 'masscan/', 'Timpibot/', 'everyfeed-spider/', 'AndroidDownloadManager/',
-		'WebZIP/', 'WDG_Validator/', 'Screaming Frog SEO Spider/', ' Bytespider;', 'ISSCyberRiskCrawler/',
-		'BitSightBot/', 'ev-crawler/', 'CensysInspect/1.1', 'Protopage/', 'Gaisbot/', 'WellKnownBot/',
-		'SuperBot/', 'Googlebot-Mobile/', 'GPTBot/', 'GenomeCrawlerd/', '2ip bot/', 'Ocarinabot',
-		'Yahoo! Slurp;', 'AdsBot-Google', 'Gregarius/', 'FAST-WebCrawler/', 'Xenu Link Sleuth/',
-		'Ask Jeeves', 'alexa site audit/', 'Yahoo! Slurp China;', 'Microsoft URL Control',
-		'Facebot', 'Googlebot-Video/', 'msnbot/', 'Offline Explorer/', 'YandexNews/', 'msnbot-media/',
-		'EmailWolf', 'Download Demon/', 'FeedFetcher-Google;', 'WebCopier', '+ONB_Bot_Btrix',
-		'scoopit-crawler/', 'ia_archiver', 'Quora-Bot/', 'WebwikiBot/', 'FullStoryBot/',
-		'wpbot/', 'SearchExpress', 'DuckDuckBot/', 'Google Web Preview',
-	];
+	$isCrawler = $crawlerDetect->isCrawler();
 
-	if (DI::config()->get('blockbot', 'block_gab')) {
-		$agents[] = 'GabSocial/';
+	blockbot_save('all-agents', $_SERVER['HTTP_USER_AGENT']);
+
+	$parts = blockbot_get_parts($_SERVER['HTTP_USER_AGENT']);
+
+	$logdata = ['isCrawler' => $isCrawler, 'agent' => $_SERVER['HTTP_USER_AGENT'], 'method' => $_SERVER['REQUEST_METHOD'], 'uri' => $_SERVER['REQUEST_URI'], 'parts' => $parts];
+
+	if ($isCrawler) {
+		blockbot_check_login_attempt($_SERVER['REQUEST_URI'], $logdata);
 	}
 
-	// List of "good" crawlers, mostly from the fediverse.
-	$good_agents = [
-		'fediverse.space crawler', 'fediverse.network crawler', 'Active_Pods_CheckBot_3.0',
-		'Social-Relay/', 'Test Certificate Info', 'Uptimebot/', 'GNUSocialBot', 'UptimeRobot/',
-		'PTST/', 'Zabbix', 'Poduptime/', 'FediFetcher', 'lemmy-stats-crawler',
-		'FedditLemmyverseCrawler/', 'lemmy-explorer-crawler/', 'URIports Validator',
-		'rss-is-dead.lol web bot;', 'fedistatsCrawler/', 'W3C_CSS_Validator_JFouffa/',
-		'IABot/', 'Slackbot 1', 'BeeperBot/', 'Matrix-Media-Repo/', 'P3P Validator',
-		'KeybaseBot;',
-	];
-
-	if (!DI::config()->get('blockbot', 'good_crawlers')) {
-		$agents = array_merge($agents, $good_agents);
-	} elseif (blockbot_match($good_agents)) {
+	if (empty($parts)) {
+		Logger::debug('Known frontend found - accept', $logdata);
+		if ($isCrawler) {
+			blockbot_save('badly-parsed-agents', $_SERVER['HTTP_USER_AGENT']);
+		}
 		return;
 	}
 
-	// List of agents from social media systems that fetch preview data via opem graph or twitter cards.
-	$socialmedia_agents = ['Twitterbot', 'facebookexternalhit/', 'SkypeUriPreview Preview/',
-		'TelegramBot', 'WhatsApp/', 'github-camo', 'Bluesky Cardyb/', 'XING-contenttabreceiver/', 
-		'LinkedInBot/', 'Instagram ', 'Synapse (bot; ', 'Discordbot/', 'SummalyBot/',
-		'Slackbot-LinkExpanding', 'Slack-ImgProxy', 'Iframely/',
-	];
+	blockbot_log_activitypub($_SERVER['REQUEST_URI'], $_SERVER['HTTP_USER_AGENT']);
 
-	if (!DI::config()->get('blockbot', 'socialmedia_agents')) {
-		$agents = array_merge($agents, $socialmedia_agents);
-	} elseif (blockbot_match($socialmedia_agents)) {
-		return;
+	if (blockbot_is_crawler($parts)) {
+		Logger::debug('Crawler found - reject', $logdata);
+		blockbot_reject();
 	}
-	
-	// HTTP Libraries
-	$http_libraries = ['ReactorNetty/', 'GuzzleHttp/', 'Embed PHP library', 'python-urllib3/',
-		'EventMachine HttpClient', 'HTMLParser/'
-	];
 
-	if (!DI::config()->get('blockbot', 'http_libraries')) {
-		$agents = array_merge($agents, $http_libraries);
-	} elseif (blockbot_match($http_libraries)) {
+	if (blockbot_is_searchbot($parts)) {
+		Logger::debug('Search bot found - reject', $logdata);
+		blockbot_reject();
+	}
+
+	if (blockbot_is_unwanted($parts)) {
+		Logger::debug('Uncategorized unwanted agent found - reject', $logdata);
+		blockbot_reject();
+	}
+
+	if (blockbot_is_security_checker($parts)) {
+		if (!DI::config()->get('blockbot', 'security_checker')) {
+			Logger::debug('Security checker found - reject', $logdata);
+			blockbot_reject();
+		}
+		Logger::debug('Security checker found - accept', $logdata);
 		return;
 	}
 
-	if (blockbot_match($agents)) {
-		throw new ForbiddenException('Bots are not allowed. If you consider this a mistake, create an issue at https://github.com/friendica/friendica');
+	if (blockbot_is_social_media($parts)) {
+		Logger::debug('Social media service found - accept', $logdata);
+		return;
+	}
+
+	if (blockbot_is_fediverse_client($parts)) {
+		Logger::debug('Fediverse client found - accept', $logdata);
+		return;
+	}
+
+	if (blockbot_is_feed_reader($parts)) {
+		Logger::debug('Feed reader found - accept', $logdata);
+		return;
+	}
+
+	if (blockbot_is_fediverse_tool($parts)) {
+		Logger::debug('Fediverse tool found - accept', $logdata);
+		return;
+	}
+
+	if (blockbot_is_service_agent($parts)) {
+		Logger::debug('Service agent found - accept', $logdata);
+		return;
+	}
+
+	if (blockbot_is_monitor($parts)) {
+		Logger::debug('Monitoring service found - accept', $logdata);
+		return;
+	}
+
+	if (blockbot_is_validator($parts)) {
+		Logger::debug('Validation service found - accept', $logdata);
+		return;
+	}
+
+	if (blockbot_is_good_tool($parts)) {
+		Logger::debug('Uncategorized helpful service found - accept', $logdata);
+		return;
+	}
+
+	// Needs to be checked at the end, since other services might use these libraries
+	if (blockbot_is_http_library($parts)) {
+		blockbot_check_login_attempt($_SERVER['REQUEST_URI'], $logdata);
+		if (!DI::config()->get('blockbot', 'http_libraries')) {
+			Logger::debug('HTTP Library found - reject', $logdata);
+			blockbot_reject();
+		}
+		Logger::debug('HTTP Library found - accept', $logdata);
+		return;
 	}
 
 	// This switch here is only meant for developers who want to add more bots to the list above, it is not safe for production.
@@ -144,44 +159,684 @@ function blockbot_init_1()
 		return;
 	}
 
-	$crawlerDetect = new CrawlerDetect();
-
-	if (!$crawlerDetect->isCrawler()) {
-		logger::debug('Good user agent detected', $logdata);
+	if (!$isCrawler) {
+		blockbot_save('good-agents', $_SERVER['HTTP_USER_AGENT']);
+		Logger::debug('Non-bot user agent detected', $logdata);
 		return;
 	}
 
-	// List of known "good" agents, mostly used by Fediverse systems, feed readers, ...
-	$agents = [
-		'curl', 'zgrab', 'Go-http-client', 'curb', 'github.com', 'reqwest', 'Feedly/',
-		'Python-urllib/', 'Liferea/', 'aiohttp/', 'WordPress.com Reader', 'hackney/',
-		'Faraday v', 'okhttp', 'UniversalFeedParser', 'PixelFedBot', 'python-requests',
-		'WordPress/', 'http.rb/', 'Apache-HttpClient/', 'WordPress.com;', 'Pleroma',
-		'Dispatch/', 'Ruby', 'Java/', 'libwww-perl/', 'Mastodon/', 'FeedlyApp/',
-		'lua-resty-http/', 'Tiny Tiny RSS/', 'Wget/', 'PostmanRuntime/',
-		'W3C_Validator/', 'NetNewsWire', 'FeedValidator/', 'theoldreader.com', 'axios/',
-		'Paw/', 'PeerTube/', 'fedi.inex.dev', 'FediDB/', 'index.community crawler',
-		'Slackbot-LinkExpanding', 'Firefish/', 'Takahe/', 'Akkoma ', 'Misskey/', 'Lynx/',
-		'camo-rs asset proxy', 'gotosocial/', 'incestoma ', 'SpaceCowboys Android RSS Reader',
-		'NewsBlur Feed Finder', 'Lemmy/', 'enby-town/', 'rss2tg bot;', '; HTTrack ',
-		'MbinBot', 'kbinBot', 'Pixelfed/', 'NewsBlur Feed Fetcher', 'NewsBlur Page Fetcher',
-	];
-
-	if (blockbot_match($agents)) {
-		logger::info('False positive', $logdata);
-		return;
-	}
-
-	logger::notice('Blocked bot', $logdata);
-	throw new ForbiddenException('Bots are not allowed. If you consider this a mistake, create an issue at https://github.com/friendica/friendica');
+	blockbot_save('bad-agents', $_SERVER['HTTP_USER_AGENT']);
+	Logger::notice('Possible bot found - reject', $logdata);
+	blockbot_reject();
 }
 
-function blockbot_match(array $agents)
+function blockbot_save($database, $userAgent)
 {
-	foreach ($agents as $agent) {
-		if (stristr($_SERVER['HTTP_USER_AGENT'], $agent)) {
+	if (!DI::config()->get('blockbot', 'logging') || !function_exists('dba_open')) {
+		return;
+	}
+
+	$resource = dba_open(System::getTempPath() . '/' . $database, 'cl');
+	$result = dba_fetch($userAgent, $resource);
+	if ($result === false) {
+		dba_insert($userAgent, true, $resource);
+	}
+	dba_close($resource);
+}
+
+function blockbot_log_activitypub(string $url, string $agent)
+{
+	if (!DI::config()->get('blockbot', 'logging')) {
+		return;
+	}
+
+	$bot = ['/.well-known/nodeinfo', '/nodeinfo/2.0', '/nodeinfo/1.0'];
+	if (in_array($url, $bot)) {
+		blockbot_save('activitypub-stats', $agent);
+	}
+
+	$bot = ['/api/v1/instance', '/api/v2/instance', '/api/v1/instance/extended_description',
+		'/api/v1/instance/peers'];
+	if (in_array($url, $bot)) {
+		blockbot_save('activitypub-api-stats', $agent);
+	}
+
+	if (substr($url, 0, 6) == '/api/v') {
+		blockbot_save('activitypub-api', $agent);
+	}
+
+	if (($_SERVER['REQUEST_METHOD'] == 'POST') && in_array('inbox', explode('/', parse_url($url, PHP_URL_PATH)))) {
+		blockbot_save('activitypub-inbox-agents', $agent);
+	}
+
+	if (!empty($_SERVER['HTTP_SIGNATURE']) && !empty(HTTPSignature::getSigner('', $_SERVER))) {
+		blockbot_save('activitypub-signature-agents', $agent);
+	}
+}
+
+function blockbot_check_login_attempt(string $url, array $logdata)
+{
+	if (in_array(trim(parse_url($url, PHP_URL_PATH), '/'), ['login', 'lostpass', 'register'])) {
+		Logger::debug('Login attempt detected - reject', $logdata);
+		blockbot_reject();
+	}
+}
+
+/**
+ * Uncategorized and unwanted services
+ *
+ * @param array $parts
+ * @return boolean
+ */
+function blockbot_is_unwanted(array $parts): bool
+{
+	$agents = [
+		'oii-research', 'yisouspider', 'bots.retroverse.social', 'gaisbot', 'bloglines', 'emailwolf',
+		'webtech', 'facebookscraper', 'www.ecsl.cs.sunysb.edu/~maxim/cgi-bin/link',
+		'gulper', 'magellan', 'linkcheck', 'nerdybot', 'ms search robot', 'fast-webcrawler',
+		'yioopbot', 'webster', 'www.admantx.com', 'openhosebot', 'lssrocketcrawler', 'dow jones searchbot',
+		'gomezagent', 'domainsigmacrawler', 'netseer crawler', 'superbot', 'searchexpress',
+		'alittle client', 'amazon-kendra', 'scanner.ducks.party', 'isscyberriskcrawler',
+		'google wireless transcoder',
+	];
+
+	foreach ($parts as $part) {
+		if (in_array($part, $agents)) {
 			return true;
 		}
 	}
 	return false;
-}
+}
+
+/**
+ * Services defined as "crawlers"
+ *
+ * @param array $parts
+ * @return boolean
+ */
+function blockbot_is_crawler(array $parts): bool
+{
+	$agents = [
+		'+http://yourls.org', 'adbeat.com/policy', 'https://gtmetrix.com', 'hubspot', 'nutch-',
+		'openwebspider'
+	];
+	foreach ($parts as $part) {
+		foreach ($agents as $agent) {
+			if (strpos($part, $agent) !== false) {
+				return true;
+			}
+		}
+	}
+
+	$agents = [
+		'ahrefsbot', 'pinterest', 'proximic', 'applebot', 'synapseworkstation.3.2.1',
+		'slackbot-linkexpanding', 'semrushbot-sa', 'qwantify', 'google search console',
+		'tbot-nutch', 'screaming frog seo spider', 'exaleadcloudview', 'dotbot', 'exabot',
+		'spbot', 'surdotlybot', 'tweetmemebot', 'cliqzbot', 'startmebot', 'ccbot', 'zoombot',
+		'domain re-animator bot', 'nutch', 'archive.org_bot http://www.archive.org/details',
+		'yahoo link preview', 'mxt', 'grapeshotcrawler', 'maxpointcrawler', 'vagabondo',
+		'archive.org_bot', 'infegyatlas', '2ip bot', 'accompanybot', 'antbot', 'anthropic-ai',
+		'aspiegelbot', 'cispa web analyzer', 'claudebot', 'colly', 'petalbot', 'ioncrawl',
+		'embedly +support@embed.ly', 'gitcrawlerbot', 'google favicon', 'httpx', 'seokicks',
+		'kocmohabt', 'masscan-ng', 'mixnodecache', 'nicecrawler', 'birdcrawlerbot', 'seolyt',
+		'dataprovider.com', 'dnsresearchbot', 'domains project', 'evc-batch', 'ev-crawler',
+		'example3', 'geedobot', 'internetmeasurement', 'ips-agent', 'semanticscholarbot',
+		'sputnikfaviconbot', 't3versionsbot', 'tchelebi', 'thinkchaos', 'velenpublicwebcrawler',
+		'webwikibot', 'woobot', 'project-resonance', 'mtrobot', 'webprosbot', 'youbot',
+		'queryseekerspider', 'scanning for research', 'semrushbot', 'senutobot', 'spawning-ai',
+		'statista.com publication finder crawler', 'turnitin', 'who.is bot', 'zaldamosearchbot',
+		'nuzzel', 'boardreader blog indexer', 'hatena-favicon', 'nbertaupete95', 'scrapy',
+		"electronic frontier foundation's do not track verifier", 'synapse', 'trendsmapresolver',
+		'pinterestbot', 'um-ln', 'slack-imgproxy', 'diffbot', 'dataforseobot', 'bw', 'bitlybot',
+		'twingly recon-klondike', 'imagesiftbot', 'rogerbot', 'yahoocachesystem', 'favicon',
+		'vkshare', 'appid: s~virustotalcloud', 'clickagy intelligence bot v2', 'gptbot',
+		'archive.org_bot http://archive.org/details', 'wellknownbot', 'archiveteam archivebot',
+		'megaindex.ru', 'adbeat_bot', 'masscan', 'embedly', 'cloudflare-amp', 'exabot-thumbnails',
+		'yahoo ad monitoring', 'seokicks-robot', 'trendiction search', 'semrushbot-si', 'plukkie',
+		'hubpages v0.2.2', 'aream.bot', 'safednsbot', 'linkpadbot', 'gluten free crawler',
+		'turnitinbot', 'xovibot', 'domaincrawler', 'nettrack', 'domaincrawler', 'yak', 'bubing',
+		'netestate ne crawler', 'blexbot', 'the knowledge ai', 'optimizer', 'hubspot webcrawler',
+		'venuscrawler', 'adstxtcrawler', 'iframely', 'checkmarknetwork', 'semrushbot-ba',
+		'archive.org bot', 'aihitbot', 'sitesucker', 'adstxtlab.com crawler', 'jobboersebot',
+		'http://www.archive.org/details/archive.org_bot', 'heritrix', 'appid: s~snapchat-proxy',
+		'icc-crawler', 'mbcrawler', 'slackbot', 'trumind-crawler', 'newspaper', 'online-webceo-bot',
+		'haena-pepper', 'y! crawler', 'linkwalker', 'seznamemailproxy', 'seekport crawler',
+		'domainstatsbot', 'qwantify/mermoz', 'sprinklr', 'komodiabot', 'seoscanners.net',
+		'domainappender', 'mixrankbot', 'abonti', 'urlappendbot', 'sistrix crawler',
+		'hatenabookmark', 'metainspector', 'ezooms', 'quora link preview', 'semrushbot-bm',
+		'barkrowler', 'panscient.com', 'http://tweetedtimes.com', 'twingly recon',
+		'collection@infegy.com', 'mediatoolkitbot', 'cloudflare-amphtml', 'ramblermail',
+		'tineye', 'adscanner', 'datagnionbot', 'aa_crawler', 'http://www.profound.net/domainappender',
+		'appid: e~arsnova-filter-system', 'kinglandsystemscorp', 'crmnlcrawlagent', 'techfetch-bot',
+	];
+
+	foreach ($parts as $part) {
+		if (substr($part, -13) == ' accompanybot') {
+			return true;
+		}
+
+		if (in_array($part, $agents)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+/**
+ * Services defined as search bots
+ *
+ * @param array $parts
+ * @return boolean
+ */
+function blockbot_is_searchbot(array $parts): bool
+{
+	$agents = ['baiduspider'];
+	foreach ($parts as $part) {
+		foreach ($agents as $agent) {
+			if (strpos($part, $agent) !== false) {
+				return true;
+			}
+		}
+	}
+
+	$agents = [
+		'yahoo! slurp', 'linkcheck by siteimprove.com', 'googlebot', '360spider', 'haosouspider',
+		'mj12bot', 'feedfetcher-google', 'mediapartners-google', 'duckduckgo-favicons-bot',
+		'googlebot-mobile', 'gigablastopensource', 'bingbot', 'surveybot', 'yandexbot',
+		'google web preview', 'meanpathbot', 'wesee_bot:we_help_monitize_your_site',
+		'seznambot', 'sogou web spider', 'linkdexbot', 'msnbot', 'smtbot', 'yandexmetrika',
+		'google-site-verification', 'netcraft ssl server survey - contact info@netcraft.com',
+		'orangebot', 'google-adwords-instant', 'googlebot-richsnippets', 'google-lens',
+		'googleother', 'google-test', 'linkdex.com', 'mail.ru', 'awariobot', 'bytespider',
+		'coccocbot-image', 'discobot', 'google-inspectiontool', 'netcraftsurveyagent',
+		'tineye-bot', 'tineye-bot-live', 'bingpreview', 'ask jeeves', 'adsbot-google', "msnbot-media ",
+		'googlebot-image', 'googlebot-news', 'googlebot-video', 'msnbot-media', 'yahoo! slurp china',
+		'inoreader.com-like feedfetcher-google', 'google-amphtml', 'duckduckbot', 'coccocbot-web',
+		'googleassociationservice', 'yandexwebmaster', 'yacybot', 'duckduckbot-https', 'yandexmobilebot',
+		'mail.ru_bot/fast', 'yandeximages', 'mail.ru_bot/img', 'ia_archiver', 'yandexblogs',
+		'yandexaccessibilitybot', 'yandeximageresizer', 'mail.ru_bot', 'yeti', 'obot', 'baiduspider-render',
+		'netcraft web server survey', 'yandexnews', 'google', 'yandexrenderresourcesbot',
+		'match by siteimprove.com', 'yandexsitelinks', 'yandexantivirus', 'daum', 'mail.ru_bot/robots',
+		'yandexmedia', 'msnbot-products', 'yandexvideo', 'yandexvertis', 'catexplorador', 'yandexcalendar',
+		'yandexfavicons', 'user-agent\x09baiduspider', 'baiduspider-image', 'yandexpagechecker', 'mojeekbot',
+		'adsbot-google-mobile', 'google-adwords-displayads-webrender', 'seznam screenshot-generator',
+		'yandexscreenshotbot', 'zumbot', 'tracemyfile', 'wotbox', 'google-adwords-express',
+		'google-adwords-displayads', 'google-youtube-links', 'yandexvideoparser', 'paperlibot',
+		'weborama-fetcher', 'googleproducer', 'coccoc', 'acoonbot', 'psbot', 'sosospider', 'voilabot',
+		'blekkobot', 'easouspider', 'omgili', 'yadirectfetcher', 'sogou pic spider', 'daumoa',
+	];
+
+	foreach ($parts as $part) {
+		if (in_array($part, $agents)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+/**
+ * Services in the "security" context
+ *
+ * @param array $parts
+ * @return boolean
+ */
+function blockbot_is_security_checker(array $parts): bool
+{
+	$agents = [
+		'http banner detection', 'l9explore', 'l9tcpid', 'lkx-apache2449traversalplugin',
+		'bitsightbot', 'censysinspect', 'pathspider', 'repolookoutbot', 'sqlmap', 'ltx71',
+		'netsystemsresearch studies the availability of various services across the internet. our website is netsystemsresearch.com',
+		'expanse a palo alto networks company searches across the global ipv4 space multiple times per day to identify customers&#39',
+		'zgrab', 'nmap scripting engine', 'l9scan', 'riddler', 'cloud mapping experiment. contact research@pdrlabs.net',
+	];
+
+	foreach ($parts as $part) {
+		if (in_array($part, $agents)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+/**
+ * Services that check pages for e.g. valid HTML
+ *
+ * @param array $parts
+ * @return boolean
+ */
+function blockbot_is_validator(array $parts): bool
+{
+	$agents = [
+		'jigsaw', 'ssl labs', 'w3c_validator', 'w3c-checklink', 'p3p validator', 'csscheck', 'validator.nu',
+		'google-structured-data-testing-tool https://search.google.com/structured-data', 'w3c_unicorn',
+	];
+
+	foreach ($parts as $part) {
+		if (in_array($part, $agents)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+/**
+ * Services that monitor a page
+ *
+ * @param array $parts
+ * @return boolean
+ */
+function blockbot_is_monitor(array $parts): bool
+{
+	$agents = [
+		'alexa site audit', 'catchpoint', 'google page speed insights', 'checkhost',
+		'poduptime', 'chrome-lighthouse', 'zabbix', 'cloudflare-alwaysonline', 'ptst',
+		'pingadmin.ru', 'pingdomtms', 'nimbostratus-bot', 'uptimebot', 'uptimerobot',
+		'http://notifyninja.com/monitoring', 'http://www.freewebmonitoring.com',
+	];
+
+	foreach ($parts as $part) {
+		if (in_array($part, $agents)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+/**
+ * Services in the centralized and decentralized social media environment 
+ *
+ * @param array $parts
+ * @return boolean
+ */
+function blockbot_is_social_media(array $parts): bool
+{
+	$agents = ['camo-rs asset proxy', 'camo asset proxy'];
+	foreach ($parts as $part) {
+		foreach ($agents as $agent) {
+			if (strpos($part, $agent) !== false) {
+				return true;
+			}
+		}
+	}
+
+	$agents = [
+		'facebookexternalhit', 'twitterbot', 'mastodon', 'facebookexternalua',
+		'friendica', 'diasporafederation', 'buzzrelay', 'activityrelay',
+		'aoderelay', 'ap-relay', 'peertube', 'misskey', 'pleroma', 'foundkey', 'akkoma',
+		'lemmy', 'calckey', 'mobilizon', 'zot', 'camo-rs', 'gotosocial', 'pixelfed',
+		'pixelfedbot', 'app.wafrn.net', 'go-camo', 'http://a.gup.pe', 'iceshrimp',
+		'firefish', 'activity-relay', 'juick', 'camo', 'python/federation', 'nextcloud',
+		'snac', 'bovine', 'takahe', 'freedica', 'gnu social', 'microblogpub',
+		'mbin', 'mammoth', 'kbinbot', 'honksnonk', 'misskeymediaproxy', 'kbinbot', 'jistflow',
+		'mastodon/3.4.1 fedibird', 'fedibird', 'funkwhale', 'linkedinbot',
+		'wafrn-cache-generator', 'simple social network', 'mbinbot', 'wordpress.com',
+		'catnip', 'castopod', 'enby-town', 'vernissage', 'iceshrimp.net', 'plasmatrap',
+		'imgproxy', 'rustypub', 'flipboard activitypub', 'gnu social activitypub plugin',
+		'micro.blog', 'mastodon-bookmark-rss', 'bookwyrm', 'damus', 'primal', 'misskeyadmin',
+		'ruby, mastodon', 'nextcloud social', 'camo asset proxy', 'smithereen', 'sorasns',
+		'cherrypick', 'bonfire activitypub federation', 'upub+0.1.0', 'plume', 'incestoma',
+		'gyptazyfedi', 'apogee', 'quolibet', 'magpie-crawler', 'redditbot', 'facebookplatform',
+	];
+
+	foreach ($parts as $part) {
+		if (in_array($part, $agents)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+/**
+ * Fediverse clients
+ *
+ * @param array $parts
+ * @return boolean
+ */
+function blockbot_is_fediverse_client(array $parts): bool
+{
+	$agents = [
+		'mastodonandroid', 'tootdeck-worker', 'piefed', 'brighteon', 'pachli', 'tusky', 'mona', 'mitra',
+		'megalodonandroid', 'fedilab', 'mastodonapp', 'toot!', 'intravnews',
+		'pixeldroid', 'greatnews', 'protopage', 'newsfox', 'vienna', 'wp-urldetails', 'husky',
+		'activitypub-go-http-client', 'mobilesafari', 'mastodon-ios', 'mastodonpy', 'techniverse',
+		'relatica',
+	];
+
+	foreach ($parts as $part) {
+		if (in_array($part, $agents)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+/**
+ * Feed reading clients and services
+ *
+ * @param array $parts
+ * @return boolean
+ */
+function blockbot_is_feed_reader(array $parts): bool
+{
+	$agents = [
+		'tiny tiny rss', 'mlem', 'feedly', 'flipboardproxy',  'reeder', 'netnewswire',
+		'freshrss', 'feedlyapp', 'feedlybot', 'feeddemon', 'rssowl', 'simplepie',
+		'magpierss',  'universalfeedparser', 'newsgatoronline', 'theoldreader.com',
+		'quiterss', 'feedburner', 'digg feed fetcher', 'r6_feedfetcher', 'apple-pubsub',
+		'netvibes', 'newsblur page fetcher', 'newsblur favicon fetcher', 'newsblur favicon fetcher',
+		'liferea', 'http://www.jetbrains.com/omea_reader/', 'feedblitz', 'bloglovin',
+		'windows-rss-platform', 'feedshow', 'feedreader', 'rssbandit', 'everyfeed-spider',
+		'feeeed', 'spacecowboys android rss reader', 'gregarius', 'feedspot',
+		'feedspot ssl asset proxy', 'newsgator', 'newsgator fetchlinks extension',
+		'akregator', 'appid: s~feedly-nikon3',
+	];
+
+	foreach ($parts as $part) {
+		if (in_array($part, $agents)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+function blockbot_is_fediverse_tool(array $parts): bool
+{
+	$agents = [
+		'diaspora-connection-tester', 'fediblock.manalejandro.com',
+		'mastodoninstances', 'fedilist agent', 'https://fedilist.com/', 'fedidb',
+		'https://wiki.communitydata.science/communitydata:fediverse_research', 'mastofeed.com',
+		'lemmy-explorer-crawler', 'fedicheck.online v1.0', 'momostr', 'fedditlemmyversecrawler',
+		'fediseer', 'fedistatscrawler', 'gnusocialbot', 'fedifetcher', 'fedineko', 'bird.makeup',
+		'fediverse', 'fedicheck.online', 'https://fed.brid.gy/', 'lemmy-stats-crawler',
+		"fediverse's stats", 'friendicadirectory', 'rss discovery engine',
+		'python-opengraph-jaywink', 'connect.rocks', 'tootsdk',
+	];
+
+
+	foreach ($parts as $part) {
+		if (in_array($part, $agents)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+/**
+ * General services
+ *
+ * @param array $parts
+ * @return boolean
+ */
+function blockbot_is_service_agent(array $parts): bool
+{
+	$agents = ['wordpress.com'];
+	foreach ($parts as $part) {
+		foreach ($agents as $agent) {
+			if (strpos($part, $agent) !== false) {
+				return true;
+			}
+		}
+	}
+
+	$agents = [
+		'chrome privacy preserving prefetch proxy', 'http compression test', 'microsoftpreview',
+		'pocketimagecache', 'wordpress', 'skypeuripreview preview', 'wordpress.com', 'discordbot',
+		'summalybot', 'livelapbot', 'whatsapp', 'facebot', 'skypeuripreview',
+		'plasmatrap image proxy server', 'grammarly', 'browsershots', 'google-apps-script',
+		'yahoomailproxy', 'pocketparser', 'apachebench',
+	];
+
+	foreach ($parts as $part) {
+		if (in_array($part, $agents)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+/**
+ * Libraries that perform HTTP requests
+ *
+ * @param array $parts
+ * @return boolean
+ */
+function blockbot_is_http_library(array $parts): bool
+{
+	if ((count($parts) == 1) && in_array($parts[0], ['okhttp', 'useragent', 'faraday'])) {
+		return true;
+	}
+
+	$agents = ['faraday '];
+	foreach ($parts as $part) {
+		foreach ($agents as $agent) {
+			if (strpos($part, $agent) !== false) {
+				return true;
+			}
+		}
+	}
+
+	$agents = [
+		'python-urllib', 'go-http-client', 'axios', 'java', 'undici', 'node', 'ruby',
+		'mint', 'wget', 'dart:io', 'dart', 'caveman-sieve', 'guzzlehttp', 'deno',
+		'aiohttp', 'networkingextension', 'python-asks', 'fasthttp', 't7', 'scalaj-http',
+		'curl', 'python-requests', 'node-fetch', 'offline explorer', 'aria2',
+		'link_thumbnailer', 'python-httpx', 'com.apple.safari.searchhelper',
+		'com.apple.webkit.networking', 'luasocket', 'libwww-perl', 'google-http-java-client',
+		'appengine-google', 'reqwest', 'htmlparser', 'headlesschrome', 'winhttp',
+		'webcopier', 'webzip', 'http.jl', 'got', 'hackney', 'oca\mail\vendor\favicon',
+		'winhttp.winhttprequest.5', 'go package http', 'jakarta commons-httpclient',
+		'cpp-httplib', 'fuzz faster u fool v1.3.1-dev', 'fuzz faster u fool v1.5.0-dev',
+		'go http package', 'go-resty', 'http.rb', 'ivre-masscan', 'java1.0.21.0',
+		'jsdom', 'python-urllib3', 'reactornetty', 'req', 'restsharp', 'ruby-rdf-distiller',
+		'pycurl', 'fdm', 'fdmx', 'lua-resty-http', 'python-httplib2', 'anyevent-http',
+		'node-superagent', 'unirest-java', 'gvfs', 'http_request2', 'java browser', 'cakephp',
+		'curly http client', 'lavf', 'typhoeus',
+	];
+
+	foreach ($parts as $part) {
+		if (in_array($part, $agents)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+/**
+ * Uncategorized helpful services
+ *
+ * @param array $parts
+ * @return boolean
+ */
+function blockbot_is_good_tool(array $parts): bool
+{
+	$agents = [
+		'easy-feed-oven', 'cutycapt', 'rss-is-dead.lol web bot', 'dnt-policy@eff.org',
+		'https://socnetv.org', 'opengraphreader', 'trendfetcher', 'iabot', 'rss-is-dead.lol feed bot',
+		'androiddownloadmanager', 'readybot.io', 'hydra', 'httrack', 'vlc', 'wdg_validator', 'download demon',
+	];
+
+
+	foreach ($parts as $part) {
+		if (in_array($part, $agents)) {
+			return true;
+		}
+	}
+	return false;
+}
+
+function blockbot_get_parts(string $agent): array
+{
+	$parts        = [];
+	$level        = 0;
+	$start        = 0;
+	$end          = 0;
+	$has_brackets = false;
+	for ($pos = 0; $pos < strlen($agent); $pos++) {
+		if ((strpos(substr($agent, $pos), '(') === false) && ($level == 0)) {
+			$part = substr($agent, $pos);
+			$parts = array_merge($parts, blockbot_split_parts($part, strpos($part, '/'), !$has_brackets));
+			break;
+		} elseif (substr($agent, $pos, 1) == '(') {
+			$level++;
+			$has_brackets = true;
+			if ($level == 1) {
+				$part = substr($agent, $end, $pos - $end);
+				$parts = array_merge($parts, blockbot_split_parts($part, $start != 0, false));
+				$start = $pos + 1;
+			}
+		} elseif (substr($agent, $pos, 1) == ')') {
+			$level--;
+			if ($level == 0) {
+				$part = substr($agent, $start, $pos - $start);
+				$parts = array_merge($parts, blockbot_split_parts($part, false, true));
+				$end = $pos + 1;
+			}
+		}
+	}
+	return blockbot_remove_browser_parts($parts);
+}
+
+function blockbot_remove_browser_parts(array $parts): array
+{
+	$cleaned = [];
+	foreach ($parts as $part) {
+		if (substr($part, -6) == ' build') {
+			continue;
+		}
+		$known = [
+			'mozilla', 'x11', 'ubuntu', 'linux x86_64', 'gecko', 'firefox', 'windows nt',
+			'win64', 'x64', 'android', 'applewebkit', 'khtml', 'like', 'chrome', 'safari', 'edg',
+			'unsupported', 'compatible', 'macintosh', 'intel mac os x', 'version', 'windows',
+			'u', 'en-us', '.net', '.net', 'wow64', 'linux', 'k', 'mobile', 'opr', 'msie',
+			'dalvik', 'build', 'nt', 'mobile safari', 'gecko/firefox', 'zh-cn', 'en-gb', 'clr',
+			'trident', '.net clr', 'qtwebengine', 'linux i686', 'tablet pc', 'ppc mac os x',
+			'en', 'fedora', 'ppc', 'edge', 'yabrowser', 'yowser', 'media center pc', 'arm_64',
+			'android 9', 'cros x86_64', 'iphone', 'cpu iphone os like mac os x', 'core',
+			'qqbrowser', 'beta', 'khtml like gecko', 'psp (playstation portable)', 'ia64',
+			'firephp', 'live', 'slcc2', 'infopath.2', 'bidubrowser', 'ubrowser', 'baiduboxapp',
+			'waterfox', 'lynx', 'libwww-fm', 'ssl-mm', 'openssl', 'gnutls', '.net4.0c', '.net4.0e',
+			'infopath.3', 'opera', 'palemoon', 'goanna', 'vivaldi', 'presto', 'intrepid', 'ru',
+			'ipad', 'cpu os like mac os x', 'omniweb', 'chromium', 'thunderbird', 'ubuntu lts',
+			'os', 'qupzilla', 'seamonkey', 'warp', 'konqueror', 'meego', 'nokian9', 'nokiabrowser',
+			'profile', 'configuration', 'untrusted', 'samsungbrowser', 'es-us', 'pocophone f1',
+			'sonyericssonw995', 'crios', 'lbbrowser', 'gwx:qualified', 'gwx:red', 'gwx:reserved',
+			'microsoft outlook', 'word', 'microsoft', 'office', 'powerpoint', 'excel',
+			'internet explorer', 'like gecko', 'shuame', 'qianniu', 'khtml, like gecko',
+			'cutycapt version', 'khtml, live gecko', '68k', 'sv1', 'aef', 'gtb7.5', 'gfe',
+			'embedded web browser from: http://bsalsa.com', 'wv', 'malnjs', '2.00',
+			'fsl', 'lcjb', 'malcjs', 'touch', 'masmjs', 'malc', 'maln', 'foxy', 'bri', 'lcte',
+			'embeddedwb from: http://www.bsalsa.com', '2345explorer', 'hpntdfjs', 'h4213',
+			'rb.gy', 'sm-a505fn', 'lenovo tb-8504x', 'silk', 'lya-al00', 'windows xp', 'openbsd',
+			'netbsd amd64', 'sa', 'samsung sm-g950f', 'redmi note', 'hry-lx1', 'cph2205',
+			'16th', 'redmi note pro', 'xiaomi/miuibrowser', 'sk-sk', 'linux i686 on x86_64',
+			'debian iceweasel', 'rmx2101', 'mi note pro', 'rmx1921', 'nokia6100', '04.01',
+			'fr-fr', 'slackware', 'sm-a225f', 'fennec', 'links', 'i386', 'windows phone os',
+			'blackberry', 'maxthon', 'opera mini', 'j2me', 'winnt4.0', 'phoenix', 'avant browser',
+			'iceweasel', 'moto e(7) plus', 'like geckoo', 'wpdesktop', 'nokia', 'lumia', 'arm',
+			'de-at', 'pixel', 'puffin', 'zte blade a7', 'linux armv7l', 'hd1913', 'symbianos',
+			'symbian os', 'de', '452', 'opera [en-us]', 'iemobile', 'windows phone', 'sm-g991b',
+			'sm-j810g', 'da-dk', 'symbian', 'series60', 'nokiax7-00', 'freebsd amd64', 'openbsd amd64',
+			'sm-n920c', 'blazer', 'palmsource', '16;320x320', 'sm-g998b', 'sm-a505g', 'freebsd i386',
+			'jaunty', 'shiretoko', 'playbook', 'rim tablet os', 'asus;galaxy6', 'minimo',
+			'linux arm7tdmi', 'blackberry7520', 'dl1036', '100011886a', 'lt-gtklauncher',
+			'browserng', 'nokiae7-00', 'ubuntu chromium', 'silk-accelerated=true', 'openbsd i386',
+			'windows ce', 'microsoft zunehd', 'epiphany', 'es-es', 'ru-ru', 'netbsd', 'ipod',
+			'safari', 'xbox', 'xbox one', 'fxios', 'opx', 'ucbrowser', 'u3',
+			'webos', 'desktop', 'compatible msie windows nt', 'sm-a525f', 'sm-g991u', 'ze520kl',
+			'cros i686', 'de-de', 'en-ca', 'config', 'i686', 'sm-g970u', 'win95', 'i',
+			'nokia7250', 'oneplus a6003', 'i2126', 'nintendo wii', 'vog-l29', 'msoffice', 'ms-office',
+			'oneplus a5010', 'linux mint', 'blackberry8320', 'observatory', 'qdesk',
+			'alexatoolbar', 'se metasr', 'qqdownload', 'alexa toolbar', 'baiduclient', 'ddg_android',
+			'com.duckduckgo.mobile.android', 'android api', 'duckduckgo', 'googletoolbar', 'amaya',
+		];
+		if (!in_array($part, $known) && !preg_match('=^rv:[\d]+\S*$=', $part)) {
+			$cleaned[] = $part;
+		}
+	}
+	return $cleaned;
+}
+
+function blockbot_clean_part(string $part): string
+{
+	$part = trim($part);
+	$subparts = [];
+	foreach (explode(' ', $part) as $subpart) {
+		$subpart = trim($subpart, ' +,');
+		if (!empty($subpart) && (!preg_match('=^\d+[\w\-\+\.]+$=', $subpart) || empty($subparts))) {
+			$subparts[] = $subpart;
+		}
+	}
+	return implode(' ', $subparts);
+}
+
+function blockbot_split_parts(string $agent, bool $parse_spaces, bool $parse_semicolon): array
+{
+	$agent = strtolower(trim($agent, ' ;'));
+	$cleaned = [];
+
+	while (preg_match('=\w+[\s\w/\._\-]*/\d+[^;\s]*=', $agent, $matches)) {
+		$part = $matches[0];
+		if (preg_match('=/\d+[^;\s]*=', $part, $matches, PREG_OFFSET_CAPTURE)) {
+			$cleaned[] = substr($part, 0, $matches[0][1]);
+			$part = substr($part, 0, $matches[0][1] +  strlen($matches[0][0]));
+		}
+		$agent = trim(str_replace($part, '', $agent));
+	}
+	if ($parse_semicolon && strpos($agent, ';') !== false) {
+		$parse_spaces = false;
+		$parts = [];
+		foreach (explode(';', $agent) as $part) {
+			$parts[] = blockbot_clean_part($part);
+		}
+	} elseif (strpos($agent, ' - ') !== false) {
+		$parts = [];
+		foreach (explode(' - ', $agent) as $part) {
+			$parts[] = blockbot_clean_part($part);
+		}
+	} elseif ($parse_spaces) {
+		$parts = explode(' ', $agent);
+	} else {
+		$parts = [$agent];
+	}
+
+	if ($parse_spaces) {
+		$subparts = [];
+		foreach ($parts as $part) {
+			while (($pos_space = strpos($part, ' ')) !== false && ($pos_slash = strpos($part, '/')) !== false) {
+				if ($pos_space > $pos_slash) {
+					$subparts[] = substr($part, 0, $pos_space);
+					$part = trim(substr($part, $pos_space + 1), ' +,-;');
+				} else {
+					$subparts[] = $part;
+					$part = '';
+				}
+			}
+			if ($part != '') {
+				$subparts[] = $part;
+			}
+		}
+		$parts = $subparts;
+	}
+
+	foreach ($parts as $part) {
+		$part = trim($part, ' +');
+
+		if (!Network::isValidHttpUrl($part) && strpos($part, '/') !== false) {
+			$split = explode('/', $part);
+			array_pop($split);
+			$part = implode('/', $split);
+		}
+
+		$pos1 = strpos($part, "'");
+		$pos2 = strrpos($part, "'");
+		if ($pos1 != $pos2) {
+			$part = substr($part, 0, $pos1 - 1) . substr($part, $pos2 + 1);
+		}
+
+		$part = trim(preg_replace('=(.*) [\d\.]+=', '$1', $part), " +,-;\u{00AD}");
+		if (!empty($part)) {
+			$cleaned[] = $part;
+		}
+	}
+	return $cleaned;
+}

blockbot/lang/C/messages.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-05 04:51+0000\n"
+"POT-Creation-Date: 2024-04-30 12:12+0000\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"
@@ -17,52 +17,29 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: blockbot.php:30
+#: blockbot.php:32
 msgid "Save Settings"
 msgstr ""
 
-#: blockbot.php:31
-msgid "Allow \"good\" crawlers"
-msgstr ""
-
-#: blockbot.php:31
-msgid ""
-"Don't block fediverse crawlers, relay servers and other bots with good "
-"purposes."
-msgstr ""
-
-#: blockbot.php:32
-msgid "Allow preview agents"
-msgstr ""
-
-#: blockbot.php:32
-msgid ""
-"Don't block agents from social media systems that want to generate preview "
-"data for links that had been set by their users."
+#: blockbot.php:33
+msgid "Allow security checkers"
 msgstr ""
 
 #: blockbot.php:33
+msgid "Don't block security checkers. They can be used for good or bad."
+msgstr ""
+
+#: blockbot.php:34
 msgid "Allow generic HTTP libraries"
 msgstr ""
 
-#: blockbot.php:33
+#: blockbot.php:34
 msgid ""
 "Don't block agents from generic HTTP libraries that could be used for good "
 "or for bad and that currently can't be traced back to any known Fediverse "
 "project."
 msgstr ""
 
-#: blockbot.php:34
-msgid "Block GabSocial"
-msgstr ""
-
-#: blockbot.php:34
-msgid ""
-"Block the software GabSocial. This will block every access for that "
-"software. You can block dedicated gab instances in the blocklist settings in "
-"the admin section."
-msgstr ""
-
 #: blockbot.php:35
 msgid "Training mode"
 msgstr ""

blockbot/templates/admin.tpl

@@ -1,6 +1,4 @@
-{{include file="field_checkbox.tpl" field=$good_crawlers}}
-{{include file="field_checkbox.tpl" field=$socialmedia_agents}}
+{{include file="field_checkbox.tpl" field=$security_checker}}
 {{include file="field_checkbox.tpl" field=$http_libraries}}
-{{include file="field_checkbox.tpl" field=$block_gab}}
 {{include file="field_checkbox.tpl" field=$training}}
-<div class="submit"><button type="submit" class="btn btn-primary" name="page_site" value="{{$submit}}">{{$submit}}</button></div>
+<div class="submit"><button type="submit" class="btn btn-primary" name="page_site" value="{{$submit}}">{{$submit}}</button></div>

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
@@ -68,6 +70,7 @@ const BLUEKSY_STATUS_TOKEN_FAIL = 13;
 const BLUESKY_DIRECTORY = 'https://plc.directory'; // Path to the directory server service to fetch the PDS of a given DID
 const BLUESKY_PDS       = 'https://bsky.social';   // Path to the personal data server service (PDS) to fetch the DID for a given handle
 const BLUESKY_WEB       = 'https://bsky.app';      // Path to the web interface with the user profile and posts
+const BLUESKY_HOSTNAME  = 'bsky.social';           // Host name to be added to the handle if incomplete
 
 function bluesky_install()
 {
@@ -97,11 +100,16 @@ function bluesky_load_config(ConfigFileManager $loader)
 
 function bluesky_check_item_notification(array &$notification_data)
 {
-	$did = DI::pConfig()->get($notification_data['uid'], 'bluesky', 'did');
-
-	if (!empty($did)) {
-		$notification_data['profiles'][] = $did;
+	if (empty($notification_data['uid'])) {
+		return;
 	}
+
+	$did = bluesky_get_user_did($notification_data['uid']);
+	if (empty($did)) {
+		return;
+	}
+
+	$notification_data['profiles'][] = $did;
 }
 
 function bluesky_probe_detect(array &$hookData)
@@ -123,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)) {
-		$did = bluesky_get_did($matches[1]);
+	} elseif (parse_url($hookData['uri'], PHP_URL_PATH) == $hookData['uri'] && strpos($hookData['uri'], '@') === false) {
+		$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;
 		}
@@ -142,19 +155,14 @@ function bluesky_probe_detect(array &$hookData)
 		return;
 	}
 
-	$hookData['result'] = bluesky_get_contact_fields($data, 0, $pconfig['uid'], false);
-
-	$hookData['result']['baseurl'] = bluesky_get_pds($did);
+	$hookData['result'] = bluesky_get_contact_fields($data, 0, $pconfig['uid'], true);
 
 	// 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']     = '';
 }
@@ -171,21 +179,21 @@ function bluesky_item_by_link(array &$hookData)
 		return;
 	}
 
-	if (!preg_match('#^' . BLUESKY_WEB . '/profile/(.+)/post/(.+)#', $hookData['uri'], $matches)) {
-		return;
-	}
-
-	$did = bluesky_get_did($matches[1]);
+	$did = bluesky_get_did_by_profile($hookData['uri']);
 	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'])) {
@@ -229,7 +237,7 @@ function bluesky_follow(array &$hook_data)
 
 	$post = [
 		'collection' => 'app.bsky.graph.follow',
-		'repo'       => DI::pConfig()->get($hook_data['uid'], 'bluesky', 'did'),
+		'repo'       => bluesky_get_user_did($hook_data['uid']),
 		'record'     => $record
 	];
 
@@ -282,15 +290,15 @@ function bluesky_block(array &$hook_data)
 
 	$post = [
 		'collection' => 'app.bsky.graph.block',
-		'repo'       => DI::pConfig()->get($hook_data['uid'], 'bluesky', 'did'),
+		'repo'       => bluesky_get_user_did($hook_data['uid']),
 		'record'     => $record
 	];
 
 	$activity = bluesky_xrpc_post($hook_data['uid'], 'com.atproto.repo.createRecord', $post);
 	if (!empty($activity->uri)) {
-		$cdata = Contact::getPublicAndUserContactID($hook_data['contact']['id'], $hook_data['uid']);
-		if (!empty($cdata['user'])) {
-			Contact::remove($cdata['user']);
+		$ucid = Contact::getUserContactId($hook_data['contact']['id'], $hook_data['uid']);
+		if ($ucid) {
+			Contact::remove($ucid);
 		}
 		Logger::debug('Successfully blocked contact', ['url' => $hook_data['contact']['url'], 'uri' => $activity->uri]);
 	}
@@ -323,7 +331,7 @@ function bluesky_addon_admin(string &$o)
 
 	$o = Renderer::replaceMacros($t, [
 		'$submit' => DI::l10n()->t('Save Settings'),
-		'$friendica_handles'    => ['friendica_handles', DI::l10n()->t('Allow your users to use your hostname for their Bluesky handles'), DI::config()->get('bluesky', 'friendica_handles'), DI::l10n()->t('Before enabling this option, you have to download and configure the bluesky-handles repository on your system. See https://git.friendi.ca/heluecht/bluesky-handles')],
+		'$friendica_handles'    => ['friendica_handles', DI::l10n()->t('Allow your users to use your hostname for their Bluesky handles'), DI::config()->get('bluesky', 'friendica_handles'), DI::l10n()->t('Before enabling this option, you have to setup a wildcard domain configuration and you have to enable wildcard requests in your webserver configuration. On Apache this is done by adding "ServerAlias *.%s" to your HTTP configuration. You don\'t need to change the HTTPS configuration.', DI::baseUrl()->getHost())],
 	]);
 }
 
@@ -342,7 +350,7 @@ function bluesky_settings(array &$data)
 	$def_enabled   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'post_by_default') ?? false;
 	$pds           = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'pds');
 	$handle        = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'handle');
-	$did           = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'did');
+	$did           = bluesky_get_user_did(DI::userSession()->getLocalUserId());
 	$token         = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'access_token');
 	$import        = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'import') ?? false;
 	$import_feeds  = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'import_feeds') ?? false;
@@ -350,8 +358,11 @@ function bluesky_settings(array &$data)
 
 	if (DI::config()->get('bluesky', 'friendica_handles')) {
 		$self = User::getById(DI::userSession()->getLocalUserId(), ['nickname']);
-		$handle = $self['nickname'] . '.' . DI::baseUrl()->getHost();
-		$friendica_handle = ['bluesky_friendica_handle', DI::l10n()->t('Allow to use %s as your Bluesky handle.', $handle), $custom_handle, DI::l10n()->t('When enabled, you can use %s as your Bluesky handle. After you enabled this option, please go to https://bsky.app/settings and select to change your handle. Select that you have got your own domain. Then enter %s and select "No DNS Panel". Then select "Verify Text File".', $handle, $handle)];
+		$host_handle = $self['nickname'] . '.' . DI::baseUrl()->getHost();
+		$friendica_handle = ['bluesky_friendica_handle', DI::l10n()->t('Allow to use %s as your Bluesky handle.', $host_handle), $custom_handle, DI::l10n()->t('When enabled, you can use %s as your Bluesky handle. After you enabled this option, please go to https://bsky.app/settings and select to change your handle. Select that you have got your own domain. Then enter %s and select "No DNS Panel". Then select "Verify Text File".', $host_handle, $host_handle)];
+		if ($custom_handle) {
+			$handle = $host_handle;
+		}
 	} else {
 		$friendica_handle = [];
 	}
@@ -364,7 +375,7 @@ function bluesky_settings(array &$data)
 		'$import_feeds' => ['bluesky_import_feeds', DI::l10n()->t('Import the pinned feeds'), $import_feeds, DI::l10n()->t('When activated, Posts will be imported from all the feeds that you pinned in Bluesky.')],
 		'$custom_handle' => $friendica_handle,
 		'$pds'          => ['bluesky_pds', DI::l10n()->t('Personal Data Server'), $pds, DI::l10n()->t('The personal data server (PDS) is the system that hosts your profile.'), '', 'readonly'],
-		'$handle'       => ['bluesky_handle', DI::l10n()->t('Bluesky handle'), $handle],
+		'$handle'       => ['bluesky_handle', DI::l10n()->t('Bluesky handle'), $handle, '', '', $custom_handle ? 'readonly' : ''],
 		'$did'          => ['bluesky_did', DI::l10n()->t('Bluesky DID'), $did, DI::l10n()->t('This is the unique identifier. It will be fetched automatically, when the handle is entered.'), '', 'readonly'],
 		'$password'     => ['bluesky_password', DI::l10n()->t('Bluesky app password'), '', DI::l10n()->t("Please don't add your real password here, but instead create a specific app password in the Bluesky settings.")],
 		'$status'       => bluesky_get_status($handle, $did, $pds, $token),
@@ -435,18 +446,10 @@ function bluesky_settings_post(array &$b)
 	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'handle',           $handle);
 	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'import',           intval($_POST['bluesky_import']));
 	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'import_feeds',     intval($_POST['bluesky_import_feeds']));
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'friendica_handle', intval($_POST['bluesky_friendica_handle']));
+	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'friendica_handle', intval($_POST['bluesky_friendica_handle'] ?? false));
 
 	if (!empty($handle)) {
-		if (empty($old_did) || $old_handle != $handle) {
-			$did = bluesky_get_did(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'handle'));
-			if (empty($did)) {
-				DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'status', BLUEKSY_STATUS_DID_FAIL);
-			}
-			DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'did', $did);
-		} else {
-			$did = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'did');
-		}
+		$did = bluesky_get_user_did(DI::userSession()->getLocalUserId(), empty($old_did) || $old_handle != $handle);
 		if (!empty($did) && (empty($old_pds) || $old_handle != $handle)) {
 			$pds = bluesky_get_pds($did);
 			if (empty($pds)) {
@@ -513,8 +516,13 @@ function bluesky_cron()
 
 	$abandon_limit = date(DateTimeFormat::MYSQL, time() - $abandon_days * 86400);
 
-	$pconfigs = DBA::selectToArray('pconfig', [], ['cat' => 'bluesky', 'k' => 'import', 'v' => true]);
+	$pconfigs = DBA::selectToArray('pconfig', [], ["`cat` = ? AND `k` IN (?, ?) AND `v`", 'bluesky', 'import', 'import_feeds']);
 	foreach ($pconfigs as $pconfig) {
+		if (empty(bluesky_get_user_did($pconfig['uid']))) {
+			Logger::debug('User has got no valid DID', ['uid' => $pconfig['uid']]);
+			continue;
+		}
+
 		if ($abandon_days != 0) {
 			if (!DBA::exists('user', ["`uid` = ? AND `login_date` >= ?", $pconfig['uid'], $abandon_limit])) {
 				Logger::notice('abandoned account: timeline from user will not be imported', ['user' => $pconfig['uid']]);
@@ -523,19 +531,27 @@ function bluesky_cron()
 		}
 
 		// Refresh the token now, so that it doesn't need to be refreshed in parallel by the following workers
+		Logger::debug('Refresh the token', ['uid' => $pconfig['uid']]);
 		bluesky_get_token($pconfig['uid']);
 
-		Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_timeline.php', $pconfig['uid'], $last);
 		Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_notifications.php', $pconfig['uid'], $last);
-
+		if (DI::pConfig()->get($pconfig['uid'], 'bluesky', 'import')) {
+			Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_timeline.php', $pconfig['uid'], $last);
+		}
 		if (DI::pConfig()->get($pconfig['uid'], 'bluesky', 'import_feeds')) {
+			Logger::debug('Fetch feeds for user', ['uid' => $pconfig['uid']]);
 			$feeds = bluesky_get_feeds($pconfig['uid']);
 			foreach ($feeds as $feed) {
 				Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_feed.php', $pconfig['uid'], $feed, $last);
 			}
 		}
+		Logger::debug('Polling done for user', ['uid' => $pconfig['uid']]);
 	}
 
+	Logger::notice('Polling done for all users');
+
+	DI::keyValue()->set('bluesky_last_poll', time());
+
 	$last_clean = DI::keyValue()->get('bluesky_last_clean');
 	if (empty($last_clean) || ($last_clean + 86400 < time())) {
 		Logger::notice('Start contact cleanup');
@@ -549,8 +565,6 @@ function bluesky_cron()
 	}
 
 	Logger::notice('cron_end');
-
-	DI::keyValue()->set('bluesky_last_poll', time());
 }
 
 function bluesky_hook_fork(array &$b)
@@ -664,7 +678,10 @@ function bluesky_create_activity(array $item, stdClass $parent = null)
 		return;
 	}
 
-	$did  = DI::pConfig()->get($uid, 'bluesky', 'did');
+	$did = bluesky_get_user_did($uid);
+	if (empty($did)) {
+		return;
+	}
 
 	if ($item['verb'] == Activity::LIKE) {
 		$record = [
@@ -724,7 +741,7 @@ function bluesky_create_post(array $item, stdClass $root = null, stdClass $paren
 			$item['body'] .= "\n[url]" . $media['url'] . "[/url]\n";
 		}
 	}
-	
+
 	if (!empty($item['quote-uri-id'])) {
 		$quote = Post::selectFirstPost(['uri', 'plink'], ['uri-id' => $item['quote-uri-id']]);
 		if (!empty($quote)) {
@@ -733,7 +750,7 @@ function bluesky_create_post(array $item, stdClass $root = null, stdClass $paren
 			}
 		}
 	}
-	
+
 	$urls = bluesky_get_urls($item['body']);
 	$item['body'] = $urls['body'];
 
@@ -772,7 +789,7 @@ function bluesky_create_post(array $item, stdClass $root = null, stdClass $paren
 
 		$post = [
 			'collection' => 'app.bsky.feed.post',
-			'repo'       => DI::pConfig()->get($uid, 'bluesky', 'did'),
+			'repo'       => bluesky_get_user_did($uid),
 			'record'     => $record
 		];
 
@@ -960,6 +977,7 @@ function bluesky_upload_blob(int $uid, array $photo): ?stdClass
 		return null;
 	}
 
+	Item::incrementOutbound(Protocol::BLUESKY);
 	Logger::debug('Uploaded blob', ['return' => $data, 'uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
 	return $data->blob;
 }
@@ -1033,8 +1051,8 @@ function bluesky_process_reason(stdClass $reason, string $uri, int $uid)
 	$item['owner-link']   = $item['author-link'];
 	$item['owner-avatar'] = $item['author-avatar'];
 	if (Item::insert($item)) {
-		$cdata = Contact::getPublicAndUserContactID($contact['id'], $uid);
-		Item::update(['post-reason' => Item::PR_ANNOUNCEMENT, 'causer-id' => $cdata['public']], ['uri' => $uri, 'uid' => $uid]);
+		$pcid = Contact::getPublicContactId($contact['id'], $uid);
+		Item::update(['post-reason' => Item::PR_ANNOUNCEMENT, 'causer-id' => $pcid], ['uri' => $uri, 'uid' => $uid]);
 	}
 }
 
@@ -1176,6 +1194,8 @@ function bluesky_process_post(stdClass $post, int $uid, int $fetch_uid, int $pos
 		$item = bluesky_add_media($post->embed, $item, $uid, $level, $last_poll);
 	}
 
+	$item['restrictions'] = bluesky_get_restrictions_for_user($post, $item, $post_reason);
+
 	if (empty($item['post-reason'])) {
 		$item['post-reason'] = $post_reason;
 	}
@@ -1211,7 +1231,11 @@ function bluesky_get_header(stdClass $post, string $uri, int $uid, int $fetch_ui
 		'source'        => json_encode($post),
 	];
 
+	$account = Contact::selectFirstAccountUser(['pid'], ['id' => $contact['id']]);
+
+	$item['author-id'] = $account['pid'];
 	$item['uri-id']       = ItemURI::getIdByURI($uri);
+	$item['owner-id']     = $item['author-id'];
 	$item['owner-name']   = $item['author-name'];
 	$item['owner-link']   = $item['author-link'];
 	$item['owner-avatar'] = $item['author-avatar'];
@@ -1220,9 +1244,63 @@ function bluesky_get_header(stdClass $post, string $uri, int $uid, int $fetch_ui
 		$item['post-reason'] = Item::PR_FOLLOWER;
 	}
 
+	if (!empty($post->labels)) {
+		foreach ($post->labels as $label) {
+			// Only flag posts as sensitive based on labels that had been provided by the author.
+			// When "ver" is set to "1" it was flagged by some automated process.
+			if (empty($label->ver)) {
+				$item['sensitive'] = true;
+				Logger::debug('Sensitive content', ['uri-id' => $item['uri-id'], 'label' => $label]);
+			}
+		}
+	}
+
 	return $item;
 }
 
+function bluesky_get_restrictions_for_user(stdClass $post, array $item, int $post_reason): ?int
+{
+	if (!empty($post->viewer->replyDisabled)) {
+		return Item::CANT_REPLY;
+	}
+
+	if (empty($post->threadgate)) {
+		return null;
+	}
+
+	if (!isset($post->threadgate->record->allow)) {
+		return null;
+	}
+
+	if ($item['uid'] == 0) {
+		return Item::CANT_REPLY;
+	}
+
+	$restrict = true;
+	$type = '$type';
+	foreach ($post->threadgate->record->allow as $allow) {
+		switch ($allow->$type) {
+			case 'app.bsky.feed.threadgate#followingRule':
+				// Only followers can reply.
+				if (Contact::isFollower($item['author-id'], $item['uid'])) {
+					$restrict = false;
+				}
+				break;
+			case 'app.bsky.feed.threadgate#mentionRule':
+				// Only mentioned accounts can reply.
+				if ($post_reason == Item::PR_TO) {
+					$restrict = false;
+				}
+				break;
+			case 'app.bsky.feed.threadgate#listRule';
+				// Only accounts in the provided list can reply. We don't support this at the moment.
+				break;
+		}
+	}
+
+	return $restrict ? Item::CANT_REPLY : null;
+}
+
 function bluesky_get_content(array $item, stdClass $record, string $uri, int $uid, int $fetch_uid, int $level, int $last_poll): array
 {
 	if (empty($item)) {
@@ -1332,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'],
@@ -1446,6 +1537,10 @@ function bluesky_fetch_missing_post(string $uri, int $uid, int $fetch_uid, int $
 	}
 
 	$class = bluesky_get_uri_class($uri);
+	if (empty($class)) {
+		return $fallback;
+	}
+
 	$fetch_uri = $class->uri;
 
 	Logger::debug('Fetch missing post', ['level' => $level, 'uid' => $uid, 'uri' => $uri]);
@@ -1458,8 +1553,7 @@ function bluesky_fetch_missing_post(string $uri, int $uid, int $fetch_uid, int $
 	Logger::debug('Reply count', ['level' => $level, 'uid' => $uid, 'uri' => $uri]);
 
 	if ($causer != 0) {
-		$cdata = Contact::getPublicAndUserContactID($causer, $uid);
-		$causer = $cdata['public'] ?? 0;
+		$causer = Contact::getPublicContactId($causer, $uid);
 	}
 
 	return bluesky_process_thread($data->thread, $uid, $fetch_uid, $post_reason, $causer, $level, $last_poll);
@@ -1528,7 +1622,7 @@ function bluesky_process_thread(stdClass $thread, int $uid, int $fetch_uid, int
 
 function bluesky_get_contact(stdClass $author, int $uid, int $fetch_uid): array
 {
-	$condition = ['network' => Protocol::BLUESKY, 'uid' => 0, 'url' => $author->did];
+	$condition = ['network' => Protocol::BLUESKY, 'uid' => 0, 'nurl' => $author->did];
 	$contact = Contact::selectFirst(['id', 'updated'], $condition);
 
 	$update = empty($contact) || $contact['updated'] < DateTimeFormat::utc('now -24 hours');
@@ -1546,7 +1640,7 @@ function bluesky_get_contact(stdClass $author, int $uid, int $fetch_uid): array
 	}
 
 	if ($uid != 0) {
-		$condition = ['network' => Protocol::BLUESKY, 'uid' => $uid, 'url' => $author->did];
+		$condition = ['network' => Protocol::BLUESKY, 'uid' => $uid, 'nurl' => $author->did];
 
 		$contact = Contact::selectFirst(['id', 'rel', 'uid'], $condition);
 		if (!isset($fields['rel']) && isset($contact['rel'])) {
@@ -1599,10 +1693,14 @@ function bluesky_get_contact_fields(stdClass $author, int $uid, int $fetch_uid,
 		return $fields;
 	}
 
-	$fields['baseurl'] = bluesky_get_pds($author->did);
-	if (!empty($fields['baseurl'])) {
-		GServer::check($fields['baseurl'], Protocol::BLUESKY);
-		$fields['gsid'] = GServer::getID($fields['baseurl'], true);
+	$data = bluesky_get(BLUESKY_DIRECTORY . '/' . $author->did);
+	if (!empty($data)) {		
+		$fields['baseurl'] = bluesky_get_pds('', $data);
+		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]);
@@ -1641,6 +1739,9 @@ function bluesky_get_feeds(int $uid): array
 {
 	$type = '$type';
 	$preferences = bluesky_get_preferences($uid);
+	if (empty($preferences) || empty($preferences->preferences)) {
+		return [];
+	}
 	foreach ($preferences->preferences as $preference) {
 		if ($preference->$type == 'app.bsky.actor.defs#savedFeedsPref') {
 			return $preference->pinned ?? [];
@@ -1649,7 +1750,7 @@ function bluesky_get_feeds(int $uid): array
 	return [];
 }
 
-function bluesky_get_preferences(int $uid): stdClass
+function bluesky_get_preferences(int $uid): ?stdClass
 {
 	$cachekey = 'bluesky:preferences:' . $uid;
 	$data = DI::cache()->get($cachekey);
@@ -1658,21 +1759,66 @@ function bluesky_get_preferences(int $uid): stdClass
 	}
 
 	$data = bluesky_xrpc_get($uid, 'app.bsky.actor.getPreferences');
+	if (empty($data)) {
+		return null;
+	}
 
 	DI::cache()->set($cachekey, $data, Duration::HOUR);
 	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');
 	if ($curlResult->isSuccess() && substr($curlResult->getBodyString(), 0, 4) == 'did:') {
 		$did = $curlResult->getBodyString();
 		if (!bluesky_valid_did($did, $handle)) {
-			Logger::notice('Invalid DID', ['handle' => $handle, 'did' => $did]);	
+			Logger::notice('Invalid DID', ['handle' => $handle, 'did' => $did]);
 			return '';
 		}
-		Logger::debug('Got DID by wellknown', ['handle' => $handle, 'did' => $did]);
 		return $did;
 	}
 	return '';
@@ -1688,56 +1834,110 @@ function bluesky_get_did_by_dns(string $handle): string
 		if (!empty($record['txt']) && substr($record['txt'], 0, 4) == 'did=') {
 			$did = substr($record['txt'], 4);
 			if (!bluesky_valid_did($did, $handle)) {
-				Logger::notice('Invalid DID', ['handle' => $handle, 'did' => $did]);	
+				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
 {
-	// Deactivated at the moment, since it isn't reliable by now
-	//$did = bluesky_get_did_by_dns($handle);
-	//if ($did != '') {
-	//	return $did;
-	//}
-	
-	//$did = bluesky_get_did_by_wellknown($handle);
-	//if ($did != '') {
-	//	return $did;
-	//}
-	
-	$data = bluesky_get(BLUESKY_PDS . '/xrpc/com.atproto.identity.resolveHandle?handle=' . urlencode($handle));
-	if (empty($data) || empty($data->did)) {
+	if ($handle == '') {
 		return '';
 	}
-	Logger::debug('Got DID by PDS call', ['handle' => $handle, 'did' => $data->did]);
-	return $data->did;
+
+	if (strpos($handle, '.') === false) {
+		$handle .= '.' . BLUESKY_HOSTNAME;
+	}
+
+	// At first we use the user PDS. That should cover most cases.
+	$pds = DI::pConfig()->get($uid, 'bluesky', 'pds');
+	if (!empty($pds)) {
+		$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]);
+			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_pds(int $uid): string
+function bluesky_get_user_did(int $uid, bool $refresh = false): ?string
+{
+	if (!$refresh) {
+		$did = DI::pConfig()->get($uid, 'bluesky', 'did');
+		if (!empty($did)) {
+			return $did;
+		}
+	}
+
+	$handle = DI::pConfig()->get($uid, 'bluesky', 'handle');
+	if (empty($handle)) {
+		return null;
+	}
+
+	$did = bluesky_get_did($handle, $uid);
+	if (empty($did)) {
+		return null;
+	}
+
+	Logger::debug('Got DID for user', ['uid' => $uid, 'handle' => $handle, 'did' => $did]);
+	DI::pConfig()->set($uid, 'bluesky', 'did', $did);
+	return $did;
+}
+
+function bluesky_get_user_pds(int $uid): ?string
 {
 	$pds = DI::pConfig()->get($uid, 'bluesky', 'pds');
 	if (!empty($pds)) {
 		return $pds;
 	}
-	$did = DI::pConfig()->get($uid, 'bluesky', 'did');
+
+	$did = bluesky_get_user_did($uid);
 	if (empty($did)) {
-		Logger::notice('Empty did for user', ['uid' => $uid]);
-		return '';
+		return null;
 	}
+
 	$pds = bluesky_get_pds($did);
+	if (empty($pds)) {
+		return null;
+	}
+
 	DI::pConfig()->set($uid, 'bluesky', 'pds', $pds);
 	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;
 	}
@@ -1751,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);
@@ -1793,7 +2009,10 @@ function bluesky_refresh_token(int $uid): string
 
 function bluesky_create_token(int $uid, string $password): string
 {
-	$did = DI::pConfig()->get($uid, 'bluesky', 'did');
+	$did = bluesky_get_user_did($uid);
+	if (empty($did)) {
+		return '';
+	}
 
 	$data = bluesky_post($uid, '/xrpc/com.atproto.server.createSession', json_encode(['identifier' => $did, 'password' => $password]), ['Content-type' => 'application/json']);
 	if (empty($data)) {
@@ -1811,13 +2030,22 @@ function bluesky_create_token(int $uid, string $password): string
 
 function bluesky_xrpc_post(int $uid, string $url, $parameters): ?stdClass
 {
-	return bluesky_post($uid, '/xrpc/' . $url, json_encode($parameters),  ['Content-type' => 'application/json', 'Authorization' => ['Bearer ' . bluesky_get_token($uid)]]);
+	$data = bluesky_post($uid, '/xrpc/' . $url, json_encode($parameters),  ['Content-type' => 'application/json', 'Authorization' => ['Bearer ' . bluesky_get_token($uid)]]);
+	if (!empty($data)) {
+		Item::incrementOutbound(Protocol::BLUESKY);
+	}
+	return $data;
 }
 
 function bluesky_post(int $uid, string $url, string $params, array $headers): ?stdClass
 {
+	$pds = bluesky_get_user_pds($uid);
+	if (empty($pds)) {
+		return null;
+	}
+
 	try {
-		$curlResult = DI::httpClient()->post(bluesky_get_user_pds($uid) . $url, $params, $headers);
+		$curlResult = DI::httpClient()->post($pds . $url, $params, $headers);
 	} catch (\Exception $e) {
 		Logger::notice('Exception on post', ['exception' => $e]);
 		DI::pConfig()->set($uid, 'bluesky', 'status', BLUEKSY_STATUS_API_FAIL);
@@ -1840,7 +2068,12 @@ function bluesky_xrpc_get(int $uid, string $url, array $parameters = []): ?stdCl
 		$url .= '?' . http_build_query($parameters);
 	}
 
-	$data = bluesky_get(bluesky_get_user_pds($uid) . '/xrpc/' . $url, HttpClientAccept::JSON, [HttpClientOptions::HEADERS => ['Authorization' => ['Bearer ' . bluesky_get_token($uid)]]]);
+	$pds = bluesky_get_user_pds($uid);
+	if (empty($pds)) {
+		return null;
+	}
+
+	$data = bluesky_get($pds . '/xrpc/' . $url, HttpClientAccept::JSON, [HttpClientOptions::HEADERS => ['Authorization' => ['Bearer ' . bluesky_get_token($uid)]]]);
 	DI::pConfig()->set($uid, 'bluesky', 'status', is_null($data) ? BLUEKSY_STATUS_API_FAIL : BLUEKSY_STATUS_SUCCESS);
 	return $data;
 }
@@ -1850,14 +2083,15 @@ function bluesky_get(string $url, string $accept_content = HttpClientAccept::DEF
 	try {
 		$curlResult = DI::httpClient()->get($url, $accept_content, $opts);
 	} catch (\Exception $e) {
-		Logger::notice('Exception on get', ['exception' => $e]);
+		Logger::notice('Exception on get', ['url' => $url, 'exception' => $e]);
 		return null;
 	}
 
 	if (!$curlResult->isSuccess()) {
-		Logger::notice('API Error', ['error' => json_decode($curlResult->getBodyString()) ?: $curlResult->getBodyString()]);
+		Logger::notice('API Error', ['url' => $url, 'error' => json_decode($curlResult->getBodyString()) ?: $curlResult->getBodyString()]);
 		return null;
 	}
 
+	Item::incrementInbound(Protocol::BLUESKY);
 	return json_decode($curlResult->getBodyString());
 }

bluesky/lang/C/messages.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-28 03:05+0000\n"
+"POT-Creation-Date: 2024-03-22 05:31+0000\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"
@@ -26,10 +26,12 @@ msgid "Allow your users to use your hostname for their Bluesky handles"
 msgstr ""
 
 #: bluesky.php:326
+#, php-format
 msgid ""
-"Before enabling this option, you have to download and configure the bluesky-"
-"handles repository on your system. See https://git.friendi.ca/heluecht/"
-"bluesky-handles"
+"Before enabling this option, you have to setup a wildcard domain "
+"configuration and you have to enable wildcard requests in your webserver "
+"configuration. On Apache this is done by adding \"ServerAlias *.%s\" to your "
+"HTTP configuration. You don't need to change the HTTPS configuration."
 msgstr ""
 
 #: bluesky.php:354

catavatar/lang/it/messages.po

@@ -6,55 +6,55 @@
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2018
 # Davide Pesenti <mrjive@mrjive.it>, 2018
-# Sylke Vicious <silkevicious@gmail.com>, 2021
+# Sylke Vicious <silkevicious@gmail.com>, 2023
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-29 00:53+0000\n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
 "PO-Revision-Date: 2018-04-07 05:23+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021\n"
-"Language-Team: Italian (https://www.transifex.com/Friendica/teams/12172/it/)\n"
+"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2023\n"
+"Language-Team: Italian (https://app.transifex.com/Friendica/teams/12172/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 #: catavatar.php:48
-msgid "Use Cat as Avatar"
-msgstr "Usa il Gatto come avatar"
-
-#: catavatar.php:49
-msgid "More Random Cat!"
-msgstr "Altro Gatto a caso!"
-
-#: catavatar.php:50
-msgid "Reset to email Cat"
-msgstr "Reimposta Gatto"
-
-#: catavatar.php:52
-msgid "Cat Avatar Settings"
-msgstr "Impostazioni Avatar Gatto"
-
-#: catavatar.php:53
 msgid "Set default profile avatar or randomize the cat."
 msgstr "Imposta l'immagine di profilo predefinita o crea un gatto casuale."
 
-#: catavatar.php:78
+#: catavatar.php:53
+msgid "Cat Avatar Settings"
+msgstr "Impostazioni Avatar Gatto"
+
+#: catavatar.php:56
+msgid "Use Cat as Avatar"
+msgstr "Usa il Gatto come avatar"
+
+#: catavatar.php:57
+msgid "Another random Cat!"
+msgstr "Un altro Gatto casuale!"
+
+#: catavatar.php:58
+msgid "Reset to email Cat"
+msgstr "Reimposta Gatto"
+
+#: catavatar.php:77
 msgid "The cat hadn't found itself."
 msgstr "Il gatto non ha trovato sé stesso."
 
-#: catavatar.php:87
+#: catavatar.php:86
 msgid "There was an error, the cat ran away."
 msgstr "Si è verificato un errore, il gatto è scappato."
 
-#: catavatar.php:93
+#: catavatar.php:92
 msgid "Profile Photos"
 msgstr "Foto del profilo"
 
-#: catavatar.php:108
+#: catavatar.php:102
 msgid "Meow!"
 msgstr "Miao!"

catavatar/lang/it/strings.php

@@ -3,13 +3,13 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return intval($n != 1);
+	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
-$a->strings['Use Cat as Avatar'] = 'Usa il Gatto come avatar';
-$a->strings['More Random Cat!'] = 'Altro Gatto a caso!';
-$a->strings['Reset to email Cat'] = 'Reimposta Gatto';
-$a->strings['Cat Avatar Settings'] = 'Impostazioni Avatar Gatto';
 $a->strings['Set default profile avatar or randomize the cat.'] = 'Imposta l\'immagine di profilo predefinita o crea un gatto casuale.';
+$a->strings['Cat Avatar Settings'] = 'Impostazioni Avatar Gatto';
+$a->strings['Use Cat as Avatar'] = 'Usa il Gatto come avatar';
+$a->strings['Another random Cat!'] = 'Un altro Gatto casuale!';
+$a->strings['Reset to email Cat'] = 'Reimposta Gatto';
 $a->strings['The cat hadn\'t found itself.'] = 'Il gatto non ha trovato sé stesso.';
 $a->strings['There was an error, the cat ran away.'] = 'Si è verificato un errore, il gatto è scappato.';
 $a->strings['Profile Photos'] = 'Foto del profilo';

curweather/curweather.php

@@ -9,12 +9,10 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
-use Friendica\Util\Proxy as ProxyUtils;
 
 function curweather_install()
 {
@@ -127,7 +125,7 @@ function curweather_network_mod_init(string &$body)
 		$t = Renderer::getMarkupTemplate("widget.tpl", "addon/curweather/" );
 		$curweather = Renderer::replaceMacros($t, [
 			'$title' => DI::l10n()->t("Current Weather"),
-			'$icon' => ProxyUtils::proxifyUrl('http://openweathermap.org/img/w/'.$res['icon'].'.png'),
+			'$icon' => 'http://openweathermap.org/img/w/'.$res['icon'].'.png',
 			'$city' => $res['city'],
 			'$lon' => $res['lon'],
 			'$lat' => $res['lat'],
@@ -154,7 +152,7 @@ function curweather_network_mod_init(string &$body)
 
 function curweather_addon_settings_post($post)
 {
-	if (!DI::userSession()->getLocalUserId() || empty($_POST['curweather-settings-submit'])) {
+	if (!DI::userSession()->getLocalUserId() || empty($_POST['curweather-submit'])) {
 		return;
 	}
 

curweather/lang/fr/messages.po

@@ -5,6 +5,7 @@
 # 
 # Translators:
 # bob lebonche <lebonche@tutanota.com>, 2021
+# cracrayol, 2024
 # Hypolite Petovan <hypolite@mrpetovan.com>, 2022
 # Hypolite Petovan <hypolite@mrpetovan.com>, 2016
 # ea1cd8241cb389ffb6f92bc6891eff5d_dc12308 <70dced5587d47e18d88f9298024d96f8_93383>, 2015
@@ -15,8 +16,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-21 19:14-0500\n"
 "PO-Revision-Date: 2014-06-22 11:34+0000\n"
-"Last-Translator: Hypolite Petovan <hypolite@mrpetovan.com>, 2022\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
+"Last-Translator: cracrayol, 2024\n"
+"Language-Team: French (http://app.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,7 +46,7 @@ msgstr "Vent"
 
 #: curweather.php:140
 msgid "Last Updated"
-msgstr "Dernière mise-à-jour"
+msgstr "Dernière mise à jour"
 
 #: curweather.php:141
 msgid "Data by"

curweather/lang/fr/strings.php

@@ -10,7 +10,7 @@ $a->strings['Current Weather'] = 'Météo actuelle';
 $a->strings['Relative Humidity'] = 'Humidité relative';
 $a->strings['Pressure'] = 'Pression';
 $a->strings['Wind'] = 'Vent';
-$a->strings['Last Updated'] = 'Dernière mise-à-jour';
+$a->strings['Last Updated'] = 'Dernière mise à jour';
 $a->strings['Data by'] = 'Données de';
 $a->strings['Show on map'] = 'Montrer sur la carte';
 $a->strings['There was a problem accessing the weather data. But have a look'] = 'Une erreur est survenue lors de l\'accès aux données météo. Vous pouvez quand même jeter un oeil';

curweather/lang/it/messages.po

@@ -5,27 +5,27 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015
-# Sylke Vicious <silkevicious@gmail.com>, 2021
+# Sylke Vicious <silkevicious@gmail.com>, 2021,2023
 # Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-16 12:57+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"PO-Revision-Date: 2014-06-22 11:34+0000\n"
+"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021,2023\n"
+"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
 #: curweather.php:47
 msgid "Error fetching weather data. Error was: "
 msgstr "Errore durante il recupero dei dati meteo. L'errore è stato:"
 
-#: curweather.php:130 curweather.php:192
+#: curweather.php:130
 msgid "Current Weather"
 msgstr "Meteo"
 
@@ -61,66 +61,66 @@ msgstr "C'è stato un problema accedendo ai dati meteo, ma dai un'occhiata"
 msgid "at OpenWeatherMap"
 msgstr "a OpenWeatherMap"
 
-#: curweather.php:179
+#: curweather.php:178
 msgid "No APPID found, please contact your admin to obtain one."
 msgstr "APPID non trovata, contatta il tuo amministratore per averne una."
 
-#: curweather.php:191 curweather.php:229
-msgid "Save Settings"
-msgstr "Salva Impostazioni"
-
-#: curweather.php:192
-msgid "Settings"
-msgstr "Impostazioni"
-
-#: curweather.php:194
+#: curweather.php:188
 msgid "Enter either the name of your location or the zip code."
 msgstr "Inserisci il nome della tua posizione o il CAP"
 
-#: curweather.php:195
+#: curweather.php:189
 msgid "Your Location"
 msgstr "La tua Posizione"
 
-#: curweather.php:195
+#: curweather.php:189
 msgid ""
 "Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
 "<em>14476,DE</em>."
 msgstr "Identificatore della tua posizione (nome o CAP), p.e. <em>Roma, IT</em> or <em>00186,IT</em>."
 
-#: curweather.php:196
+#: curweather.php:190
 msgid "Units"
 msgstr "Unità"
 
-#: curweather.php:196
+#: curweather.php:190
 msgid "select if the temperature should be displayed in &deg;C or &deg;F"
 msgstr "scegli se la temperatura deve essere mostrata in °C o in °F"
 
-#: curweather.php:197
+#: curweather.php:191
 msgid "Show weather data"
 msgstr "Mostra dati meteo"
 
-#: curweather.php:232
+#: curweather.php:196
+msgid "Current Weather Settings"
+msgstr "Impostazioni Meteo"
+
+#: curweather.php:227
+msgid "Save Settings"
+msgstr "Salva Impostazioni"
+
+#: curweather.php:230
 msgid "Caching Interval"
 msgstr "Intervallo di cache"
 
-#: curweather.php:234
+#: curweather.php:232
 msgid ""
 "For how long should the weather data be cached? Choose according your "
 "OpenWeatherMap account type."
 msgstr "Per quanto tempo i dati meteo devono essere memorizzati? Scegli a seconda del tuo tipo di account su OpenWeatherMap."
 
-#: curweather.php:235
+#: curweather.php:233
 msgid "no cache"
 msgstr "nessuna cache"
 
-#: curweather.php:236 curweather.php:237 curweather.php:238 curweather.php:239
+#: curweather.php:234 curweather.php:235 curweather.php:236 curweather.php:237
 msgid "minutes"
 msgstr "minuti"
 
-#: curweather.php:242
+#: curweather.php:240
 msgid "Your APPID"
 msgstr "Il tuo APPID"
 
-#: curweather.php:242
+#: curweather.php:240
 msgid "Your API key provided by OpenWeatherMap"
 msgstr "La tua chiave API da OpenWeatherMap"

curweather/lang/it/strings.php

@@ -3,7 +3,7 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return intval($n != 1);
+	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
 $a->strings['Error fetching weather data. Error was: '] = 'Errore durante il recupero dei dati meteo. L\'errore è stato:';
 $a->strings['Current Weather'] = 'Meteo';
@@ -16,14 +16,14 @@ $a->strings['Show on map'] = 'Mostra sulla mappa';
 $a->strings['There was a problem accessing the weather data. But have a look'] = 'C\'è stato un problema accedendo ai dati meteo, ma dai un\'occhiata';
 $a->strings['at OpenWeatherMap'] = 'a OpenWeatherMap';
 $a->strings['No APPID found, please contact your admin to obtain one.'] = 'APPID non trovata, contatta il tuo amministratore per averne una.';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
-$a->strings['Settings'] = 'Impostazioni';
 $a->strings['Enter either the name of your location or the zip code.'] = 'Inserisci il nome della tua posizione o il CAP';
 $a->strings['Your Location'] = 'La tua Posizione';
 $a->strings['Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.'] = 'Identificatore della tua posizione (nome o CAP), p.e. <em>Roma, IT</em> or <em>00186,IT</em>.';
 $a->strings['Units'] = 'Unità';
 $a->strings['select if the temperature should be displayed in &deg;C or &deg;F'] = 'scegli se la temperatura deve essere mostrata in °C o in °F';
 $a->strings['Show weather data'] = 'Mostra dati meteo';
+$a->strings['Current Weather Settings'] = 'Impostazioni Meteo';
+$a->strings['Save Settings'] = 'Salva Impostazioni';
 $a->strings['Caching Interval'] = 'Intervallo di cache';
 $a->strings['For how long should the weather data be cached? Choose according your OpenWeatherMap account type.'] = 'Per quanto tempo i dati meteo devono essere memorizzati? Scegli a seconda del tuo tipo di account su OpenWeatherMap.';
 $a->strings['no cache'] = 'nessuna cache';

dwpost/lang/it/messages.po

@@ -5,45 +5,41 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014,2018
-# Sylke Vicious <silkevicious@gmail.com>, 2020-2021
+# Sylke Vicious <silkevicious@gmail.com>, 2020-2021,2023
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-16 12:55+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2021-11-21 19:17-0500\n"
+"PO-Revision-Date: 2014-06-22 11:41+0000\n"
+"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2020-2021,2023\n"
+"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: dwpost.php:41
+#: dwpost.php:43
 msgid "Post to Dreamwidth"
 msgstr "Invia a Dreamwidth"
 
-#: dwpost.php:72 dwpost.php:76
-msgid "Dreamwidth Export"
-msgstr "Esporta Dreamwidth"
+#: dwpost.php:63
+msgid "Enable Dreamwidth Post Addon"
+msgstr "Abilita il componente aggiuntivo di pubblicazione Dreamwidth"
 
-#: dwpost.php:80
-msgid "Enable dreamwidth Post Addon"
-msgstr "Abilita il componente aggiuntivo di invio a Dreamwidth"
-
-#: dwpost.php:85
-msgid "dreamwidth username"
+#: dwpost.php:64
+msgid "Dreamwidth username"
 msgstr "Nome utente Dreamwidth"
 
-#: dwpost.php:90
-msgid "dreamwidth password"
-msgstr "password Dreamwidth"
+#: dwpost.php:65
+msgid "Dreamwidth password"
+msgstr "Password Dreamwidth"
 
-#: dwpost.php:95
-msgid "Post to dreamwidth by default"
-msgstr "Invia sempre a Dreamwidth"
+#: dwpost.php:66
+msgid "Post to Dreamwidth by default"
+msgstr "Pubblica su dreamwidth per impostazione predefinita"
 
-#: dwpost.php:100
-msgid "Save Settings"
-msgstr "Salva Impostazioni"
+#: dwpost.php:71
+msgid "Dreamwidth Export"
+msgstr "Esporta Dreamwidth"

dwpost/lang/it/strings.php

@@ -3,12 +3,11 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return intval($n != 1);
+	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
 $a->strings['Post to Dreamwidth'] = 'Invia a Dreamwidth';
+$a->strings['Enable Dreamwidth Post Addon'] = 'Abilita il componente aggiuntivo di pubblicazione Dreamwidth';
+$a->strings['Dreamwidth username'] = 'Nome utente Dreamwidth';
+$a->strings['Dreamwidth password'] = 'Password Dreamwidth';
+$a->strings['Post to Dreamwidth by default'] = 'Pubblica su dreamwidth per impostazione predefinita';
 $a->strings['Dreamwidth Export'] = 'Esporta Dreamwidth';
-$a->strings['Enable dreamwidth Post Addon'] = 'Abilita il componente aggiuntivo di invio a Dreamwidth';
-$a->strings['dreamwidth username'] = 'Nome utente Dreamwidth';
-$a->strings['dreamwidth password'] = 'password Dreamwidth';
-$a->strings['Post to dreamwidth by default'] = 'Invia sempre a Dreamwidth';
-$a->strings['Save Settings'] = 'Salva Impostazioni';

forumdirectory/forumdirectory.php

@@ -8,7 +8,6 @@
  * Note: Please use Group Directory instead
  */
 
-use Friendica\App;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
 use Friendica\Content\Widget;
@@ -16,8 +15,8 @@ use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\Profile;
 use Friendica\Model\User;
+use Friendica\Security\OpenWebAuth;
 
 global $forumdirectory_search;
 
@@ -82,7 +81,7 @@ function forumdirectory_content()
 	$gdirpath = '';
 	$dirurl = DI::config()->get('system', 'directory');
 	if (strlen($dirurl)) {
-		$gdirpath = Profile::zrl($dirurl, true);
+		$gdirpath = OpenWebAuth::getZrlUrl($dirurl, true);
 	}
 
 	$sql_extra = '';
@@ -104,8 +103,8 @@ function forumdirectory_content()
 	$total = 0;
 	$cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total` FROM `profile`
 				INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
-				WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` = ? $sql_extra",
-				User::PAGE_FLAGS_COMMUNITY);
+				WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` IN (?, ?) $sql_extra",
+				User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_COMM_MAN);
 	if (DBA::isResult($cnt)) {
 		$total = $cnt['total'];
 	}
@@ -120,8 +119,8 @@ function forumdirectory_content()
 			`contact`.`addr`, `contact`.`url` FROM `profile`
 			INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
 			INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid`
-			WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` = ? AND `contact`.`self`
-			$sql_extra $order LIMIT $limit", User::PAGE_FLAGS_COMMUNITY
+			WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` IN (?, ?) AND `contact`.`self`
+			$sql_extra $order LIMIT $limit", User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_COMM_MAN
 	);
 
 	if (DBA::isResult($r)) {

geonames/lang/fr/messages.po

@@ -6,6 +6,7 @@
 # Translators:
 # bob lebonche <lebonche@tutanota.com>, 2021
 # ButterflyOfFire, 2020
+# cracrayol, 2024
 # Hypolite Petovan <hypolite@mrpetovan.com>, 2016
 msgid ""
 msgstr ""
@@ -13,8 +14,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-21 19:14-0500\n"
 "PO-Revision-Date: 2014-06-23 08:27+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
+"Last-Translator: cracrayol, 2024\n"
+"Language-Team: French (http://app.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,7 +30,7 @@ msgstr "Remplacer les coordonnées par le nom de la localité la plus proche dan
 
 #: geonames.php:136
 msgid "Enable Geonames Addon"
-msgstr "Activer l'application complémentaire Geonames"
+msgstr "Activer l'extension Geonames"
 
 #: geonames.php:141
 msgid "Geonames Settings"

geonames/lang/fr/strings.php

@@ -6,5 +6,5 @@ function string_plural_select_fr($n){
 	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
 $a->strings['Replace numerical coordinates by the nearest populated location name in your posts.'] = 'Remplacer les coordonnées par le nom de la localité la plus proche dans votre publication.';
-$a->strings['Enable Geonames Addon'] = 'Activer l\'application complémentaire Geonames';
+$a->strings['Enable Geonames Addon'] = 'Activer l\'extension Geonames';
 $a->strings['Geonames Settings'] = 'Paramètres Geonames';

gnot/lang/fr/messages.po

@@ -6,6 +6,7 @@
 # Translators:
 # bob lebonche <lebonche@tutanota.com>, 2021
 # ButterflyOfFire, 2020
+# cracrayol, 2024
 # Hypolite Petovan <hypolite@mrpetovan.com>, 2016
 msgid ""
 msgstr ""
@@ -13,8 +14,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-21 19:14-0500\n"
 "PO-Revision-Date: 2014-06-23 08:30+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
+"Last-Translator: cracrayol, 2024\n"
+"Language-Team: French (http://app.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,7 +30,7 @@ msgstr "Permettre le filtrage des notifications de commentaires par courriel sur
 
 #: gnot.php:64
 msgid "Enable this addon?"
-msgstr "Activer cette application complémentaire ?"
+msgstr "Activer cette extension ?"
 
 #: gnot.php:69
 msgid "Gnot Settings"

gnot/lang/fr/strings.php

@@ -6,6 +6,6 @@ function string_plural_select_fr($n){
 	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
 $a->strings['Allows threading of email comment notifications on Gmail and anonymising the subject line.'] = 'Permettre le filtrage des notifications de commentaires par courriel sur Gmail et l\'anonymisation de l\'objet.';
-$a->strings['Enable this addon?'] = 'Activer cette application complémentaire ?';
+$a->strings['Enable this addon?'] = 'Activer cette extension ?';
 $a->strings['Gnot Settings'] = 'Paramètres Gnot';
 $a->strings['[Friendica:Notify] Comment to conversation #%d'] = '[Friendica:Notify] Commentaire vers conversation #%d';

gravatar/lang/fr/messages.po

@@ -5,6 +5,7 @@
 # 
 # Translators:
 # bob lebonche <lebonche@tutanota.com>, 2021
+# cracrayol, 2024
 # Marie Olive <lacellule101@gmail.com>, 2018
 # ea1cd8241cb389ffb6f92bc6891eff5d_dc12308 <70dced5587d47e18d88f9298024d96f8_93383>, 2015
 msgid ""
@@ -13,8 +14,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-02-01 18:15+0100\n"
 "PO-Revision-Date: 2014-06-23 08:33+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
+"Last-Translator: cracrayol, 2024\n"
+"Language-Team: French (http://app.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,7 +51,7 @@ msgid ""
 "Libravatar addon is installed, too. Please disable Libravatar addon or this "
 "Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
 "nothing was found at Libravatar."
-msgstr "L'application complémentaire Libravatar est aussi installée. Merci de désactiver l'application complémentaire Libravatar ou cette application complémentaire Gravatar. L'application complémentaire se repliera sur Gravatar si rien n'est trouvé dans Libravatar."
+msgstr "L'extension Libravatar est aussi installée. Merci de désactiver l'extension Libravatar ou cette extension Gravatar. L'extension se repliera sur Gravatar si rien n'est trouvé dans Libravatar."
 
 #: gravatar.php:102
 msgid "Save Settings"

gravatar/lang/fr/strings.php

@@ -11,7 +11,7 @@ $a->strings['monster face'] = 'Face de monstre';
 $a->strings['computer generated face'] = 'visage généré par ordinateur';
 $a->strings['retro arcade style face'] = 'Face style retro arcade';
 $a->strings['Information'] = 'Information';
-$a->strings['Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.'] = 'L\'application complémentaire Libravatar est aussi installée. Merci de désactiver l\'application complémentaire Libravatar ou cette application complémentaire Gravatar. L\'application complémentaire se repliera sur Gravatar si rien n\'est trouvé dans Libravatar.';
+$a->strings['Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.'] = 'L\'extension Libravatar est aussi installée. Merci de désactiver l\'extension Libravatar ou cette extension Gravatar. L\'extension se repliera sur Gravatar si rien n\'est trouvé dans Libravatar.';
 $a->strings['Save Settings'] = 'Sauvegarder les paramètres.';
 $a->strings['Default avatar image'] = 'Image par défaut d\'avatar';
 $a->strings['Select default avatar image if none was found at Gravatar. See README'] = 'Sélectionner l\'avatar par défaut, si aucun n\'est trouvé sur Gravatar. Voir Lisezmoi.';

groupdirectory/groupdirectory.php

@@ -13,8 +13,8 @@ use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\Profile;
 use Friendica\Model\User;
+use Friendica\Security\OpenWebAuth;
 
 global $groupdirectory_search;
 
@@ -79,7 +79,7 @@ function groupdirectory_content()
 	$gdirpath = '';
 	$dirurl   = DI::config()->get('system', 'directory');
 	if (strlen($dirurl)) {
-		$gdirpath = Profile::zrl($dirurl, true);
+		$gdirpath = OpenWebAuth::getZrlUrl($dirurl, true);
 	}
 
 	$sql_extra = '';
@@ -101,8 +101,8 @@ function groupdirectory_content()
 	$total = 0;
 	$cnt   = DBA::fetchFirst("SELECT COUNT(*) AS `total` FROM `profile`
 				INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
-				WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` = ? $sql_extra",
-		User::PAGE_FLAGS_COMMUNITY);
+				WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` IN (?, ?) $sql_extra",
+		User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_COMM_MAN);
 	if (DBA::isResult($cnt)) {
 		$total = $cnt['total'];
 	}
@@ -117,8 +117,8 @@ function groupdirectory_content()
 			`contact`.`addr`, `contact`.`url` FROM `profile`
 			INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
 			INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid`
-			WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` = ? AND `contact`.`self`
-			$sql_extra $order LIMIT $limit", User::PAGE_FLAGS_COMMUNITY
+			WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` IN (?, ?)  AND `contact`.`self`
+			$sql_extra $order LIMIT $limit", User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_COMM_MAN
 	);
 
 	if (DBA::isResult($r)) {

ijpost/lang/fr/messages.po

@@ -5,6 +5,7 @@
 # 
 # Translators:
 # bob lebonche <lebonche@tutanota.com>, 2021
+# cracrayol, 2024
 # Hypolite Petovan <hypolite@mrpetovan.com>, 2016
 msgid ""
 msgstr ""
@@ -12,8 +13,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-21 19:17-0500\n"
 "PO-Revision-Date: 2014-06-23 08:37+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
+"Last-Translator: cracrayol, 2024\n"
+"Language-Team: French (http://app.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +27,7 @@ msgstr "Publier sur Insanejournal"
 
 #: ijpost.php:61
 msgid "Enable InsaneJournal Post Addon"
-msgstr "Activer l'application complémentaire InsaneJournalPost"
+msgstr "Activer l'extension InsaneJournal"
 
 #: ijpost.php:62
 msgid "InsaneJournal username"

ijpost/lang/fr/strings.php

@@ -6,7 +6,7 @@ function string_plural_select_fr($n){
 	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
 $a->strings['Post to Insanejournal'] = 'Publier sur Insanejournal';
-$a->strings['Enable InsaneJournal Post Addon'] = 'Activer l\'application complémentaire InsaneJournalPost';
+$a->strings['Enable InsaneJournal Post Addon'] = 'Activer l\'extension InsaneJournal';
 $a->strings['InsaneJournal username'] = 'Identifiant du InsaneJournal';
 $a->strings['InsaneJournal password'] = 'Mot de passe du InsaneJournal';
 $a->strings['Post to InsaneJournal by default'] = 'Publier sur le InsaneJournal par défaut';

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.3
+ * Version: 0.4
  * Author: Matthias Ebers <https://loma.ml/profile/feb>
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  * Status: Unsupported
@@ -93,9 +93,11 @@ function invidious_render(array &$b)
 	$original = $b['html'];
 	$server   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'invidious', 'server', DI::config()->get('invidious', 'server', INVIDIOUS_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?://(?: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']) {

js_upload/js_upload.php

@@ -7,11 +7,11 @@
  * Maintainer: Hypolite Petovan <https://friendica.mrpetovan.com/profile/hypolite>
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
+use Friendica\Util\Images;
 use Friendica\Util\Strings;
 
 global $js_upload_jsonresponse;
@@ -20,9 +20,9 @@ global $js_upload_result;
 function js_upload_install()
 {
 	Hook::register('photo_upload_form', __FILE__, 'js_upload_form');
-	Hook::register('photo_post_init', __FILE__, 'js_upload_post_init');
-	Hook::register('photo_post_file', __FILE__, 'js_upload_post_file');
-	Hook::register('photo_post_end', __FILE__, 'js_upload_post_end');
+	Hook::register('photo_post_init',   __FILE__, 'js_upload_post_init');
+	Hook::register('photo_post_file',   __FILE__, 'js_upload_post_file');
+	Hook::register('photo_post_end',    __FILE__, 'js_upload_post_end');
 }
 
 function js_upload_form(array &$b)
@@ -34,11 +34,11 @@ function js_upload_form(array &$b)
 
 	$tpl = Renderer::getMarkupTemplate('js_upload.tpl', 'addon/js_upload');
 	$b['addon_text'] .= Renderer::replaceMacros($tpl, [
-		'$upload_msg' => DI::l10n()->t('Select files for upload'),
-		'$drop_msg' => DI::l10n()->t('Drop files here to upload'),
-		'$cancel' => DI::l10n()->t('Cancel'),
-		'$failed' => DI::l10n()->t('Failed'),
-		'$post_url' => $b['post_url'],
+		'$upload_msg'   => DI::l10n()->t('Select files for upload'),
+		'$drop_msg'     => DI::l10n()->t('Drop files here to upload'),
+		'$cancel'       => DI::l10n()->t('Cancel'),
+		'$failed'       => DI::l10n()->t('Failed'),
+		'$post_url'     => $b['post_url'],
 		'$maximagesize' => Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')),
 	]);
 }
@@ -48,7 +48,14 @@ function js_upload_post_init(array &$b)
 	global $js_upload_result, $js_upload_jsonresponse;
 
 	// list of valid extensions
-	$allowedExtensions = ['jpeg', 'gif', 'png', 'jpg'];
+	$allowedExtensions = [];
+	foreach (Images::IMAGETYPES as $type) {
+		$extension = image_type_to_extension($type, false);
+		if ($extension == 'jpeg') {
+			$allowedExtensions[] = 'jpg';
+		}
+		$allowedExtensions[] = $extension;
+	}
 
 	// max file size in bytes
 	$sizeLimit = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
@@ -75,10 +82,9 @@ function js_upload_post_file(array &$b)
 
 	$result = $js_upload_result;
 
-	$b['src'] = $result['path'];
+	$b['src']      = $result['path'];
 	$b['filename'] = $result['filename'];
 	$b['filesize'] = filesize($b['src']);
-
 }
 
 function js_upload_post_end(int &$b)
@@ -179,11 +185,11 @@ class qqUploadedFileForm
 
 class qqFileUploader
 {
-	private $allowedExtensions = [];
-	private $sizeLimit = 10485760;
+	private $allowedExtensions;
+	private $sizeLimit;
 	private $file;
 
-	function __construct(array $allowedExtensions = [], $sizeLimit = 10485760)
+	function __construct(array $allowedExtensions = [], $sizeLimit)
 	{
 		$allowedExtensions = array_map('strtolower', $allowedExtensions);
 
@@ -197,7 +203,6 @@ class qqFileUploader
 		} else {
 			$this->file = false;
 		}
-
 	}
 
 	/**
@@ -215,11 +220,9 @@ class qqFileUploader
 			return ['error' => DI::l10n()->t('Uploaded file is empty')];
 		}
 
-//		if ($size > $this->sizeLimit) {
-
-//			return array('error' => DI::l10n()->t('Uploaded file is too large'));
-//		}
-
+		//		if ($size > $this->sizeLimit) {
+		//			return array('error' => DI::l10n()->t('Uploaded file is too large'));
+		//		}
 
 		$maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
 
@@ -241,14 +244,14 @@ class qqFileUploader
 
 		if ($this->file->save()) {
 			return [
-				'success' => true,
-				'path' => $this->file->getPath(),
+				'success'  => true,
+				'path'     => $this->file->getPath(),
 				'filename' => $filename . '.' . $ext
 			];
 		} else {
 			return [
-				'error' => DI::l10n()->t('Upload was cancelled, or server error encountered'),
-				'path' => $this->file->getPath(),
+				'error'    => DI::l10n()->t('Upload was cancelled, or server error encountered'),
+				'path'     => $this->file->getPath(),
 				'filename' => $filename . '.' . $ext
 			];
 		}

krynn/lang/fr/messages.po

@@ -5,14 +5,15 @@
 # 
 # Translators:
 # bob lebonche <lebonche@tutanota.com>, 2021
+# cracrayol, 2024
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-21 19:14-0500\n"
 "PO-Revision-Date: 2015-07-07 15:14+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
+"Last-Translator: cracrayol, 2024\n"
+"Language-Team: French (http://app.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,7 +22,7 @@ msgstr ""
 
 #: krynn.php:127
 msgid "Enable Krynn Addon"
-msgstr "Activer l'application complémentaire Krynn"
+msgstr "Activer l'extension Krynn"
 
 #: krynn.php:132
 msgid "Krynn Settings"

krynn/lang/fr/strings.php

@@ -5,5 +5,5 @@ function string_plural_select_fr($n){
 	$n = intval($n);
 	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
-$a->strings['Enable Krynn Addon'] = 'Activer l\'application complémentaire Krynn';
+$a->strings['Enable Krynn Addon'] = 'Activer l\'extension Krynn';
 $a->strings['Krynn Settings'] = 'Paramètres de Krynn';

libertree/lang/it/messages.po

@@ -5,45 +5,41 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015,2018
-# Sylke Vicious <silkevicious@gmail.com>, 2021
+# Sylke Vicious <silkevicious@gmail.com>, 2021,2023
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-16 12:47+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2023-06-03 15:49-0400\n"
+"PO-Revision-Date: 2014-06-23 09:44+0000\n"
+"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021,2023\n"
+"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
 
-#: libertree.php:37
+#: libertree.php:39
 msgid "Post to libertree"
 msgstr "Invia a Libertree"
 
-#: libertree.php:71 libertree.php:75
-msgid "libertree Export"
-msgstr "Esporta libertree"
-
-#: libertree.php:79
+#: libertree.php:59
 msgid "Enable Libertree Post Addon"
 msgstr "Abilita il componente aggiuntivo di invio a Libertree"
 
-#: libertree.php:84
-msgid "Libertree API token"
-msgstr "Token API Libertree"
-
-#: libertree.php:89
+#: libertree.php:60
 msgid "Libertree site URL"
 msgstr "Indirizzo sito Libertree"
 
-#: libertree.php:94
+#: libertree.php:61
+msgid "Libertree API token"
+msgstr "Token API Libertree"
+
+#: libertree.php:62
 msgid "Post to Libertree by default"
 msgstr "Invia sempre a Libertree"
 
-#: libertree.php:100
-msgid "Save Settings"
-msgstr "Salva Impostazioni"
+#: libertree.php:67
+msgid "Libertree Export"
+msgstr "Esporta Libertree"

libertree/lang/it/strings.php

@@ -3,12 +3,11 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return intval($n != 1);
+	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
 $a->strings['Post to libertree'] = 'Invia a Libertree';
-$a->strings['libertree Export'] = 'Esporta libertree';
 $a->strings['Enable Libertree Post Addon'] = 'Abilita il componente aggiuntivo di invio a Libertree';
-$a->strings['Libertree API token'] = 'Token API Libertree';
 $a->strings['Libertree site URL'] = 'Indirizzo sito Libertree';
+$a->strings['Libertree API token'] = 'Token API Libertree';
 $a->strings['Post to Libertree by default'] = 'Invia sempre a Libertree';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
+$a->strings['Libertree Export'] = 'Esporta Libertree';

mailstream/lang/de/messages.po

@@ -5,16 +5,18 @@
 # 
 # Translators:
 # Andreas H., 2014
+# foss <oss@disr.it>, 2022
+# Raroun, 2023
 # Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018
 # Ulf Rompe <transifex.com@rompe.org>, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-11 19:13+0100\n"
-"PO-Revision-Date: 2019-02-18 15:05+0000\n"
-"Last-Translator: Ulf Rompe <transifex.com@rompe.org>\n"
-"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2021-11-21 19:15-0500\n"
+"PO-Revision-Date: 2014-06-23 09:54+0000\n"
+"Last-Translator: Raroun, 2023\n"
+"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,72 +31,76 @@ msgstr "Absender"
 msgid "Email address that stream items will appear to be from."
 msgstr "E-Mail-Adresse, die in hochgeladenen Artikeln erscheint."
 
-#: mailstream.php:82 mailstream.php:380
+#: mailstream.php:82
 msgid "Save Settings"
 msgstr "Einstellungen speichern"
 
-#: mailstream.php:223
+#: mailstream.php:311
 msgid "Re:"
 msgstr "Re:"
 
-#: mailstream.php:231
+#: mailstream.php:324 mailstream.php:327
 msgid "Friendica post"
 msgstr "Friendica-Veröffentlichung"
 
-#: mailstream.php:234
+#: mailstream.php:330
 msgid "Diaspora post"
 msgstr "Diaspora-Veröffentlichung"
 
-#: mailstream.php:244
+#: mailstream.php:340
 msgid "Feed item"
 msgstr "Artikel-Feed"
 
-#: mailstream.php:247
+#: mailstream.php:343
 msgid "Email"
 msgstr "E-Mail"
 
-#: mailstream.php:249
+#: mailstream.php:345
 msgid "Friendica Item"
 msgstr "Friendica-Artikel"
 
-#: mailstream.php:293
+#: mailstream.php:419
 msgid "Upstream"
 msgstr "Upstream"
 
-#: mailstream.php:294
+#: mailstream.php:420
+msgid "URI"
+msgstr "URI"
+
+#: mailstream.php:421
 msgid "Local"
 msgstr "Lokal"
 
-#: mailstream.php:362
+#: mailstream.php:499
 msgid "Enabled"
-msgstr "eingeschaltet"
+msgstr "Aktiv"
 
-#: mailstream.php:366
+#: mailstream.php:504
 msgid "Email Address"
 msgstr "E-Mail-Adresse"
 
-#: mailstream.php:368
+#: mailstream.php:506
 msgid "Leave blank to use your account email address"
 msgstr "Leer lassen für deine Konto-E-Mail-Addresse"
 
-#: mailstream.php:371
+#: mailstream.php:510
 msgid "Exclude Likes"
 msgstr "Likes ignorieren"
 
-#: mailstream.php:373
+#: mailstream.php:512
 msgid "Check this to omit mailing \"Like\" notifications"
 msgstr "Diese Option verhindert das Versenden von \"Like\"-Benachrichtigungen per E-Mail."
 
-#: mailstream.php:376
+#: mailstream.php:516
 msgid "Attach Images"
 msgstr "Bilder anhängen"
 
-#: mailstream.php:378
+#: mailstream.php:518
 msgid ""
 "Download images in posts and attach them to the email.  Useful for reading "
 "email while offline."
 msgstr "Sollen Bilder, die im Beitrag eingebettet sind, als Dateianhang in den E-Mails verschickt werden?"
 
-#: mailstream.php:379
+#: mailstream.php:525
 msgid "Mail Stream Settings"
 msgstr "Mail-Nachrichten-Einstellungen"

mailstream/lang/de/strings.php

@@ -15,8 +15,9 @@ $a->strings['Feed item'] = 'Artikel-Feed';
 $a->strings['Email'] = 'E-Mail';
 $a->strings['Friendica Item'] = 'Friendica-Artikel';
 $a->strings['Upstream'] = 'Upstream';
+$a->strings['URI'] = 'URI';
 $a->strings['Local'] = 'Lokal';
-$a->strings['Enabled'] = 'eingeschaltet';
+$a->strings['Enabled'] = 'Aktiv';
 $a->strings['Email Address'] = 'E-Mail-Adresse';
 $a->strings['Leave blank to use your account email address'] = 'Leer lassen für deine Konto-E-Mail-Addresse';
 $a->strings['Exclude Likes'] = 'Likes ignorieren';

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
@@ -34,26 +32,7 @@ function mailstream_install()
 	Hook::register('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook');
 	Hook::register('mailstream_send_hook', 'addon/mailstream/mailstream.php', 'mailstream_send_hook');
 
-	Logger::info("mailstream: installed");
-}
-
-/**
- * Enforces that mailstream_install has set up the current version
- */
-function mailstream_check_version()
-{
-	if (!is_null(DI::config()->get('mailstream', 'dbversion'))) {
-		DI::config()->delete('mailstream', 'dbversion');
-		Logger::info("mailstream_check_version: old version detected, reinstalling");
-		mailstream_install();
-		Hook::loadHooks();
-		Hook::add(
-			'mailstream_convert_table_entries',
-			'addon/mailstream/mailstream.php',
-			'mailstream_convert_table_entries'
-		);
-		Hook::fork(Worker::PRIORITY_LOW, 'mailstream_convert_table_entries');
-	}
+	Logger::info("installed mailstream");
 }
 
 /**
@@ -72,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')
@@ -105,7 +86,7 @@ function mailstream_generate_id(string $uri): string
 	$host = DI::baseUrl()->getHost();
 	$resource = hash('md5', $uri);
 	$message_id = "<" . $resource . "@" . $host . ">";
-	Logger::debug('mailstream: Generated message ID ' . $message_id . ' for URI ' . $uri);
+	Logger::debug('generated message ID', ['id' => $message_id, 'uri' => $uri]);
 	return $message_id;
 }
 
@@ -114,20 +95,20 @@ function mailstream_send_hook(array $data)
 	$criteria = array('uid' => $data['uid'], 'contact-id' => $data['contact-id'], 'uri' => $data['uri']);
 	$item = Post::selectFirst([], $criteria);
 	if (empty($item)) {
-		Logger::error('mailstream_send_hook could not find item');
+		Logger::error('could not find item');
 		return;
 	}
 
 	$user = User::getById($item['uid']);
 	if (empty($user)) {
-			Logger::error('mailstream_send_hook could not fund user', ['uid' => $item['uid']]);
+		Logger::error('could not find user', ['uid' => $item['uid']]);
 		return;
 	}
 
 	if (!mailstream_send($data['message_id'], $item, $user)) {
-		Logger::debug('mailstream_send_hook send failed, will retry', $data);
+		Logger::debug('send failed, will retry', $data);
 		if (!Worker::defer()) {
-			Logger::error('mailstream_send_hook failed and could not defer', $data);
+			Logger::error('failed and could not defer', $data);
 		}
 	}
 }
@@ -142,35 +123,33 @@ function mailstream_send_hook(array $data)
  */
 function mailstream_post_hook(array &$item)
 {
-	mailstream_check_version();
-
+	if ($item['uid'] === 0) {
+		Logger::debug('mailstream: root user, skipping item ' . $item['id']);
+		return;
+	}
 	if (!DI::pConfig()->get($item['uid'], 'mailstream', 'enabled')) {
 		Logger::debug('mailstream: not enabled.', ['item' => $item['id'], ' uid ' => $item['uid']]);
 		return;
 	}
-	if (!$item['uid']) {
-		Logger::debug('mailstream: no uid for item ' . $item['id']);
-		return;
-	}
 	if (!$item['contact-id']) {
-		Logger::debug('mailstream: no contact-id for item ' . $item['id']);
+		Logger::debug('no contact-id', ['item' => $item['id']]);
 		return;
 	}
 	if (!$item['uri']) {
-		Logger::debug('mailstream: no uri for item ' . $item['id']);
+		Logger::debug('no uri', ['item' => $item['id']]);
 		return;
 	}
 	if ($item['verb'] == Activity::ANNOUNCE) {
-		Logger::debug('mailstream: announce item ', ['item' => $item['id']]);
+		Logger::debug('ignoring announce', ['item' => $item['id']]);
 		return;
 	}
 	if (DI::pConfig()->get($item['uid'], 'mailstream', 'nolikes')) {
 		if ($item['verb'] == Activity::LIKE) {
-			Logger::debug('mailstream: like item ' . $item['id']);
+			Logger::debug('ignoring like', ['item' => $item['id']]);
 			return;
 		}
 		if ($item['verb'] == Activity::DISLIKE) {
-			Logger::debug('mailstream: dislike item ' . $item['id']);
+			Logger::debug('ignoring dislike', ['item' => $item['id']]);
 			return;
 		}
 	}
@@ -219,9 +198,17 @@ 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()
+				]);
+				continue;
+			}
 		} catch (InvalidArgumentException $e) {
-			Logger::error('mailstream_do_images exception fetching url', ['url' => $url, 'item_id' => $item['id']]);
+			Logger::error('exception fetching url', ['url' => $url, 'item_id' => $item['id']]);
 			continue;
 		}
 		$attachments[$url] = [
@@ -322,13 +309,12 @@ function mailstream_subject(array $item): string
 	}
 	$contact = Contact::selectFirst([], ['id' => $item['contact-id'], 'uid' => $item['uid']]);
 	if (!DBA::isResult($contact)) {
-		Logger::error(
-			'mailstream_subject no contact for item',
-			['id' => $item['id'],
-				'plink' => $item['plink'],
-				'contact id' => $item['contact-id'],
-			'uid' => $item['uid']]
-		);
+		Logger::error('no contact', [
+			'item' => $item['id'],
+			'plink' => $item['plink'],
+			'contact id' => $item['contact-id'],
+			'uid' => $item['uid']
+		]);
 		return DI::l10n()->t("Friendica post");
 	}
 	if ($contact['network'] === 'dfrn') {
@@ -365,21 +351,20 @@ function mailstream_subject(array $item): string
 function mailstream_send(string $message_id, array $item, array $user): bool
 {
 	if (!is_array($item)) {
-		Logger::error('mailstream_send item is empty', ['message_id' => $message_id]);
+		Logger::error('item is empty', ['message_id' => $message_id]);
 		return false;
 	}
 
 	if (!$item['visible']) {
-		Logger::debug('mailstream_send item not yet visible', ['item uri' => $item['uri']]);
+		Logger::debug('item not yet visible', ['item uri' => $item['uri']]);
 		return false;
 	}
 	if (!$message_id) {
-		Logger::error('mailstream_send no message ID supplied', ['item uri' => $item['uri'],
-				'user email' => $user['email']]);
+		Logger::error('no message ID supplied', ['item uri' => $item['uri'], 'user email' => $user['email']]);
 		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']);
 
@@ -424,21 +409,24 @@ 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'),
-						 '$uri' => DI::l10n()->t('URI'),
-						 '$local' => DI::l10n()->t('Local'),
-						 '$item' => $item]);
+			'$upstream' => DI::l10n()->t('Upstream'),
+			'$uri' => DI::l10n()->t('URI'),
+			'$local' => DI::l10n()->t('Local'),
+			'$item' => $item
+		]);
 		$mail->Body = mailstream_html_wrap($mail->Body);
 		if (!$mail->Send()) {
 			throw new Exception($mail->ErrorInfo);
 		}
-		Logger::debug('mailstream_send sent message', ['message ID' => $mail->MessageID,
-				'subject' => $mail->Subject,
-				'address' => $address]);
+		Logger::debug('sent message', [
+			'message ID' => $mail->MessageID,
+			'subject' => $mail->Subject,
+			'address' => $address
+		]);
 	} catch (phpmailerException $e) {
-		Logger::debug('mailstream_send PHPMailer exception sending message ' . $message_id . ': ' . $e->errorMessage());
+		Logger::debug('PHPMailer exception sending message', ['id' => $message_id, 'error' => $e->errorMessage()]);
 	} catch (Exception $e) {
-		Logger::debug('mailstream_send exception sending message ' . $message_id . ': ' . $e->getMessage());
+		Logger::debug('exception sending message', ['id' => $message_id, 'error' => $e->getMessage()]);
 	}
 
 	return true;
@@ -462,29 +450,6 @@ function mailstream_html_wrap(string &$text)
 	return $text;
 }
 
-/**
- * Convert v1 mailstream table entries to v2 workerqueue items
- */
-function mailstream_convert_table_entries()
-{
-	$ms_item_ids = DBA::selectToArray('mailstream_item', [], ['message-id', 'uri', 'uid', 'contact-id'], ["`mailstream_item`.`completed` IS NULL"]);
-	Logger::debug('mailstream_convert_table_entries processing ' . count($ms_item_ids) . ' items');
-	foreach ($ms_item_ids as $ms_item_id) {
-		$send_hook_data = array('uid' => $ms_item_id['uid'],
-					'contact-id' => $ms_item_id['contact-id'],
-					'uri' => $ms_item_id['uri'],
-					'message_id' => $ms_item_id['message-id'],
-					'tries' => 0);
-		if (!$ms_item_id['message-id'] || !strlen($ms_item_id['message-id'])) {
-			Logger::info('mailstream_convert_table_entries: item has no message-id.', ['item' => $ms_item_id['id'], 'uri' => $ms_item_id['uri']]);
-							continue;
-		}
-		Logger::info('mailstream_convert_table_entries: convert item to workerqueue', $send_hook_data);
-		Hook::fork(Worker::PRIORITY_LOW, 'mailstream_send_hook', $send_hook_data);
-	}
-	DBA::e('DROP TABLE `mailstream_item`');
-}
-
 /**
  * Form for configuring mailstream features for a user
  *

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,13 +8,11 @@
  * Status: Unsupported
  */
 
-use Friendica\App;
 use Friendica\Content\Smilies;
 use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Hook;
 use Friendica\Core\Protocol;
 use Friendica\DI;
-use Friendica\Util\Proxy as ProxyUtils;
 
 function mastodoncustomemojis_install()
 {
@@ -79,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);
@@ -88,7 +85,7 @@ function mastodoncustomemojis_fetch_custom_emojis_for_url($api_base_url)
 			foreach ($emojis_array as $emoji) {
 				if (!empty($emoji['shortcode']) && !empty($emoji['static_url'])) {
 					$return['texts'][] = ':' . $emoji['shortcode'] . ':';
-					$return['icons'][] = '<img class="emoji mastodon" src="' . ProxyUtils::proxifyUrl($emoji['static_url']) . '" alt=":' . $emoji['shortcode'] . ':" title=":' . $emoji['shortcode'] . ':"/>';
+					$return['icons'][] = '<img class="emoji mastodon" src="' . $emoji['static_url'] . '" alt=":' . $emoji['shortcode'] . ':" title=":' . $emoji['shortcode'] . ':"/>';
 				}
 			}
 		}

nsfw/lang/fr/messages.po

@@ -4,7 +4,7 @@
 # 
 # 
 # Translators:
-# Florent C., 2023
+# cracrayol, 2023-2024
 # Nicolas Derive, 2022-2023
 # StefOfficiel <pichard.stephane@free.fr>, 2015
 # Vincent Vindarel <vindarel@mailz.org>, 2018
@@ -14,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-12-10 14:42-0500\n"
 "PO-Revision-Date: 2014-06-23 10:34+0000\n"
-"Last-Translator: Florent C., 2023\n"
+"Last-Translator: cracrayol, 2023-2024\n"
 "Language-Team: French (http://app.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,7 +42,7 @@ msgstr "Liste de mots-clés - séparés par des virgules - à cacher"
 msgid ""
 "Use /expression/ to provide regular expressions, #tag to specfically match "
 "hashtags (case-insensitive), or regular words (case-sensitive)"
-msgstr "Utiliser /expression/ pour fournir des expressions régulières, #tag pour correspondre à un tag (insensible à la casse), ou des mots classiques (sensible à la casse)"
+msgstr "Utiliser /expression/ pour fournir des expressions régulières, #etiquette pour correspondre à une étiquette (insensible à la casse), ou des mots classiques (sensible à la casse)"
 
 #: nsfw.php:72
 msgid "Content Filter (NSFW and more)"

nsfw/lang/fr/strings.php

@@ -8,7 +8,7 @@ function string_plural_select_fr($n){
 $a->strings['This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view.'] = 'Cette extension recherche des mots/textes spécifiés dans les publications et les masque. Elle peut être utilisée pour filtrer le contenu étiqueté par exemple avec #NSFW qui peut être considéré comme inapproprié à certains moments ou endroits, comme par exemple au travail. Elle est aussi utile pour cacher du contenu non pertinent ou ennuyeux d\'une vue directe.';
 $a->strings['Enable Content filter'] = 'Activer le filtrage de contenu';
 $a->strings['Comma separated list of keywords to hide'] = 'Liste de mots-clés - séparés par des virgules - à cacher';
-$a->strings['Use /expression/ to provide regular expressions, #tag to specfically match hashtags (case-insensitive), or regular words (case-sensitive)'] = 'Utiliser /expression/ pour fournir des expressions régulières, #tag pour correspondre à un tag (insensible à la casse), ou des mots classiques (sensible à la casse)';
+$a->strings['Use /expression/ to provide regular expressions, #tag to specfically match hashtags (case-insensitive), or regular words (case-sensitive)'] = 'Utiliser /expression/ pour fournir des expressions régulières, #etiquette pour correspondre à une étiquette (insensible à la casse), ou des mots classiques (sensible à la casse)';
 $a->strings['Content Filter (NSFW and more)'] = 'Filtre de contenu (NSFW et autres)';
 $a->strings['Regular expression "%s" fails to compile'] = 'La compilation de l\'expression régulière "%s" a échoué';
 $a->strings['Filtered tag: %s'] = 'Tag filtré : %s';

ratioed/RatioedPanel.php

@@ -0,0 +1,213 @@
+<?php
+
+namespace Friendica\Addon\ratioed;
+
+use Friendica\Content\Pager;
+use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
+use Friendica\Database\DBA;
+use Friendica\DI;
+use Friendica\Model\User;
+use Friendica\Module\Moderation\Users\Active;
+
+/**
+ * This class implements the "Behaviour" panel in Moderation/Users
+ */
+class RatioedPanel extends Active
+{
+	protected function content(array $request = []): string
+	{
+		Active::content();
+
+		if (isset(DI::args()->getArgv()[1]) and DI::args()->getArgv()[1] === 'help') {
+			$template = Renderer::getMarkupTemplate('/help.tpl', 'addon/ratioed/');
+			return Renderer::replaceMacros($template, array('$config' => DI::baseUrl() . '/settings/addon'));
+		}
+
+		$action = $this->parameters['action'] ?? '';
+		$uid	= $this->parameters['uid']	?? 0;
+
+		if ($uid) {
+			$user = User::getById($uid, ['username', 'blocked']);
+			if (!$user) {
+				$this->systemMessages->addNotice($this->t('User not found'));
+				$this->baseUrl->redirect('moderation/users');
+			}
+		}
+
+		switch ($action) {
+			case 'delete':
+				if ($this->session->getLocalUserId() != $uid) {
+					self::checkFormSecurityTokenRedirectOnError('moderation/users/active', 'moderation_users_active', 't');
+					// delete user
+					User::remove($uid);
+
+					$this->systemMessages->addNotice($this->t('User "%s" deleted', $user['username']));
+				} else {
+					$this->systemMessages->addNotice($this->t('You can\'t remove yourself'));
+				}
+
+				$this->baseUrl->redirect('moderation/users/active');
+				break;
+			case 'block':
+				self::checkFormSecurityTokenRedirectOnError('moderation/users/active', 'moderation_users_active', 't');
+				User::block($uid);
+				$this->systemMessages->addNotice($this->t('User "%s" blocked', $user['username']));
+				$this->baseUrl->redirect('moderation/users/active');
+				break;
+		}
+		$pager = new Pager($this->l10n, $this->args->getQueryString(), 100);
+
+		$valid_orders = [
+			'name',
+			'email',
+			'register_date',
+			'last-activity',
+			'last-item',
+			'page-flags',
+		];
+
+		$order		   = 'last-item';
+		$order_direction = '-';
+		if (!empty($request['o'])) {
+			$new_order = $request['o'];
+			if ($new_order[0] === '-') {
+				$order_direction = '-';
+				$new_order	   = substr($new_order, 1);
+			}
+
+			if (in_array($new_order, $valid_orders)) {
+				$order = $new_order;
+			}
+		}
+
+		$users = User::getList($pager->getStart(), $pager->getItemsPerPage(), 'active', $order, ($order_direction == '-'));
+
+		$users = array_map($this->setupUserCallback(), $users);
+
+		$header_titles = [
+			$this->t('Name'),
+			$this->t('Email'),
+			$this->t('Register date'),
+			$this->t('Last login'),
+			$this->t('Last public item'),
+			$this->t('Type'),
+			$this->t('Blocked by'),
+			$this->t('Comments last 24h'),
+			$this->t('Reactions last 24h'),
+			$this->t('Ratio last 24h'),
+		];
+		$field_names = [
+			'name',
+			'email',
+			'register_date',
+			'login_date',
+			'lastitem_date',
+			'page_flags',
+			'blocked_by',
+			'comments',
+			'reactions',
+			'ratio',
+		];
+		$th_users = array_map(null, $header_titles, $valid_orders, $field_names);
+
+		$count = $this->database->count('user', ["`verified` AND NOT `blocked` AND NOT `account_removed` AND NOT `account_expired` AND `uid` != ?", 0]);
+
+		$t = Renderer::getMarkupTemplate('ratioed.tpl', 'addon/ratioed');
+		return self::getTabsHTML('ratioed') . Renderer::replaceMacros($t, [
+			// strings //
+			'$title'		  => $this->t('Moderation'),
+			'$help_url'		  => $this->baseUrl . '/ratioed/help',
+			'$page'		   => $this->t('Behaviour'),
+			'$select_all'	 => $this->t('select all'),
+			'$delete'		 => $this->t('Delete'),
+			'$block'		  => $this->t('Block'),
+			'$blocked'		=> $this->t('User blocked'),
+			'$siteadmin'	  => $this->t('Site admin'),
+			'$accountexpired' => $this->t('Account expired'),
+			'$h_newuser'	  => $this->t('Create a new user'),
+
+			'$th_users'			  => $th_users,
+			'$order_users'		   => $order,
+			'$order_direction_users' => $order_direction,
+
+			'$confirm_delete_multi' => $this->t('Selected users will be deleted!\n\nEverything these users had posted on this site will be permanently deleted!\n\nAre you sure?'),
+			'$confirm_delete'	   => $this->t('The user {0} will be deleted!\n\nEverything this user has posted on this site will be permanently deleted!\n\nAre you sure?'),
+
+			'$form_security_token' => self::getFormSecurityToken('moderation_users_active'),
+
+			// values //
+			'$baseurl'	  => $this->baseUrl,
+			'$query_string' => $this->args->getQueryString(),
+
+			'$users' => $users,
+			'$count' => $count,
+			'$pager' => $pager->renderFull($count),
+		]);
+	}
+
+	protected function setupUserCallback(): \Closure
+	{
+		Logger::debug("ratioed: setupUserCallback");
+		$parentCallback = parent::setupUserCallback();
+		return function ($user) use ($parentCallback) {
+			$blocked_count = DBA::count('user-contact', ['uid' => $user['uid'], 'is-blocked' => 1]);
+			$user['blocked_by'] = $blocked_count;
+
+			$self_contact_result = DBA::p('SELECT admin_contact.id AS user_contact_uid FROM contact AS admin_contact JOIN contact AS user_contact ON admin_contact.`uri-id` = user_contact.`uri-id` AND admin_contact.self = 0 AND user_contact.self = 1 WHERE user_contact.uid = ?', $user['uid']);
+			if (DBA::isResult($self_contact_result)) {
+				$self_contact_result_row = DBA::fetch($self_contact_result);
+				$user['user_contact_uid'] = $self_contact_result_row['user_contact_uid'];
+			}
+			else {
+				$user['user_contact_uid'] = NULL;
+			}
+
+			if ($user['user_contact_uid']) {
+				$post_engagement_result = DBA::p('SELECT SUM(`comments`) AS `comment_count`, SUM(`activities`) AS `activities_count` FROM `post-engagement` WHERE `post-engagement`.created > DATE_SUB(now(), INTERVAL 1 DAY) AND `post-engagement`.`owner-id` = ?', $user['user_contact_uid']);
+				if (DBA::isResult($post_engagement_result)) {
+					$post_engagement_result_row = DBA::fetch($post_engagement_result);
+					$user['comments'] = $post_engagement_result_row['comment_count'];
+					$user['reactions'] = $post_engagement_result_row['activities_count'];
+					if ($user['reactions'] > 0) {
+						$user['ratio'] = number_format($user['comments'] / $user['reactions'], 1, '.', '');
+						$user['ratioed'] = (float)($user['ratio']) >= 2.0;
+					}
+					else {
+						if ($user['comments'] == 0) {
+							$user['ratio'] = '0';
+							$user['ratioed'] = false;
+						}
+						else {
+							$user['ratio'] = '∞';
+							$user['ratioed'] = false;
+						}
+					}
+				}
+				else {
+					$user['comments'] = 'error';
+					$user['reactions'] = 'error';
+					$user['ratio'] = 'error';
+					$user['ratioed'] = false;
+				}
+			}
+			else {
+				$user['comments'] = 'error';
+				$user['reactions'] = 'error';
+				$user['ratio'] = 'error';
+				$user['ratioed'] = false;
+			}
+
+			$user = $parentCallback($user);
+			Logger::debug("ratioed: setupUserCallback", [
+				'uid' => $user['uid'],
+				'blocked_by' => $user['blocked_by'],
+				'comments' => $user['comments'],
+				'reactions' => $user['reactions'],
+				'ratio' => $user['ratio'],
+				'ratioed' => $user['ratioed'],
+			]);
+			return $user;
+		};
+	}
+}

ratioed/ratioed.php

@@ -0,0 +1,58 @@
+<?php
+/**
+ * Name: Ratioed
+ * Description: Additional moderation user table with statistics about user behaviour
+ * Version: 0.1
+ * Author: Matthew Exon <http://mat.exon.name>
+ */
+
+use Friendica\Addon\ratioed\RatioedPanel;
+use Friendica\Core\Hook;
+use Friendica\Core\Logger;
+use Friendica\DI;
+
+/**
+ * Sets up the addon hooks and updates data in the database if needed
+ */
+function ratioed_install()
+{
+	Hook::register('moderation_users_tabs', 'addon/ratioed/ratioed.php', 'ratioed_users_tabs');
+
+	Logger::info("ratioed: installed");
+}
+
+/**
+ * This is a statement rather than an actual function definition. The simple
+ * existence of this method is checked to figure out if the addon offers a
+ * module.
+ */
+function ratioed_module() {}
+
+/**
+ * @brief Adds additional users tab to the moderation panel
+ *
+ * @param array $arr Parameters, including "tabs" which is the list to modify, and "selectedTab", which is the currently selected tab ID
+ */
+function ratioed_users_tabs(array &$arr) {
+	Logger::debug("ratioed: users tabs");
+
+	array_push($arr['tabs'], [
+		'label'	 => DI::l10n()->t('Behaviour'),
+		'url'	   => 'ratioed',
+		'sel'	   => $arr['selectedTab'] == 'ratioed' ? 'active' : '',
+		'title'	 => DI::l10n()->t('Statistics about users behaviour'),
+		'id'		=> 'admin-users-ratioed',
+		'accesskey' => 'r',
+	]);
+}
+
+/**
+ * @brief Displays the ratioed tab in the moderation panel
+ */
+function ratioed_content() {
+	Logger::debug("ratioed: content");
+
+	$ratioed = DI::getDice()->create(RatioedPanel::class, [$_SERVER]);
+	$httpException = DI::getDice()->create(Friendica\Module\Special\HTTPException::class);
+	$ratioed->run($httpException);
+}

ratioed/templates/help.tpl

@@ -0,0 +1,92 @@
+<div class="panel 'help-content-wrapper">
+  <div class="panel-body">
+    <h2>Ratioed Plugin Help</h2>
+    <p>
+      This plugin provides administrators with additional statistics about
+      the behaviour of users.  These may be useful as early warning signs
+      that warrant more carefully watching the behaviour of a user.  They
+      are <em>not</em> suitable as a trigger for instantly blocking,
+      muting, or reporting a user, since they lack context.
+    </p>
+    <p>
+      The name of the plugin comes
+      from <a href="https://knowyourmeme.com/editorials/guides/what-is-the-ratio-and-what-does-it-mean-to-get-ratioed-twitters-1-rule-explained">"The
+        Ratio"</a>, a well-known quick rule of thumb:
+    </p>
+    <blockquote>
+      If the Replies:RT ratio is greater than 2:1, you done messed up.
+    </blockquote>
+    <p>
+      To "get ratioed" is to receive a large number of comments in a short
+      space of time, with relatively few likes or boosts.  If commenters
+      were enthusiastic about the posts, they would also have liked or
+      boosted them.  Receiving many comments without such likes or boosts
+      indicates the comments were probably angry.  This anger may or may
+      not be justified, but either way this is probably something
+      moderators should be aware of.
+    </p>
+    <p>
+      This plugin allows viewing of an actual ratio, calculated over the
+      last 24 hours.  This is a useful timeframe for sudden dogpiling
+      events that administrators might not otherwise notice.  The plugin
+      also calculates other statistics.
+    </p>
+    <h3>Explanation of Statistics</h3>
+    <h4>Blocked by</h4>
+    <p>
+      This summarises the number of users on remote servers that have
+      blocked this user.
+    </p>
+    <p>
+      Note that the ActivityPub spec expressly says that
+      implementations "SHOULD NOT" forward such block messages to
+      remote servers.  Nevertheless some implementations do this
+      anyway, notably Mastodon.  This statistic can only count block
+      messages from servers that do this, as well as blocks from local
+      users.  As such, it is usually an undercount.
+    </p>
+    <p>
+      The reason the spec recommends against forwarding these messages
+      is that they can lead to retaliation.  For this reason, this
+      plugin deliberately does not provide any way to investigate
+      exactly who blocked the user.
+    </p>
+    <h4>Comments last 24h</h4>
+    <p>
+      This gives the number of comments made on the top-level posts that
+      this user made within the last 24 hours.
+    </p>
+    <h4>Reactions last 24h</h4>
+    <p>
+      This collects the number of likes, boosts, or other "one-click"
+      interactions made on the user's top-level posts within the last 24
+      hours.
+    </p>
+    <h4>Ratio last 24h</h4>
+    <p>
+      This is the ratio between "Comments last 24h" and "Reactions last
+      24h".  It is intended to approximate the traditional ratio as
+      understood on Twitter.
+    </p>
+    <h3>Performance</h3>
+    <p>
+      The statistics are computed from scratch each time the page loads.
+      It's possible that this might put a heavy load on the database. and
+      the page may take a long time to load.
+    </p>
+    <h3>Extending</h3>
+    <p>
+      Suggestions for additional statistics are welcome, especially from
+      moderators.  This plugin should be considered a sandbox for
+      experimentation, so it is not necessary to prove that any statistic
+      is correlated with unwanted behaviour.
+    </p>
+    <p>
+      However, this plugin does deal with potentially sensitive
+      information.  Even if moderators do in principle have access to all
+      information, it should not necessarily be highlighted.  Statistics
+      should be kept anonymous and neutral.  Also, they should be
+      presented only to moderators, not to the users themselves.
+    </p>
+  </div>
+</div>

ratioed/templates/ratioed.tpl

@@ -0,0 +1,164 @@
+<script type="text/javascript" src="view/theme/frio/js/mod_admin.js?v={{constant('\Friendica\App::VERSION')}}"></script>
+<link rel="stylesheet" href="view/theme/frio/css/mod_admin.css?v={{constant('\Friendica\App::VERSION')}}" type="text/css" media="screen"/>
+
+<div id="admin-users" class="adminpage generic-page-wrapper">
+	<h1>{{$title}} - {{$page}} ({{$count}})</h1>
+	<p>
+		<a href="{{$base_url}}/moderation/users/create" class="btn btn-primary"><i class="fa fa-user-plus"></i> {{$h_newuser}}</a>
+	</p>
+	<form action="{{$baseurl}}/{{$query_string}}" method="post">
+		<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
+		<table id="users" class="table table-hover">
+			<thead>
+				<tr>
+					<th>
+						<div class="checkbox">
+							<input type="checkbox" id="admin-settings-users-select" class="selecttoggle" data-select-class="users_ckbx"/>
+							<label for="admin-settings-users-select"></label>
+						</div>
+					</th>
+					<th></th>
+					{{foreach $th_users as $k=>$th}}
+						{{if $k < 2 || $order_users == $th.1 || ($k==5 && !in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1])) }}
+						<th class="th-{{$k}}">
+							<a href="{{$baseurl}}/moderation/users/active?o={{if $order_direction_users == "+"}}-{{/if}}{{$th.1}}" class="table-order">
+								{{if $order_users == $th.1}}
+									{{if $order_direction_users == "+"}}
+									&#8595;
+									{{else}}
+									&#8593;
+									{{/if}}
+								{{else}}
+								&#8597;
+								{{/if}}
+								{{$th.0}}
+							</a>
+						</th>
+						{{/if}}
+					{{/foreach}}
+					<th></th>
+				</tr>
+			</thead>
+			<tbody>
+			{{foreach $users as $u}}
+				<tr id="user-{{$u.uid}}" class="{{if $u.ratioed}}blocked{{/if}}">
+					<td>
+						{{if $u.is_deletable}}
+						<div class="checkbox">
+							<input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/>
+							<label for="id_user_{{$u.uid}}"></label>
+						</div>
+						{{else}}
+						&nbsp;
+						{{/if}}
+					</td>
+					<td><img class="avatar-nano" src="{{$u.micro}}" title="{{$u.nickname}}"></td>
+					<td><a href="{{$u.url}}" title="{{$u.nickname}}"> {{$u.name}}</a></td>
+					<td>{{$u.email}}</td>
+				{{if $order_users == $th_users.2.1}}
+					<td>{{$u.register_date}}</td>
+				{{/if}}
+
+				{{if $order_users == $th_users.3.1}}
+					<td>{{$u.login_date}}</td>
+				{{/if}}
+
+				{{if $order_users == $th_users.4.1}}
+					<td>{{$u.lastitem_date}}</td>
+				{{/if}}
+
+				{{if !in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1]) }}
+					<td>
+						<i class="fa
+							{{if $u.page_flags_raw==0}}fa-user{{/if}}		{{* PAGE_NORMAL *}}
+							{{if $u.page_flags_raw==1}}fa-bullhorn{{/if}}		{{* PAGE_SOAPBOX *}}
+							{{if $u.page_flags_raw==2}}fa-users{{/if}}		{{* PAGE_COMMUNITY *}}
+							{{if $u.page_flags_raw==3}}fa-heart{{/if}}		{{* PAGE_FREELOVE *}}
+							{{if $u.page_flags_raw==4}}fa-rss{{/if}}		{{* PAGE_BLOG *}}
+							{{if $u.page_flags_raw==5}}fa-user-secret{{/if}}	{{* PAGE_PRVGROUP *}}
+							" title="{{$u.page_flags}}">
+						</i>
+						{{if $u.page_flags_raw==0 && $u.account_type_raw > 0}}
+						<i class="fa
+							{{if $u.account_type_raw==1}}fa-sitemap{{/if}}		{{* ACCOUNT_TYPE_ORGANISATION *}}
+							{{if $u.account_type_raw==2}}fa-newspaper-o{{/if}}	{{* ACCOUNT_TYPE_NEWS *}}
+							{{if $u.account_type_raw==3}}fa-comments{{/if}}		{{* ACCOUNT_TYPE_COMMUNITY *}}
+							" title="{{$u.account_type}}">
+						</i>
+						{{/if}}
+						{{if $u.is_admin}}<i class="fa fa-user-secret text-primary" title="{{$siteadmin}}"></i>{{/if}}
+						{{if $u.account_expired}}<i class="fa fa-clock-o text-warning" title="{{$accountexpired}}"></i>{{/if}}
+					</td>
+				{{/if}}
+
+					<td class="text-right">
+						<button type="button" class="btn-link admin-settings-action-link" onclick="return details({{$u.uid}})"><span class="caret"></span></button>
+					</td>
+				</tr>
+				<tr id="user-{{$u.uid}}-detail" class=" details hidden {{if $u.blocked != 0}}blocked{{/if}}">
+					<td>&nbsp;</td>
+					<td colspan="4">
+					{{if $order_users != $th_users.2.1}}
+						<p>
+							<a href="{{$baseurl}}/ratioed?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.2.1}}" class="btn-link table-order">
+							&#8597; {{$th_users.2.0}}</a> : {{$u.register_date}}
+						</p>
+					{{/if}}
+
+					{{if $order_users != $th_users.3.1}}
+						<p>
+							<a href="{{$baseurl}}/ratioed?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.3.1}}" class="btn-link table-order">
+								&#8597; {{$th_users.3.0}}</a> : {{$u.login_date}}
+						</p>
+					{{/if}}
+
+					{{if $order_users != $th_users.4.1}}
+						<p>
+							<a href="{{$baseurl}}/ratioed?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.4.1}}" class="btn-link table-order">
+								&#8597; {{$th_users.4.0}}</a> : {{$u.lastitem_date}}
+						</p>
+					{{/if}}
+
+					{{if in_array($order_users,[$th_users.2.1, $th_users.3.1, $th_users.4.1]) }}
+						<p>
+							<a href="{{$baseurl}}/ratioed?o={{if $order_direction_users == "+"}}-{{/if}}{{$th_users.5.1}}" class="btn-link table-order">
+								&#8597; {{$th_users.5.0}}</a> : {{$u.page_flags}}{{if $u.page_flags_raw==0 && $u.account_type_raw > 0}}, {{$u.account_type}}{{/if}} {{if $u.is_admin}}({{$siteadmin}}){{/if}} {{if $u.account_expired}}({{$accountexpired}}){{/if}}
+						</p>
+					{{/if}}
+
+					{{foreach $th_users as $k=>$th}}
+					{{if $order_users != $th.1 && $k > 5}}
+						<p>
+							{{$th.0}} : {{$u[$th.2]}}
+						</p>
+					{{/if}}
+					{{/foreach}}
+
+					</td>
+					<td class="text-right">
+				{{if $u.is_deletable}}
+						<a href="{{$baseurl}}/moderation/users/active/block/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$block}}">
+							<i class="fa fa-ban" aria-hidden="true"></i>
+						</a>
+						<a href="{{$baseurl}}/moderation/users/active/delete/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$delete}}" onclick="return confirm_delete('{{$confirm_delete}}','{{$u.name}}')">
+							<i class="fa fa-trash" aria-hidden="true"></i>
+						</a>
+				{{else}}
+						&nbsp;
+				{{/if}}
+					</td>
+				</tr>
+			{{/foreach}}
+			</tbody>
+		</table>
+		<div class="panel-footer">
+			<button type="submit" name="page_users_block" value="1" class="btn btn-warning">
+				<i class="fa fa-ban" aria-hidden="true"></i> {{$block}}
+			</button>
+			<button type="submit" name="page_users_delete" value="1" class="btn btn-danger" onclick="return confirm_delete('{{$confirm_delete_multi}}')">
+				<i class="fa fa-trash" aria-hidden="true"></i> {{$delete}}
+			</button>
+		</div>
+		{{$pager nofilter}}
+	</form>
+</div>

securemail/lang/fr/messages.po

@@ -5,7 +5,7 @@
 # 
 # Translators:
 # Hypolite Petovan <hypolite@mrpetovan.com>, 2022
-# Florent C., 2023
+# cracrayol, 2024
 # 
 #, fuzzy
 msgid ""
@@ -14,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-11-21 19:16-0500\n"
 "PO-Revision-Date: 2018-03-20 07:26+0000\n"
-"Last-Translator: Florent C., 2023\n"
+"Last-Translator: cracrayol, 2024\n"
 "Language-Team: French (https://app.transifex.com/Friendica/teams/12172/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +24,7 @@ msgstr ""
 
 #: securemail.php:50
 msgid "Enable Secure Mail"
-msgstr "Activer l'extension des emails sécurisés"
+msgstr "Activer l'extension des courriels sécurisés"
 
 #: securemail.php:51
 msgid "Public key"
@@ -36,7 +36,7 @@ msgstr "Votre clé publique PGP formatée compatible ASCII"
 
 #: securemail.php:56
 msgid "\"Secure Mail\" Settings"
-msgstr "Paramètres des emails sécurisés"
+msgstr "Paramètres des courriels sécurisés"
 
 #: securemail.php:59
 msgid "Save Settings"

securemail/lang/fr/strings.php

@@ -5,10 +5,10 @@ function string_plural_select_fr($n){
 	$n = intval($n);
 	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
 }}
-$a->strings['Enable Secure Mail'] = 'Activer l\'extension des emails sécurisés';
+$a->strings['Enable Secure Mail'] = 'Activer l\'extension des courriels sécurisés';
 $a->strings['Public key'] = 'Clé publique';
 $a->strings['Your public PGP key, ascii armored format'] = 'Votre clé publique PGP formatée compatible ASCII';
-$a->strings['"Secure Mail" Settings'] = 'Paramètres des emails sécurisés';
+$a->strings['"Secure Mail" Settings'] = 'Paramètres des courriels sécurisés';
 $a->strings['Save Settings'] = 'Enregistrer les paramètres';
 $a->strings['Save and send test'] = 'Enregistrer et envoyer un message de test';
 $a->strings['Test email sent'] = 'Courriel de test envoyé avec succès';

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 : 
-#when all else fails.
+	#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.
 
-
-
-#Animal smileys.
+	#Animal smileys.
 
 	$b['texts'][] = ':bunnyflowers:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':bunnyflowers:' . '" />';
@@ -50,7 +48,7 @@ function smiley_pack_smilies(array &$b)
 
 	$b['texts'][] = ':cow:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':cow:' . '" />';
-    
+
 	$b['texts'][] = ':crab:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':crab:' . '" />';
 
@@ -71,7 +69,7 @@ function smiley_pack_smilies(array &$b)
 
 	$b['texts'][] = ':horse:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':horse:' . '" />';
-  
+
 	$b['texts'][] = ':parrot:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':parrot:' . '" />';
 
@@ -99,16 +97,13 @@ 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:' . '" />';
 
 	$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:' . '" />';
@@ -116,11 +111,10 @@ function smiley_pack_smilies(array &$b)
 	$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:' . '" />';
-    
+
 	$b['texts'][] = ':shrug:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':shrug:' . '" />';
 
@@ -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:' . '" />';
@@ -152,20 +145,20 @@ function smiley_pack_smilies(array &$b)
 
 	$b['texts'][] = ':devillish:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':devillish:' . '" />';
-	
+
 	$b['texts'][] = ':daseesaw:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':daseesaw:' . '" />';
 
 	$b['texts'][] = ':turnevil:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':turnevil:' . '" />';
-	
+
 	$b['texts'][] = ':saint:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/saint.gif' . '" alt="' . ':saint:' . '" />';
 
 	$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:' . '" />';
@@ -231,11 +224,11 @@ function smiley_pack_smilies(array &$b)
 
 	$b['texts'][] = ':snooker:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':snooker:' . '" />';
-  
+
 	$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 
-# at the start of $OtherLanguage.
+	# Regex killers - stick these at the bottom so they appear at the end of the English and
+	# 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:' . '" />';
@@ -455,7 +459,7 @@ function smiley_pack_smilies(array &$b)
 
 	$b['texts'][] = ':golf:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/golf.gif' . '" alt="' . ':golf:' . '" />';
-	
+
 	$b['texts'][] = ':football:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/football.gif' . '" alt="' . ':football:' . '" />';
 
@@ -480,63 +484,167 @@ 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)
-# Fediverse
+	# New Gif Emoji (@one@loma.ml)
+	# 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:' . '" />';
-	
+
 	$b['texts'][] = ':pleroma:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/pleroma.gif' . '" alt="' . ':pleroma:' . '" />';
-	
+
 	$b['texts'][] = ':misskey:';
 	$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:' . '" />';
-	
+
 	$b['texts'][] = ':nextcloud:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/nextcloud.gif' . '" alt="' . ':nextcloud:' . '" />';
-	
+
 	$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:' . '" />';
-	
+
 	$b['texts'][] = ':spotify:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/spotify.gif' . '" alt="' . ':spotify:' . '" />';
-		
+
 	$b['texts'][] = ':twitter:';
 	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/twitter.gif' . '" alt="' . ':twitter:' . '" />';
-			
+
 	$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:' . '" />';
 }