Show placeholders for missing messages.
git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@3760 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
parent
5e0304481b
commit
dbfa9e5623
@ -1 +1 @@
|
|||||||
{"type":"tildefriends-app","files":{"app.js":"&LAPhIEnIVpfzC4R5D93GtAPrKgViVV3wbHHzfa7tAr4=.sha256","index.html":"&/CE4CuVKI56h5tfAHF0kzCXbLfhVjWzsM8aZAB9HpEM=.sha256","vue-material.js":"&K5cdLqXYCENPak/TCINHQhyJhpS4G9DlZHGwoh/LF2g=.sha256","tf-user.js":"&DdJwZYEo7AqFyutYMvEjykoVXxdHVog0UXye6Sbo0TU=.sha256","tf-message.js":"&gBMlL/D2sGuvFQR46qXM1ERLA+baZDp9h/4jOD42k7w=.sha256","tf.js":"&gJUMwBsssB+Suy/NTUjcB3JeloFLvV18i6egqvThaVY=.sha256","commonmark.min.js":"&5x6ek3tFrKTZX6hXNNyFsjmhvrjmWpUkwuuaiyVV1Us=.sha256","vue.js":"&g1wvA+yHl1sVC+eufTsg9If7ZeVyMTBU+h0tks7ZNzE=.sha256","vue-material-theme-default-dark.css":"&RP2nr+2CR18BpHHw5ST9a5GJUCOG9n0G2kuGkcQioWE=.sha256","vue-material.min.css":"&kGbUM2QgFSyHZRzqQb0b+0S3EVIlZ0AXpdiAVjIhou8=.sha256","roboto.css":"&jJv43Om673mQO5JK0jj7714s5E+5Yrf82H6LcDx7wUs=.sha256","material-icons.css":"&a28PdcVvgq/DxyIvJAx/e+ZOEtOuHnr3kjLWKyzH11M=.sha256"}}
|
{"type":"tildefriends-app","files":{"app.js":"&g8ietss5dxwzLkFreH1YCDH1fLr53CgA0htu9+lr8Ok=.sha256","index.html":"&/CE4CuVKI56h5tfAHF0kzCXbLfhVjWzsM8aZAB9HpEM=.sha256","vue-material.js":"&K5cdLqXYCENPak/TCINHQhyJhpS4G9DlZHGwoh/LF2g=.sha256","tf-user.js":"&DdJwZYEo7AqFyutYMvEjykoVXxdHVog0UXye6Sbo0TU=.sha256","tf-message.js":"&ZQuSBy1K3iASz/NVEa8ILA6aOefHZUmBa/Ddpcl7ZyI=.sha256","tf.js":"&oNOs6Ha7Rsd2fectO5NVhsWdwu/vkLBNIvr8l9Vj6ds=.sha256","commonmark.min.js":"&5x6ek3tFrKTZX6hXNNyFsjmhvrjmWpUkwuuaiyVV1Us=.sha256","vue.js":"&g1wvA+yHl1sVC+eufTsg9If7ZeVyMTBU+h0tks7ZNzE=.sha256","vue-material-theme-default-dark.css":"&RP2nr+2CR18BpHHw5ST9a5GJUCOG9n0G2kuGkcQioWE=.sha256","vue-material.min.css":"&kGbUM2QgFSyHZRzqQb0b+0S3EVIlZ0AXpdiAVjIhou8=.sha256","roboto.css":"&jJv43Om673mQO5JK0jj7714s5E+5Yrf82H6LcDx7wUs=.sha256","material-icons.css":"&a28PdcVvgq/DxyIvJAx/e+ZOEtOuHnr3kjLWKyzH11M=.sha256"}}
|
@ -239,7 +239,7 @@ async function getRelatedPostIds(db, message, ids, limit) {
|
|||||||
" json_extract(content, '$.type') = 'post' AND "+
|
" json_extract(content, '$.type') = 'post' AND "+
|
||||||
" (id = ? OR json_extract(content, '$.root') = ?) "+
|
" (id = ? OR json_extract(content, '$.root') = ?) "+
|
||||||
"ORDER BY timestamp DESC LIMIT ?",
|
"ORDER BY timestamp DESC LIMIT ?",
|
||||||
[].concat([message.timestamp, row_id_max], ids_batch, [message.id, id, limit]),
|
[].concat([message.timestamp || 0, row_id_max], ids_batch, [message.id, id, limit]),
|
||||||
function(row) {
|
function(row) {
|
||||||
if (row.id) {
|
if (row.id) {
|
||||||
recent.push({id: row.id, timestamp: row.timestamp});
|
recent.push({id: row.id, timestamp: row.timestamp});
|
||||||
@ -336,7 +336,8 @@ async function refresh(selected) {
|
|||||||
var ids;
|
var ids;
|
||||||
if (selected && selected.length == 1 && selected[0].startsWith('%')) {
|
if (selected && selected.length == 1 && selected[0].startsWith('%')) {
|
||||||
var m = await getPosts(db, selected);
|
var m = await getPosts(db, selected);
|
||||||
ids = m.length ? await getRelatedPostIds(db, m[0], all_followed, k_posts_max) : [];
|
m = m.length ? m[0] : {id: selected[0]};
|
||||||
|
ids = await getRelatedPostIds(db, m, all_followed, k_posts_max);
|
||||||
} else {
|
} else {
|
||||||
ids = await getRecentPostIds(db, whoami, g_selected, k_posts_max);
|
ids = await getRecentPostIds(db, whoami, g_selected, k_posts_max);
|
||||||
}
|
}
|
||||||
|
@ -56,8 +56,9 @@ Vue.component('tf-message', {
|
|||||||
<md-button class="md-icon-button md-dense" @click="show_message">
|
<md-button class="md-icon-button md-dense" @click="show_message">
|
||||||
<md-icon>percent</md-icon>
|
<md-icon>percent</md-icon>
|
||||||
</md-button>
|
</md-button>
|
||||||
<tf-user :id="message.author"></tf-user>
|
<tf-user :id="message.author" v-if="message.author"></tf-user>
|
||||||
</h3>
|
</h3>
|
||||||
|
<template v-if="message.author">
|
||||||
<div style="font-size: x-small">
|
<div style="font-size: x-small">
|
||||||
{{new Date(message.timestamp)}}
|
{{new Date(message.timestamp)}}
|
||||||
<md-tooltip>{{message.id}}</md-tooltip>
|
<md-tooltip>{{message.id}}</md-tooltip>
|
||||||
@ -68,8 +69,13 @@ Vue.component('tf-message', {
|
|||||||
<md-tooltip>Show Raw Message</md-tooltip>
|
<md-tooltip>Show Raw Message</md-tooltip>
|
||||||
</md-menu>
|
</md-menu>
|
||||||
</div>
|
</div>
|
||||||
|
</template>
|
||||||
|
<template v-else>
|
||||||
|
<h3>Missing</h3>
|
||||||
|
</template>
|
||||||
</md-app-toolbar>
|
</md-app-toolbar>
|
||||||
<md-app-content>
|
<md-app-content>
|
||||||
|
<template v-if="message.author">
|
||||||
<div v-if="showRaw">
|
<div v-if="showRaw">
|
||||||
<h1>{{message.id}}</h1>
|
<h1>{{message.id}}</h1>
|
||||||
<pre style="word-wrap: break-all; white-space: pre-wrap">{{content_raw}}</pre>
|
<pre style="word-wrap: break-all; white-space: pre-wrap">{{content_raw}}</pre>
|
||||||
@ -89,11 +95,15 @@ Vue.component('tf-message', {
|
|||||||
<div v-else-if="content_json && content_json.type == 'contact'"><tf-user :id="message.author"></tf-user> {{content_json.following ? '==>' : '=/=>'}} <tf-user :id="content_json.contact"></tf-user></div>
|
<div v-else-if="content_json && content_json.type == 'contact'"><tf-user :id="message.author"></tf-user> {{content_json.following ? '==>' : '=/=>'}} <tf-user :id="content_json.contact"></tf-user></div>
|
||||||
<div v-else>{{message.content}}</div>
|
<div v-else>{{message.content}}</div>
|
||||||
</div>
|
</div>
|
||||||
|
</template>
|
||||||
|
<template v-else>
|
||||||
|
{{message.id}}
|
||||||
|
</template>
|
||||||
<tf-message v-for="sub_message in (message.children || [])" v-bind:message="sub_message" v-bind:messages="messages" v-bind:votes="votes" v-bind:key="sub_message.id"></tf-message>
|
<tf-message v-for="sub_message in (message.children || [])" v-bind:message="sub_message" v-bind:messages="messages" v-bind:votes="votes" v-bind:key="sub_message.id"></tf-message>
|
||||||
<md-chip v-for="vote in Object.keys(votes[message.id] || {})" v-bind:key="vote">
|
<md-chip v-for="vote in Object.keys(votes[message.id] || {})" v-bind:key="vote">
|
||||||
{{vote + (votes[message.id][vote].length > 1 ? ' (' + votes[message.id][vote].length + ')' : '')}}
|
{{vote + (votes[message.id][vote].length > 1 ? ' (' + votes[message.id][vote].length + ')' : '')}}
|
||||||
</md-chip>
|
</md-chip>
|
||||||
<md-card-actions>
|
<md-card-actions v-if="message.author">
|
||||||
<md-button class="md-icon-button" @click="set_reply">
|
<md-button class="md-icon-button" @click="set_reply">
|
||||||
<md-icon>reply</md-icon>
|
<md-icon>reply</md-icon>
|
||||||
</md-button>
|
</md-button>
|
||||||
|
@ -48,6 +48,17 @@ function processMessages() {
|
|||||||
found = true;
|
found = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (!found) {
|
||||||
|
var fake_root = {
|
||||||
|
id: root,
|
||||||
|
children: [new_message],
|
||||||
|
timestamp: new_message.timestamp,
|
||||||
|
content: '{}',
|
||||||
|
};
|
||||||
|
g_data.messages.push(fake_root);
|
||||||
|
g_data.messages.sort((x, y) => y.timestamp - x.timestamp);
|
||||||
|
found = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
var removed = {};
|
var removed = {};
|
||||||
for (let message of g_data.messages) {
|
for (let message of g_data.messages) {
|
||||||
@ -58,6 +69,15 @@ function processMessages() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
g_data.messages = g_data.messages.filter(x => !removed[x.id]);
|
g_data.messages = g_data.messages.filter(x => !removed[x.id]);
|
||||||
|
if (!found) {
|
||||||
|
for (let message of g_data.messages) {
|
||||||
|
if (message.id == new_message.id) {
|
||||||
|
new_message.children = message.children;
|
||||||
|
Vue.set(g_data.messages, g_data.messages.indexOf(message), new_message);
|
||||||
|
found = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
if (!found) {
|
if (!found) {
|
||||||
g_data.messages.push(new_message);
|
g_data.messages.push(new_message);
|
||||||
g_data.messages.sort((x, y) => y.timestamp - x.timestamp);
|
g_data.messages.sort((x, y) => y.timestamp - x.timestamp);
|
||||||
|
Loading…
Reference in New Issue
Block a user