From 18771d4d734f2953ba69ea929f3de4ef77c79128 Mon Sep 17 00:00:00 2001
From: mei23 <m@m544.net>
Date: Thu, 2 May 2019 14:44:39 +0900
Subject: [PATCH] =?UTF-8?q?=E6=8B=A1=E5=BC=B5=E9=80=9A=E7=9F=A5=E6=A9=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/en-US.yml                             |  6 +++
 locales/ja-JP.yml                             |  7 +++
 .../common/scripts/compose-notification.ts    |  7 +++
 .../settings/extended-notification.vue        | 47 +++++++++++++++++++
 .../views/components/settings/settings.vue    |  6 +++
 .../common/views/deck/deck.notification.vue   | 23 ++++++++-
 .../views/components/notifications.vue        | 20 +++++++-
 .../app/desktop/views/components/settings.vue |  3 ++
 .../views/components/notification-preview.vue | 12 ++++-
 .../mobile/views/components/notification.vue  | 23 ++++++++-
 src/misc/get-notification-summary.ts          |  2 +
 src/models/notification.ts                    |  3 +-
 src/server/api/endpoints/i/notifications.ts   |  4 +-
 src/server/api/openapi/schemas.ts             |  2 +-
 src/services/note/create.ts                   | 36 ++++++++++++--
 15 files changed, 189 insertions(+), 12 deletions(-)
 create mode 100644 src/client/app/common/views/components/settings/extended-notification.vue

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 272710f3239b..a2fe510f6dd2 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -126,6 +126,7 @@ common:
     apps: "Apps"
     tags: "Hashtag"
     mute-and-block: "Mute / Block"
+    extended-notification: "Extra notification"
     blocking: "Block"
     security: "Security"
     signin: "Login History"
@@ -976,6 +977,11 @@ common/views/components/mute-and-block.vue:
   muted-words: "Muted keywords"
   muted-words-description: "Separating with spaces results in AND specifications, and delimiting with line breaks results in OR specifications"
   save: "Save"
+common/views/components/settings/extended-notification.vue:
+  extended-notification: "Extra notification"
+  highlighted-words: "Hightlighted words"
+  highlighted-words-description: "Enter the words you want to notify, one per line"
+  save: "Save"
 common/views/components/password-settings.vue:
   reset: "Change password"
   enter-current-password: "Enter the current password"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index fa8deec7d2c9..e1d65cca0ee1 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -136,6 +136,7 @@ common:
     apps: "アプリ"
     tags: "ハッシュタグ"
     mute-and-block: "ミュート/ブロック"
+    extended-notification: "拡張通知"
     blocking: "ブロック"
     security: "セキュリティ"
     signin: "ログイン履歴"
@@ -1079,6 +1080,12 @@ common/views/components/mute-and-block.vue:
   muted-words-description: "スペースで区切るとAND指定になり、改行で区切るとOR指定になります"
   save: "保存"
 
+common/views/components/settings/extended-notification.vue:
+  extended-notification: "拡張通知"
+  highlighted-words: "ハイライトワード"
+  highlighted-words-description: "通知したいワードを1行に1つずつ入力します"
+  save: "保存"
+
 common/views/components/password-settings.vue:
   reset: "パスワードを変更する"
   enter-current-password: "現在のパスワードを入力してください"
diff --git a/src/client/app/common/scripts/compose-notification.ts b/src/client/app/common/scripts/compose-notification.ts
index ec854f2f4d74..4843248853b1 100644
--- a/src/client/app/common/scripts/compose-notification.ts
+++ b/src/client/app/common/scripts/compose-notification.ts
@@ -64,6 +64,13 @@ export default function(type, data): Notification {
 						icon: data.user.avatarUrl
 					};
 
+				case 'highlight':
+					return {
+						title: `${getUserName(data.user)}:`,
+						body: getNoteSummary(data),
+						icon: data.user.avatarUrl
+					};
+
 				default:
 					return null;
 			}
diff --git a/src/client/app/common/views/components/settings/extended-notification.vue b/src/client/app/common/views/components/settings/extended-notification.vue
new file mode 100644
index 000000000000..71378cdf61d6
--- /dev/null
+++ b/src/client/app/common/views/components/settings/extended-notification.vue
@@ -0,0 +1,47 @@
+<template>
+<ui-card>
+	<template #title><fa :icon="faLightbulb"/> {{ $t('extended-notification') }}</template>
+
+	<section>
+		<header>{{ $t('highlighted-words') }}</header>
+		<ui-textarea v-model="highlightedWords">
+			{{ $t('highlighted-words') }}<template #desc>{{ $t('highlighted-words-description') }}</template>
+		</ui-textarea>
+		<ui-button @click="save">{{ $t('save') }}</ui-button>
+	</section>
+</ui-card>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+import i18n from '../../../../i18n';
+import { faLightbulb } from '@fortawesome/free-regular-svg-icons';
+
+export default Vue.extend({
+	i18n: i18n('common/views/components/settings/extended-notification.vue'),
+
+	data() {
+		return {
+			highlightedWords: '',
+			faLightbulb,
+		};
+	},
+
+	computed: {
+		_highlightedWords: {
+			get() { return this.$store.state.settings.highlightedWords; },
+			set(value) { this.$store.dispatch('settings/set', { key: 'highlightedWords', value }); }
+		},
+	},
+
+	mounted() {
+		this.highlightedWords = this._highlightedWords.join('\n');
+	},
+
+	methods: {
+		save() {
+			this._highlightedWords = this.highlightedWords.split('\n').filter((x: string) => x != '');
+		}
+	}
+});
+</script>
diff --git a/src/client/app/common/views/components/settings/settings.vue b/src/client/app/common/views/components/settings/settings.vue
index 21436f98157e..e191d57c0bd2 100644
--- a/src/client/app/common/views/components/settings/settings.vue
+++ b/src/client/app/common/views/components/settings/settings.vue
@@ -183,6 +183,10 @@
 		<x-mute-and-block/>
 	</template>
 
+	<template v-if="page == null || page == 'extendedNotification'">
+		<x-extended-notification/>
+	</template>
+
 	<!--
 	<template v-if="page == null || page == 'apps'">
 		<ui-card>
@@ -264,6 +268,7 @@ import XIntegration from './integration.vue';
 import XTheme from './theme.vue';
 import XDrive from './drive.vue';
 import XMuteAndBlock from './mute-and-block.vue';
+import XExtendedNotification from './extended-notification.vue';
 import XPassword from './password.vue';
 import XProfile from './profile.vue';
 import XApi from './api.vue';
@@ -284,6 +289,7 @@ export default Vue.extend({
 		XTheme,
 		XDrive,
 		XMuteAndBlock,
+		XExtendedNotification,
 		XPassword,
 		XProfile,
 		XApi,
diff --git a/src/client/app/common/views/deck/deck.notification.vue b/src/client/app/common/views/deck/deck.notification.vue
index 61b14bea0374..a3cca593ebc7 100644
--- a/src/client/app/common/views/deck/deck.notification.vue
+++ b/src/client/app/common/views/deck/deck.notification.vue
@@ -80,6 +80,22 @@
 		</div>
 	</div>
 
+	<div class="notification highlight" v-if="notification.type == 'highlight'">
+		<mk-avatar class="avatar" :user="notification.user"/>
+		<div>
+			<header>
+				<fa :icon="faLightbulb"/>
+				<router-link :to="notification.user | userPage">
+					<mk-user-name :user="notification.user"/>
+				</router-link>
+				<mk-time :time="notification.createdAt"/>
+			</header>
+			<router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note)">
+				<mfm :text="getNoteSummary(notification.note)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.emojis"/>
+			</router-link>
+		</div>
+	</div>
+
 	<template v-if="notification.type == 'quote'">
 		<mk-note :note="notification.note" @update:note="onNoteUpdated"/>
 	</template>
@@ -97,12 +113,14 @@
 <script lang="ts">
 import Vue from 'vue';
 import getNoteSummary from '../../../../../misc/get-note-summary';
+import { faLightbulb } from '@fortawesome/free-regular-svg-icons';
 
 export default Vue.extend({
 	props: ['notification'],
 	data() {
 		return {
-			getNoteSummary
+			getNoteSummary,
+			faLightbulb,
 		};
 	},
 	methods: {
@@ -186,4 +204,7 @@ export default Vue.extend({
 			> div > header [data-icon]
 				color #888
 
+		&.reply, &.mention, &.highlight
+			> div > header [data-icon]
+				color #555
 </style>
diff --git a/src/client/app/desktop/views/components/notifications.vue b/src/client/app/desktop/views/components/notifications.vue
index 5eaef6dff3c2..c451ff040619 100644
--- a/src/client/app/desktop/views/components/notifications.vue
+++ b/src/client/app/desktop/views/components/notifications.vue
@@ -123,6 +123,20 @@
 							</router-link>
 						</div>
 					</template>
+
+					<template v-if="notification.type == 'highlight'">
+						<mk-avatar class="avatar" :user="notification.note.user"/>
+						<div class="text">
+							<p><fa :icon="faLightbulb"/>
+								<router-link :to="notification.note.user | userPage" v-user-preview="notification.note.userId">
+									<mk-user-name :user="notification.note.user"/>
+								</router-link>
+							</p>
+							<a class="note-preview" :href="notification.note | notePage" :title="getNoteSummary(notification.note)">
+								<mfm :text="getNoteSummary(notification.note)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.emojis"/>
+							</a>
+						</div>
+					</template>
 				</div>
 
 				<p class="date" v-if="i != notifications.length - 1 && notification._date != _notifications[i + 1]._date" :key="notification.id + '-time'">
@@ -145,6 +159,7 @@ import i18n from '../../../i18n';
 import getNoteSummary from '../../../../../misc/get-note-summary';
 import getNotificationSummary from '../../../../../misc/get-notification-summary';
 import * as config from '../../../config';
+import { faLightbulb } from '@fortawesome/free-regular-svg-icons';
 
 export default Vue.extend({
 	i18n: i18n(),
@@ -155,7 +170,8 @@ export default Vue.extend({
 			notifications: [],
 			moreNotifications: false,
 			connection: null,
-			getNoteSummary
+			getNoteSummary,
+			faLightbulb,
 		};
 	},
 
@@ -334,7 +350,7 @@ export default Vue.extend({
 					.text p [data-icon]
 						color #888
 
-				&.reply, &.mention
+				&.reply, &.mention, &.highlight
 					.text p [data-icon]
 						color #555
 
diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue
index 76b4214553cb..6630cc51bc89 100644
--- a/src/client/app/desktop/views/components/settings.vue
+++ b/src/client/app/desktop/views/components/settings.vue
@@ -8,6 +8,7 @@
 		<p :class="{ active: page == 'drive' }" @mousedown="page = 'drive'"><fa icon="cloud" fixed-width/>{{ $t('@.drive') }}</p>
 		<p :class="{ active: page == 'hashtags' }" @mousedown="page = 'hashtags'"><fa icon="hashtag" fixed-width/>{{ $t('@._settings.tags') }}</p>
 		<p :class="{ active: page == 'muteAndBlock' }" @mousedown="page = 'muteAndBlock'"><fa icon="ban" fixed-width/>{{ $t('@._settings.mute-and-block') }}</p>
+		<p :class="{ active: page == 'extendedNotification' }" @mousedown="page = 'extendedNotification'"><fa :icon="faLightbulb" fixed-width/>{{ $t('@._settings.extended-notification') }}</p>
 		<p :class="{ active: page == 'apps' }" @mousedown="page = 'apps'"><fa icon="puzzle-piece" fixed-width/>{{ $t('@._settings.apps') }}</p>
 		<p :class="{ active: page == 'security' }" @mousedown="page = 'security'"><fa icon="unlock-alt" fixed-width/>{{ $t('@._settings.security') }}</p>
 		<p :class="{ active: page == 'api' }" @mousedown="page = 'api'"><fa icon="key" fixed-width/>API</p>
@@ -23,6 +24,7 @@
 import Vue from 'vue';
 import i18n from '../../../i18n';
 import XSettings from '../../../common/views/components/settings/settings.vue';
+import { faLightbulb } from '@fortawesome/free-regular-svg-icons';
 
 export default Vue.extend({
 	i18n: i18n(),
@@ -43,6 +45,7 @@ export default Vue.extend({
 	data() {
 		return {
 			page: this.initialPage || 'profile',
+			faLightbulb,
 		};
 	},
 });
diff --git a/src/client/app/mobile/views/components/notification-preview.vue b/src/client/app/mobile/views/components/notification-preview.vue
index 1b8eceaa6c04..f6fa5e724f3e 100644
--- a/src/client/app/mobile/views/components/notification-preview.vue
+++ b/src/client/app/mobile/views/components/notification-preview.vue
@@ -61,18 +61,28 @@
 			<p class="note-ref"><fa icon="quote-left"/>{{ getNoteSummary(notification.note) }}<fa icon="quote-right"/></p>
 		</div>
 	</template>
+
+	<template v-if="notification.type == 'highlight'">
+		<mk-avatar class="avatar" :user="notification.note.user"/>
+		<div class="text">
+			<p><fa :icon="faLightbulb"/><mk-user-name :user="notification.note.user"/></p>
+			<p class="note-preview">{{ getNoteSummary(notification.note) }}</p>
+		</div>
+	</template>
 </div>
 </template>
 
 <script lang="ts">
 import Vue from 'vue';
 import getNoteSummary from '../../../../../misc/get-note-summary';
+import { faLightbulb } from '@fortawesome/free-regular-svg-icons';
 
 export default Vue.extend({
 	props: ['notification'],
 	data() {
 		return {
-			getNoteSummary
+			getNoteSummary,
+			faLightbulb,
 		};
 	}
 });
diff --git a/src/client/app/mobile/views/components/notification.vue b/src/client/app/mobile/views/components/notification.vue
index b98556f0df22..881b8056b5df 100644
--- a/src/client/app/mobile/views/components/notification.vue
+++ b/src/client/app/mobile/views/components/notification.vue
@@ -70,6 +70,22 @@
 		</div>
 	</div>
 
+	<div class="notification highlight" v-if="notification.type == 'highlight'">
+		<mk-avatar class="avatar" :user="notification.user"/>
+		<div>
+			<header>
+				<fa :icon="faLightbulb"/>
+				<router-link :to="notification.user | userPage">
+					<mk-user-name :user="notification.user"/>
+				</router-link>
+				<mk-time :time="notification.createdAt"/>
+			</header>
+			<router-link class="note-ref" :to="notification.note | notePage" :title="getNoteSummary(notification.note)">
+				<mfm :text="getNoteSummary(notification.note)" :should-break="false" :plain-text="true" :custom-emojis="notification.note.emojis"/>
+			</router-link>
+		</div>
+	</div>
+
 	<template v-if="notification.type == 'quote'">
 		<mk-note :note="notification.note" @update:note="onNoteUpdated"/>
 	</template>
@@ -87,12 +103,14 @@
 <script lang="ts">
 import Vue from 'vue';
 import getNoteSummary from '../../../../../misc/get-note-summary';
+import { faLightbulb } from '@fortawesome/free-regular-svg-icons';
 
 export default Vue.extend({
 	props: ['notification'],
 	data() {
 		return {
-			getNoteSummary
+			getNoteSummary,
+			faLightbulb,
 		};
 	},
 	methods: {
@@ -176,4 +194,7 @@ export default Vue.extend({
 			> div > header [data-icon]
 				color #888
 
+		&.reply, &.mention, &.highlight
+			> div > header [data-icon]
+				color #555
 </style>
diff --git a/src/misc/get-notification-summary.ts b/src/misc/get-notification-summary.ts
index 50fd30f5c243..ac7a51186591 100644
--- a/src/misc/get-notification-summary.ts
+++ b/src/misc/get-notification-summary.ts
@@ -22,6 +22,8 @@ export default function(notification: any): string {
 			return `${getReactionEmoji(notification.reaction)} ${getUserName(notification.user)} ${getNoteSummary(notification.note)}`;
 		case 'poll_vote':
 			return `Vote ${getUserName(notification.user)} ${getNoteSummary(notification.note)}`;
+		case 'highlight':
+			return `Highlight ${getUserName(notification.user)} ${getNoteSummary(notification.note)}`;
 		default:
 			return `Unknown ${notification.type}`;
 	}
diff --git a/src/models/notification.ts b/src/models/notification.ts
index 75456af57b34..b3ac6477221d 100644
--- a/src/models/notification.ts
+++ b/src/models/notification.ts
@@ -44,7 +44,7 @@ export interface INotification {
 	 * reaction - (自分または自分がWatchしている)投稿にリアクションされた
 	 * poll_vote - (自分または自分がWatchしている)投稿の投票に投票された
 	 */
-	type: 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'poll_vote';
+	type: 'follow' | 'mention' | 'reply' | 'renote' | 'quote' | 'reaction' | 'poll_vote' | 'highlight';
 
 	/**
 	 * 通知が読まれたかどうか
@@ -102,6 +102,7 @@ export const pack = (notification: any) => new Promise<any>(async (resolve, reje
 		case 'quote':
 		case 'reaction':
 		case 'poll_vote':
+		case 'highlight':
 			// Populate note
 			_notification.note = await packNote(_notification.noteId, me);
 
diff --git a/src/server/api/endpoints/i/notifications.ts b/src/server/api/endpoints/i/notifications.ts
index d3e3064abd3a..fa3acb650bce 100644
--- a/src/server/api/endpoints/i/notifications.ts
+++ b/src/server/api/endpoints/i/notifications.ts
@@ -46,12 +46,12 @@ export const meta = {
 		},
 
 		includeTypes: {
-			validator: $.optional.arr($.str.or(['follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'poll_vote', 'receiveFollowRequest'])),
+			validator: $.optional.arr($.str.or(['follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'poll_vote', 'receiveFollowRequest', 'highlight'])),
 			default: [] as string[]
 		},
 
 		excludeTypes: {
-			validator: $.optional.arr($.str.or(['follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'poll_vote', 'receiveFollowRequest'])),
+			validator: $.optional.arr($.str.or(['follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'poll_vote', 'receiveFollowRequest', 'highlight'])),
 			default: [] as string[]
 		}
 	},
diff --git a/src/server/api/openapi/schemas.ts b/src/server/api/openapi/schemas.ts
index 70a0d6faf008..22ccf4cb06c6 100644
--- a/src/server/api/openapi/schemas.ts
+++ b/src/server/api/openapi/schemas.ts
@@ -221,7 +221,7 @@ export const schemas = {
 			},
 			type: {
 				type: 'string',
-				enum: ['follow', 'receiveFollowRequest', 'mention', 'reply', 'renote', 'quote', 'reaction', 'poll_vote'],
+				enum: ['follow', 'receiveFollowRequest', 'mention', 'reply', 'renote', 'quote', 'reaction', 'poll_vote', 'highlight'],
 				description: 'The type of the notification.'
 			},
 		},
diff --git a/src/services/note/create.ts b/src/services/note/create.ts
index e911a3e15acf..868fde8cc4cf 100644
--- a/src/services/note/create.ts
+++ b/src/services/note/create.ts
@@ -37,7 +37,7 @@ import extractEmojis from '../../misc/extract-emojis';
 import extractHashtags from '../../misc/extract-hashtags';
 import { genId } from '../../misc/gen-id';
 
-type NotificationType = 'reply' | 'renote' | 'quote' | 'mention';
+type NotificationType = 'reply' | 'renote' | 'quote' | 'mention' | 'highlight';
 
 class NotificationManager {
 	private notifier: IUser;
@@ -57,11 +57,11 @@ class NotificationManager {
 		// 自分自身へは通知しない
 		if (this.notifier._id.equals(notifiee)) return;
 
-		const exist = this.queue.find(x => x.target.equals(notifiee));
+		const exist = this.queue.find(x => x.target.equals(notifiee) && x.reason == 'mention');
 
 		if (exist) {
 			// 「メンションされているかつ返信されている」場合は、メンションとしての通知ではなく返信としての通知にする
-			if (reason != 'mention') {
+			if (reason == 'reply') {
 				exist.reason = reason;
 			}
 		} else {
@@ -313,6 +313,11 @@ export default async (user: IUser, data: Option, silent = false) => new Promise<
 		deliverNoteToMentionedRemoteUsers(mentionedUsers, user, noteActivity);
 	}
 
+	// Extended notification
+	if (note.visibility === 'public' || note.visibility === 'home') {
+		nmRelatedPromises.push(notifyExtended(note.text, nm));
+	}
+
 	// If has in reply to note
 	if (data.reply) {
 		// Fetch watchers
@@ -575,6 +580,31 @@ async function notifyToWatchersOfReplyee(reply: INote, user: IUser, nm: Notifica
 	}
 }
 
+async function notifyExtended(text: string, nm: NotificationManager) {
+	if (!text) return;
+
+	const us = await User.find({
+		host: null,
+		'clientSettings.highlightedWords': { $exists: true }
+	});
+
+	for (const u of us) {
+		if (!isLocalUser(u)) continue;
+
+		try {
+			const words: string[] = u.clientSettings.highlightedWords.filter((q: string) => q != null && q.length > 0);
+
+			const match = words.some(word => text.toLowerCase().includes(word.toLowerCase()));
+
+			if (match) {
+				nm.push(u._id, 'highlight');
+			}
+		} catch (e) {
+			console.error(e);
+		}
+	}
+}
+
 async function publishToUserLists(note: INote, noteObj: any) {
 	const lists = await UserList.find({
 		userIds: note.userId