アニメーション画像を無効にする際、サーバーサイドではなくクライアントサイドでURLを変更するように
This commit is contained in:
parent
f014b7ae0e
commit
861302f0fd
14 changed files with 40 additions and 56 deletions
|
|
@ -12,7 +12,6 @@ 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');
|
||||
|
||||
|
|
@ -345,8 +344,6 @@ 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) {
|
||||
|
|
@ -371,7 +368,7 @@ export const pack = (
|
|||
if (opts.detail) {
|
||||
if (_user.pinnedNoteIds) {
|
||||
// Populate pinned notes
|
||||
_user.pinnedNotes = packNoteMany(_user.pinnedNoteIds, me, {
|
||||
_user.pinnedNotes = packNoteMany(_user.pinnedNoteIds, meId, {
|
||||
detail: true
|
||||
});
|
||||
}
|
||||
|
|
@ -400,14 +397,11 @@ export const pack = (
|
|||
|
||||
// カスタム絵文字添付
|
||||
if (_user.emojis) {
|
||||
_user.emojis = (await Emoji.find({
|
||||
_user.emojis = Emoji.find({
|
||||
name: { $in: _user.emojis },
|
||||
host: _user.host
|
||||
}, {
|
||||
fields: { _id: false }
|
||||
})).map(emoji => {
|
||||
emoji.url = wrapUrl(emoji.url, me);
|
||||
return emoji;
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue