advancedcontentfilter/advancedcontentfilter.php

@@ -253,7 +253,7 @@ function advancedcontentfilter_content()
 				'cancel'            => DI::l10n()->t('Cancel'),
 			],
 			'$current_theme' => DI::app()->getCurrentTheme(),
-			'$rules' => DBA::toArray(DBA::select('advancedcontentfilter_rules', [], ['uid' => DI::userSession()->getLocalUserId()])),
+			'$rules' => advancedcontentfilter_get_rules(),
 			'$form_security_token' => BaseModule::getFormSecurityToken()
 		]);
 	}
@@ -305,7 +305,7 @@ function advancedcontentfilter_build_fields($data)
  * API
  */
 
-function advancedcontentfilter_get_rules(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface
+function advancedcontentfilter_get_rules(ServerRequestInterface $request, ResponseInterface $response)
 {
 	if (!DI::userSession()->getLocalUserId()) {
 		throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this method'));

advancedcontentfilter/templates/settings.tpl

@@ -3,7 +3,7 @@
 	<div id="rules"></div>
 
 	<script>
-		var existingRules = {{$rules|json_encode nofilter}};
+		var existingRules = {{$rules nofilter}};
 
 		var messages = {
 	{{foreach $messages as $key => $value}}

blockbot/blockbot.php

@@ -27,20 +27,16 @@ function blockbot_addon_admin(string &$o)
 	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/blockbot/');
 
 	$o = Renderer::replaceMacros($t, [
-		'$submit'             => DI::l10n()->t('Save Settings'),
+		'$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.")],
+		'$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.")],
+		'$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.')],
-		'$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.")],
+		'$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.")],
-		'$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', 'http_libraries', $_POST['http_libraries'] ?? false);
 	DI::config()->set('blockbot', 'block_gab', $_POST['block_gab'] ?? false);
 	DI::config()->set('blockbot', 'training', $_POST['training'] ?? false);
 }
@@ -53,85 +49,58 @@ function blockbot_init_1()
 
 	$logdata = ['agent' => $_SERVER['HTTP_USER_AGENT'], 'uri' => $_SERVER['REQUEST_URI']];
 
-	// List of known unwanted crawlers.
+	// List of "good" crawlers
+	$good_agents = [
+		'fediverse.space crawler', 'fediverse.network crawler', 'Active_Pods_CheckBot_3.0',
+		'Social-Relay/', 'Test Certificate Info', 'Uptimebot/', 'GNUSocialBot', 'UptimeRobot/',
+		'PTST/', 'Zabbix', 'Poduptime/'
+	];
+
+	// List of known crawlers.
 	$agents = [
 		'SemrushBot', 's~feedly-nikon3', 'Qwantify/Bleriot/', 'ltx71', 'Sogou web spider/',
-		'Diffbot/', 'YisouSpider', 'evc-batch/', 'LivelapBot/', 'TrendsmapResolver/',
+		'Diffbot/', 'Twitterbot/', 'YisouSpider', 'evc-batch/', 'LivelapBot/', 'TrendsmapResolver/',
 		'PaperLiBot/', 'Nuzzel', 'um-LN/', 'Google Favicon', 'Datanyze', 'BLEXBot/', '360Spider',
 		'adscanner/', 'HeadlessChrome', 'wpif', 'startmebot/', 'Googlebot/', 'Applebot/',
-		'GoogleImageProxy', 'bingbot/', 'heritrix/', 'ldspider',
+		'facebookexternalhit/', '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/',
+		'AhrefsBot/', 'YandexBot/', 'Exabot/', 'Mediumbot-MetaTagFetcher/', 'WhatsApp/',
-		'SurdotlyBot/', 'BingPreview/', 'SabsimBot/', 'CCBot/', 'WbSrch/',
+		'TelegramBot', '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/',
+		'Scrapy/', 'github-camo', '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;',
+		'SummalyBot/', 'DNSResearchBot/', 'PetalBot;', 'Nmap Scripting Engine;',
 		'Google-Apps-Script; beanserver;', 'woorankreview/', 'Seekport Crawler;', 'AHC/',
-		'Semanticbot/', 'XoviOnpageCrawler;', 'Pinterest/',
+		'SkypeUriPreview Preview/', 'Semanticbot/', 'Embed PHP library', 'XoviOnpageCrawler;',
 		'GetHPinfo.com-Bot/', 'BoardReader Favicon Fetcher', 'Google-Adwords-Instant', 'newspaper/',
-		'YurichevBot/', 'Crawling at Home Project', 'InfoTigerBot/', 'AdIdxBot/',
+		'YurichevBot/', 'Crawling at Home Project', 'InfoTigerBot/'
-		'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'
 	];
 
+	if (!DI::config()->get('blockbot', 'good_crawlers')) {
+		$agents = array_merge($agents, $good_agents);
+	} else {
+		foreach ($good_agents as $good_agent) {
+			if (stristr($_SERVER['HTTP_USER_AGENT'], $good_agent)) {
+				return;
+			}
+		}
+	}
+
 	if (DI::config()->get('blockbot', 'block_gab')) {
 		$agents[] = 'GabSocial/';
 	}
 
-	// List of "good" crawlers, mostly from the fediverse.
+	foreach ($agents as $agent) {
-	$good_agents = [
+		if (stristr($_SERVER['HTTP_USER_AGENT'], $agent)) {
-		'fediverse.space crawler', 'fediverse.network crawler', 'Active_Pods_CheckBot_3.0',
+			throw new ForbiddenException('Bots are not allowed');
-		'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',
-	];
-
-	if (!DI::config()->get('blockbot', 'good_crawlers')) {
-		$agents = array_merge($agents, $good_agents);
-	} elseif (blockbot_match($good_agents)) {
-		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',
-	];
-
-	if (!DI::config()->get('blockbot', 'socialmedia_agents')) {
-		$agents = array_merge($agents, $socialmedia_agents);
-	} elseif (blockbot_match($socialmedia_agents)) {
-		return;
-	}
-	
-	// 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)) {
-		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');
 	}
 
 	// This switch here is only meant for developers who want to add more bots to the list above, it is not safe for production.
@@ -146,7 +115,7 @@ function blockbot_init_1()
 		return;
 	}
 
-	// List of known "good" agents, mostly used by Fediverse systems, feed readers, ...
+	// List of false positives' strings of known "good" agents.
 	$agents = [
 		'curl', 'zgrab', 'Go-http-client', 'curb', 'github.com', 'reqwest', 'Feedly/',
 		'Python-urllib/', 'Liferea/', 'aiohttp/', 'WordPress.com Reader', 'hackney/',
@@ -156,27 +125,20 @@ function blockbot_init_1()
 		'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/',
+		'Slackbot-LinkExpanding'
-		'camo-rs asset proxy', 'gotosocial/', 'incestoma ', 'SpaceCowboys Android RSS Reader',
-		'NewsBlur Feed Finder', 'Lemmy/', 'enby-town/', 'rss2tg bot;', '; HTTrack ',
-		'MbinBot', 'kbinBot'
 	];
 
-	if (blockbot_match($agents)) {
+	if (DI::config()->get('blockbot', 'good_crawlers')) {
-		logger::info('False positive', $logdata);
+		$agents = array_merge($agents, $good_agents);
-		return;
+	}
+
+	foreach ($agents as $agent) {
+		if (stristr($_SERVER['HTTP_USER_AGENT'], $agent)) {
+			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');
+	throw new ForbiddenException('Bots are not allowed');
-}
-
-function blockbot_match(array $agents)
-{
-	foreach ($agents as $agent) {
-		if (stristr($_SERVER['HTTP_USER_AGENT'], $agent)) {
-			return true;
-		}
-	}
-	return false;
 }

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: 2021-12-13 06:17+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"
@@ -32,42 +32,21 @@ msgid ""
 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."
-msgstr ""
-
-#: blockbot.php:33
-msgid "Allow generic HTTP libraries"
-msgstr ""
-
-#: blockbot.php:33
-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
+#: blockbot.php:32
 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
+#: blockbot.php:33
 msgid "Training mode"
 msgstr ""
 
-#: blockbot.php:35
+#: blockbot.php:33
 msgid ""
 "Activates the training mode. This is only meant for developing purposes. "
 "Don't activate this on a production machine. This can cut communication with "

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=$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>

bluesky/bluesky.php

@@ -42,7 +42,6 @@ use Friendica\Model\ItemURI;
 use Friendica\Model\Photo;
 use Friendica\Model\Post;
 use Friendica\Model\Tag;
-use Friendica\Model\User;
 use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Object\Image;
@@ -142,7 +141,7 @@ function bluesky_probe_detect(array &$hookData)
 		return;
 	}
 
-	$hookData['result'] = bluesky_get_contact_fields($data, 0, $pconfig['uid'], false);
+	$hookData['result'] = bluesky_get_contact_fields($data, 0, false);
 
 	$hookData['result']['baseurl'] = bluesky_get_pds($did);
 
@@ -184,7 +183,7 @@ function bluesky_item_by_link(array &$hookData)
 
 	$uri = 'at://' . $did . '/app.bsky.feed.post/' . $matches[2];
 
-	$uri = bluesky_fetch_missing_post($uri, $hookData['uid'], $hookData['uid'], Item::PR_FETCHED, 0, 0, 0);
+	$uri = bluesky_fetch_missing_post($uri, $hookData['uid'], $hookData['uid'], 0, 0);
 	Logger::debug('Got post', ['profile' => $matches[1], 'cid' => $matches[2], 'result' => $uri]);
 	if (!empty($uri)) {
 		$item = Post::selectFirst(['id'], ['uri' => $uri, 'uid' => $hookData['uid']]);
@@ -317,44 +316,20 @@ function bluesky_unblock(array &$hook_data)
 	$hook_data['result'] = true;
 }
 
-function bluesky_addon_admin(string &$o)
-{
-	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/bluesky/');
-
-	$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')],
-	]);
-}
-
-function bluesky_addon_admin_post()
-{
-	DI::config()->set('bluesky', 'friendica_handles', (bool)$_POST['friendica_handles']);
-}
-
 function bluesky_settings(array &$data)
 {
 	if (!DI::userSession()->getLocalUserId()) {
 		return;
 	}
 
-	$enabled       = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'post') ?? false;
+	$enabled      = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'post') ?? false;
-	$def_enabled   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'post_by_default') ?? false;
+	$def_enabled  = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'post_by_default') ?? false;
-	$pds           = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'pds');
+	$pds          = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'pds');
-	$handle        = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'handle');
+	$handle       = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'handle');
-	$did           = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'did');
+	$did          = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'did');
-	$token         = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'access_token');
+	$token        = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'access_token');
-	$import        = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'import') ?? false;
+	$import       = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'import') ?? false;
-	$import_feeds  = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'import_feeds') ?? false;
+	$import_feeds = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'import_feeds') ?? false;
-	$custom_handle = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'friendica_handle') ?? false;
-
-	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)];
-	} else {
-		$friendica_handle = [];
-	}
 
 	$t    = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/bluesky/');
 	$html = Renderer::replaceMacros($t, [
@@ -362,7 +337,6 @@ function bluesky_settings(array &$data)
 		'$bydefault'    => ['bluesky_bydefault', DI::l10n()->t('Post to Bluesky by default'), $def_enabled],
 		'$import'       => ['bluesky_import', DI::l10n()->t('Import the remote timeline'), $import],
 		'$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],
 		'$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'],
@@ -430,12 +404,11 @@ function bluesky_settings_post(array &$b)
 
 	$handle = trim($_POST['bluesky_handle'], ' @');
 
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'post',             intval($_POST['bluesky']));
+	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'post',            intval($_POST['bluesky']));
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'post_by_default',  intval($_POST['bluesky_bydefault']));
+	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'post_by_default', intval($_POST['bluesky_bydefault']));
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'handle',           $handle);
+	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',          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', 'import_feeds',    intval($_POST['bluesky_import_feeds']));
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'friendica_handle', intval($_POST['bluesky_friendica_handle']));
 
 	if (!empty($handle)) {
 		if (empty($old_did) || $old_handle != $handle) {
@@ -717,24 +690,8 @@ function bluesky_create_post(array $item, stdClass $root = null, stdClass $paren
 		$language = '';
 	}
 
-	$item['body'] = Post\Media::removeFromBody($item['body']);
+	$did  = DI::pConfig()->get($uid, 'bluesky', 'did');
-
+	$urls = bluesky_get_urls(Post\Media::removeFromBody($item['body']));
-	foreach (Post\Media::getByURIId($item['uri-id'], [Post\Media::AUDIO, Post\Media::VIDEO, Post\Media::ACTIVITY]) as $media) {
-		if (strpos($item['body'], $media['url']) === false) {
-			$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)) {
-			if ((strpos($item['body'], $quote['plink'] ?: $quote['uri']) === false) && (strpos($item['body'], $quote['uri']) === false)) {
-				$item['body'] .= "\n[url]" . ($quote['plink'] ?: $quote['uri']) . "[/url]\n";
-			}
-		}
-	}
-	
-	$urls = bluesky_get_urls($item['body']);
 	$item['body'] = $urls['body'];
 
 	$msg = Plaintext::getPost($item, 300, false, BBCode::BLUESKY);
@@ -772,7 +729,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'       => $did,
 			'record'     => $record
 		];
 
@@ -807,7 +764,7 @@ function bluesky_get_urls(string $body): array
 	if (preg_match_all("/#\[url\=(https?:.*?)\](.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER)) {
 		foreach ($matches as $match) {
 			$text = '#' . $match[2];
-			$urls[strpos($body, $match[0])] = ['tag' => $match[2], 'text' => $text, 'hash' => $text];
+			$urls[] = ['tag' => $match[2], 'text' => $text, 'hash' => $text];
 			$body = str_replace($match[0], $text, $body);
 		}
 	}
@@ -817,7 +774,7 @@ function bluesky_get_urls(string $body): array
 		foreach ($matches as $match) {
 			$text = Strings::getStyledURL($match[1]);
 			$hash = bluesky_get_hash_for_url($match[0], mb_strlen($text));
-			$urls[strpos($body, $match[0])] = ['url' => $match[1], 'text' => $text, 'hash' => $hash];
+			$urls[] = ['url' => $match[1], 'text' => $text, 'hash' => $hash];
 			$body = str_replace($match[0], $hash, $body);
 		}
 	}
@@ -832,19 +789,17 @@ function bluesky_get_urls(string $body): array
 			}
 			if (mb_strlen($text) < 100) {
 				$hash = bluesky_get_hash_for_url($match[0], mb_strlen($text));
-				$urls[strpos($body, $match[0])] = ['url' => $match[1], 'text' => $text, 'hash' => $hash];
+				$urls[] = ['url' => $match[1], 'text' => $text, 'hash' => $hash];
 				$body = str_replace($match[0], $hash, $body);
 			} else {
 				$text = Strings::getStyledURL($match[1]);
 				$hash = bluesky_get_hash_for_url($match[0], mb_strlen($text));
-				$urls[strpos($body, $match[0])] = ['url' => $match[1], 'text' => $text, 'hash' => $hash];
+				$urls[] = ['url' => $match[1], 'text' => $text, 'hash' => $hash];
 				$body = str_replace($match[0], $text . ' ' . $hash, $body);
 			}
 		}
 	}
 
-	asort($urls);
-
 	return ['body' => $body, 'urls' => $urls];
 }
 
@@ -941,7 +896,7 @@ function bluesky_upload_blob(int $uid, array $photo): ?stdClass
 	$retrial = Worker::getRetrial();
 	$content = Photo::getImageForPhoto($photo);
 
-	$picture = new Image($content, $photo['type'], $photo['filename']);
+	$picture = new Image($content, $photo['type']);
 	$height  = $picture->getHeight();
 	$width   = $picture->getWidth();
 	$size    = strlen($content);
@@ -987,7 +942,7 @@ function bluesky_fetch_timeline(int $uid, int $last_poll)
 	}
 
 	foreach (array_reverse($data->feed) as $entry) {
-		bluesky_process_post($entry->post, $uid, $uid, Item::PR_NONE, 0, 0, $last_poll);
+		bluesky_process_post($entry->post, $uid, Item::PR_NONE, 0, $last_poll);
 		if (!empty($entry->reason)) {
 			bluesky_process_reason($entry->reason, bluesky_get_uri($entry->post), $uid);
 		}
@@ -1057,28 +1012,28 @@ function bluesky_fetch_notifications(int $uid, int $last_poll)
 				$item['gravity'] = Item::GRAVITY_ACTIVITY;
 				$item['body'] = $item['verb'] = Activity::LIKE;
 				$item['thr-parent'] = bluesky_get_uri($notification->record->subject);
-				$item['thr-parent'] = bluesky_fetch_missing_post($item['thr-parent'], $uid, $uid, Item::PR_FETCHED, $item['contact-id'], 0, $last_poll);
+				$item['thr-parent'] = bluesky_fetch_missing_post($item['thr-parent'], $uid, $uid, $item['contact-id'], 0, $last_poll);
 				if (!empty($item['thr-parent'])) {
 					$data = Item::insert($item);
 					Logger::debug('Got like', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
 				} else {
 					Logger::info('Thread parent not found', ['uid' => $uid, 'parent' => $item['thr-parent'], 'uri' => $uri]);
 				}
-				break;
+			break;
 
 			case 'repost':
 				$item = bluesky_get_header($notification, $uri, $uid, $uid);
 				$item['gravity'] = Item::GRAVITY_ACTIVITY;
 				$item['body'] = $item['verb'] = Activity::ANNOUNCE;
 				$item['thr-parent'] = bluesky_get_uri($notification->record->subject);
-				$item['thr-parent'] = bluesky_fetch_missing_post($item['thr-parent'], $uid, $uid, Item::PR_FETCHED, $item['contact-id'], 0, $last_poll);
+				$item['thr-parent'] = bluesky_fetch_missing_post($item['thr-parent'], $uid, $uid, $item['contact-id'], 0, $last_poll);
 				if (!empty($item['thr-parent'])) {
 					$data = Item::insert($item);
 					Logger::debug('Got repost', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
 				} else {
 					Logger::info('Thread parent not found', ['uid' => $uid, 'parent' => $item['thr-parent'], 'uri' => $uri]);
 				}
-				break;
+			break;
 
 			case 'follow':
 				$contact = bluesky_get_contact($notification->author, $uid, $uid);
@@ -1086,21 +1041,18 @@ function bluesky_fetch_notifications(int $uid, int $last_poll)
 				break;
 
 			case 'mention':
-				$contact = bluesky_get_contact($notification->author, 0, $uid);
+				$data = bluesky_process_post($notification, $uid, Item::PR_PUSHED, 0, $last_poll);
-				$result  = bluesky_fetch_missing_post($uri, $uid, $uid, Item::PR_TO, $contact['id'], 0, $last_poll);
+				Logger::debug('Got mention', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
-				Logger::debug('Got mention', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
 				break;
 
 			case 'reply':
-				$contact = bluesky_get_contact($notification->author, 0, $uid);
+				$data = bluesky_process_post($notification, $uid, Item::PR_PUSHED, 0, $last_poll);
-				$result  = bluesky_fetch_missing_post($uri, $uid, $uid, Item::PR_COMMENT, $contact['id'], 0, $last_poll);
+				Logger::debug('Got reply', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
-				Logger::debug('Got reply', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
 				break;
 
 			case 'quote':
-				$contact = bluesky_get_contact($notification->author, 0, $uid);
+				$data = bluesky_process_post($notification, $uid, Item::PR_PUSHED, 0, $last_poll);
-				$result  = bluesky_fetch_missing_post($uri, $uid, $uid, Item::PR_PUSHED, $contact['id'], 0, $last_poll);
+				Logger::debug('Got quote', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
-				Logger::debug('Got quote', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
 				break;
 
 			default:
@@ -1138,12 +1090,15 @@ function bluesky_fetch_feed(int $uid, string $feed, int $last_poll)
 			Logger::debug('Unwanted language detected', ['text' => $entry->post->record->text]);
 			continue;
 		}
-		$uri_id = bluesky_process_post($entry->post, $uid, $uid, Item::PR_TAG, 0, 0, $last_poll);
+		$id = bluesky_process_post($entry->post, $uid, Item::PR_TAG, 0, $last_poll);
-		if (!empty($uri_id)) {
+		if (!empty($id)) {
-			$stored = Post\Category::storeFileByURIId($uri_id, $uid, Post\Category::SUBCRIPTION, $feedname, $feedurl);
+			$post = Post::selectFirst(['uri-id'], ['id' => $id]);
-			Logger::debug('Stored tag subscription for user', ['uri-id' => $uri_id, 'uid' => $uid, 'name' => $feedname, 'url' => $feedurl, 'stored' => $stored]);
+			if (!empty($post['uri-id'])) {
-		} else {
+				$stored = Post\Category::storeFileByURIId($post['uri-id'], $uid, Post\Category::SUBCRIPTION, $feedname, $feedurl);
-			Logger::notice('Post not found', ['entry' => $entry]);
+				Logger::debug('Stored tag subscription for user', ['uri-id' => $post['uri-id'], 'uid' => $uid, 'name' => $feedname, 'url' => $feedurl, 'stored' => $stored]);
+			} else {
+				Logger::notice('Post not found', ['id' => $id, 'entry' => $entry]);
+			}
 		}
 		if (!empty($entry->reason)) {
 			bluesky_process_reason($entry->reason, bluesky_get_uri($entry->post), $uid);
@@ -1151,23 +1106,22 @@ function bluesky_fetch_feed(int $uid, string $feed, int $last_poll)
 	}
 }
 
-function bluesky_process_post(stdClass $post, int $uid, int $fetch_uid, int $post_reason, int $causer, int $level, int $last_poll): int
+function bluesky_process_post(stdClass $post, int $uid, int $post_reason, int $level, int $last_poll): int
 {
 	$uri = bluesky_get_uri($post);
 
-	if ($uri_id = bluesky_fetch_uri_id($uri, $uid)) {
+	if ($id = Post::selectFirst(['id'], ['uri' => $uri, 'uid' => $uid])) {
-		return $uri_id;
+		return $id['id'];
 	}
 
-	if (empty($post->record)) {
+	if ($id = Post::selectFirst(['id'], ['extid' => $uri, 'uid' => $uid])) {
-		Logger::debug('Invalid post', ['uri' => $uri]);
+		return $id['id'];
-		return 0;
 	}
 
 	Logger::debug('Importing post', ['uid' => $uid, 'indexedAt' => $post->indexedAt, 'uri' => $post->uri, 'cid' => $post->cid, 'root' => $post->record->reply->root ?? '']);
 
-	$item = bluesky_get_header($post, $uri, $uid, $fetch_uid);
+	$item = bluesky_get_header($post, $uri, $uid, $uid);
-	$item = bluesky_get_content($item, $post->record, $uri, $uid, $fetch_uid, $level, $last_poll);
+	$item = bluesky_get_content($item, $post->record, $uri, $uid, $uid, $level, $last_poll);
 	if (empty($item)) {
 		return 0;
 	}
@@ -1180,18 +1134,13 @@ function bluesky_process_post(stdClass $post, int $uid, int $fetch_uid, int $pos
 		$item['post-reason'] = $post_reason;
 	}
 
-	if ($causer != 0) {
+	return Item::insert($item);
-		$item['causer-id'] = $causer;
-	}
-
-	Item::insert($item);
-	return bluesky_fetch_uri_id($uri, $uid);
 }
 
 function bluesky_get_header(stdClass $post, string $uri, int $uid, int $fetch_uid): array
 {
 	$parts = bluesky_get_uri_parts($uri);
-	if (empty($post->author) || empty($post->cid) || empty($parts->rkey)) {
+	if (empty($post->author)) {
 		return [];
 	}
 	$contact = bluesky_get_contact($post->author, $uid, $fetch_uid);
@@ -1232,7 +1181,7 @@ function bluesky_get_content(array $item, stdClass $record, string $uri, int $ui
 	if (!empty($record->reply)) {
 		$item['parent-uri'] = bluesky_get_uri($record->reply->root);
 		if ($item['parent-uri'] != $uri) {
-			$item['parent-uri'] = bluesky_fetch_missing_post($item['parent-uri'], $uid, $fetch_uid, Item::PR_FETCHED, $item['contact-id'], $level, $last_poll);
+			$item['parent-uri'] = bluesky_fetch_missing_post($item['parent-uri'], $uid, $fetch_uid, $item['contact-id'], $level, $last_poll);
 			if (empty($item['parent-uri'])) {
 				return [];
 			}
@@ -1240,7 +1189,7 @@ function bluesky_get_content(array $item, stdClass $record, string $uri, int $ui
 
 		$item['thr-parent'] = bluesky_get_uri($record->reply->parent);
 		if (!in_array($item['thr-parent'], [$uri, $item['parent-uri']])) {
-			$item['thr-parent'] = bluesky_fetch_missing_post($item['thr-parent'], $uid, $fetch_uid, Item::PR_FETCHED, $item['contact-id'], $level, $last_poll, $item['parent-uri']);
+			$item['thr-parent'] = bluesky_fetch_missing_post($item['thr-parent'], $uid, $fetch_uid, $item['contact-id'], $level, $last_poll, $item['parent-uri']);
 			if (empty($item['thr-parent'])) {
 				return [];
 			}
@@ -1344,36 +1293,55 @@ function bluesky_add_media(stdClass $embed, array $item, int $fetch_uid, int $le
 			break;
 
 		case 'app.bsky.embed.record#view':
-			$original_uri = $uri = bluesky_get_uri($embed->record);
+			$uri = bluesky_get_uri($embed->record);
-			$uri = bluesky_fetch_missing_post($uri, $item['uid'], $fetch_uid, Item::PR_FETCHED, $item['contact-id'], $level, $last_poll);
+			$shared = Post::selectFirst(['uri-id'], ['uri' => $uri, 'uid' => $item['uid']]);
-			if ($uri) {
+			if (empty($shared)) {
-				$shared = Post::selectFirst(['uri-id'], ['uri' => $uri, 'uid' => [$item['uid'], 0]]);
+				if (empty($embed->record->value)) {
-				$uri_id = $shared['uri-id'] ?? 0;
+					Logger::info('Record has got no value', ['record' => $embed->record]);
+					break;
+				}
+				$shared = bluesky_get_header($embed->record, $uri, 0, $fetch_uid);
+				$shared = bluesky_get_content($shared, $embed->record->value, $uri, $item['uid'], $fetch_uid, $level, $last_poll);
+				if (!empty($shared)) {
+					if (!empty($embed->record->embeds)) {
+						foreach ($embed->record->embeds as $single) {
+							$shared = bluesky_add_media($single, $shared, $fetch_uid, $level, $last_poll);
+						}
+					}
+					Item::insert($shared);
+				}
 			}
-			if (!empty($uri_id)) {
+			if (!empty($shared['uri-id'])) {
-				$item['quote-uri-id'] = $uri_id;
+				$item['quote-uri-id'] = $shared['uri-id'];
-			} else {
-				Logger::debug('Quoted post could not be fetched', ['original-uri' => $original_uri, 'uri' => $uri]);
 			}
 			break;
 
 		case 'app.bsky.embed.recordWithMedia#view':
-			bluesky_add_media($embed->media, $item, $fetch_uid, $level, $last_poll);
+			$uri = bluesky_get_uri($embed->record->record);
-			$original_uri = $uri = bluesky_get_uri($embed->record->record);
+			$shared = Post::selectFirst(['uri-id'], ['uri' => $uri, 'uid' => $item['uid']]);
-			$uri = bluesky_fetch_missing_post($uri, $item['uid'], $fetch_uid, Item::PR_FETCHED, $item['contact-id'], $level, $last_poll);
+			if (empty($shared)) {
-			if ($uri) {
+				$shared = bluesky_get_header($embed->record->record, $uri, 0, $fetch_uid);
-				$shared = Post::selectFirst(['uri-id'], ['uri' => $uri, 'uid' => [$item['uid'], 0]]);
+				$shared = bluesky_get_content($shared, $embed->record->record->value, $uri, $item['uid'], $fetch_uid, $level, $last_poll);
-				$uri_id = $shared['uri-id'] ?? 0;
+				if (!empty($shared)) {
+					if (!empty($embed->record->record->embeds)) {
+						foreach ($embed->record->record->embeds as $single) {
+							$shared = bluesky_add_media($single, $shared, $fetch_uid, $level, $last_poll);
+						}
+					}
+					Item::insert($shared);
+				}
 			}
-			if (!empty($uri_id)) {
+			if (!empty($shared['uri-id'])) {
-				$item['quote-uri-id'] = $uri_id;
+				$item['quote-uri-id'] = $shared['uri-id'];
-			} else {
+			}
-				Logger::debug('Quoted post could not be fetched', ['original-uri' => $original_uri, 'uri' => $uri]);
+
+			if (!empty($embed->media)) {
+				$item = bluesky_add_media($embed->media, $item, $fetch_uid, $level, $last_poll);
 			}
 			break;
 
 		default:
-			Logger::notice('Unhandled embed type', ['uri-id' => $item['uri-id'], 'type' => $embed->$type, 'embed' => $embed]);
+			Logger::notice('Unhandled embed type', ['type' => $embed->$type, 'embed' => $embed]);
 			break;
 	}
 	return $item;
@@ -1431,7 +1399,7 @@ function bluesky_get_uri_parts(string $uri): ?stdClass
 	return $class;
 }
 
-function bluesky_fetch_missing_post(string $uri, int $uid, int $fetch_uid, int $post_reason, int $causer, int $level, int $last_poll, string $fallback = ''): string
+function bluesky_fetch_missing_post(string $uri, int $uid, int $fetch_uid, int $causer, int $level, int $last_poll = 0, string $fallback = ''): string
 {
 	$fetched_uri = bluesky_fetch_post($uri, $uid);
 	if (!empty($fetched_uri)) {
@@ -1459,10 +1427,11 @@ function bluesky_fetch_missing_post(string $uri, int $uid, int $fetch_uid, int $
 
 	if ($causer != 0) {
 		$cdata = Contact::getPublicAndUserContactID($causer, $uid);
-		$causer = $cdata['public'] ?? 0;
+	} else {
+		$cdata = [];
 	}
 
-	return bluesky_process_thread($data->thread, $uid, $fetch_uid, $post_reason, $causer, $level, $last_poll);
+	return bluesky_process_thread($data->thread, $uid, $fetch_uid, $cdata, $level, $last_poll);
 }
 
 function bluesky_fetch_post(string $uri, int $uid): string
@@ -1480,22 +1449,7 @@ function bluesky_fetch_post(string $uri, int $uid): string
 	return '';
 }
 
-function bluesky_fetch_uri_id(string $uri, int $uid): string
+function bluesky_process_thread(stdClass $thread, int $uid, int $fetch_uid, array $cdata, int $level, int $last_poll): string
-{
-	$reply = Post::selectFirst(['uri-id'], ['uri' => $uri, 'uid' => [$uid, 0]]);
-	if (!empty($reply['uri-id'])) {
-		Logger::debug('Post with extid exists', ['uri' => $uri]);
-		return $reply['uri-id'];
-	}
-	$reply = Post::selectFirst(['uri-id'], ['extid' => $uri, 'uid' => [$uid, 0]]);
-	if (!empty($reply['uri-id'])) {
-		Logger::debug('Post with extid exists', ['uri' => $uri]);
-		return $reply['uri-id'];
-	}
-	return 0;
-}
-
-function bluesky_process_thread(stdClass $thread, int $uid, int $fetch_uid, int $post_reason, int $causer, int $level, int $last_poll): string
 {
 	if (empty($thread->post)) {
 		Logger::info('Invalid post', ['post' => $thread]);
@@ -1505,12 +1459,27 @@ function bluesky_process_thread(stdClass $thread, int $uid, int $fetch_uid, int
 
 	$fetched_uri = bluesky_fetch_post($uri, $uid);
 	if (empty($fetched_uri)) {
-		$uri_id = bluesky_process_post($thread->post, $uid, $fetch_uid, $post_reason, $causer, $level, $last_poll);
+		Logger::debug('Process missing post', ['uri' => $uri]);
-		if ($uri_id) {
+		$item = bluesky_get_header($thread->post, $uri, $uid, $uid);
-			Logger::debug('Post has been processed and stored', ['uri-id' => $uri_id, 'uri' => $uri]);
+		$item = bluesky_get_content($item, $thread->post->record, $uri, $uid, $fetch_uid, $level, $last_poll);
-			return $uri;
+		if (!empty($item)) {
+			$item['post-reason'] = Item::PR_FETCHED;
+
+			if (!empty($cdata['public'])) {
+				$item['causer-id']   = $cdata['public'];
+			}
+
+			if (!empty($thread->post->embed)) {
+				$item = bluesky_add_media($thread->post->embed, $item, $uid, $level, $last_poll);
+			}
+			$id = Item::insert($item);
+			if (!$id) {
+				Logger::info('Item has not not been stored', ['uri' => $uri]);
+				return '';
+			}
+			Logger::debug('Stored item', ['id' => $id, 'uri' => $uri]);
 		} else {
-			Logger::info('Post has not not been stored', ['uri' => $uri]);
+			Logger::info('Post has not not been fetched', ['uri' => $uri]);
 			return '';
 		}
 	} else {
@@ -1519,7 +1488,7 @@ function bluesky_process_thread(stdClass $thread, int $uid, int $fetch_uid, int
 	}
 
 	foreach ($thread->replies ?? [] as $reply) {
-		$reply_uri = bluesky_process_thread($reply, $uid, $fetch_uid, Item::PR_FETCHED, $causer, $level, $last_poll);
+		$reply_uri = bluesky_process_thread($reply, $uid, $fetch_uid, $cdata, $level, $last_poll);
 		Logger::debug('Reply has been processed', ['uri' => $uri, 'reply' => $reply_uri]);
 	}
 
@@ -1533,7 +1502,7 @@ function bluesky_get_contact(stdClass $author, int $uid, int $fetch_uid): array
 
 	$update = empty($contact) || $contact['updated'] < DateTimeFormat::utc('now -24 hours');
 
-	$public_fields = $fields = bluesky_get_contact_fields($author, $uid, $fetch_uid, $update);
+	$public_fields = $fields = bluesky_get_contact_fields($author, $fetch_uid, $update);
 
 	$public_fields['uid'] = 0;
 	$public_fields['rel'] = Contact::NOTHING;
@@ -1574,10 +1543,8 @@ function bluesky_get_contact(stdClass $author, int $uid, int $fetch_uid): array
 	return Contact::getById($cid);
 }
 
-function bluesky_get_contact_fields(stdClass $author, int $uid, int $fetch_uid, bool $update): array
+function bluesky_get_contact_fields(stdClass $author, int $uid, bool $update): array
 {
-	$nick = $author->handle ?? $author->did;
-	$name = $author->displayName ?? $nick;
 	$fields = [
 		'uid'      => $uid,
 		'network'  => Protocol::BLUESKY,
@@ -1588,10 +1555,10 @@ function bluesky_get_contact_fields(stdClass $author, int $uid, int $fetch_uid,
 		'pending'  => false,
 		'url'      => $author->did,
 		'nurl'     => $author->did,
-		'alias'    => BLUESKY_WEB . '/profile/' . $nick,
+		'alias'    => BLUESKY_WEB . '/profile/' . $author->handle,
-		'name'     => $name ?: $nick,
+		'name'     => $author->displayName ?? $author->handle,
-		'nick'     => $nick,
+		'nick'     => $author->handle,
-		'addr'     => $nick,
+		'addr'     => $author->handle,
 	];
 
 	if (!$update) {
@@ -1605,7 +1572,7 @@ function bluesky_get_contact_fields(stdClass $author, int $uid, int $fetch_uid,
 		$fields['gsid'] = GServer::getID($fields['baseurl'], true);
 	}
 
-	$data = bluesky_xrpc_get($fetch_uid, 'app.bsky.actor.getProfile', ['actor' => $author->did]);
+	$data = bluesky_xrpc_get($uid, 'app.bsky.actor.getProfile', ['actor' => $author->did]);
 	if (empty($data)) {
 		Logger::debug('Error fetching contact fields', ['uid' => $uid, 'url' => $fields['url']]);
 		return $fields;
@@ -1663,59 +1630,13 @@ function bluesky_get_preferences(int $uid): stdClass
 	return $data;
 }
 
-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]);	
-			return '';
-		}
-		Logger::debug('Got DID by wellknown', ['handle' => $handle, 'did' => $did]);
-		return $did;
-	}
-	return '';
-}
-
-function bluesky_get_did_by_dns(string $handle): string
-{
-	$records = @dns_get_record('_atproto.' . $handle . '.', DNS_TXT);
-	if (empty($records)) {
-		return '';
-	}
-	foreach ($records as $record) {
-		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]);	
-				return '';
-			}
-			Logger::debug('Got DID by DNS', ['handle' => $handle, 'did' => $did]);
-			return $did;
-		}
-	}
-	return '';
-}
-
 function bluesky_get_did(string $handle): 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 (empty($data)) {
 		return '';
 	}
-	Logger::debug('Got DID by PDS call', ['handle' => $handle, 'did' => $data->did]);
+	Logger::debug('Got DID', ['return' => $data]);
 	return $data->did;
 }
 
@@ -1751,16 +1672,6 @@ function bluesky_get_pds(string $did): ?string
 	return null;
 }
 
-function bluesky_valid_did(string $did, string $handle): bool
-{
-	$data = bluesky_get(BLUESKY_DIRECTORY . '/' . $did);
-	if (empty($data) || empty($data->alsoKnownAs)) {
-		return false;
-	}
-
-	return in_array('at://' . $handle, $data->alsoKnownAs);
-}
-
 function bluesky_get_token(int $uid): string
 {
 	$token   = DI::pConfig()->get($uid, 'bluesky', 'access_token');
@@ -1843,6 +1754,7 @@ function bluesky_xrpc_get(int $uid, string $url, array $parameters = []): ?stdCl
 	$data = bluesky_get(bluesky_get_user_pds($uid) . '/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;
+
 }
 
 function bluesky_get(string $url, string $accept_content = HttpClientAccept::DEFAULT, array $opts = []): ?stdClass

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: 2023-12-06 06:30+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,129 +17,100 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: bluesky.php:325
+#: bluesky.php:336
-msgid "Save Settings"
-msgstr ""
-
-#: bluesky.php:326
-msgid "Allow your users to use your hostname for their Bluesky handles"
-msgstr ""
-
-#: bluesky.php:326
-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"
-msgstr ""
-
-#: bluesky.php:354
-#, php-format
-msgid "Allow to use %s as your Bluesky handle."
-msgstr ""
-
-#: bluesky.php:354
-#, php-format
-msgid ""
-"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\"."
-msgstr ""
-
-#: bluesky.php:361
 msgid "Enable Bluesky Post Addon"
 msgstr ""
 
-#: bluesky.php:362
+#: bluesky.php:337
 msgid "Post to Bluesky by default"
 msgstr ""
 
-#: bluesky.php:363
+#: bluesky.php:338
 msgid "Import the remote timeline"
 msgstr ""
 
-#: bluesky.php:364
+#: bluesky.php:339
 msgid "Import the pinned feeds"
 msgstr ""
 
-#: bluesky.php:364
+#: bluesky.php:339
 msgid ""
 "When activated, Posts will be imported from all the feeds that you pinned in "
 "Bluesky."
 msgstr ""
 
-#: bluesky.php:366
+#: bluesky.php:340
 msgid "Personal Data Server"
 msgstr ""
 
-#: bluesky.php:366
+#: bluesky.php:340
 msgid "The personal data server (PDS) is the system that hosts your profile."
 msgstr ""
 
-#: bluesky.php:367
+#: bluesky.php:341
 msgid "Bluesky handle"
 msgstr ""
 
-#: bluesky.php:368
+#: bluesky.php:342
 msgid "Bluesky DID"
 msgstr ""
 
-#: bluesky.php:368
+#: bluesky.php:342
 msgid ""
 "This is the unique identifier. It will be fetched automatically, when the "
 "handle is entered."
 msgstr ""
 
-#: bluesky.php:369
+#: bluesky.php:343
 msgid "Bluesky app password"
 msgstr ""
 
-#: bluesky.php:369
+#: bluesky.php:343
 msgid ""
 "Please don't add your real password here, but instead create a specific app "
 "password in the Bluesky settings."
 msgstr ""
 
-#: bluesky.php:375
+#: bluesky.php:349
 msgid "Bluesky Import/Export"
 msgstr ""
 
-#: bluesky.php:385
+#: bluesky.php:359
 msgid ""
 "You are not authenticated. Please enter your handle and the app password."
 msgstr ""
 
-#: bluesky.php:405
+#: bluesky.php:379
 msgid ""
 "You are authenticated to Bluesky. For security reasons the password isn't "
 "stored."
 msgstr ""
 
-#: bluesky.php:407
+#: bluesky.php:381
 msgid ""
 "The communication with the personal data server service (PDS) is established."
 msgstr ""
 
-#: bluesky.php:409
+#: bluesky.php:383
 msgid "Communication issues with the personal data server service (PDS)."
 msgstr ""
 
-#: bluesky.php:411
+#: bluesky.php:385
 msgid ""
 "The DID for the provided handle could not be detected. Please check if you "
 "entered the correct handle."
 msgstr ""
 
-#: bluesky.php:413
+#: bluesky.php:387
 msgid "The personal data server service (PDS) could not be detected."
 msgstr ""
 
-#: bluesky.php:415
+#: bluesky.php:389
 msgid ""
 "The authentication with the provided handle and password failed. Please "
 "check if you entered the correct password."
 msgstr ""
 
-#: bluesky.php:484
+#: bluesky.php:457
 msgid "Post to Bluesky"
 msgstr ""

bluesky/templates/admin.tpl

@@ -1,2 +0,0 @@
-{{include file="field_checkbox.tpl" field=$friendica_handles}}
-<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>

bluesky/templates/connector_settings.tpl

@@ -3,9 +3,6 @@
 {{include file="field_checkbox.tpl" field=$bydefault}}
 {{include file="field_checkbox.tpl" field=$import}}
 {{include file="field_checkbox.tpl" field=$import_feeds}}
-{{if $custom_handle}}
-	{{include file="field_checkbox.tpl" field=$custom_handle}}
-{{/if}}
 {{include file="field_input.tpl" field=$pds}}
 {{include file="field_input.tpl" field=$handle}}
 {{include file="field_input.tpl" field=$did}}

mailstream/mailstream.php

@@ -169,10 +169,6 @@ function mailstream_post_hook(array &$item)
 			Logger::debug('mailstream: like item ' . $item['id']);
 			return;
 		}
-		if ($item['verb'] == Activity::DISLIKE) {
-			Logger::debug('mailstream: dislike item ' . $item['id']);
-			return;
-		}
 	}
 
 	$message_id = mailstream_generate_id($item['uri']);

pnut/LICENSE

@@ -1,662 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.
-

pnut/README.md

@@ -1,10 +0,0 @@
-# Pnut connector
-
-With this addon to friendica you can give your users the possibility to post their *public* messages to pnut.io. 
-
-No setup is needed for the admins to make it work for their users, however it is possible for the admin to create a client, so that the users don't have to.
-
-To do so, go to https://pnut.io/dev and scroll down to "Create New Client".
-Enter a name of your choice and enter your Friendica host name as the website.
-Use https://(yourhost.name)/pnut/connect as a redirect url, replace "(yourhost.name)" with the host name of your system.
-Limit the scope to "basic,files,follow,polls,presence,stream,update_profile,write_post"

pnut/lang/C/messages.po

@@ -1,74 +0,0 @@
-# ADDON pnut
-# Copyright (C) 
-# This file is distributed under the same license as the Friendica pnut addon package.
-# 
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-03 11:53+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"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: pnut.php:42
-msgid "Permission denied."
-msgstr ""
-
-#: pnut.php:79
-msgid "You are now authenticated with pnut.io."
-msgstr ""
-
-#: pnut.php:82
-msgid "Error fetching token. Please try again."
-msgstr ""
-
-#: pnut.php:85
-msgid "return to the connector page"
-msgstr ""
-
-#: pnut.php:103
-msgid "Save Settings"
-msgstr ""
-
-#: pnut.php:104 pnut.php:150
-msgid "Client ID"
-msgstr ""
-
-#: pnut.php:105 pnut.php:151
-msgid "Client Secret"
-msgstr ""
-
-#: pnut.php:139
-msgid "Authenticate with pnut.io"
-msgstr ""
-
-#: pnut.php:143
-msgid "Disconnect"
-msgstr ""
-
-#: pnut.php:148
-msgid "Enable Pnut Post Addon"
-msgstr ""
-
-#: pnut.php:149
-msgid "Post to Pnut by default"
-msgstr ""
-
-#: pnut.php:152
-msgid "Access Token"
-msgstr ""
-
-#: pnut.php:161
-msgid "Pnut Export"
-msgstr ""
-
-#: pnut.php:203
-msgid "Post to Pnut"
-msgstr ""

pnut/lib/LICENSE

@@ -1,24 +0,0 @@
-Copyright (c) 2013, Josh Dolitsky
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the Josh Dolitsky nor the names of its 
-      contributors may be used to endorse or promote products derived 
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL TRAVIS RICHARDSON BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

pnut/lib/phpnutException.php

@@ -1,5 +0,0 @@
-<?php
-
-namespace phpnut;
-
-class phpnutException extends \Exception {}

pnut/pnut.php

@@ -1,325 +0,0 @@
-<?php
-/**
- * Name: Pnut Connector
- * Description: Post to pnut.io
- * Version: 0.1.2
- * Author: Morgan McMillian <https://social.clacks.network/profile/spacenerdmo>
- * Status: In Development
- */
-
-require_once 'addon/pnut/lib/phpnut.php';
-require_once 'addon/pnut/lib/phpnutException.php';
-
-use Friendica\Content\Text\BBCode;
-use Friendica\Content\Text\Plaintext;
-use Friendica\Core\Config\Util\ConfigFileManager;
-use Friendica\Core\Hook;
-use Friendica\Core\Logger;
-use Friendica\Core\Renderer;
-use Friendica\Core\System;
-use Friendica\DI;
-use Friendica\Model\Photo;
-use phpnut\phpnutException;
-
-const PNUT_LIMIT = 256;
-
-function pnut_install()
-{
-	Hook::register('load_config',             __FILE__, 'pnut_load_config');
-	Hook::register('hook_fork',               __FILE__, 'pnut_hook_fork');
-	Hook::register('post_local',              __FILE__, 'pnut_post_local');
-	Hook::register('notifier_normal',         __FILE__, 'pnut_post_hook');
-	Hook::register('jot_networks',            __FILE__, 'pnut_jot_nets');
-	Hook::register('connector_settings',      __FILE__, 'pnut_settings');
-	Hook::register('connector_settings_post', __FILE__, 'pnut_settings_post');
-}
-
-function pnut_module() {}
-
-function pnut_content()
-{
-	if (!DI::userSession()->getLocalUserId()) {
-		DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
-		return '';
-	}
-
-	if (isset(DI::args()->getArgv()[1])) {
-		switch (DI::args()->getArgv()[1]) {
-			case 'connect':
-				$o = pnut_connect();
-				break;
-
-			default:
-				$o = print_r(DI::args()->getArgv(), true);
-				break;
-		}
-	} else {
-		$o = pnut_connect();
-	}
-	return $o;
-}
-
-function pnut_connect()
-{
-	$client_id     = DI::config()->get('pnut', 'client_id');
-	$client_secret = DI::config()->get('pnut', 'client_secret');
-
-	if (empty($client_id) || empty($client_secret)) {
-		$client_id     = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'client_id');
-		$client_secret = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'client_secret');
-	}
-
-	$callback_url = DI::baseUrl() . '/pnut/connect';
-
-	$nut = new phpnut\phpnut($client_id, $client_secret);
-
-	try {
-		$token = $nut->getAccessToken($callback_url);
-		Logger::debug('Got Token', [$token]);
-		$o = DI::l10n()->t('You are now authenticated with pnut.io.');
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pnut', 'access_token', $token);
-	} catch (phpnutException $e) {
-		$o = DI::l10n()->t('Error fetching token. Please try again.', ['code' => $e->getCode(), 'message' => $e->getMessage()]);
-	}
-
-	$o .= '<br /><a href="' . DI::baseUrl() . '/settings/connectors">' . DI::l10n()->t("return to the connector page").'</a>';
-
-	return $o;
-}
-
-function pnut_load_config(ConfigFileManager $loader)
-{
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('pnut'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
-}
-
-function pnut_addon_admin(string &$o)
-{
-	$client_id     = DI::config()->get('pnut', 'client_id');
-	$client_secret = DI::config()->get('pnut', 'client_secret');
-
-	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/pnut/');
-
-	$o = Renderer::replaceMacros($t, [
-		'$submit'        => DI::l10n()->t('Save Settings'),
-		'$client_id'     => ['pnut_client_id', DI::l10n()->t('Client ID'), $client_id],
-		'$client_secret' => ['pnut_client_secret', DI::l10n()->t('Client Secret'), $client_secret],
-	]);
-}
-
-function pnut_addon_admin_post()
-{
-	DI::config()->set('pnut', 'client_id',     $_POST['pnut_client_id']);
-	DI::config()->set('pnut', 'client_secret', $_POST['pnut_client_secret']);
-}
-
-function pnut_settings(array &$data)
-{
-	if (!DI::userSession()->getLocalUserId()) {
-		return;
-	}
-
-	$redirectUri  = DI::baseUrl() . '/pnut/connect';
-	$scope        = ['write_post','files'];
-
-	$enabled       = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'post') ?? false;
-	$def_enabled   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'post_by_default') ?? false;
-	$client_id     = DI::config()->get('pnut', 'client_id');
-	$client_secret = DI::config()->get('pnut', 'client_secret');
-	$token         = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'access_token');
-	
-	$user_client = empty($client_id) || empty($client_secret);
-	if ($user_client) {
-		$client_id     = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'client_id');
-		$client_secret = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'client_secret');
-	}
-
-	if (!empty($client_id) && !empty($client_secret) && empty($token)) {
-		$nut = new phpnut\phpnut($client_id, $client_secret);
-		$authorize_url = $nut->getAuthUrl($redirectUri, $scope);
-		$authorize_text = DI::l10n()->t('Authenticate with pnut.io');
-	}
-
-	if (!empty($token)) {
-		$disconn_btn = DI::l10n()->t('Disconnect');
-	}
-
-	$t    = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/pnut/');
-	$html = Renderer::replaceMacros($t, [
-		'$enable'         => ['pnut', DI::l10n()->t('Enable Pnut Post Addon'), $enabled],
-		'$bydefault'      => ['pnut_bydefault', DI::l10n()->t('Post to Pnut by default'), $def_enabled],
-		'$client_id'      => ['pnut_client_id', DI::l10n()->t('Client ID'), $client_id],
-		'$client_secret'  => ['pnut_client_secret', DI::l10n()->t('Client Secret'), $client_secret],
-		'$access_token'   => ['pnut_access_token', DI::l10n()->t('Access Token'), $token, '', '', 'readonly'],
-		'$authorize_url'  => $authorize_url ?? '',
-		'$authorize_text' => $authorize_text ?? '',
-		'$disconn_btn'    => $disconn_btn ?? '',
-		'user_client'     => $user_client,
-	]);
-
-	$data = [
-		'connector' => 'pnut',
-		'title'     => DI::l10n()->t('Pnut Export'),
-		'image'     => 'addon/pnut/pnut.svg',
-		'enabled'   => $enabled,
-		'html'      => $html,
-	];
-}
-
-function pnut_settings_post(array &$b)
-{
-	if (empty($_POST['pnut-submit']) && empty($_POST['pnut-disconnect'])) {
-		return;
-	}
-
-	if (!empty($_POST['pnut-disconnect'])) {
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'pnut', 'post');
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'pnut', 'post_by_default');
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'pnut', 'client_id');
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'pnut', 'client_secret');
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'pnut', 'access_token');
-	} else {
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pnut', 'post',            intval($_POST['pnut']));
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pnut', 'post_by_default', intval($_POST['pnut_bydefault']));
-		if (!empty($_POST['pnut_client_id'])) {
-			DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pnut', 'client_id',     $_POST['pnut_client_id']);
-		}
-		if (!empty($_POST['pnut_client_secret'])) {
-			DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pnut', 'client_secret', $_POST['pnut_client_secret']);
-		}
-	}
-}
-
-function pnut_jot_nets(array &$jotnets_fields)
-{
-	if (!DI::userSession()->getLocalUserId()) {
-		return;
-	}
-
-	if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'post')) {
-		$jotnets_fields[] = [
-			'type'  => 'checkbox',
-			'field' => [
-				'pnut_enable',
-				DI::l10n()->t('Post to Pnut'),
-				DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'post_by_default')
-			]
-		];
-	}
-}
-
-function pnut_hook_fork(array &$b)
-{
-	if ($b['name'] != 'notifier_normal') {
-		return;
-	}
-
-	$post = $b['data'];
-
-	if (($post['created'] !== $post['edited']) && !$post['deleted']) {
-		DI::logger()->info('Editing is not supported by the addon');
-		$b['execute'] = false;
-		return;
-	}
-
-	if (!strstr($post['postopts'] ?? '', 'pnut') || ($post['parent'] != $post['id']) || $post['private']) {
-		$b['execute'] = false;
-		return;
-	}
-}
-
-function pnut_post_local(array &$b)
-{
-	if ($b['edit']) {
-		return;
-	}
-
-	if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
-		return;
-	}
-
-	if ($b['private'] || $b['parent']) {
-		return;
-	}
-
-	$pnut_post   = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'post'));
-	$pnut_enable = (($pnut_post && !empty($_REQUEST['pnut_enable'])) ? intval($_REQUEST['pnut_enable']) : 0);
-
-	// if API is used, default to the chosen settings
-	if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'post_by_default'))) {
-		$pnut_enable = 1;
-	}
-
-	if (!$pnut_enable) {
-		return;
-	}
-
-	if (strlen($b['postopts'])) {
-		$b['postopts'] .= ',';
-	}
-
-	$b['postopts'] .= 'pnut';
-}
-
-function pnut_post_hook(array &$b)
-{
-	/**
-	 * Post to pnut.io
-	 */
-	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
-		return;
-	}
-
-	Logger::notice('PNUT post invoked', ['id' => $b['id'], 'guid' => $b['guid'], 'plink' => $b['plink']]);
-	Logger::debug('PNUT array', $b);
-
-	$token = DI::pConfig()->get($b['uid'], 'pnut', 'access_token');
-	$nut = new phpnut\phpnut($token);
-
-	$msgarr = Plaintext::getPost($b, PNUT_LIMIT, true, BBCode::EXTERNAL);
-	$text = $msgarr['text'];
-	$raw = [];
-
-	Logger::debug('PNUT msgarr', $msgarr);
-
-	if (count($msgarr['parts']) > 1) {
-		$tstamp = time();
-		$raw['nl.chimpnut.blog.post'][] = ['body' => $b['body'], 'tstamp' => $tstamp];
-		$text = Plaintext::shorten($text, 252 - strlen($b['plink']), $b['uid']);
-		$text .= "\n" . $b['plink'];
-	}
-
-	if ($msgarr['type'] == 'link') {
-		$text .= "\n[" . $msgarr['title'] . "](" . $msgarr['url'] . ")";
-	}
-
-	if ($msgarr['type'] == 'photo') {
-		$fileraw = ['type' => 'dev.mcmillian.friendica.image', 'kind' => 'image', 'is_public' => true];
-		foreach ($msgarr['images'] as $image) {
-			Logger::debug('PNUT image', $image);
-
-			if (!empty($image['id'])) {
-				$photo = Photo::selectFirst([], ['id' => $image['id']]);
-				Logger::debug('PNUT selectFirst');
-			} else {
-				$photo = Photo::createPhotoForExternalResource($image['url']);
-				Logger::debug('PNUT createPhotoForExternalResource');
-			}
-			$picturedata = Photo::getImageForPhoto($photo);
-
-			Logger::debug('PNUT photo', $photo);
-			$picurefile = tempnam(System::getTempPath(), 'pnut');
-			file_put_contents($picurefile, $picturedata);
-			Logger::debug('PNUT got file?', ['filename' => $picurefile]);
-			$imagefile = $nut->createFile($picurefile, $fileraw);
-			Logger::debug('PNUT file', ['pnutimagefile' => $imagefile]);
-			unlink($picurefile);
-
-			$raw['io.pnut.core.oembed'][] = ['+io.pnut.core.file' => ['file_id' => $imagefile['id'], 'file_token' => $imagefile['file_token'], 'format' => 'oembed']];
-		}
-	}
-
-	$raw['io.pnut.core.crosspost'][] = ['canonical_url' => $b['plink']];
-	$nut->createPost($text, ['raw' => $raw]);
-
-	Logger::debug('PNUT post complete', ['id' => $b['id'], 'text' => $text, 'raw' => $raw]);
-}

pnut/templates/admin.tpl

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

pnut/templates/connector_settings.tpl

@@ -1,14 +0,0 @@
-<p>{{$status}}</p>
-{{include file="field_checkbox.tpl" field=$enable}}
-{{include file="field_checkbox.tpl" field=$bydefault}}
-{{if $user_client}}
-	{{include file="field_input.tpl" field=$client_id}}
-	{{include file="field_input.tpl" field=$client_secret}}
-	{{include file="field_input.tpl" field=$access_token}}
-{{/if}}
-{{if $authorize_url}}
-	<a href="{{$authorize_url}}">{{$authorize_text}}</a>
-{{/if}}
-{{if $disconn_btn}}
-	<div class="submit"><input type="submit" name="pnut-disconnect" value="{{$disconn_btn}}" /></div>
-{{/if}}

tumblr/tumblr.php

@@ -677,20 +677,11 @@ function tumblr_send_npf(array $post): bool
 		return true;
 	}
 
-	$post['body'] = Post\Media::addAttachmentsToBody($post['uri-id'], $post['body'], [Post\Media::IMAGE, Post\Media::AUDIO, Post\Media::VIDEO, Post\Media::ACTIVITY]);
+	$post['body'] = Post\Media::addAttachmentsToBody($post['uri-id'], $post['body']);
 	if (!empty($post['title'])) {
 		$post['body'] = '[h1]' . $post['title'] . "[/h1]\n" . $post['body'];
 	}
 
-	if (!empty($post['quote-uri-id'])) {
-		$quote = Post::selectFirstPost(['uri', 'plink'], ['uri-id' => $post['quote-uri-id']]);
-		if (!empty($quote)) {
-			if ((strpos($post['body'], $quote['plink'] ?: $quote['uri']) === false) && (strpos($post['body'], $quote['uri']) === false)) {
-				$post['body'] .= "\n[url]" . ($quote['plink'] ?: $quote['uri']) . "[/url]\n";
-			}
-		}
-	}
-
 	$params = [
 		'content'                => NPF::fromBBCode($post['body'], $post['uri-id']),
 		'state'                  => 'published',
@@ -1488,7 +1479,7 @@ function tumblr_exchange_token(int $uid): stdClass
 		]);
 
 		$response = $client->post('oauth2/exchange', ['auth' => 'oauth']);
-		return json_decode($response->getBody()->getContents());
+		return json_decode($response->getBodyString()->getContents());
 	} catch (RequestException $exception) {
 		Logger::notice('Exchange failed', ['code' => $exception->getCode(), 'message' => $exception->getMessage()]);
 		return new stdClass;

twitter/twitter.php

@@ -308,7 +308,7 @@ function twitter_upload_image(int $uid, array $image, int $retrial)
 
 	$picturedata = Photo::getImageForPhoto($photo);
 
-	$picture = new Image($picturedata, $photo['type'], $photo['filename']);
+	$picture = new Image($picturedata, $photo['type']);
 	$height  = $picture->getHeight();
 	$width   = $picture->getWidth();
 	$size    = strlen($picturedata);

url_replace/url_replace.php

@@ -6,7 +6,6 @@
  * Author: Dr. Tobias Quathamer <https://social.anoxinon.de/@toddy>
  * Maintainer: Dr. Tobias Quathamer <https://social.anoxinon.de/@toddy>
  */
-
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
@@ -26,13 +25,13 @@ function url_replace_addon_admin_post()
 	// Convert twelvefeet_sites into an array before setting the new value
 	$twelvefeet_sites = explode(PHP_EOL, $_POST['twelvefeet_sites']);
 	// Normalize URLs by using lower case, removing a trailing slash and whitespace
-	$twelvefeet_sites = array_map(fn($value): string => rtrim(trim(strtolower($value)), '/'), $twelvefeet_sites);
+	$twelvefeet_sites = array_map(fn ($value): string => rtrim(trim(strtolower($value)), '/'), $twelvefeet_sites);
 	// Do not store empty lines or duplicates
-	$twelvefeet_sites = array_filter($twelvefeet_sites, fn($value): bool => !empty($value));
+	$twelvefeet_sites = array_filter($twelvefeet_sites, fn ($value): bool => !empty($value));
 	$twelvefeet_sites = array_unique($twelvefeet_sites);
 	// Ensure a protocol and default to HTTPS
 	$twelvefeet_sites = array_map(
-		fn($value): string => substr($value, 0, 4) !== 'http' ? 'https://' . $value : $value,
+		fn ($value): string => substr($value, 0, 4) !== 'http' ? 'https://'.$value : $value,
 		$twelvefeet_sites
 	);
 	asort($twelvefeet_sites);
@@ -47,10 +46,9 @@ function url_replace_addon_admin(string &$o)
 {
 	$nitter_server    = DI::config()->get('url_replace', 'nitter_server');
 	$invidious_server = DI::config()->get('url_replace', 'invidious_server');
-	$twelvefeet_sites = implode(PHP_EOL, DI::config()->get('url_replace', 'twelvefeet_sites') ?? [] ?: []);
+	$twelvefeet_sites = implode(PHP_EOL, DI::config()->get('url_replace', 'twelvefeet_sites'));
-
+	$t                = Renderer::getMarkupTemplate('admin.tpl', 'addon/url_replace/');
-	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/url_replace/');
+	$o                = Renderer::replaceMacros($t, [
-	$o = Renderer::replaceMacros($t, [
 		'$nitter_server' => [
 			'nitter_server',
 			DI::l10n()->t('Nitter server'),
@@ -114,10 +112,13 @@ function url_replace_render(array &$b)
 		}
 	}
 
-	$twelvefeet_sites = DI::config()->get('url_replace', 'twelvefeet_sites') ?? [] ?: [];
+	$twelvefeet_sites = DI::config()->get('url_replace', 'twelvefeet_sites');
+	if (empty($twelvefeet_sites)) {
+		$twelvefeet_sites = [];
+	}
 	foreach ($twelvefeet_sites as $twelvefeet_site) {
 		if (strpos($b['html'], $twelvefeet_site) !== false) {
-			$b['html'] = str_replace($twelvefeet_site, 'https://12ft.io/' . $twelvefeet_site, $b['html']);
+			$b['html'] = str_replace($twelvefeet_site, 'https://12ft.io/'.$twelvefeet_site, $b['html']);
 			$replaced  = true;
 		}
 	}