From f014b7ae0ece886ef0cff2366b9925e23b34ba6f Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Tue, 5 Feb 2019 03:01:36 +0900
Subject: アニメーションを自動再生しないオプション (#4131)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Refactor

* settings

* Media Proxy

* Replace API response
---
 src/models/user.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/models/user.ts')

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;
 		});
 	}
 
-- 
cgit v1.2.3-freya