From 5212a1057ed05085d4d332976510880c6a692a8e Mon Sep 17 00:00:00 2001
From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com>
Date: Tue, 13 Aug 2024 09:01:50 +0000
Subject: [bugfix] relax missing preferred_username, instead using webfingered
 username (#3189)

* support no preferred_username, instead using webfingered username

* add tests for the new preferred_username behaviour
---
 internal/ap/extract.go | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'internal/ap/extract.go')

diff --git a/internal/ap/extract.go b/internal/ap/extract.go
index ce1e2d421..f69fb299e 100644
--- a/internal/ap/extract.go
+++ b/internal/ap/extract.go
@@ -195,17 +195,12 @@ func ExtractPollOptionables(arr []TypeOrIRI) ([]PollOptionable, []TypeOrIRI) {
 // ExtractPreferredUsername returns a string representation of
 // an interface's preferredUsername property. Will return an
 // error if preferredUsername is nil, not a string, or empty.
-func ExtractPreferredUsername(i WithPreferredUsername) (string, error) {
+func ExtractPreferredUsername(i WithPreferredUsername) string {
 	u := i.GetActivityStreamsPreferredUsername()
 	if u == nil || !u.IsXMLSchemaString() {
-		return "", gtserror.New("preferredUsername nil or not a string")
-	}
-
-	if u.GetXMLSchemaString() == "" {
-		return "", gtserror.New("preferredUsername was empty")
+		return ""
 	}
-
-	return u.GetXMLSchemaString(), nil
+	return u.GetXMLSchemaString()
 }
 
 // ExtractName returns the first string representation it
-- 
cgit v1.2.3