Преглед на файлове

fix spurious bidi violations when casefolding the nickmask of an RTL nick

tags/v1.0.0-rc1
Shivaram Lingamneni преди 5 години
родител
ревизия
a2a9788f39
променени са 1 файла, в които са добавени 6 реда и са изтрити 6 реда
  1. 6
    6
      irc/client.go

+ 6
- 6
irc/client.go Целия файл

@@ -759,15 +759,15 @@ func (client *Client) updateNickMaskNoMutex() {
759 759
 		client.hostname = client.rawHostname
760 760
 	}
761 761
 
762
-	nickMaskString := fmt.Sprintf("%s!%s@%s", client.nick, client.username, client.hostname)
763
-	nickMaskCasefolded, err := Casefold(nickMaskString)
762
+	cfusername, _ := Casefold(client.username) // we already checked for errors in SetNames
763
+	cfhostname, err := Casefold(client.hostname)
764 764
 	if err != nil {
765
-		client.server.logger.Error("internal", "nickmask couldn't be casefolded", nickMaskString, err.Error())
766
-		return
765
+		client.server.logger.Error("internal", "hostname couldn't be casefolded", client.hostname, err.Error())
766
+		cfhostname = client.hostname // YOLO
767 767
 	}
768 768
 
769
-	client.nickMaskString = nickMaskString
770
-	client.nickMaskCasefolded = nickMaskCasefolded
769
+	client.nickMaskString = fmt.Sprintf("%s!%s@%s", client.nick, client.username, client.hostname)
770
+	client.nickMaskCasefolded = fmt.Sprintf("%s!%s@%s", client.nickCasefolded, cfusername, cfhostname)
771 771
 }
772 772
 
773 773
 // AllNickmasks returns all the possible nickmasks for the client.

Loading…
Отказ
Запис