Browse Source

alter contact pubkey in group join if they have reset their node, tribe declare casing

feature/dockerfile-arm
Evan Feenstra 5 years ago
parent
commit
b6c6302279
  1. 20
      api/controllers/chats.ts
  2. 18
      api/utils/tribes.ts
  3. 10
      dist/api/controllers/chats.js
  4. 2
      dist/api/controllers/chats.js.map
  5. 18
      dist/api/utils/tribes.js
  6. 2
      dist/api/utils/tribes.js.map

20
api/controllers/chats.ts

@ -63,10 +63,10 @@ async function editTribe(req, res) {
tribes.edit({
uuid,
...params,
pricePerMessage: price_per_message||0,
priceToJoin: price_to_join||0,
price_per_message: price_per_message||0,
price_to_join: price_to_join||0,
description, tags, img,
ownerAlias: owner.alias,
owner_alias: owner.alias,
})
} else {
// remove from tribes server? or at least just "unlist"
@ -117,11 +117,11 @@ async function createGroupChat(req, res) {
// publish to tribe server
tribes.declare({
...chatParams,
pricePerMessage: price_per_message||0,
priceToJoin: price_to_join||0,
price_per_message: price_per_message||0,
price_to_join: price_to_join||0,
description, tags, img,
ownerPubkey: owner.publicKey,
ownerAlias: owner.alias,
owner_pubkey: owner.publicKey,
owner_alias: owner.alias,
})
}
// make me owner when i create
@ -388,6 +388,12 @@ async function receiveGroupJoin(payload) {
if (sender) {
theSender = sender // might already include??
if(!contactIds.includes(sender.id)) contactIds.push(sender.id)
// update sender contacT_key in case they reset?
if(member && member.key) {
if(sender.contactKey!==member.key) {
await sender.update({contactKey:member.key})
}
}
} else {
if(member && member.key) {
const createdContact = await models.Contact.create({

18
api/utils/tribes.ts

@ -53,16 +53,16 @@ export function publish(topic, msg) {
if (client) client.publish(topic, msg)
}
export async function declare({ uuid, name, description, tags, img, groupKey, host, pricePerMessage, priceToJoin, ownerAlias, ownerPubkey }) {
export async function declare({ uuid, name, description, tags, img, groupKey, host, price_per_message, price_to_join, owner_alias, owner_pubkey }) {
try {
const r = await fetch('https://' + host + '/tribes', {
method: 'POST',
body: JSON.stringify({
uuid, groupKey,
name, description, tags, img: img || '',
pricePerMessage: pricePerMessage || 0,
priceToJoin: priceToJoin || 0,
ownerAlias, ownerPubkey,
pricePerMessage: price_per_message || 0,
priceToJoin: price_to_join || 0,
owner_alias, owner_pubkey,
}),
headers: { 'Content-Type': 'application/json' }
})
@ -73,16 +73,16 @@ export async function declare({ uuid, name, description, tags, img, groupKey, ho
}
}
export async function edit({ uuid, name, description, tags, img, pricePerMessage, priceToJoin, ownerAlias }) {
export async function edit({ uuid, name, description, tags, img, price_per_message, price_to_join, owner_alias }) {
try {
const r = await fetch('https://' + getHost() + '/tribes', {
method: 'POST',
method: 'PUT',
body: JSON.stringify({
uuid,
name, description, tags, img: img || '',
pricePerMessage: pricePerMessage || 0,
priceToJoin: priceToJoin || 0,
ownerAlias,
pricePerMessage: price_per_message || 0,
priceToJoin: price_to_join || 0,
owner_alias,
}),
headers: { 'Content-Type': 'application/json' }
})

10
dist/api/controllers/chats.js

@ -58,7 +58,7 @@ function editTribe(req, res) {
priceToJoin: price_to_join || 0
};
if (is_listed) {
tribes.edit(Object.assign(Object.assign({ uuid }, params), { pricePerMessage: price_per_message || 0, priceToJoin: price_to_join || 0, description, tags, img, ownerAlias: owner.alias }));
tribes.edit(Object.assign(Object.assign({ uuid }, params), { price_per_message: price_per_message || 0, price_to_join: price_to_join || 0, description, tags, img, owner_alias: owner.alias }));
}
else {
// remove from tribes server? or at least just "unlist"
@ -97,7 +97,7 @@ function createGroupChat(req, res) {
chatParams = yield createTribeChatParams(owner, contact_ids, name, img, price_per_message, price_to_join);
if (is_listed && chatParams.uuid) {
// publish to tribe server
tribes.declare(Object.assign(Object.assign({}, chatParams), { pricePerMessage: price_per_message || 0, priceToJoin: price_to_join || 0, description, tags, img, ownerPubkey: owner.publicKey, ownerAlias: owner.alias }));
tribes.declare(Object.assign(Object.assign({}, chatParams), { price_per_message: price_per_message || 0, price_to_join: price_to_join || 0, description, tags, img, owner_pubkey: owner.publicKey, owner_alias: owner.alias }));
}
// make me owner when i create
members[owner.publicKey].role = constants.chat_roles.owner;
@ -351,6 +351,12 @@ function receiveGroupJoin(payload) {
theSender = sender; // might already include??
if (!contactIds.includes(sender.id))
contactIds.push(sender.id);
// update sender contacT_key in case they reset?
if (member && member.key) {
if (sender.contactKey !== member.key) {
yield sender.update({ contactKey: member.key });
}
}
}
else {
if (member && member.key) {

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

File diff suppressed because one or more lines are too long

18
dist/api/utils/tribes.js

@ -66,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, ownerAlias, ownerPubkey }) {
function declare({ uuid, name, description, tags, img, groupKey, host, price_per_message, price_to_join, owner_alias, owner_pubkey }) {
return __awaiter(this, void 0, void 0, function* () {
try {
const r = yield fetch('https://' + host + '/tribes', {
@ -74,9 +74,9 @@ function declare({ uuid, name, description, tags, img, groupKey, host, pricePerM
body: JSON.stringify({
uuid, groupKey,
name, description, tags, img: img || '',
pricePerMessage: pricePerMessage || 0,
priceToJoin: priceToJoin || 0,
ownerAlias, ownerPubkey,
pricePerMessage: price_per_message || 0,
priceToJoin: price_to_join || 0,
owner_alias, owner_pubkey,
}),
headers: { 'Content-Type': 'application/json' }
});
@ -89,17 +89,17 @@ function declare({ uuid, name, description, tags, img, groupKey, host, pricePerM
});
}
exports.declare = declare;
function edit({ uuid, name, description, tags, img, pricePerMessage, priceToJoin, ownerAlias }) {
function edit({ uuid, name, description, tags, img, price_per_message, price_to_join, owner_alias }) {
return __awaiter(this, void 0, void 0, function* () {
try {
const r = yield fetch('https://' + getHost() + '/tribes', {
method: 'POST',
method: 'PUT',
body: JSON.stringify({
uuid,
name, description, tags, img: img || '',
pricePerMessage: pricePerMessage || 0,
priceToJoin: priceToJoin || 0,
ownerAlias,
pricePerMessage: price_per_message || 0,
priceToJoin: price_to_join || 0,
owner_alias,
}),
headers: { 'Content-Type': 'application/json' }
});

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

@ -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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"}
Loading…
Cancel
Save