Skip to content

Commit 519678b

Browse files
authored
Merge pull request #311 from yn1323/develop
release
2 parents f3c9855 + 27021df commit 519678b

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

convex/email/actions.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import { formatDateLabel, getDeadlineCutoff } from "../_lib/dateFormat";
77
import { getResendClient } from "../_lib/resend";
88
import { buildConfirmationEmailHtml, buildRecruitmentEmailHtml, buildReissueEmailHtml } from "./templates";
99

10-
const APP_URL = process.env.APP_URL ?? "https://yps.app";
10+
const APP_URL = process.env.APP_URL ?? "https://shiftori.app";
11+
const RESEND_FROM = process.env.RESEND_FROM_EMAIL ?? "noreply@shiftori.app";
1112

1213
/**
1314
* シフト確定メールを全スタッフに送信
@@ -32,7 +33,7 @@ export const sendShiftConfirmationEmails = internalAction({
3233
const reissueUrl = `${APP_URL}/shifts/reissue?recruitmentId=${recruitmentId}`;
3334

3435
await resend.emails.send({
35-
from: `${data.shopName} <onboarding@resend.dev>`,
36+
from: `${data.shopName} <${RESEND_FROM}>`,
3637
to: staffData.email,
3738
subject: isResend
3839
? `【シフト変更】【${data.shopName}${data.periodLabel} シフト変更のお知らせ`
@@ -70,11 +71,10 @@ export const sendReissueEmail = internalAction({
7071
});
7172

7273
const resend = getResendClient();
73-
const appUrl = process.env.APP_URL ?? "https://yps.app";
74-
const magicLinkUrl = `${appUrl}/shifts/view?token=${token}`;
74+
const magicLinkUrl = `${APP_URL}/shifts/view?token=${token}`;
7575

7676
await resend.emails.send({
77-
from: `${data.shopName} <onboarding@resend.dev>`,
77+
from: `${data.shopName} <${RESEND_FROM}>`,
7878
to: data.staffEmail,
7979
subject: `【${data.shopName}${data.periodLabel} シフト閲覧リンク`,
8080
html: buildReissueEmailHtml({
@@ -111,7 +111,7 @@ export const sendRecruitmentNotificationEmails = internalAction({
111111
const magicLinkUrl = `${APP_URL}/shifts/submit?token=${token}`;
112112

113113
await resend.emails.send({
114-
from: `${data.shopName} <onboarding@resend.dev>`,
114+
from: `${data.shopName} <${RESEND_FROM}>`,
115115
to: staff.email,
116116
subject: `【${data.shopName}${data.periodLabel} シフト希望の提出をお願いします`,
117117
html: buildRecruitmentEmailHtml({

doc/plans/2026-03-30_メール通知・マジックリンク設計.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666

6767
### 方式
6868
- 自前トークン付きURL(Clerk不使用)
69-
- URL形式: `https://yps.app/shifts/view?token={token}`
69+
- URL形式: `https://shiftori.app/shifts/view?token={token}`
7070

7171
### トークン
7272
- 有効期限: 24時間

0 commit comments

Comments
 (0)