mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2024-11-01 23:55:58 +09:00
Code

mark as read all -> mark all as read

Browse Source 
Close #855
This commit is contained in:
Aya Morisawa 2018-07-20 14:16:02 +09:00
parent a8cf67198f
commit 5d09b7e38b
6 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/app/mobile/views/pages/notifications.vue
View File

@ -24,7 +24,7 @@ export default Vue.extend({
const ok = window.confirm('%i18n:@read-all%'); const ok = window.confirm('%i18n:@read-all%');
if (!ok) return; if (!ok) return;
(this as any).api('notifications/mark_as_read_all'); (this as any).api('notifications/mark_all_as_read');
}, },
onFetched() { onFetched() {
Progress.done(); Progress.done();

2
src/server/api/common/read-messaging-message.ts
View File

@ -7,7 +7,7 @@ import { publishMessagingIndexStream } from '../../../stream';
import User from '../../../models/user'; import User from '../../../models/user';
/** /**
* Mark as read message(s) * Mark messages as read
*/ */
export default ( export default (
user: string | mongo.ObjectID, user: string | mongo.ObjectID,

2
src/server/api/common/read-notification.ts
View File

@ -5,7 +5,7 @@ import Mute from '../../../models/mute';
import User from '../../../models/user'; import User from '../../../models/user';
/** /**
* Mark as read notification(s) * Mark notifications as read
*/ */
export default ( export default (
user: string | mongo.ObjectID, user: string | mongo.ObjectID,

2
src/server/api/endpoints/i/notifications.ts
View File

@ -96,7 +96,7 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
// Serialize // Serialize
res(await Promise.all(notifications.map(notification => pack(notification)))); res(await Promise.all(notifications.map(notification => pack(notification))));
// Mark as read all // Mark all as read
if (notifications.length > 0 && markAsRead) { if (notifications.length > 0 && markAsRead) {
read(user._id, notifications); read(user._id, notifications);
} }

2
src/server/api/endpoints/messaging/messages.ts
View File

@ -96,7 +96,7 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
return; return;
} }
// Mark as read all // Mark all as read
if (markAsRead) { if (markAsRead) {
read(user._id, recipient._id, messages); read(user._id, recipient._id, messages);
} }

4
src/server/api/endpoints/notifications/mark_as_read_all.ts → src/server/api/endpoints/notifications/mark_all_as_read.ts
View File

@ -5,7 +5,7 @@ import User, { ILocalUser } from '../../../../models/user';
export const meta = { export const meta = {
desc: { desc: {
ja: '全ての通知を既読にします。', ja: '全ての通知を既読にします。',
en: 'Mark as read all notifications.' en: 'Mark all notifications as read.'
}, },
requireCredential: true, requireCredential: true,
@ -14,7 +14,7 @@ export const meta = {
}; };
/** /**
* Mark as read all notifications * Mark all notifications as read
*/ */
export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => { export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
// Update documents // Update documents