diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2018-05-26 12:35:14 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-26 12:35:14 +0900 |
| commit | bc9487822529b260fbdc9a8dcca35c3da25db04e (patch) | |
| tree | d5fd0dffb95e03b95df8e98692305d75f855e645 /src/models | |
| parent | New translations ja.yml (Portuguese) (diff) | |
| parent | Merge pull request #1649 from l2dy/i18n (diff) | |
| download | misskey-bc9487822529b260fbdc9a8dcca35c3da25db04e.tar.gz misskey-bc9487822529b260fbdc9a8dcca35c3da25db04e.tar.bz2 misskey-bc9487822529b260fbdc9a8dcca35c3da25db04e.zip | |
Merge branch 'master' into l10n_master
Diffstat (limited to 'src/models')
| -rw-r--r-- | src/models/drive-file.ts | 5 | ||||
| -rw-r--r-- | src/models/note.ts | 4 | ||||
| -rw-r--r-- | src/models/user.ts | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/models/drive-file.ts b/src/models/drive-file.ts index 8a18567dc6..a3a567038e 100644 --- a/src/models/drive-file.ts +++ b/src/models/drive-file.ts @@ -32,7 +32,7 @@ export type IMetadata = { uri?: string; url?: string; deletedAt?: Date; - isExpired?: boolean; + isMetaOnly?: boolean; }; export type IDriveFile = { @@ -155,7 +155,8 @@ export const pack = ( _target = Object.assign(_target, _file.metadata); _target.src = _file.metadata.url; - _target.url = `${config.drive_url}/${_target.id}/${encodeURIComponent(_target.name)}`; + _target.url = _file.metadata.isMetaOnly ? _file.metadata.url : `${config.drive_url}/${_target.id}/${encodeURIComponent(_target.name)}`; + _target.isRemote = _file.metadata.isMetaOnly; if (_target.properties == null) _target.properties = {}; diff --git a/src/models/note.ts b/src/models/note.ts index 5070923363..1274901d45 100644 --- a/src/models/note.ts +++ b/src/models/note.ts @@ -324,6 +324,10 @@ export const pack = async ( // resolve promises in _note object _note = await rap(_note); + if (_note.user.isCat && _note.text) { + _note.text = _note.text.replace(/な/g, 'にゃ').replace(/ナ/g, 'ニャ'); + } + if (hide) { _note.mediaIds = []; _note.text = null; diff --git a/src/models/user.ts b/src/models/user.ts index 108111ceca..477bb232e4 100644 --- a/src/models/user.ts +++ b/src/models/user.ts @@ -77,6 +77,7 @@ export interface ILocalUser extends IUserBase { }; lastUsedAt: Date; isBot: boolean; + isCat: boolean; isPro: boolean; twoFactorSecret: string; twoFactorEnabled: boolean; |