tjh.dev
forked from
tangled.org/core
Mirror of @tangled.org/core. Running on a Raspberry Pi Zero 2
appview/state: handle empty vanity stat kinds
allows removing vanity stat kinds
Signed-off-by: oppiliappan <me@oppi.li>
oppi.li
+2
appview/db/profile.go
+2
appview/db/profile.go
···
453
453
case models.VanityStatStarCount:
454
454
query = `select count(id) from stars where subject_at like 'at://' || ? || '%'`
455
455
args = append(args, did)
456
+
case models.VanityStatNone:
457
+
return 0, nil
456
458
default:
457
459
return 0, fmt.Errorf("invalid vanity stat kind: %s", stat)
458
460
}
+1
-1
appview/ingester.go
+1
-1
appview/ingester.go
+24
-1
appview/models/profile.go
+24
-1
appview/models/profile.go
···
60
60
VanityStatClosedIssueCount VanityStatKind = "closed-issue-count"
61
61
VanityStatRepositoryCount VanityStatKind = "repository-count"
62
62
VanityStatStarCount VanityStatKind = "star-count"
63
+
VanityStatNone VanityStatKind = ""
63
64
)
65
+
66
+
func ParseVanityStatKind(s string) VanityStatKind {
67
+
switch s {
68
+
case "merged-pull-request-count":
69
+
return VanityStatMergedPRCount
70
+
case "closed-pull-request-count":
71
+
return VanityStatClosedPRCount
72
+
case "open-pull-request-count":
73
+
return VanityStatOpenPRCount
74
+
case "open-issue-count":
75
+
return VanityStatOpenIssueCount
76
+
case "closed-issue-count":
77
+
return VanityStatClosedIssueCount
78
+
case "repository-count":
79
+
return VanityStatRepositoryCount
80
+
case "star-count":
81
+
return VanityStatStarCount
82
+
default:
83
+
return VanityStatNone
84
+
}
85
+
}
64
86
65
87
func (v VanityStatKind) String() string {
66
88
switch v {
···
100
78
return "Repositories"
101
79
case VanityStatStarCount:
102
80
return "Stars Received"
81
+
default:
82
+
return ""
103
83
}
104
-
return ""
105
84
}
106
85
107
86
type VanityStat struct {
+1
-1
appview/pages/templates/user/fragments/editBio.html
+1
-1
appview/pages/templates/user/fragments/editBio.html
···
110
110
{{ $id := index . 0 }}
111
111
{{ $stat := index . 1 }}
112
112
<select class="stat-group w-full p-1 border border-gray-200 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-700 text-sm" id="stat{{$id}}" name="stat{{$id}}">
113
-
<option value="">choose stat</option>
113
+
<option value="">Choose Stat</option>
114
114
{{ $stats := assoc
115
115
"merged-pull-request-count" "Merged PR Count"
116
116
"closed-pull-request-count" "Closed PR Count"
+2
-7
appview/state/profile.go
+2
-7
appview/state/profile.go
···
550
550
stat0 := r.FormValue("stat0")
551
551
stat1 := r.FormValue("stat1")
552
552
553
-
if stat0 != "" {
554
-
profile.Stats[0].Kind = models.VanityStatKind(stat0)
555
-
}
556
-
557
-
if stat1 != "" {
558
-
profile.Stats[1].Kind = models.VanityStatKind(stat1)
559
-
}
553
+
profile.Stats[0].Kind = models.ParseVanityStatKind(stat0)
554
+
profile.Stats[1].Kind = models.ParseVanityStatKind(stat1)
560
555
561
556
if err := db.ValidateProfile(s.db, profile); err != nil {
562
557
log.Println("invalid profile", err)