diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2019-02-05 03:01:36 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-02-05 03:01:36 +0900 |
| commit | f014b7ae0ece886ef0cff2366b9925e23b34ba6f (patch) | |
| tree | c35760467278da408348fcd459415af7a63e08e9 /src/models/user.ts | |
| parent | Refactor: Better type definition (diff) | |
| download | misskey-f014b7ae0ece886ef0cff2366b9925e23b34ba6f.tar.gz misskey-f014b7ae0ece886ef0cff2366b9925e23b34ba6f.tar.bz2 misskey-f014b7ae0ece886ef0cff2366b9925e23b34ba6f.zip | |
アニメーションを自動再生しないオプション (#4131)
* Refactor
* settings
* Media Proxy
* Replace API response
Diffstat (limited to 'src/models/user.ts')
| -rw-r--r-- | src/models/user.ts | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/models/user.ts b/src/models/user.ts index 2453a2ed15..cba1d98c46 100644 --- a/src/models/user.ts +++ b/src/models/user.ts @@ -12,6 +12,7 @@ import config from '../config'; import FollowRequest from './follow-request'; import fetchMeta from '../misc/fetch-meta'; import Emoji from './emoji'; +import wrapUrl from '../misc/wrap-url'; const User = db.get<IUser>('users'); @@ -344,6 +345,8 @@ export const pack = ( if (_user.avatarUrl == null) { _user.avatarUrl = `${config.drive_url}/default-avatar.jpg`; + } else { + _user.avatarUrl = wrapUrl(_user.avatarUrl, me); } if (!meId || !meId.equals(_user.id) || !opts.detail) { @@ -368,7 +371,7 @@ export const pack = ( if (opts.detail) { if (_user.pinnedNoteIds) { // Populate pinned notes - _user.pinnedNotes = packNoteMany(_user.pinnedNoteIds, meId, { + _user.pinnedNotes = packNoteMany(_user.pinnedNoteIds, me, { detail: true }); } @@ -397,11 +400,14 @@ export const pack = ( // カスタム絵文字添付 if (_user.emojis) { - _user.emojis = Emoji.find({ + _user.emojis = (await Emoji.find({ name: { $in: _user.emojis }, host: _user.host }, { fields: { _id: false } + })).map(emoji => { + emoji.url = wrapUrl(emoji.url, me); + return emoji; }); } |