chore(): chat merge conflict interface

quantmHQ · Dec 5, 2024 · 324fccf · 324fccf
1 parent 06084fa
commit 324fccf
Show file tree

Hide file tree

Showing 5 changed files with 186 additions and 3 deletions.
diff --git a/api b/api
diff --git a/internal/core/kernel/chat.go b/internal/core/kernel/chat.go
@@ -12,6 +12,11 @@ type (
 		// NotifyLinesExceed sends a message indicating a line exceed message.
 		//
 		// This method must not be called from the workflow.
-		NotifyLinesExceed(ctx context.Context, event *events.Event[eventsv1.ChatHook, eventsv1.Diff]) error // TODO - need to handle branch
+		NotifyLinesExceed(ctx context.Context, event *events.Event[eventsv1.ChatHook, eventsv1.Diff]) error
+
+		// NotifyMergeConflict sends a message indicating a merge conflict.
+		//
+		// This method must not be called from the workflow.
+		NotifyMergeConflict(ctx context.Context, event *events.Event[eventsv1.ChatHook, eventsv1.Merge]) error
 	}
 )
diff --git a/internal/events/payload.go b/internal/events/payload.go
@@ -13,6 +13,7 @@ type (
 			eventsv1.Push |
 			eventsv1.Rebase |
 			eventsv1.Diff |
-			eventsv1.PullRequest
+			eventsv1.PullRequest |
+			eventsv1.Merge
 	}
 )
diff --git a/internal/hooks/slack/activities/kernel.go b/internal/hooks/slack/activities/kernel.go
@@ -64,6 +64,12 @@ func (k *Kernel) NotifyLinesExceed(
 	return fns.SendMessage(client, target, attachment)
 }
 
+func (k *Kernel) NotifyMergeConflict(
+	ctx context.Context, event *events.Event[eventsv1.ChatHook, eventsv1.Merge],
+) error {
+	return nil
+}
+
 func (k *Kernel) to_user(ctx context.Context, link_to uuid.UUID) (string, string, error) {
 	msg, err := db.Queries().GetMessagesByLinkTo(ctx, link_to)
 	if err != nil {

diff --git a/internal/proto/ctrlplane/events/v1/merge.pb.go b/internal/proto/ctrlplane/events/v1/merge.pb.go