heartles
/
egirlskey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

#2620

This commit is contained in:
syuilo 2018-09-05 19:32:46 +09:00
parent db943df0c8
commit a1b82e9723
43 changed files with 167 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,7 +1,7 @@
{
"name": "misskey",
"author": "syuilo <i@syuilo.com>",
"version": "8.26.0",
"version": "9.0.0",
"clientVersion": "1.0.9358",
"codename": "nighthike",
"main": "./built/index.js",

53
src/client/app/common/scripts/parse-search-query.ts
View File

@ -1,53 +0,0 @@
export default function(qs: string) {
const q = {
text: ''
};
qs.split(' ').forEach(x => {
if (/^([a-z_]+?):(.+?)$/.test(x)) {
const [key, value] = x.split(':');
switch (key) {
case 'user':
q['includeUserUsernames'] = value.split(',');
break;
case 'exclude_user':
q['excludeUserUsernames'] = value.split(',');
break;
case 'follow':
q['following'] = value == 'null' ? null : value == 'true';
break;
case 'reply':
q['reply'] = value == 'null' ? null : value == 'true';
break;
case 'renote':
q['renote'] = value == 'null' ? null : value == 'true';
break;
case 'media':
q['media'] = value == 'null' ? null : value == 'true';
break;
case 'poll':
q['poll'] = value == 'null' ? null : value == 'true';
break;
case 'until':
case 'since':
// YYYY-MM-DD
if (/^[0-9]+\-[0-9]+\-[0-9]+$/) {
const [yyyy, mm, dd] = value.split('-');
q[`${key}_date`] = (new Date(parseInt(yyyy, 10), parseInt(mm, 10) - 1, parseInt(dd, 10))).getTime();
}
break;
default:
q[key] = value;
break;
}
} else {
q.text += x + ' ';
}
});
if (q.text) {
q.text = q.text.trim();
}
return q;
}

2
src/client/app/common/views/components/welcome-timeline.vue
View File

@ -63,7 +63,7 @@ export default Vue.extend({
local: true,
reply: false,
renote: false,
media: false,
file: false,
poll: false
}).then(notes => {
this.notes = notes;

6
src/client/app/desktop/views/components/note-detail.vue
View File

@ -42,8 +42,8 @@
<span v-if="p.deletedAt" style="opacity: 0.5">%i18n:@deleted%</span>
<misskey-flavored-markdown v-if="p.text" :text="p.text" :i="$store.state.i"/>
</div>
<div class="media" v-if="p.media.length > 0">
<mk-media-list :media-list="p.media" :raw="true"/>
<div class="files" v-if="p.files.length > 0">
<mk-media-list :media-list="p.files" :raw="true"/>
</div>
<mk-poll v-if="p.poll" :note="p"/>
<mk-url-preview v-for="url in urls" :url="url" :key="url" :detail="true"/>
@ -114,7 +114,7 @@ export default Vue.extend({
isRenote(): boolean {
return (this.note.renote &&
this.note.text == null &&
this.note.mediaIds.length == 0 &&
this.note.fileIds.length == 0 &&
this.note.poll == null);
},
p(): any {

6
src/client/app/desktop/views/components/notes.note.vue
View File

@ -28,8 +28,8 @@
<misskey-flavored-markdown v-if="p.text" :text="p.text" :i="$store.state.i" :class="$style.text"/>
<a class="rp" v-if="p.renote">RP:</a>
</div>
<div class="media" v-if="p.media.length > 0">
<mk-media-list :media-list="p.media"/>
<div class="files" v-if="p.files.length > 0">
<mk-media-list :media-list="p.files"/>
</div>
<mk-poll v-if="p.poll" :note="p" ref="pollViewer"/>
<a class="location" v-if="p.geo" :href="`https://maps.google.com/maps?q=${p.geo.coordinates[1]},${p.geo.coordinates[0]}`" target="_blank">%fa:map-marker-alt% 位置情報</a>
@ -110,7 +110,7 @@ export default Vue.extend({
isRenote(): boolean {
return (this.note.renote &&
this.note.text == null &&
this.note.mediaIds.length == 0 &&
this.note.fileIds.length == 0 &&
this.note.poll == null);
},

2
src/client/app/desktop/views/components/notes.vue
View File

@ -122,7 +122,7 @@ export default Vue.extend({
prepend(note, silent = false) {
//#region 弾く
const isMyNote = note.userId == this.$store.state.i.id;
const isPureRenote = note.renoteId != null && note.text == null && note.mediaIds.length == 0 && note.poll == null;
const isPureRenote = note.renoteId != null && note.text == null && note.fileIds.length == 0 && note.poll == null;
if (this.$store.state.settings.showMyRenotes === false) {
if (isMyNote && isPureRenote) {

10
src/client/app/desktop/views/components/post-form-window.vue
View File

@ -4,7 +4,7 @@
<span class="icon" v-if="geo">%fa:map-marker-alt%</span>
<span v-if="!reply">%i18n:@note%</span>
<span v-if="reply">%i18n:@reply%</span>
<span class="count" v-if="media.length != 0">{{ '%i18n:@attaches%'.replace('{}', media.length) }}</span>
<span class="count" v-if="files.length != 0">{{ '%i18n:@attaches%'.replace('{}', files.length) }}</span>
<span class="count" v-if="uploadings.length != 0">{{ '%i18n:@uploading-media%'.replace('{}', uploadings.length) }}<mk-ellipsis/></span>
</span>
@ -14,7 +14,7 @@
:reply="reply"
@posted="onPosted"
@change-uploadings="onChangeUploadings"
@change-attached-media="onChangeMedia"
@change-attached-files="onChangeFiles"
@geo-attached="onGeoAttached"
@geo-dettached="onGeoDettached"/>
</div>
@ -29,7 +29,7 @@ export default Vue.extend({
data() {
return {
uploadings: [],
media: [],
files: [],
geo: null
};
},
@ -42,8 +42,8 @@ export default Vue.extend({
onChangeUploadings(files) {
this.uploadings = files;
},
onChangeMedia(media) {
this.media = media;
onChangeFiles(files) {
this.files = files;
},
onGeoAttached(geo) {
this.geo = geo;

16
src/client/app/desktop/views/components/post-form.vue
View File

@ -20,7 +20,7 @@
@keydown="onKeydown" @paste="onPaste" :placeholder="placeholder"
v-autocomplete="'text'"
></textarea>
<div class="medias" :class="{ with: poll }" v-show="files.length != 0">
<div class="files" :class="{ with: poll }" v-show="files.length != 0">
<x-draggable :list="files" :options="{ animation: 150 }">
<div v-for="file in files" :key="file.id">
<div class="img" :style="{ backgroundImage: `url(${file.thumbnailUrl})` }" :title="file.name"></div>
@ -188,7 +188,7 @@ export default Vue.extend({
(this.$refs.poll as any).set(draft.data.poll);
});
}
this.$emit('change-attached-media', this.files);
this.$emit('change-attached-files', this.files);
}
}
@ -225,12 +225,12 @@ export default Vue.extend({
attachMedia(driveFile) {
this.files.push(driveFile);
this.$emit('change-attached-media', this.files);
this.$emit('change-attached-files', this.files);
},
detachMedia(id) {
this.files = this.files.filter(x => x.id != id);
this.$emit('change-attached-media', this.files);
this.$emit('change-attached-files', this.files);
},
onChangeFile() {
@ -249,7 +249,7 @@ export default Vue.extend({
this.text = '';
this.files = [];
this.poll = false;
this.$emit('change-attached-media', this.files);
this.$emit('change-attached-files', this.files);
},
onKeydown(e) {
@ -297,7 +297,7 @@ export default Vue.extend({
if (driveFile != null && driveFile != '') {
const file = JSON.parse(driveFile);
this.files.push(file);
this.$emit('change-attached-media', this.files);
this.$emit('change-attached-files', this.files);
e.preventDefault();
}
//#endregion
@ -354,7 +354,7 @@ export default Vue.extend({
(this as any).api('notes/create', {
text: this.text == '' ? undefined : this.text,
mediaIds: this.files.length > 0 ? this.files.map(f => f.id) : undefined,
fileIds: this.files.length > 0 ? this.files.map(f => f.id) : undefined,
replyId: this.reply ? this.reply.id : undefined,
renoteId: this.renote ? this.renote.id : undefined,
poll: this.poll ? (this.$refs.poll as any).get() : undefined,
@ -514,7 +514,7 @@ root(isDark)
margin-right 8px
white-space nowrap
> .medias
> .files
margin 0
padding 0
background isDark ? #181b23 : lighten($theme-color, 98%)

6
src/client/app/desktop/views/components/sub-note-content.vue
View File

@ -7,9 +7,9 @@
<misskey-flavored-markdown v-if="note.text" :text="note.text" :i="$store.state.i"/>
<a class="rp" v-if="note.renoteId" :href="`/notes/${note.renoteId}`">RP: ...</a>
</div>
<details v-if="note.media.length > 0">
<summary>({{ '%i18n:@media-count%'.replace('{}', note.media.length) }})</summary>
<mk-media-list :media-list="note.media"/>
<details v-if="note.files.length > 0">
<summary>({{ '%i18n:@media-count%'.replace('{}', note.files.length) }})</summary>
<mk-media-list :media-list="note.files"/>
</details>
<details v-if="note.poll">
<summary>%i18n:@poll%</summary>

6
src/client/app/desktop/views/pages/deck/deck.list-tl.vue
View File

@ -68,7 +68,7 @@ export default Vue.extend({
(this as any).api('notes/user-list-timeline', {
listId: this.list.id,
limit: fetchLimit + 1,
mediaOnly: this.mediaOnly,
withFiles: this.mediaOnly,
includeMyRenotes: this.$store.state.settings.showMyRenotes,
includeRenotedMyNotes: this.$store.state.settings.showRenotedMyNotes,
includeLocalRenotes: this.$store.state.settings.showLocalRenotes
@ -90,7 +90,7 @@ export default Vue.extend({
listId: this.list.id,
limit: fetchLimit + 1,
untilId: (this.$refs.timeline as any).tail().id,
mediaOnly: this.mediaOnly,
withFiles: this.mediaOnly,
includeMyRenotes: this.$store.state.settings.showMyRenotes,
includeRenotedMyNotes: this.$store.state.settings.showRenotedMyNotes,
includeLocalRenotes: this.$store.state.settings.showLocalRenotes
@ -109,7 +109,7 @@ export default Vue.extend({
return promise;
},
onNote(note) {
if (this.mediaOnly && note.media.length == 0) return;
if (this.mediaOnly && note.files.length == 0) return;
// Prepend a note
(this.$refs.timeline as any).prepend(note);

16
src/client/app/desktop/views/pages/deck/deck.note.vue
View File

@ -28,8 +28,8 @@
<misskey-flavored-markdown v-if="p.text" :text="p.text" :i="$store.state.i"/>
<a class="rp" v-if="p.renote != null">RP:</a>
</div>
<div class="media" v-if="p.media.length > 0">
<mk-media-list :media-list="p.media"/>
<div class="files" v-if="p.files.length > 0">
<mk-media-list :media-list="p.files"/>
</div>
<mk-poll v-if="p.poll" :note="p" ref="pollViewer"/>
<a class="location" v-if="p.geo" :href="`https://maps.google.com/maps?q=${p.geo.coordinates[1]},${p.geo.coordinates[0]}`" target="_blank">%fa:map-marker-alt% %i18n:@location%</a>
@ -54,11 +54,11 @@
</article>
</div>
<div v-else class="srwrkujossgfuhrbnvqkybtzxpblgchi">
<div v-if="note.media.length > 0">
<mk-media-list :media-list="note.media"/>
<div v-if="note.files.length > 0">
<mk-media-list :media-list="note.files"/>
</div>
<div v-if="note.renote && note.renote.media.length > 0">
<mk-media-list :media-list="note.renote.media"/>
<div v-if="note.renote && note.renote.files.length > 0">
<mk-media-list :media-list="note.renote.files"/>
</div>
</div>
</template>
@ -100,7 +100,7 @@ export default Vue.extend({
isRenote(): boolean {
return (this.note.renote &&
this.note.text == null &&
this.note.mediaIds.length == 0 &&
this.note.fileIds.length == 0 &&
this.note.poll == null);
},
@ -371,7 +371,7 @@ root(isDark)
.mk-url-preview
margin-top 8px
> .media
> .files
> img
display block
max-width 100%

2
src/client/app/desktop/views/pages/deck/deck.notes.vue
View File

@ -127,7 +127,7 @@ export default Vue.extend({
prepend(note, silent = false) {
//#region 弾く
const isMyNote = note.userId == this.$store.state.i.id;
const isPureRenote = note.renoteId != null && note.text == null && note.mediaIds.length == 0 && note.poll == null;
const isPureRenote = note.renoteId != null && note.text == null && note.fileIds.length == 0 && note.poll == null;
if (this.$store.state.settings.showMyRenotes === false) {
if (isMyNote && isPureRenote) {

6
src/client/app/desktop/views/pages/deck/deck.tl.vue
View File

@ -96,7 +96,7 @@ export default Vue.extend({
(this.$refs.timeline as any).init(() => new Promise((res, rej) => {
(this as any).api(this.endpoint, {
limit: fetchLimit + 1,
mediaOnly: this.mediaOnly,
withFiles: this.mediaOnly,
includeMyRenotes: this.$store.state.settings.showMyRenotes,
includeRenotedMyNotes: this.$store.state.settings.showRenotedMyNotes,
includeLocalRenotes: this.$store.state.settings.showLocalRenotes
@ -117,7 +117,7 @@ export default Vue.extend({
const promise = (this as any).api(this.endpoint, {
limit: fetchLimit + 1,
mediaOnly: this.mediaOnly,
withFiles: this.mediaOnly,
untilId: (this.$refs.timeline as any).tail().id,
includeMyRenotes: this.$store.state.settings.showMyRenotes,
includeRenotedMyNotes: this.$store.state.settings.showRenotedMyNotes,
@ -138,7 +138,7 @@ export default Vue.extend({
},
onNote(note) {
if (this.mediaOnly && note.media.length == 0) return;
if (this.mediaOnly && note.files.length == 0) return;
// Prepend a note
(this.$refs.timeline as any).prepend(note);

6
src/client/app/desktop/views/pages/user/user.photos.vue
View File

@ -24,12 +24,12 @@ export default Vue.extend({
mounted() {
(this as any).api('users/notes', {
userId: this.user.id,
withMedia: true,
withFiles: true,
limit: 9
}).then(notes => {
notes.forEach(note => {
note.media.forEach(media => {
if (this.images.length < 9) this.images.push(media);
note.files.forEach(file => {
if (this.images.length < 9) this.images.push(file);
});
});
this.fetching = false;

4
src/client/app/desktop/views/pages/user/user.timeline.vue
View File

@ -66,7 +66,7 @@ export default Vue.extend({
limit: fetchLimit + 1,
untilDate: this.date ? this.date.getTime() : undefined,
includeReplies: this.mode == 'with-replies',
withMedia: this.mode == 'with-media'
withFiles: this.mode == 'with-media'
}).then(notes => {
if (notes.length == fetchLimit + 1) {
notes.pop();
@ -86,7 +86,7 @@ export default Vue.extend({
userId: this.user.id,
limit: fetchLimit + 1,
includeReplies: this.mode == 'with-replies',
withMedia: this.mode == 'with-media',
withFiles: this.mode == 'with-media',
untilId: (this.$refs.timeline as any).tail().id
});

2
src/client/app/desktop/views/widgets/trends.vue
View File

@ -49,7 +49,7 @@ export default define({
offset: this.offset,
renote: false,
reply: false,
media: false,
file: false,
poll: false
}).then(notes => {
const note = notes ? notes[0] : null;

8
src/client/app/mobile/views/components/note-detail.vue
View File

@ -40,8 +40,8 @@
<span v-if="p.deletedAt" style="opacity: 0.5">(%i18n:@deleted%)</span>
<misskey-flavored-markdown v-if="p.text" :text="p.text" :i="$store.state.i"/>
</div>
<div class="media" v-if="p.media.length > 0">
<mk-media-list :media-list="p.media" :raw="true"/>
<div class="files" v-if="p.files.length > 0">
<mk-media-list :media-list="p.files" :raw="true"/>
</div>
<mk-poll v-if="p.poll" :note="p"/>
<mk-url-preview v-for="url in urls" :url="url" :key="url" :detail="true"/>
@ -113,7 +113,7 @@ export default Vue.extend({
isRenote(): boolean {
return (this.note.renote &&
this.note.text == null &&
this.note.mediaIds.length == 0 &&
this.note.fileIds.length == 0 &&
this.note.poll == null);
},
@ -369,7 +369,7 @@ root(isDark)
> .mk-url-preview
margin-top 8px
> .media
> .files
> img
display block
max-width 100%

8
src/client/app/mobile/views/components/note.vue
View File

@ -28,8 +28,8 @@
<misskey-flavored-markdown v-if="p.text" :text="p.text" :i="$store.state.i" :class="$style.text"/>
<a class="rp" v-if="p.renote != null">RP:</a>
</div>
<div class="media" v-if="p.media.length > 0">
<mk-media-list :media-list="p.media"/>
<div class="files" v-if="p.files.length > 0">
<mk-media-list :media-list="p.files"/>
</div>
<mk-poll v-if="p.poll" :note="p" ref="pollViewer"/>
<mk-url-preview v-for="url in urls" :url="url" :key="url"/>
@ -90,7 +90,7 @@ export default Vue.extend({
isRenote(): boolean {
return (this.note.renote &&
this.note.text == null &&
this.note.mediaIds.length == 0 &&
this.note.fileIds.length == 0 &&
this.note.poll == null);
},
@ -414,7 +414,7 @@ root(isDark)
.mk-url-preview
margin-top 8px
> .media
> .files
> img
display block
max-width 100%

2
src/client/app/mobile/views/components/notes.vue
View File

@ -125,7 +125,7 @@ export default Vue.extend({
prepend(note, silent = false) {
//#region 弾く
const isMyNote = note.userId == this.$store.state.i.id;
const isPureRenote = note.renoteId != null && note.text == null && note.mediaIds.length == 0 && note.poll == null;
const isPureRenote = note.renoteId != null && note.text == null && note.fileIds.length == 0 && note.poll == null;
if (this.$store.state.settings.showMyRenotes === false) {
if (isMyNote && isPureRenote) {

8
src/client/app/mobile/views/components/post-form.vue
View File

@ -200,12 +200,12 @@ export default Vue.extend({
attachMedia(driveFile) {
this.files.push(driveFile);
this.$emit('change-attached-media', this.files);
this.$emit('change-attached-files', this.files);
},
detachMedia(file) {
this.files = this.files.filter(x => x.id != file.id);
this.$emit('change-attached-media', this.files);
this.$emit('change-attached-files', this.files);
},
onChangeFile() {
@ -269,7 +269,7 @@ export default Vue.extend({
this.text = '';
this.files = [];
this.poll = false;
this.$emit('change-attached-media');
this.$emit('change-attached-files');
},
post() {
@ -277,7 +277,7 @@ export default Vue.extend({
const viaMobile = this.$store.state.settings.disableViaMobile !== true;
(this as any).api('notes/create', {
text: this.text == '' ? undefined : this.text,
mediaIds: this.files.length > 0 ? this.files.map(f => f.id) : undefined,
fileIds: this.files.length > 0 ? this.files.map(f => f.id) : undefined,
replyId: this.reply ? this.reply.id : undefined,
renoteId: this.renote ? this.renote.id : undefined,
poll: this.poll ? (this.$refs.poll as any).get() : undefined,

6
src/client/app/mobile/views/components/sub-note-content.vue
View File

@ -7,9 +7,9 @@
<misskey-flavored-markdown v-if="note.text" :text="note.text" :i="$store.state.i"/>
<a class="rp" v-if="note.renoteId">RP: ...</a>
</div>
<details v-if="note.media.length > 0">
<summary>({{ '%i18n:@media-count%'.replace('{}', note.media.length) }})</summary>
<mk-media-list :media-list="note.media"/>
<details v-if="note.files.length > 0">
<summary>({{ '%i18n:@media-count%'.replace('{}', note.files.length) }})</summary>
<mk-media-list :media-list="note.files"/>
</details>
<details v-if="note.poll">
<summary>%i18n:@poll%</summary>

4
src/client/app/mobile/views/components/user-timeline.vue
View File

@ -41,7 +41,7 @@ export default Vue.extend({
(this.$refs.timeline as any).init(() => new Promise((res, rej) => {
(this as any).api('users/notes', {
userId: this.user.id,
withMedia: this.withMedia,
withFiles: this.withMedia,
limit: fetchLimit + 1
}).then(notes => {
if (notes.length == fetchLimit + 1) {
@ -62,7 +62,7 @@ export default Vue.extend({
const promise = (this as any).api('users/notes', {
userId: this.user.id,
withMedia: this.withMedia,
withFiles: this.withMedia,
limit: fetchLimit + 1,
untilId: (this.$refs.timeline as any).tail().id
});

2
src/client/app/mobile/views/pages/user/home.photos.vue
View File

@ -26,7 +26,7 @@ export default Vue.extend({
mounted() {
(this as any).api('users/notes', {
userId: this.user.id,
withMedia: true,
withFiles: true,
limit: 6
}).then(notes => {
notes.forEach(note => {

12
src/docs/api/entities/note.yaml
View File

@ -33,19 +33,19 @@ props:
ja-JP: "投稿の本文"
en-US: "The text of this note"
mediaIds:
fileIds:
type: "id(DriveFile)[]"
optional: true
desc:
ja-JP: "添付されているメディアのID (なければレスポンスでは空配列)"
en-US: "The IDs of the attached media (empty array for response if no media is attached)"
ja-JP: "添付されているファイルのID (なければレスポンスでは空配列)"
en-US: "The IDs of the attached files (empty array for response if no files is attached)"
media:
files:
type: "entity(DriveFile)[]"
optional: true
desc:
ja-JP: "添付されているメディア"
en-US: "The attached media"
ja-JP: "添付されているファイル"
en-US: "The attached files"
userId:
type: "id(User)"

6
src/misc/get-note-summary.ts
View File

@ -16,9 +16,9 @@ const summarize = (note: any): string => {
// 本文
summary += note.text ? note.text : '';
// メディアが添付されているとき
if (note.media.length != 0) {
summary += ` (${note.media.length}つのメディア)`;
// ファイルが添付されているとき
if (note.files.length != 0) {
summary += ` (${note.files.length}つのファイル)`;
}
// 投票が添付されているとき

2
src/misc/is-quote.ts
View File

@ -1,5 +1,5 @@
import { INote } from '../models/note';
export default function(note: INote): boolean {
return note.renoteId != null && (note.text != null || note.poll != null || (note.mediaIds != null && note.mediaIds.length > 0));
return note.renoteId != null && (note.text != null || note.poll != null || (note.fileIds != null && note.fileIds.length > 0));
}

2
src/models/drive-file.ts
View File

@ -92,7 +92,7 @@ export async function deleteDriveFile(driveFile: string | mongo.ObjectID | IDriv
// このDriveFileを添付しているNoteをすべて削除
await Promise.all((
await Note.find({ mediaIds: d._id })
await Note.find({ fileIds: d._id })
).map(x => deleteNote(x)));
// このDriveFileを添付しているMessagingMessageをすべて削除

26
src/models/note.ts
View File

@ -6,7 +6,7 @@ import { IUser, pack as packUser } from './user';
import { pack as packApp } from './app';
import PollVote, { deletePollVote } from './poll-vote';
import Reaction, { deleteNoteReaction } from './note-reaction';
import { pack as packFile } from './drive-file';
import { pack as packFile, IDriveFile } from './drive-file';
import NoteWatching, { deleteNoteWatching } from './note-watching';
import NoteReaction from './note-reaction';
import Favorite, { deleteFavorite } from './favorite';
@ -17,9 +17,20 @@ const Note = db.get<INote>('notes');
Note.createIndex('uri', { sparse: true, unique: true });
Note.createIndex('userId');
Note.createIndex('tagsLower');
Note.createIndex('_files.contentType');
Note.createIndex({
createdAt: -1
});
// 後方互換性のため
Note.update({}, {
$rename: {
mediaIds: 'fileIds'
}
}, {
multi: true
});
export default Note;
export function isValidText(text: string): boolean {
@ -34,7 +45,7 @@ export type INote = {
_id: mongo.ObjectID;
createdAt: Date;
deletedAt: Date;
mediaIds: mongo.ObjectID[];
fileIds: mongo.ObjectID[];
replyId: mongo.ObjectID;
renoteId: mongo.ObjectID;
poll: {
@ -92,6 +103,7 @@ export type INote = {
inbox?: string;
};
_replyIds?: mongo.ObjectID[];
_files?: IDriveFile[];
};
/**
@ -271,11 +283,15 @@ export const pack = async (
_note.app = packApp(_note.appId);
}
// Populate media
_note.media = hide ? [] : Promise.all(_note.mediaIds.map((fileId: mongo.ObjectID) =>
// Populate files
_note.files = hide ? [] : Promise.all(_note.fileIds.map((fileId: mongo.ObjectID) =>
packFile(fileId)
));
// 後方互換性のため
_note.mediaIds = _note.fileIds;
_note.media = _note.files;
// When requested a detailed note data
if (opts.detail) {
//#region 重いので廃止
@ -344,7 +360,7 @@ export const pack = async (
}
if (hide) {
_note.mediaIds = [];
_note.fileIds = [];
_note.text = null;
_note.poll = null;
_note.cw = null;

6
src/remote/activitypub/models/note.ts
View File

@ -78,11 +78,11 @@ export async function createNote(value: any, resolver?: Resolver, silent = false
}
//#endergion
// 添付メディア
// 添付ファイル
// TODO: attachmentは必ずしもImageではない
// TODO: attachmentは必ずしも配列ではない
// Noteがsensitiveなら添付もsensitiveにする
const media = note.attachment
const files = note.attachment
.map(attach => attach.sensitive = note.sensitive)
? await Promise.all(note.attachment.map(x => resolveImage(actor, x)))
: [];
@ -100,7 +100,7 @@ export async function createNote(value: any, resolver?: Resolver, silent = false
return await post(actor, {
createdAt: new Date(note.published),
media,
files: files,
reply,
renote: undefined,
cw: note.summary,

4
src/remote/activitypub/renderer/note.ts
View File

@ -8,8 +8,8 @@ import User from '../../../models/user';
import toHtml from '../misc/get-note-html';
export default async function renderNote(note: INote, dive = true): Promise<any> {
const promisedFiles: Promise<IDriveFile[]> = note.mediaIds
? DriveFile.find({ _id: { $in: note.mediaIds } })
const promisedFiles: Promise<IDriveFile[]> = note.fileIds
? DriveFile.find({ _id: { $in: note.fileIds } })
: Promise.resolve([]);
let inReplyTo;

2
src/server/activitypub/outbox.ts
View File

@ -58,7 +58,7 @@ export default async (ctx: Router.IRouterContext) => {
$or: [{
text: { $ne: null }
}, {
mediaIds: { $ne: [] }
fileIds: { $ne: [] }
}]
}]
} as any;

10
src/server/api/endpoints/notes.ts
View File

@ -20,9 +20,9 @@ export default (params: any) => new Promise(async (res, rej) => {
const [renote, renoteErr] = $.bool.optional.get(params.renote);
if (renoteErr) return rej('invalid renote param');
// Get 'media' parameter
const [media, mediaErr] = $.bool.optional.get(params.media);
if (mediaErr) return rej('invalid media param');
// Get 'files' parameter
const [files, filesErr] = $.bool.optional.get(params.files);
if (filesErr) return rej('invalid files param');
// Get 'poll' parameter
const [poll, pollErr] = $.bool.optional.get(params.poll);
@ -79,8 +79,8 @@ export default (params: any) => new Promise(async (res, rej) => {
query.renoteId = renote ? { $exists: true, $ne: null } : null;
}
if (media != undefined) {
query.mediaIds = media ? { $exists: true, $ne: null } : [];
if (files != undefined) {
query.fileIds = files ? { $exists: true, $ne: null } : [];
}
if (poll != undefined) {

23
src/server/api/endpoints/notes/create.ts
View File

@ -71,9 +71,15 @@ export const meta = {
ref: 'geo'
}),
fileIds: $.arr($.type(ID)).optional.unique().range(1, 4).note({
desc: {
'ja-JP': '添付するファイル'
}
}),
mediaIds: $.arr($.type(ID)).optional.unique().range(1, 4).note({
desc: {
'ja-JP': '添付するメディア'
'ja-JP': '添付するファイル (このパラメータは廃止予定です。代わりに fileIds を使ってください。)'
}
}),
@ -124,15 +130,16 @@ export default (params: any, user: ILocalUser, app: IApp) => new Promise(async (
}
let files: IDriveFile[] = [];
if (ps.mediaIds !== undefined) {
const fileIds = ps.fileIds != null ? ps.fileIds : ps.mediaIds != null ? ps.mediaIds : null;
if (fileIds != null) {
// Fetch files
// forEach だと途中でエラーなどがあっても return できないので
// 敢えて for を使っています。
for (const mediaId of ps.mediaIds) {
for (const fileId of fileIds) {
// Fetch file
// SELECT _id
const entity = await DriveFile.findOne({
_id: mediaId,
_id: fileId,
'metadata.userId': user._id
});
@ -155,7 +162,7 @@ export default (params: any, user: ILocalUser, app: IApp) => new Promise(async (
if (renote == null) {
return rej('renoteee is not found');
} else if (renote.renoteId && !renote.text && !renote.mediaIds) {
} else if (renote.renoteId && !renote.text && !renote.fileIds) {
return rej('cannot renote to renote');
}
}
@ -176,7 +183,7 @@ export default (params: any, user: ILocalUser, app: IApp) => new Promise(async (
}
// 返信対象が引用でないRenoteだったらエラー
if (reply.renoteId && !reply.text && !reply.mediaIds) {
if (reply.renoteId && !reply.text && !reply.fileIds) {
return rej('cannot reply to renote');
}
}
@ -191,13 +198,13 @@ export default (params: any, user: ILocalUser, app: IApp) => new Promise(async (
// テキストが無いかつ添付ファイルが無いかつRenoteも無いかつ投票も無かったらエラー
if ((ps.text === undefined || ps.text === null) && files === null && renote === null && ps.poll === undefined) {
return rej('text, mediaIds, renoteId or poll is required');
return rej('text, fileIds, renoteId or poll is required');
}
// 投稿を作成
const note = await create(user, {
createdAt: new Date(),
media: files,
files: files,
poll: ps.poll,
text: ps.text,
reply,

10
src/server/api/endpoints/notes/global-timeline.ts
View File

@ -33,9 +33,9 @@ export default async (params: any, user: ILocalUser) => {
throw 'only one of sinceId, untilId, sinceDate, untilDate can be specified';
}
// Get 'mediaOnly' parameter
const [mediaOnly, mediaOnlyErr] = $.bool.optional.get(params.mediaOnly);
if (mediaOnlyErr) throw 'invalid mediaOnly param';
// Get 'withFiles' parameter
const [withFiles, withFilesErr] = $.bool.optional.get(params.withFiles);
if (withFilesErr) throw 'invalid withFiles param';
// ミュートしているユーザーを取得
const mutedUserIds = user ? (await Mute.find({
@ -68,8 +68,8 @@ export default async (params: any, user: ILocalUser) => {
};
}
if (mediaOnly) {
query.mediaIds = { $exists: true, $ne: [] };
if (withFiles) {
query.fileIds = { $exists: true, $ne: [] };
}
if (sinceId) {

12
src/server/api/endpoints/notes/hybrid-timeline.ts
View File

@ -66,7 +66,7 @@ export const meta = {
}
}),
mediaOnly: $.bool.optional.note({
withFiles: $.bool.optional.note({
desc: {
'ja-JP': 'true にすると、メディアが添付された投稿だけ取得します'
}
@ -164,7 +164,7 @@ export default async (params: any, user: ILocalUser) => {
}, {
text: { $ne: null }
}, {
mediaIds: { $ne: [] }
fileIds: { $ne: [] }
}, {
poll: { $ne: null }
}]
@ -180,7 +180,7 @@ export default async (params: any, user: ILocalUser) => {
}, {
text: { $ne: null }
}, {
mediaIds: { $ne: [] }
fileIds: { $ne: [] }
}, {
poll: { $ne: null }
}]
@ -196,16 +196,16 @@ export default async (params: any, user: ILocalUser) => {
}, {
text: { $ne: null }
}, {
mediaIds: { $ne: [] }
fileIds: { $ne: [] }
}, {
poll: { $ne: null }
}]
});
}
if (ps.mediaOnly) {
if (ps.withFiles) {
query.$and.push({
mediaIds: { $exists: true, $ne: [] }
fileIds: { $exists: true, $ne: [] }
});
}

10
src/server/api/endpoints/notes/local-timeline.ts
View File

@ -33,9 +33,9 @@ export default async (params: any, user: ILocalUser) => {
throw 'only one of sinceId, untilId, sinceDate, untilDate can be specified';
}
// Get 'mediaOnly' parameter
const [mediaOnly, mediaOnlyErr] = $.bool.optional.get(params.mediaOnly);
if (mediaOnlyErr) throw 'invalid mediaOnly param';
// Get 'withFiles' parameter
const [withFiles, withFilesErr] = $.bool.optional.get(params.withFiles);
if (withFilesErr) throw 'invalid withFiles param';
// ミュートしているユーザーを取得
const mutedUserIds = user ? (await Mute.find({
@ -69,8 +69,8 @@ export default async (params: any, user: ILocalUser) => {
};
}
if (mediaOnly) {
query.mediaIds = { $exists: true, $ne: [] };
if (withFiles) {
query.fileIds = { $exists: true, $ne: [] };
}
if (sinceId) {

6
src/server/api/endpoints/notes/search_by_tag.ts
View File

@ -247,7 +247,7 @@ export default (params: any, me: ILocalUser) => new Promise(async (res, rej) =>
if (media != null) {
if (media) {
push({
mediaIds: {
fileIds: {
$exists: true,
$ne: null
}
@ -255,11 +255,11 @@ export default (params: any, me: ILocalUser) => new Promise(async (res, rej) =>
} else {
push({
$or: [{
mediaIds: {
fileIds: {
$exists: false
}
}, {
mediaIds: null
fileIds: null
}]
});
}

12
src/server/api/endpoints/notes/timeline.ts
View File

@ -67,7 +67,7 @@ export const meta = {
}
}),
mediaOnly: $.bool.optional.note({
withFiles: $.bool.optional.note({
desc: {
'ja-JP': 'true にすると、メディアが添付された投稿だけ取得します'
}
@ -154,7 +154,7 @@ export default async (params: any, user: ILocalUser) => {
}, {
text: { $ne: null }
}, {
mediaIds: { $ne: [] }
fileIds: { $ne: [] }
}, {
poll: { $ne: null }
}]
@ -170,7 +170,7 @@ export default async (params: any, user: ILocalUser) => {
}, {
text: { $ne: null }
}, {
mediaIds: { $ne: [] }
fileIds: { $ne: [] }
}, {
poll: { $ne: null }
}]
@ -186,16 +186,16 @@ export default async (params: any, user: ILocalUser) => {
}, {
text: { $ne: null }
}, {
mediaIds: { $ne: [] }
fileIds: { $ne: [] }
}, {
poll: { $ne: null }
}]
});
}
if (ps.mediaOnly) {
if (ps.withFiles) {
query.$and.push({
mediaIds: { $exists: true, $ne: [] }
fileIds: { $exists: true, $ne: [] }
});
}

2
src/server/api/endpoints/notes/trend.ts
View File

@ -52,7 +52,7 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
}
if (media != undefined) {
query.mediaIds = media ? { $exists: true, $ne: null } : null;
query.fileIds = media ? { $exists: true, $ne: null } : null;
}
if (poll != undefined) {

12
src/server/api/endpoints/notes/user-list-timeline.ts
View File

@ -73,7 +73,7 @@ export const meta = {
}
}),
mediaOnly: $.bool.optional.note({
withFiles: $.bool.optional.note({
desc: {
'ja-JP': 'true にすると、メディアが添付された投稿だけ取得します'
}
@ -160,7 +160,7 @@ export default async (params: any, user: ILocalUser) => {
}, {
text: { $ne: null }
}, {
mediaIds: { $ne: [] }
fileIds: { $ne: [] }
}, {
poll: { $ne: null }
}]
@ -176,7 +176,7 @@ export default async (params: any, user: ILocalUser) => {
}, {
text: { $ne: null }
}, {
mediaIds: { $ne: [] }
fileIds: { $ne: [] }
}, {
poll: { $ne: null }
}]
@ -192,16 +192,16 @@ export default async (params: any, user: ILocalUser) => {
}, {
text: { $ne: null }
}, {
mediaIds: { $ne: [] }
fileIds: { $ne: [] }
}, {
poll: { $ne: null }
}]
});
}
if (ps.mediaOnly) {
if (ps.withFiles) {
query.$and.push({
mediaIds: { $exists: true, $ne: [] }
fileIds: { $exists: true, $ne: [] }
});
}

10
src/server/api/endpoints/users/notes.ts
View File

@ -27,9 +27,9 @@ export default (params: any, me: ILocalUser) => new Promise(async (res, rej) =>
const [includeReplies = true, includeRepliesErr] = $.bool.optional.get(params.includeReplies);
if (includeRepliesErr) return rej('invalid includeReplies param');
// Get 'withMedia' parameter
const [withMedia = false, withMediaErr] = $.bool.optional.get(params.withMedia);
if (withMediaErr) return rej('invalid withMedia param');
// Get 'withFiles' parameter
const [withFiles = false, withFilesErr] = $.bool.optional.get(params.withFiles);
if (withFilesErr) return rej('invalid withFiles param');
// Get 'limit' parameter
const [limit = 10, limitErr] = $.num.optional.range(1, 100).get(params.limit);
@ -104,8 +104,8 @@ export default (params: any, me: ILocalUser) => new Promise(async (res, rej) =>
query.replyId = null;
}
if (withMedia) {
query.mediaIds = {
if (withFiles) {
query.fileIds = {
$exists: true,
$ne: []
};

11
src/services/note/create.ts
View File

@ -84,7 +84,7 @@ type Option = {
text?: string;
reply?: INote;
renote?: INote;
media?: IDriveFile[];
files?: IDriveFile[];
geo?: any;
poll?: any;
viaMobile?: boolean;
@ -135,7 +135,7 @@ export default async (user: IUser, data: Option, silent = false) => new Promise<
const mentionedUsers = await extractMentionedUsers(tokens);
const note = await insertNote(user, data, tokens, tags, mentionedUsers);
const note = await insertNote(user, data, tags, mentionedUsers);
res(note);
@ -309,10 +309,10 @@ async function publish(user: IUser, note: INote, noteObj: any, reply: INote, ren
publishToUserLists(note, noteObj);
}
async function insertNote(user: IUser, data: Option, tokens: ReturnType<typeof parse>, tags: string[], mentionedUsers: IUser[]) {
async function insertNote(user: IUser, data: Option, tags: string[], mentionedUsers: IUser[]) {
const insert: any = {
createdAt: data.createdAt,
mediaIds: data.media ? data.media.map(file => file._id) : [],
fileIds: data.files ? data.files.map(file => file._id) : [],
replyId: data.reply ? data.reply._id : null,
renoteId: data.renote ? data.renote._id : null,
text: data.text,
@ -347,7 +347,8 @@ async function insertNote(user: IUser, data: Option, tokens: ReturnType<typeof p
_user: {
host: user.host,
inbox: isRemoteUser(user) ? user.inbox : undefined
}
},
_files: data.files ? data.files : []
};
if (data.uri != null) insert.uri = data.uri;

2
src/services/note/delete.ts
View File

@ -23,7 +23,7 @@ export default async function(user: IUser, note: INote) {
deletedAt: new Date(),
text: null,
tags: [],
mediaIds: [],
fileIds: [],
poll: null,
geo: null
}