From 49154778234d90aeb47be260c42a6f9d7b62fb1f Mon Sep 17 00:00:00 2001
From: boatbomber <zack@boatbomber.com>
Date: Sun, 16 Jul 2023 21:03:06 -0700
Subject: [PATCH] Expose reconciler hooks on servesession (#741)

---
 plugin/src/App/init.lua     |  2 +-
 plugin/src/ServeSession.lua | 16 ++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/plugin/src/App/init.lua b/plugin/src/App/init.lua
index 23d0a506..f4c30f3c 100644
--- a/plugin/src/App/init.lua
+++ b/plugin/src/App/init.lua
@@ -374,7 +374,7 @@ function App:startSession()
 		end)
 	end)
 
-	serveSession:onPatchApplied(function(patch, unapplied)
+	serveSession:hookPostcommit(function(patch, _instanceMap, unapplied)
 		local now = os.time()
 		local old = self.state.patchData
 
diff --git a/plugin/src/ServeSession.lua b/plugin/src/ServeSession.lua
index 4e5116c8..6a3fcdc4 100644
--- a/plugin/src/ServeSession.lua
+++ b/plugin/src/ServeSession.lua
@@ -97,7 +97,6 @@ function ServeSession.new(options)
 		__instanceMap = instanceMap,
 		__changeBatcher = changeBatcher,
 		__statusChangedCallback = nil,
-		__patchAppliedCallback = nil,
 		__connections = connections,
 	}
 
@@ -129,8 +128,12 @@ function ServeSession:setConfirmCallback(callback)
 	self.__userConfirmCallback = callback
 end
 
-function ServeSession:onPatchApplied(callback)
-	self.__patchAppliedCallback = callback
+function ServeSession:hookPrecommit(callback)
+	return self.__reconciler:hookPrecommit(callback)
+end
+
+function ServeSession:hookPostcommit(callback)
+	return self.__reconciler:hookPostcommit(callback)
 end
 
 function ServeSession:start()
@@ -291,9 +294,6 @@ function ServeSession:__initialSync(serverInfo)
 					Log.warn("Could not apply all changes requested by the Rojo server:\n{}",
 						PatchSet.humanSummary(self.__instanceMap, unappliedPatch))
 				end
-				if self.__patchAppliedCallback then
-					pcall(self.__patchAppliedCallback, catchUpPatch, unappliedPatch)
-				end
 			end
 		end)
 end
@@ -318,10 +318,6 @@ function ServeSession:__mainSyncLoop()
 							Log.warn("Could not apply all changes requested by the Rojo server:\n{}",
 								PatchSet.humanSummary(self.__instanceMap, unappliedPatch))
 						end
-
-						if self.__patchAppliedCallback then
-							pcall(self.__patchAppliedCallback, message, unappliedPatch)
-						end
 					end
 				end):await()