diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-07-02 19:20:34 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-07-02 19:20:34 +0900 |
| commit | 10677b57d444c45696bd99bb021ca5ddce1a511f (patch) | |
| tree | 3742130b0afd668231ccd75f5648ff3f11f64e21 /src | |
| parent | Fix #5073 (diff) | |
| download | sharkey-10677b57d444c45696bd99bb021ca5ddce1a511f.tar.gz sharkey-10677b57d444c45696bd99bb021ca5ddce1a511f.tar.bz2 sharkey-10677b57d444c45696bd99bb021ca5ddce1a511f.zip | |
Update dependencies :rocket:
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/app/desktop/views/components/crop-window.vue | 1 | ||||
| -rw-r--r-- | src/misc/detect-mine.ts | 2 | ||||
| -rw-r--r-- | src/server/web/feed.ts | 9 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/client/app/desktop/views/components/crop-window.vue b/src/client/app/desktop/views/components/crop-window.vue index 5d7e0e5e03..856f889b02 100644 --- a/src/client/app/desktop/views/components/crop-window.vue +++ b/src/client/app/desktop/views/components/crop-window.vue @@ -21,6 +21,7 @@ import Vue from 'vue'; import i18n from '../../../i18n'; import VueCropper from 'vue-cropperjs'; +import 'cropperjs/dist/cropper.css'; import * as url from '../../../../../prelude/url'; export default Vue.extend({ diff --git a/src/misc/detect-mine.ts b/src/misc/detect-mine.ts index 70d58ffe21..b228733697 100644 --- a/src/misc/detect-mine.ts +++ b/src/misc/detect-mine.ts @@ -1,5 +1,5 @@ import * as fs from 'fs'; -import fileType from 'file-type'; +import fileType = require('file-type'); import checkSvg from '../misc/check-svg'; export async function detectMine(path: string) { diff --git a/src/server/web/feed.ts b/src/server/web/feed.ts index 88a61af7cc..9c7591d744 100644 --- a/src/server/web/feed.ts +++ b/src/server/web/feed.ts @@ -6,7 +6,7 @@ import { In } from 'typeorm'; import { ensure } from '../../prelude/ensure'; export default async function(user: User) { - const author: Author = { + const author = { link: `${config.url}/@${user.username}`, name: user.name || user.username }; @@ -30,13 +30,14 @@ export default async function(user: User) { generator: 'Misskey', description: `${user.notesCount} Notes, ${user.followingCount} Following, ${user.followersCount} Followers${profile.description ? ` ยท ${profile.description}` : ''}`, link: author.link, - image: user.avatarUrl, + image: user.avatarUrl ? user.avatarUrl : undefined, feedLinks: { json: `${author.link}.json`, atom: `${author.link}.atom`, }, - author - } as FeedOptions); + author, + copyright: user.name || user.username + }); for (const note of notes) { const files = note.fileIds.length > 0 ? await DriveFiles.find({ |