diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2018-08-30 03:56:51 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-30 03:56:51 +0900 |
| commit | 4e11da98d90c1c44fce1abaf63c248896feff03a (patch) | |
| tree | cbe91363f87a3cc29b142433c16e4b16ccf2aa7d /src/server/api/endpoints/i | |
| parent | New translations ja-JP.yml (French) (diff) | |
| parent | :art: (diff) | |
| download | misskey-4e11da98d90c1c44fce1abaf63c248896feff03a.tar.gz misskey-4e11da98d90c1c44fce1abaf63c248896feff03a.tar.bz2 misskey-4e11da98d90c1c44fce1abaf63c248896feff03a.zip | |
Merge branch 'develop' into l10n_develop
Diffstat (limited to 'src/server/api/endpoints/i')
| -rw-r--r-- | src/server/api/endpoints/i/favorites.ts | 4 | ||||
| -rw-r--r-- | src/server/api/endpoints/i/update.ts | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/server/api/endpoints/i/favorites.ts b/src/server/api/endpoints/i/favorites.ts index 47c8a87fd9..32c1a55fb0 100644 --- a/src/server/api/endpoints/i/favorites.ts +++ b/src/server/api/endpoints/i/favorites.ts @@ -4,8 +4,8 @@ import { ILocalUser } from '../../../../models/user'; export const meta = { desc: { - ja: 'お気に入りに登録した投稿一覧を取得します。', - en: 'Get favorited notes' + 'ja-JP': 'お気に入りに登録した投稿一覧を取得します。', + 'en-US': 'Get favorited notes' }, requireCredential: true, diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts index 922b396797..cdb4eb3f56 100644 --- a/src/server/api/endpoints/i/update.ts +++ b/src/server/api/endpoints/i/update.ts @@ -8,8 +8,8 @@ import config from '../../../../config'; export const meta = { desc: { - ja: 'アカウント情報を更新します。', - en: 'Update myself' + 'ja-JP': 'アカウント情報を更新します。', + 'en-US': 'Update myself' }, requireCredential: true, @@ -84,7 +84,7 @@ export default async (params: any, user: ILocalUser, app: IApp) => new Promise(a if (avatar == null) return rej('avatar not found'); - updates.avatarUrl = avatar.metadata.url || `${config.drive_url}/${avatar._id}`; + updates.avatarUrl = avatar.metadata.thumbnailUrl || avatar.metadata.url || `${config.drive_url}/${avatar._id}`; if (avatar.metadata.properties.avgColor) { updates.avatarColor = avatar.metadata.properties.avgColor; |