diff --git a/locales/ja.yml b/locales/ja.yml index 6f1a00309d..7e245d46a9 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -148,7 +148,7 @@ common/views/components/games/reversi/reversi.vue: playing: "進行中" matching: waiting-for: "{}を待っています" - cacnel: "キャンセル" + cancel: "キャンセル" common/views/components/games/reversi/reversi.room.vue: settings-of-the-game: "ゲームの設定" @@ -318,14 +318,9 @@ common/views/widgets/broadcast.vue: next: "次" common/views/widgets/calendar.vue: - year-english: "" - year-japanese: "年" - month-english: "" - month-japanese: "月" - day-english: "" - day-japanese: "日" - weekday-english: "" - weekday-japanese: "曜日" + year: "{}年" + month: "{}月" + day: "{}日" today: "今日:" this-month: "今月:" this-year: "今年:" @@ -872,20 +867,14 @@ desktop/views/pages/selectdrive.vue: desktop/views/pages/search.vue: not-available: "検索機能を利用することができません。" - not-found-quotes1: "「" - not-found-quotes2: "」" - not-found-text-english: "" - not-found-text-japanese: "に関する投稿は見つかりませんでした。" + not-found: "「{}」に関する投稿は見つかりませんでした。" desktop/views/pages/share.vue: share-with: "Misskeyで共有" close: "閉じる" desktop/views/pages/tag.vue: - no-posts-found-english: "" - no-posts-found-japanese: "に関する投稿は見つかりませんでした。" - left-quote: "「" - right-quote: "」" + no-posts-found: "ハッシュタグ「{}」が付けられた投稿は見つかりませんでした。" desktop/views/pages/user-list.users.vue: users: "ユーザー" @@ -1131,10 +1120,7 @@ mobile/views/pages/home.vue: global: "グローバル" mobile/views/pages/tag.vue: - no-posts-found-japanese: "に関する投稿は見つかりませんでした。" - no-posts-found-english: "" - left-quote: "「" - right-quote: "」" + no-posts-found: "ハッシュタグ「{}」が付けられた投稿は見つかりませんでした。" mobile/views/pages/welcome.vue: signup: "新規登録" diff --git a/package.json b/package.json index cdc070ca71..1d182a9339 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "misskey", "author": "syuilo ", - "version": "5.9.0", - "clientVersion": "1.0.7726", + "version": "5.10.0", + "clientVersion": "1.0.7828", "codename": "nighthike", "main": "./built/index.js", "private": true, diff --git a/src/client/app/common/views/components/games/reversi/reversi.game.vue b/src/client/app/common/views/components/games/reversi/reversi.game.vue index 0c183b343e..de9c0395c7 100644 --- a/src/client/app/common/views/components/games/reversi/reversi.game.vue +++ b/src/client/app/common/views/components/games/reversi/reversi.game.vue @@ -1,14 +1,14 @@ diff --git a/src/client/app/mobile/views/pages/tag.vue b/src/client/app/mobile/views/pages/tag.vue index c94fcec7da..a545e2b839 100644 --- a/src/client/app/mobile/views/pages/tag.vue +++ b/src/client/app/mobile/views/pages/tag.vue @@ -3,7 +3,7 @@ %fa:hashtag%{{ $route.params.tag }}
-

%fa:search%%i18n:@no-posts-found-english%%i18n:@left-quote%{{ q }}%i18n:@right-quote%%i18n:@no-posts-found-japanese%

+

%fa:search% {{ '%i18n:no-posts-found%'.split('{}')[0] }}{{ q }}{{ '%i18n:no-posts-found%'.split('{}')[1] }}

diff --git a/src/misc/get-user-name.ts b/src/misc/get-user-name.ts index acd5e6626d..eab9f87ef0 100644 --- a/src/misc/get-user-name.ts +++ b/src/misc/get-user-name.ts @@ -1,5 +1,5 @@ import { IUser } from '../models/user'; export default function(user: IUser): string { - return user.name || '名無し'; + return user.name || user.username; } diff --git a/src/models/notification.ts b/src/models/notification.ts index 097e3e691f..835c89cd56 100644 --- a/src/models/notification.ts +++ b/src/models/notification.ts @@ -5,6 +5,7 @@ import { IUser, pack as packUser } from './user'; import { pack as packNote } from './note'; const Notification = db.get('notifications'); +Notification.createIndex('notifieeId'); export default Notification; export interface INotification { diff --git a/src/server/api/endpoints/i/notifications.ts b/src/server/api/endpoints/i/notifications.ts index b6865fba52..46242b9d9f 100644 --- a/src/server/api/endpoints/i/notifications.ts +++ b/src/server/api/endpoints/i/notifications.ts @@ -19,10 +19,6 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) = const [markAsRead = true, markAsReadErr] = $.bool.optional.get(params.markAsRead); if (markAsReadErr) return rej('invalid markAsRead param'); - // Get 'type' parameter - const [type, typeErr] = $.arr($.str).optional.unique().get(params.type); - if (typeErr) return rej('invalid type param'); - // Get 'limit' parameter const [limit = 10, limitErr] = $.num.optional.range(1, 100).get(params.limit); if (limitErr) return rej('invalid limit param'); @@ -41,8 +37,7 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) = } const mute = await Mute.find({ - muterId: user._id, - deletedAt: { $exists: false } + muterId: user._id }); const query = { @@ -69,12 +64,6 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) = }); } - if (type) { - query.type = { - $in: type - }; - } - if (sinceId) { sort._id = 1; query._id = { diff --git a/src/services/note/create.ts b/src/services/note/create.ts index 6e644ef1d3..20dfc78c04 100644 --- a/src/services/note/create.ts +++ b/src/services/note/create.ts @@ -164,14 +164,19 @@ export default async (user: IUser, data: Option, silent = false) => new Promise< } // 通知 - nm.push(data.reply.userId, 'reply'); + if (isLocalUser(data.reply._user)) { + nm.push(data.reply.userId, 'reply'); + } } // If it is renote if (data.renote) { - // Notify const type = data.text ? 'quote' : 'renote'; - nm.push(data.renote.userId, type); + + // Notify + if (isLocalUser(data.renote._user)) { + nm.push(data.renote.userId, type); + } // Fetch watchers nmRelatedPromises.push(notifyToWatchersOfRenotee(data.renote, user, nm, type)); @@ -181,15 +186,9 @@ export default async (user: IUser, data: Option, silent = false) => new Promise< watch(user._id, data.renote); } - // If it is quote renote - if (data.text) { - // Add mention - nm.push(data.renote.userId, 'quote'); - } else { - // Publish event - if (!user._id.equals(data.renote.userId)) { - publishUserStream(data.renote.userId, 'renote', noteObj); - } + // Publish event + if (!user._id.equals(data.renote.userId)) { + publishUserStream(data.renote.userId, 'renote', noteObj); } }