summaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2021-02-13 12:28:26 +0900
committersyuilo <syuilotan@yahoo.co.jp>2021-02-13 12:28:26 +0900
commitebadd7fd3f255af3dd5035afe1d0d75337fa39a4 (patch)
tree5a441d13c74092560b913b5eef4ff4252f128fd5 /src/server
parentMerge pull request #7187 from syuilo/dependabot/npm_and_yarn/typescript-4.1.5 (diff)
downloadsharkey-ebadd7fd3f255af3dd5035afe1d0d75337fa39a4.tar.gz
sharkey-ebadd7fd3f255af3dd5035afe1d0d75337fa39a4.tar.bz2
sharkey-ebadd7fd3f255af3dd5035afe1d0d75337fa39a4.zip
wip: email notification
Diffstat (limited to 'src/server')
-rw-r--r--src/server/api/endpoints/admin/send-email.ts2
-rw-r--r--src/server/api/endpoints/i/update-email.ts4
-rw-r--r--src/server/api/endpoints/i/update.ts7
3 files changed, 10 insertions, 3 deletions
diff --git a/src/server/api/endpoints/admin/send-email.ts b/src/server/api/endpoints/admin/send-email.ts
index 9af931ad99..c0e77e1621 100644
--- a/src/server/api/endpoints/admin/send-email.ts
+++ b/src/server/api/endpoints/admin/send-email.ts
@@ -22,5 +22,5 @@ export const meta = {
};
export default define(meta, async (ps) => {
- await sendEmail(ps.to, ps.subject, ps.text);
+ await sendEmail(ps.to, ps.subject, ps.text, ps.text);
});
diff --git a/src/server/api/endpoints/i/update-email.ts b/src/server/api/endpoints/i/update-email.ts
index 20d9703320..d3d7bace75 100644
--- a/src/server/api/endpoints/i/update-email.ts
+++ b/src/server/api/endpoints/i/update-email.ts
@@ -72,7 +72,9 @@ export default define(meta, async (ps, user) => {
const link = `${config.url}/verify-email/${code}`;
- sendEmail(ps.email, 'Email verification', `To verify email, please click this link: ${link}`);
+ sendEmail(ps.email, 'Email verification',
+ `To verify email, please click this link:<br><a href="${link}">${link}</a>`,
+ `To verify email, please click this link: ${link}`);
}
return iObj;
diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts
index e4c0e8cec9..bf1796924a 100644
--- a/src/server/api/endpoints/i/update.ts
+++ b/src/server/api/endpoints/i/update.ts
@@ -161,6 +161,10 @@ export const meta = {
mutingNotificationTypes: {
validator: $.optional.arr($.str.or(notificationTypes as unknown as string[]))
},
+
+ emailNotificationTypes: {
+ validator: $.optional.arr($.str)
+ },
},
errors: {
@@ -206,7 +210,7 @@ export default define(meta, async (ps, user, token) => {
if (ps.name !== undefined) updates.name = ps.name;
if (ps.description !== undefined) profileUpdates.description = ps.description;
- //if (ps.lang !== undefined) updates.lang = ps.lang;
+ if (ps.lang !== undefined) profileUpdates.lang = ps.lang;
if (ps.location !== undefined) profileUpdates.location = ps.location;
if (ps.birthday !== undefined) profileUpdates.birthday = ps.birthday;
if (ps.avatarId !== undefined) updates.avatarId = ps.avatarId;
@@ -226,6 +230,7 @@ export default define(meta, async (ps, user, token) => {
if (typeof ps.injectFeaturedNote === 'boolean') profileUpdates.injectFeaturedNote = ps.injectFeaturedNote;
if (typeof ps.receiveAnnouncementEmail === 'boolean') profileUpdates.receiveAnnouncementEmail = ps.receiveAnnouncementEmail;
if (typeof ps.alwaysMarkNsfw === 'boolean') profileUpdates.alwaysMarkNsfw = ps.alwaysMarkNsfw;
+ if (ps.emailNotificationTypes !== undefined) profileUpdates.emailNotificationTypes = ps.emailNotificationTypes;
if (ps.avatarId) {
const avatar = await DriveFiles.findOne(ps.avatarId);