Skip to content

Commit a40d1c4

Browse files
committed
Minor adjustments to the discord message styles
1 parent 59a104c commit a40d1c4

File tree

2 files changed

+28
-14
lines changed

2 files changed

+28
-14
lines changed

backend/functions/src/schema/models/discordChannel/service.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,14 @@ export class DiscordChannelService extends PaginatedService {
221221
}
222222

223223
const submissions = await Submission.getAllSqlRecord({
224-
select: ["id", "event.name", "participants", "score", "externalLinks"],
224+
select: [
225+
"id",
226+
"event.name",
227+
"participants",
228+
"score",
229+
"externalLinks",
230+
"happenedOn",
231+
],
225232
where: [
226233
{
227234
field: "event.id",
@@ -299,7 +306,9 @@ export class DiscordChannelService extends PaginatedService {
299306
placeEmojisMap[currentPlace] ?? "(" + currentPlace + ")"
300307
} ${serializeTime(
301308
submissionObject.submission.score
302-
)} - ${submissionObject.characters.join(", ")} - [Proof](${
309+
)} - ${submissionObject.characters.join(", ")} - <t:${Math.floor(
310+
submissionObject.submission.happenedOn
311+
)}:D> - [Proof](${
303312
submissionObject.submission.externalLinks.find(
304313
(link) => !isVideoUrl(link)
305314
) ?? submissionObject.submission.externalLinks[0]

backend/functions/src/schema/models/submission/service.ts

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import {
3030
SubmissionCharacterParticipantLink,
3131
} from "../../services";
3232
import {
33-
formatUnixTimestamp,
3433
generateLeaderboardRoute,
3534
isVideoUrl,
3635
serializeTime,
@@ -1249,7 +1248,7 @@ export class SubmissionService extends PaginatedService {
12491248

12501249
if (secondPlaceScore) {
12511250
const secondPlaceSubmissions = await this.getAllSqlRecord({
1252-
select: ["id", "score"],
1251+
select: ["id", "score", "happenedOn"],
12531252
where: {
12541253
"event.id": submission["event.id"],
12551254
status: submissionStatusKenum.APPROVED.index,
@@ -1289,7 +1288,7 @@ export class SubmissionService extends PaginatedService {
12891288
if (soloPBUpdateLogPost.relevantChannelIds.size) {
12901289
if (soloPBUpdateLogPost.currentUserSecondPlaceSubmission) {
12911290
discordMessageContents.push({
1292-
content: `${formatUnixTimestamp(submission.happenedOn)}\n\n${
1291+
content: `<t:${Math.floor(submission.happenedOn)}:D>\n\n${
12931292
soloPBUpdateLogPost.relevantChannelIds.size
12941293
? [...soloPBUpdateLogPost.relevantChannelIds]
12951294
.map((channelId) => "<#" + channelId + ">")
@@ -1338,7 +1337,7 @@ export class SubmissionService extends PaginatedService {
13381337
: "";
13391338

13401339
discordMessageContents.push({
1341-
content: `${formatUnixTimestamp(submission.happenedOn)}\n\n${
1340+
content: `<t:${Math.floor(submission.happenedOn)}:D>\n\n${
13421341
soloPBUpdateLogPost.relevantChannelIds.size
13431342
? [...soloPBUpdateLogPost.relevantChannelIds]
13441343
.map((channelId) => "<#" + channelId + ">")
@@ -1373,7 +1372,7 @@ export class SubmissionService extends PaginatedService {
13731372
relevantErasUpdateLogPost.secondPlaceSubmissions.length > 0
13741373
) {
13751374
discordMessageContents.push({
1376-
content: `${formatUnixTimestamp(submission.happenedOn)}\n\n${
1375+
content: `<t:${Math.floor(submission.happenedOn)}:D>\n\n${
13771376
relevantErasUpdateLogPost.relevantChannelIds.size
13781377
? [...relevantErasUpdateLogPost.relevantChannelIds]
13791378
.map((channelId) => "<#" + channelId + ">")
@@ -1382,10 +1381,16 @@ export class SubmissionService extends PaginatedService {
13821381
}🔸 Replaced **${eventStr} WR - ${serializeTime(
13831382
relevantErasUpdateLogPost.secondPlaceSubmissions[0].submission.score
13841383
)}** by\n${relevantErasUpdateLogPost.secondPlaceSubmissions
1385-
.map(
1386-
(submissionObject) =>
1387-
`\`\`\`diff\n- ${submissionObject.characters.join(", ")}\`\`\``
1388-
)
1384+
.map((submissionObject) => {
1385+
const reignDays = Math.floor(
1386+
(submission.happenedOn -
1387+
submissionObject.submission.happenedOn) /
1388+
(24 * 60 * 60)
1389+
);
1390+
return `\`\`\`diff\n- ${submissionObject.characters.join(
1391+
", "
1392+
)} (${reignDays < 1 ? "<1" : reignDays} day reign)\`\`\``;
1393+
})
13891394
.join("\n")}\n🔸 with **${eventStr} WR - ${serializeTime(
13901395
submission.score
13911396
)}** by\n\`\`\`yaml\n+ ${relevantErasUpdateLogPost.currentSubmission.characters.join(
@@ -1398,7 +1403,7 @@ export class SubmissionService extends PaginatedService {
13981403
} else {
13991404
// if we end up here, relevantErasUpdateLogPost.isWR will always be either false or { isTie: true }
14001405
discordMessageContents.push({
1401-
content: `${formatUnixTimestamp(submission.happenedOn)}\n\n${
1406+
content: `<t:${Math.floor(submission.happenedOn)}:D>\n\n${
14021407
relevantErasUpdateLogPost.relevantChannelIds.size
14031408
? [...relevantErasUpdateLogPost.relevantChannelIds]
14041409
.map((channelId) => "<#" + channelId + ">")
@@ -1580,9 +1585,9 @@ export class SubmissionService extends PaginatedService {
15801585
);
15811586
}
15821587

1583-
return `Happened On: ${formatUnixTimestamp(
1588+
return `Happened On: <t:${Math.floor(
15841589
submission.happenedOn
1585-
)}\nEvent: ${generateEventText(
1590+
)}:D>\nEvent: ${generateEventText(
15861591
submission["event.name"],
15871592
submission.participants,
15881593
submission["event.maxParticipants"]

0 commit comments

Comments
 (0)