@roadmanjs/chat 1.1.3 → 1.1.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/chat/methods/ChatConvo.methods.js +11 -12
- package/dist/chat/methods/ChatConvo.methods.js.map +1 -1
- package/dist/chat/resolvers/ChatMessage.resolver.js +1 -1
- package/package.json +1 -1
- package/src/chat/methods/ChatConvo.methods.ts +11 -11
- package/src/chat/resolvers/ChatMessage.resolver.ts +1 -1
|
@@ -43,7 +43,6 @@ const models_1 = require("../models");
|
|
|
43
43
|
const couchset_1 = require("@roadmanjs/couchset");
|
|
44
44
|
const pubsub_utils_1 = require("../../shared/pubsub.utils");
|
|
45
45
|
const client_graphql_1 = require("@stoqey/client-graphql");
|
|
46
|
-
const compact_1 = __importDefault(require("lodash/compact"));
|
|
47
46
|
const isEmpty_1 = __importDefault(require("lodash/isEmpty"));
|
|
48
47
|
const logs_1 = require("@roadmanjs/logs");
|
|
49
48
|
const createAConvoAndReturnIt = async (newConvo) => {
|
|
@@ -188,33 +187,33 @@ const updateConvoSubscriptions = async (args) => {
|
|
|
188
187
|
return data;
|
|
189
188
|
};
|
|
190
189
|
const subscriptionData = getSubscriptionData();
|
|
191
|
-
const
|
|
190
|
+
const publishToMessageAsGroupTopic = async () => {
|
|
192
191
|
return (0, pubsub_utils_1.publishMessageToTopic)(context, [models_1.ChatMessage.name], Object.assign({ convoId, owner: sender }, subscriptionData));
|
|
193
192
|
};
|
|
194
193
|
try {
|
|
195
194
|
// send to message topic
|
|
196
|
-
await
|
|
195
|
+
await publishToMessageAsGroupTopic();
|
|
197
196
|
// send to convo topics
|
|
198
197
|
const membersConvos = await ChatConvo_model_1.default.pagination({
|
|
199
198
|
select: ChatConvo_model_1.chatConvoSelectors,
|
|
200
199
|
where: { convoId: { $eq: convoId }, owner: { $neq: sender } },
|
|
201
200
|
});
|
|
202
201
|
if (!(0, isEmpty_1.default)(membersConvos)) {
|
|
203
|
-
const isPublicChat = (
|
|
204
|
-
if (!(
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
202
|
+
// const isPublicChat = compact(membersConvos.map((c) => c.public));
|
|
203
|
+
// if (!isEmpty(isPublicChat)) {
|
|
204
|
+
// log(`updated subscriptions isPublicChat`);
|
|
205
|
+
// // await publishToMessageAsGroupTopic();
|
|
206
|
+
// return;
|
|
207
|
+
// }
|
|
208
208
|
// push notification here
|
|
209
209
|
// update sockets, no need for results
|
|
210
|
-
await (0, client_graphql_1.awaitTo)(Promise.all(membersConvos.map((convo) => {
|
|
210
|
+
await (0, client_graphql_1.awaitTo)(Promise.all(membersConvos.map(async (convo) => {
|
|
211
211
|
const pushmessage = Object.assign(Object.assign({}, data), { convoId, owner: convo.owner });
|
|
212
|
-
// unhandled promises
|
|
213
212
|
if (!subscriptionData.typing) {
|
|
214
|
-
(0, pubsub_utils_1.sendPushNotification)(sender, pushmessage);
|
|
213
|
+
await (0, pubsub_utils_1.sendPushNotification)(sender, pushmessage);
|
|
215
214
|
}
|
|
216
215
|
// Send subscriptions to owners
|
|
217
|
-
return (0, pubsub_utils_1.publishMessageToTopic)(context, [ChatConvo_model_1.ChatConvo.name], Object.assign({ convoId, owner: convo.owner }, subscriptionData)); // update sockets
|
|
216
|
+
return (0, pubsub_utils_1.publishMessageToTopic)(context, [ChatConvo_model_1.ChatConvo.name, models_1.ChatMessage.name], Object.assign({ convoId, owner: convo.owner }, subscriptionData)); // update sockets
|
|
218
217
|
})));
|
|
219
218
|
(0, logs_1.log)(`updated subscriptions from=${sender} with data=${data}`, membersConvos.map((uc) => uc.id));
|
|
220
219
|
// update sockets
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChatConvo.methods.js","sourceRoot":"","sources":["../../../src/chat/methods/ChatConvo.methods.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6EAKmC;AACnC,sCAAwD;AACxD,kDAAoE;AACpE,4DAAsF;AAGtF,2DAA+C;
|
|
1
|
+
{"version":3,"file":"ChatConvo.methods.js","sourceRoot":"","sources":["../../../src/chat/methods/ChatConvo.methods.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,7 +36,7 @@ exports.ChatMessageResolver = ChatMessageResolver;
|
|
|
36
36
|
__decorate([
|
|
37
37
|
(0, type_graphql_1.Subscription)(() => ChatMessage_model_1.OnChatMessage, {
|
|
38
38
|
topics: ChatMessage_model_1.ChatMessage.name,
|
|
39
|
-
filter: ({ payload, args }) => args.convoId === payload.convoId && args.owner
|
|
39
|
+
filter: ({ payload, args }) => args.convoId === payload.convoId && args.owner === payload.owner,
|
|
40
40
|
}),
|
|
41
41
|
__param(0, (0, type_graphql_1.Root)()),
|
|
42
42
|
__param(1, (0, type_graphql_1.Arg)('owner', () => String, { nullable: true })),
|
package/package.json
CHANGED
|
@@ -250,7 +250,7 @@ export const updateConvoSubscriptions = async (
|
|
|
250
250
|
|
|
251
251
|
const subscriptionData = getSubscriptionData();
|
|
252
252
|
|
|
253
|
-
const
|
|
253
|
+
const publishToMessageAsGroupTopic = async () => {
|
|
254
254
|
return publishMessageToTopic(context, [ChatMessage.name], {
|
|
255
255
|
convoId,
|
|
256
256
|
owner: sender,
|
|
@@ -260,7 +260,7 @@ export const updateConvoSubscriptions = async (
|
|
|
260
260
|
|
|
261
261
|
try {
|
|
262
262
|
// send to message topic
|
|
263
|
-
await
|
|
263
|
+
await publishToMessageAsGroupTopic();
|
|
264
264
|
|
|
265
265
|
// send to convo topics
|
|
266
266
|
const membersConvos: ChatConvoType[] = await ChatConvoModel.pagination({
|
|
@@ -269,32 +269,32 @@ export const updateConvoSubscriptions = async (
|
|
|
269
269
|
});
|
|
270
270
|
|
|
271
271
|
if (!isEmpty(membersConvos)) {
|
|
272
|
-
const isPublicChat = compact(membersConvos.map((c) => c.public));
|
|
272
|
+
// const isPublicChat = compact(membersConvos.map((c) => c.public));
|
|
273
273
|
|
|
274
|
-
if (!isEmpty(isPublicChat)) {
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
274
|
+
// if (!isEmpty(isPublicChat)) {
|
|
275
|
+
// log(`updated subscriptions isPublicChat`);
|
|
276
|
+
// // await publishToMessageAsGroupTopic();
|
|
277
|
+
// return;
|
|
278
|
+
// }
|
|
278
279
|
|
|
279
280
|
// push notification here
|
|
280
281
|
|
|
281
282
|
// update sockets, no need for results
|
|
282
283
|
await awaitTo(
|
|
283
284
|
Promise.all(
|
|
284
|
-
membersConvos.map((convo) => {
|
|
285
|
+
membersConvos.map(async (convo) => {
|
|
285
286
|
const pushmessage = {
|
|
286
287
|
...data,
|
|
287
288
|
convoId,
|
|
288
289
|
owner: convo.owner,
|
|
289
290
|
};
|
|
290
291
|
|
|
291
|
-
// unhandled promises
|
|
292
292
|
if (!subscriptionData.typing) {
|
|
293
|
-
sendPushNotification(sender, pushmessage);
|
|
293
|
+
await sendPushNotification(sender, pushmessage);
|
|
294
294
|
}
|
|
295
295
|
|
|
296
296
|
// Send subscriptions to owners
|
|
297
|
-
return publishMessageToTopic(context, [ChatConvo.name], {
|
|
297
|
+
return publishMessageToTopic(context, [ChatConvo.name, ChatMessage.name], {
|
|
298
298
|
convoId,
|
|
299
299
|
owner: convo.owner,
|
|
300
300
|
...subscriptionData,
|
|
@@ -12,7 +12,7 @@ export class ChatMessageResolver {
|
|
|
12
12
|
@Subscription(() => OnChatMessage, {
|
|
13
13
|
topics: ChatMessage.name,
|
|
14
14
|
filter: ({payload, args}) =>
|
|
15
|
-
args.convoId === payload.convoId && args.owner
|
|
15
|
+
args.convoId === payload.convoId && args.owner === payload.owner,
|
|
16
16
|
})
|
|
17
17
|
onChatMessage(
|
|
18
18
|
@Root() data: OnChatMessage,
|