graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-12-23 22:03:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

Set empty array instead of null to mediaIds property of posts

Browse source
This commit is contained in:
Akihiko Odaki 2018-03-31 19:45:56 +09:00
parent 4e37ee541a
commit 8c41432907
10 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/client/app/desktop/views/components/post-detail.sub.vue
View file

@ -17,7 +17,7 @@
</header> </header>
<div class="body"> <div class="body">
<mk-post-html v-if="post.ast" :ast="post.ast" :i="os.i" :class="$style.text"/> <mk-post-html v-if="post.ast" :ast="post.ast" :i="os.i" :class="$style.text"/>
<div class="media" v-if="post.media"> <div class="media" v-if="post.media > 0">
<mk-media-list :media-list="post.media"/> <mk-media-list :media-list="post.media"/>
</div> </div>
</div> </div>

2
src/client/app/desktop/views/components/post-detail.vue
View file

@ -39,7 +39,7 @@
</header> </header>
<div class="body"> <div class="body">
<mk-post-html :class="$style.text" v-if="p.ast" :ast="p.ast" :i="os.i"/> <mk-post-html :class="$style.text" v-if="p.ast" :ast="p.ast" :i="os.i"/>
<div class="media" v-if="p.media"> <div class="media" v-if="p.media.length > 0">
<mk-media-list :media-list="p.media"/> <mk-media-list :media-list="p.media"/>
</div> </div>
<mk-poll v-if="p.poll" :post="p"/> <mk-poll v-if="p.poll" :post="p"/>

2
src/client/app/desktop/views/components/posts.post.vue
View file

@ -41,7 +41,7 @@
<mk-post-html v-if="p.ast" :ast="p.ast" :i="os.i" :class="$style.text"/> <mk-post-html v-if="p.ast" :ast="p.ast" :i="os.i" :class="$style.text"/>
<a class="rp" v-if="p.repost">RP:</a> <a class="rp" v-if="p.repost">RP:</a>
</div> </div>
<div class="media" v-if="p.media"> <div class="media" v-if="p.media.length > 0">
<mk-media-list :media-list="p.media"/> <mk-media-list :media-list="p.media"/>
</div> </div>
<mk-poll v-if="p.poll" :post="p" ref="pollViewer"/> <mk-poll v-if="p.poll" :post="p" ref="pollViewer"/>

2
src/client/app/desktop/views/components/sub-post-content.vue
View file

@ -5,7 +5,7 @@
<mk-post-html :ast="post.ast" :i="os.i"/> <mk-post-html :ast="post.ast" :i="os.i"/>
<a class="rp" v-if="post.repostId" :href="`/post:${post.repostId}`">RP: ...</a> <a class="rp" v-if="post.repostId" :href="`/post:${post.repostId}`">RP: ...</a>
</div> </div>
<details v-if="post.media"> <details v-if="post.media.length > 0">
<summary>({{ post.media.length }}つのメディア)</summary> <summary>({{ post.media.length }}つのメディア)</summary>
<mk-media-list :media-list="post.media"/> <mk-media-list :media-list="post.media"/>
</details> </details>

2
src/client/app/mobile/views/components/post-detail.vue
View file

@ -42,7 +42,7 @@
<div class="tags" v-if="p.tags && p.tags.length > 0"> <div class="tags" v-if="p.tags && p.tags.length > 0">
<router-link v-for="tag in p.tags" :key="tag" :to="`/search?q=#${tag}`">{{ tag }}</router-link> <router-link v-for="tag in p.tags" :key="tag" :to="`/search?q=#${tag}`">{{ tag }}</router-link>
</div> </div>
<div class="media" v-if="p.media"> <div class="media" v-if="p.media.length > 0">
<mk-media-list :media-list="p.media"/> <mk-media-list :media-list="p.media"/>
</div> </div>
<mk-poll v-if="p.poll" :post="p"/> <mk-poll v-if="p.poll" :post="p"/>

2
src/client/app/mobile/views/components/post.vue
View file

@ -40,7 +40,7 @@
<mk-post-html v-if="p.ast" :ast="p.ast" :i="os.i" :class="$style.text"/> <mk-post-html v-if="p.ast" :ast="p.ast" :i="os.i" :class="$style.text"/>
<a class="rp" v-if="p.repost != null">RP:</a> <a class="rp" v-if="p.repost != null">RP:</a>
</div> </div>
<div class="media" v-if="p.media"> <div class="media" v-if="p.media.length > 0">
<mk-media-list :media-list="p.media"/> <mk-media-list :media-list="p.media"/>
</div> </div>
<mk-poll v-if="p.poll" :post="p" ref="pollViewer"/> <mk-poll v-if="p.poll" :post="p" ref="pollViewer"/>

2
src/client/app/mobile/views/components/sub-post-content.vue
View file

@ -5,7 +5,7 @@
<mk-post-html v-if="post.ast" :ast="post.ast" :i="os.i"/> <mk-post-html v-if="post.ast" :ast="post.ast" :i="os.i"/>
<a class="rp" v-if="post.repostId">RP: ...</a> <a class="rp" v-if="post.repostId">RP: ...</a>
</div> </div>
<details v-if="post.media"> <details v-if="post.media.length > 0">
<summary>({{ post.media.length }}個のメディア)</summary> <summary>({{ post.media.length }}個のメディア)</summary>
<mk-media-list :media-list="post.media"/> <mk-media-list :media-list="post.media"/>
</details> </details>

4
src/client/docs/api/entities/post.yaml
View file

@ -33,8 +33,8 @@ props:
type: "id(DriveFile)[]" type: "id(DriveFile)[]"
optional: true optional: true
desc: desc:
ja: "添付されているメディアのID" ja: "添付されているメディアのID (なければレスポンスでは空配列)"
en: "The IDs of the attached media" en: "The IDs of the attached media (empty array for response if no media is attached)"
- name: "media" - name: "media"
type: "entity(DriveFile)[]" type: "entity(DriveFile)[]"
optional: true optional: true

2
src/server/api/endpoints/posts/create.ts
View file

@ -254,7 +254,7 @@ module.exports = (params, user: IUser, app) => new Promise(async (res, rej) => {
createdAt: new Date(), createdAt: new Date(),
channelId: channel ? channel._id : undefined, channelId: channel ? channel._id : undefined,
index: channel ? channel.index + 1 : undefined, index: channel ? channel.index + 1 : undefined,
mediaIds: files ? files.map(file => file._id) : undefined, mediaIds: files ? files.map(file => file._id) : [],
replyId: reply ? reply._id : undefined, replyId: reply ? reply._id : undefined,
repostId: repost ? repost._id : undefined, repostId: repost ? repost._id : undefined,
poll: poll, poll: poll,

1
tools/migration/nighthike/6.js Normal file
View file

@ -0,0 +1 @@
db.posts.update({ mediaIds: null }, { $set: { mediaIds: [] } }, false, true);