Skip to content

Commit 57d1532

Browse files
moshmagemoshmage
authored
Merge pull request #185 from layerx-labs/dev
BEPRO 2.20
2 parents 61a6d48 + f2b1fa1 commit 57d1532

23 files changed

+232
-159
lines changed

‎src/actions/get-bounty-closed-event.ts‎

Lines changed: 43 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -110,16 +110,49 @@ export async function action(block: DecodedLog, query?: EventsQuery): Promise<Ev
110110

111111
const {tokenAmount, fundingAmount, rewardAmount, rewardToken, transactional} = bounty;
112112

113-
Push.event(AnalyticEventName.BOUNTY_CLOSED, {
114-
chainId, network: {name: network.name, id: network.id},
115-
tokenAmount, fundingAmount, rewardAmount, rewardToken, transactional,
116-
currency: dbBounty.transactionalToken?.symbol,
117-
reward: dbBounty.rewardToken?.symbol,
118-
creator: block.returnValues.creator,
119-
username: dbBounty.user?.handle,
120-
actor: address,
121-
title: dbBounty.title
122-
})
113+
const targets = [(await dbBounty.getUser({
114+
attributes: ["email", "id"],
115+
include: [{association: "user_settings"}]
116+
})).get()]
117+
118+
const AnalyticsEvent = {
119+
name: AnalyticEventName.BOUNTY_CLOSED,
120+
params: {
121+
chainId, network: {name: network.name, id: network.id},
122+
tokenAmount, fundingAmount, rewardAmount, rewardToken, transactional,
123+
currency: dbBounty.transactionalToken?.symbol,
124+
reward: dbBounty.rewardToken?.symbol,
125+
creator: block.returnValues.creator,
126+
username: dbBounty.user?.handle,
127+
actor: address,
128+
title: dbBounty.title
129+
}
130+
};
131+
132+
const NotificationEvent = {
133+
name: AnalyticEventName.NOTIF_TASK_CLOSED,
134+
params: {
135+
targets,
136+
task: {
137+
title: dbBounty.title,
138+
id: dbBounty.id,
139+
createdAt: dbBounty.createdAt,
140+
network: dbBounty.network.name,
141+
link: `${dbBounty.network.name}/task/${dbBounty.id}`
142+
},
143+
proposal: {
144+
id: dbProposal.id,
145+
link: `${dbBounty.network.name}/task/${dbBounty.id}/proposal/${dbProposal.id}`,
146+
},
147+
deliverable: {
148+
title: deliverable.title,
149+
id: deliverable.id,
150+
link: `${dbBounty.network.name}/task/${dbBounty.id}/deliverable/${dbProposal.id}`
151+
},
152+
}
153+
}
154+
155+
Push.events([AnalyticsEvent, NotificationEvent]);
123156

124157
return eventsProcessed;
125158
}

‎src/actions/get-bounty-created-event.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,10 @@ export async function action(block: DecodedLog<BountyCreatedEvent['returnValues'
186186
address: dbBounty.user?.address,
187187
username: dbBounty.user?.handle,
188188
},
189-
notification: {
189+
task: {
190+
title: dbBounty.title,
190191
id: dbBounty.id,
191-
title: `Task #${dbBounty.id} has been created on ${dbBounty.network.name}`,
192+
createdAt: dbBounty.createdAt,
192193
network: dbBounty.network.name,
193194
link: `${dbBounty.network.name}/task/${dbBounty.id}`
194195
}

‎src/actions/get-proposal-created-event.ts‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,19 @@ export async function action(block: DecodedLog<BountyProposalCreatedEvent['retur
113113
address: createProposal.creator,
114114
username: createProposal.handle,
115115
},
116-
notification: {
117-
id: createProposal.id,
118-
title: `Proposal #${createProposal.id} has been created on task #${dbBounty.id}`,
116+
task: {
117+
id: dbDeliverable.bountyId,
118+
title: dbBounty.title,
119119
network: dbBounty.network.name,
120-
link: `${dbBounty.network.name}/task/${dbBounty.id}/proposal/${createProposal.id}`
120+
},
121+
deliverable: {
122+
title: dbDeliverable.title,
123+
id: dbDeliverable.id,
124+
updatedAt: dbDeliverable.updatedAt
125+
},
126+
proposal: {
127+
id: createProposal.id,
128+
link: `${dbBounty.network.name}/task/${dbBounty.id}/proposal/${createProposal.id}`,
121129
}
122130
}
123131
}

‎src/actions/get-pullrequest-created-event.ts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,15 @@ export async function action(block: DecodedLog<BountyPullRequestCreatedEvent['re
9191
id: dbDeliverable.user.id,
9292
username: dbDeliverable.user.handle,
9393
},
94-
notification: {
95-
id: dbDeliverable.id,
96-
title: `Deliverable #${dbDeliverable.id} has been created on task #${dbBounty.id}`,
94+
task: {
95+
id: dbDeliverable.bountyId,
96+
title: dbBounty.title,
9797
network: dbBounty.network.name,
98+
},
99+
deliverable: {
100+
title: dbDeliverable.title,
101+
id: dbDeliverable.id,
102+
createdAt: dbDeliverable.createdAt,
98103
link: `${dbBounty.network.name}/task/${dbBounty.id}/deliverable/${dbDeliverable.id}`
99104
}
100105
}

‎src/actions/get-pullrequest-ready-for-review.ts‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,16 +97,20 @@ export async function action(block: DecodedLog<BountyPullRequestReadyForReviewEv
9797
const NotificationEvent = {
9898
name: AnalyticEventName.NOTIF_DELIVERABLE_READY,
9999
params: {
100-
targets: [...targets, owner.get()],
100+
targets: [...targets, owner],
101101
creator: {
102102
address: dbDeliverable.user.address,
103-
id: owner.id,
103+
id: dbDeliverable.user.id,
104104
username: dbDeliverable.user.handle,
105105
},
106-
notification: {
107-
id: dbDeliverable.id,
108-
title: `Deliverable #${dbDeliverable.id} on task #${dbBounty.id} is ready to be reviewed`,
106+
task: {
107+
id: dbDeliverable.bountyId,
108+
title: dbBounty.title,
109109
network: dbBounty.network.name,
110+
},
111+
deliverable: {
112+
title: dbDeliverable.title,
113+
id: dbDeliverable.id,
110114
link: `${dbBounty.network.name}/task/${dbBounty.id}/deliverable/${dbDeliverable.id}`
111115
}
112116
}

‎src/integrations/notifications/templates/notif-deliverable-created.hbs‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
{{> avatar}}
2-
3-
{{creator.username}}
4-
5-
{{task.title}}
6-
7-
{{task.id}}
8-
9-
{{deliverable.createdAt}}
10-
{{deliverable.title}}
11-
{{deliverable.id}}
12-
13-
created a deliverable
2+
<div id="link">{{deliverable.link}}</div>
3+
<div class="d-flex flex-column ms-3">
4+
<span class="xs-medium title text-white mb-3">
5+
Deliverable <a href="{{deliverable.link}}">#{{deliverable.id}}</a> created for task #{{task.id}}
6+
</span>
7+
{{#if task.title}}
8+
<span class="sm-regular mb-3 text-white-50">
9+
{{task.title}}
10+
</span>
11+
{{/if}}
12+
<div class="d-flex gap-2 text-white-50">
13+
<span class="sm-regular">{{task.network}}</span>
14+
<span>•</span>
15+
<span class="sm-regular">%DATE%</span>
16+
</div>
17+
</div>

‎src/integrations/notifications/templates/notif-deliverable-ready.hbs‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
{{> avatar}}
2-
3-
{{creator.username}}
4-
5-
{{task.title}}
6-
7-
{{task.id}}
8-
9-
{{deliverable.updatedAt}}
10-
{{deliverable.title}}
11-
{{deliverable.id}}
12-
13-
created a deliverable
2+
<div id="link">{{deliverable.link}}</div>
3+
<div class="d-flex flex-column ms-3">
4+
<span class="xs-medium title text-white mb-3">
5+
Deliverable <a href="{{deliverable.link}}">#{{deliverable.id}}</a> marked as ready for review
6+
</span>
7+
{{#if deliverable.title}}
8+
<span class="sm-regular mb-3 text-white-50">
9+
{{deliverable.title}}
10+
</span>
11+
{{/if}}
12+
<div class="d-flex gap-2 text-white-50">
13+
<span class="sm-regular">{{task.network}}</span>
14+
<span>•</span>
15+
<span class="sm-regular">%DATE%</span>
16+
</div>
17+
</div>

‎src/integrations/notifications/templates/notif-proposal-disputed.hbs‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
{{> avatar}}
2-
3-
{{creator.username}}
4-
5-
{{task.title}}
6-
{{task.id}}
7-
8-
{{deliverable.updatedAt}}
9-
{{deliverable.title}}
10-
{{deliverable.id}}
11-
12-
{{proposal.id}}
13-
{{proposal.distributions}}
14-
{{proposal.disputes}}
15-
16-
disputed
2+
<div id="link">{{proposal.link}}</div>
3+
<div class="d-flex flex-column ms-3">
4+
<span class="xs-medium title text-white mb-3">
5+
Proposal <a href="{{proposal.link}}">#{{proposal.id}}</a> was disputed with {{proposal.disputes}} votes
6+
</span>
7+
{{#if deliverable.title}}
8+
<span class="sm-regular mb-3 text-white-50">
9+
{{deliverable.title}}
10+
</span>
11+
{{/if}}
12+
<div class="d-flex gap-2 text-white-50">
13+
<span class="sm-regular">{{task.network}}</span>
14+
<span>•</span>
15+
<span class="sm-regular">%DATE%</span>
16+
</div>
17+
</div>

‎src/integrations/notifications/templates/notif-proposal-open.hbs‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
{{> avatar}}
2-
3-
{{creator.username}}
4-
5-
{{task.title}}
6-
{{task.id}}
7-
8-
{{deliverable.updatedAt}}
9-
{{deliverable.title}}
10-
{{deliverable.id}}
11-
12-
{{proposal.id}}
13-
{{proposal.distributions}}
14-
15-
created a deliverable
2+
<div id="link">{{proposal.link}}</div>
3+
<div class="d-flex flex-column ms-3">
4+
<span class="xs-medium title text-white mb-3">
5+
Proposal <a href="{{proposal.link}}">#{{proposal.id}}</a> created for deliverable #{{deliverable.id}}
6+
</span>
7+
{{#if deliverable.title}}
8+
<span class="sm-regular mb-3 text-white-50">
9+
{{deliverable.title}}
10+
</span>
11+
{{/if}}
12+
<div class="d-flex gap-2 text-white-50">
13+
<span class="sm-regular">{{task.network}}</span>
14+
<span>•</span>
15+
<span class="sm-regular">%DATE%</span>
16+
</div>
17+
</div>

‎src/integrations/notifications/templates/notif-task-closed.hbs‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{{> avatar}}
2+
<div id="link">{{task.link}}</div>
3+
<div class="d-flex flex-column ms-3">
4+
<span class="xs-medium title text-white mb-3">
5+
Task <a href="{{task.link}}">#{{task.id}}</a> closed
6+
</span>
7+
{{#if task.title}}
8+
<span class="sm-regular mb-3 text-white-50">
9+
{{task.title}}
10+
</span>
11+
{{/if}}
12+
<div class="d-flex gap-2 text-white-50">
13+
<span class="sm-regular">{{task.network}}</span>
14+
<span>•</span>
15+
<span class="sm-regular">%DATE%</span>
16+
</div>
17+
</div>

0 commit comments

Comments
 (0)