Merge pull request #63 from stakwork/private-tribes

Private tribes

api/controllers/chatTribes.ts

@@ -96,14 +96,14 @@ export async function joinTribe(req, res){
 export async function editTribe(req, res) {
 	const {
 		name,
-		is_listed,
 		price_per_message,
 		price_to_join,
 		escrow_amount,
 		escrow_millis,
 		img,
 		description,
 		tags,
+		unlisted,
 	} = req.body
 	const { id } = req.params
 
@@ -117,24 +117,23 @@ export async function editTribe(req, res) {
 	const owner = await models.Contact.findOne({ where: { isOwner: true } })
 
 	let okToUpdate = true
-	if(is_listed) {
-		try{
-			await tribes.edit({
-				uuid: chat.uuid,
-				name: name,
-				host: chat.host,
-				price_per_message: price_per_message||0,
-				price_to_join: price_to_join||0,
-				escrow_amount: escrow_amount||0,
-				escrow_millis: escrow_millis||0,
-				description, 
-				tags, 
-				img,
-				owner_alias: owner.alias,
-			})
-		} catch(e) {
-			okToUpdate = false
-		}
+	try{
+		await tribes.edit({
+			uuid: chat.uuid,
+			name: name,
+			host: chat.host,
+			price_per_message: price_per_message||0,
+			price_to_join: price_to_join||0,
+			escrow_amount: escrow_amount||0,
+			escrow_millis: escrow_millis||0,
+			description, 
+			tags, 
+			img,
+			owner_alias: owner.alias,
+			unlisted,
+		})
+	} catch(e) {
+		okToUpdate = false
 	}
 
 	if(okToUpdate) {
@@ -145,6 +144,7 @@ export async function editTribe(req, res) {
 			priceToJoin: price_to_join||0,
 			escrowAmount: escrow_amount||0,
 			escrowMillis: escrow_millis||0,
+			unlisted: unlisted||false,
 		})
 		success(res, jsonUtils.chatToJson(chat))
 	} else {
@@ -206,7 +206,7 @@ export async function replayChatHistory(chat, contact) {
 	})
 }
 
-export async function createTribeChatParams(owner, contactIds, name, img, price_per_message, price_to_join, escrow_amount, escrow_millis): Promise<{[k:string]:any}> {
+export async function createTribeChatParams(owner, contactIds, name, img, price_per_message, price_to_join, escrow_amount, escrow_millis, unlisted): Promise<{[k:string]:any}> {
 	let date = new Date()
 	date.setMilliseconds(0)
 	if (!(owner && contactIds && Array.isArray(contactIds))) {
@@ -233,6 +233,7 @@ export async function createTribeChatParams(owner, contactIds, name, img, price_
 		priceToJoin: price_to_join||0,
 		escrowMillis: escrow_millis||0,
 		escrowAmount: escrow_amount||0,
+		unlisted: unlisted||false,
 	}
 }
 

api/controllers/chats.ts

@@ -137,14 +137,14 @@ export async function createGroupChat(req, res) {
 	const {
 		name,
 		is_tribe,
-		is_listed,
 		price_per_message,
 		price_to_join,
 		escrow_amount,
 		escrow_millis,
 		img,
 		description,
 		tags,
+		unlisted,
 	} = req.body
 	const contact_ids = req.body.contact_ids||[]
 
@@ -165,8 +165,8 @@ export async function createGroupChat(req, res) {
 	let chatParams:any = null
 	let okToCreate = true
 	if(is_tribe){
-		chatParams = await createTribeChatParams(owner, contact_ids, name, img, price_per_message, price_to_join, escrow_amount, escrow_millis)
-		if(is_listed && chatParams.uuid){
+		chatParams = await createTribeChatParams(owner, contact_ids, name, img, price_per_message, price_to_join, escrow_amount, escrow_millis, unlisted)
+		if(chatParams.uuid){
 			// publish to tribe server
 			try {
 				await tribes.declare({
@@ -181,6 +181,7 @@ export async function createGroupChat(req, res) {
 					description, tags, img,
 					owner_pubkey: owner.publicKey,
 					owner_alias: owner.alias,
+					unlisted: unlisted||false,
 				})
 			} catch(e) {
 				okToCreate = false

api/hub.ts

@@ -99,7 +99,7 @@ const sendHubCall = (params) => {
     headers: { 'Content-Type': 'application/json' }
   })
   .catch(error => {
-    console.log('[hub error]', error)
+    console.log('[hub warning]: cannot reach hub',)
   })
 }
 

api/models/ts/chat.ts

@@ -66,6 +66,16 @@ export default class Chat extends Model<Chat> {
   @Column(DataType.BIGINT)
   escrowMillis: number
 
+  @Column({ // dont show on tribes list
+    type: DataType.BOOLEAN,
+    defaultValue: false,
+    // allowNull: false
+  })
+  unlisted: boolean
+
+  @Column
+  private: boolean // joining requires approval of admin
+
   @Column 
   ownerPubkey: string
 

api/models/ts/chatMember.ts

@@ -21,4 +21,7 @@ export default class ChatMember extends Model<ChatMember> {
   @Column
   lastActive: Date
 
+  @Column
+  approved: boolean
+
 }

api/utils/setup.ts

@@ -6,7 +6,7 @@ import * as publicIp from 'public-ip'
 import password from '../utils/password'
 import {checkTag, checkCommitHash} from '../utils/gitinfo'
 
-const USER_VERSION = 5
+const USER_VERSION = 6
 
 const setupDatabase = async () => {
   console.log('=> [db] starting setup...')
@@ -31,40 +31,33 @@ async function setVersion(){
 }
 
 async function migrate(){
+  addTableColumn('sphinx_chats', 'private', 'BOOLEAN')
+  addTableColumn('sphinx_chats', 'unlisted', 'BOOLEAN')
+  addTableColumn('sphinx_chat_members', 'approved', 'BOOLEAN')
+
   addTableColumn('sphinx_chats', 'seen', 'BOOLEAN')
 
   try{
     await sequelize.query(`CREATE INDEX idx_messages_sender ON sphinx_messages (sender);`)
-  }catch(e){
-    console.log(e)
-  }
+  }catch(e){}
 
   addTableColumn('sphinx_contacts', 'notification_sound')
 
-  try{
-    await sequelize.query(`
-CREATE TABLE sphinx_timers (
-  id BIGINT,
-  chat_id BIGINT,
-  receiver BIGINT,
-  millis BIGINT,
-  msg_id BIGINT,
-  amount DECIMAL
-)`)
-  } catch(e){}
-  addTableColumn('sphinx_chats', 'escrow_amount', 'BIGINT')
-  addTableColumn('sphinx_chats', 'escrow_millis', 'BIGINT')
+//   try{
+//     await sequelize.query(`
+// CREATE TABLE sphinx_timers (
+//   id BIGINT,
+//   chat_id BIGINT,
+//   receiver BIGINT,
+//   millis BIGINT,
+//   msg_id BIGINT,
+//   amount DECIMAL
+// )`)
+//   } catch(e){}
+//   addTableColumn('sphinx_chats', 'escrow_amount', 'BIGINT')
+//   addTableColumn('sphinx_chats', 'escrow_millis', 'BIGINT')
 
-  addTableColumn('sphinx_contacts', 'private_photo', 'BOOLEAN')
-
-  // addTableColumn('sphinx_media_keys', 'media_type')
-  // addTableColumn('sphinx_media_keys', 'original_muid')
-  // addTableColumn('sphinx_messages', 'original_muid')
-
-  // addTableColumn('sphinx_messages', 'uuid')
-  // addTableColumn('sphinx_messages', 'reply_uuid')
-
-  // addTableColumn('sphinx_media_keys', 'sender', 'BIGINT')
+//   addTableColumn('sphinx_contacts', 'private_photo', 'BOOLEAN')
 }
 
 async function addTableColumn(table:string, column:string, type='TEXT') {

api/utils/tribes.ts

@@ -72,7 +72,7 @@ export function publish(topic, msg, cb) {
   })
 }
 
-export async function declare({ uuid, name, description, tags, img, group_key, host, price_per_message, price_to_join, owner_alias, owner_pubkey, escrow_amount, escrow_millis }) {
+export async function declare({ uuid, name, description, tags, img, group_key, host, price_per_message, price_to_join, owner_alias, owner_pubkey, escrow_amount, escrow_millis, unlisted }) {
   try {
     await fetch('https://' + host + '/tribes', {
       method: 'POST',
@@ -84,6 +84,7 @@ export async function declare({ uuid, name, description, tags, img, group_key, h
         owner_alias, owner_pubkey,
         escrow_amount: escrow_amount || 0,
         escrow_millis: escrow_millis || 0,
+        unlisted: unlisted||false,
       }),
       headers: { 'Content-Type': 'application/json' }
     })
@@ -94,7 +95,7 @@ export async function declare({ uuid, name, description, tags, img, group_key, h
   }
 }
 
-export async function edit({ uuid, host, name, description, tags, img, price_per_message, price_to_join, owner_alias, escrow_amount, escrow_millis }) {
+export async function edit({ uuid, host, name, description, tags, img, price_per_message, price_to_join, owner_alias, escrow_amount, escrow_millis, unlisted }) {
   try {
     const token = await genSignedTimestamp()
     await fetch('https://' + host + '/tribe?token=' + token, {
@@ -107,6 +108,7 @@ export async function edit({ uuid, host, name, description, tags, img, price_per
         escrow_amount: escrow_amount || 0,
         escrow_millis: escrow_millis || 0,
         owner_alias,
+        unlisted: unlisted||false,
       }),
       headers: { 'Content-Type': 'application/json' }
     })

config/constants.json

@@ -39,7 +39,9 @@
     "group_leave": 15,
     "group_kick": 16,
     "delete": 17,
-    "repayment": 18
+    "repayment": 18,
+    "member_approve": 19,
+    "member_reject": 20
   },
   "payment_errors": {
     "timeout": "Timed Out",