fix clicks on username/mentions

kpfaulkner · May 26, 2024 · 90eeeeb · 90eeeeb
1 parent 1dd8514
commit 90eeeeb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/main.go b/main.go
@@ -15,7 +15,7 @@ import (
 
 var (
 	AccountID int64
-	Version   = "0.1.0"
+	Version   = "0.1.1"
 )
 
 func setupLogging() {

diff --git a/ui/core.go b/ui/core.go
@@ -466,9 +466,9 @@ func (u *UI) handleMessageColumnEvents(gtx layout.Context) error {
 					}
 
 					if username, ok := o.Get("username").(string); ok && username != "" {
-						if userID, ok := o.Get("userID").(string); ok && userID != "" {
+						if userID, ok := o.Get("userID").(mastodon.ID); ok && userID != "" {
 							log.Debugf("username clicked %s : %s\n", username, userID)
-							u.addNewUsernameColumn(username, userID)
+							u.addNewUsernameColumn(username, string(userID))
 						}
 					}
 
@@ -481,9 +481,9 @@ func (u *UI) handleMessageColumnEvents(gtx layout.Context) error {
 				case richtext.Click:
 
 					if username, ok := o.Get("username").(string); ok && username != "" {
-						if userID, ok := o.Get("userID").(string); ok && userID != "" {
+						if userID, ok := o.Get("userID").(mastodon.ID); ok && userID != "" {
 							log.Debugf("username clicked %s : %s\n", username, userID)
-							u.addNewUsernameColumn(username, userID)
+							u.addNewUsernameColumn(username, string(userID))
 						}
 					}
 				}

diff --git a/ui/status.go b/ui/status.go
@@ -323,7 +323,7 @@ func (ss *StatusState) generateDetailsSpanStyles(status mastodon.Status) []richt
 					// search for mentions in status
 					for _, mention := range mentions {
 						if mention.Username == path.Base(linkText)[1:] {
-							span.Set("userID", fmt.Sprintf("%d", mention.ID))
+							span.Set("userID", mention.ID)
 						}
 					}
 				}
@@ -384,7 +384,7 @@ func (ss *StatusState) generateNameSpanStyles(status mastodon.Status) []richtext
 			Interactive: true,
 		}
 		span.Set("username", status.Account.Username)
-		span.Set("userID", fmt.Sprintf("%d", status.Account.ID))
+		span.Set("userID", status.Account.ID)
 		spans = append(spans, span)
 	} else {
 		if status.Reblog != nil {
@@ -396,7 +396,7 @@ func (ss *StatusState) generateNameSpanStyles(status mastodon.Status) []richtext
 				Interactive: true,
 			}
 			span.Set("username", status.Account.Username)
-			span.Set("userID", fmt.Sprintf("%d", status.Account.ID))
+			span.Set("userID", status.Account.ID)
 			spans = append(spans, span)
 
 			span2 := richtext.SpanStyle{