Merge pull request 'Bluesky: Improve DID detection for custom PDS' (#1533) from heluecht/friendica-addons:bluesky-pds into develop

Reviewed-on: friendica/friendica-addons#1533

.woodpecker/.code_standards_check.yml

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

.woodpecker/.continuous-deployment.yml

@@ -9,6 +9,9 @@ pipeline:
   clone_friendica_base:
     image: alpine/git
     commands:
+      - git config --global user.email "no-reply@friendi.ca"
+      - git config --global user.name "Friendica"
+      - git config --global --add safe.directory $CI_WORKSPACE
       - git clone https://github.com/friendica/friendica.git .
       - git checkout $CI_COMMIT_BRANCH
     when:

.woodpecker/.messages.po_check.yml

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

.woodpecker/.phpunit.yml

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

.woodpecker/.releaser.yml

@@ -9,6 +9,9 @@ pipeline:
   clone_friendica_base:
     image: alpine/git
     commands:
+      - git config --global user.email "no-reply@friendi.ca"
+      - git config --global user.name "Friendica"
+      - git config --global --add safe.directory $CI_WORKSPACE
       - git clone https://github.com/friendica/friendica.git .
       - git checkout $CI_COMMIT_BRANCH
     when:

bluesky/bluesky.php

@@ -1793,23 +1793,19 @@ function bluesky_get_did(string $handle): string
 		$handle .= '.' . BLUESKY_HOSTNAME;
 	}
 
-	// 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) && !empty($data->did)) {
-		return '';
+		Logger::debug('Got DID by PDS call', ['handle' => $handle, 'did' => $data->did]);
+		return $data->did;
 	}
-	Logger::debug('Got DID by PDS call', ['handle' => $handle, 'did' => $data->did]);
+
-	return $data->did;
+	// Possibly a custom PDS. 
+	$did = bluesky_get_did_by_dns($handle);
+	if ($did != '') {
+		return $did;
+	}
+	
+	return bluesky_get_did_by_wellknown($handle);
 }
 
 function bluesky_get_user_did(int $uid, bool $refresh = false): ?string