summaryrefslogtreecommitdiff
path: root/src/client/pages
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/client/pages
parentMerge pull request #7187 from syuilo/dependabot/npm_and_yarn/typescript-4.1.5 (diff)
downloadmisskey-ebadd7fd3f255af3dd5035afe1d0d75337fa39a4.tar.gz
misskey-ebadd7fd3f255af3dd5035afe1d0d75337fa39a4.tar.bz2
misskey-ebadd7fd3f255af3dd5035afe1d0d75337fa39a4.zip
wip: email notification
Diffstat (limited to 'src/client/pages')
-rw-r--r--src/client/pages/settings/email-notification.vue90
-rw-r--r--src/client/pages/settings/email.vue7
-rw-r--r--src/client/pages/settings/index.vue1
-rw-r--r--src/client/pages/settings/profile.vue46
4 files changed, 124 insertions, 20 deletions
diff --git a/src/client/pages/settings/email-notification.vue b/src/client/pages/settings/email-notification.vue
new file mode 100644
index 0000000000..de2cfd3912
--- /dev/null
+++ b/src/client/pages/settings/email-notification.vue
@@ -0,0 +1,90 @@
+<template>
+<FormBase>
+ <FormGroup>
+ <FormSwitch v-model:value="mention">
+ {{ $ts._notification._types.mention }}
+ </FormSwitch>
+ <FormSwitch v-model:value="reply">
+ {{ $ts._notification._types.reply }}
+ </FormSwitch>
+ <FormSwitch v-model:value="quote">
+ {{ $ts._notification._types.quote }}
+ </FormSwitch>
+ <FormSwitch v-model:value="follow">
+ {{ $ts._notification._types.follow }}
+ </FormSwitch>
+ <FormSwitch v-model:value="receiveFollowRequest">
+ {{ $ts._notification._types.receiveFollowRequest }}
+ </FormSwitch>
+ <FormSwitch v-model:value="groupInvited">
+ {{ $ts._notification._types.groupInvited }}
+ </FormSwitch>
+ </FormGroup>
+</FormBase>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { faCog } from '@fortawesome/free-solid-svg-icons';
+import { faBell, faEnvelope } from '@fortawesome/free-regular-svg-icons';
+import FormButton from '@/components/form/button.vue';
+import FormSwitch from '@/components/form/switch.vue';
+import FormBase from '@/components/form/base.vue';
+import FormGroup from '@/components/form/group.vue';
+import * as os from '@/os';
+
+export default defineComponent({
+ components: {
+ FormBase,
+ FormSwitch,
+ FormButton,
+ FormGroup,
+ },
+
+ emits: ['info'],
+
+ data() {
+ return {
+ INFO: {
+ title: this.$ts.emailNotification,
+ icon: faEnvelope
+ },
+
+ mention: this.$i.emailNotificationTypes.includes('mention'),
+ reply: this.$i.emailNotificationTypes.includes('reply'),
+ quote: this.$i.emailNotificationTypes.includes('quote'),
+ follow: this.$i.emailNotificationTypes.includes('follow'),
+ receiveFollowRequest: this.$i.emailNotificationTypes.includes('receiveFollowRequest'),
+ groupInvited: this.$i.emailNotificationTypes.includes('groupInvited'),
+ }
+ },
+
+ created() {
+ this.$watch('mention', this.save);
+ this.$watch('reply', this.save);
+ this.$watch('quote', this.save);
+ this.$watch('follow', this.save);
+ this.$watch('receiveFollowRequest', this.save);
+ this.$watch('groupInvited', this.save);
+ },
+
+ mounted() {
+ this.$emit('info', this.INFO);
+ },
+
+ methods: {
+ save() {
+ os.api('i/update', {
+ emailNotificationTypes: [
+ ...[this.mention ? 'mention' : null],
+ ...[this.reply ? 'reply' : null],
+ ...[this.quote ? 'quote' : null],
+ ...[this.follow ? 'follow' : null],
+ ...[this.receiveFollowRequest ? 'receiveFollowRequest' : null],
+ ...[this.groupInvited ? 'groupInvited' : null],
+ ].filter(x => x != null)
+ });
+ }
+ }
+});
+</script>
diff --git a/src/client/pages/settings/email.vue b/src/client/pages/settings/email.vue
index 5ccb79a41d..e334e23cbd 100644
--- a/src/client/pages/settings/email.vue
+++ b/src/client/pages/settings/email.vue
@@ -9,6 +9,11 @@
</FormLink>
</FormGroup>
+ <FormLink to="/settings/email/notification">
+ <template #icon><Fa :icon="faBell"/></template>
+ {{ $ts.emailNotification }}
+ </FormLink>
+
<FormSwitch :value="$i.receiveAnnouncementEmail" @update:value="onChangeReceiveAnnouncementEmail">
{{ $ts.receiveAnnouncementFromInstance }}
</FormSwitch>
@@ -43,7 +48,7 @@ export default defineComponent({
title: this.$ts.email,
icon: faEnvelope
},
- faCog, faExclamationTriangle, faCheck
+ faCog, faExclamationTriangle, faCheck, faBell
}
},
diff --git a/src/client/pages/settings/index.vue b/src/client/pages/settings/index.vue
index df53eb5133..54bf56930d 100644
--- a/src/client/pages/settings/index.vue
+++ b/src/client/pages/settings/index.vue
@@ -99,6 +99,7 @@ export default defineComponent({
case 'general': return defineAsyncComponent(() => import('./general.vue'));
case 'email': return defineAsyncComponent(() => import('./email.vue'));
case 'email/address': return defineAsyncComponent(() => import('./email-address.vue'));
+ case 'email/notification': return defineAsyncComponent(() => import('./email-notification.vue'));
case 'theme': return defineAsyncComponent(() => import('./theme.vue'));
case 'theme/install': return defineAsyncComponent(() => import('./theme.install.vue'));
case 'theme/manage': return defineAsyncComponent(() => import('./theme.manage.vue'));
diff --git a/src/client/pages/settings/profile.vue b/src/client/pages/settings/profile.vue
index 8c2c63e317..e9bffc3b00 100644
--- a/src/client/pages/settings/profile.vue
+++ b/src/client/pages/settings/profile.vue
@@ -8,25 +8,30 @@
<FormButton @click="changeBanner" primary>{{ $ts._profile.changeBanner }}</FormButton>
</FormGroup>
- <FormInput v-model:value="name" :max="30">
+ <FormInput v-model:value="name" :max="30" manual-save>
<span>{{ $ts._profile.name }}</span>
</FormInput>
- <FormTextarea v-model:value="description" :max="500">
+ <FormTextarea v-model:value="description" :max="500" tall manual-save>
<span>{{ $ts._profile.description }}</span>
<template #desc>{{ $ts._profile.youCanIncludeHashtags }}</template>
</FormTextarea>
- <FormInput v-model:value="location">
+ <FormInput v-model:value="location" manual-save>
<span>{{ $ts.location }}</span>
<template #prefix><Fa :icon="faMapMarkerAlt"/></template>
</FormInput>
- <FormInput v-model:value="birthday" type="date">
+ <FormInput v-model:value="birthday" type="date" manual-save>
<span>{{ $ts.birthday }}</span>
<template #prefix><Fa :icon="faBirthdayCake"/></template>
</FormInput>
+ <FormSelect v-model:value="lang">
+ <template #label>{{ $ts.language }}</template>
+ <option v-for="x in langs" :value="x[0]" :key="x[0]">{{ x[1] }}</option>
+ </FormSelect>
+
<FormGroup>
<FormButton @click="editMetadata" primary>{{ $ts._profile.metadataEdit }}</FormButton>
<template #caption>{{ $ts._profile.metadataDescription }}</template>
@@ -37,8 +42,6 @@
<FormSwitch v-model:value="isBot">{{ $ts.flagAsBot }}<template #desc>{{ $ts.flagAsBotDescription }}</template></FormSwitch>
<FormSwitch v-model:value="alwaysMarkNsfw">{{ $ts.alwaysMarkSensitive }}</FormSwitch>
-
- <FormButton @click="save(true)" primary><Fa :icon="faSave"/> {{ $ts.save }}</FormButton>
</FormBase>
</template>
@@ -50,10 +53,10 @@ import FormButton from '@/components/form/button.vue';
import FormInput from '@/components/form/input.vue';
import FormTextarea from '@/components/form/textarea.vue';
import FormSwitch from '@/components/form/switch.vue';
-import FormTuple from '@/components/form/tuple.vue';
+import FormSelect from '@/components/form/select.vue';
import FormBase from '@/components/form/base.vue';
import FormGroup from '@/components/form/group.vue';
-import { host } from '@/config';
+import { host, langs } from '@/config';
import { selectFile } from '@/scripts/select-file';
import * as os from '@/os';
@@ -63,7 +66,7 @@ export default defineComponent({
FormInput,
FormTextarea,
FormSwitch,
- FormTuple,
+ FormSelect,
FormBase,
FormGroup,
},
@@ -77,9 +80,11 @@ export default defineComponent({
icon: faUser
},
host,
+ langs,
name: null,
description: null,
birthday: null,
+ lang: null,
location: null,
fieldName0: null,
fieldValue0: null,
@@ -104,6 +109,7 @@ export default defineComponent({
this.description = this.$i.description;
this.location = this.$i.location;
this.birthday = this.$i.birthday;
+ this.lang = this.$i.lang;
this.avatarId = this.$i.avatarId;
this.bannerId = this.$i.bannerId;
this.isBot = this.$i.isBot;
@@ -118,6 +124,15 @@ export default defineComponent({
this.fieldValue2 = this.$i.fields[2] ? this.$i.fields[2].value : null;
this.fieldName3 = this.$i.fields[3] ? this.$i.fields[3].name : null;
this.fieldValue3 = this.$i.fields[3] ? this.$i.fields[3].value : null;
+
+ this.$watch('name', this.save);
+ this.$watch('description', this.save);
+ this.$watch('location', this.save);
+ this.$watch('birthday', this.save);
+ this.$watch('lang', this.save);
+ this.$watch('isBot', this.save);
+ this.$watch('isCat', this.save);
+ this.$watch('alwaysMarkNsfw', this.save);
},
mounted() {
@@ -214,14 +229,15 @@ export default defineComponent({
});
},
- save(notify) {
+ save() {
this.saving = true;
- os.api('i/update', {
+ os.apiWithDialog('i/update', {
name: this.name || null,
description: this.description || null,
location: this.location || null,
birthday: this.birthday || null,
+ lang: this.lang || null,
isBot: !!this.isBot,
isCat: !!this.isCat,
alwaysMarkNsfw: !!this.alwaysMarkNsfw,
@@ -231,16 +247,8 @@ export default defineComponent({
this.$i.avatarUrl = i.avatarUrl;
this.$i.bannerId = i.bannerId;
this.$i.bannerUrl = i.bannerUrl;
-
- if (notify) {
- os.success();
- }
}).catch(err => {
this.saving = false;
- os.dialog({
- type: 'error',
- text: err.id
- });
});
},
}