Merge branch 'main' into feature/votes_search

goverland-labs · Jul 22, 2024 · 20ada83 · 20ada83
2 parents 314c26d + 76db842
commit 20ada83
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,9 +7,18 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [0.1.22] - 2024-07-22
+
 ### Added
 - Search for votes
 
+## [0.1.21] - 2024-07-06
+
+### Changed
+- Top proposals calculation
+
+## [0.1.20] - 2024-07-05
+
 ### Changed
 - Extend vote response with proposal identifier
 

diff --git a/internal/proposal/repo.go b/internal/proposal/repo.go
@@ -113,6 +113,7 @@ func (r *Repo) GetTop(filters []Filter) (ProposalList, error) {
 			"from proposals where state = 'active' and spam is not true and votes >= 30) pr on pr.id = proposals.id and pr.r <= 2").
 		InnerJoins("inner join daos on daos.id = proposals.dao_id").
 		Order("daos.verified desc").
+		Order("pr.r").
 		Order("votes/(EXTRACT(EPOCH FROM CURRENT_TIMESTAMP)-start) desc")
 
 	var (