lukechilds
/
sphinx-relay
mirror of https://github.com/lukechilds/sphinx-relay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix

feature/dockerfile-arm
Evan Feenstra 4 years ago
parent
2acbd8bd75
commit
7f8c735c45
9 changed files with 7 additions and 91 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      api/controllers/chats.ts
  2. 5
      api/controllers/index.ts
  3. 12
      api/utils/tribes.ts
  4. 31
      dist/api/controllers/chats.js
  5. 2
      dist/api/controllers/chats.js.map
  6. 4
      dist/api/controllers/index.js
  7. 2
      dist/api/controllers/index.js.map
  8. 11
      dist/api/utils/tribes.js
  9. 2
      dist/api/utils/tribes.js.map

29
api/controllers/chats.ts
View File

@ -37,35 +37,6 @@ async function mute(req, res) {
success(res, jsonUtils.chatToJson(chat))
}
export async function testCreateTribe(){
console.log("=======> TEST CREATE TRIBE")
const owner = await models.Contact.findOne({ where: { isOwner: true } })
const contact_ids = [1]
const img = 'https://i.pinimg.com/originals/54/7a/9c/547a9cc6b93e10261f1dd8a8af474e03.jpg'
const price_per_message = 0
const price_to_join = 100
const name = `Evan's test tribe`
const chatParams = await createTribeChatParams(owner, contact_ids, name, img, price_per_message, price_to_join)
// publish to tribe server
tribes.declare({
name:chatParams.name,
uuid:chatParams.uuid,
host:chatParams.host,
groupKey:chatParams.groupKey,
pricePerMessage: price_per_message,
priceToJoin: price_to_join,
description:'This is a test group',
tags:['Bitcoin','Lightning'],
img,
})
const chat = await models.Chat.create(chatParams)
await models.ChatMember.create({
contactId: owner.id,
chatId: chat.id,
role: constants.chat_roles.owner,
})
}
// just add self here if tribes
// or can u add contacts as members?
async function createGroupChat(req, res) {

5
api/controllers/index.ts
View File

@ -29,11 +29,6 @@ async function set(app) {
console.log('=> could not auth with media server', e.message)
}
const testTribe = process.env.TEST_TRIBE
if(testTribe && testTribe==='true') {
controllers.chats.testCreateTribe()
}
app.get('/chats', controllers.chats.getChats)
app.post('/group', controllers.chats.createGroupChat)
app.post('/chats/:chat_id/:mute_unmute', controllers.chats.mute)

12
api/utils/tribes.ts
View File

@ -11,15 +11,6 @@ const config = require(path.join(__dirname,'../../config/app.json'))[env]
let client:any
// export async function testCreate(){
// const uuid = await genSignedTimestamp()
// const name='test'
// declare({
// uuid,name,groupKey:'asdf',host:config.tribes_host,
// pricePerMessage:0,priceToJoin:0,description:'',tags:[]
// })
// }
export async function connect(onMessage) {
try{
const info = await LND.getInfo()
@ -62,7 +53,7 @@ export function publish(topic,msg){
if(client) client.publish(topic,msg)
}
export async function declare({uuid,name,description,tags,img,groupKey,host,pricePerMessage,priceToJoin}) {
export async function declare({uuid,name,description,tags,img,groupKey,host,pricePerMessage,priceToJoin,ownerAlias,ownerPubkey}) {
const r = await fetch('https://' + host + '/tribes', {
method: 'POST' ,
body: JSON.stringify({
@ -70,6 +61,7 @@ export async function declare({uuid,name,description,tags,img,groupKey,host,pric
name, description, tags, img:img||'',
pricePerMessage:pricePerMessage||0,
priceToJoin:priceToJoin||0,
ownerAlias, ownerPubkey,
}),
headers: { 'Content-Type': 'application/json' }

31
dist/api/controllers/chats.js
View File

@ -45,37 +45,6 @@ function mute(req, res) {
});
}
exports.mute = mute;
function testCreateTribe() {
return __awaiter(this, void 0, void 0, function* () {
console.log("=======> TEST CREATE TRIBE");
const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } });
const contact_ids = [1];
const img = 'https://i.pinimg.com/originals/54/7a/9c/547a9cc6b93e10261f1dd8a8af474e03.jpg';
const price_per_message = 0;
const price_to_join = 100;
const name = `Evan's test tribe`;
const chatParams = yield createTribeChatParams(owner, contact_ids, name, img, price_per_message, price_to_join);
// publish to tribe server
tribes.declare({
name: chatParams.name,
uuid: chatParams.uuid,
host: chatParams.host,
groupKey: chatParams.groupKey,
pricePerMessage: price_per_message,
priceToJoin: price_to_join,
description: 'This is a test group',
tags: ['Bitcoin', 'Lightning'],
img,
});
const chat = yield models_1.models.Chat.create(chatParams);
yield models_1.models.ChatMember.create({
contactId: owner.id,
chatId: chat.id,
role: constants.chat_roles.owner,
});
});
}
exports.testCreateTribe = testCreateTribe;
// just add self here if tribes
// or can u add contacts as members?
function createGroupChat(req, res) {

2
dist/api/controllers/chats.js.map
View File

File diff suppressed because one or more lines are too long

4
dist/api/controllers/index.js
View File

@ -38,10 +38,6 @@ function set(app) {
catch (e) {
console.log('=> could not auth with media server', e.message);
}
const testTribe = process.env.TEST_TRIBE;
if (testTribe && testTribe === 'true') {
controllers.chats.testCreateTribe();
}
app.get('/chats', controllers.chats.getChats);
app.post('/group', controllers.chats.createGroupChat);
app.post('/chats/:chat_id/:mute_unmute', controllers.chats.mute);

2
dist/api/controllers/index.js.map
View File

File diff suppressed because one or more lines are too long

11
dist/api/utils/tribes.js
View File

@ -18,14 +18,6 @@ const fetch = require("node-fetch");
const env = process.env.NODE_ENV || 'development';
const config = require(path.join(__dirname, '../../config/app.json'))[env];
let client;
// export async function testCreate(){
// const uuid = await genSignedTimestamp()
// const name='test'
// declare({
// uuid,name,groupKey:'asdf',host:config.tribes_host,
// pricePerMessage:0,priceToJoin:0,description:'',tags:[]
// })
// }
function connect(onMessage) {
return __awaiter(this, void 0, void 0, function* () {
try {
@ -74,7 +66,7 @@ function publish(topic, msg) {
client.publish(topic, msg);
}
exports.publish = publish;
function declare({ uuid, name, description, tags, img, groupKey, host, pricePerMessage, priceToJoin }) {
function declare({ uuid, name, description, tags, img, groupKey, host, pricePerMessage, priceToJoin, ownerAlias, ownerPubkey }) {
return __awaiter(this, void 0, void 0, function* () {
const r = yield fetch('https://' + host + '/tribes', {
method: 'POST',
@ -83,6 +75,7 @@ function declare({ uuid, name, description, tags, img, groupKey, host, pricePerM
name, description, tags, img: img || '',
pricePerMessage: pricePerMessage || 0,
priceToJoin: priceToJoin || 0,
ownerAlias, ownerPubkey,
}),
headers: { 'Content-Type': 'application/json' }
});

2
dist/api/utils/tribes.js.map
View File

@ -1 +1 @@
{"version":3,"file":"tribes.js","sourceRoot":"","sources":["../../../api/utils/tribes.ts"],"names":[],"mappings":"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"}
{"version":3,"file":"tribes.js","sourceRoot":"","sources":["../../../api/utils/tribes.ts"],"names":[],"mappings":"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"}
Write Preview
Loading…
Cancel
Save