use address field, temp disable arm64

istresearch · Apr 3, 2024 · c948902 · c948902
1 parent b8ff656
commit c948902
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
@@ -70,7 +70,7 @@ jobs:
               },
               "image": {
                 "dockerfile": "Dockerfile",
-                "arch_allowed": "amd64 arm64",
+                "arch_allowed": "amd64",
                 "name": "${{ github.repository }}",
                 "tag": "${{ needs.build_cfg.outputs.VERSION_STR }}${{ needs.build_cfg.outputs.ALT_TAGS }}",
                 "build_args": [

diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml
@@ -65,7 +65,7 @@ jobs:
               },
               "image": {
                 "dockerfile": "Dockerfile",
-                "arch_allowed": "amd64 arm64",
+                "arch_allowed": "amd64",
                 "name": "${{ github.repository }}",
                 "tag": "${{ needs.build_cfg.outputs.VERSION_STR }}",
                 "build_args": [

diff --git a/handlers/postmaster/postmaster.go b/handlers/postmaster/postmaster.go
@@ -205,10 +205,7 @@ func (h *handler) SendMsg(ctx context.Context, msg courier.Msg) (courier.MsgStat
 		return nil, fmt.Errorf("invalid chat mode")
 	}
 
-	deviceId := msg.Channel().ConfigForKey("device_id", "").(string)
-	if deviceId == "" {
-		return nil, fmt.Errorf("invalid chat mode")
-	}
+	deviceId := msg.Channel().Address()
 
 	status := h.Backend().NewMsgStatusForID(msg.Channel(), msg.ID(), courier.MsgErrored)
 
@@ -282,10 +279,7 @@ func (h *handler) PurgeOutgoing(ctx context.Context, channel courier.Channel) er
 		return fmt.Errorf("invalid chat mode")
 	}
 
-	deviceID := channel.ConfigForKey("device_id", "").(string)
-	if deviceID == "" {
-		return fmt.Errorf("invalid chat mode")
-	}
+	deviceID := channel.Address()
 
 	pr := purgeRequest{
 		DeviceID: deviceID,