Bladeren bron

refactor: idk

ayn2op 11 maanden geleden
bovenliggende
commit
31464e4f25
3 gewijzigde bestanden met toevoegingen van 16 en 18 verwijderingen
  1. 10 14
      cmd/messages_text.go
  2. 3 2
      internal/markdown/renderer.go
  3. 3 2
      internal/notifications/renderer.go

+ 10 - 14
cmd/messages_text.go

@@ -317,23 +317,19 @@ func (mt *MessagesText) _select(name string) {
 		// If no message is currently selected, select the latest message.
 		if len(mt.GetHighlights()) == 0 {
 			mt.selectedMessageID = ms[0].ID
+		} else if msgIdx < len(ms)-1 {
+			mt.selectedMessageID = ms[msgIdx+1].ID
 		} else {
-			if msgIdx < len(ms)-1 {
-				mt.selectedMessageID = ms[msgIdx+1].ID
-			} else {
-				return
-			}
+			return
 		}
 	case mt.cfg.Keys.MessagesText.SelectNext:
 		// If no message is currently selected, select the latest message.
 		if len(mt.GetHighlights()) == 0 {
 			mt.selectedMessageID = ms[0].ID
+		} else if msgIdx > 0 {
+			mt.selectedMessageID = ms[msgIdx-1].ID
 		} else {
-			if msgIdx > 0 {
-				mt.selectedMessageID = ms[msgIdx-1].ID
-			} else {
-				return
-			}
+			return
 		}
 	case mt.cfg.Keys.MessagesText.SelectFirst:
 		mt.selectedMessageID = ms[len(ms)-1].ID
@@ -498,10 +494,10 @@ func (mt *MessagesText) showUrlSelector(urls []string, attachments []discord.Att
 		})
 	}
 
-	for i, url := range urls {
-		urlCopy := url
-		list.AddItem(url, "", rune('1'+i), func() {
-			go openURL(urlCopy)
+	for i, u := range urls {
+		url := u
+		list.AddItem(u, "", rune('1'+i), func() {
+			go openURL(url)
 			done()
 		})
 	}

+ 3 - 2
internal/markdown/renderer.go

@@ -64,8 +64,9 @@ func (r *renderer) renderFencedCodeBlock(w io.Writer, n *ast.FencedCodeBlock, en
 
 	if entering {
 		// body
-		for i := range n.Lines().Len() {
-			line := n.Lines().At(i)
+		lines := n.Lines()
+		for i := range lines.Len() {
+			line := lines.At(i)
 			io.WriteString(w, "| ")
 			w.Write(line.Value(source))
 		}

+ 3 - 2
internal/notifications/renderer.go

@@ -39,8 +39,9 @@ func (r *renderer) Render(w io.Writer, source []byte, n ast.Node) error {
 			io.WriteString(w, "\n")
 
 			if entering {
-				for i := range n.Lines().Len() {
-					line := n.Lines().At(i)
+				lines := n.Lines()
+				for i := range lines.Len() {
+					line := lines.At(i)
 					io.WriteString(w, "| ")
 					w.Write(line.Value(source))
 				}