Skip to content

Commit d2ed132

Browse files
authored
Merge pull request #11 from codeGROOVE-dev/sprinkler
make go code more idiomatic
2 parents 4c39051 + 1f6cc0d commit d2ed132

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

main.go

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -999,50 +999,50 @@ func generatePRDisplay(prs []PR, username string, blockingOnly, verbose, include
999999

10001000
// Filter out excluded orgs
10011001
if len(excludedOrgs) > 0 {
1002-
var filteredPRs []PR
1002+
var filtered []PR
10031003
for i := range prs {
10041004
excluded := false
1005-
prOrg := orgFromURL(prs[i].HTMLURL)
1006-
for _, excludeOrg := range excludedOrgs {
1007-
if prOrg == excludeOrg {
1005+
org := orgFromURL(prs[i].HTMLURL)
1006+
for _, exc := range excludedOrgs {
1007+
if org == exc {
10081008
excluded = true
10091009
break
10101010
}
10111011
}
10121012
if !excluded {
1013-
filteredPRs = append(filteredPRs, prs[i])
1013+
filtered = append(filtered, prs[i])
10141014
}
10151015
}
1016-
prs = filteredPRs
1016+
prs = filtered
10171017
}
10181018

10191019
// Filter stale PRs unless includeStale is true
10201020
if !includeStale {
1021-
var filteredPRs []PR
1022-
staleDuration := stalePRDays * 24 * time.Hour
1021+
var filtered []PR
1022+
staleAge := stalePRDays * 24 * time.Hour
10231023
for i := range prs {
1024-
isStale := false
1024+
stale := false
10251025

10261026
// Check if PR is older than 90 days based on UpdatedAt
1027-
if time.Since(prs[i].UpdatedAt) > staleDuration {
1028-
isStale = true
1027+
if time.Since(prs[i].UpdatedAt) > staleAge {
1028+
stale = true
10291029
}
10301030

10311031
// Also check TurnResponse tags if available
1032-
if !isStale && prs[i].TurnResponse != nil {
1032+
if !stale && prs[i].TurnResponse != nil {
10331033
for _, tag := range prs[i].TurnResponse.PRState.Tags {
10341034
if tag == "stale" {
1035-
isStale = true
1035+
stale = true
10361036
break
10371037
}
10381038
}
10391039
}
10401040

1041-
if !isStale {
1042-
filteredPRs = append(filteredPRs, prs[i])
1041+
if !stale {
1042+
filtered = append(filtered, prs[i])
10431043
}
10441044
}
1045-
prs = filteredPRs
1045+
prs = filtered
10461046
}
10471047

10481048
// Sort PRs by most recently updated
@@ -1052,37 +1052,37 @@ func generatePRDisplay(prs []PR, username string, blockingOnly, verbose, include
10521052
incoming, outgoing := categorizePRs(prs, username)
10531053

10541054
// Count blocking PRs
1055-
incomingBlockingCount := 0
1055+
inBlocked := 0
10561056
for i := range incoming {
10571057
if isBlockingOnUser(&incoming[i], username) {
1058-
incomingBlockingCount++
1058+
inBlocked++
10591059
}
10601060
}
10611061

1062-
outgoingBlockingCount := 0
1062+
outBlocked := 0
10631063
for i := range outgoing {
10641064
if isBlockingOnUser(&outgoing[i], username) {
1065-
outgoingBlockingCount++
1065+
outBlocked++
10661066
}
10671067
}
10681068

10691069
output.WriteString("\n")
10701070

10711071
// Incoming PRs with integrated header
1072-
if len(incoming) > 0 && (!blockingOnly || incomingBlockingCount > 0) {
1072+
if len(incoming) > 0 && (!blockingOnly || inBlocked > 0) {
10731073
// Header with counts - proper singular/plural
10741074
prText := "PR"
10751075
if len(incoming) != 1 {
10761076
prText = "PRs"
10771077
}
10781078
output.WriteString(fmt.Sprintf("incoming - %d %s", len(incoming), prText))
1079-
if incomingBlockingCount > 0 {
1079+
if inBlocked > 0 {
10801080
output.WriteString(", ")
10811081
blockText := "blocked on YOU"
10821082
output.WriteString(lipgloss.NewStyle().
10831083
Foreground(lipgloss.Color("#E5484D")). // Red for blocked count
10841084
Bold(true).
1085-
Render(fmt.Sprintf("%d %s", incomingBlockingCount, blockText)))
1085+
Render(fmt.Sprintf("%d %s", inBlocked, blockText)))
10861086
}
10871087
output.WriteString(":\n")
10881088

@@ -1095,7 +1095,7 @@ func generatePRDisplay(prs []PR, username string, blockingOnly, verbose, include
10951095
}
10961096

10971097
// Outgoing PRs with integrated header
1098-
if len(outgoing) > 0 && (!blockingOnly || outgoingBlockingCount > 0) {
1098+
if len(outgoing) > 0 && (!blockingOnly || outBlocked > 0) {
10991099
if len(incoming) > 0 {
11001100
output.WriteString("\n")
11011101
}
@@ -1108,13 +1108,13 @@ func generatePRDisplay(prs []PR, username string, blockingOnly, verbose, include
11081108
output.WriteString(lipgloss.NewStyle().
11091109
Foreground(lipgloss.Color("#8B8B8B")). // Gray for outgoing header
11101110
Render(fmt.Sprintf("outgoing - %d %s", len(outgoing), prText)))
1111-
if outgoingBlockingCount > 0 {
1111+
if outBlocked > 0 {
11121112
output.WriteString(", ")
11131113
blockText := "blocked on YOU"
11141114
output.WriteString(lipgloss.NewStyle().
11151115
Foreground(lipgloss.Color("#E5484D")).
11161116
Bold(true).
1117-
Render(fmt.Sprintf("%d %s", outgoingBlockingCount, blockText)))
1117+
Render(fmt.Sprintf("%d %s", outBlocked, blockText)))
11181118
}
11191119
output.WriteString(":\n")
11201120

@@ -1126,7 +1126,7 @@ func generatePRDisplay(prs []PR, username string, blockingOnly, verbose, include
11261126
}
11271127
}
11281128

1129-
if blockingOnly && incomingBlockingCount == 0 && outgoingBlockingCount == 0 {
1129+
if blockingOnly && inBlocked == 0 && outBlocked == 0 {
11301130
// Show nothing when no PRs are blocking
11311131
return ""
11321132
}

0 commit comments

Comments
 (0)