From 0664587a4ba4a957f860d49866bbff5c4f1d45f2 Mon Sep 17 00:00:00 2001
From: Gerardo Rodriguez <g@rodrz.com>
Date: Thu, 5 Nov 2026 03:04:54 +0000
Subject: [PATCH 1/3] ci: cache pre-commit hooks per Go version

---
 .github/workflows/go.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 8b988db..7c7a83e 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -32,8 +32,14 @@ jobs:
           go install honnef.co/go/tools/cmd/staticcheck@latest
           export PATH="$HOME/go/bin:$PATH"
 
+      - name: Cache pre-commit
+        uses: actions/cache@v6
+        with:
+          path: ~/.cache/pre-commit
+          key: pre-commit-go${{ matrix.go-version }}-${{ hashFiles('.pre-commit-config.yaml') }}
+
       - name: Run pre-commit
-        uses: pre-commit/action@v3.0.1
+        run: pipx run pre-commit run --all-files --show-diff-on-failure --color=always
 
   test:
     runs-on: ubuntu-latest

From a630835d70e59d28b29ee6316da589a27a155ba5 Mon Sep 17 00:00:00 2001
From: Nick Mills-Barrett <nick@beeper.com>
Date: Thu, 5 Nov 2026 13:09:30 +0000
Subject: [PATCH 2/3] pre-commit: install bridgelint with the CI Go toolchain
 (#706)

---
 .github/workflows/go.yml | 1 +
 .pre-commit-config.yaml  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 8b988db..df15747 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -30,6 +30,7 @@ jobs:
         run: |
           go install golang.org/x/tools/cmd/goimports@latest
           go install honnef.co/go/tools/cmd/staticcheck@latest
+          go install github.com/beeper/pre-commit-go/bridgelint@latest
           export PATH="$HOME/go/bin:$PATH"
 
       - name: Run pre-commit
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 8ea1c20..1f1fe9c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -27,4 +27,5 @@ repos:
       - id: zerolog-ban-msgf
       - id: zerolog-use-stringer
       - id: bridgelint
+        language: system
         verbose: true

From 34b4187e0796ee399245434e7a2657d97d25cd40 Mon Sep 17 00:00:00 2001
From: "indent[bot]" <297468268+indent[bot]@users.noreply.github.com>
Date: Thu, 5 Nov 2026 15:33:19 +0000
Subject: [PATCH 3/3] chatinfo: stop listing contacts after request
 cancellation (#705)

Co-authored-by: Indent <noreply@indent.com>
---
 pkg/connector/chatinfo.go | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkg/connector/chatinfo.go b/pkg/connector/chatinfo.go
index 4668cd7..dbc524d 100644
--- a/pkg/connector/chatinfo.go
+++ b/pkg/connector/chatinfo.go
@@ -445,11 +445,15 @@ func (s *SignalClient) GetContactList(ctx context.Context) ([]*bridgev2.ResolveI
 	}
 	resp := make([]*bridgev2.ResolveIdentifierResponse, len(recipients))
 	for i, recipient := range recipients {
-		recipientResp := &bridgev2.ResolveIdentifierResponse{
-			Chat: s.makeCreateDMResponse(ctx, recipient, nil),
+		if err = ctx.Err(); err != nil {
+			return nil, err
 		}
+		recipientResp := &bridgev2.ResolveIdentifierResponse{}
 		var username string
 		if recipient.ACI != uuid.Nil {
+			recipientResp.Chat = &bridgev2.CreateChatResponse{
+				PortalKey: s.makeDMPortalKey(libsignalgo.NewACIServiceID(recipient.ACI)),
+			}
 			recipientResp.UserID = signalid.MakeUserID(recipient.ACI)
 			ghost, err := s.Main.Bridge.GetGhostByID(ctx, recipientResp.UserID)
 			if err != nil {
@@ -458,7 +462,11 @@ func (s *SignalClient) GetContactList(ctx context.Context) ([]*bridgev2.ResolveI
 			recipientResp.Ghost = ghost
 			username = ghost.Metadata.(*signalid.GhostMetadata).Username
 		} else {
-			recipientResp.UserID = signalid.MakeUserIDFromServiceID(libsignalgo.NewPNIServiceID(recipient.PNI))
+			pniServiceID := libsignalgo.NewPNIServiceID(recipient.PNI)
+			recipientResp.Chat = &bridgev2.CreateChatResponse{
+				PortalKey: s.makeDMPortalKey(pniServiceID),
+			}
+			recipientResp.UserID = signalid.MakeUserIDFromServiceID(pniServiceID)
 		}
 		recipientResp.UserInfo, err = s.contactToUserInfo(ctx, recipient, username, false)
 		if err != nil {