Merge pull request '[v8.0/forgejo] [gitea] week 2024-27 cherry pick (gitea/main -> forgejo)' (#4283) from bp-v8.0/forgejo-a2426e2-45181ee-9d1c72a into v8.0/forgejo

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4283
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>

models/activities/notification.go

@@ -287,13 +287,14 @@ type UserIDCount struct {
 	Count  int64
 }
 
-// GetUIDsAndNotificationCounts between the two provided times
+// GetUIDsAndNotificationCounts returns the unread counts for every user between the two provided times.
+// It must return all user IDs which appear during the period, including count=0 for users who have read all.
 func GetUIDsAndNotificationCounts(ctx context.Context, since, until timeutil.TimeStamp) ([]UserIDCount, error) {
-	sql := `SELECT user_id, count(*) AS count FROM notification ` +
+	sql := `SELECT user_id, sum(case when status= ? then 1 else 0 end) AS count FROM notification ` +
 		`WHERE user_id IN (SELECT user_id FROM notification WHERE updated_unix >= ? AND ` +
-		`updated_unix < ?) AND status = ? GROUP BY user_id`
+		`updated_unix < ?) GROUP BY user_id`
 	var res []UserIDCount
-	return res, db.GetEngine(ctx).SQL(sql, since, until, NotificationStatusUnread).Find(&res)
+	return res, db.GetEngine(ctx).SQL(sql, NotificationStatusUnread, since, until).Find(&res)
 }
 
 // SetIssueReadBy sets issue to be read by given user.

modules/lfs/http_client.go

@@ -180,6 +180,10 @@ func (c *HTTPClient) performOperation(ctx context.Context, objects []Pointer, dc
 			}
 		} else {
 			link, ok := object.Actions["download"]
+			if !ok {
+				// no actions block in response, try legacy response schema
+				link, ok = object.Links["download"]
+			}
 			if !ok {
 				log.Debug("%+v", object)
 				return errors.New("missing action 'download'")

modules/lfs/http_client_test.go

@@ -59,6 +59,17 @@ func lfsTestRoundtripHandler(req *http.Request) *http.Response {
 				},
 			},
 		}
+	} else if strings.Contains(url, "legacy-batch-request-download") {
+		batchResponse = &BatchResponse{
+			Transfer: "dummy",
+			Objects: []*ObjectResponse{
+				{
+					Links: map[string]*Link{
+						"download": {},
+					},
+				},
+			},
+		}
 	} else if strings.Contains(url, "valid-batch-request-upload") {
 		batchResponse = &BatchResponse{
 			Transfer: "dummy",
@@ -229,6 +240,11 @@ func TestHTTPClientDownload(t *testing.T) {
 			endpoint:      "https://unknown-actions-map.io",
 			expectederror: "missing action 'download'",
 		},
+		// case 11
+		{
+			endpoint:      "https://legacy-batch-request-download.io",
+			expectederror: "",
+		},
 	}
 
 	for n, c := range cases {

modules/lfs/shared.go

@@ -47,6 +47,7 @@ type BatchResponse struct {
 type ObjectResponse struct {
 	Pointer
 	Actions map[string]*Link `json:"actions,omitempty"`
+	Links   map[string]*Link `json:"_links,omitempty"`
 	Error   *ObjectError     `json:"error,omitempty"`
 }
 

release-notes/8.0.0/feat/31513.md

@@ -0,0 +1 @@
+- add support for LFS server implementations which have batch API responses in an older/deprecated schema