mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-27 08:23:08 +02:00
Refactor: Use better english
This commit is contained in:
syuilo
parent
94b2ddef45
commit
712c0ef27d
4 changed files with 39 additions and 44 deletions
|
|
@ -2,16 +2,16 @@
|
|||
<div class="mk-note-detail" :title="title">
|
||||
<button
|
||||
class="read-more"
|
||||
v-if="p.reply && p.reply.replyId && context.length == 0"
|
||||
v-if="p.reply && p.reply.replyId && conversation.length == 0"
|
||||
title="%i18n:@more%"
|
||||
@click="fetchContext"
|
||||
:disabled="contextFetching"
|
||||
@click="fetchConversation"
|
||||
:disabled="conversationFetching"
|
||||
>
|
||||
<template v-if="!contextFetching">%fa:ellipsis-v%</template>
|
||||
<template v-if="contextFetching">%fa:spinner .pulse%</template>
|
||||
<template v-if="!conversationFetching">%fa:ellipsis-v%</template>
|
||||
<template v-if="conversationFetching">%fa:spinner .pulse%</template>
|
||||
</button>
|
||||
<div class="context">
|
||||
<x-sub v-for="note in context" :key="note.id" :note="note"/>
|
||||
<div class="conversation">
|
||||
<x-sub v-for="note in conversation" :key="note.id" :note="note"/>
|
||||
</div>
|
||||
<div class="reply-to" v-if="p.reply">
|
||||
<x-sub :note="p.reply"/>
|
||||
|
|
@ -107,8 +107,8 @@ export default Vue.extend({
|
|||
|
||||
data() {
|
||||
return {
|
||||
context: [],
|
||||
contextFetching: false,
|
||||
conversation: [],
|
||||
conversationFetching: false,
|
||||
replies: []
|
||||
};
|
||||
},
|
||||
|
|
@ -176,15 +176,15 @@ export default Vue.extend({
|
|||
},
|
||||
|
||||
methods: {
|
||||
fetchContext() {
|
||||
this.contextFetching = true;
|
||||
fetchConversation() {
|
||||
this.conversationFetching = true;
|
||||
|
||||
// Fetch context
|
||||
(this as any).api('notes/context', {
|
||||
// Fetch conversation
|
||||
(this as any).api('notes/conversation', {
|
||||
noteId: this.p.replyId
|
||||
}).then(context => {
|
||||
this.contextFetching = false;
|
||||
this.context = context.reverse();
|
||||
}).then(conversation => {
|
||||
this.conversationFetching = false;
|
||||
this.conversation = conversation.reverse();
|
||||
});
|
||||
},
|
||||
reply() {
|
||||
|
|
@ -249,7 +249,7 @@ root(isDark)
|
|||
&:disabled
|
||||
color isDark ? #21242b : #ccc
|
||||
|
||||
> .context
|
||||
> .conversation
|
||||
> *
|
||||
border-bottom 1px solid isDark ? #1c2023 : #eef0f2
|
||||
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
<div class="mk-note-detail">
|
||||
<button
|
||||
class="more"
|
||||
v-if="p.reply && p.reply.replyId && context.length == 0"
|
||||
@click="fetchContext"
|
||||
:disabled="fetchingContext"
|
||||
v-if="p.reply && p.reply.replyId && conversation.length == 0"
|
||||
@click="fetchConversation"
|
||||
:disabled="conversationFetching"
|
||||
>
|
||||
<template v-if="!contextFetching">%fa:ellipsis-v%</template>
|
||||
<template v-if="contextFetching">%fa:spinner .pulse%</template>
|
||||
<template v-if="!conversationFetching">%fa:ellipsis-v%</template>
|
||||
<template v-if="conversationFetching">%fa:spinner .pulse%</template>
|
||||
</button>
|
||||
<div class="context">
|
||||
<x-sub v-for="note in context" :key="note.id" :note="note"/>
|
||||
<div class="conversation">
|
||||
<x-sub v-for="note in conversation" :key="note.id" :note="note"/>
|
||||
</div>
|
||||
<div class="reply-to" v-if="p.reply">
|
||||
<x-sub :note="p.reply"/>
|
||||
|
|
@ -99,8 +99,8 @@ export default Vue.extend({
|
|||
|
||||
data() {
|
||||
return {
|
||||
context: [],
|
||||
contextFetching: false,
|
||||
conversation: [],
|
||||
conversationFetching: false,
|
||||
replies: []
|
||||
};
|
||||
},
|
||||
|
|
@ -166,14 +166,14 @@ export default Vue.extend({
|
|||
|
||||
methods: {
|
||||
fetchContext() {
|
||||
this.contextFetching = true;
|
||||
this.conversationFetching = true;
|
||||
|
||||
// Fetch context
|
||||
(this as any).api('notes/context', {
|
||||
// Fetch conversation
|
||||
(this as any).api('notes/conversation', {
|
||||
noteId: this.p.replyId
|
||||
}).then(context => {
|
||||
this.contextFetching = false;
|
||||
this.context = context.reverse();
|
||||
}).then(conversation => {
|
||||
this.conversationFetching = false;
|
||||
this.conversation = conversation.reverse();
|
||||
});
|
||||
},
|
||||
reply() {
|
||||
|
|
@ -245,7 +245,7 @@ root(isDark)
|
|||
&:disabled
|
||||
color #ccc
|
||||
|
||||
> .context
|
||||
> .conversation
|
||||
> *
|
||||
border-bottom 1px solid isDark ? #1c2023 : #eef0f2
|
||||
|
||||
|
|
|
|||
|
|
@ -482,7 +482,7 @@ const endpoints: Endpoint[] = [
|
|||
name: 'notes/replies'
|
||||
},
|
||||
{
|
||||
name: 'notes/context'
|
||||
name: 'notes/conversation'
|
||||
},
|
||||
{
|
||||
name: 'notes/create',
|
||||
|
|
|
|||
|
|
@ -5,11 +5,7 @@ import $ from 'cafy'; import ID from '../../../../cafy-id';
|
|||
import Note, { pack } from '../../../../models/note';
|
||||
|
||||
/**
|
||||
* Show a context of a note
|
||||
*
|
||||
* @param {any} params
|
||||
* @param {any} user
|
||||
* @return {Promise<any>}
|
||||
* Show conversation of a note
|
||||
*/
|
||||
module.exports = (params, user) => new Promise(async (res, rej) => {
|
||||
// Get 'noteId' parameter
|
||||
|
|
@ -33,7 +29,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
|
|||
return rej('note not found');
|
||||
}
|
||||
|
||||
const context = [];
|
||||
const conversation = [];
|
||||
let i = 0;
|
||||
|
||||
async function get(id) {
|
||||
|
|
@ -41,10 +37,10 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
|
|||
const p = await Note.findOne({ _id: id });
|
||||
|
||||
if (i > offset) {
|
||||
context.push(p);
|
||||
conversation.push(p);
|
||||
}
|
||||
|
||||
if (context.length == limit) {
|
||||
if (conversation.length == limit) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -58,6 +54,5 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
|
|||
}
|
||||
|
||||
// Serialize
|
||||
res(await Promise.all(context.map(async note =>
|
||||
await pack(note, user))));
|
||||
res(await Promise.all(conversation.map(note => pack(note, user))));
|
||||
});
|
||||
Loading…
Reference in a new issue