Skip to content

Commit c610b6d

Browse files
authored
Merge pull request #195 from streamdevs/179-mr-link
feat: send mr link in mr events
2 parents d8e9637 + 609d851 commit c610b6d

File tree

6 files changed

+9
-6
lines changed

6 files changed

+9
-6
lines changed

src/reactions/gitlab/merge-request-merged.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export class MergeRequestMerged extends Reaction<MergeRequestPayload> {
77
}
88

99
getTwitchChatMessage({ payload }: ReactionHandleOptions<MergeRequestPayload>): string {
10-
return `The merge request from ${payload.user.username} has been merged into ${payload.repository.homepage}`;
10+
return `The merge request from ${payload.user.username} has been merged into ${payload.object_attributes.url}`;
1111
}
1212

1313
canHandle({ payload, event }: ReactionCanHandleOptions<MergeRequestPayload>): boolean {

src/reactions/gitlab/merge-request-opened.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export class MergeRequestOpened extends Reaction<MergeRequestPayload> {
88
}
99

1010
getTwitchChatMessage({ payload }: ReactionHandleOptions<MergeRequestPayload>): string {
11-
return `${payload.user.username} just opened a merge request in ${payload.repository.homepage}`;
11+
return `${payload.user.username} just opened a merge request in ${payload.object_attributes.url}`;
1212
}
1313

1414
canHandle({ payload, event, config }: ReactionCanHandleOptions<MergeRequestPayload>): boolean {

src/schemas/gitlab/merge-request-payload.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@ export interface MergeRequestPayload {
1414
};
1515
object_attributes: {
1616
state: 'merged' | 'created' | 'updated' | 'closed' | 'opened';
17+
url: url;
1718
};
1819
}

test/builders/gitlab/merge-request-payload-builder.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import { MergeRequestPayload } from '../../../src/schemas/gitlab/merge-request-payload';
21
import { merge } from 'lodash';
2+
import { DeepPartial } from 'utility-types';
3+
import { MergeRequestPayload } from '../../../src/schemas/gitlab/merge-request-payload';
34

45
export class MergeRequestPayloadBuilder {
56
private payload: MergeRequestPayload = {
@@ -17,10 +18,11 @@ export class MergeRequestPayloadBuilder {
1718
},
1819
object_attributes: {
1920
state: 'merged',
21+
url: 'http://example.com/diaspora/merge_requests/1',
2022
},
2123
};
2224

23-
public with(payload: Partial<MergeRequestPayload>): MergeRequestPayloadBuilder {
25+
public with(payload: DeepPartial<MergeRequestPayload>): MergeRequestPayloadBuilder {
2426
merge(this.payload, payload);
2527

2628
return this;

test/reactions/gitlab/merge-request-merged.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ describe('MergeRequestMerged', () => {
5555
expect.objectContaining({
5656
twitchChat: {
5757
notified: true,
58-
message: `The merge request from ${payload.user.username} has been merged into ${payload.repository.homepage}`,
58+
message: `The merge request from ${payload.user.username} has been merged into ${payload.object_attributes.url}`,
5959
},
6060
}),
6161
);

test/reactions/gitlab/merge-request-opened.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ describe('MergeRequestOpened', () => {
9292

9393
expect(response).toEqual({
9494
notified: true,
95-
message: `${payload.user.username} just opened a merge request in ${payload.repository.homepage}`,
95+
message: `${payload.user.username} just opened a merge request in ${payload.object_attributes.url}`,
9696
});
9797
});
9898

0 commit comments

Comments
 (0)