diff --git a/packages/server/modules/core/repositories/commits.ts b/packages/server/modules/core/repositories/commits.ts index 60ec7219f6..7605466428 100644 --- a/packages/server/modules/core/repositories/commits.ts +++ b/packages/server/modules/core/repositories/commits.ts @@ -178,6 +178,11 @@ export const getBatchedBranchCommitsFactory = ...BranchCommits.cols, StreamCommits.col.streamId ]) + .innerJoin( + StreamCommits.name, + StreamCommits.col.commitId, + BranchCommits.col.commitId + ) .whereIn(BranchCommits.col.branchId, branchIds) .orderBy(BranchCommits.col.branchId) diff --git a/packages/server/modules/core/services/streams/clone.ts b/packages/server/modules/core/services/streams/clone.ts index 5b5dc9b502..4060c4db83 100644 --- a/packages/server/modules/core/services/streams/clone.ts +++ b/packages/server/modules/core/services/streams/clone.ts @@ -521,19 +521,16 @@ export const cloneStreamFactory = const { newStream } = coreCloneResult // Clone comments await cloneStreamCommentsFactory(deps)(state, coreCloneResult) - // Create activity item - await deps.addStreamClonedActivity( - { - sourceStreamId, - newStream, - clonerId: userId - }, - { trx: state.trx } - ) // Commit transaction await state.trx.commit() + // Create activity item + await deps.addStreamClonedActivity({ + sourceStreamId, + newStream, + clonerId: userId + }) return coreCloneResult.newStream } catch (e) { await state.trx.rollback()