Merge branch 'release/1.2.3'

axllent · Oct 14, 2022 · 9053651 · 9053651
2 parents 6e6482f + a959303
commit 9053651
Show file tree

Hide file tree

Showing 10 changed files with 212 additions and 152 deletions.
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -30,7 +30,7 @@ jobs:
       uses: docker/build-push-action@v3
       with:
         context: .
-        platforms: linux/amd64,linux/arm64,linux/arm
+        platforms: linux/386,linux/amd64,linux/arm,linux/arm64
         build-args: |
           "VERSION=${{ steps.tag.outputs.tag }}"
         push: true

diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
@@ -10,12 +10,16 @@ jobs:
     strategy:
       matrix:
         goos: [linux, windows, darwin]
-        goarch: ["386", amd64, arm64]
+        goarch: ["386", amd64, arm, arm64]
         exclude:
           - goarch: "386"
             goos: darwin
           - goarch: "386"
             goos: windows
+          - goarch: arm
+            goos: darwin
+          - goarch: arm
+            goos: windows
     steps:
     - uses: actions/checkout@v3
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 Notable changes to Mailpit will be documented in this file.
 
+## 1.2.3
+
+### API
+- Add limit and start parameters to search
+
+### UI
+- Prevent double message index request on websocket connect
+
+
 ## 1.2.2
 
 ### API

diff --git a/docs/apiv1/Search.md b/docs/apiv1/Search.md
@@ -10,9 +10,11 @@ Matching messages are returned in the order of latest received to oldest.
 
 ## Query parameters
 
-| Parameter | Type   | Required | Description  |
-|-----------|--------|----------|--------------|
-| query     | string | true     | Search query |
+| Parameter | Type    | Required | Description                |
+|-----------|---------|----------|----------------------------|
+| query     | string  | true     | Search query               |
+| limit     | integer | false    | Limit results (default 50) |
+| start     | integer | false    | Pagination offset          |
 
 
 ## Response

diff --git a/server/apiv1/api.go b/server/apiv1/api.go
@@ -55,7 +55,9 @@ func Search(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	messages, err := storage.Search(search)
+	start, limit := getStartLimit(r)
+
+	messages, err := storage.Search(search, start, limit)
 	if err != nil {
 		httpError(w, err.Error())
 		return

diff --git a/server/server_test.go b/server/server_test.go
@@ -181,7 +181,9 @@ func assertSearchEqual(t *testing.T, uri, query string, count int) {
 	t.Logf("Test search: %s", query)
 	m := apiv1.MessagesResult{}
 
-	data, err := clientGet(uri + "?query=" + url.QueryEscape(query))
+	limit := fmt.Sprintf("%d", count)
+
+	data, err := clientGet(uri + "?query=" + url.QueryEscape(query) + "&limit=" + limit)
 	if err != nil {
 		t.Errorf(err.Error())
 		return