From 92c06b34a9cb0e194e8425b8784328aea3ba0f2a Mon Sep 17 00:00:00 2001
From: Cory McWilliams <cory@unprompted.com>
Date: Tue, 12 Jan 2021 02:23:57 +0000
Subject: [PATCH] A few minor things.  Fixed missing fields from app messages. 
 Fixed some missing messages.  Removed unnecessary asyncs.

git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@3637 ed5197a5-7fde-0310-b194-c3ffbd925b24
---
 apps/cory/index.json       |   2 +-
 apps/cory/index/app.js     |  17 +++---
 apps/cory/index/index.html | 107 +++++++++++++++++++------------------
 3 files changed, 66 insertions(+), 60 deletions(-)

diff --git a/apps/cory/index.json b/apps/cory/index.json
index c1e723f25..16df43f7a 100644
--- a/apps/cory/index.json
+++ b/apps/cory/index.json
@@ -1 +1 @@
-{"type":"tildefriends-app","files":{"app.js":"&WiH+BcLge0Imgpcfo/lecF92raEkf2cLyxr+GQKM5DU=.sha256","index.html":"&z528csPu5+I+634DKxY3EBOQYAAVt1hLOQiWj+gW+qM=.sha256","vue-material.js":"&K5cdLqXYCENPak/TCINHQhyJhpS4G9DlZHGwoh/LF2g=.sha256"}}
\ No newline at end of file
+{"type":"tildefriends-app","files":{"app.js":"&QC3jbGKlu7N1D7w6L64MUuT0EWf0MSew1gEg4LbaFcM=.sha256","index.html":"&eqLI+5Abbs4OEjIO7neOQFjhm/iknp6gi96RD2VTAR0=.sha256","vue-material.js":"&K5cdLqXYCENPak/TCINHQhyJhpS4G9DlZHGwoh/LF2g=.sha256"}}
\ No newline at end of file
diff --git a/apps/cory/index/app.js b/apps/cory/index/app.js
index 7e478c9ca..51ebe078e 100644
--- a/apps/cory/index/app.js
+++ b/apps/cory/index/app.js
@@ -5,7 +5,7 @@ const k_votes_max = 100;
 
 async function following(db, id) {
 	var o = await db.get(id + ":following");
-	const k_version = 4;
+	const k_version = 5;
 	var f = o ? JSON.parse(o) : o;
 	if (!f || f.version != k_version) {
 		f = {users: [], sequence: 0, version: k_version};
@@ -24,7 +24,7 @@ async function following(db, id) {
 		"UNION SELECT MAX(sequence) AS sequence, NULL, NULL FROM messages WHERE author = ?1 "+
 		"ORDER BY sequence",
 		[id, f.sequence],
-		async function(row) {
+		function(row) {
 			if (row.following) {
 				f.users.add(row.contact);
 			} else {
@@ -53,7 +53,7 @@ async function followingDeep(db, seed_ids, depth) {
 
 async function followers(db, id) {
 	var o = await db.get(id + ":followers");
-	const k_version = 2;
+	const k_version = 3;
 	var f = o ? JSON.parse(o) : o;
 	if (!f || f.version != k_version) {
 		f = {users: [], rowid: 0, version: k_version};
@@ -72,7 +72,7 @@ async function followers(db, id) {
 		"UNION SELECT MAX(rowid) as rowid, NULL, NULL FROM messages "+
 		"ORDER BY rowid",
 		[f.rowid, id],
-		async function(row) {
+		function(row) {
 			if (row.following) {
 				f.users.add(row.contact);
 			} else {
@@ -101,7 +101,7 @@ async function sendUser(db, id) {
 
 async function pubsByUser(db, id) {
 	var o = await db.get(id + ":pubs");
-	const k_version = 2;
+	const k_version = 3;
 	var f = o ? JSON.parse(o) : o;
 	if (!f || f.version != k_version) {
 		f = {pubs: [], sequence: 0, version: k_version};
@@ -121,7 +121,7 @@ async function pubsByUser(db, id) {
 		"UNION SELECT MAX(sequence) as sequence, NULL, NULL, NULL FROM messages WHERE author = ?2 "+
 		"ORDER BY sequence",
 		[f.sequence, id],
-		async function(row) {
+		function(row) {
 			f.sequence = row.sequence;
 			if (row.host) {
 				row = {host: row.host, port: row.port, key: row.key};
@@ -237,7 +237,7 @@ async function getRecentPostIds(db, id, ids, limit) {
 
 async function getVotes(db, id) {
 	var o = await db.get(id + ":votes");
-	const k_version = 2;
+	const k_version = 3;
 	var votes = [];
 	var f = o ? JSON.parse(o) : o;
 	if (!f || f.version != k_version) {
@@ -259,7 +259,7 @@ async function getVotes(db, id) {
 		"UNION SELECT MAX(rowid) as rowid, NULL, NULL AS id, NULL, NULL, NULL FROM messages "+
 		"ORDER BY rowid DESC LIMIT ?",
 		[f.rowid, id, k_votes_max],
-		async function(row) {
+		function(row) {
 			if (row.id) {
 				votes.push(row);
 			} else {
@@ -363,6 +363,7 @@ core.register('message', async function(m) {
 			app = JSON.parse(utf8Decode(app));
 			app.type = 'tildefriends-app';
 			app.name = m.message.share_app.name;
+			app.text = m.message.share_app.text;
 			await ssb.appendMessage(app);
 		} else if (m.message.user) {
 			await sendUser(await database("ssb"), m.message.user);
diff --git a/apps/cory/index/index.html b/apps/cory/index/index.html
index 1ad2fc49f..70a3eea58 100644
--- a/apps/cory/index/index.html
+++ b/apps/cory/index/index.html
@@ -84,29 +84,29 @@
 					},
 					template: `<span @click="show_user_dialog = true">
 							{{users[id] && users[id].name ? users[id].name : id}}
-							<md-tooltip v-if="users[id] && users[id].name">{{id}}</md-tooltip>
-							<md-dialog :md-active.sync="show_user_dialog">
-							<md-dialog-title>{{users[id] && users[id].name ? users[id].name : id}}</md-dialog-title>
-							<md-dialog-content v-if="users[id]">
-							<div v-if="users[id].image"><img :src="'/' + users[id].image + '/view'"></div>
-							<div v-if="users[id].name">{{id}}</div>
-							<div>{{users[id].description}}</div>
-							<div><md-switch v-model="following">Following</md-switch></div>
-							<md-list>
-							<md-subheader>Followers</md-subheader>
-							<md-list-item v-for="follower in (users[id] || []).followers" v-bind:key="'follower-' + follower">
-							<tf-user :id="follower"></tf-user>
-										</md-list-item>
-							<md-subheader>Following</md-subheader>
-							<md-list-item v-for="user in (users[id] || []).following" v-bind:key="'following-' + user">
-							<tf-user :id="user"></tf-user>
-										</md-list-item>
+								<md-tooltip v-if="users[id] && users[id].name">{{id}}</md-tooltip>
+								<md-dialog :md-active.sync="show_user_dialog">
+									<md-dialog-title>{{users[id] && users[id].name ? users[id].name : id}}</md-dialog-title>
+									<md-dialog-content v-if="users[id]">
+										<div v-if="users[id].image"><img :src="'/' + users[id].image + '/view'"></div>
+										<div v-if="users[id].name">{{id}}</div>
+										<div>{{users[id].description}}</div>
+										<div><md-switch v-model="following">Following</md-switch></div>
+										<md-list>
+											<md-subheader>Followers</md-subheader>
+											<md-list-item v-for="follower in (users[id] || []).followers" v-bind:key="'follower-' + follower">
+												<tf-user :id="follower"></tf-user>
+											</md-list-item>
+											<md-subheader>Following</md-subheader>
+											<md-list-item v-for="user in (users[id] || []).following" v-bind:key="'following-' + user">
+												<tf-user :id="user"></tf-user>
+											</md-list-item>
 										</md-list>
-										</md-dialog-content>
-							<md-dialog-actions>
-							<md-button @click="show_user_dialog = false">Close</md-button>
-										</md-dialog-actions>
-										</md-dialog>
+									</md-dialog-content>
+									<md-dialog-actions>
+										<md-button @click="show_user_dialog = false">Close</md-button>
+									</md-dialog-actions>
+								</md-dialog>
 							</span>`,
 				});
 				Vue.component('tf-message', {
@@ -162,36 +162,40 @@
 					},
 					template: `<md-app class="md-elevation-8" style="margin: 1em" v-if="!content_json || ['pub', 'vote'].indexOf(content_json.type) == -1">
 <md-app-toolbar>
-<h3>
-<tf-user :id="message.author"></tf-user>
-			</h3>
-<div style="font-size: x-small">{{new Date(message.timestamp)}}</div>
-<div class="md-toolbar-section-end">
-<md-menu>
-<md-button md-menu-trigger class="md-icon-button"><md-icon>more_vert</md-icon></md-button>
-<md-menu-content>
-<md-menu-item v-if="!showRaw" v-on:click="showRaw = true">View Raw</md-menu-item>
-<md-menu-item v-else v-on:click="showRaw = false">View Message</md-menu-item>
+	<h3>
+		<tf-user :id="message.author"></tf-user>
+	</h3>
+	<div style="font-size: x-small">{{new Date(message.timestamp)}}</div>
+	<div class="md-toolbar-section-end">
+		<md-menu>
+			<md-button md-menu-trigger class="md-icon-button"><md-icon>more_vert</md-icon></md-button>
+			<md-menu-content>
+				<md-menu-item v-if="!showRaw" v-on:click="showRaw = true">View Raw</md-menu-item>
+				<md-menu-item v-else v-on:click="showRaw = false">View Message</md-menu-item>
 			</md-menu-content>
-			</md-menu>
-			</div>
-			</md-app-toolbar>
+		</md-menu>
+	</div>
+</md-app-toolbar>
 <md-app-content>
-<div v-if="showRaw">{{message.content}}</div>
-<div v-else>
-<div v-if="content_json && content_json.type == 'post'">
-<div v-html="this.markdown(content_json.text)"></div>
-<img v-for="mention in content_json.mentions" v-if="mention.link && typeof(mention.link) == 'string' && mention.link.startsWith('&')" :src="'/' + mention.link + '/view'"></img>
-			</div>
-<div v-else-if="content_json && content_json.type == 'contact'"><tf-user :id="message.author"></tf-user> {{content_json.following ? '==&gt;' : '=/=&gt;'}} <tf-user :id="content_json.contact"></tf-user></div>
-<div v-else>{{message.content}}</div>
-			</div>
-<tf-message v-for="sub_message in sub_messages" v-bind:message="sub_message" v-bind:messages="messages" v-bind:key="sub_message.id"></tf-message>
-<md-chip v-for="vote in Object.keys(votes)" v-bind:key="vote">
-{{vote + (votes[vote].length > 1 ? ' (' + votes[vote].length + ')' : '')}}
-			</md-chip>
-			</md-app-content>
-			</md-app>`,
+	<div v-if="showRaw">{{message.content}}</div>
+	<div v-else>
+		<div v-if="content_json && content_json.type == 'post'">
+			<div v-html="this.markdown(content_json.text)"></div>
+			<img v-for="mention in content_json.mentions" v-if="mention.link && typeof(mention.link) == 'string' && mention.link.startsWith('&')" :src="'/' + mention.link + '/view'"></img>
+		</div>
+		<div v-else-if="content_json && content_json.type == 'tildefriends-app'">
+			<div v-html="this.markdown(content_json.text)"></div>
+			<md-button target="_top" :href="'/' + message.id + '/'">{{content_json.name || 'tildefriends-app'}}</md-button>
+		</div>
+		<div v-else-if="content_json && content_json.type == 'contact'"><tf-user :id="message.author"></tf-user> {{content_json.following ? '==&gt;' : '=/=&gt;'}} <tf-user :id="content_json.contact"></tf-user></div>
+		<div v-else>{{message.content}}</div>
+	</div>
+	<tf-message v-for="sub_message in sub_messages" v-bind:message="sub_message" v-bind:messages="messages" v-bind:key="sub_message.id"></tf-message>
+	<md-chip v-for="vote in Object.keys(votes)" v-bind:key="vote">
+		{{vote + (votes[vote].length > 1 ? ' (' + votes[vote].length + ')' : '')}}
+	</md-chip>
+</md-app-content>
+</md-app>`,
 				});
 				function markdown(d) { return d; }
 				Vue.config.performance = true;
@@ -203,6 +207,7 @@
 							if (g_data.share_app) {
 								window.parent.postMessage({share_app: {
 									app: g_data.apps[g_data.share_app],
+									name: g_data.share_app,
 									text: document.getElementById('post_text').value,
 								}}, '*');
 							} else {
@@ -296,7 +301,7 @@
 							<md-button class="md-raised md-primary" v-on:click="post_message()">Submit Post</md-button>
 						</md-card-actions>
 					</md-card>
-					<tf-message v-for="message in messages" v-if="!content_json(message).root" v-bind:message="message" v-bind:messages="messages" v-bind:key="message.id"></tf-message>
+					<tf-message v-for="message in messages" v-if="!content_json(message).root || !messages.some(m => m.id == content_json(message).root)" v-bind:message="message" v-bind:messages="messages" v-bind:key="message.id"></tf-message>
 				</md-app-content>
 			</md-app>
 		</div>