First glimpse of multiple SSB identities per Tilde Friends user.

git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@3941 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
2022-07-31 19:01:08 +00:00
parent 0bd1463a6b
commit 24530e1158
9 changed files with 108 additions and 80 deletions

View File

@ -1 +1 @@
{"type":"tildefriends-app","files":{"app.js":"&TOlRdlgclkUtDVAOmfSoAQCoRzzMN4wAvKmF0cRvOHk=.sha256","index.html":"&TGAqOmpnOigx4XQbFix82ugZEOfR1Gdc2zMWUQMSvwI=.sha256","vue-material.js":"&K5cdLqXYCENPak/TCINHQhyJhpS4G9DlZHGwoh/LF2g=.sha256","tf-user.js":"&smJOHGgIsKwQXeEJD3VbHX4A+vhr1Se54WlSHUP/Km8=.sha256","tf-message.js":"&7M+IUC+xHyc306xRrJcx3TnYpONYLlgCsF80m2M2ws4=.sha256","tf.js":"&0+ub/dNZzf74GUWyVIzGZPb6pKJDx6y7I4Stsosh9Y0=.sha256","commonmark.min.js":"&EP0OeR9zyLwZannz+0ga4s9AGES2RLvvIIQYHqqV6+k=.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","tf-shared.js":"&MPINm55jkpz2rrNbwsYl09PKGvbgL3nwgBy6CMQkSnw=.sha256","style.css":"&qegBNCrVUihxffRUxGFuG/6u+0Y6d18zHtfNHBZtZ04=.sha256"}}
{"type":"tildefriends-app","files":{"app.js":"&acYxT0G3CMw7yeOLrSZEyUMddadjz3Tj3s922ufQBcQ=.sha256","index.html":"&zWXxIB5f290SW1LGSasi41hNMJUwWzFTnSGeO/lh5zI=.sha256","vue-material.js":"&K5cdLqXYCENPak/TCINHQhyJhpS4G9DlZHGwoh/LF2g=.sha256","tf-user.js":"&smJOHGgIsKwQXeEJD3VbHX4A+vhr1Se54WlSHUP/Km8=.sha256","tf-message.js":"&7M+IUC+xHyc306xRrJcx3TnYpONYLlgCsF80m2M2ws4=.sha256","tf.js":"&FD0n9f4JMrvTFTxNOpMKDPv0e2Cex49G+oWdZOUcd/I=.sha256","commonmark.min.js":"&EP0OeR9zyLwZannz+0ga4s9AGES2RLvvIIQYHqqV6+k=.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","tf-shared.js":"&MPINm55jkpz2rrNbwsYl09PKGvbgL3nwgBy6CMQkSnw=.sha256","style.css":"&qegBNCrVUihxffRUxGFuG/6u+0Y6d18zHtfNHBZtZ04=.sha256"}}

View File

@ -5,6 +5,8 @@ const k_votes_max = 20;
var g_ready = false;
var g_selected = null;
let g_whoami = null;
let g_hash = null;
var g_blocking_cache = {};
var g_following_cache = {};
@ -313,7 +315,6 @@ async function getRelatedPostIds(db, message, ids, limit) {
id = JSON.parse(message.content).root || id;
} catch {
}
print("id = ", id);
for (var i = 0; i < ids.length; i += k_batch_max) {
var ids_batch = ids.slice(i, Math.min(i + k_batch_max, ids.length));
await ssb.sqlStream(
@ -395,8 +396,9 @@ async function getPosts(db, ids) {
}
tfrpc.register(async function ready() {
let identities = await ssb.getIdentities();
await tfrpc.rpc.set_identities(identities);
g_ready = true;
return refresh(g_selected);
});
tfrpc.register(async function store_blob(blob) {
@ -439,13 +441,24 @@ async function updateSequences(db) {
return changes;
}
async function refresh(selected) {
let g_refresh_limit = 5;
async function refresh_internal(whoami, selected) {
if (typeof(whoami) !== 'string') {
return;
}
if (whoami !== g_whoami || selected !== g_selected) {
g_whoami = whoami;
g_selected = selected;
} else {
return;
}
var timing = [];
timing.push({name: 'start', time: new Date()});
g_following_cache = {};
g_following_deep_cache = {};
await tfrpc.rpc.clear();
var whoami = await ssb.whoami();
await tfrpc.rpc.set_identities(await ssb.getIdentities());
var db = await database("ssb");
g_sequence = {};
try {
@ -458,14 +471,15 @@ async function refresh(selected) {
timing.push({name: 'blocked', time: new Date()});
var all_followed = await followingDeep(db, [whoami], 2, blocked);
timing.push({name: 'all_followed', time: new Date()});
if (selected) {
g_selected = selected;
} else {
g_selected = all_followed;
let actual_selected = selected ? selected : all_followed;
let hash = selected && selected.length == 1 ? selected[0] : null;
if (hash !== g_hash) {
g_hash = hash;
print(g_hash, '=>', hash);
//await tfrpc.rpc.set_hash(hash);
}
await Promise.all([
tfrpc.rpc.set('whoami', whoami),,
tfrpc.rpc.set_hash(selected && selected.length == 1 ? selected[0] : null),
tfrpc.rpc.set('whoami', whoami),
tfrpc.rpc.set('broadcasts', await ssb.getBroadcasts()),
tfrpc.rpc.set('connections', await ssb.connections()),
tfrpc.rpc.set('apps', await core.apps()),
@ -477,7 +491,7 @@ async function refresh(selected) {
m = m.length ? m[0] : {id: selected[0]};
ids = await getRelatedPostIds(db, m, all_followed, k_posts_max);
} else {
ids = await getRecentPostIds2(db, whoami, g_selected, (new Date()).valueOf() - (24 * 60 * 60 * 1000));
ids = await getRecentPostIds2(db, whoami, actual_selected, (new Date()).valueOf() - (24 * 60 * 60 * 1000));
}
timing.push({name: 'get_post_ids', time: new Date()});
var posts = await getPosts(db, ids);
@ -544,7 +558,7 @@ ssb.addEventListener('message', async function(id) {
var db = await database("ssb");
var posts = await getPosts(db, [id]);
for (let post of posts) {
if (post.author == await ssb.whoami() ||
if (post.author == g_whoami ||
JSON.parse(post.content).type != 'post') {
await tfrpc.rpc.push_posts([post]);
} else {
@ -553,6 +567,10 @@ ssb.addEventListener('message', async function(id) {
}
});
tfrpc.register(async function refresh(whoami, selected) {
return refresh_internal(whoami, selected);
});
async function addAppSources(message) {
if (message.mentions) {
for (let mention of message.mentions) {
@ -576,19 +594,11 @@ core.register('message', async function(m) {
await ssb.connect(m.message.connect);
} else if (m.message.appendMessage) {
await addAppSources(m.message.appendMessage);
await ssb.appendMessage(m.message.appendMessage);
} else if (m.message.refresh) {
await refresh(g_selected);
await ssb.appendMessageWithIdentity(g_whoami, m.message.appendMessage);
}
} else if (m.event == 'hashChange') {
if (m.hash.length > 1) {
g_selected = [m.hash.substring(1)];
} else {
g_selected = null;
}
if (g_ready) {
await refresh(g_selected);
}
let selected = m.hash.length > 1 ? [m.hash.substring(1)] : null;
await refresh_internal(g_whoami, selected);
} else if (m.event == 'focus' || m.event == 'blur') {
/* Shh. */
} else {

View File

@ -43,7 +43,13 @@
</md-app-toolbar>
<md-app class="md-elevation-8">
<md-app-toolbar>
<div>Welcome, <tf-user :id="whoami"></tf-user>.</div>
<div>Welcome, <tf-user :id="whoami"></tf-user>
<md-field>
<md-select v-model="whoami" name="whoami" id="whoami" :change="refresh()">
<md-option v-for="identity in identities" v-bind:key="identity" :value="identity">{{identity}}</md-option>
</md-select>
</md-field>
</div>
</md-app-toolbar>
<md-app-content>
<span v-if="load_time">

View File

@ -3,6 +3,7 @@ import * as tfshared from './tf-shared.js';
export var g_data = {
whoami: null,
identities: [],
connections: [],
messages: [],
messages_by_id: {},
@ -48,7 +49,9 @@ tfrpc.register(function clear() {
g_load_start = new Date();
g_data.loading = true;
Object.keys(g_data_initial).forEach(function(key) {
Vue.set(g_data, key, JSON.parse(JSON.stringify(g_data_initial[key])));
if (key != 'identities' && key != 'whoami') {
Vue.set(g_data, key, JSON.parse(JSON.stringify(g_data_initial[key])));
}
});
});
@ -56,6 +59,15 @@ tfrpc.register(function set(key, value) {
g_data[key] = value;
});
tfrpc.register(function set_identities(value) {
if (JSON.stringify(g_data.identities) != JSON.stringify(value)) {
g_data.identities = value.map(x => x);
}
if (!g_data.whoami && value.length) {
g_data.whoami = value[0];
}
});
tfrpc.register(function push_users(users) {
for (let [id, user] of Object.entries(users)) {
Vue.set(g_data.users, id, Object.assign({}, g_data.users[id] || {}, user));
@ -207,7 +219,7 @@ window.addEventListener('load', function() {
},
markdown: tfshared.markdown,
refresh: function() {
window.parent.postMessage({refresh: true}, '*');
tfrpc.rpc.refresh(g_data.whoami);
},
add_app_to_mentions: function(app) {
Vue.set(g_data.mentions, g_data.apps[app], {