Skip to content

fix flip convo id #29161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrisnojima merged 1 commit into from
Apr 17, 2026
+15 −4
Merged

fix flip convo id #29161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions go/chat/flipmanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,15 @@ func (m *FlipManager) handleUpdate(ctx context.Context, update flip.GameStateUpd
GameID: gameID.FlipGameIDStr(),
}
}
status.ConvID = update.Metadata.ConversationID.ConvIDStr()
if len(status.ConvID) == 0 {
hmi, hmiErr := m.getHostMessageInfo(ctx, update.Metadata.ConversationID)
if hmiErr != nil {
m.Debug(ctx, "handleUpdate: failed to get host message info: %s", hmiErr)
status.ConvID = update.Metadata.ConversationID.ConvIDStr()
} else {
status.ConvID = hmi.ConvID.ConvIDStr()
}
}

switch {
case update.Err != nil:
Expand Down Expand Up @@ -1374,10 +1382,10 @@ func (m *FlipManager) loadGame(ctx context.Context, job loadGameJob) (err error)
}
}
m.Debug(ctx, "loadGame: game had no action after pausing, sending error")
job.resCh <- m.handleSummaryUpdate(ctx, job.gameID, summary, flipConvID, true)
job.resCh <- m.handleSummaryUpdate(ctx, job.gameID, summary, hmi.ConvID, true)
}(globals.BackgroundChatCtx(ctx, m.G()), summary)
} else {
job.resCh <- m.handleSummaryUpdate(ctx, job.gameID, summary, flipConvID, true)
job.resCh <- m.handleSummaryUpdate(ctx, job.gameID, summary, hmi.ConvID, true)
}
return nil
}
Expand Down Expand Up @@ -1409,7 +1417,9 @@ func (m *FlipManager) LoadFlip(ctx context.Context, uid gregor1.UID, hostConvID
default:
m.queueDirtyGameID(ctx, gameID, true)
res = make(chan chat1.UICoinFlipStatus, 1)
res <- stored.(chat1.UICoinFlipStatus)
status := stored.(chat1.UICoinFlipStatus)
status.ConvID = hostConvID.ConvIDStr()
res <- status
err = make(chan error, 1)
return res, err
}
Expand Down
1 change: 1 addition & 0 deletions go/chat/flipmanager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,7 @@ func TestFlipManagerLoadFlip(t *testing.T) {
case updates := <-ui0.CoinFlipUpdates:
require.Equal(t, 1, len(updates))
require.Equal(t, chat1.UICoinFlipPhase_COMPLETE, updates[0].Phase)
require.Equal(t, conv.Id.ConvIDStr(), updates[0].ConvID)
require.Equal(t, res, updates[0].ResultText)
case <-time.After(timeout):
require.Fail(t, "no updates")
Expand Down