M activity.go → activity.go

@@ -1505,12 +1505,11 @@ j["@context"] = itiswhatitis
 	j["id"] = user.URL
 	j["inbox"] = user.URL + "/inbox"
 	j["outbox"] = user.URL + "/outbox"
+	if user.Options.CustomDisplay != "" {
+		user.Display = user.Options.CustomDisplay
+	}
 	j["name"] = user.Display
-	if user.Options.DisplayName != "" {
-		j["preferredUsername"] = user.Options.DisplayName
-	} else {
-		j["preferredUsername"] = user.Name
-	}
+	j["preferredUsername"] = user.Name
 	j["summary"] = user.HTAbout
 	var tags []junk.Junk
 	for _, o := range user.Onts {

M honk.go → honk.go

@@ -56,10 +56,10 @@ OmitImages bool   `json:",omitempty"`
 	Avahex     bool   `json:",omitempty"`
 	MentionAll bool   `json:",omitempty"`
 	Avatar     string `json:",omitempty"`
+	CustomDisplay string `json:",omitempty"`
 	Banner     string `json:",omitempty"`
 	MapLink    string `json:",omitempty"`
 	Reaction   string `json:",omitempty"`
-	DisplayName string `json:",omitempty"`
 	MeCount    int64
 	ChatCount  int64
 }
@@ -75,7 +75,6 @@ type Honk struct {
 	ID       int64
 	UserID   int64
 	Username string
-	DisplayName string
 	What     string
 	Honker   string
 	Handle   string

M views/account.html → views/account.html

@@ -17,7 +17,7 @@ <input tabindex=1 type="checkbox" id="omitimages" name="omitimages" value="omitimages" {{ if .User.Options.OmitImages }}checked{{ end }}><span></span>
 <p><label class="button" for="mentionall">mention all:</label>
 <input tabindex=1 type="checkbox" id="mentionall" name="mentionall" value="mentionall" {{ if .User.Options.MentionAll }}checked{{ end }}><span></span>
 <p><label id="displayname">display name:</label>
-<input tabindex=1 type="text" name="displayname">
+<input tabindex=1 type="text" name="displayname" value="{{ .User.Display }}">
 
 <p><label class="button" for="maps">apple map links:</label>
 <input tabindex=1 type="checkbox" id="maps" name="maps" value="apple" {{ if eq "apple" .User.Options.MapLink }}checked{{ end }}><span></span>

M web.go → web.go

@@ -1131,14 +1131,18 @@ options.MapLink = "apple"
 	} else {
 		options.MapLink = ""
 	}
+
+
+	sendupdate := false
 	if r.FormValue("displayname") != "" {
-		options.DisplayName = r.FormValue("displayname")
+		options.CustomDisplay = r.FormValue("displayname")
+		sendupdate = true
 	} else {
-		options.DisplayName = ""
+		options.CustomDisplay = ""
 	}
+
 	options.Reaction = r.FormValue("reaction")
 
-	sendupdate := false
 	ava := re_avatar.FindString(whatabout)
 	if ava != "" {
 		whatabout = re_avatar.ReplaceAllString(whatabout, "")