Merge branch 'master' of https://forge.sunglocto.net/sunglocto/pi-im

main.go

@@ -240,17 +240,20 @@ func CreateUITab(chatJidStr string) ChatTabUI {
 			content.SetText(msgContent)
 			if chatTabs[chatJidStr].Messages[i].ReplyID != "PICLIENT:UNAVAILABLE" {
 				reply := chatTabs[chatJidStr].Messages[i].Raw.Reply
+				guy := jid.MustParse(reply.To).Resourcepart()
 				// TODO: EXPERIMENTALLY GET REPLIED TO TEXT
 
+
 				for i := len(chatTabs[chatJidStr].Messages) - 1; i >= 0; i-- {
 					if reply.ID == chatTabs[chatJidStr].Messages[i].Raw.StanzaID.ID {
 						replytext.Show()
 						replytext.SetText(fmt.Sprintf("> %s", chatTabs[chatJidStr].Messages[i].Content))
+						guy = chatTabs[chatJidStr].Messages[i].Author
 						break
 					}
 				}
 
-				author.SetText(fmt.Sprintf("%s > %s", chatTabs[chatJidStr].Messages[i].Author, jid.MustParse(reply.To).Resourcepart()))
+				author.SetText(fmt.Sprintf("%s > %s", chatTabs[chatJidStr].Messages[i].Author, guy))
 			} else {
 				author.SetText(chatTabs[chatJidStr].Messages[i].Author)
 			}
@@ -315,7 +318,7 @@ func addChatTab(isMuc bool, chatJid jid.JID, nick string) {
 }
 
 func dropToSignInPage(reason string) {
-	w = a.NewWindow("Welcome to Pi")
+	w = a.NewWindow("Welcome to pi")
 	w.Resize(fyne.NewSize(500, 500))
 	rt := widget.NewRichTextFromMarkdown("# Welcome to pi\nIt appears you do not have a valid account configured. Let's create one!")
 	footer := widget.NewRichTextFromMarkdown(fmt.Sprintf("Reason for being dropped to the sign-in page:\n\n```%s```", reason))