.woodpecker/.code_standards_check.yml

@@ -4,9 +4,6 @@ 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,9 +9,6 @@ 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,9 +4,6 @@ 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,9 +21,6 @@ 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,9 +9,6 @@ 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,19 +1793,23 @@ function bluesky_get_did(string $handle): string
 		$handle .= '.' . BLUESKY_HOSTNAME;
 	}
 
-	$data = bluesky_get(BLUESKY_PDS . '/xrpc/com.atproto.identity.resolveHandle?handle=' . urlencode($handle));
+	// Deactivated at the moment, since it isn't reliable by now
-	if (!empty($data) && !empty($data->did)) {
+	//$did = bluesky_get_did_by_dns($handle);
-		Logger::debug('Got DID by PDS call', ['handle' => $handle, 'did' => $data->did]);
+	//if ($did != '') {
-		return $data->did;
+	//	return $did;
-	}
+	//}
 
-	// Possibly a custom PDS. 
+	//$did = bluesky_get_did_by_wellknown($handle);
-	$did = bluesky_get_did_by_dns($handle);
+	//if ($did != '') {
-	if ($did != '') {
+	//	return $did;
-		return $did;
+	//}
+
+	$data = bluesky_get(BLUESKY_PDS . '/xrpc/com.atproto.identity.resolveHandle?handle=' . urlencode($handle));
+	if (empty($data) || empty($data->did)) {
+		return '';
 	}
-	
+	Logger::debug('Got DID by PDS call', ['handle' => $handle, 'did' => $data->did]);
-	return bluesky_get_did_by_wellknown($handle);
+	return $data->did;
 }
 
 function bluesky_get_user_did(int $uid, bool $refresh = false): ?string