Skip to content

Conversation

@Cookiezaurs
Copy link
Contributor

No description provided.

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR introduces functionality to allow ClickHouse (or other plugins) to suggest which user ID should be the winner during user merge operations, rather than always using the default merge logic based on last session time.

Key Changes:

  • Added a new plugin dispatch endpoint /i/suggest_merged_uid that allows plugins to influence merge decisions
  • Modified the merge flow to handle three scenarios: winner is old UID, winner is new UID (default), or winner is a completely different UID (double merge)
  • Added mergeOptions parameter to the mergeUserData function to pass plugin suggestions through to merge handlers

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 5 comments.

File Description
api/parts/mgmt/app_users.js Core merge logic updated to dispatch to plugins for merge UID suggestions and handle the suggested winner UID in three different scenarios
plugins/times-of-day/tests.js Added test to trigger mutation manager job after app reset to ensure proper cleanup

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@Cookiezaurs Cookiezaurs merged commit 4bc78b6 into newarchitecture Dec 19, 2025
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants